mooho-base-admin-plus 2.5.31 → 2.5.33

package/history.md

@@ -125,3 +125,5 @@ mooho-base-admin-plus@2.5.28 - form增加tables属性
 mooho-base-admin-plus@2.5.29 - 修复升级后出现的警告
 mooho-base-admin-plus@2.5.30 - 修复表格勾选后修改数据勾选消失的bug
 mooho-base-admin-plus@2.5.31 - 修复选择框筛选布尔值的bug
+mooho-base-admin-plus@2.5.32 - 重新发布
+mooho-base-admin-plus@2.5.33 - 表单内嵌套表格change事件增加参数

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

@@ -38101,7 +38101,7 @@ const modalTable = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["render", _sfc_ren
               }) : r.dataType == "Decimal" || r.dataType == "Float" || r.dataType == "Double" ? r.dataSource.push({
                 id: parseFloat(o),
                 name: s
-              }) : r.dataType == "Boolean" ? r.dataSource.push({
+              }) : r.dataType == "Boolean" && (r.controlType == "Check" || r.controlType == "Switch") ? r.dataSource.push({
                 id: o.toUpperCase() == "TRUE",
                 name: s
               }) : r.dataSource.push({
@@ -39700,76 +39700,76 @@ const tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["render", _sfc_r
       this.onDataChange(r, s);
     },
     // 数据变化事件
-    async onDataChange(r, a) {
-      for (let o of this.columns) {
-        if ((o.showJson || "").trim()) {
-          let s = JSON.parse(o.showJson);
-          (s.type == "Condition" || s.type == "Expression") && (o.isShow = this.judgeCondition(s, this.data));
-        }
-        if ((o.readonlyJson || "").trim()) {
-          let s = JSON.parse(o.readonlyJson);
-          (s.type == "Condition" || s.type == "Expression") && (o.isReadonly = this.judgeCondition(s, this.data));
-        }
-        if ((o.requiredJson || "").trim()) {
-          let s = JSON.parse(o.requiredJson);
-          if (s.type == "Condition" || s.type == "Expression") {
-            let l = o.isRequired;
-            if (o.isRequired = this.judgeCondition(s, this.data), l != o.isRequired) {
-              let u = this.$refs.form.fields.find((c) => c.prop == o.code);
-              u != null && (u.isRequired = o.isRequired, o.isRequired || (u.validateState = "", u.validateMessage = ""));
+    async onDataChange(r, a, o, s, l) {
+      for (let u of this.columns) {
+        if ((u.showJson || "").trim()) {
+          let c = JSON.parse(u.showJson);
+          (c.type == "Condition" || c.type == "Expression") && (u.isShow = this.judgeCondition(c, this.data));
+        }
+        if ((u.readonlyJson || "").trim()) {
+          let c = JSON.parse(u.readonlyJson);
+          (c.type == "Condition" || c.type == "Expression") && (u.isReadonly = this.judgeCondition(c, this.data));
+        }
+        if ((u.requiredJson || "").trim()) {
+          let c = JSON.parse(u.requiredJson);
+          if (c.type == "Condition" || c.type == "Expression") {
+            let d = u.isRequired;
+            if (u.isRequired = this.judgeCondition(c, this.data), d != u.isRequired) {
+              let f = this.$refs.form.fields.find((p) => p.prop == u.code);
+              f != null && (f.isRequired = u.isRequired, u.isRequired || (f.validateState = "", f.validateMessage = ""));
             }
           }
         }
       }
       if (r != null && r.controlType == "Table")
-        this.$emit("on-change", r, null, null, this.$refs["table_" + r.code][0].data);
+        this.$emit("on-change", r, null, null, this.$refs["table_" + r.code][0].data, o, s, l);
       else if (r != null) {
-        let o = this.parseData(this.dataBefore, r.code), s = this.parseData(this.data, r.code);
-        o !== s && setTimeout(() => {
-          this.$emit("on-change", r, o, s, a);
+        let u = this.parseData(this.dataBefore, r.code), c = this.parseData(this.data, r.code);
+        u !== c && setTimeout(() => {
+          this.$emit("on-change", r, u, c, a);
         });
       } else
         this.$emit("on-change", r, null, null, a);
       this.dataBefore = this.copy(this.data);
-      for (let o of this.columns)
-        if ((o.calculate || "").trim()) {
-          let s = o.calculate;
-          s = this.calcStat("sum", s), s = this.calcStat("min", s), s = this.calcStat("max", s), s = this.calcStat("avg", s);
-          let l = this.getTriggers(s);
-          (!r || l.some((u) => u == r.code) || o.calculate != s) && setTimeout(() => {
-            let u = this.calculate(s, this.data);
-            o.digit != null && (u = this.keepDecimal(u, o.digit, o.fixedDigit)), this.setData(this.data, o.code, u);
+      for (let u of this.columns)
+        if ((u.calculate || "").trim()) {
+          let c = u.calculate;
+          c = this.calcStat("sum", c), c = this.calcStat("min", c), c = this.calcStat("max", c), c = this.calcStat("avg", c);
+          let d = this.getTriggers(c);
+          (!r || d.some((f) => f == r.code) || u.calculate != c) && setTimeout(() => {
+            let f = this.calculate(c, this.data);
+            u.digit != null && (f = this.keepDecimal(f, u.digit, u.fixedDigit)), this.setData(this.data, u.code, f);
           });
         }
-      for ((r == null || r.triggers && r.triggers !== []) && this.columns.forEach(function(o) {
-        !o.isStaticItem && (o.source || "").trim() && !(o.dataType && o.dataType.startsWith("Enum:")) && (r == null || r.triggers.some((s) => s.code == o.code)) && (o.needRefresh = !0);
+      for ((r == null || r.triggers && r.triggers !== []) && this.columns.forEach(function(u) {
+        !u.isStaticItem && (u.source || "").trim() && !(u.dataType && u.dataType.startsWith("Enum:")) && (r == null || r.triggers.some((c) => c.code == u.code)) && (u.needRefresh = !0);
       }); ; ) {
-        let o = this.columns.filter((s) => s.needRefresh == !0 || s.needClear == !0)[0];
-        if (o == null)
+        let u = this.columns.filter((c) => c.needRefresh == !0 || c.needClear == !0)[0];
+        if (u == null)
           break;
-        if (o.needClear && this.parseData(this.data, o.code) != null)
-          this.setData(this.data, o.code, null), o.triggers.forEach((s) => {
-            s.needClear = !0;
+        if (u.needClear && this.parseData(this.data, u.code) != null)
+          this.setData(this.data, u.code, null), u.triggers.forEach((c) => {
+            c.needClear = !0;
           });
-        else if (o.needRefresh && (o.source || "").trim() && !(o.dataType && o.dataType.startsWith("Enum:"))) {
-          let s = this.getParam(this.data, o);
-          if (o.controlType === "Select" || o.controlType === "MultiSelect" || o.controlType === "TreeSelect" || o.controlType === "MultiTreeSelect" || o.controlType === "SelectWithOther" || o.controlType === "ComboSelect" || o.controlType === "MultiComboSelect" || o.controlType === "Radio" || o.controlType === "CheckGroup")
-            s != null ? this.fillDataSource(this.data, o, s) : (o.dataSource = [], this.setData(this.data, o.code, null), o.triggers.forEach((l) => {
-              l.needClear = !0;
+        else if (u.needRefresh && (u.source || "").trim() && !(u.dataType && u.dataType.startsWith("Enum:"))) {
+          let c = this.getParam(this.data, u);
+          if (u.controlType === "Select" || u.controlType === "MultiSelect" || u.controlType === "TreeSelect" || u.controlType === "MultiTreeSelect" || u.controlType === "SelectWithOther" || u.controlType === "ComboSelect" || u.controlType === "MultiComboSelect" || u.controlType === "Radio" || u.controlType === "CheckGroup")
+            c != null ? this.fillDataSource(this.data, u, c) : (u.dataSource = [], this.setData(this.data, u.code, null), u.triggers.forEach((d) => {
+              d.needClear = !0;
             }));
-          else if (r && (o.controlType === "DialogSelect" || o.controlType === "MultiDialogSelect"))
-            this.setData(this.data, o.code, null), o.triggers.forEach((l) => {
-              l.needClear = !0;
+          else if (r && (u.controlType === "DialogSelect" || u.controlType === "MultiDialogSelect"))
+            this.setData(this.data, u.code, null), u.triggers.forEach((d) => {
+              d.needClear = !0;
             });
-          else if (o.controlType === "List" && s != null) {
-            let l, u = this.$refs["list_" + o.code][0].tableView, c = u.filtering;
-            (c || "").trim() && (s = {
-              ...s,
-              ...JSON.parse(c)
-            }), o.isSourceCustom ? l = await customModelApi.query(o.sourceModel, s) : l = await modelApi.query(o.sourceModel, s, u.functionName, u.functionType), this.$refs["list_" + o.code][0].loadData(l.data);
+          else if (u.controlType === "List" && c != null) {
+            let d, f = this.$refs["list_" + u.code][0].tableView, p = f.filtering;
+            (p || "").trim() && (c = {
+              ...c,
+              ...JSON.parse(p)
+            }), u.isSourceCustom ? d = await customModelApi.query(u.sourceModel, c) : d = await modelApi.query(u.sourceModel, c, f.functionName, f.functionType), this.$refs["list_" + u.code][0].loadData(d.data);
           }
         }
-        o.needClear = !1, o.needRefresh = !1;
+        u.needClear = !1, u.needRefresh = !1;
       }
     },
     // 输入框失去焦点事件
@@ -39928,7 +39928,7 @@ function _sfc_render$o(r, a, o, s, l, u) {
                       readonly: o.readonly || L.isReadonly,
                       embedded: !0,
                       "parent-data": l.data,
-                      onOnChange: (H) => u.onDataChange(L)
+                      onOnChange: (H, Z, ae) => u.onDataChange(L, null, H, Z, ae)
                     }, {
                       column: withCtx((H) => [
                         renderSlot(r.$slots, "tableColumn", {