@fecp/designer 5.2.8 → 5.2.10

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.2.8";
+const version = "5.2.10";
 const packageJson = {
   version
 };

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

@@ -122,18 +122,18 @@ const _sfc_main = {
       () => editConfigData.value.labelPosition,
       (labelPosition) => {
         const targetHeight = labelPosition === "top" ? 0.75 : 1;
-        const fieldTypes = [
-          "subTitle",
-          "h2",
-          "subForm",
-          "subTable",
-          "approvalHistory",
-          "divider"
-        ];
         layoutData.value.forEach((item) => {
-          var _a;
-          if (fieldTypes.includes((_a = item.component) == null ? void 0 : _a.fieldType)) {
-            item.h = item.h * targetHeight;
+          var _a, _b, _c;
+          if (["subTitle", "h2", "divider"].includes((_a = item.component) == null ? void 0 : _a.fieldType)) {
+            item.h = 1 * targetHeight;
+          } else if (["subForm", "subTable", "approvalHistory"].includes(
+            (_b = item.component) == null ? void 0 : _b.fieldType
+          )) {
+            if (((_c = item.component) == null ? void 0 : _c.titleMode) == "none") {
+              item.h = 2 * targetHeight;
+            } else {
+              item.h = 3 * targetHeight;
+            }
           }
         });
         gridLayout.value.resizeEvent();
@@ -226,14 +226,17 @@ const _sfc_main = {
       } else if (component.fieldType == "subTitle" || component.fieldType == "h2" || component.fieldType == "divider") {
         finalWH = {
           w: editConfigData.value.columns,
-          h: 1,
+          h: editConfigData.value.labelPosition == "top" ? 0.75 : 1,
           isResizable: false
         };
       } else if (component.fieldType == "subForm" || component.fieldType == "subTable" || component.fieldType == "approvalHistory") {
-        finalWH = { w: editConfigData.value.columns, h: 2 };
+        finalWH = {
+          w: editConfigData.value.columns,
+          h: editConfigData.value.labelPosition == "top" ? 1.5 : 2
+        };
       }
       const colNum = editConfigData.value.columns;
-      const rowHeight = 60;
+      const rowHeight = editConfigData.value.labelPosition == "top" ? 90 : 60;
       const margin = 0;
       const cellWidth = (rect.width + margin) / colNum;
       const cellHeight = rowHeight + margin;
@@ -566,5 +569,5 @@ const _sfc_main = {
     };
   }
 };
-const formWorkArea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-8e0ae4da"]]);
+const formWorkArea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-838fb4f9"]]);
 exports.default = formWorkArea;

package/lib/packages/designer/src/packages/table/queryModule/DynamicModeConfig.vue.js

@@ -488,5 +488,5 @@ const _sfc_main = {
     };
   }
 };
-const DynamicModeConfig = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-2bd86c73"]]);
+const DynamicModeConfig = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-fd2bf737"]]);
 exports.default = DynamicModeConfig;

package/lib/packages/vue/src/components/dialog/DialogRenderer.vue2.js

@@ -147,7 +147,7 @@ const _sfc_main = {
     };
     const dialogTableRef = vue.ref();
     const handleConfirm = () => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f, _g;
       const contentSource = (_a = currentDialogConfig.value) == null ? void 0 : _a.contentSource;
       if (contentSource === "table") {
         if (tableSelectionRows.value.length == 0) {
@@ -184,20 +184,20 @@ const _sfc_main = {
         }
         const callbackEventConfig = currentDialogConfig.value.callbackEventConfig;
         if (callbackEventConfig && Object.keys(callbackEventConfig).length > 0 && ((_e = callbackEventConfig == null ? void 0 : callbackEventConfig.next) == null ? void 0 : _e.id) != "end") {
-          const fieldsData = dialogTableRef.value.localConfig.fieldsData;
           eventFlowHandler.executeEventFlow({
             eventFlow: callbackEventConfig,
-            fields: fieldsData,
+            fields: props.fieldsList,
             instance: props.instance,
-            localConfig: dialogTableRef.value.localConfig || {},
+            localConfig: ((_g = (_f = props.componentCtx) == null ? void 0 : _f.$) == null ? void 0 : _g.exposed.localConfig.value) || {},
             components: {
-              table: {
-                $: {
-                  exposed: dialogTableRef.value
-                }
-              }
+              // table: {
+              //   $: {
+              //     exposed: dialogTableRef.value,
+              //   },
+              // },
+              table: props.componentCtx
             },
-            row: {},
+            row: props.formData,
             item: {}
           });
         }
@@ -412,5 +412,5 @@ const _sfc_main = {
     };
   }
 };
-const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d28d3f09"]]);
+const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-871f9831"]]);
 exports.default = DialogRenderer;

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

@@ -333,7 +333,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           item.h = item.h * 0;
         } else if (!item.fixedH) {
           item.h = item.h * 60;
-        } else ;
+        } else if (item.fixedH) {
+          item.h = item.h / (localConfig.value.labelPosition == "top" ? 1.5 : 1);
+        }
         return item;
       });
       gridLayoutDataConfig.value = gridLayoutData;
@@ -682,5 +684,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-016bcba6"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-a84aa0ec"]]);
 exports.default = _Form;

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

@@ -421,5 +421,5 @@ const _sfc_main = {
     };
   }
 };
-const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-66d8d7cb"]]);
+const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-59950eea"]]);
 exports.default = DynamicQuery;

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

@@ -477,6 +477,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             isShow: false
           }))
         ];
+        localConfig.value.hiddenFields.forEach((item) => {
+          if (!hiddenFormData.value[item.fieldName]) {
+            hiddenFormData.value[item.fieldName] = item.value;
+          }
+        });
         initHandleEvent();
         emit("loaded", option);
       } catch (error) {
@@ -518,6 +523,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         dataSourceManager.value.destroy();
       }
     });
+    const setFormData = (data) => {
+      Object.assign(hiddenFormData.value, data);
+    };
     __expose({
       tableRef,
       refresh,
@@ -526,7 +534,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       getSelection,
       clearSelection,
       exportData: handleExport,
-      localConfig
+      localConfig,
+      setFormData
     });
     return (_ctx, _cache) => {
       const _component_el_container = index.ElContainer;
@@ -633,5 +642,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-86bf4794"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b8d760e0"]]);
 exports.default = _Table;

package/package.json

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