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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.1.0-dev.20",
+  "version": "1.1.0-dev.21",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/components/xform/form-designer/designer.js

@@ -106,7 +106,6 @@ let chartContainers = [],
         globalConfig: null,
         // 表单级动态字段规则
         dynamicFieldEnabled: false,
-        dynamicFieldRuleVersion: 2,
         dynamicFieldRunMode: "auto",
         dynamicFieldAllowValue: false,
         dynamicFieldSourceType: "local",
@@ -282,13 +281,6 @@ let chartContainers = [],
           modifiedFlag = true;
         }
         if (!!formJson && !!formJson.formConfig) {
-          // 旧模板缺少版本时不能继承新建模板的 V2 默认值。
-          this.vueInstance.$set(this.formConfig, "dynamicFieldRuleVersion",
-            formJson.formConfig.dynamicFieldRuleVersion || 1);
-          this.vueInstance.$set(this.formConfig, "dynamicFieldRunMode",
-            formJson.formConfig.dynamicFieldRunMode || "auto");
-          this.vueInstance.$set(this.formConfig, "dynamicFieldAllowValue",
-            !!formJson.formConfig.dynamicFieldAllowValue);
           //this.formConfig = importObj.formConfig
           baseRefUtil.overwriteObj(
             this.formConfig,
@@ -1970,13 +1962,6 @@ let chartContainers = [],
           "form__config__backup"
         );
         if (!!formConfigBackup) {
-          const restoredConfig = JSON.parse(formConfigBackup);
-          this.vueInstance.$set(this.formConfig, "dynamicFieldRuleVersion",
-            restoredConfig.dynamicFieldRuleVersion || 1);
-          this.vueInstance.$set(this.formConfig, "dynamicFieldRunMode",
-            restoredConfig.dynamicFieldRunMode || "auto");
-          this.vueInstance.$set(this.formConfig, "dynamicFieldAllowValue",
-            !!restoredConfig.dynamicFieldAllowValue);
           //this.formConfig = JSON.parse(formConfigBackup)
           baseRefUtil.overwriteObj(
             this.formConfig,

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

@@ -120,7 +120,7 @@ modules = {
   },
   mounted() {
     const formRef = this.getFormRef && this.getFormRef();
-    if (formRef && formRef.isFieldControlV2 && formRef.isFieldControlV2()) {
+    if (formRef && formRef.isFieldControlEnabled()) {
       this.initFieldAttrs();
       formRef.syncFieldControlValidation();
     }
@@ -1047,7 +1047,7 @@ modules = {
     },
     buildFieldRules() {
       const formRef = this.getFormRef && this.getFormRef();
-      if (formRef && formRef.isFieldControlV2 && formRef.isFieldControlV2() &&
+      if (formRef && formRef.isFieldControlEnabled() &&
           !formRef.isFieldControlFieldVisible(this.field)) {
         this.clearFieldRules();
         return;

package/src/components/xform/form-designer/setting-panel/form-dynamicField-setting.vue

@@ -2,123 +2,48 @@
   <div class="form-dynamic-field-setting">
     <el-form-item label="启用动态字段">
       <el-switch v-model="formConfig.dynamicFieldEnabled"></el-switch>
-      <div class="tip-text">
-        根据表单数据/后台脚本动态控制整个表单内任意字段、容器的显隐等状态
-      </div>
+      <el-tooltip content="根据表单数据动态控制字段、容器的显隐、必填、只读和禁用状态。" placement="left" popper-class="xform-setting-help">
+        <i class="el-icon-info setting-help-icon" tabindex="0" aria-label="动态字段说明"></i>
+      </el-tooltip>
     </el-form-item>
 
     <template v-if="formConfig.dynamicFieldEnabled">
-      <el-form-item label="执行规则">
-        <el-select :value="formConfig.dynamicFieldRuleVersion || 1" size="mini"
-          @input="$set(formConfig, 'dynamicFieldRuleVersion', $event)">
-          <el-option label="新版：动态规则后执行流程规则" :value="2" />
-          <el-option label="历史兼容（待迁移）" :value="1" />
+      <div v-if="fieldControlTreeState.error" class="tip-text tree-options-error">{{ fieldControlTreeState.error }}</div>
+      <el-form-item label="执行方式">
+        <el-select :value="formConfig.dynamicFieldRunMode || 'auto'" size="mini"
+          @input="$set(formConfig, 'dynamicFieldRunMode', $event)">
+          <el-option label="按场景默认" value="auto" />
+          <el-option label="仅初始化" value="initialOnly" />
+          <el-option label="持续生效" value="continuous" />
         </el-select>
+        <el-tooltip content="默认：有流程仅初始化，无流程持续联动。仅初始化保留首次结果；持续模式每轮均由流程规则收尾。" placement="left" popper-class="xform-setting-help">
+          <i class="el-icon-info setting-help-icon" tabindex="0" aria-label="执行方式说明"></i>
+        </el-tooltip>
       </el-form-item>
-      <div v-if="fieldControlTreeState.error" class="tip-text tree-options-error">{{ fieldControlTreeState.error }}</div>
-      <template v-if="formConfig.dynamicFieldRuleVersion === 2">
-        <el-form-item label="执行方式">
-          <el-select :value="formConfig.dynamicFieldRunMode || 'auto'" size="mini"
-            @input="$set(formConfig, 'dynamicFieldRunMode', $event)">
-            <el-option label="按场景默认" value="auto" />
-            <el-option label="仅初始化" value="initialOnly" />
-            <el-option label="持续生效" value="continuous" />
-          </el-select>
-          <div class="tip-text">默认：有流程仅初始化，无流程持续联动。仅初始化保留首次结果；持续模式每轮均由流程规则收尾。</div>
-        </el-form-item>
-        <el-form-item label="允许自动赋值" v-if="formConfig.dynamicFieldSourceType === 'script'">
-          <el-switch :value="!!formConfig.dynamicFieldAllowValue"
-            @input="$set(formConfig, 'dynamicFieldAllowValue', $event)" />
-          <div class="tip-text">开启前需确认后台 value 覆盖条件；规则未返回 value 时保留用户输入。</div>
-        </el-form-item>
-      </template>
-      <div v-else class="tip-text">历史模板保持原执行顺序。迁移前请核对流程放开、持续联动与后台状态快照。</div>
-      <el-form-item label="数据来源" class="form-item-label-top">
-        <el-radio-group v-model="formConfig.dynamicFieldSourceType" size="mini">
-          <el-radio-button label="local">本地规则</el-radio-button>
-          <el-radio-button label="script">后台脚本</el-radio-button>
-        </el-radio-group>
+      <el-form-item label="字段规则" class="el-form-item-second">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          icon="el-icon-setting"
+          @click="openRuleDialog"
+        >
+          配置规则（{{ (formConfig.dynamicFieldRules || []).length }}）
+        </el-button>
       </el-form-item>
-
-      <template v-if="formConfig.dynamicFieldSourceType === 'local'">
-        <el-form-item label="字段规则" class="el-form-item-second">
-          <el-button
-            type="primary"
-            plain
-            size="mini"
-            icon="el-icon-setting"
-            @click="openRuleDialog"
-          >
-            配置规则（{{ (formConfig.dynamicFieldRules || []).length }}）
-          </el-button>
-        </el-form-item>
-      </template>
-
-      <template v-if="formConfig.dynamicFieldSourceType === 'script'">
-        <el-form-item class="form-item-label-top el-form-item-second" label="脚本编码">
-          <el-input
-            v-model="formConfig.dynamicFieldScriptCode"
-            size="mini"
-            placeholder="scriptCode 或 formCode/scriptCode"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="额外参数" class="el-form-item-second">
-          <a
-            href="javascript:void(0);"
-            class="a-link link-oneLind"
-            @click="editDynamicFieldScriptParam"
-          >
-            <span>{{ formConfig.dynamicFieldScriptParam }}</span>
-            <i class="el-icon-edit"></i>
-          </a>
-          <div class="tip-text">
-            格式： return { stage:
-            this.formModel.status }
-          </div>
-        </el-form-item>
-        <el-form-item class="form-item-label-top el-form-item-second" label="触发字段">
-          <el-select
-            v-model="formConfig.dynamicFieldTriggerFields"
-            multiple
-            filterable
-            size="mini"
-            style="width: 100%"
-            placeholder="字段值变化时重新请求后台"
-          >
-            <el-option
-              v-for="(n, idx) in treeOptions"
-              :key="n.value + '#' + idx"
-              :value="n.value"
-              :label="optPlainLabel(n)"
-              :disabled="n.isContainer"
-            >
-              <span
-                :style="{ paddingLeft: n.depth * 14 + 'px' }"
-                :class="{ 'opt-container': n.isContainer }"
-              >
-                <span v-if="n.isContainer" class="opt-tag"
-                  >[{{ containerTypeLabel(n.type) }}]</span
-                >{{ n.baseLabel }}
-              </span>
-            </el-option>
-          </el-select>
-          <div class="tip-text">未配置数据触发字段时，编辑数据不会自动请求；新版持续模式在流程上下文刷新时仍会重算。</div>
-        </el-form-item>
-        <div class="tip-text">
-          后台返回 fieldStates 的 key
-          可为字段名，也可为「命名容器」名以控制其显隐（容器仅 visible 生效）
-        </div>
-      </template>
     </template>
 
     <el-dialog
       title="表单动态字段规则"
       :visible.sync="ruleDialogVisible"
       :append-to-body="true"
-      width="760px"
+      width="880px"
+      top="6vh"
       custom-class="dynamic-field-rule-dialog"
     >
+      <div class="rule-dialog-summary">配置触发条件与字段状态，规则按排列顺序执行。</div>
       <div class="rule-list">
+        <div v-if="!editingRules.length" class="rule-empty">暂无规则，点击下方「添加规则」开始配置</div>
         <div
           v-for="(rule, rIdx) in editingRules"
           :key="rule.id"
@@ -147,13 +72,13 @@
             <div
               v-for="(cond, cIdx) in rule.conditions"
               :key="cIdx"
-              class="rule-row"
+              class="rule-row condition-row"
             >
               <el-select
                 v-model="cond.field"
                 filterable
                 size="mini"
-                placeholder="字段"
+                placeholder="选择条件字段"
                 class="cell-field"
               >
                 <el-option
@@ -189,14 +114,15 @@
               <el-input
                 v-model="cond.value"
                 size="mini"
-                placeholder="值"
+                placeholder="输入比较值"
                 class="cell-value"
                 :disabled="op_noValue(cond.operator)"
               ></el-input>
               <el-button
                 type="text"
                 icon="el-icon-remove-outline"
-                class="danger-text"
+                class="danger-text row-remove"
+                aria-label="删除条件"
                 @click="removeCondition(rule, cIdx)"
               ></el-button>
             </div>
@@ -294,7 +220,8 @@
               <el-button
                 type="text"
                 icon="el-icon-remove-outline"
-                class="danger-text"
+                class="danger-text row-remove"
+                aria-label="删除目标字段"
                 @click="removeTarget(rule, tIdx)"
               ></el-button>
             </div>
@@ -319,7 +246,8 @@
         </el-button>
       </div>
 
-      <div slot="footer">
+      <div slot="footer" class="rule-dialog-footer">
+        <span class="rule-count">共 {{ editingRules.length }} 条规则</span>
         <el-button size="mini" @click="ruleDialogVisible = false"
           >取消</el-button
         >
@@ -372,9 +300,8 @@
 </template>
 
 <script>
-import { fieldControlTreeOptions, normalizeLocalRules } from "@base/components/xform/form-render/fieldControlEngine";
+import { fieldControlTreeOptions, commitLocalFieldRules } from "@base/components/xform/form-render/fieldControlEngine";
 import i18n from "../../../../components/xform/utils/i18n";
-import { buildWidgetTreeOptions } from "../../../../components/xform/form-render/container-item/dynamicFieldEngine";
 
 const NO_VALUE_OPERATORS = ["empty", "notEmpty"];
 
@@ -409,9 +336,6 @@ export default {
   computed: {
     fieldControlTreeState() {
       const list = (this.designer && this.designer.widgetList) || [];
-      if (this.formConfig.dynamicFieldRuleVersion !== 2) {
-        return { options: buildWidgetTreeOptions(list), error: "" };
-      }
       try {
         return { options: fieldControlTreeOptions(list), error: "" };
       } catch (error) {
@@ -531,29 +455,11 @@ export default {
       rule.targets.splice(idx, 1);
     },
     saveRules() {
-      if (this.formConfig.dynamicFieldRuleVersion === 2) {
-        try {
-          const options = fieldControlTreeOptions(this.designer?.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(this.editingRules);
-          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);
-            });
-          });
-          this.formConfig.dynamicFieldRules = normalized;
-          this.ruleDialogVisible = false;
-        } catch (error) { this.$message.error(error.message); }
-        return;
-      }
-      this.formConfig.dynamicFieldRules = JSON.parse(
-        JSON.stringify(this.editingRules)
-      );
-      this.ruleDialogVisible = false;
+      try {
+        this.formConfig.dynamicFieldRules = commitLocalFieldRules(
+          this.editingRules, this.designer?.widgetList || []);
+        this.ruleDialogVisible = false;
+      } catch (error) { this.$message.error(error.message); }
     },
   },
 };
@@ -658,3 +564,124 @@ export default {
   margin-right: 4px;
 }
 </style>
+
+<!-- 弹框挂载到 body，以独立类名隔离样式，并覆盖设置面板的控件宽度。 -->
+<style lang="scss">
+.el-dialog.dynamic-field-rule-dialog {
+  display: flex;
+  flex-direction: column;
+  max-width: calc(100vw - 32px);
+  max-height: 88vh;
+  margin-bottom: 0;
+  border-radius: 8px;
+
+  > .el-dialog__header {
+    flex: none;
+    padding: 20px 24px;
+    border-bottom: 1px solid #ebeef5;
+  }
+
+  > .el-dialog__body {
+    display: flex;
+    flex-direction: column;
+    min-height: 0;
+    padding: 16px 24px;
+    overflow: hidden;
+  }
+
+  > .el-dialog__footer {
+    flex: none;
+    padding: 14px 24px;
+    border-top: 1px solid #ebeef5;
+  }
+
+  .rule-dialog-summary {
+    flex: none;
+    margin-bottom: 14px;
+    color: #909399;
+    font-size: 13px;
+    line-height: 20px;
+  }
+
+  .rule-list {
+    min-height: 0;
+    max-height: none;
+    overflow-y: auto;
+    overflow-x: hidden;
+    padding-right: 4px;
+  }
+
+  .rule-empty {
+    padding: 40px 12px;
+    text-align: center;
+    color: #909399;
+  }
+
+  .rule-card {
+    padding: 0 16px 16px;
+    margin-bottom: 16px;
+    border: 1px solid #e4e7ed;
+    border-radius: 6px;
+    background: #fff;
+  }
+
+  .rule-card-header {
+    min-height: 44px;
+    margin: 0 -16px 14px;
+    padding: 0 16px;
+    background: #f5f7fa;
+    border-bottom: 1px solid #ebeef5;
+    border-radius: 6px 6px 0 0;
+  }
+
+  .rule-title { font-size: 14px; color: #303133; }
+  .rule-section + .rule-section { margin-top: 14px; padding-top: 14px; border-top: 1px dashed #e4e7ed; }
+  .rule-section-title { margin-bottom: 12px; gap: 12px; }
+
+  .rule-row {
+    display: grid;
+    gap: 10px;
+    margin-bottom: 10px;
+    min-width: 0;
+  }
+
+  .condition-row { grid-template-columns: minmax(0, 1.4fr) minmax(0, 1fr) minmax(0, 1fr) 28px; }
+  .target-row {
+    grid-template-columns: repeat(4, minmax(0, 1fr)) 28px;
+    padding: 12px;
+    background: #fafbfd;
+    border: 1px solid #ebeef5;
+    border-radius: 4px;
+  }
+
+  .target-row > .cell-field { grid-column: 1 / 5; }
+  .target-row > .row-remove { grid-column: 5; grid-row: 1; }
+  .target-attr { display: flex; flex-direction: column; align-items: stretch; gap: 6px; min-width: 0; }
+  .target-attr .attr-label { color: #606266; font-size: 12px; line-height: 18px; }
+
+  .rule-row .el-select,
+  .rule-row .el-input,
+  .rule-row .cell-field,
+  .rule-row .cell-op,
+  .rule-row .cell-value,
+  .rule-row .cell-tri { width: 100% !important; min-width: 0; margin: 0; }
+
+  .row-remove { width: 28px; margin: 0; padding: 8px 0; }
+  .rule-dialog-footer { display: flex; align-items: center; gap: 10px; }
+  .rule-dialog-footer .el-button { margin: 0; }
+  .rule-count { margin-right: auto; font-size: 13px; color: #909399; }
+
+  @media (max-width: 600px) {
+    > .el-dialog__body { padding: 12px; }
+    .condition-row { grid-template-columns: minmax(0, 1fr) 28px; }
+    .condition-row > .cell-field { grid-column: 1; }
+    .condition-row > .row-remove { grid-column: 2; grid-row: 1; }
+    .condition-row > .cell-op, .condition-row > .cell-value { grid-column: 1; }
+    .target-row { grid-template-columns: repeat(2, minmax(0, 1fr)) 28px; }
+    .target-row > .cell-field { grid-column: 1 / 3; }
+    .target-row > .row-remove { grid-column: 3; }
+    .target-attr:nth-of-type(odd) { grid-column: 1; }
+    .target-attr:nth-of-type(even) { grid-column: 2; }
+  }
+}
+</style>

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -5,7 +5,7 @@
       size="mini"
       label-position="left"
       label-width="120px"
-      class="setting-form"
+      class="setting-form form-settings-panel"
       @submit.native.prevent
     >
       <el-collapse v-model="formActiveCollapseNames" class="setting-collapse">
@@ -359,9 +359,12 @@
         </el-collapse-item>
         <el-collapse-item name="4" title="列表标签页信息（仅列表表单生效）">
           <el-form-item label-width="0">
-            <span style="color:rgba(0,0,0,0.45); font-size: 12px; line-height: 1.6;display:block;">
+            <el-tooltip placement="left" popper-class="xform-setting-help">
+            <span slot="content">
               本组配置只从「查询列表页」所用的表单读取，在详情/编辑表单里设置不会生效
             </span>
+            <span>适用范围<i class="el-icon-info setting-help-icon" tabindex="0"></i></span>
+            </el-tooltip>
           </el-form-item>
           <el-form-item :label="i18nt('列表启用详情多标签')">
             <el-switch v-model="formConfig.multiTabEnabled"></el-switch>
@@ -379,17 +382,21 @@
           >
             <el-switch v-model="formConfig.addTabEnabled"></el-switch>
             <span style="margin-left: 8px; color: #999; font-size: 12px">
-              开启后新增打开独立可关闭页签，需配置「标签名称字段」
+              <el-tooltip content="开启后新增打开独立可关闭页签，需配置标签名称字段。" placement="left" popper-class="xform-setting-help">
+                <i class="el-icon-info setting-help-icon" tabindex="0" aria-label="新增页签说明"></i>
+              </el-tooltip>
             </span>
           </el-form-item>
-          <el-form-item :label="i18nt('流程启动后行为')" class="form-item-label-top">
+          <el-form-item class="stacked-setting submit-behavior-setting">
+            <span slot="label">{{ i18nt('流程启动后行为') }}
+              <el-tooltip content="详情页保存并提交、直接启动流程成功后的行为，不填默认刷新当前页签。" placement="left" popper-class="xform-setting-help">
+                <i class="el-icon-info setting-help-icon" tabindex="0" aria-label="流程启动后行为说明"></i>
+              </el-tooltip>
+            </span>
             <el-radio-group v-model="formConfig.submitBehavior">
               <el-radio label="closeToList">关闭页签并回列表刷新</el-radio>
               <el-radio label="refreshCurrent">刷新当前页签</el-radio>
             </el-radio-group>
-            <div style="color: #999; font-size: 12px; line-height: 1.6">
-              详情页「保存并提交」「直接启动流程」成功后的行为，不填默认「刷新当前页签」
-            </div>
           </el-form-item>
         </el-collapse-item>
         <el-collapse-item name="5" title="其他标签页信息">
@@ -406,11 +413,11 @@
           <el-form-item :label="i18nt('隐藏常规标签')">
             <el-switch v-model="formConfig.hideNormalTab"></el-switch>
           </el-form-item>
-          <el-form-item :label="i18nt('其他标签页配置')" class="form-item-label-top" label-width="0">
+          <el-form-item :label="i18nt('其他标签页配置')" class="stacked-setting other-tabs-setting">
             <div>
               <draggable
                 tag="ul"
-                class="draggable-box"
+                class="other-tabs-list"
                 :list="formConfig.otherTabList"
                 v-bind="{
                   group: 'optionsGroup',
@@ -1792,3 +1799,61 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
   word-break: break-all;
 }
 </style>
+
+<style lang="scss">
+.form-settings-panel.setting-form {
+  .el-form-item {
+    min-width: 0;
+  }
+  .el-form-item > .el-form-item__label {
+    flex-shrink: 0;
+    white-space: normal !important;
+    overflow-wrap: anywhere;
+    line-height: 20px;
+    text-align: left;
+  }
+  .el-form-item > .el-form-item__content {
+    min-width: 0;
+    line-height: 28px;
+  }
+  .el-form-item__content > .el-input,
+  .el-form-item__content > .el-select,
+  .el-form-item__content > .el-textarea { width: 100% !important; min-width: 0; }
+  .el-form-item__content > .el-select { width: calc(100% - 28px) !important; }
+  .el-form-item__content > a { max-width: 100%; overflow: hidden; text-overflow: ellipsis; }
+  .el-radio { margin: 0 12px 4px 0; white-space: normal; line-height: 22px; }
+  .el-collapse-item__header { height: auto; min-height: 42px; line-height: 22px; padding: 8px 0; }
+  .el-collapse-item__arrow { flex-shrink: 0; }
+  .el-form-item.stacked-setting {
+    display: block !important;
+    > .el-form-item__label {
+      float: none;
+      display: block !important;
+      width: 100% !important;
+      padding: 0 0 8px;
+    }
+    > .el-form-item__content { margin-left: 0 !important; width: 100%; }
+  }
+  .submit-behavior-setting .el-radio-group { display: flex; flex-direction: column; gap: 8px; }
+  .submit-behavior-setting .el-radio { display: flex; align-items: baseline; margin: 0; }
+  .other-tabs-list { padding: 0; margin: 0; width: 100%; }
+  .other-tabs-list > li {
+    display: grid;
+    grid-template-columns: 18px minmax(0, 1fr) 28px;
+    align-items: center;
+    gap: 8px;
+    padding: 10px 8px;
+    margin-bottom: 10px;
+    list-style: none;
+    background: #f5f7fa;
+    border-radius: 4px;
+  }
+  .other-tabs-list > li > .el-input { grid-column: 2; width: 100% !important; min-width: 0; margin: 0; }
+  .other-tabs-list .drag-option { grid-column: 1; grid-row: 1 / 3; cursor: move; color: #909399; }
+  .other-tabs-list .col-delete-button { grid-column: 3; grid-row: 1 / 3; margin: 0; padding: 6px; }
+  .tree-options-error { overflow-wrap: anywhere; margin-bottom: 8px; }
+}
+.setting-help-icon { margin-left: 8px; color: #909399; cursor: help; font-size: 14px; }
+.setting-help-icon:hover, .setting-help-icon:focus { color: #409eff; }
+.el-tooltip__popper.xform-setting-help { max-width: 300px; line-height: 1.7; overflow-wrap: anywhere; }
+</style>

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} 首次初始化是否跳过动态列加载。 */
@@ -4539,7 +4537,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];