@fecp/designer 5.3.5 → 5.3.6

package/es/designer.css

@@ -5372,7 +5372,7 @@ body,
 .flowchart-canvas[data-v-d06c15b1] {
   height: 100%;
 }
-.approval-history-content.flowChart[data-v-ca0519c9] {
+.approval-history-content.flowChart[data-v-f7d02612] {
   background-color: #f9fafc;
 }.dialog-header-content[data-v-7e9fd985] {
   font-size: 16px;
@@ -5570,27 +5570,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-5e8468de] {
+.fec-form[data-v-a3082b55] {
   height: 100%;
 }
-[data-v-5e8468de] .vgl-item {
+[data-v-a3082b55] .vgl-item {
   transition: none;
 }
-[data-v-5e8468de] .vgl-item > .el-form-item {
+[data-v-a3082b55] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-5e8468de] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-a3082b55] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-5e8468de] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-a3082b55] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-5e8468de] .vgl-item > .el-container {
+[data-v-a3082b55] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-2352d631] {
   display: inline-block;

package/es/packages/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.3.5";
+const version = "5.3.6";
 const packageJson = {
   version
 };

package/es/packages/vue/src/components/bus/approvalHistory/ApprovalHistory.vue.mjs

@@ -68,7 +68,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       if (foundItem) {
         foundItem.fixedH = true;
         foundItem.h = dom.offsetHeight + titleHeight;
-        setFormItemHeight(props.config.id, dom.offsetHeight + titleHeight);
+        setFormItemHeight(props.config.id, true, dom.offsetHeight + titleHeight);
       }
     }
     return (_ctx, _cache) => {
@@ -125,7 +125,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _ApprovalHistory = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ca0519c9"]]);
+const _ApprovalHistory = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f7d02612"]]);
 export {
   _ApprovalHistory as default
 };

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

@@ -152,6 +152,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         mergeOptionsToFields();
         loadFormData();
         loadEventFlow();
+        initGridLayoutDataConfig();
         if (pageEvents && localConfig.value.pageEventConfig) {
           const onCreatedEvent = localConfig.value.pageEventConfig.find(
             (e) => e.name === "onCreated"
@@ -708,6 +709,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       return result;
     };
     const applyLinkageEffectsForChangedFields = (changedFieldNames) => {
+      var _a;
       console.log(
         "🚀 ~ applyLinkageEffectsForChangedFields ~ 变化的字段:",
         changedFieldNames
@@ -723,9 +725,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         if (checkFilterMatch(item.filterConfig, formData.value, fields)) {
           const fieldAssignments = item.fieldAssignments || [];
           fieldAssignments.forEach((assignment) => {
-            var _a, _b;
+            var _a2, _b;
             const fieldId = assignment.fieldId;
-            const formulaText = (_b = (_a = assignment.formula) == null ? void 0 : _a.value) == null ? void 0 : _b.text;
+            const formulaText = (_b = (_a2 = assignment.formula) == null ? void 0 : _a2.value) == null ? void 0 : _b.text;
             const field = fields.find((f) => f.id == fieldId);
             if (field && formulaText) {
               const calcResult = calculate({
@@ -825,11 +827,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }
       });
       gridLayoutFieldsData.value = updatedLayoutData.filter((item) => !item.hidden);
+      (_a = gridLayout == null ? void 0 : gridLayout.value) == null ? void 0 : _a.resizeEvent();
     };
     watch(
       formData,
       (newVal, oldVal) => {
-        initGridLayoutDataConfig();
         const changedFields = findChangedFields(newVal, prevFormData.value);
         if (changedFields.length > 0) {
           applyLinkageEffectsForChangedFields(changedFields);
@@ -839,11 +841,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       },
       { deep: true }
     );
-    function setFormItemHeight(id, h) {
+    function setFormItemHeight(id, fixedH, h) {
+      var _a;
       const item = gridLayoutFieldsData.value.find((item2) => item2.id == id);
-      if (item) {
-        item.h = h;
-      }
+      if (!fixedH) {
+        item.h = h * 60;
+      } else if (fixedH) {
+        item.h = h / (localConfig.value.labelPosition == "top" ? 1.5 : 1);
+      }
+      const oriItem = oriGridLayoutData.value.find((item2) => item2.id == id);
+      if (!fixedH) {
+        oriItem.h = h * 60;
+      } else if (fixedH) {
+        oriItem.h = h / (localConfig.value.labelPosition == "top" ? 1.5 : 1);
+      }
+      (_a = gridLayout == null ? void 0 : gridLayout.value) == null ? void 0 : _a.resizeEvent();
     }
     provide("formData", formData);
     provide("localConfig", localConfig);
@@ -945,7 +957,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5e8468de"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a3082b55"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/components/forms/subForm/SubForm.vue.mjs

@@ -59,11 +59,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const foundItem = props.localConfig.fieldsData.find(
         (item) => item.id == props.config.id
       );
-      const y = 1;
       const titleHeight = props.config.titleMode != "none" ? 1 : 0;
       if (foundItem) {
-        foundItem.h = maxY + y + titleHeight;
-        setFormItemHeight(props.config.id, maxY + y + titleHeight);
+        foundItem.h = maxY + titleHeight;
+        setFormItemHeight(props.config.id, false, maxY + titleHeight);
       }
     }
     return (_ctx, _cache) => {

package/es/packages/vue/src/components/forms/subTable/SubTable.vue.mjs

@@ -79,7 +79,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     });
     function subTableLoaded(subOption) {
       subTableOption.value = subOption;
-      console.log("🚀 ~ subTableLoaded ~ subOption:", subOption);
       const foundItem = props.localConfig.fieldsData.find(
         (item) => item.id == props.config.id
       );
@@ -89,6 +88,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         foundItem.h = props.config.subTableHeight + titleHeight;
         setFormItemHeight(
           props.config.id,
+          true,
           props.config.subTableHeight + titleHeight
         );
       }

package/es/packages/vue/src/utils/eventFlow/actionHandlers.mjs

@@ -262,7 +262,7 @@ async function handleTableRefresh(node, data, fields, context) {
   var _a, _b, _c;
   console.log("[EventFlow] 执行表格刷新:", node.basic);
   const basic = node.basic || {};
-  const refreshOptions2 = {
+  const refreshOptions = {
     resetSort: basic.resetSort !== false,
     // 默认 true
     resetFilter: basic.resetFilter !== false,
@@ -270,11 +270,11 @@ async function handleTableRefresh(node, data, fields, context) {
     resetPagination: basic.resetPagination !== false
     // 默认 true
   };
-  console.log("[EventFlow] 刷新选项:", refreshOptions2);
+  console.log("[EventFlow] 刷新选项:", refreshOptions);
   const tableComponent = (_a = context.components) == null ? void 0 : _a.table;
   const refreshMethod = (_c = (_b = tableComponent == null ? void 0 : tableComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.refresh;
   if (typeof refreshMethod === "function") {
-    await refreshMethod(refreshOptions2);
+    await refreshMethod(refreshOptions);
     return {
       success: true,
       message: "表格已刷新"
@@ -346,6 +346,11 @@ async function handleTableRowDelete(node, data, fields, context) {
     const tableComponent = (_a = context.components) == null ? void 0 : _a.table;
     const refreshMethod = (_c = (_b = tableComponent == null ? void 0 : tableComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.refresh;
     if (typeof refreshMethod === "function") {
+      const refreshOptions = {
+        resetSort: false,
+        resetFilter: false,
+        resetPagination: false
+      };
       await refreshMethod(refreshOptions);
       return {
         success: true,

package/lib/designer.css

@@ -5372,7 +5372,7 @@ body,
 .flowchart-canvas[data-v-d06c15b1] {
   height: 100%;
 }
-.approval-history-content.flowChart[data-v-ca0519c9] {
+.approval-history-content.flowChart[data-v-f7d02612] {
   background-color: #f9fafc;
 }.dialog-header-content[data-v-7e9fd985] {
   font-size: 16px;
@@ -5570,27 +5570,27 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-5e8468de] {
+.fec-form[data-v-a3082b55] {
   height: 100%;
 }
-[data-v-5e8468de] .vgl-item {
+[data-v-a3082b55] .vgl-item {
   transition: none;
 }
-[data-v-5e8468de] .vgl-item > .el-form-item {
+[data-v-a3082b55] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-5e8468de] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-a3082b55] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-5e8468de] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-a3082b55] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-5e8468de] .vgl-item > .el-container {
+[data-v-a3082b55] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-2352d631] {
   display: inline-block;

package/lib/packages/designer/package.json.js

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

package/lib/packages/vue/src/components/bus/approvalHistory/ApprovalHistory.vue.js

@@ -70,7 +70,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       if (foundItem) {
         foundItem.fixedH = true;
         foundItem.h = dom.offsetHeight + titleHeight;
-        setFormItemHeight(props.config.id, dom.offsetHeight + titleHeight);
+        setFormItemHeight(props.config.id, true, dom.offsetHeight + titleHeight);
       }
     }
     return (_ctx, _cache) => {
@@ -127,5 +127,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _ApprovalHistory = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ca0519c9"]]);
+const _ApprovalHistory = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-f7d02612"]]);
 exports.default = _ApprovalHistory;

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

@@ -154,6 +154,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         mergeOptionsToFields();
         loadFormData();
         loadEventFlow();
+        initGridLayoutDataConfig();
         if (pageEvents && localConfig.value.pageEventConfig) {
           const onCreatedEvent = localConfig.value.pageEventConfig.find(
             (e) => e.name === "onCreated"
@@ -710,6 +711,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       return result;
     };
     const applyLinkageEffectsForChangedFields = (changedFieldNames) => {
+      var _a;
       console.log(
         "🚀 ~ applyLinkageEffectsForChangedFields ~ 变化的字段:",
         changedFieldNames
@@ -725,9 +727,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         if (parseFilterConfig.checkFilterMatch(item.filterConfig, formData.value, fields)) {
           const fieldAssignments = item.fieldAssignments || [];
           fieldAssignments.forEach((assignment) => {
-            var _a, _b;
+            var _a2, _b;
             const fieldId = assignment.fieldId;
-            const formulaText = (_b = (_a = assignment.formula) == null ? void 0 : _a.value) == null ? void 0 : _b.text;
+            const formulaText = (_b = (_a2 = assignment.formula) == null ? void 0 : _a2.value) == null ? void 0 : _b.text;
             const field = fields.find((f) => f.id == fieldId);
             if (field && formulaText) {
               const calcResult = calculate.calculate({
@@ -827,11 +829,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }
       });
       gridLayoutFieldsData.value = updatedLayoutData.filter((item) => !item.hidden);
+      (_a = gridLayout == null ? void 0 : gridLayout.value) == null ? void 0 : _a.resizeEvent();
     };
     vue.watch(
       formData,
       (newVal, oldVal) => {
-        initGridLayoutDataConfig();
         const changedFields = findChangedFields(newVal, prevFormData.value);
         if (changedFields.length > 0) {
           applyLinkageEffectsForChangedFields(changedFields);
@@ -841,11 +843,21 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       },
       { deep: true }
     );
-    function setFormItemHeight(id, h) {
+    function setFormItemHeight(id, fixedH, h) {
+      var _a;
       const item = gridLayoutFieldsData.value.find((item2) => item2.id == id);
-      if (item) {
-        item.h = h;
-      }
+      if (!fixedH) {
+        item.h = h * 60;
+      } else if (fixedH) {
+        item.h = h / (localConfig.value.labelPosition == "top" ? 1.5 : 1);
+      }
+      const oriItem = oriGridLayoutData.value.find((item2) => item2.id == id);
+      if (!fixedH) {
+        oriItem.h = h * 60;
+      } else if (fixedH) {
+        oriItem.h = h / (localConfig.value.labelPosition == "top" ? 1.5 : 1);
+      }
+      (_a = gridLayout == null ? void 0 : gridLayout.value) == null ? void 0 : _a.resizeEvent();
     }
     vue.provide("formData", formData);
     vue.provide("localConfig", localConfig);
@@ -947,5 +959,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5e8468de"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-a3082b55"]]);
 exports.default = _Form;

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

@@ -61,11 +61,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const foundItem = props.localConfig.fieldsData.find(
         (item) => item.id == props.config.id
       );
-      const y = 1;
       const titleHeight = props.config.titleMode != "none" ? 1 : 0;
       if (foundItem) {
-        foundItem.h = maxY + y + titleHeight;
-        setFormItemHeight(props.config.id, maxY + y + titleHeight);
+        foundItem.h = maxY + titleHeight;
+        setFormItemHeight(props.config.id, false, maxY + titleHeight);
       }
     }
     return (_ctx, _cache) => {

package/lib/packages/vue/src/components/forms/subTable/SubTable.vue.js

@@ -81,7 +81,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     });
     function subTableLoaded(subOption) {
       subTableOption.value = subOption;
-      console.log("🚀 ~ subTableLoaded ~ subOption:", subOption);
       const foundItem = props.localConfig.fieldsData.find(
         (item) => item.id == props.config.id
       );
@@ -91,6 +90,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         foundItem.h = props.config.subTableHeight + titleHeight;
         setFormItemHeight(
           props.config.id,
+          true,
           props.config.subTableHeight + titleHeight
         );
       }

package/lib/packages/vue/src/utils/eventFlow/actionHandlers.js

@@ -264,7 +264,7 @@ async function handleTableRefresh(node, data, fields, context) {
   var _a, _b, _c;
   console.log("[EventFlow] 执行表格刷新:", node.basic);
   const basic = node.basic || {};
-  const refreshOptions2 = {
+  const refreshOptions = {
     resetSort: basic.resetSort !== false,
     // 默认 true
     resetFilter: basic.resetFilter !== false,
@@ -272,11 +272,11 @@ async function handleTableRefresh(node, data, fields, context) {
     resetPagination: basic.resetPagination !== false
     // 默认 true
   };
-  console.log("[EventFlow] 刷新选项:", refreshOptions2);
+  console.log("[EventFlow] 刷新选项:", refreshOptions);
   const tableComponent = (_a = context.components) == null ? void 0 : _a.table;
   const refreshMethod = (_c = (_b = tableComponent == null ? void 0 : tableComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.refresh;
   if (typeof refreshMethod === "function") {
-    await refreshMethod(refreshOptions2);
+    await refreshMethod(refreshOptions);
     return {
       success: true,
       message: "表格已刷新"
@@ -348,6 +348,11 @@ async function handleTableRowDelete(node, data, fields, context) {
     const tableComponent = (_a = context.components) == null ? void 0 : _a.table;
     const refreshMethod = (_c = (_b = tableComponent == null ? void 0 : tableComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.refresh;
     if (typeof refreshMethod === "function") {
+      const refreshOptions = {
+        resetSort: false,
+        resetFilter: false,
+        resetPagination: false
+      };
       await refreshMethod(refreshOptions);
       return {
         success: true,

package/package.json

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