Browse Source

chore: update deps

xiaoxian521 3 years ago
parent
commit
b554356ba1
4 changed files with 48 additions and 42 deletions
  1. 40 27
      package-lock.json
  2. 3 3
      package.json
  3. 2 5
      public/serverConfig.json
  4. 3 7
      src/components/Map/src/Amap.vue

+ 40 - 27
package-lock.json

@@ -33,8 +33,8 @@
         "vue-router": "^4.0.8",
         "vue-router": "^4.0.8",
         "vue-types": "^3.0.2",
         "vue-types": "^3.0.2",
         "vuedraggable": "^4.0.1",
         "vuedraggable": "^4.0.1",
-        "vuex": "^4.0.0",
-        "vxe-table": "^4.0.16",
+        "vuex": "^4.0.1",
+        "vxe-table": "^4.0.18-beta.0",
         "wangeditor": "^4.0.3",
         "wangeditor": "^4.0.3",
         "xe-ajax": "^4.0.5",
         "xe-ajax": "^4.0.5",
         "xe-utils": "^3.2.1",
         "xe-utils": "^3.2.1",
@@ -55,7 +55,7 @@
         "sass": "^1.32.8",
         "sass": "^1.32.8",
         "sass-loader": "^11.0.1",
         "sass-loader": "^11.0.1",
         "typescript": "^4.2.4",
         "typescript": "^4.2.4",
-        "vite": "^2.3.3",
+        "vite": "^2.3.4",
         "vite-plugin-mock": "^2.5.0",
         "vite-plugin-mock": "^2.5.0",
         "vite-plugin-style-import": "^0.10.0"
         "vite-plugin-style-import": "^0.10.0"
       }
       }
@@ -728,9 +728,9 @@
       }
       }
     },
     },
     "node_modules/@vue/devtools-api": {
     "node_modules/@vue/devtools-api": {
-      "version": "6.0.0-beta.10",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.10.tgz",
-      "integrity": "sha512-nktQYRnIFrh4DdXiCBjHnsHOMZXDIVcP9qlm/DMfxmjJMtpMGrSZCOKP8j7kDhObNHyqlicwoGLd+a4hf4x9ww=="
+      "version": "6.0.0-beta.11",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.11.tgz",
+      "integrity": "sha512-vpw61AkW9U8c2upjJCljHq9eh1KkD4FJ7DYbRzIETpj9WAw2VESudJZosAk4M+7npBo1Zu1jNQY03HUMVO/czQ=="
     },
     },
     "node_modules/@vue/reactivity": {
     "node_modules/@vue/reactivity": {
       "version": "3.0.11",
       "version": "3.0.11",
@@ -2561,9 +2561,9 @@
       }
       }
     },
     },
     "node_modules/vite": {
     "node_modules/vite": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-2.3.3.tgz",
-      "integrity": "sha512-eO1iwRbn3/BfkNVMNJDeANAFCZ5NobYOFPu7IqfY7DcI7I9nFGjJIZid0EViTmLDGwwSUPmRAq3cRBbO3+DsMA==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-2.3.4.tgz",
+      "integrity": "sha512-7orxrF65+Q5n/sMCnO91S8OS0gkPJ7g+y3bLlc7CPCXVswK8to1T8YycCk9SZh+AcIc0TuN6YajWTBFS5atMNA==",
       "dev": true,
       "dev": true,
       "dependencies": {
       "dependencies": {
         "esbuild": "^0.11.23",
         "esbuild": "^0.11.23",
@@ -2716,6 +2716,9 @@
       },
       },
       "engines": {
       "engines": {
         "node": ">= 10"
         "node": ">= 10"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.0"
       }
       }
     },
     },
     "node_modules/vue-json-pretty": {
     "node_modules/vue-json-pretty": {
@@ -2758,14 +2761,21 @@
       }
       }
     },
     },
     "node_modules/vuex": {
     "node_modules/vuex": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-4.0.0.tgz?cache=0&sync_timestamp=1612277442796&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-4.0.0.tgz",
-      "integrity": "sha1-rId6p2qcRTaMl5Rx5GG1INOObPU="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.1.tgz",
+      "integrity": "sha512-MddakQTAnImDkK1YhEESowKSU5KcjqHH3L1ScPx1lj6NzDDX0FuRBZqJoME5O7/nvj9puudDf6xnWU2w/cqI7g==",
+      "dependencies": {
+        "@vue/devtools-api": "^6.0.0-beta.11"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.2"
+      }
     },
     },
     "node_modules/vxe-table": {
     "node_modules/vxe-table": {
-      "version": "4.0.16",
-      "resolved": "https://registry.npmjs.org/vxe-table/-/vxe-table-4.0.16.tgz",
-      "integrity": "sha512-ykJiahu+Q+1eveihhWjH0bBx8qS8I4fNObWVnUe+dYbcGWUvyqgpKVY8HuV2OvJDEcPgi5sSmns++NBxJj+XsA==",
+      "version": "4.0.18-beta.0",
+      "resolved": "https://registry.npmjs.org/vxe-table/-/vxe-table-4.0.18-beta.0.tgz",
+      "integrity": "sha512-mZzGM9PMOzVKQLmj7AjeV/RhCaWWLWBlW91WYpnc2B6OrMK2a2amqCdJTLxmfjXLfBYJpjeV6op5ZX1FIDq21A==",
+      "license": "MIT",
       "peerDependencies": {
       "peerDependencies": {
         "vue": "^3.0.0",
         "vue": "^3.0.0",
         "xe-utils": "^3.2.0"
         "xe-utils": "^3.2.0"
@@ -3468,9 +3478,9 @@
       }
       }
     },
     },
     "@vue/devtools-api": {
     "@vue/devtools-api": {
-      "version": "6.0.0-beta.10",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.10.tgz",
-      "integrity": "sha512-nktQYRnIFrh4DdXiCBjHnsHOMZXDIVcP9qlm/DMfxmjJMtpMGrSZCOKP8j7kDhObNHyqlicwoGLd+a4hf4x9ww=="
+      "version": "6.0.0-beta.11",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.11.tgz",
+      "integrity": "sha512-vpw61AkW9U8c2upjJCljHq9eh1KkD4FJ7DYbRzIETpj9WAw2VESudJZosAk4M+7npBo1Zu1jNQY03HUMVO/czQ=="
     },
     },
     "@vue/reactivity": {
     "@vue/reactivity": {
       "version": "3.0.11",
       "version": "3.0.11",
@@ -4961,9 +4971,9 @@
       "requires": {}
       "requires": {}
     },
     },
     "vite": {
     "vite": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-2.3.3.tgz",
-      "integrity": "sha512-eO1iwRbn3/BfkNVMNJDeANAFCZ5NobYOFPu7IqfY7DcI7I9nFGjJIZid0EViTmLDGwwSUPmRAq3cRBbO3+DsMA==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-2.3.4.tgz",
+      "integrity": "sha512-7orxrF65+Q5n/sMCnO91S8OS0gkPJ7g+y3bLlc7CPCXVswK8to1T8YycCk9SZh+AcIc0TuN6YajWTBFS5atMNA==",
       "dev": true,
       "dev": true,
       "requires": {
       "requires": {
         "esbuild": "^0.11.23",
         "esbuild": "^0.11.23",
@@ -5117,14 +5127,17 @@
       }
       }
     },
     },
     "vuex": {
     "vuex": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-4.0.0.tgz?cache=0&sync_timestamp=1612277442796&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvuex%2Fdownload%2Fvuex-4.0.0.tgz",
-      "integrity": "sha1-rId6p2qcRTaMl5Rx5GG1INOObPU="
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.0.1.tgz",
+      "integrity": "sha512-MddakQTAnImDkK1YhEESowKSU5KcjqHH3L1ScPx1lj6NzDDX0FuRBZqJoME5O7/nvj9puudDf6xnWU2w/cqI7g==",
+      "requires": {
+        "@vue/devtools-api": "^6.0.0-beta.11"
+      }
     },
     },
     "vxe-table": {
     "vxe-table": {
-      "version": "4.0.16",
-      "resolved": "https://registry.npmjs.org/vxe-table/-/vxe-table-4.0.16.tgz",
-      "integrity": "sha512-ykJiahu+Q+1eveihhWjH0bBx8qS8I4fNObWVnUe+dYbcGWUvyqgpKVY8HuV2OvJDEcPgi5sSmns++NBxJj+XsA==",
+      "version": "4.0.18-beta.0",
+      "resolved": "https://registry.npmjs.org/vxe-table/-/vxe-table-4.0.18-beta.0.tgz",
+      "integrity": "sha512-mZzGM9PMOzVKQLmj7AjeV/RhCaWWLWBlW91WYpnc2B6OrMK2a2amqCdJTLxmfjXLfBYJpjeV6op5ZX1FIDq21A==",
       "requires": {}
       "requires": {}
     },
     },
     "wangeditor": {
     "wangeditor": {

+ 3 - 3
package.json

@@ -36,8 +36,8 @@
     "vue-router": "^4.0.8",
     "vue-router": "^4.0.8",
     "vue-types": "^3.0.2",
     "vue-types": "^3.0.2",
     "vuedraggable": "^4.0.1",
     "vuedraggable": "^4.0.1",
-    "vuex": "^4.0.0",
-    "vxe-table": "^4.0.16",
+    "vuex": "^4.0.1",
+    "vxe-table": "^4.0.18-beta.0",
     "wangeditor": "^4.0.3",
     "wangeditor": "^4.0.3",
     "xe-ajax": "^4.0.5",
     "xe-ajax": "^4.0.5",
     "xe-utils": "^3.2.1",
     "xe-utils": "^3.2.1",
@@ -58,7 +58,7 @@
     "sass": "^1.32.8",
     "sass": "^1.32.8",
     "sass-loader": "^11.0.1",
     "sass-loader": "^11.0.1",
     "typescript": "^4.2.4",
     "typescript": "^4.2.4",
-    "vite": "^2.3.3",
+    "vite": "^2.3.4",
     "vite-plugin-mock": "^2.5.0",
     "vite-plugin-mock": "^2.5.0",
     "vite-plugin-style-import": "^0.10.0"
     "vite-plugin-style-import": "^0.10.0"
   }
   }

+ 2 - 5
public/serverConfig.json

@@ -5,11 +5,8 @@
     "baiduKey": "wTHbkkEweiFqZLKunMIjcrb2RcqNXkhc",
     "baiduKey": "wTHbkkEweiFqZLKunMIjcrb2RcqNXkhc",
     "options": {
     "options": {
       "resizeEnable": true,
       "resizeEnable": true,
-      "center": [
-        114.085947,
-        22.547
-      ],
+      "center": [113.6401, 34.72468],
       "zoom": 12
       "zoom": 12
     }
     }
   }
   }
-}
+}

+ 3 - 7
src/components/Map/src/Amap.vue

@@ -69,10 +69,8 @@ export default defineComponent({
     onBeforeMount(() => {
     onBeforeMount(() => {
       vm = getCurrentInstance(); //获取组件实例
       vm = getCurrentInstance(); //获取组件实例
       if (!vm) return;
       if (!vm) return;
-      let {
-        MapConfigure,
-        options
-      } = vm.appContext.config.globalProperties.$config;
+      let { MapConfigure } = vm.appContext.config.globalProperties.$config;
+      let { options } = MapConfigure;
 
 
       AMapLoader.load({
       AMapLoader.load({
         key: MapConfigure.amapKey,
         key: MapConfigure.amapKey,
@@ -81,9 +79,7 @@ export default defineComponent({
       })
       })
         .then(AMap => {
         .then(AMap => {
           // 创建地图实例
           // 创建地图实例
-          map = new AMap.Map(vm.refs.mapview, {
-            options
-          });
+          map = new AMap.Map(vm.refs.mapview, options);
 
 
           //地图中添加地图操作ToolBar插件
           //地图中添加地图操作ToolBar插件
           map.plugin(["AMap.ToolBar", "AMap.MapType"], () => {
           map.plugin(["AMap.ToolBar", "AMap.MapType"], () => {