@newview/ui 1.1.99 → 1.2.0

package/README.md

@@ -1,6 +1,11 @@
+### 1.2.0
+1、表格组件工具栏、工具栏组件增加按钮权限控制
+
 ### 1.1.98
 1、表头筛选daterange增加默认传值功能
 
+### 1.1.97
+1、搜索日期时间选择组件赋值修改
 
 ### 1.1.96
 1、表单及表格日期时间选择组件赋值修改

package/dist/newview-ui.js

@@ -32470,7 +32470,7 @@ let ToolbarInstance$1 = class ToolbarInstance2 extends BaseInstance {
           this.setShowOptions();
         }
       }
-      return isShow;
+      return isShow && this.otherCommon.btnIsShowForOp(item2.name);
     });
     /**
      * 获取Icon
@@ -32739,13 +32739,23 @@ let GridColumnInstance$1 = class GridColumnInstance2 extends BaseInstance {
       return !this.utilities.isNull(column.rowButtons) && column.rowButtons.length > 0;
     });
     __publicField2(this, "getIsShowRowButton", (btn, row) => {
+      let isshow = true;
       if (this.utilities.isNull(btn.isShow)) {
-        return true;
+        isshow = true;
+      } else {
+        if (typeof btn.isShow == "boolean") {
+          isshow = btn.isShow;
+        } else {
+          isshow = btn.isShow(row);
+        }
       }
-      if (typeof btn.isShow == "boolean") {
-        return btn.isShow;
+      let code = btn.name;
+      if (btn.text == "编辑") {
+        code = "edit";
+      } else if (btn.text == "删除" || btn.text == "移除" || btn.text == "清除") {
+        code = "delete";
       }
-      return btn.isShow(row);
+      return isshow && this.otherCommon.btnIsShowForOp(code);
     });
     /**
      * 获取行按钮
@@ -57993,7 +58003,7 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
     super();
     __publicField2(this, "props");
     __publicField2(this, "ctx");
-    // API实例化 
+    // API实例化
     // 全局属性
     __publicField2(this, "xTable", ref());
     //#region 查询面板
@@ -58839,6 +58849,7 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
         return;
       }
       for (const item2 of toolbars) {
+        item2.isShow = this.getIsShowButton(item2) && this.otherCommon.btnIsShowForOp(item2.name);
         switch (item2.name) {
           case "add":
             if (this.utilities.isNull(item2.onclick)) {
@@ -58886,6 +58897,7 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
             }
             break;
           case "exportexcel":
+            item2.isShow = this.getIsShowButton(item2) && this.otherCommon.btnIsShowForOp("export");
             if (this.utilities.isNull(item2.onclick)) {
               item2.onclick = () => {
                 this.doExportExcel();
@@ -58904,6 +58916,19 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
         }
       }
     });
+    __publicField2(this, "getIsShowButton", (btn) => {
+      let isshow = true;
+      if (this.utilities.isNull(btn.isShow)) {
+        isshow = true;
+      } else {
+        if (typeof btn.isShow == "boolean") {
+          isshow = btn.isShow;
+        } else {
+          isshow = btn.isShow();
+        }
+      }
+      return isshow;
+    });
     /**
      * 获取添加的数据
      * @param row 
@@ -240577,7 +240602,7 @@ class GridInstance extends BaseInstance {
     super();
     __publicField2(this, "props");
     __publicField2(this, "ctx");
-    // API实例化 
+    // API实例化
     // 全局属性
     __publicField2(this, "xTable", ref());
     //#region 查询面板
@@ -241423,6 +241448,7 @@ class GridInstance extends BaseInstance {
         return;
       }
       for (const item2 of toolbars) {
+        item2.isShow = this.getIsShowButton(item2) && this.otherCommon.btnIsShowForOp(item2.name);
         switch (item2.name) {
           case "add":
             if (this.utilities.isNull(item2.onclick)) {
@@ -241470,6 +241496,7 @@ class GridInstance extends BaseInstance {
             }
             break;
           case "exportexcel":
+            item2.isShow = this.getIsShowButton(item2) && this.otherCommon.btnIsShowForOp("export");
             if (this.utilities.isNull(item2.onclick)) {
               item2.onclick = () => {
                 this.doExportExcel();
@@ -241488,6 +241515,19 @@ class GridInstance extends BaseInstance {
         }
       }
     });
+    __publicField2(this, "getIsShowButton", (btn) => {
+      let isshow = true;
+      if (this.utilities.isNull(btn.isShow)) {
+        isshow = true;
+      } else {
+        if (typeof btn.isShow == "boolean") {
+          isshow = btn.isShow;
+        } else {
+          isshow = btn.isShow();
+        }
+      }
+      return isshow;
+    });
     /**
      * 获取添加的数据
      * @param row 
@@ -243908,7 +243948,7 @@ class ToolbarInstance extends BaseInstance {
           this.setShowOptions();
         }
       }
-      return isShow;
+      return isShow && this.otherCommon.btnIsShowForOp(item2.name);
     });
     /**
      * 获取Icon