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

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/select-export-item-button-editor.vue

@@ -19,10 +19,29 @@
       ></el-switch>
     </el-form-item>
     <el-form-item label="导出每页查询数量" class="form-item-label-top">
-      <base-input-number
+      <empty-number-input
         v-model="optionModel.exportPageSize"
         :max="optionModel.showImageAtTable ? 150 : 1000"
-      ></base-input-number>
+        :placeholder="'默认 ' + defaultPageSize"
+      ></empty-number-input>
+    </el-form-item>
+    <el-form-item label="最大查询总数" class="form-item-label-top">
+      <empty-number-input
+        v-model="optionModel.maxQueryTotal"
+        :placeholder="'默认 ' + defaultMaxQueryTotal"
+      ></empty-number-input>
+      <div class="export-item-columns-tip">
+        条件导出最多拉取的行数。留空则使用全局逻辑参数（默认 {{ defaultMaxQueryTotal }}）
+      </div>
+    </el-form-item>
+    <el-form-item label="每个文件最大数据量" class="form-item-label-top">
+      <empty-number-input
+        v-model="optionModel.limitFileSize"
+        :placeholder="'默认 ' + defaultLimitFileSize"
+      ></empty-number-input>
+      <div class="export-item-columns-tip">
+        单个 Excel 最多行数，超出则分多个文件。留空则使用全局逻辑参数（默认 {{ defaultLimitFileSize }}）
+      </div>
     </el-form-item>
     <el-form-item label="导出参数" label-width="150px">
       <a
@@ -80,12 +99,15 @@
 import i18n from "../../../../utils/i18n";
 import eventMixin from "../event-handler/eventMixin";
 import exportItemColumnsDialog from "../container-data-table/exportItemColumns-dialog.vue";
+import { DEFAULT_CONDITION_EXPORT_CONFIG } from "@base/components/excelExport/conditionExportConfig";
+import emptyNumberInput from "./empty-number-input.vue";
 
 export default {
   name: "select-export-item-button-editor",
   mixins: [i18n, eventMixin],
   components: {
     exportItemColumnsDialog,
+    emptyNumberInput,
   },
   props: {
     designer: Object,
@@ -98,6 +120,9 @@ export default {
       // 与数据表格属性面板同一套：脚本里可直接用 dataId / formCode
       tableConfigParams: ["dataId", "formCode"],
       showExportItemColumnsDialog: false,
+      defaultPageSize: DEFAULT_CONDITION_EXPORT_CONFIG.pageSize,
+      defaultMaxQueryTotal: DEFAULT_CONDITION_EXPORT_CONFIG.maxQueryTotal,
+      defaultLimitFileSize: DEFAULT_CONDITION_EXPORT_CONFIG.limitFileSize,
     };
   },
   methods: {

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/table-export-button-editor.vue

@@ -13,8 +13,23 @@
       <el-switch v-model="optionModel.showImageAtTable" @change="changeShowImageAtTable"></el-switch>
     </el-form-item>
     <el-form-item label="导出每页查询数量" class="form-item-label-top">
-      <base-input-number v-model="optionModel.exportPageSize"
-                         :max="optionModel.showImageAtTable?150:1000"></base-input-number>
+      <empty-number-input v-model="optionModel.exportPageSize"
+                          :max="optionModel.showImageAtTable?150:1000"
+                          :placeholder="'默认 ' + defaultPageSize"></empty-number-input>
+    </el-form-item>
+    <el-form-item label="最大查询总数" class="form-item-label-top">
+      <empty-number-input v-model="optionModel.maxQueryTotal"
+                          :placeholder="'默认 ' + defaultMaxQueryTotal"></empty-number-input>
+      <div class="export-limit-tip">
+        条件导出最多拉取的行数。留空则使用全局逻辑参数（默认 {{ defaultMaxQueryTotal }}）
+      </div>
+    </el-form-item>
+    <el-form-item label="每个文件最大数据量" class="form-item-label-top">
+      <empty-number-input v-model="optionModel.limitFileSize"
+                          :placeholder="'默认 ' + defaultLimitFileSize"></empty-number-input>
+      <div class="export-limit-tip">
+        单个 Excel 最多行数，超出则分多个文件。留空则使用全局逻辑参数（默认 {{ defaultLimitFileSize }}）
+      </div>
     </el-form-item>
     <el-form-item label="导出参数" label-width="150px">
       <a href="javascript:void(0);" class="a-link link-oneLind"
@@ -30,10 +45,15 @@
 import i18n from "../../../../../../components/xform/utils/i18n";
 import eventMixin
   from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import { DEFAULT_CONDITION_EXPORT_CONFIG } from "@base/components/excelExport/conditionExportConfig";
+import emptyNumberInput from "./empty-number-input.vue";
 
 export default {
   name: "table-export-button-editor",
   mixins: [i18n, eventMixin],
+  components: {
+    emptyNumberInput,
+  },
   props: {
     designer: Object,
     selectedWidget: Object,
@@ -42,6 +62,9 @@ export default {
   data() {
     return {
       eventParams: [],
+      defaultPageSize: DEFAULT_CONDITION_EXPORT_CONFIG.pageSize,
+      defaultMaxQueryTotal: DEFAULT_CONDITION_EXPORT_CONFIG.maxQueryTotal,
+      defaultLimitFileSize: DEFAULT_CONDITION_EXPORT_CONFIG.limitFileSize,
     };
   },
   methods: {
@@ -57,4 +80,11 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.export-limit-tip {
+  line-height: 18px;
+  color: #909399;
+  font-size: 12px;
+  margin-top: 4px;
+}
+</style>

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -3287,6 +3287,9 @@ export const advancedFields = [
       tableRef: "",
       tableExportParam: "",
       showImageAtTable: false,
+      exportPageSize: null,
+      maxQueryTotal: null,
+      limitFileSize: null,
       tableExportFlag: 1,
 
       onCreated: "",
@@ -3351,6 +3354,9 @@ export const advancedFields = [
       tableRef: "",
       tableExportParam: "",
       showImageAtTable: false,
+      exportPageSize: null,
+      maxQueryTotal: null,
+      limitFileSize: null,
       selectExportItemFlag: 1,
       exportItemConditionEnabled: !1,
       // 按钮级明细导出配置：三项各自独立，留空的那项沿用数据表格属性上维护的

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -1442,10 +1442,8 @@ modules = {
       const formRef = this.getFormRef();
       if (!formRef || formRef.designState) return;
       this.$nextTick(() => {
-        if (formRef.syncFieldControlAfterStructure && formRef.syncFieldControlAfterStructure()) return;
-        if (formRef.hanldeCommonWidgetForTableColumns) {
-          formRef.hanldeCommonWidgetForTableColumns(tableColumns);
-        }
+        if (formRef.syncFieldControlAfterStructure()) return;
+        formRef.hanldeCommonWidgetForTableColumns(tableColumns);
       });
     },
     /** @returns {Boolean} 首次初始化是否跳过动态列加载。 */
@@ -2800,7 +2798,9 @@ modules = {
                 if (
                   customParam?.exportParam?.type !== EXPORT_TYPE.ITEM_SELECTED
                 ) {
-                  formData = tableOption.param ? tableOption.param() || {} : {};
+                  formData = customParam?.exportParam?.exportQuerySnapshot !== undefined
+                    ? this.$baseLodash.cloneDeep(customParam.exportParam.exportQuerySnapshot)
+                    : tableOption.param ? tableOption.param() || {} : {};
                 }
                 const queryParams = Object.assign({}, formData);
 
@@ -4539,7 +4539,7 @@ modules = {
       try {
         // 行内保存只提交当前行，校验范围同步收敛到当前行：其他行与表外字段
         // 的必填不该拦住单行保存（整体保存仍走 formRef.validate 的全量校验）
-        const controlled = formRef.isFieldControlV2 && formRef.isFieldControlV2();
+        const controlled = formRef.isFieldControlEnabled();
         const rowValid = controlled ? await this.validateEditRowAsync(obj.row) : this.validateEditRow(obj.row);
         if (!rowValid) return false;
         const fieldControlSnapshot = controlled ? formRef.captureFieldControlSubmission() : null;

package/src/components/xform/form-render/container-item/dynamicFieldMixin.js

@@ -10,7 +10,7 @@ import {
 /**
  * 表格布局容器(table/h5-table)专用混入。
  *
- * 提供两类「布局表格」特有能力(动态字段状态控制已统一收敛到表单设置，见 formDynamicFieldMixin)：
+ * 提供两类「布局表格」特有能力（动态字段状态控制由表单级 fieldControlMixin 统一处理）：
  *  1. 动态字段(dynamicSchemaSourceType)：字段定义由脚本或接口下发，运行时生成并插入到行布局中。
  *  2. 行折叠(默认行为)：整行字段均隐藏时折叠该行(响应式，随字段显隐自动更新)。
  *
@@ -108,7 +108,7 @@ const dynamicFieldMixin = {
         }
         return Promise.resolve(true);
       } catch (e) {
-        if (formRef.isFieldControlV2 && formRef.isFieldControlV2()) return Promise.reject(e);
+        if (formRef.isFieldControlEnabled()) return Promise.reject(e);
         return Promise.resolve(false);
       }
     },
@@ -118,7 +118,7 @@ const dynamicFieldMixin = {
       if (!this.supportsRowLayout()) return;
       if (this.getDynamicSchemaSourceType() === "none") return;
       const formRef = this.getFormRef();
-      if (formRef && formRef.isFieldControlV2 && formRef.isFieldControlV2()) {
+      if (formRef && formRef.isFieldControlEnabled()) {
         const task = this.$nextTick().then(() => this.resolveShouldInitDynamicSchema())
           .then(shouldInit => shouldInit ? this.loadControlledDynamicSchema() : undefined);
         return formRef.trackFieldControlSchema(task, () => this.loadDynamicSchema(), this);
@@ -176,7 +176,7 @@ const dynamicFieldMixin = {
       const formRef = this.getFormRef && this.getFormRef();
       if (!this.designState && this.supportsRowLayout() &&
           this.getDynamicSchemaSourceType() !== "none" &&
-          formRef && formRef.isFieldControlV2 && formRef.isFieldControlV2()) {
+          formRef && formRef.isFieldControlEnabled()) {
         return formRef.trackFieldControlSchema(this.loadControlledDynamicSchema(),
           () => this.loadDynamicSchema(), this);
       }

package/src/components/xform/form-render/container-item/tab-item.vue

@@ -99,7 +99,7 @@ export default {
   watch: {
     visibleTabs(tabs) {
       const formRef = this.getFormRef();
-      if (formRef && formRef.isFieldControlV2 && formRef.isFieldControlV2() &&
+      if (formRef && formRef.isFieldControlEnabled() &&
           !tabs.some(tab => tab.options.name === this.activeTabName)) {
         this.activeTabName = tabs.length ? tabs[0].options.name : "";
       }

package/src/components/xform/form-render/fieldControlEngine.js

@@ -99,6 +99,24 @@ export function normalizeLocalRules(rules) {
   });
 }
 
+export function commitLocalFieldRules(rules, widgetList) {
+  const list = Array.isArray(rules) ? rules : [];
+  if (!list.length) return [];
+  const options = fieldControlTreeOptions(widgetList || []);
+  const targets = new Set(options.map(item => item.value));
+  const fields = new Set(options.filter(item => !item.isContainer).map(item => item.value));
+  const normalized = normalizeLocalRules(list);
+  normalized.forEach(rule => {
+    rule.conditions.forEach(condition => {
+      if (!fields.has(condition.field)) throw new Error("条件字段不存在或不支持：" + condition.field);
+    });
+    rule.targets.forEach(target => {
+      if (!targets.has(target.field)) throw new Error("目标不存在或不支持：" + target.field);
+    });
+  });
+  return normalized;
+}
+
 export function evaluateCondition(condition, model) {
   if (!condition || !condition.field) throw new Error("请选择动态规则条件字段");
   const actual = model[condition.field];

package/src/components/xform/form-render/fieldControlMixin.js

@@ -30,7 +30,12 @@ export default {
   computed: {
     fieldControlBlocked() {
       // 仅准备期隐藏，避免用户在流程限制生效前操作。error 要保留已填内容，提交由 ensure 拦截。
-      return this.isFieldControlV2() && this.fieldControlStatus === "preparing";
+      return this.isFieldControlEnabled() && this.fieldControlStatus === "preparing";
+    },
+    fieldControlInteractionBlocked() {
+      // 错误时保留表单内容可见，但不允许继续编辑或触发字段/按钮副作用。
+      return this.isFieldControlEnabled()
+        && ["preparing", "error"].includes(this.fieldControlStatus);
     },
     fieldControlContextKey() {
       const info = this.wfParam?.wfInfo || {};
@@ -43,7 +48,7 @@ export default {
   watch: {
     fieldControlContextKey() {
       const runtime = this._fieldControl;
-      if (!runtime || !this.isFieldControlV2()) return;
+      if (!runtime || !this.isFieldControlEnabled()) return;
       if (!this.fieldControlInitialized) {
         if (runtime.mounting || runtime.task) runtime.revision++;
         return;
@@ -52,7 +57,8 @@ export default {
       runtime.mode = resolveRunMode(this.formConfig, !!this.wfParam?.hasWf);
       this.stopFieldControlWatcher();
       if (previousMode !== runtime.mode || runtime.mode === "continuous") {
-        this.invalidateFieldControl();
+        // 流程节点是权限边界，不能在防抖/后台请求期间继续使用旧节点状态。
+        this.invalidateFieldControl({ immediate: true, blockInteraction: true });
       } else {
         runtime.revision++;
         this.applyFieldControlStates(runtime.dynamicStates);
@@ -64,8 +70,8 @@ export default {
     this.disposeFieldControl();
   },
   methods: {
-    isFieldControlV2() {
-      return !!this.formConfig?.dynamicFieldEnabled && Number(this.formConfig.dynamicFieldRuleVersion) === 2;
+    isFieldControlEnabled() {
+      return !!this.formConfig?.dynamicFieldEnabled;
     },
     getFieldControlRuntime() {
       if (!this._fieldControl) this._fieldControl = createRuntime();
@@ -74,7 +80,7 @@ export default {
     prepareFieldControlTargets() {
       const runtime = this.getFieldControlRuntime();
       const entries = collectFieldControlTargets(this.widgetList);
-      const widgets = this.getFieldControlWidgets ? this.getFieldControlWidgets() : entries.map(e => e.widget);
+      const widgets = this.getFieldControlWidgets();
       runtime.entries = entries;
       runtime.byWidget = new WeakMap();
       entries.forEach(entry => runtime.byWidget.set(entry.widget, entry));
@@ -86,9 +92,9 @@ export default {
         runtime.definitions.set(widget, state);
       });
     },
-    // 动态列/结构晚于首次采集时，先登记未改写的定义，再走动态→流程，避免 V1 旁路污染基线。
+    // 动态列/结构晚于首次采集时，先登记未改写的定义，再走动态→流程。
     syncFieldControlAfterStructure() {
-      if (!this.isFieldControlV2()) return false;
+      if (!this.isFieldControlEnabled()) return false;
       this.prepareFieldControlTargets();
       const runtime = this.getFieldControlRuntime();
       if (this.fieldControlInitialized) {
@@ -107,7 +113,7 @@ export default {
       const result = Object.create(null);
       this.getFieldControlRuntime().entries.forEach(entry => {
         const projected = this.createFieldControlProjection(entry.widget);
-        if (this.handleWidgetShowRule) this.handleWidgetShowRule(projected);
+        this.handleWidgetShowRule(projected);
         result[entry.key] = readFieldState(projected);
       });
       return result;
@@ -192,7 +198,7 @@ export default {
       if (runtime.schemaErrors.size) throw Array.from(runtime.schemaErrors.values())[0].error;
     },
     async initializeFieldControl() {
-      if (!this.isFieldControlV2()) return;
+      if (!this.isFieldControlEnabled()) return;
       const runtime = this.getFieldControlRuntime();
       if (runtime.destroyed) throw new Error("表单已关闭");
       this.fieldControlStatus = "preparing";
@@ -247,18 +253,25 @@ export default {
         if (!sameValue(runtime.lastDependency, this.fieldControlDependency())) this.invalidateFieldControl();
       }, { deep: true, sync: true });
     },
-    invalidateFieldControl() {
+    invalidateFieldControl(options = {}) {
       const runtime = this.getFieldControlRuntime();
+      const immediate = options.immediate === true;
+      if (options.blockInteraction) {
+        this.fieldControlStatus = "preparing";
+        this.fieldControlError = "";
+      }
       runtime.revision++;
       runtime.dirty = true;
       if (runtime.timer) clearTimeout(runtime.timer);
-      runtime.timer = setTimeout(() => {
+      const refresh = () => {
         runtime.timer = null;
         this.refreshFieldControl().catch(error => this.failFieldControl(error, runtime));
-      }, 120);
+      };
+      if (immediate) refresh();
+      else runtime.timer = setTimeout(refresh, 120);
     },
     async refreshFieldControl() {
-      if (!this.isFieldControlV2()) return;
+      if (!this.isFieldControlEnabled()) return;
       const runtime = this.getFieldControlRuntime();
       if (runtime.timer) clearTimeout(runtime.timer);
       runtime.timer = null;
@@ -389,14 +402,14 @@ export default {
     },
     applyFieldControlStates(states) {
       const runtime = this.getFieldControlRuntime();
-      this.widgetEditOnWf = this.hanldeWfWidgetNew0 ? this.hanldeWfWidgetNew0() : false;
+      this.widgetEditOnWf = this.hanldeWfWidgetNew0();
       let editable = false;
       runtime.flowWidgets.forEach(widget => {
         const entry = runtime.byWidget.get(widget);
         const projected = this.createFieldControlProjection(widget);
-        if (this.handleWidgetShowRule) this.handleWidgetShowRule(projected);
+        this.handleWidgetShowRule(projected);
         if (entry && states?.[entry.key]) writeStateOptions(projected.options, states[entry.key]);
-        if (this.applyWorkflowFieldControl) this.applyWorkflowFieldControl(projected);
+        this.applyWorkflowFieldControl(projected);
         if (widget.formItemFlag && this.disabledMode) projected.options.disabled = true;
         const effective = readFieldState(projected);
         // 非输入按钮不在动态目标范围，但仍应用流程自身的 disabled。
@@ -407,7 +420,7 @@ export default {
         applyFieldState(target, effective, name => this.getWidgetRef(name));
         if (widget.formItemFlag && !projected.options.hidden && !projected.options.disabled && !projected.options.readonly) editable = true;
       });
-      this.wfModifyEnabled = !!this.wfParam?.wfInfo?.toModify && editable && !this.getReadMode?.();
+      this.wfModifyEnabled = !!this.wfParam?.wfInfo?.toModify && editable && !this.getReadMode();
       this.syncFieldControlValidation();
     },
     syncFieldControlValidation() {
@@ -429,11 +442,14 @@ export default {
       if (runtime.destroyed || runtime !== this.getFieldControlRuntime()) return;
       this.fieldControlStatus = "error";
       this.fieldControlError = error?.message || "字段规则执行失败，请重试";
-      // 无成功结果时至少应用已知流程限制。错误状态独立阻挡编辑/提交。
-      if (!runtime.dynamicStates && runtime.flowWidgets.length) this.applyFieldControlStates(null);
+      // 即使动态重算失败，也要用最后一份可信动态状态重新收口当前流程限制。
+      // 交互由 fieldControlInteractionBlocked 独立阻断，不污染定义基线。
+      if (runtime.flowWidgets.length) {
+        try { this.applyFieldControlStates(runtime.dynamicStates); } catch (applyError) { /* 保留原始失败 */ }
+      }
     },
     async ensureFieldControlReady() {
-      if (!this.isFieldControlV2()) return;
+      if (!this.isFieldControlEnabled()) return;
       const runtime = this.getFieldControlRuntime();
       if (runtime.mountTask) await runtime.mountTask;
       if (runtime.destroyed) throw new Error("表单已关闭");
@@ -457,7 +473,7 @@ export default {
       }
     },
     guardFieldControlWorkflow(option) {
-      if (!this.isFieldControlV2()) return option;
+      if (!this.isFieldControlEnabled()) return option;
       const snapshots = {};
       const wrapped = { ...option };
       [["onStart", "onBeforeStartSubmit", "start"], ["onClickAgree", "onBeforeAgree", "agree"]]
@@ -485,7 +501,7 @@ export default {
       return wrapped;
     },
     captureFieldControlSubmission() {
-      if (!this.isFieldControlV2()) return null;
+      if (!this.isFieldControlEnabled()) return null;
       return {
         data: cloneDeep(this.formModel), context: this.fieldControlContextKey,
         revision: this.getFieldControlRuntime().revision,
@@ -513,12 +529,6 @@ export default {
       this.fieldControlInitialized = false;
       this.fieldControlStatus = "idle";
       this.fieldControlError = "";
-      // 同时清理 V1，支持 setFormJson 在两个版本之间切换。
-      if (this._fdfWatcher) this._fdfWatcher();
-      if (this._fdfTimer) clearTimeout(this._fdfTimer);
-      this._fdfWatcher = null;
-      this._fdfTimer = null;
-      this._fdfInited = false;
     },
   },
 };

package/src/components/xform/form-render/index.vue

@@ -10,7 +10,7 @@
 
 <template>
   <div>
-    <el-alert v-if="isFieldControlV2() && fieldControlError" :title="fieldControlError" type="error" :closable="false" show-icon>
+    <el-alert v-if="fieldControlError" :title="fieldControlError" type="error" :closable="false" show-icon>
       <el-button type="text" @click="retryFieldControl">重新计算字段规则</el-button>
     </el-alert>
     <div v-if="fieldControlBlocked" role="status">正在准备表单，请稍候…</div>
@@ -19,8 +19,12 @@
       :size="size"
       :class="[customClass, h5RootClass]"
       class="render-form"
-      :style="fieldControlBlocked ? { visibility: 'hidden' } : null"
+      :style="fieldControlBlocked
+        ? { visibility: 'hidden' }
+        : (fieldControlInteractionBlocked ? { pointerEvents: 'none' } : null)"
+      :inert="fieldControlInteractionBlocked ? '' : null"
       :aria-busy="fieldControlBlocked ? 'true' : 'false'"
+      :aria-disabled="fieldControlInteractionBlocked ? 'true' : 'false'"
       :label-width="labelWidth"
       :validate-on-rule-change="false"
       :model="formDataModel"
@@ -119,7 +123,6 @@
 import "./container-item/index";
 import FieldComponents from "../../../components/xform/form-designer/form-widget/field-widget/index";
 import indexMixin from "../../../components/xform/form-render/indexMixin";
-import formDynamicFieldMixin from "../../../components/xform/form-render/formDynamicFieldMixin";
 
 import fieldControlMixin from "@base/components/xform/form-render/fieldControlMixin";
 
@@ -144,7 +147,7 @@ export default {
     compareDelList: () =>
       import("../../../components/xform/form-render/compareDelList.vue"),
   },
-  mixins: [indexMixin, formDynamicFieldMixin, fieldControlMixin],
+  mixins: [indexMixin, fieldControlMixin],
 };
 </script>
 

package/src/components/xform/form-render/indexMixin.js

@@ -386,7 +386,7 @@ modules = {
       let formConfig = this.formConfig;
       if (formConfig.isLoadEntity) {
         this.loadDefaultEntityData(() => {
-          if (!(this.isFieldControlV2 && this.isFieldControlV2())) {
+          if (!this.isFieldControlEnabled()) {
             this.handleCustomEvent(formConfig.formScriptSuccess);
           }
         });
@@ -574,7 +574,7 @@ modules = {
         : null;
     },
     handleShowContent(callback) {
-      if (this.isFieldControlV2 && this.isFieldControlV2()) return this.showControlledForm(callback);
+      if (this.isFieldControlEnabled()) return this.showControlledForm(callback);
       // this.buildFormModel(!this.formJsonObj ? null : this.formJsonObj.widgetList);
       this.handleBeforeMounted().then(() => {
         this.showFormContent = true;
@@ -742,8 +742,14 @@ modules = {
       })*/
     },
     hanldeCommonWidget2() {
-      if (this.isFieldControlV2 && this.isFieldControlV2()) {
-        this.prepareFieldControlTargets();
+      if (this.isFieldControlEnabled()) {
+        // 渲染前仍先补齐列 widget，但配置异常不能跳出受控初始化：
+        // showControlledForm 会再次采集并把错误落到 error/重试界面。
+        try {
+          this.prepareFieldControlTargets();
+        } catch (error) {
+          this.failFieldControl(error);
+        }
         return;
       }
       let wfParam = this.wfParam || {};
@@ -1561,7 +1567,7 @@ modules = {
             if (wfConfig1) {
               resOption = extendDeeply(resOption, wfConfig1);
             }
-            return this.guardFieldControlWorkflow ? this.guardFieldControlWorkflow(resOption) : resOption;
+            return this.guardFieldControlWorkflow(resOption);
           };
         }
         return this.loadFormData({
@@ -2093,7 +2099,7 @@ modules = {
             !i.formConfig || !i.widgetList)
           )
             return void this.$message.error("Invalid format of form json.");
-          if (this.resetFieldControl) this.resetFieldControl();
+          this.resetFieldControl();
           this.clearFormDataModel(),
             this.buildFormModel(i.widgetList),
             this.$set(this.formJsonObj, "formConfig", i.formConfig),
@@ -2103,11 +2109,8 @@ modules = {
             this.insertCustomStyleAndScriptNode(),
             this.$nextTick(function () {
               t.initFormObject(!1);
-              if (t.isFieldControlV2 && t.isFieldControlV2()) t.showControlledForm();
-              else {
-                t.handleOnMounted();
-                if (t.initFormDynamicFields) t.initFormDynamicFields();
-              }
+              if (t.isFieldControlEnabled()) t.showControlledForm();
+              else t.handleOnMounted();
             });
         } else this.$message.error("Set form json failed.");
     },
@@ -2120,7 +2123,7 @@ modules = {
     },
     getFormData: function () {
       const validateData = arguments.length === 0 || arguments[0] === undefined || arguments[0];
-      if (validateData && this.isFieldControlV2 && this.isFieldControlV2()) {
+      if (validateData && this.isFieldControlEnabled()) {
         return this.ensureFieldControlReady().then(() => new Promise((resolve, reject) => {
           const snapshot = this.captureFieldControlSubmission();
           this.validateCurrentForm(async valid => {
@@ -2275,7 +2278,7 @@ modules = {
       this.$refs.renderForm.clearValidate(e);
     },
     validateForm: function (e) {
-      if (this.isFieldControlV2 && this.isFieldControlV2()) return this.validate(e);
+      if (this.isFieldControlEnabled()) return this.validate(e);
 
       this.$refs["renderForm"].$baseValidate((valid) => {
         if (!valid) {
@@ -4662,6 +4665,8 @@ modules = {
     saveForm(callback) {
       this.validateForm((valid) => {
         if (!valid) return;
+        // 从校验通过起锁定数据/规则版本；getSubData 和确认框都是异步窗口。
+        const fieldControlSnapshot = this.captureFieldControlSubmission();
         this.getSubData().then((formData) => {
           let reportTemplate = this.reportTemplate || {};
           let formConfig = this.formConfig;
@@ -4676,7 +4681,13 @@ modules = {
             data: realFormData,
           };
 
-          this.$baseConfirm("您确定要保存吗？").then(() => {
+          this.$baseConfirm("您确定要保存吗？").then(async () => {
+            try {
+              await this.assertFieldControlSubmission(fieldControlSnapshot);
+            } catch (error) {
+              this.$message.error(error.message);
+              return;
+            }
             let saveConfig = formConfig.saveConfig || {};
             this.formHttp({
               options: saveConfig,
@@ -4932,7 +4943,7 @@ modules = {
       }
     },
     validate(callback) {
-      if (this.isFieldControlV2 && this.isFieldControlV2()) {
+      if (this.isFieldControlEnabled()) {
         return this.ensureFieldControlReady().then(() => new Promise(resolve => {
           const snapshot = this.captureFieldControlSubmission();
           this.validateCurrentForm(async valid => {

package/src/components/xform/utils/util.js

@@ -1135,7 +1135,6 @@ export function getDefaultFormConfig() {
     globalConfig: null,
     // 表单级动态字段规则：按本地规则/后台脚本动态控制整个表单内任意字段/容器的显隐/必填/只读/禁用/取值
     dynamicFieldEnabled: false,
-    dynamicFieldRuleVersion: 2,
     dynamicFieldRunMode: "auto",
     dynamicFieldAllowValue: false,
     dynamicFieldSourceType: "local",

package/src/views/user/home/default.vue

@@ -737,15 +737,18 @@ body #app .index-home {
       .time {
         color: #b9b9b9;
         font-size: 12px;
-        right: 12px;
+        right: 12px;
+        background: #FFF;
+        padding-left: 8px;
       }
 
       &:hover {
         color: $baseColor;
-        background-color: transparentize($baseColor, 0.97);
+        background-color: #F8FAFC;
 
         .time {
-          color: $baseColor;
+          color: $baseColor;
+          background-color: #F8FAFC;
         }
       }
 

package/src/views/user/home/wjl/content.vue

@@ -483,7 +483,8 @@ export default {
           let userInfo = res.objx;
           this.headPhotoUrl = userInfo.headPhotoUrl
             ? userInfo.headPhotoUrl
-            : (require("@/resources/images/default-header.png").default || require("@/resources/images/default-header.png"));
+            : require("@/resources/images/default-header.png").default ||
+              require("@/resources/images/default-header.png");
 
           this.userInfo = userInfo;
           this.initServiceProviderRole();
@@ -709,7 +710,7 @@ export default {
       this.showDealDialog = true;
     },
     openOrderView(row) {
-      let dataId = row.id;
+      let dataId = row.order_id;
       if (dataId == null) {
         this.$message.warning(this.$t1("未找到工单"));
         return;