@lambo-design/schema-paging-table 1.0.0-beta.55 → 1.0.0-beta.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/schema-paging-table",
-  "version": "1.0.0-beta.55",
+  "version": "1.0.0-beta.57",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,9 +12,9 @@
   "devDependencies": {
     "standard-version": "^9.5.0",
     "@lambo-design/core": "^4.7.1-beta.156",
-    "@lambo-design/shared": "^1.0.0-beta.246",
-    "@lambo-design/paging-table": "^1.0.0-beta.90",
-    "@lambo-design/schema-form": "^1.0.0-beta.77"
+    "@lambo-design/schema-form": "^1.0.0-beta.77",
+    "@lambo-design/shared": "^1.0.0-beta.248",
+    "@lambo-design/paging-table": "^1.0.0-beta.90"
   },
   "scripts": {
     "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/index.vue

@@ -51,9 +51,11 @@
             :icon="item.icon"
             v-permission="item.permission"
             :key="index"
-            @click="doClick(item)"
+            :loading="loading[index]"
+            @click="doClick(item, index)"
             :class="buttonShowClass">
-            {{ item.name }}
+              <span v-if="!loading[index]">{{ item.name }}</span>
+              <span v-else>{{ loadingMsg[index] }}</span>
           </Button>
         </Row>
       </Col>
@@ -90,7 +92,9 @@ export default {
       selectRows: [],
       selectedKeys: [],
       radioSelectIndex: -1,
-      selectCondition:''
+      selectCondition:'',
+      loading: {},
+      loadingMsg: {}
     }
   },
   props:{
@@ -338,7 +342,8 @@ export default {
         this.tableSearchParams = val
         this.queryForm = val
       },
-      deep: true
+      deep: true,
+      immediate: true
     },
     selectedKey: {
       handler: function () {
@@ -390,7 +395,7 @@ export default {
     setCollapse: function() {
       this.collapsed = !this.collapsed
     },
-    doClick(item){
+    doClick(item, index){
       let self = this;
       if (item.clickEvent?.type === "route") {
         const routeInfo = item.clickEvent.route;
@@ -449,6 +454,51 @@ export default {
             self.$emit(item.clickEvent?.method?.name, param)
           }
         }
+      } else if (item.clickEvent?.type === "request") {
+        const requestInfo = item.clickEvent.request;
+        const keysExist = requestInfo.keys && requestInfo.keys.length !== 0;
+        let selection = self.getSelection()
+        if (keysExist && selection.length === 0) {
+          self.$Message.info('请选择一条记录！')
+          return
+        }
+        const response = item.clickEvent.response
+        let data;
+        if (self.multiSelect) {
+          data = selection.map((select, index) => {
+            if (item.clickEvent?.request?.keys) {
+              let obj = item.clickEvent?.request?.keys?.reduce((acc, sourceItem) => {
+                return Object.assign(acc, {[sourceItem]: select[sourceItem]})
+              }, {})
+              return obj
+            } else {
+              return item
+            }
+          })
+        } else {
+          if (item.clickEvent?.request?.keys) {
+            data = item.clickEvent?.request?.keys?.reduce((acc, sourceItem) => {
+              return Object.assign(acc, {[sourceItem]: selection[0][sourceItem]})
+            }, {})
+          }
+        }
+        const request = {
+          url: item.clickEvent.request.url,
+          method: item.clickEvent.request.method,
+          param: data,
+        }
+        if (item.clickEvent.tips.title) {
+          let tips = item.clickEvent.tips
+          this.$Modal.confirm({
+            title: tips.title,
+            content: '<p>' + tips.content + '</p>',
+            onOk: () => {
+              self.fetch(request, response, index)
+            }
+          });
+        } else {
+          self.fetch(request, response, index)
+        }
       }
     },
     doSearch: function () {
@@ -466,23 +516,36 @@ export default {
       this.queryForm = this.$options.propsData.form;
       this.doSearch()
     },
-    fetch: function (request,response) {
+    fetch: function (request,response,index) {
       let self = this
       let options = {
         url: request.url,
         method: request.method,
         [request.method==='GET'?"params":"data"]:request.param
       }
+      if (index) {
+        self.$set(self.loading, index, true)
+        self.$set(self.loadingMsg, index, response.loadingMsg || '执行中...')
+      }
       ajax.request(options).then(function (resp) {
         if (resp.data && resp.data.code === 1) {
           self.$Message.success(response.successMsg)
-          self.doSearch()
+          if (index) {
+            self.$set(self.loading, index, false)
+          }
+          self.$refs.schemaPagingTable.tableRefresh()
         } else {
           self.$Message.error(response.errorMsg)
+          if (index) {
+            self.$set(self.loading, index, false)
+          }
         }
       }).catch(function (err) {
         console.error(err)
         self.$Message.error(response.errorMsg)
+        if (index) {
+          self.$set(self.loading, index, false)
+        }
       })
     },
     /**