t20-common-lib 0.15.24 → 0.15.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.15.24",
+  "version": "0.15.25",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/dynamic-form/src/main.vue

@@ -494,27 +494,21 @@ export default {
      * 触发表单校验；通过后由返回值携带表单数据与附件（与 needFile 一致时含已落档行）。
      * @returns {Promise<{ valid: false, formData: object } | { valid: true, formData: object, operate?: string, fileUploadTableData?: array }>}
      */
-    async validate() {
+    async validate(callback) {
       const formRef = this.$refs.dynamicForms;
       if (!formRef || typeof formRef.validate !== "function") {
-        return { valid: false, formData: this.formData };
+        callback(false, this.formData);
       }
       const pass = await new Promise((resolve) => {
         formRef.validate((valid) => resolve(valid));
       });
       if (!pass) {
-        return { valid: false, formData: this.formData };
+        callback(false, this.formData);
       }
-      const result = {
-        valid: true,
-        formData: this.formData,
-      };
-      if (this.needFile) {
-        result.fileUploadTableData = (this.fileUploadTableData || []).filter(
-          (t) => t.beid
-        );
-      }
-      return result;
+      const fileUploadTableData = (this.fileUploadTableData || []).filter(
+        (t) => t.beid
+      );
+      callback(true, this.formData, fileUploadTableData);
     },
   },
 };