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

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;

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

@@ -1,285 +0,0 @@
-/**
- * 动态字段规则引擎(纯逻辑，无 Vue 上下文)。
- *
- * 供「表单级动态规则(form-setting)」与「容器级动态字段(container-item)」共用：
- *  - 目标收集：字段 + 命名容器，建立 目标key -> { widget, refKey, isContainer } 映射与设计基线
- *  - 规则计算：本地条件/逻辑求值，输出每个目标的最终状态
- *  - 状态落地：通过 getWidgetRef 应用到运行时组件，无 ref 时回退改 schema
- */
-import {
-  traverseFieldWidgets,
-  traverseContainerWidgets,
-  traverseFieldWidgetsOfContainer,
-} from "../../../../components/xform/utils/util";
-
-// 布局内格容器，不作为可控目标
-const EXCLUDED_CONTAINER_TYPES = ["grid-col", "table-cell", "h5-table-cell"];
-
-export function getModelKey(w) {
-  return (w.options.keyNameEnabled && w.options.keyName) || w.options.name;
-}
-
-function addFieldTo(map, baseline, w) {
-  if (!w || !w.options) return;
-  const key = getModelKey(w);
-  if (!key) return;
-  map[key] = { widget: w, refKey: w.options.name, isContainer: false };
-  baseline[key] = {
-    visible: !w.options.hidden,
-    required: !!w.options.required,
-    readonly: !!w.options.readonly,
-    disabled: !!w.options.disabled,
-  };
-}
-
-function addContainerTo(map, baseline, w) {
-  if (!w || !w.options || !w.options.name) return;
-  if (EXCLUDED_CONTAINER_TYPES.indexOf(w.type) > -1) return;
-  const key = w.options.name;
-  if (map[key]) return;
-  map[key] = { widget: w, refKey: key, isContainer: true };
-  baseline[key] = { visible: !w.options.hidden };
-}
-
-// 整个表单范围：字段 + 命名容器(跳过弹窗/抽屉内部)
-export function buildFormTargetMap(widgetList) {
-  const map = {};
-  const baseline = {};
-  traverseFieldWidgets(widgetList || [], (w) => addFieldTo(map, baseline, w));
-  traverseContainerWidgets(
-    widgetList || [],
-    (w) => addContainerTo(map, baseline, w),
-    true
-  );
-  return { map, baseline };
-}
-
-// 单个容器范围：容器内字段 + 命名子容器
-export function buildContainerTargetMap(container) {
-  const map = {};
-  const baseline = {};
-  traverseFieldWidgetsOfContainer(container, (w) => addFieldTo(map, baseline, w));
-  collectNamedContainersInContainer(container).forEach((w) =>
-    addContainerTo(map, baseline, w)
-  );
-  return { map, baseline };
-}
-
-// 递归收集指定容器内「命名的子容器」
-export function collectNamedContainersInContainer(root) {
-  const out = [];
-  const walk = (w, isRoot) => {
-    if (!w || w.category !== "container") return;
-    if (
-      !isRoot
-      && w.options
-      && w.options.name
-      && EXCLUDED_CONTAINER_TYPES.indexOf(w.type) === -1
-    ) {
-      out.push(w);
-    }
-    if (Array.isArray(w.rows)) {
-      w.rows.forEach((row) => {
-        (row.cols || []).forEach((cell) => walk(cell, false));
-      });
-    }
-    ["cols", "tabs", "widgetList", "panes", "buttonWidgetList"].forEach((k) => {
-      if (Array.isArray(w[k])) w[k].forEach((c) => walk(c, false));
-    });
-  };
-  walk(root, true);
-  return out;
-}
-
-/* ------------------- 层级下拉选项(供设计器) ------------------- */
-// 构建带层级的目标候选(字段 + 容器)，按表单树 DFS 顺序输出，附带 depth。
-// 布局内格(grid-col/table-cell 等)不单独成节点，仅作为透明层向下展开。
-function makeTreeBuilder() {
-  const nodes = [];
-  const visitList = (list, depth) => {
-    (list || []).forEach((w) => visit(w, depth));
-  };
-  const visitChildren = (w, depth) => {
-    if (Array.isArray(w.rows)) {
-      w.rows.forEach((row) => visitList((row && row.cols) || [], depth));
-    }
-    ["cols", "tabs", "widgetList", "panes", "buttonWidgetList"].forEach((k) => {
-      if (Array.isArray(w[k])) visitList(w[k], depth);
-    });
-  };
-  const visit = (w, depth) => {
-    if (!w) return;
-    if (w.category === "container") {
-      // 布局内格：透明展开，深度不变
-      if (EXCLUDED_CONTAINER_TYPES.indexOf(w.type) > -1) {
-        visitChildren(w, depth);
-        return;
-      }
-      const name = w.options && w.options.name;
-      nodes.push({
-        value: name || "__c_" + w.id,
-        baseLabel: (w.options && (w.options.label || name)) || w.type,
-        depth,
-        isContainer: true,
-        hasName: !!name,
-        type: w.type,
-      });
-      visitChildren(w, depth + 1);
-    } else if (w.formItemFlag) {
-      const key = getModelKey(w);
-      if (!key) return;
-      nodes.push({
-        value: key,
-        baseLabel: (w.options.label || key) + " (" + key + ")",
-        depth,
-        isContainer: false,
-        hasName: true,
-        type: w.type,
-      });
-    }
-  };
-  return { nodes, visitList, visitChildren };
-}
-
-// 整个表单范围的层级候选
-export function buildWidgetTreeOptions(rootList) {
-  const b = makeTreeBuilder();
-  b.visitList(rootList || [], 0);
-  return b.nodes;
-}
-
-// 单个容器范围的层级候选(不含容器自身，从其子级开始)
-export function buildContainerTreeOptions(container) {
-  const b = makeTreeBuilder();
-  if (container) b.visitChildren(container, 0);
-  return b.nodes;
-}
-
-/* ------------------- 规则计算 ------------------- */
-export function computeLocalStates(rules, baseline, formModel) {
-  const list = rules || [];
-  const states = {};
-  const ensure = (key) => {
-    if (!states[key]) {
-      const base = baseline[key] || { visible: true };
-      states[key] = Object.assign({}, base);
-    }
-    return states[key];
-  };
-  // 先把所有规则涉及的目标置为基线，未命中时即还原
-  list.forEach((rule) => {
-    (rule.targets || []).forEach((t) => t.field && ensure(t.field));
-  });
-  list.forEach((rule) => {
-    if (!evalRule(rule, formModel)) return;
-    (rule.targets || []).forEach((t) => {
-      if (!t.field) return;
-      const s = ensure(t.field);
-      if (t.visible !== undefined && t.visible !== null) s.visible = !!t.visible;
-      if (t.required !== undefined && t.required !== null) {
-        s.required = !!t.required;
-      }
-      if (t.readonly !== undefined && t.readonly !== null) {
-        s.readonly = !!t.readonly;
-      }
-      if (t.disabled !== undefined && t.disabled !== null) {
-        s.disabled = !!t.disabled;
-      }
-    });
-  });
-  return states;
-}
-
-export function evalRule(rule, model) {
-  const conds = (rule && rule.conditions) || [];
-  if (!conds.length) return true;
-  if (rule.logic === "or") {
-    return conds.some((c) => evalCondition(c, model));
-  }
-  return conds.every((c) => evalCondition(c, model));
-}
-
-export function evalCondition(cond, model) {
-  if (!cond || !cond.field) return false;
-  const actual = model ? model[cond.field] : undefined;
-  const expected = cond.value;
-  const isEmpty = (v) =>
-    v === undefined
-    || v === null
-    || v === ""
-    || (Array.isArray(v) && v.length === 0);
-  const toList = (v) =>
-    String(v == null ? "" : v)
-      .split(",")
-      .map((s) => s.trim())
-      .filter((s) => s !== "");
-  switch (cond.operator) {
-    case "eq":
-      return String(actual) === String(expected);
-    case "ne":
-      return String(actual) !== String(expected);
-    case "gt":
-      return Number(actual) > Number(expected);
-    case "lt":
-      return Number(actual) < Number(expected);
-    case "ge":
-      return Number(actual) >= Number(expected);
-    case "le":
-      return Number(actual) <= Number(expected);
-    case "in":
-      return toList(expected).includes(String(actual));
-    case "nin":
-      return !toList(expected).includes(String(actual));
-    case "includes":
-      return Array.isArray(actual)
-        ? actual.map(String).includes(String(expected))
-        : String(actual == null ? "" : actual).indexOf(String(expected)) > -1;
-    case "empty":
-      return isEmpty(actual);
-    case "notEmpty":
-      return !isEmpty(actual);
-    default:
-      return false;
-  }
-}
-
-/* ------------------- 状态落地 ------------------- */
-// entry: { widget, refKey, isContainer }；getWidgetRef: (name) => 运行时组件ref
-export function applyTargetState(entry, state, getWidgetRef) {
-  if (!entry || !state) return;
-  const widget = entry.widget;
-  const isContainer = entry.isContainer;
-  const ref = getWidgetRef ? getWidgetRef(entry.refKey) : null;
-  const hasVisible = state.visible !== undefined && state.visible !== null;
-  if (ref) {
-    if (hasVisible && ref.setHidden) ref.setHidden(!state.visible);
-    if (isContainer) return;
-    if (state.required !== undefined && state.required !== null && ref.setRequired) {
-      ref.setRequired(!!state.required);
-    }
-    if (state.readonly !== undefined && state.readonly !== null && ref.setReadonly) {
-      ref.setReadonly(!!state.readonly);
-    }
-    if (state.disabled !== undefined && state.disabled !== null && ref.setDisabled) {
-      ref.setDisabled(!!state.disabled);
-    }
-    if (state.options !== undefined && state.options !== null && ref.setOptions) {
-      ref.setOptions(state.options);
-    }
-    if (state.value !== undefined && ref.setValue) {
-      ref.setValue(state.value);
-    }
-  } else {
-    if (hasVisible) widget.options.hidden = !state.visible;
-    if (isContainer) return;
-    if (state.required !== undefined && state.required !== null) {
-      widget.options.required = !!state.required;
-    }
-    if (state.readonly !== undefined && state.readonly !== null) {
-      widget.options.readonly = !!state.readonly;
-    }
-    if (state.disabled !== undefined && state.disabled !== null) {
-      widget.options.disabled = !!state.disabled;
-    }
-  }
-}