scorpio 3 年之前
父节点
当前提交
1a540d2abb
共有 4 个文件被更改,包括 63 次插入22 次删除
  1. 1 1
      package.json
  2. 5 5
      src/views/database/component/list.vue
  3. 7 5
      src/views/recycle/index.vue
  4. 50 11
      yarn.lock

+ 1 - 1
package.json

@@ -10,7 +10,7 @@
   },
   },
   "dependencies": {
   "dependencies": {
     "@element-plus/icons-vue": "^2.0.6",
     "@element-plus/icons-vue": "^2.0.6",
-    "@smallwei/avue": "^3.1.4",
+    "@smallwei/avue": "^3.2.5",
     "animate.css": "^4.1.1",
     "animate.css": "^4.1.1",
     "dateformat": "^5.0.3",
     "dateformat": "^5.0.3",
     "element-plus": "^2.2.9",
     "element-plus": "^2.2.9",

+ 5 - 5
src/views/database/component/list.vue

@@ -16,7 +16,7 @@
     </div>
     </div>
     <avue-crud ref="crud"
     <avue-crud ref="crud"
                v-model="form"
                v-model="form"
-               :page="page"
+               v-model:page="page"
                :before-open="beforeOpen"
                :before-open="beforeOpen"
                :data="data"
                :data="data"
                :option="option"
                :option="option"
@@ -85,8 +85,8 @@ export default {
           }]
           }]
       },
       },
       page: {
       page: {
-        size: 10,
-        current: 1,
+        currentSize: 10,
+        currentPage: 1,
         total: 0
         total: 0
       },
       },
       id: ''
       id: ''
@@ -99,6 +99,8 @@ export default {
   },
   },
   methods: {
   methods: {
     onLoad (query = {}) {
     onLoad (query = {}) {
+      this.page.current = this.page.currentPage
+      this.page.size = this.page.pageSize
       const data = { ...query, ...this.page }
       const data = { ...query, ...this.page }
       this.loading = true
       this.loading = true
       this.$api.database.fileList(data).then(res => {
       this.$api.database.fileList(data).then(res => {
@@ -111,11 +113,9 @@ export default {
     },
     },
     currentChange (currentPage) {
     currentChange (currentPage) {
       this.page.current = currentPage
       this.page.current = currentPage
-      this.refreshChange()
     },
     },
     sizeChange (pageSize) {
     sizeChange (pageSize) {
       this.page.size = pageSize
       this.page.size = pageSize
-      this.refreshChange()
     },
     },
     refreshChange () {
     refreshChange () {
       this.onLoad(this.page, this.query)
       this.onLoad(this.page, this.query)

+ 7 - 5
src/views/recycle/index.vue

@@ -2,7 +2,7 @@
   <div class="full-height full-width flex flex-col">
   <div class="full-height full-width flex flex-col">
     <avue-crud ref="crud"
     <avue-crud ref="crud"
                v-model="form"
                v-model="form"
-               :page="page"
+               v-model:page="page"
                :before-open="beforeOpen"
                :before-open="beforeOpen"
                :data="data"
                :data="data"
                :option="option"
                :option="option"
@@ -34,8 +34,8 @@ export default {
       data: [],
       data: [],
       form: {},
       form: {},
       page: {
       page: {
-        size: 10,
-        current: 1,
+        pageSize: 10,
+        currentPage: 1,
         total: 10
         total: 10
       },
       },
       option: {
       option: {
@@ -102,6 +102,9 @@ export default {
   methods: {
   methods: {
     onLoad () {
     onLoad () {
       this.loading = true
       this.loading = true
+      this.page.current = this.page.currentPage
+      this.page.size = this.page.pageSize
+
       this.$api.recycle.recycleList(this.page).then(res => {
       this.$api.recycle.recycleList(this.page).then(res => {
         this.loading = false
         this.loading = false
         if (res.code === 200) {
         if (res.code === 200) {
@@ -130,8 +133,7 @@ export default {
       }
       }
     },
     },
     currentChange (currentPage) {
     currentChange (currentPage) {
-      this.page.current = currentPage
-      this.refreshChange()
+      this.page.currentPage = currentPage
     },
     },
     sizeChange (pageSize) {
     sizeChange (pageSize) {
       this.page.size = pageSize
       this.page.size = pageSize

+ 50 - 11
yarn.lock

@@ -47,6 +47,11 @@
   resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-0.7.3.tgz#d274116678ffae87f6b60e90f88cc4083eefab86"
   resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-0.7.3.tgz#d274116678ffae87f6b60e90f88cc4083eefab86"
   integrity sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg==
   integrity sha512-buc8BXHmG9l82+OQXOFU3Kr2XQx9ys01U/Q9HMIrZ300iLc8HLMgh7dcCqgYzAzf4BkoQvDcXf5Y+CuEZ5JBYg==
 
 
+"@floating-ui/core@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.0.2.tgz#d06a66d3ad8214186eda2432ac8b8d81868a571f"
+  integrity sha512-Skfy0YS3NJ5nV9us0uuPN0HDk1Q4edljaOhRBJGDWs9EBa7ZVMYBHRFlhLvvmwEoaIM9BlH6QJFn9/uZg0bACg==
+
 "@floating-ui/dom@^0.5.4":
 "@floating-ui/dom@^0.5.4":
   version "0.5.4"
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-0.5.4.tgz#4eae73f78bcd4bd553ae2ade30e6f1f9c73fe3f1"
   resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-0.5.4.tgz#4eae73f78bcd4bd553ae2ade30e6f1f9c73fe3f1"
@@ -54,6 +59,13 @@
   dependencies:
   dependencies:
     "@floating-ui/core" "^0.7.3"
     "@floating-ui/core" "^0.7.3"
 
 
+"@floating-ui/dom@^1.0.1":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.0.6.tgz#e42393ec381a4fe96673fbcee137a95e86c93ebc"
+  integrity sha512-kt/tg1oip9OAH1xjCTcx1OpcUpu9rjDw3GKJ/rEhUqhO7QyJWfrHU0DpLTNsH67+JyFL5Kv9X1utsXwKFVtyEQ==
+  dependencies:
+    "@floating-ui/core" "^1.0.2"
+
 "@gar/promisify@^1.1.3":
 "@gar/promisify@^1.1.3":
   version "1.1.3"
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
@@ -275,16 +287,16 @@
   resolved "https://registry.yarnpkg.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz#a7f69e3665d3da9b115f9e71671dae1b97e13671"
   resolved "https://registry.yarnpkg.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz#a7f69e3665d3da9b115f9e71671dae1b97e13671"
   integrity sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==
   integrity sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==
 
 
-"@smallwei/avue@^3.1.4":
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/@smallwei/avue/-/avue-3.1.4.tgz#d9d5fb049706e718ceee74a49bae1af7fd1d8f25"
-  integrity sha512-+KVr9ssdh0RWK5cCy8v9403KFgkInMQuGCOoumm+kGZDj8BJPDSIQe5CjJU6H9ukL30J/wiL4OYHu7V3giNB+Q==
+"@smallwei/avue@^3.2.5":
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/@smallwei/avue/-/avue-3.2.5.tgz#b44d1ac003328a8d81e7b0c4dc710b5196d82d11"
+  integrity sha512-L34KjOhkOtIgnjeTMa0Gldfq/zQ+o+RbcU+gAWkT0J2RYllw7o6udwho8mrT7f1v09QPht8WaYe2TQSshJwRqw==
   dependencies:
   dependencies:
     "@element-plus/icons-vue" "^2.0.6"
     "@element-plus/icons-vue" "^2.0.6"
     axios "^0.21.1"
     axios "^0.21.1"
     countup.js "^1.9.3"
     countup.js "^1.9.3"
     dayjs "^1.10.4"
     dayjs "^1.10.4"
-    element-plus "^2.2.11"
+    element-plus "^2.2.17"
     vue "^3.2.37"
     vue "^3.2.37"
 
 
 "@tootallnate/once@2":
 "@tootallnate/once@2":
@@ -326,6 +338,11 @@
   resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz#94e175b53623384bff1f354cdb3197a8d63cdbe5"
   resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz#94e175b53623384bff1f354cdb3197a8d63cdbe5"
   integrity sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A==
   integrity sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A==
 
 
+"@types/web-bluetooth@^0.0.16":
+  version "0.0.16"
+  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz#1d12873a8e49567371f2a75fe3e7f7edca6662d8"
+  integrity sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==
+
 "@vitejs/plugin-vue@^3.0.0":
 "@vitejs/plugin-vue@^3.0.0":
   version "3.0.0"
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.0.0.tgz#7081e2b3fbe04e291bb85107b9fb57a1fa5e6aeb"
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-3.0.0.tgz#7081e2b3fbe04e291bb85107b9fb57a1fa5e6aeb"
@@ -436,11 +453,26 @@
     "@vueuse/shared" "8.9.4"
     "@vueuse/shared" "8.9.4"
     vue-demi "*"
     vue-demi "*"
 
 
+"@vueuse/core@^9.1.0":
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-9.5.0.tgz#6726e952e8f92b465457d3bc95deb385aacd9a41"
+  integrity sha512-6GsWBsJHEb3sYw15mbLrcbslAVY45pkzjJYTKYKCXv88z7srAF0VEW0q+oXKsl58tCbqooplInahXFg8Yo1m4w==
+  dependencies:
+    "@types/web-bluetooth" "^0.0.16"
+    "@vueuse/metadata" "9.5.0"
+    "@vueuse/shared" "9.5.0"
+    vue-demi "*"
+
 "@vueuse/metadata@8.9.4":
 "@vueuse/metadata@8.9.4":
   version "8.9.4"
   version "8.9.4"
   resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-8.9.4.tgz#a4132db33e4c1b1023636acfa20aa7b37ab3d978"
   resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-8.9.4.tgz#a4132db33e4c1b1023636acfa20aa7b37ab3d978"
   integrity sha512-IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw==
   integrity sha512-IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw==
 
 
+"@vueuse/metadata@9.5.0":
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-9.5.0.tgz#b01c84230261ddee4d439ae5d9c21343dc5ae565"
+  integrity sha512-4M1AyPZmIv41pym+K5+4wup3bKuYebbH8w8BROY1hmT7rIwcyS4tEL+UsGz0Hiu1FCOxcoBrwtAizc0YmBJjyQ==
+
 "@vueuse/shared@8.9.4":
 "@vueuse/shared@8.9.4":
   version "8.9.4"
   version "8.9.4"
   resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-8.9.4.tgz#c9741c30ffb666b50d62f0dd80b76119fd47573e"
   resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-8.9.4.tgz#c9741c30ffb666b50d62f0dd80b76119fd47573e"
@@ -448,6 +480,13 @@
   dependencies:
   dependencies:
     vue-demi "*"
     vue-demi "*"
 
 
+"@vueuse/shared@9.5.0":
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-9.5.0.tgz#f5306548af0dc9f2b3a0d4da74e62bfdd6211241"
+  integrity sha512-HnnCWU1Vg9CVWRCcI8ohDKDRB2Sc4bTgT1XAIaoLSfVHHn+TKbrox6pd3klCSw4UDxkhDfOk8cAdcK+Z5KleCA==
+  dependencies:
+    vue-demi "*"
+
 "@windicss/config@1.8.7":
 "@windicss/config@1.8.7":
   version "1.8.7"
   version "1.8.7"
   resolved "https://registry.yarnpkg.com/@windicss/config/-/config-1.8.7.tgz#650bec3c6e3293306e4fe0c478253bd0085884aa"
   resolved "https://registry.yarnpkg.com/@windicss/config/-/config-1.8.7.tgz#650bec3c6e3293306e4fe0c478253bd0085884aa"
@@ -987,18 +1026,18 @@ doctrine@^3.0.0:
   dependencies:
   dependencies:
     esutils "^2.0.2"
     esutils "^2.0.2"
 
 
-element-plus@^2.2.11:
-  version "2.2.13"
-  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.2.13.tgz#9ec3a9fa6587c93a87bb0d30c200ac8ee4f69c8b"
-  integrity sha512-dKQ7BPZC8deUPhv+6s4GgOL0GyGj3KpUarywxm6s1nWnHjH6FqeZlUcxPqBvJd7W/d81POayx3B13GP+rfkG9g==
+element-plus@^2.2.17:
+  version "2.2.21"
+  resolved "https://registry.yarnpkg.com/element-plus/-/element-plus-2.2.21.tgz#ba3902b5e29fcb83b7407a0b7408372a1eed595e"
+  integrity sha512-wZUePoXZ1zuCkzENK/8mn+mekuLJ9OoGYiudjUujzCf+T8HfOQl+TKQStwOkGBNk93fK8e9YdFIty4jH4AX6dg==
   dependencies:
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.0.6"
     "@element-plus/icons-vue" "^2.0.6"
-    "@floating-ui/dom" "^0.5.4"
+    "@floating-ui/dom" "^1.0.1"
     "@popperjs/core" "npm:@sxzz/popperjs-es@^2.11.7"
     "@popperjs/core" "npm:@sxzz/popperjs-es@^2.11.7"
     "@types/lodash" "^4.14.182"
     "@types/lodash" "^4.14.182"
     "@types/lodash-es" "^4.17.6"
     "@types/lodash-es" "^4.17.6"
-    "@vueuse/core" "^8.7.5"
+    "@vueuse/core" "^9.1.0"
     async-validator "^4.2.5"
     async-validator "^4.2.5"
     dayjs "^1.11.3"
     dayjs "^1.11.3"
     escape-html "^1.0.3"
     escape-html "^1.0.3"