mooho-base-admin-plus 2.4.5 → 2.4.7

package/history.md

@@ -37,3 +37,5 @@
 2.4.3 - 附件下载改为弹出新页，为了兼容 某些文件下载时直接打开，无法回退。如 pdf
 2.4.4 - 附件下载 div 改为 span，解决点击空白处也会下载的问题
 2.4.5 - 修复表格中显示图片报错的 bug
+2.4.6 - 表格允许查看、允许编辑、允许删除属性增加函数类型
+2.4.7 - 计算列触发条件优化

package/package/mooho-base-admin-plus.min.esm.js

@@ -23115,7 +23115,11 @@ var mixinPage = {
         }
       }
       if (!!(expression2 || "").trim()) {
-        triggers.push(expression2);
+        if (expression2.indexOf(".") >= 0) {
+          triggers.push(expression2.split(".")[0] + "ID");
+        } else {
+          triggers.push(expression2);
+        }
       }
       return triggers;
     },
@@ -37386,11 +37390,13 @@ const _sfc_main$w = {
           calculate = this.calcStat("avg", calculate);
           let triggers = this.getTriggers(calculate);
           if (!sender || triggers.some((item) => item == sender.code) || column.calculate != calculate) {
-            let result2 = this.calculate(calculate, this.data);
-            if (column.digit != null) {
-              result2 = this.keepDecimal(result2, column.digit, column.fixedDigit);
-            }
-            this.setData(this.data, column.code, result2);
+            setTimeout(() => {
+              let result2 = this.calculate(calculate, this.data);
+              if (column.digit != null) {
+                result2 = this.keepDecimal(result2, column.digit, column.fixedDigit);
+              }
+              this.setData(this.data, column.code, result2);
+            });
           }
         }
       }
@@ -42631,15 +42637,15 @@ const _sfc_main$q = {
       default: true
     },
     editEnable: {
-      type: Boolean,
+      type: [Boolean, Function],
       default: true
     },
     showEnable: {
-      type: Boolean,
+      type: [Boolean, Function],
       default: true
     },
     removeEnable: {
-      type: Boolean,
+      type: [Boolean, Function],
       default: true
     },
     draggable: {
@@ -44623,7 +44629,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
               row: $options.rowData(row, index2),
               index: index2
             }, void 0, true),
-            $options.judge($data.tableView.editEnable, $data.tableView.editEnableJson, $options.rowData(row, index2)) && $props.editEnable && !$props.readonly ? (openBlock(), createBlock(_component_Button, {
+            $options.judge($data.tableView.editEnable, $data.tableView.editEnableJson, $options.rowData(row, index2)) && (typeof $props.editEnable === "function" ? $props.editEnable(row) : $props.editEnable) && !$props.readonly ? (openBlock(), createBlock(_component_Button, {
               key: 0,
               size: "small",
               title: _ctx.$t("Front_Btn_Edit"),
@@ -44631,7 +44637,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
               "custom-icon": "fa fa-edit",
               onClick: ($event) => $options.edit($options.rowData(row, index2), index2)
             }, null, 8, ["title", "onClick"])) : createCommentVNode("v-if", true),
-            $options.judge($data.tableView.showEnable, $data.tableView.showEnableJson, $options.rowData(row, index2)) && $props.showEnable ? (openBlock(), createBlock(_component_Button, {
+            $options.judge($data.tableView.showEnable, $data.tableView.showEnableJson, $options.rowData(row, index2)) && (typeof $props.showEnable === "function" ? $props.showEnable(row) : $props.showEnable) ? (openBlock(), createBlock(_component_Button, {
               key: 1,
               size: "small",
               title: _ctx.$t("Front_Btn_Detail"),
@@ -44639,7 +44645,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
               "custom-icon": "fa fa-file-alt",
               onClick: ($event) => $options.show($options.rowData(row, index2), index2)
             }, null, 8, ["title", "onClick"])) : createCommentVNode("v-if", true),
-            $options.judge($data.tableView.removeEnable, $data.tableView.removeEnableJson, $options.rowData(row, index2)) && $props.removeEnable && !$props.readonly ? (openBlock(), createBlock(_component_Button, {
+            $options.judge($data.tableView.removeEnable, $data.tableView.removeEnableJson, $options.rowData(row, index2)) && (typeof $props.removeEnable === "function" ? $props.removeEnable(row) : $props.removeEnable) && !$props.readonly ? (openBlock(), createBlock(_component_Button, {
               key: 2,
               size: "small",
               title: _ctx.$t("Front_Btn_Remove"),