@fecp/designer 5.2.7 → 5.2.9

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

@@ -155,7 +155,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           );
           if (onCreatedEvent) {
             console.log("🚀 页面 onCreated 事件触发");
-            pageEvents.executeEvent("onCreated");
+            await pageEvents.executeEvent("onCreated");
           }
         }
       } catch (error) {
@@ -682,5 +682,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-42af7e52"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-016bcba6"]]);
 exports.default = _Form;

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

@@ -55,13 +55,18 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
       return [];
     });
-    const initSearchData = vue.computed(() => {
+    const fieldList = vue.computed(() => {
+      return [
+        ...props.localConfig.fieldsData.map((item) => item.component),
+        ...props.localConfig.hiddenFields
+      ];
+    });
+    const initHiddenData = vue.computed(() => {
       if (props.config.dataSourceFrom == "self") {
-        const fields = props.localConfig.fieldsData.map((item) => item.component);
         const params = parseRouteParams.parseRouteParams(
           props.config.subTableParams,
           formData.value,
-          fields
+          fieldList.value
         );
         return params;
       }
@@ -97,10 +102,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           hasPagination: __props.config.isSubTablePagination,
           height: __props.config.subTableHeight,
           tableData: vue.unref(subTableData),
-          initSearchData: vue.unref(initSearchData),
+          initHiddenData: vue.unref(initHiddenData),
           canLoadBySearchData: __props.config.reloadOnParamsChange,
           readonly: __props.config.isSubTableReadOnly
-        }, null, 8, ["templateKey", "mode", "hasPagination", "height", "tableData", "initSearchData", "canLoadBySearchData", "readonly"])
+        }, null, 8, ["templateKey", "mode", "hasPagination", "height", "tableData", "initHiddenData", "canLoadBySearchData", "readonly"])
       ], 64);
     };
   }

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

@@ -131,5 +131,5 @@ const _sfc_main = {
     };
   }
 };
-const CustomButtons = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-afddc440"]]);
+const CustomButtons = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-827a5895"]]);
 exports.default = CustomButtons;

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-35de4740"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b8d760e0"]]);
 exports.default = _Table;

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

@@ -141,6 +141,7 @@ async function handlePageGoBack(node, data, fields, context) {
 }
 async function handleApiCall(node, data, fields, context, params) {
   console.log("[EventFlow] 执行API调用:", node.basic);
+  debugger;
   const basic = node.basic || {};
   if (!basic.dataSourceId) {
     return {

package/lib/packages/vue/src/utils/getJsonAsyncUtil.js

@@ -12,7 +12,8 @@ async function getJsonAsyncUtil($http, id, type, initOption) {
     templateKey: id,
     type,
     moduleType: busMode,
-    timestamp: Date.now()
+    timestamp: Date.now(),
+    templateVersion: "v5"
   });
   if (data) {
     option = JSON.parse(data);

package/package.json

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