@lambo-design/schema-paging-table 1.0.0-beta.60 → 1.0.0-beta.61

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/schema-paging-table",
-  "version": "1.0.0-beta.60",
+  "version": "1.0.0-beta.61",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -11,10 +11,10 @@
   },
   "devDependencies": {
     "standard-version": "^9.5.0",
-    "@lambo-design/core": "^4.7.1-beta.158",
-    "@lambo-design/shared": "^1.0.0-beta.252",
-    "@lambo-design/paging-table": "^1.0.0-beta.91",
-    "@lambo-design/schema-form": "^1.0.0-beta.84"
+    "@lambo-design/core": "^4.7.1-beta.159",
+    "@lambo-design/shared": "^1.0.0-beta.255",
+    "@lambo-design/schema-form": "^1.0.0-beta.84",
+    "@lambo-design/paging-table": "^1.0.0-beta.92"
   },
   "scripts": {
     "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/index.vue

@@ -240,65 +240,35 @@ export default {
                   doms = item.name ? item.name : param.row[obj.key]
                 } else {
                   doms = operateHref(self, h, param.row, item.name || param.row[obj.key], (vm, currentRow) => {
-                    if (item.clickEvent?.type === "route") {
-                      // self.$Message.info(item.clickEvent.name)
-                      let query = item.clickEvent?.route?.keys?.reduce((acc, sourceItem) => {
-                        return Object.assign(acc, {[sourceItem]: currentRow[sourceItem]})
-                      }, {})
-                      self.$router.push({
-                        path: item.clickEvent?.route?.path,
-                        query
-                      })
-                    } else if (item.clickEvent?.type === "request") {
-                      // self.$Message.info(item.clickEvent.name)
-                      let data = item.clickEvent?.request?.keys?.reduce((acc, sourceItem) => {
-                        return Object.assign(acc, {[sourceItem]: currentRow[sourceItem]})
-                      }, {})
-                      let request = {
-                        url: item.clickEvent.request.url,
-                        method: item.clickEvent.request.method,
-                        param: data || currentRow,
-                      }
-                      let response = item.clickEvent.response
-                      if (item.clickEvent.tips) {
-                        let tips = item.clickEvent.tips
-                        this.$Modal.confirm({
-                          title: tips.title,
-                          content: '<p>' + tips.content + '</p>',
-                          onOk: () => {
-                            self.fetch(request, response)
-                          }
-                        });
-                      } else {
-                        self.fetch(request, response)
-                      }
-                    } else if (item.clickEvent?.type === "method") {
-                      if(!item.clickEvent?.method?.keys) {
-                        self.$emit(item.clickEvent?.method?.name, param.index,currentRow);
-                        return ;
-                      }
-                      let args = item.clickEvent?.method?.keys?.reduce((total, current) => {
-                        return Object.assign(total, {[current]: currentRow[current]})
-                      }, {})
-                      self.$emit(item.clickEvent?.method?.name, args)
-                    } else if (item.clickEvent?.type === "modal") {
-                      self.$Message.info(item.clickEvent.name)
-                    }
+                    self.handleClickEvent(item, currentRow)
                   }, '', item.permission)
                 }
+                let directives = item.permission ? [{ name: "permission", value: item.permission }] : null;
                 if (visibleDomsd.length < self.operColumnDropdownNum) {
                   visibleDomsd.push(doms);
-                } else if (visibleDomsd.length === self.operColumnDropdownNum && dropdownDomsd.length === 0){
-                  dropdownDomsd.push(h('DropdownItem', {}, [visibleDomsd[self.operColumnDropdownNum - 1]]))
-                  dropdownDomsd.push(h('DropdownItem', {}, [doms]))
+                  if (visibleDomsd.length === self.operColumnDropdownNum) {
+                    dropdownDomsd.push(h('DropdownItem', {
+                      nativeOn: {
+                        'click': () => {
+                          self.handleClickEvent(item, param.row)
+                        }
+                      },
+                      directives
+                    }, [doms]))
+                    visibleDomsd.splice(self.operColumnDropdownNum - 1, 1)
+                  }
                 } else {
-                  dropdownDomsd.push(h('DropdownItem', {}, [doms]))
+                  dropdownDomsd.push(h('DropdownItem', {
+                    nativeOn: {
+                      'click': () => {
+                        self.handleClickEvent(item, param.row)
+                      }
+                    },
+                    directives
+                  }, [doms]))
                 }
               }
             })
-            if (dropdownDomsd.length !== 0) {
-              visibleDomsd.splice(self.operColumnDropdownNum - 1, 1)
-            }
             return h('div', {}, [
               ...visibleDomsd,
               dropdownDomsd.length !== 0 ? operateMore(self,h,dropdownDomsd) : null
@@ -373,6 +343,53 @@ export default {
     window.removeEventListener('resize', this.calculateButtonsInFirstRow);
   },
   methods: {
+    handleClickEvent(item, currentRow) {
+      let self = this
+      if (item.clickEvent?.type === "route") {
+        // self.$Message.info(item.clickEvent.name)
+        let query = item.clickEvent?.route?.keys?.reduce((acc, sourceItem) => {
+          return Object.assign(acc, {[sourceItem]: currentRow[sourceItem]})
+        }, {})
+        self.$router.push({
+          path: item.clickEvent?.route?.path,
+          query
+        })
+      } else if (item.clickEvent?.type === "request") {
+        // self.$Message.info(item.clickEvent.name)
+        let data = item.clickEvent?.request?.keys?.reduce((acc, sourceItem) => {
+          return Object.assign(acc, {[sourceItem]: currentRow[sourceItem]})
+        }, {})
+        let request = {
+          url: item.clickEvent.request.url,
+          method: item.clickEvent.request.method,
+          param: data || currentRow,
+        }
+        let response = item.clickEvent.response
+        if (item.clickEvent.tips) {
+          let tips = item.clickEvent.tips
+          this.$Modal.confirm({
+            title: tips.title,
+            content: '<p>' + tips.content + '</p>',
+            onOk: () => {
+              self.fetch(request, response)
+            }
+          });
+        } else {
+          self.fetch(request, response)
+        }
+      } else if (item.clickEvent?.type === "method") {
+        if(!item.clickEvent?.method?.keys) {
+          self.$emit(item.clickEvent?.method?.name, param.index,currentRow);
+          return ;
+        }
+        let args = item.clickEvent?.method?.keys?.reduce((total, current) => {
+          return Object.assign(total, {[current]: currentRow[current]})
+        }, {})
+        self.$emit(item.clickEvent?.method?.name, args)
+      } else if (item.clickEvent?.type === "modal") {
+        self.$Message.info(item.clickEvent.name)
+      }
+    },
     //计算第一行有多少个button，根据父div宽度和每个button的宽度计算
     calculateButtonsInFirstRow() {
       let container = this.$refs.container