@newview/ui 1.1.98 → 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);
     });
     /**
      * 获取行按钮
@@ -33002,7 +33012,6 @@ let GridColumnInstance$1 = class GridColumnInstance2 extends BaseInstance {
     //#endregion 事件 END
     //#region 表头筛选
     __publicField2(this, "getColumFilters", (filter3) => {
-      debugger;
       if (filter3) {
         if (filter3.type == "select") {
           return filter3.options.map((e) => {
@@ -33010,8 +33019,8 @@ let GridColumnInstance$1 = class GridColumnInstance2 extends BaseInstance {
             return e;
           });
         } else if (filter3.type == "daterange") {
-          if ((filter3 == null ? void 0 : filter3.data) && (filter3 == null ? void 0 : filter3.data.length) >= 2) {
-            return [{ data: filter3.data }];
+          if ((filter3 == null ? void 0 : filter3.defaultFilteringTimeRange) && (filter3 == null ? void 0 : filter3.defaultFilteringTimeRange.length) >= 2) {
+            return [{ data: filter3.defaultFilteringTimeRange }];
           } else {
             return [{ data: ["", ""] }];
           }
@@ -57994,7 +58003,7 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
     super();
     __publicField2(this, "props");
     __publicField2(this, "ctx");
-    // API实例化 
+    // API实例化
     // 全局属性
     __publicField2(this, "xTable", ref());
     //#region 查询面板
@@ -58840,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)) {
@@ -58887,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();
@@ -58905,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 
@@ -59455,8 +59479,8 @@ let GridInstance$1 = class GridInstance2 extends BaseInstance {
   }
   //#endregion 公开方法 END
 };
-const Grid_vue_vue_type_style_index_0_scoped_2a3c4718_lang = "";
-const _withScopeId$3 = (n) => (pushScopeId("data-v-2a3c4718"), n = n(), popScopeId(), n);
+const Grid_vue_vue_type_style_index_0_scoped_1b3fc6d2_lang = "";
+const _withScopeId$3 = (n) => (pushScopeId("data-v-1b3fc6d2"), n = n(), popScopeId(), n);
 const _hoisted_1$e = { class: "nv-crud nv-pos-r" };
 const _hoisted_2$b = { class: "grid-msg" };
 const _hoisted_3$9 = { class: "nv-crud-body" };
@@ -59493,7 +59517,6 @@ function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_vxe_table = resolveComponent("vxe-table");
   const _component_Page = resolveComponent("Page");
   return openBlock(), createElementBlock("div", _hoisted_1$e, [
-    createTextVNode(" 123 "),
     createVNode(_component_Spin, {
       fix: "",
       show: _ctx.doMethodLoading.show,
@@ -59689,7 +59712,7 @@ function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
     ])) : createCommentVNode("", true)
   ]);
 }
-const Grid = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$j], ["__scopeId", "data-v-2a3c4718"]]);
+const Grid = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["render", _sfc_render$j], ["__scopeId", "data-v-1b3fc6d2"]]);
 const GridCellContent = defineComponent({
   name: "GridCellContent",
   props: {
@@ -240579,7 +240602,7 @@ class GridInstance extends BaseInstance {
     super();
     __publicField2(this, "props");
     __publicField2(this, "ctx");
-    // API实例化 
+    // API实例化
     // 全局属性
     __publicField2(this, "xTable", ref());
     //#region 查询面板
@@ -241425,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)) {
@@ -241472,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();
@@ -241490,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 
@@ -243910,7 +243948,7 @@ class ToolbarInstance extends BaseInstance {
           this.setShowOptions();
         }
       }
-      return isShow;
+      return isShow && this.otherCommon.btnIsShowForOp(item2.name);
     });
     /**
      * 获取Icon