cloud-web-corejs 1.1.0-dev.19 → 1.1.0-dev.20

package/src/components/xform/form-designer/form-widget/dialog/importDialogMixin.js

@@ -1504,6 +1504,40 @@ tmixins = {
         // 进度框形态：逐行校验 → 成败进结果表 → 通过的行一次性入表格。
         // 默认关闭，关闭时下面仍是原来的"全屏 loading + 整批交付"老链路。
         if (importOption.showProgressDialog) {
+          // 确认回调在进度框形态下是前置钩子：解析完立刻跑，通过后再 startFrontImport。
+          // done() = 继续导入；close() = 中止。不返回 false 则自动继续（console.log 也能进进度框）。
+          if (importOption.onConfirmImportEnabled) {
+            let started = false;
+            const done = () => {
+              if (started) return;
+              started = true;
+              that.startFrontImport(resultData, file);
+            };
+            const close = () => {
+              if (started) return;
+              started = true;
+              that.loadingObj && that.loadingObj.close();
+              that.loadingObj = null;
+              that.clearImportTimer();
+            };
+            try {
+              if (
+                that
+                  .getFieldTarget()
+                  .handleCustomEvent(
+                    importOption.onConfirmImport,
+                    ["resultData", "file", "done", "close"],
+                    [resultData, file, done, close]
+                  ) !== false
+              ) {
+                done();
+              }
+            } catch (et) {
+              console.error(et);
+              close();
+            }
+            return;
+          }
           that.startFrontImport(resultData, file);
           return;
         }

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -118,7 +118,13 @@ modules = {
       }
     }
   },
-  mounted() {},
+  mounted() {
+    const formRef = this.getFormRef && this.getFormRef();
+    if (formRef && formRef.isFieldControlV2 && formRef.isFieldControlV2()) {
+      this.initFieldAttrs();
+      formRef.syncFieldControlValidation();
+    }
+  },
   /*watch: {
     currentValue(val) {
       this.initFieldModel(true);
@@ -1040,6 +1046,12 @@ modules = {
       }
     },
     buildFieldRules() {
+      const formRef = this.getFormRef && this.getFormRef();
+      if (formRef && formRef.isFieldControlV2 && formRef.isFieldControlV2() &&
+          !formRef.isFieldControlFieldVisible(this.field)) {
+        this.clearFieldRules();
+        return;
+      }
       if (!this.field.formItemFlag || this.field.options.hidden) {
         return;
       }