mooho-base-admin-plus 2.10.53 → 2.10.54

package/history.md

@@ -224,3 +224,4 @@ mooho-base-admin-plus@2.10.50 - 修复Excel表格验证功能
 mooho-base-admin-plus@2.10.51 - Excel表格增加Refresh方法，组件增加事件声明
 mooho-base-admin-plus@2.10.52 - 修复上一版本的bug
 mooho-base-admin-plus@2.10.53 - 修复上一版本的bug
+mooho-base-admin-plus@2.10.54 - 修复上一版本的bug

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

@@ -41784,8 +41784,14 @@ const tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_r
      *
      * @public
      */
-    validate() {
-      return this.$refs.form.validate();
+    async validate() {
+      let a = await this.$refs.form.validate();
+      for (let r of this.columns)
+        if (r.controlType == "ExcelTable" && !r.isReadonly && r.isShow) {
+          let o = await this.$refs["table_" + r.code][0].validate();
+          a = a && o;
+        }
+      return a;
     },
     /**
      * 获取完整数据
@@ -41802,8 +41808,8 @@ const tableSetting = /* @__PURE__ */ _export_sfc(_sfc_main$q, [["render", _sfc_r
           let o = this.$refs["table_" + r.code][0].getData();
           if (r.isRequired && o.length == 0)
             return this.error("Front_Msg_Row_Required|" + this.getNameI18n(r)), !1;
-          if (!this.$refs["table_" + r.code][0].validate())
-            return console.log("invalid", "table_" + r.code), !1;
+          if (r.controlType == "Table" && !this.$refs["table_" + r.code][0].validate())
+            return !1;
           r.tableStoreType == "Inner" ? a[r.code] = JSON.stringify(o) : a.tableData.push({
             model: r.sourceModel,
             sourceDataCode: r.sourceDataCode,
@@ -103970,13 +103976,15 @@ const _sfc_main$o = {
      *
      * @public
      */
-    validate() {
+    async validate() {
       let a = [];
-      for (let o = 0; o < this.staticData.length - 1; o++)
-        a.push(o);
-      return this.$refs.table.hotInstance.validateRows(a, (o) => {
-        console.log("valid", o);
-      }) ? !0 : (this.error("Front_Msg_Form_Validate_Fail"), !1);
+      for (let r = 0; r < this.staticData.length - 1; r++)
+        a.push(r);
+      return new Promise((r) => {
+        this.$refs.table.hotInstance.validateRows(a, (o) => {
+          r(o);
+        });
+      });
     },
     /**
      * 获取数据