@fecp/designer 5.3.8 → 5.3.10

package/lib/packages/designer/src/packages/form/index.vue.js

@@ -4,13 +4,6 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                                                                                                         */
 ;/* empty css                                                                                                                                    */
 ;/* empty css                                                                                                                                       */
-;/* empty css                                                                                                                                      */
-;/* empty css                                                                                                                                            */
-;/* empty css                                                                                                                                      */
-;/* empty css                                                                                                                                        */
-require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/theme-chalk/el-dropdown-menu.css.js");
-;/* empty css                                                                                                                                        */
-;/* empty css                                                                                                                                     */
 const vue = require("vue");
 const eventBus = require("../utils/eventBus.js");
 require("../../../../../node_modules/.pnpm/grid-layout-plus@1.1.1_vue@3.5.13_typescript@5.7.3_/node_modules/grid-layout-plus/es/index.js");
@@ -35,11 +28,8 @@ const index$1 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_v
 const index$2 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.js");
 const gridLayout_vue = require("../../../../../node_modules/.pnpm/grid-layout-plus@1.1.1_vue@3.5.13_typescript@5.7.3_/node_modules/grid-layout-plus/es/components/grid-layout.vue.js");
 const index$3 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/icon/index.js");
-const index$5 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/dropdown/index.js");
-const index$6 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.js");
-const index$7 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/checkbox/index.js");
-const index$8 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/divider/index.js");
-const index$9 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.js");
+const index$5 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/divider/index.js");
+const index$6 = require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.js");
 const _hoisted_1 = { class: "form-work-area" };
 const _hoisted_2 = { class: "form-grid-container" };
 const _hoisted_3 = ["onMouseenter", "onClick"];
@@ -48,22 +38,19 @@ const _hoisted_4 = {
   class: "component-toolbar"
 };
 const _hoisted_5 = ["onClick"];
-const _hoisted_6 = { class: "quick-setting-panel" };
-const _hoisted_7 = { class: "setting-row" };
-const _hoisted_8 = { class: "setting-row" };
-const _hoisted_9 = { class: "setting-row" };
-const _hoisted_10 = ["onClick"];
-const _hoisted_11 = ["onClick"];
-const _hoisted_12 = { class: "status-tags" };
-const _hoisted_13 = {
+const _hoisted_6 = ["onClick"];
+const _hoisted_7 = ["onClick"];
+const _hoisted_8 = ["onClick"];
+const _hoisted_9 = { class: "status-tags" };
+const _hoisted_10 = {
   key: 0,
   class: "field-name-tag"
 };
-const _hoisted_14 = {
+const _hoisted_11 = {
   key: 1,
   class: "status-tag disabled-tag"
 };
-const _hoisted_15 = {
+const _hoisted_12 = {
   key: 2,
   class: "status-tag readonly-tag"
 };
@@ -182,7 +169,7 @@ const _sfc_main = {
         };
         editConfigData.value.deletedFields.push(deletedField);
         layoutData.value.splice(index2, 1);
-        index$9.ElMessage.success("字段已移至回收站");
+        index$6.ElMessage.success("字段已移至回收站");
       }
     }
     function handleHide(item) {
@@ -319,13 +306,7 @@ const _sfc_main = {
     eventBus.default.on("resizeEvent", () => {
       gridLayout.value.resizeEvent();
     });
-    const dropdownVisibleMap = vue.ref(/* @__PURE__ */ new Map());
-    function getDropdownVisible(itemId) {
-      return dropdownVisibleMap.value.get(itemId) || false;
-    }
-    function setDropdownVisible(itemId, visible) {
-      dropdownVisibleMap.value.set(itemId, visible);
-    }
+    vue.ref(/* @__PURE__ */ new Map());
     const isDragging = vue.computed(() => {
       var _a;
       return ((_a = gridLayout.value) == null ? void 0 : _a.state.isDragging) || false;
@@ -345,12 +326,8 @@ const _sfc_main = {
     });
     return (_ctx, _cache) => {
       const _component_el_icon = index$3.ElIcon;
-      const _component_el_input = index$6.ElInput;
-      const _component_el_checkbox = index$7.ElCheckbox;
-      const _component_el_dropdown_menu = index$5.ElDropdownMenu;
-      const _component_el_dropdown = index$5.ElDropdown;
       const _component_Hide = vue.resolveComponent("Hide");
-      const _component_el_divider = index$8.ElDivider;
+      const _component_el_divider = index$5.ElDivider;
       const _component_el_form = index$2.ElForm;
       const _component_el_scrollbar = index$1.ElScrollbar;
       return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
@@ -413,76 +390,18 @@ const _sfc_main = {
                                   _: 2
                                 }, 1024)
                               ], 10, _hoisted_5),
-                              vue.createVNode(_component_el_dropdown, {
-                                "popper-class": `form-quick-setting-${item.i}`,
-                                trigger: "click",
-                                placement: "bottom",
-                                "hide-on-click": false,
-                                onVisibleChange: (visible) => setDropdownVisible(item.id, visible)
-                              }, {
-                                dropdown: vue.withCtx(() => [
-                                  getDropdownVisible(item.id) ? (vue.openBlock(), vue.createBlock(_component_el_dropdown_menu, { key: 0 }, {
-                                    default: vue.withCtx(() => [
-                                      vue.createElementVNode("div", _hoisted_6, [
-                                        vue.createElementVNode("div", _hoisted_7, [
-                                          _cache[3] || (_cache[3] = vue.createElementVNode("span", { class: "setting-label" }, "标题:", -1)),
-                                          vue.createVNode(_component_el_input, {
-                                            modelValue: item.component.label,
-                                            "onUpdate:modelValue": ($event) => item.component.label = $event,
-                                            size: "small",
-                                            class: "setting-input"
-                                          }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                                        ]),
-                                        vue.createElementVNode("div", _hoisted_8, [
-                                          _cache[4] || (_cache[4] = vue.createElementVNode("span", { class: "setting-label" }, "字段:", -1)),
-                                          vue.createVNode(_component_el_input, {
-                                            modelValue: item.component.fieldName,
-                                            "onUpdate:modelValue": ($event) => item.component.fieldName = $event,
-                                            size: "small",
-                                            class: "setting-input"
-                                          }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                                        ]),
-                                        vue.createElementVNode("div", _hoisted_9, [
-                                          vue.createVNode(_component_el_checkbox, {
-                                            modelValue: item.component.required,
-                                            "onUpdate:modelValue": ($event) => item.component.required = $event,
-                                            label: "必填",
-                                            size: "small"
-                                          }, null, 8, ["modelValue", "onUpdate:modelValue"]),
-                                          vue.createVNode(_component_el_checkbox, {
-                                            modelValue: item.component.readOnly,
-                                            "onUpdate:modelValue": ($event) => item.component.readOnly = $event,
-                                            label: "只读",
-                                            size: "small"
-                                          }, null, 8, ["modelValue", "onUpdate:modelValue"]),
-                                          vue.createVNode(_component_el_checkbox, {
-                                            modelValue: item.component.disabled,
-                                            "onUpdate:modelValue": ($event) => item.component.disabled = $event,
-                                            label: "禁用",
-                                            size: "small"
-                                          }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                                        ])
-                                      ])
-                                    ]),
-                                    _: 2
-                                  }, 1024)) : vue.createCommentVNode("", true)
-                                ]),
-                                default: vue.withCtx(() => [
-                                  item.component.fieldType != "blank" ? (vue.openBlock(), vue.createElementBlock("span", {
-                                    key: 0,
-                                    class: vue.normalizeClass(["toolbar-btn settings-btn", { "is-active": getDropdownVisible(item.id) }]),
-                                    title: "快捷设置"
-                                  }, [
-                                    vue.createVNode(_component_el_icon, null, {
-                                      default: vue.withCtx(() => [
-                                        vue.createVNode(vue.unref(index$4.Setting))
-                                      ]),
-                                      _: 1
-                                    })
-                                  ], 2)) : vue.createCommentVNode("", true)
-                                ]),
-                                _: 2
-                              }, 1032, ["popper-class", "onVisibleChange"]),
+                              vue.createElementVNode("span", {
+                                class: vue.normalizeClass(["toolbar-btn disabled-btn", { "is-disabled": item.component.disabled }]),
+                                title: "设置只读",
+                                onClick: vue.withModifiers(($event) => item.component.disabled = !item.component.disabled, ["stop"])
+                              }, [
+                                vue.createVNode(_component_el_icon, null, {
+                                  default: vue.withCtx(() => [
+                                    item.component.disabled ? (vue.openBlock(), vue.createBlock(vue.unref(index$4.Lock), { key: 0 })) : (vue.openBlock(), vue.createBlock(vue.unref(index$4.Unlock), { key: 1 }))
+                                  ]),
+                                  _: 2
+                                }, 1024)
+                              ], 10, _hoisted_6),
                               vue.createElementVNode("span", {
                                 class: "toolbar-btn settings-btn",
                                 title: "放进隐藏域",
@@ -494,7 +413,7 @@ const _sfc_main = {
                                   ]),
                                   _: 1
                                 })
-                              ], 8, _hoisted_10),
+                              ], 8, _hoisted_7),
                               vue.createElementVNode("span", {
                                 class: "toolbar-btn delete-btn",
                                 title: "删除组件",
@@ -506,18 +425,18 @@ const _sfc_main = {
                                   ]),
                                   _: 1
                                 })
-                              ], 8, _hoisted_11)
+                              ], 8, _hoisted_8)
                             ])) : vue.createCommentVNode("", true),
-                            vue.createElementVNode("div", _hoisted_12, [
-                              editConfigData.value.showFieldName && item.component.fieldName ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_13, vue.toDisplayString(item.component.fieldType == "blank" ? "空白占位" : item.component.fieldName), 1)) : vue.createCommentVNode("", true),
-                              item.component.disabled ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_14, [
+                            vue.createElementVNode("div", _hoisted_9, [
+                              editConfigData.value.showFieldName && item.component.fieldName ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_10, vue.toDisplayString(item.component.fieldType == "blank" ? "空白占位" : item.component.fieldName), 1)) : vue.createCommentVNode("", true),
+                              item.component.disabled ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_11, [
                                 vue.createVNode(_component_el_icon, null, {
                                   default: vue.withCtx(() => [
                                     vue.createVNode(vue.unref(index$4.Lock))
                                   ]),
                                   _: 1
                                 })
-                              ])) : item.component.readOnly ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_15, [
+                              ])) : item.component.readOnly ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_12, [
                                 vue.createVNode(_component_el_icon, null, {
                                   default: vue.withCtx(() => [
                                     vue.createVNode(vue.unref(index$4.View))
@@ -554,7 +473,7 @@ const _sfc_main = {
                                 key: 5,
                                 "border-style": "dashed"
                               }, {
-                                default: vue.withCtx(() => _cache[5] || (_cache[5] = [
+                                default: vue.withCtx(() => _cache[3] || (_cache[3] = [
                                   vue.createTextVNode(" 此处为分割线，阻止下方组件自动向上补齐，解析时不显示 ")
                                 ])),
                                 _: 1
@@ -582,5 +501,5 @@ const _sfc_main = {
     };
   }
 };
-const formWorkArea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-f689abe4"]]);
+const formWorkArea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-1d0d8388"]]);
 exports.default = formWorkArea;

package/lib/packages/vue/src/components/forms/form/Form.vue.js

@@ -209,7 +209,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           }
         });
       }
-      formData.value = { ...defaultData, ...props.modelValue };
+      formData.value = { ...defaultData, ...setFormData(props.modelValue, true) };
       formRules.value = rules;
     };
     const loadFieldDataSources = async () => {
@@ -616,7 +616,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
       return result;
     };
-    const setFormData = (data) => {
+    const setFormData = (data, flag = false) => {
       const processedData = { ...data };
       const processField = (field) => {
         const fieldName = field.fieldName;
@@ -661,6 +661,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           processField(field);
         });
       }
+      if (flag) {
+        return processedData;
+      }
       Object.assign(formData.value, processedData);
     };
     vue.onMounted(() => {
@@ -850,7 +853,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           applyLinkageEffectsForChangedFields(changedFields);
         }
         prevFormData.value = { ...newVal };
-        emit("update:modelValue", newVal);
+        emit("update:modelValue", getFormData());
       },
       { deep: true }
     );
@@ -970,5 +973,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-63966ae6"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-bf77b845"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/forms/subForm/SubForm.vue.js

@@ -4,6 +4,7 @@ const vue = require("vue");
 const index$2 = require("../form/index.js");
 const index$1 = require("../subTitle/index.js");
 const index = require("../h2/index.js");
+const common = require("../../../utils/common.js");
 const _hoisted_1 = {
   key: 0,
   style: { "height": "60px", "position": "relative" }
@@ -52,6 +53,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     vue.inject("rowHeight");
     vue.inject("gridLayout");
     const setFormItemHeight = vue.inject("setFormItemHeight");
+    const subFormData = vue.computed({
+      get: () => {
+        return common.cloneDeep(formData.value);
+      },
+      set: (val) => {
+        formData.value = { ...formData.value, ...val };
+      }
+    });
     const templateKey = vue.computed(() => {
       if (props.config.formSource == "dynamic") {
         const dynamicSubFormKey = props.config.dynamicSubFormKey;
@@ -113,8 +122,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           onLoaded: subFormLoaded,
           canPageEvent: __props.config.triggerSubFormPageEvent,
           initFormMode: __props.formMode,
-          modelValue: vue.unref(formData),
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(formData) ? formData.value = $event : null)
+          modelValue: vue.unref(subFormData),
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(subFormData) ? subFormData.value = $event : null)
         }, null, 8, ["templateKey", "canPageEvent", "initFormMode", "modelValue"])
       ], 64);
     };

package/lib/packages/vue/src/components/table/Table.vue.js

@@ -119,7 +119,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const configLoading = vue.ref(true);
     const localConfig = vue.ref({});
     const fieldsData = vue.ref({});
-    const hiddenFormData = vue.ref(props.initHiddenData);
+    const hiddenFormData = vue.computed(() => props.initHiddenData);
     const dataSourceOptions = vue.ref({});
     const dictionaryOptions = vue.ref({});
     const displayData = vue.computed(() => {
@@ -647,5 +647,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-8f3c46b5"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-be17662c"]]);
 exports.default = _Table;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.3.8",
+  "version": "5.3.10",
   "main": "lib/packages/designer/index.js",
   "module": "es/packages/designer/index.mjs",
   "files": [