mooho-base-admin-plus 2.4.6 → 2.4.8

package/history.md

@@ -38,3 +38,5 @@
 2.4.4 - 附件下载 div 改为 span，解决点击空白处也会下载的问题
 2.4.5 - 修复表格中显示图片报错的 bug
 2.4.6 - 表格允许查看、允许编辑、允许删除属性增加函数类型
+2.4.7 - 计算列触发条件优化
+2.4.8 - 批量选择时无法触发选择

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);
+            });
           }
         }
       }
@@ -42774,7 +42780,9 @@ const _sfc_main$q = {
           };
           this.itemSelectActive = true;
           setTimeout(() => {
-            this.$refs.itemSelect.init(this.tableView.batchSelectDataModel + "Source", this.tableView.batchSelectDataModel + "Target");
+            this.$refs.itemSelect.init(this.tableView.batchSelectDataModel + "Source", this.tableView.batchSelectDataModel + "Target", () => {
+              this.$refs.itemSelect.loadSource();
+            });
           });
         } else if (this.embedded && this.tableView.createEnable && this.createEnable && !this.readonly) {
           column.renderHeader = (h4) => {