@fecp/designer 5.4.62 → 5.4.64

package/es/designer/src/packages/form/property/subForm.vue.mjs

@@ -10,7 +10,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                 */
 import { computed, ref, createBlock, openBlock, unref, isRef, withCtx, createVNode, createElementBlock, createCommentVNode, createTextVNode, Fragment } from "vue";
 import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
-import TemplateSelector from "../../../components/TemplateSelector.vue.mjs";
+import TemplateSelector from "../../../components/TemplateSelector.vue2.mjs";
 import emitter from "../../utils/eventBus.mjs";
 import ValueSelector from "../../../components/ValueSelector.vue.mjs";
 import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";

package/es/designer/src/packages/form/property/subTable.vue.mjs

@@ -23,7 +23,7 @@ import "../../../../../node_modules/element-plus/theme-chalk/el-dropdown-item.cs
 /* empty css                                                                     */
 import { computed, ref, watch, createBlock, openBlock, withCtx, createVNode, createElementBlock, createCommentVNode, createTextVNode, Fragment, renderList, createElementVNode, toDisplayString } from "vue";
 import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
-import TemplateSelector from "../../../components/TemplateSelector.vue.mjs";
+import TemplateSelector from "../../../components/TemplateSelector.vue2.mjs";
 import emitter from "../../utils/eventBus.mjs";
 import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
 import api from "../../../api/index.mjs";

package/es/designer/src/packages/form/property/widgets.vue.mjs

@@ -18,22 +18,44 @@ import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
 /* empty css                                                                  */
 /* empty css                                                                        */
 /* empty css                                                                  */
-import { computed, ref, watch, createBlock, openBlock, unref, isRef, withCtx, createVNode, createElementBlock, Fragment, renderList, createCommentVNode, createTextVNode, createElementVNode } from "vue";
-import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
+import { computed, reactive, ref, watch, createBlock, openBlock, unref, isRef, withCtx, createVNode, createElementBlock, Fragment, renderList, createCommentVNode, createTextVNode, createElementVNode } from "vue";
+import { getEditConfigData } from "../../utils/common.mjs";
 import OptionConfig from "../../../components/OptionConfig.vue.mjs";
-import components from "../aside/index.mjs";
+import components, { defaultProperty } from "../aside/index.mjs";
 import EventConfigButton from "../../../components/EventConfigButton.vue.mjs";
-import _sfc_main$3 from "../../../components/DataSourceSelect.vue.mjs";
+import _sfc_main$2 from "../../../components/DataSourceSelect.vue.mjs";
 import ConditionConfigButton from "../../../components/ConditionConfigButton.vue2.mjs";
 import DefaultValueEditor from "../components/DefaultValueEditor.vue.mjs";
 import emitter from "../../utils/eventBus.mjs";
 import FieldSetMapping from "../../../components/FieldSetMapping.vue2.mjs";
 import OnlyFLowConfigButton from "../../../components/OnlyFLowConfigButton.vue2.mjs";
-import _sfc_main$2 from "../../../components/FormulaEditorInput.vue.mjs";
+import _sfc_main$1 from "../../../components/FormulaEditorInput.vue.mjs";
 import api from "../../../api/index.mjs";
-import _sfc_main$1 from "../../../components/DialogSelect.vue.mjs";
-/* empty css              */
+/* empty css                                                                  */
+/* empty css                                                                   */
+/* empty css                                                                  */
+/* empty css                                                                   */
+/* empty css                                                                 */
+/* empty css                                                                     */
+/* empty css                                                                  */
+/* empty css                                                                  */
+/* empty css                                                                */
+/* empty css                                                                */
+/* empty css                                                                      */
+import "../../../../../node_modules/element-plus/theme-chalk/el-tooltip.css.mjs";
+/* empty css                                                                 */
+/* empty css                                                                        */
+/* empty css                                       */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
+/* empty css                                                                 */
+/* empty css                                                                   */
+import "../../../components/TemplateSelector.vue.mjs";
+import "../../table/default.mjs";
+/* empty css                                 */
+/* empty css                       */
+/* empty css                             */
+import store from "../../../store/index.mjs";
+/* empty css              */
 import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";
 import { ElSelect, ElOption } from "../../../../../node_modules/element-plus/es/components/select/index.mjs";
 import { ElForm, ElFormItem } from "../../../../../node_modules/element-plus/es/components/form/index.mjs";
@@ -80,8 +102,17 @@ const _hoisted_20 = {
 const _sfc_main = {
   __name: "widgets",
   setup(__props) {
-    const currentItem = computed(() => {
-      return getCurrentItem();
+    const currentItem = computed({
+      get: () => {
+        const item = store.getters.selectedItem;
+        if (item) {
+          return reactive({ ...defaultProperty, ...item });
+        }
+        return item;
+      },
+      set(value) {
+        store.commit("set_selected_item", value);
+      }
     });
     const activeName = ref(["common"]);
     const validationRules = {
@@ -124,23 +155,9 @@ const _sfc_main = {
       ];
     });
     const fieldTypes = computed(() => {
-      const fieldTypeArr = [
-        "text",
-        "textarea",
-        "number",
-        "date",
-        "select",
-        "multipleSelection",
-        "radio",
-        "checkbox",
-        "switch"
-      ];
       const basicComponents = components.find((c) => c.name === "basic");
-      return [
-        ...basicComponents == null ? void 0 : basicComponents.children.filter(
-          (item) => fieldTypeArr.includes(item.fieldType)
-        )
-      ];
+      const advancedComponents = components.find((c) => c.name === "advanced");
+      return [...basicComponents == null ? void 0 : basicComponents.children, ...advancedComponents == null ? void 0 : advancedComponents.children];
     });
     function handleFieldTypeChange(fieldType) {
       const item = currentItem.value;
@@ -617,15 +634,28 @@ const _sfc_main = {
                       ]),
                       createElementVNode("div", _hoisted_4, [
                         _cache[69] || (_cache[69] = createElementVNode("span", { class: "field-label" }, "选择弹层", -1)),
-                        createVNode(_sfc_main$1, {
+                        createVNode(_component_el_select, {
                           modelValue: unref(currentItem).suffixDialogId,
                           "onUpdate:modelValue": _cache[20] || (_cache[20] = ($event) => unref(currentItem).suffixDialogId = $event),
+                          placeholder: "请选择弹层",
+                          filterable: "",
                           loading: unref(dialogLoading),
-                          dialogOptions: unref(dialogOptions),
-                          isGlobal: unref(currentItem).dialogSource == "global"
-                        }, null, 8, ["modelValue", "loading", "dialogOptions", "isGlobal"])
+                          clearable: "",
+                          style: { "width": "100%" }
+                        }, {
+                          default: withCtx(() => [
+                            (openBlock(true), createElementBlock(Fragment, null, renderList(unref(dialogOptions), (dialog) => {
+                              return openBlock(), createBlock(_component_el_option, {
+                                key: dialog.id,
+                                label: dialog.name,
+                                value: dialog.id
+                              }, null, 8, ["label", "value"]);
+                            }), 128))
+                          ]),
+                          _: 1
+                        }, 8, ["modelValue", "loading"])
                       ]),
-                      unref(currentItem).dialogSource == "global" && unref(currentItem).suffixDialogId && unref(currDialog).contentSource === "table" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+                      unref(currentItem).dialogSource == "global" && unref(currentItem).suffixDialogId ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                         createElementVNode("div", _hoisted_5, [
                           _cache[73] || (_cache[73] = createElementVNode("span", { class: "field-label" }, "选择模式", -1)),
                           createVNode(_component_el_radio_group, {
@@ -659,7 +689,7 @@ const _sfc_main = {
                         unref(currentItem).selectionMode != "none" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                           createElementVNode("div", _hoisted_6, [
                             _cache[74] || (_cache[74] = createElementVNode("span", { class: "field-label" }, "反显格式", -1)),
-                            createVNode(unref(_sfc_main$2), {
+                            createVNode(unref(_sfc_main$1), {
                               title: "反显格式配置",
                               formulaConf: unref(currentItem).displayFormat,
                               "onUpdate:formulaConf": _cache[22] || (_cache[22] = ($event) => unref(currentItem).displayFormat = $event),
@@ -830,7 +860,7 @@ const _sfc_main = {
                   unref(currentItem).fieldType === "cascader" ? (openBlock(), createElementBlock(Fragment, { key: 7 }, [
                     createVNode(_component_el_form_item, { label: "数据源" }, {
                       default: withCtx(() => [
-                        createVNode(_sfc_main$3, {
+                        createVNode(_sfc_main$2, {
                           modelValue: unref(currentItem).optionConfig.dataSourceValue,
                           "onUpdate:modelValue": _cache[34] || (_cache[34] = ($event) => unref(currentItem).optionConfig.dataSourceValue = $event)
                         }, null, 8, ["modelValue"])
@@ -1141,7 +1171,7 @@ const _sfc_main = {
                         }, null, 8, ["condition", "onConfirm"])
                       ])) : createCommentVNode("", true),
                       unref(currentItem).validationType === "custom" ? (openBlock(), createElementBlock("div", _hoisted_20, [
-                        createVNode(_sfc_main$3, {
+                        createVNode(_sfc_main$2, {
                           modelValue: unref(currentItem).validationDataSource,
                           "onUpdate:modelValue": _cache[52] || (_cache[52] = ($event) => unref(currentItem).validationDataSource = $event)
                         }, null, 8, ["modelValue"])
@@ -1168,7 +1198,7 @@ const _sfc_main = {
     };
   }
 };
-const widgets = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-3dab7919"]]);
+const widgets = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8b0152bc"]]);
 export {
   widgets as default
 };

package/es/designer.css

@@ -3235,17 +3235,17 @@ to {
   width: 100%;
 }
 
-.collapse-header[data-v-3dab7919] {
+.collapse-header[data-v-8b0152bc] {
   display: flex;
   align-items: center;
   justify-content: space-between;
   width: 100%;
   padding-right: 20px;
 }
-.setting[data-v-3dab7919] .el-collapse-item__content {
+.setting[data-v-8b0152bc] .el-collapse-item__content {
   position: relative;
 }
-.field-type-select[data-v-3dab7919] {
+.field-type-select[data-v-8b0152bc] {
   position: absolute;
   top: 11px;
   right: 16px;
@@ -3256,41 +3256,41 @@ to {
   transition: all 0.3s;
   border-radius: 4px;
 }
-.field-type-select[data-v-3dab7919] .el-select__wrapper {
+.field-type-select[data-v-8b0152bc] .el-select__wrapper {
   background: transparent;
   box-shadow: none;
 }
-.field-type-select[data-v-3dab7919] .el-select__selected-item {
+.field-type-select[data-v-8b0152bc] .el-select__selected-item {
   text-align: center;
 }
-.width-input[data-v-3dab7919] {
+.width-input[data-v-8b0152bc] {
   width: 100%;
 }
-.data-source-fields[data-v-3dab7919] {
+.data-source-fields[data-v-8b0152bc] {
   display: flex;
   flex-direction: column;
   gap: 8px;
   margin-bottom: 18px;
 }
-.data-source-fields .field-item[data-v-3dab7919] {
+.data-source-fields .field-item[data-v-8b0152bc] {
   display: flex;
   align-items: center;
   gap: 8px;
 }
-.data-source-fields .field-item .field-label[data-v-3dab7919] {
+.data-source-fields .field-item .field-label[data-v-8b0152bc] {
   width: 80px;
   font-size: 13px;
   color: #606266;
   text-align: right;
   flex-shrink: 0;
 }
-.data-source-fields .field-item .field-label[data-v-3dab7919]::after {
+.data-source-fields .field-item .field-label[data-v-8b0152bc]::after {
   content: "：";
 }
-.data-source-fields .field-item .el-input[data-v-3dab7919] {
+.data-source-fields .field-item .el-input[data-v-8b0152bc] {
   flex: 1;
 }
-[data-v-3dab7919] .el-form-item__content {
+[data-v-8b0152bc] .el-form-item__content {
   flex-wrap: wrap !important;
 }
 .buttons-table[data-v-8ebdd5a8] {
@@ -5904,28 +5904,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-67c25477] {
+.fec-form[data-v-5e17ab81] {
   height: 100%;
 }
-[data-v-67c25477] .vgl-item {
+[data-v-5e17ab81] .vgl-item {
   transition: none;
 }
-[data-v-67c25477] .vgl-item > .el-form-item {
+[data-v-5e17ab81] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-67c25477] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-5e17ab81] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-67c25477] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-5e17ab81] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
-  pointer-events: none;
 }
-[data-v-67c25477] .vgl-item > .el-container {
+[data-v-5e17ab81] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-3e5372d4] {
   display: inline-block;
@@ -6261,17 +6260,18 @@ body,
   max-height: 90% !important;
   padding: 0 !important;
 }
-.fec-layout-row[data-v-18b8b23a] {
+.fec-layout-row[data-v-09545121] {
   width: 100%;
   height: 100%;
+  overflow: hidden;
 }
-.fec-layout-row[data-v-18b8b23a] .el-col {
+.fec-layout-row[data-v-09545121] .el-col {
   height: 100%;
 }
-.fec-layout-row[data-v-18b8b23a] .el-col .el-scrollbar__bar {
+.fec-layout-row[data-v-09545121] .el-col .el-scrollbar__bar {
   display: none;
 }
-.grid-content[data-v-18b8b23a] {
+.grid-content[data-v-09545121] {
   border-radius: 9px 9px 4px 4px;
   background-color: #fff;
   position: relative;
@@ -6282,7 +6282,7 @@ body,
       padding: 16px 16px 16px 16px;
     } */
 }
-.grid-content-statistics[data-v-18b8b23a] {
+.grid-content-statistics[data-v-09545121] {
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -6293,7 +6293,7 @@ body,
     height: 100%;
   } */
 }
-.grid-content-statistics[data-v-18b8b23a] .fec-layout-card:last-child {
+.grid-content-statistics[data-v-09545121] .fec-layout-card:last-child {
   margin-bottom: 0 !important;
   flex: 1;
 }
@@ -6334,7 +6334,7 @@ body,
   flex-grow: 1;
   padding-top: 12px;
 }
-.van-button__content[data-v-d189300b]:before {
+[data-v-191efc8d] .van-button__content:before {
   display: none;
 }:root,:host{--van-cell-font-size: var(--van-font-size-md);--van-cell-line-height: 24px;--van-cell-vertical-padding: 10px;--van-cell-horizontal-padding: var(--van-padding-md);--van-cell-text-color: var(--van-text-color);--van-cell-background: var(--van-background-2);--van-cell-border-color: var(--van-border-color);--van-cell-active-color: var(--van-active-color);--van-cell-required-color: var(--van-danger-color);--van-cell-label-color: var(--van-text-color-2);--van-cell-label-font-size: var(--van-font-size-sm);--van-cell-label-line-height: var(--van-line-height-sm);--van-cell-label-margin-top: var(--van-padding-base);--van-cell-value-color: var(--van-text-color-2);--van-cell-value-font-size: inherit;--van-cell-icon-size: 16px;--van-cell-right-icon-color: var(--van-gray-6);--van-cell-large-vertical-padding: var(--van-padding-sm);--van-cell-large-title-font-size: var(--van-font-size-lg);--van-cell-large-label-font-size: var(--van-font-size-md);--van-cell-large-value-font-size: inherit}.van-cell{position:relative;display:flex;box-sizing:border-box;width:100%;padding:var(--van-cell-vertical-padding) var(--van-cell-horizontal-padding);overflow:hidden;color:var(--van-cell-text-color);font-size:var(--van-cell-font-size);line-height:var(--van-cell-line-height);background:var(--van-cell-background)}.van-cell:after{position:absolute;box-sizing:border-box;content:" ";pointer-events:none;right:var(--van-padding-md);bottom:0;left:var(--van-padding-md);border-bottom:1px solid var(--van-cell-border-color);transform:scaleY(.5)}.van-cell:last-child:after,.van-cell--borderless:after{display:none}.van-cell__label{margin-top:var(--van-cell-label-margin-top);color:var(--van-cell-label-color);font-size:var(--van-cell-label-font-size);line-height:var(--van-cell-label-line-height)}.van-cell__title,.van-cell__value{flex:1}.van-cell__value{position:relative;overflow:hidden;color:var(--van-cell-value-color);font-size:var(--van-cell-value-font-size);text-align:right;vertical-align:middle;word-wrap:break-word}.van-cell__left-icon,.van-cell__right-icon{height:var(--van-cell-line-height);font-size:var(--van-cell-icon-size);line-height:var(--van-cell-line-height)}.van-cell__left-icon{margin-right:var(--van-padding-base)}.van-cell__right-icon{margin-left:var(--van-padding-base);color:var(--van-cell-right-icon-color)}.van-cell--clickable{cursor:pointer}.van-cell--clickable:active{background-color:var(--van-cell-active-color)}.van-cell--required{overflow:visible}.van-cell--required:before{position:absolute;left:var(--van-padding-xs);color:var(--van-cell-required-color);font-size:var(--van-cell-font-size);content:"*"}.van-cell--center{align-items:center}.van-cell--large{padding-top:var(--van-cell-large-vertical-padding);padding-bottom:var(--van-cell-large-vertical-padding)}.van-cell--large .van-cell__title{font-size:var(--van-cell-large-title-font-size)}.van-cell--large .van-cell__label{font-size:var(--van-cell-large-label-font-size)}.van-cell--large .van-cell__value{font-size:var(--van-cell-large-value-font-size)}
 :root,:host{--van-cell-group-background: var(--van-background-2);--van-cell-group-title-color: var(--van-text-color-2);--van-cell-group-title-padding: var(--van-padding-md) var(--van-padding-md);--van-cell-group-title-font-size: var(--van-font-size-md);--van-cell-group-title-line-height: 16px;--van-cell-group-inset-padding: 0 var(--van-padding-md);--van-cell-group-inset-radius: var(--van-radius-lg);--van-cell-group-inset-title-padding: var(--van-padding-md) var(--van-padding-md)}.van-cell-group{background:var(--van-cell-group-background)}.van-cell-group--inset{margin:var(--van-cell-group-inset-padding);border-radius:var(--van-cell-group-inset-radius);overflow:hidden}.van-cell-group__title{padding:var(--van-cell-group-title-padding);color:var(--van-cell-group-title-color);font-size:var(--van-cell-group-title-font-size);line-height:var(--van-cell-group-title-line-height)}.van-cell-group__title--inset{padding:var(--van-cell-group-inset-title-padding)}

package/es/packages/mobile/src/components/base/button/Button.vue.mjs

@@ -21,7 +21,7 @@ function _sfc_render(_ctx, _cache) {
     })
   ]), 1040);
 }
-const _Button = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-d189300b"]]);
+const _Button = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-191efc8d"]]);
 export {
   _Button as default
 };

package/es/packages/vue/src/components/forms/form/Form.vue.mjs

@@ -117,8 +117,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const dataSourceOptions = ref({});
     const dictionaryOptions = ref({});
     const productData = ref({});
-    const fieldsData = ref([]);
-    const hiddenFields = ref([]);
+    const fieldsData = ref({});
+    const hiddenFields = ref({});
     const rowHeight = ref(1);
     const pageEvents = props.canPageEvent ? usePageEvents(() => ({
       pageEventConfig: localConfig.value.pageEventConfig,
@@ -764,9 +764,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         ...Object.keys(oldData || {})
       ]);
       for (const key of allKeys) {
-        const newVal = newData[key];
-        const oldVal = oldData[key];
-        if (!newVal && !oldVal && Object.keys(oldData || {}).length != 0) {
+        const hasKeyInNew = newData && Object.prototype.hasOwnProperty.call(newData, key);
+        const hasKeyInOld = oldData && Object.prototype.hasOwnProperty.call(oldData, key);
+        if (!hasKeyInNew && !hasKeyInOld) {
+          continue;
+        }
+        const newVal = hasKeyInNew ? newData[key] : void 0;
+        const oldVal = hasKeyInOld ? oldData[key] : void 0;
+        if (!newVal && !oldVal && Object.keys(oldData || {}).length === 0) {
           continue;
         }
         if (JSON.stringify(newVal) != JSON.stringify(oldVal)) {
@@ -845,48 +850,40 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }
       });
       const updatedLayoutData = cloneDeep(oriGridLayoutData.value || []);
-      const allVisibilityFieldIds = /* @__PURE__ */ new Set();
-      relevantConfigs.visibility.forEach((item) => {
-        (item.dataLinkFieldList || []).forEach((fieldId) => {
-          allVisibilityFieldIds.add(fieldId);
-        });
-      });
-      allVisibilityFieldIds.forEach((fieldId) => {
-        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-        if (layoutFieldItem) {
-          layoutFieldItem.hidden = true;
-        }
-      });
       relevantConfigs.visibility.forEach((item) => {
+        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          (item.dataLinkFieldList || []).forEach((fieldId) => {
+          dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.hidden = false;
             }
           });
-        }
-      });
-      const allRequiredFieldIds = /* @__PURE__ */ new Set();
-      relevantConfigs.required.forEach((item) => {
-        (item.dataLinkFieldList || []).forEach((fieldId) => {
-          allRequiredFieldIds.add(fieldId);
-        });
-      });
-      allRequiredFieldIds.forEach((fieldId) => {
-        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-        if (layoutFieldItem) {
-          layoutFieldItem.component.required = false;
+        } else {
+          dataLinkFieldList.forEach((fieldId) => {
+            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+            if (layoutFieldItem) {
+              layoutFieldItem.hidden = true;
+            }
+          });
         }
       });
       relevantConfigs.required.forEach((item) => {
+        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          (item.dataLinkFieldList || []).forEach((fieldId) => {
+          dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.component.required = true;
             }
           });
+        } else {
+          dataLinkFieldList.forEach((fieldId) => {
+            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+            if (layoutFieldItem) {
+              layoutFieldItem.component.required = false;
+            }
+          });
         }
       });
       const rules = {};
@@ -902,48 +899,40 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         rules[fieldName] = prodRules.value[fieldName];
       }
       formRules.value = rules;
-      const allReadonlyFieldIds = /* @__PURE__ */ new Set();
-      relevantConfigs.readonly.forEach((item) => {
-        (item.dataLinkFieldList || []).forEach((fieldId) => {
-          allReadonlyFieldIds.add(fieldId);
-        });
-      });
-      allReadonlyFieldIds.forEach((fieldId) => {
-        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-        if (layoutFieldItem) {
-          layoutFieldItem.component.readOnly = false;
-        }
-      });
       relevantConfigs.readonly.forEach((item) => {
+        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          (item.dataLinkFieldList || []).forEach((fieldId) => {
+          dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.component.readOnly = true;
             }
           });
-        }
-      });
-      const allDisabledFieldIds = /* @__PURE__ */ new Set();
-      relevantConfigs.disabled.forEach((item) => {
-        (item.dataLinkFieldList || []).forEach((fieldId) => {
-          allDisabledFieldIds.add(fieldId);
-        });
-      });
-      allDisabledFieldIds.forEach((fieldId) => {
-        const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
-        if (layoutFieldItem) {
-          layoutFieldItem.component.disabled = false;
+        } else {
+          dataLinkFieldList.forEach((fieldId) => {
+            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+            if (layoutFieldItem) {
+              layoutFieldItem.component.readOnly = false;
+            }
+          });
         }
       });
       relevantConfigs.disabled.forEach((item) => {
+        const dataLinkFieldList = item.dataLinkFieldList || [];
         if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
-          (item.dataLinkFieldList || []).forEach((fieldId) => {
+          dataLinkFieldList.forEach((fieldId) => {
             const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
             if (layoutFieldItem) {
               layoutFieldItem.component.disabled = true;
             }
           });
+        } else {
+          dataLinkFieldList.forEach((fieldId) => {
+            const layoutFieldItem = updatedLayoutData.find((g) => g.id == fieldId);
+            if (layoutFieldItem) {
+              layoutFieldItem.component.disabled = false;
+            }
+          });
         }
       });
       gridLayoutFieldsData.value = updatedLayoutData.filter((item) => !item.hidden);
@@ -959,7 +948,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       linkaged = true;
     }
     watch(
-      () => cloneDeep(formData.value),
+      formData,
       (newVal, oldVal) => {
         if (!linkaged) {
           return;
@@ -968,12 +957,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           return;
         }
         const changedFields = findChangedFields(newVal, prevFormData.value);
-        console.log("🚀 ~ changedFields:", changedFields);
         if (changedFields.length > 0) {
           applyLinkageEffectsForChangedFields(changedFields);
-          prevFormData.value = { ...newVal };
-          emit("update:modelValue", getFormData());
         }
+        prevFormData.value = { ...newVal };
+        emit("update:modelValue", getFormData());
       },
       { deep: true }
     );
@@ -1099,7 +1087,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-67c25477"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5e17ab81"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/components/layout/Layout.vue.mjs

@@ -23,11 +23,16 @@ const _sfc_main = {
     initFormMode: {
       type: String,
       default: ""
+    },
+    initFormData: {
+      type: Object,
+      default: {}
     }
   },
   emits: ["loaded"],
   setup(__props, { emit: __emit }) {
-    const formData = ref({});
+    const props = __props;
+    const formData = ref(props.initFormData);
     const emit = __emit;
     const showCard = ref(false);
     function loaded(option, formData2) {
@@ -80,7 +85,7 @@ const _sfc_main = {
     };
   }
 };
-const _Layout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-18b8b23a"]]);
+const _Layout = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-09545121"]]);
 export {
   _Layout as default
 };

package/lib/designer/package.json.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.4.62";
+const version = "5.4.64";
 const packageJson = {
   version
 };