xiaoxian521 3 жил өмнө
parent
commit
cd872bea83

+ 60 - 67
package-lock.json

@@ -17,7 +17,7 @@
         "dayjs": "^1.10.4",
         "dotenv": "^8.2.0",
         "echarts": "^5.1.1",
-        "element-plus": "^1.0.2-beta.42",
+        "element-plus": "^1.0.2-beta.44",
         "font-awesome": "^4.7.0",
         "lodash-es": "^4.17.21",
         "mitt": "^2.1.0",
@@ -30,14 +30,14 @@
         "vue": "^3.0.11",
         "vue-i18n": "^9.1.6",
         "vue-json-pretty": "^2.0.2",
-        "vue-router": "^4.0.6",
+        "vue-router": "^4.0.8",
         "vue-types": "^3.0.2",
         "vuedraggable": "^4.0.1",
         "vuex": "^4.0.0",
-        "vxe-table": "^4.0.15-beta.2",
+        "vxe-table": "^4.0.16",
         "wangeditor": "^4.0.3",
         "xe-ajax": "^4.0.5",
-        "xe-utils": "^3.1.12",
+        "xe-utils": "^3.2.1",
         "xgplayer": "^2.20.3"
       },
       "devDependencies": {
@@ -55,7 +55,7 @@
         "sass": "^1.32.8",
         "sass-loader": "^11.0.1",
         "typescript": "^4.2.4",
-        "vite": "^2.2.3",
+        "vite": "^2.3.3",
         "vite-plugin-mock": "^2.5.0",
         "vite-plugin-style-import": "^0.10.0"
       }
@@ -586,9 +586,9 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.14.168",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz",
-      "integrity": "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q=="
+      "version": "4.14.169",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.169.tgz",
+      "integrity": "sha512-DvmZHoHTFJ8zhVYwCLWbQ7uAbYQEk52Ev2/ZiQ7Y7gQGeV9pjBqjnQpECMHfKS1rCYAhMI7LHVxwyZLZinJgdw=="
     },
     "node_modules/@types/mockjs": {
       "version": "1.0.3",
@@ -729,9 +729,9 @@
       }
     },
     "node_modules/@vue/devtools-api": {
-      "version": "6.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.7.tgz",
-      "integrity": "sha512-mIfqX8ZF6s2ulelIzfxGk9sFoigpoeK/2/DlWrtBGWfvwaK3kR1P2bxNkZ0LbJeuKHfcRP6hGZtGist7nxUN9A=="
+      "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=="
     },
     "node_modules/@vue/reactivity": {
       "version": "3.0.11",
@@ -1308,9 +1308,9 @@
       "dev": true
     },
     "node_modules/element-plus": {
-      "version": "1.0.2-beta.42",
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.42.tgz",
-      "integrity": "sha512-6BS8hC2Bs3bggHQ7CdY+pQ+AJmZhQm3UGqA3Bh2mSNC+f2Fk5IELBvi/J1zRdz69LCCW5f9XEWf5B7OrOIfcKQ==",
+      "version": "1.0.2-beta.44",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.44.tgz",
+      "integrity": "sha512-PmGfOnV/66LPGSsSbaesiTnmrcQ5PnoZLr2eKRv2/lJ06xUc0AiSBiktGrds0mETgC1O/mRHswXk/Se6aJtpKQ==",
       "dependencies": {
         "@popperjs/core": "^2.4.4",
         "@types/lodash": "^4.14.161",
@@ -1379,9 +1379,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.9.7",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.9.7.tgz",
-      "integrity": "sha512-VtUf6aQ89VTmMLKrWHYG50uByMF4JQlVysb8dmg6cOgW8JnFCipmz7p+HNBl+RR3LLCuBxFGVauAe2wfnF9bLg==",
+      "version": "0.11.23",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.11.23.tgz",
+      "integrity": "sha512-iaiZZ9vUF5wJV8ob1tl+5aJTrwDczlvGP0JoMmnpC2B0ppiMCu8n8gmy5ZTGl5bcG081XBVn+U+jP+mPFm5T5Q==",
       "dev": true,
       "hasInstallScript": true,
       "bin": {
@@ -2562,13 +2562,13 @@
       }
     },
     "node_modules/vite": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-2.2.3.tgz",
-      "integrity": "sha512-PtjyBL4GtACM+uT5q5hi2+AlMBbb6YI2b2bam6QI8ZdZt4FezseF0yZHQx0G+b3po9jIJ/GS5N9gc5Yq9Rue7g==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-2.3.3.tgz",
+      "integrity": "sha512-eO1iwRbn3/BfkNVMNJDeANAFCZ5NobYOFPu7IqfY7DcI7I9nFGjJIZid0EViTmLDGwwSUPmRAq3cRBbO3+DsMA==",
       "dev": true,
       "dependencies": {
-        "esbuild": "^0.9.3",
-        "postcss": "^8.2.1",
+        "esbuild": "^0.11.23",
+        "postcss": "^8.2.10",
         "resolve": "^1.19.0",
         "rollup": "^2.38.5"
       },
@@ -2642,16 +2642,6 @@
       "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
       "dev": true
     },
-    "node_modules/vite-plugin-mock/node_modules/esbuild": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npm.taobao.org/esbuild/download/esbuild-0.11.10.tgz?cache=0&sync_timestamp=1618309241959&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fesbuild%2Fdownload%2Fesbuild-0.11.10.tgz",
-      "integrity": "sha1-9dOeTZzBMLeNdRZk/vG2YyQPVUU=",
-      "dev": true,
-      "hasInstallScript": true,
-      "bin": {
-        "esbuild": "bin/esbuild"
-      }
-    },
     "node_modules/vite-plugin-mock/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
@@ -2739,9 +2729,15 @@
       }
     },
     "node_modules/vue-router": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-4.0.6.tgz",
-      "integrity": "sha1-kXUNtQfSZkLyJbDsYGRWjl/kSNY="
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.8.tgz",
+      "integrity": "sha512-42mWSQaH7CCBQDspQTHv63f34VEnZC20g9QNK4WJ/zW8SdIUeT6TQ2i/78fjF/pVBUPLBWrGhvB7uDnaz7O/pA==",
+      "dependencies": {
+        "@vue/devtools-api": "^6.0.0-beta.10"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.0"
+      }
     },
     "node_modules/vue-types": {
       "version": "3.0.2",
@@ -2768,9 +2764,9 @@
       "integrity": "sha1-rId6p2qcRTaMl5Rx5GG1INOObPU="
     },
     "node_modules/vxe-table": {
-      "version": "4.0.15-beta.2",
-      "resolved": "https://registry.npmjs.org/vxe-table/-/vxe-table-4.0.15-beta.2.tgz",
-      "integrity": "sha512-XbyoVFAbvwnOzCcvNiGpe8vHBCUTwQzv2GBv5HjlzGKEy+e99eEAeIcEzYfXvu4ttIva+5u+at9svwRNKT8EBA==",
+      "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==",
       "peerDependencies": {
         "vue": "^3.0.0",
         "xe-utils": "^3.2.0"
@@ -3337,9 +3333,9 @@
       "dev": true
     },
     "@types/lodash": {
-      "version": "4.14.168",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz",
-      "integrity": "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q=="
+      "version": "4.14.169",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.169.tgz",
+      "integrity": "sha512-DvmZHoHTFJ8zhVYwCLWbQ7uAbYQEk52Ev2/ZiQ7Y7gQGeV9pjBqjnQpECMHfKS1rCYAhMI7LHVxwyZLZinJgdw=="
     },
     "@types/mockjs": {
       "version": "1.0.3",
@@ -3472,9 +3468,9 @@
       }
     },
     "@vue/devtools-api": {
-      "version": "6.0.0-beta.7",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.7.tgz",
-      "integrity": "sha512-mIfqX8ZF6s2ulelIzfxGk9sFoigpoeK/2/DlWrtBGWfvwaK3kR1P2bxNkZ0LbJeuKHfcRP6hGZtGist7nxUN9A=="
+      "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=="
     },
     "@vue/reactivity": {
       "version": "3.0.11",
@@ -3933,9 +3929,9 @@
       "dev": true
     },
     "element-plus": {
-      "version": "1.0.2-beta.42",
-      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.42.tgz",
-      "integrity": "sha512-6BS8hC2Bs3bggHQ7CdY+pQ+AJmZhQm3UGqA3Bh2mSNC+f2Fk5IELBvi/J1zRdz69LCCW5f9XEWf5B7OrOIfcKQ==",
+      "version": "1.0.2-beta.44",
+      "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-1.0.2-beta.44.tgz",
+      "integrity": "sha512-PmGfOnV/66LPGSsSbaesiTnmrcQ5PnoZLr2eKRv2/lJ06xUc0AiSBiktGrds0mETgC1O/mRHswXk/Se6aJtpKQ==",
       "requires": {
         "@popperjs/core": "^2.4.4",
         "@types/lodash": "^4.14.161",
@@ -3995,9 +3991,9 @@
       }
     },
     "esbuild": {
-      "version": "0.9.7",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.9.7.tgz",
-      "integrity": "sha512-VtUf6aQ89VTmMLKrWHYG50uByMF4JQlVysb8dmg6cOgW8JnFCipmz7p+HNBl+RR3LLCuBxFGVauAe2wfnF9bLg==",
+      "version": "0.11.23",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.11.23.tgz",
+      "integrity": "sha512-iaiZZ9vUF5wJV8ob1tl+5aJTrwDczlvGP0JoMmnpC2B0ppiMCu8n8gmy5ZTGl5bcG081XBVn+U+jP+mPFm5T5Q==",
       "dev": true
     },
     "escalade": {
@@ -4965,14 +4961,14 @@
       "requires": {}
     },
     "vite": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-2.2.3.tgz",
-      "integrity": "sha512-PtjyBL4GtACM+uT5q5hi2+AlMBbb6YI2b2bam6QI8ZdZt4FezseF0yZHQx0G+b3po9jIJ/GS5N9gc5Yq9Rue7g==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-2.3.3.tgz",
+      "integrity": "sha512-eO1iwRbn3/BfkNVMNJDeANAFCZ5NobYOFPu7IqfY7DcI7I9nFGjJIZid0EViTmLDGwwSUPmRAq3cRBbO3+DsMA==",
       "dev": true,
       "requires": {
-        "esbuild": "^0.9.3",
+        "esbuild": "^0.11.23",
         "fsevents": "~2.3.1",
-        "postcss": "^8.2.1",
+        "postcss": "^8.2.10",
         "resolve": "^1.19.0",
         "rollup": "^2.38.5"
       }
@@ -5028,12 +5024,6 @@
           "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
           "dev": true
         },
-        "esbuild": {
-          "version": "0.11.10",
-          "resolved": "https://registry.npm.taobao.org/esbuild/download/esbuild-0.11.10.tgz?cache=0&sync_timestamp=1618309241959&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fesbuild%2Fdownload%2Fesbuild-0.11.10.tgz",
-          "integrity": "sha1-9dOeTZzBMLeNdRZk/vG2YyQPVUU=",
-          "dev": true
-        },
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz",
@@ -5103,9 +5093,12 @@
       "integrity": "sha512-Vn7SX3XR9cfvGRNoTDNID89GmvVUMb7/fLUX3C3n0Qptga0N7hp7Zwspui1I1XN5pE+PeoVghCSYty+bi8KnjA=="
     },
     "vue-router": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-4.0.6.tgz",
-      "integrity": "sha1-kXUNtQfSZkLyJbDsYGRWjl/kSNY="
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.8.tgz",
+      "integrity": "sha512-42mWSQaH7CCBQDspQTHv63f34VEnZC20g9QNK4WJ/zW8SdIUeT6TQ2i/78fjF/pVBUPLBWrGhvB7uDnaz7O/pA==",
+      "requires": {
+        "@vue/devtools-api": "^6.0.0-beta.10"
+      }
     },
     "vue-types": {
       "version": "3.0.2",
@@ -5129,9 +5122,9 @@
       "integrity": "sha1-rId6p2qcRTaMl5Rx5GG1INOObPU="
     },
     "vxe-table": {
-      "version": "4.0.15-beta.2",
-      "resolved": "https://registry.npmjs.org/vxe-table/-/vxe-table-4.0.15-beta.2.tgz",
-      "integrity": "sha512-XbyoVFAbvwnOzCcvNiGpe8vHBCUTwQzv2GBv5HjlzGKEy+e99eEAeIcEzYfXvu4ttIva+5u+at9svwRNKT8EBA==",
+      "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==",
       "requires": {}
     },
     "wangeditor": {

+ 5 - 5
package.json

@@ -20,7 +20,7 @@
     "dayjs": "^1.10.4",
     "dotenv": "^8.2.0",
     "echarts": "^5.1.1",
-    "element-plus": "^1.0.2-beta.42",
+    "element-plus": "^1.0.2-beta.44",
     "font-awesome": "^4.7.0",
     "lodash-es": "^4.17.21",
     "mitt": "^2.1.0",
@@ -33,14 +33,14 @@
     "vue": "^3.0.11",
     "vue-i18n": "^9.1.6",
     "vue-json-pretty": "^2.0.2",
-    "vue-router": "^4.0.6",
+    "vue-router": "^4.0.8",
     "vue-types": "^3.0.2",
     "vuedraggable": "^4.0.1",
     "vuex": "^4.0.0",
-    "vxe-table": "^4.0.15-beta.2",
+    "vxe-table": "^4.0.16",
     "wangeditor": "^4.0.3",
     "xe-ajax": "^4.0.5",
-    "xe-utils": "^3.1.12",
+    "xe-utils": "^3.2.1",
     "xgplayer": "^2.20.3"
   },
   "devDependencies": {
@@ -58,7 +58,7 @@
     "sass": "^1.32.8",
     "sass-loader": "^11.0.1",
     "typescript": "^4.2.4",
-    "vite": "^2.2.3",
+    "vite": "^2.3.3",
     "vite-plugin-mock": "^2.5.0",
     "vite-plugin-style-import": "^0.10.0"
   }

+ 8 - 8
src/views/components/draggable/index.vue

@@ -67,7 +67,7 @@
 </template>
 
 <script lang='ts'>
-import draggable from "vuedraggable";
+import draggable from "vuedraggable/src/vuedraggable";
 import { reactive, toRefs, onMounted } from "vue";
 export default {
   components: { draggable },
@@ -82,20 +82,20 @@ export default {
         { grid: "cn", num: 6 },
         { grid: "cn", num: 7 },
         { grid: "cn", num: 8 },
-        { grid: "cn", num: 9 },
+        { grid: "cn", num: 9 }
       ],
       lists: [
         { people: "cn", id: 1, name: "www.itxst.com" },
         { people: "cn", id: 2, name: "www.baidu.com" },
         { people: "cn", id: 3, name: "www.taobao.com" },
-        { people: "cn", id: 4, name: "www.google.com" },
+        { people: "cn", id: 4, name: "www.google.com" }
       ],
       cutLists: [
         { people: "cn", id: 1, name: "cut1" },
         { people: "cn", id: 2, name: "cut2" },
         { people: "cn", id: 3, name: "cut3" },
-        { people: "cn", id: 4, name: "cut4" },
-      ],
+        { people: "cn", id: 4, name: "cut4" }
+      ]
     });
 
     const change = (evt): void => {
@@ -110,15 +110,15 @@ export default {
         forceFallback: true,
         chosenClass: "chosen",
         swapClass: "highlight",
-        animation: 300,
+        animation: 300
       });
     });
 
     return {
       ...toRefs(myArray),
-      change,
+      change
     };
-  },
+  }
 };
 </script>
 

+ 9 - 7
types/shims-vue.d.ts

@@ -1,10 +1,12 @@
-declare module '*.vue' {
-  import type { DefineComponent } from 'vue'
-  const component: DefineComponent<{}, {}, any>
-  export default component
+declare module "*.vue" {
+  import type { DefineComponent } from "vue";
+  const component: DefineComponent<{}, {}, any>;
+  export default component;
 }
 
-declare module '*.scss' {
-  const scss: Record<string, string>
+declare module "*.scss" {
+  const scss: Record<string, string>;
   export default scss;
-}
+}
+
+declare module "vuedraggable/src/vuedraggable";