@lambo-design/schema-paging-table 1.0.0-beta.65 → 1.0.0-beta.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/schema-paging-table",
-  "version": "1.0.0-beta.65",
+  "version": "1.0.0-beta.67",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -11,10 +11,10 @@
   },
   "devDependencies": {
     "standard-version": "^9.5.0",
-    "@lambo-design/shared": "^1.0.0-beta.259",
-    "@lambo-design/core": "^4.7.1-beta.159",
-    "@lambo-design/schema-form": "^1.0.0-beta.85",
-    "@lambo-design/paging-table": "^1.0.0-beta.93"
+    "@lambo-design/core": "^4.7.1-beta.160",
+    "@lambo-design/shared": "^1.0.0-beta.260",
+    "@lambo-design/paging-table": "^1.0.0-beta.93",
+    "@lambo-design/schema-form": "^1.0.0-beta.87"
   },
   "scripts": {
     "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/index.vue

@@ -251,19 +251,19 @@ export default {
               const conditionMet = item && typeof item.condition === "function" ? item.condition(param) : true;
               const execConditionMet = item && typeof item.execCondition === "function" ? item.execCondition(param) : true;
               if(conditionMet){
-                let doms
+                let dom
                 if (!execConditionMet) {
-                  doms = item.name ? item.name : param.row[obj.key]
+                  dom = item.name ? item.name : param.row[obj.key]
                 } else {
-                  doms = operateHref(self, h, param.row, item.name || param.row[obj.key], (vm, currentRow) => {
+                  dom = operateHref(self, h, param.row, item.name || param.row[obj.key], (vm, currentRow) => {
                     self.handleClickEvent(item, currentRow)
                   }, '', item.permission)
                 }
                 let directives = item.permission ? [{ name: "permission", value: item.permission }] : null;
                 // 权限原因 导致按钮不可见 会影响更多按钮数量
                 if (visibleDomsd.length <= self.operColumnDropdownNum) {
-                  visibleDomsd.push(doms);
-                  if (visibleDomsd.length === self.operColumnDropdownNum + 1) {
+                  visibleDomsd.push(dom);
+                  if (visibleDomsd.length >= self.operColumnDropdownNum) {
                     dropdownDomsd.push(h('DropdownItem', {
                       nativeOn: {
                         'click': () => {
@@ -271,8 +271,7 @@ export default {
                         }
                       },
                       directives
-                    }, [doms]))
-                    visibleDomsd.splice(self.operColumnDropdownNum, 1)
+                    }, [dom]))
                   }
                 } else {
                   dropdownDomsd.push(h('DropdownItem', {
@@ -282,13 +281,16 @@ export default {
                       }
                     },
                     directives
-                  }, [doms]))
+                  }, [dom]))
                 }
               }
             })
+            if (visibleDomsd.length > self.operColumnDropdownNum) {
+              visibleDomsd.splice(self.operColumnDropdownNum - 1, 2)
+            }
             return h('div', {}, [
               ...visibleDomsd,
-              dropdownDomsd.length !== 0 ? operateMore(self,h,dropdownDomsd) : null
+              dropdownDomsd.length > 1 ? operateMore(self,h,dropdownDomsd) : null
             ]);
           }
         } else if (obj.hasOwnProperty('type') && (obj.type === 'selection'||obj.type === 'single-selection')) {
@@ -395,7 +397,7 @@ export default {
           self.fetch(request, response)
         }
       } else if (item.clickEvent?.type === "method") {
-        if(!item.clickEvent?.method?.keys) {
+        if(!item.clickEvent?.method?.keys || item.clickEvent.method.keys.length === 0) {
           self.$emit(item.clickEvent?.method?.name, currentRow._index,currentRow);
           return ;
         }
@@ -454,8 +456,8 @@ export default {
           self.$router.push({ path: routeInfo.path, query })
         } else {
           const query = keysExist
-            ? routeInfo.keys.reduce((acc, key) => ({ ...acc, [key]: selection[0][key] }), {})
-            : null;
+              ? routeInfo.keys.reduce((acc, key) => ({ ...acc, [key]: selection[0][key] }), {})
+              : null;
           self.$router.push({ path: routeInfo.path, query })
         }
       } else if (item.clickEvent?.type === "method") {