mooho-base-admin-plus 2.10.46 → 2.10.48

package/history.md

@@ -217,3 +217,5 @@ mooho-base-admin-plus@2.10.43 - 修复上一版本的bug
 mooho-base-admin-plus@2.10.44 - 修复上一版本的bug
 mooho-base-admin-plus@2.10.45 - 修复上一版本的bug
 mooho-base-admin-plus@2.10.46 - 修复上一版本的bug
+mooho-base-admin-plus@2.10.47 - Excel表格验证等
+mooho-base-admin-plus@2.10.48 - int类型可以显示千分位

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

@@ -7590,7 +7590,9 @@ const showFormat = {}, mixinPage = {
       }
       if (s === "DateTime")
         return (l || "").trim() ? format$6(new Date(d), l) : format$6(new Date(d), "yyyy-MM-dd");
-      if (s === "Integer")
+      if (s === "Integer") {
+        if (l === "Thousand")
+          return this.formatThousand(d);
         if ((l || "").trim()) {
           let f = null;
           try {
@@ -7601,7 +7603,7 @@ const showFormat = {}, mixinPage = {
           return f;
         } else
           return d;
-      else {
+      } else {
         if (s === "Decimal" || s === "Float" || s === "Double")
           return d = parseFloat(d), l === "Money" ? this.formatThousand(d.toFixed(2)) : l === "Thousand" ? this.formatThousand(this.keepDecimal(d, c, u)) : l === "Percent" ? this.keepDecimal(d, c, u) + "%" : this.keepDecimal(d, c, u);
         if (s === "Boolean")
@@ -41886,7 +41888,6 @@ const tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_r
     },
     // 数据变化事件
     async onDataChange(a, r, o, s, l) {
-      console.log("onDataChange", a, r, o, s, l);
       for (let c of this.columns) {
         if ((c.showJson || "").trim()) {
           let u = JSON.parse(c.showJson);
@@ -103210,7 +103211,7 @@ const _sfc_main$o = {
       if (this.coords = r, a.detail === 2 && r.row >= 0 && !this.readonly) {
         let o = this.hotSetting.columns[r.col], s = this.$refs.table.hotInstance.getSourceData();
         o.controlType === "DialogSelect" && !o.readonly && this.$refs.dialogTable.init(o.source, () => {
-          this.$refs.dialogTable.open(this.getParam(s[r.row], o));
+          this.$refs.dialogTable.open(this.getParam(s[r.row], o, this.parentData));
         });
       }
     });
@@ -103307,7 +103308,7 @@ const _sfc_main$o = {
               if (l.controlType === "Label" || l.isReadonly == !0)
                 c.readOnly = !0;
               else if (l.controlType === "NumberInput")
-                c.type = "numeric", c.numericFormat = "0%";
+                c.type = "numeric";
               else if (l.controlType === "Check")
                 c.type = "checkbox";
               else if (l.controlType === "Select") {
@@ -103406,16 +103407,20 @@ const _sfc_main$o = {
               let v = !0;
               this.$emit("on-remove", p, (y) => {
                 v = y;
-              }), console.log(v), v && this.$refs.table.hotInstance.alter("remove_row", d);
+              }), v && this.$refs.table.hotInstance.alter("remove_row", d);
             });
           }
         })), this.$refs.table.hotInstance.addHook("afterChange", (l) => {
-          l && (l.forEach(([c, u, d, f]) => {
-            !this.readonly && this.tableView.createEnable && c == this.data.length - 1 && (d ?? "") != (f ?? "") && (this.data.push(this.getDefaultData()), this.$refs.table.hotInstance.loadData(this.data)), this.columns.find((p) => p.code == u).controlType != "DialogSelect" && this.onDataChange(
-              this.data[c],
-              this.columns.find((p) => p.code == u)
-            );
-          }), this.loadData());
+          l && l.forEach(([c, u, d, f]) => {
+            !this.readonly && this.tableView.createEnable && c == this.data.length - 1 && (d ?? "") != (f ?? "") && this.data.push(this.getDefaultData());
+            let p = this.columns.find((g) => g.code == u);
+            p.controlType != "DialogSelect" && this.onDataChange(this.data[c], p), p.controlType == "Select" && (p.selectOptions.some((g) => g == f) || (this.data[c][p.code] = null)), this.calc(this.data[c]), this.$refs.table.hotInstance.updateData(this.data);
+          });
+        }), this.$refs.table.hotInstance.addHook("beforePaste", (l, c) => {
+          let u = this.columns.filter((d) => !!(d.parentCode || "").trim() || this.columns.filter((f) => f.parentCode == d.code).length == 0);
+          for (let d = c[0].startCol; d < c[0].startCol + l[0].length; d++)
+            for (let f = c[0].startRow; f < c[0].startRow + l.length; f++)
+              l[f - c[0].startRow][d - c[0].startCol] != null && (l[f - c[0].startRow][d - c[0].startCol] = l[f - c[0].startRow][d - c[0].startCol].trim(), u[d].controlType == "NumberInput" && (l[f - c[0].startRow][d - c[0].startCol] = l[f - c[0].startRow][d - c[0].startCol].replace(/,/g, "")));
         }), this.loadData([]), this.inited = !0, setTimeout(() => {
           typeof r == "function" && r();
         });
@@ -103446,19 +103451,19 @@ const _sfc_main$o = {
      * @public
      */
     validate() {
-      for (let a = 0; a < this.staticData.length; a++) {
+      for (let a = 0; a < this.staticData.length - 1; a++) {
         let r = this.staticData[a];
         for (let o = 0; o < this.columns.length; o++) {
           let s = this.columns[o], l = this.parseData(r, s.code);
-          if (s.slot == "normal" && !(r._isShow && r._isShow[s.code] == !1) && s.isShow != !1) {
+          if (s.isShow != !1) {
             if (s.isRequired && (l == null || !(String(l) || "").trim()))
-              return this.error("Front_Msg_Row_Column_Required|" + (a + 1) + "|" + name), !1;
+              return this.error("Front_Msg_Row_Column_Required|" + (a + 1) + "|" + s.name), !1;
             if (s.maxValue != null && !isNaN(l) && l > s.maxValue)
-              return this.error("Front_Msg_Row_Validation_Max_Value|" + (a + 1) + "|" + name + "|" + s.maxValue.toString()), !1;
+              return this.error("Front_Msg_Row_Validation_Max_Value|" + (a + 1) + "|" + s.name + "|" + s.maxValue.toString()), !1;
             if (s.minValue != null && !isNaN(l) && l < s.minValue)
-              return this.error("Front_Msg_Row_Validation_Min_Value|" + (a + 1) + "|" + name + "|" + s.minValue.toString()), !1;
+              return this.error("Front_Msg_Row_Validation_Min_Value|" + (a + 1) + "|" + s.name + "|" + s.minValue.toString()), !1;
             if ((s.pattern || "").trim() && l != null && new RegExp(s.pattern).test(l) == !1)
-              return this.error("Front_Msg_Row_Validation_Pattern|" + (a + 1) + "|" + name + "|" + s.pattern), !1;
+              return this.error("Front_Msg_Row_Validation_Pattern|" + (a + 1) + "|" + s.name + "|" + s.pattern), !1;
           }
         }
       }