mooho-base-admin-plus 2.0.10 → 2.0.12

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

@@ -22034,6 +22034,11 @@ var mixinPage = {
       return triggers;
     },
     calculate(text, model) {
+      if (text == null) {
+        return null;
+      } else {
+        text = text.toString();
+      }
       let result = "";
       let expression = "";
       for (let i3 = 0; i3 < text.length; i3++) {
@@ -35861,7 +35866,6 @@ const _sfc_main$w = {
       }
     },
     onSelectDataChange(sender, selected) {
-      console.log("onSelectDataChange", sender, selected);
       let code2;
       if (sender.code.endsWith("ID")) {
         code2 = sender.code.substr(0, sender.code.length - 2);
@@ -35952,9 +35956,14 @@ const _sfc_main$w = {
       this.dataBefore = this.copy(this.data);
       for (let column of this.columns) {
         if (!!(column.calculate || "").trim()) {
-          let triggers = this.getTriggers(column.calculate);
-          if (!sender || triggers.some((item) => item == sender.code)) {
-            let result2 = this.calculate(column.calculate, this.data);
+          let calculate = column.calculate;
+          calculate = this.calcStat("sum", calculate);
+          calculate = this.calcStat("min", calculate);
+          calculate = this.calcStat("max", calculate);
+          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);
             }
@@ -36079,6 +36088,42 @@ const _sfc_main$w = {
         return value;
       }
     },
+    calcStat(op, calculate) {
+      let start2 = calculate.indexOf(op + "(");
+      let end2 = calculate.indexOf(")", start2);
+      if (start2 == -1 || end2 == -1) {
+        return calculate;
+      }
+      let property = calculate.substring(start2 + 4, end2);
+      if (property.indexOf(".") == -1) {
+        return calculate;
+      }
+      let table = this.$refs["table_" + property.split(".")[0]];
+      if (table == null || table.length == 0) {
+        return calculate;
+      }
+      let tableData = table[0].getData();
+      let result2 = null;
+      let sum2 = null;
+      let count2 = null;
+      for (let item of tableData) {
+        let value = this.parseData(item, property.substr(property.indexOf(".") + 1));
+        if (value) {
+          if (op == "sum") {
+            result2 = result2 == null ? value : result2 + value;
+          } else if (op == "min") {
+            result2 = result2 == null ? value : value < result2 ? value : result2;
+          } else if (op == "max") {
+            result2 = result2 == null ? value : value > result2 ? value : result2;
+          } else if (op == "avg") {
+            sum2 = sum2 == null ? value : sum2 + value;
+            count2 = count2 == null ? 1 : count2 + 1;
+            result2 = count2 > 0 ? sum2 / count2 : null;
+          }
+        }
+      }
+      return calculate.substring(0, start2) + (result2 == null ? "null" : result2.toString()) + calculate.substring(end2 + 1);
+    },
     getNameI18n(column) {
       if (this.layout.showI18n) {
         if (column.code) {
@@ -41438,8 +41483,8 @@ const _sfc_main$q = {
     },
     onDataChange(data2, sender, selected) {
       this.setShowStatus(data2);
-      this.$emit("on-change", data2, sender, selected);
       this.calc(data2, sender);
+      this.$emit("on-change", data2, sender, selected);
       if (sender == null || sender.triggers !== []) {
         this.columns.forEach(function(column) {
           if (!column.isStaticItem && !!(column.source || "").trim() && (sender == null || sender.triggers.some((item) => {