@fecp/designer 5.3.13 → 5.3.14

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

@@ -30,26 +30,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       type: String,
       default: ""
     }
-    //   subFormId: {
-    //     type: String,
-    //     required: true,
-    //   },
-    //   subFormKey: {
-    //     type: String,
-    //     default: "",
-    //   },
-    //   subFormName: {
-    //     type: String,
-    //     default: "",
-    //   },
-    //   dataSourceFrom: {
-    //     type: String,
-    //     default: "",
-    //   },
-    //   triggerSubFormPageEvent: {
-    //     type: Boolean,
-    //     default: false,
-    //   },
   },
   setup(__props, { expose: __expose }) {
     const props = __props;
@@ -57,6 +37,22 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     vue.inject("rowHeight");
     vue.inject("gridLayout");
     const setFormItemHeight = vue.inject("setFormItemHeight");
+    const handleEvent = vue.inject("handleEvent");
+    const btnRollbackEvent = vue.computed(() => {
+      const btnRollback = props.config.btnRollback || [];
+      const data = {};
+      for (const item of btnRollback) {
+        const handleFunc = () => {
+          handleEvent.value(
+            formData.value,
+            {},
+            { eventFlow: item.callbackEventConfig }
+          );
+        };
+        data[item.id] = handleFunc;
+      }
+      return data;
+    });
     const subTableData = vue.computed(() => {
       if (props.config.dataSourceFrom == "main") {
         return formData.value[props.config.fieldName];
@@ -204,8 +200,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           tableData: vue.unref(subTableData),
           initHiddenData: vue.unref(initHiddenData),
           canLoadBySearchData: __props.config.reloadOnParamsChange,
-          readonly: __props.config.isSubTableReadOnly || __props.formMode == "query"
-        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "height", "tableData", "initHiddenData", "canLoadBySearchData", "readonly"])
+          readonly: __props.config.isSubTableReadOnly || __props.formMode == "query",
+          btnRollbackEvent: vue.unref(btnRollbackEvent)
+        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "height", "tableData", "initHiddenData", "canLoadBySearchData", "readonly", "btnRollbackEvent"])
       ], 64);
     };
   }

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

@@ -100,6 +100,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     initHiddenData: {
       type: Object,
       default: {}
+    },
+    btnRollbackEvent: {
+      type: Object,
+      default: {}
     }
   },
   emits: [
@@ -293,7 +297,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
     };
     const handleFlowEvent = vue.ref(null);
-    const handleCustomBtnClick = ({ btn, event, type }) => {
+    const handleCustomBtnClick = async ({ btn, event, type }) => {
       var _a, _b;
       switch (btn.btnType) {
         case "refresh":
@@ -306,12 +310,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           handlePersonalize();
           break;
         default:
-          (_b = handleFlowEvent.value) == null ? void 0 : _b.call(
+          await ((_b = handleFlowEvent.value) == null ? void 0 : _b.call(
             handleFlowEvent,
             hiddenFormData.value,
             btn,
             (_a = btn.eventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
-          );
+          ));
+          const handleFunc = props.btnRollbackEvent[btn.id];
+          if (handleFunc && typeof handleFunc == "function") {
+            handleFunc();
+          }
       }
     };
     const handleSortChange = ({ property, order }) => {
@@ -624,7 +632,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                       "table-data": displayData.value,
                       readonly: __props.readonly,
                       isDialog: __props.isDialog,
-                      hiddenFormData: hiddenFormData.value
+                      hiddenFormData: hiddenFormData.value,
+                      btnRollbackEvent: __props.btnRollbackEvent
                     }, vue.createSlots({ _: 2 }, [
                       vue.renderList(fieldsData.value, (field) => {
                         return {
@@ -634,7 +643,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                           ])
                         };
                       })
-                    ]), 1032, ["fields-data", "show-index", "select-mode", "is-opt-btns", "opt-btns", "mode-key", "modes", "data-source-options", "dictionary-options", "localConfig", "table-ref", "table-data", "readonly", "isDialog", "hiddenFormData"])
+                    ]), 1032, ["fields-data", "show-index", "select-mode", "is-opt-btns", "opt-btns", "mode-key", "modes", "data-source-options", "dictionary-options", "localConfig", "table-ref", "table-data", "readonly", "isDialog", "hiddenFormData", "btnRollbackEvent"])
                   ];
                 }),
                 _: 3
@@ -653,5 +662,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-fa5e2171"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3c129bed"]]);
 exports.default = _Table;

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

@@ -105,6 +105,10 @@ const _sfc_main = {
     hiddenFormData: {
       type: Object,
       default: {}
+    },
+    btnRollbackEvent: {
+      type: Object,
+      default: {}
     }
   },
   setup(__props) {
@@ -271,7 +275,7 @@ const _sfc_main = {
       );
       return Math.max(maxVisibleBtns, 1) * btnWidth + padding;
     });
-    const { getEventHandlers: createEventHandlers } = eventFlowHandler.useEventFlow({
+    const { handleEvent } = eventFlowHandler.useEventFlow({
       fields: props.fieldsData,
       instance,
       localConfig: props.localConfig,
@@ -279,13 +283,17 @@ const _sfc_main = {
         table: props.tableRef
       }
     });
-    const getEventHandlers = (row, item, eventConfig) => {
-      return createEventHandlers(
-        item,
+    async function handleButtonClick(row, btn, eventConfig) {
+      await handleEvent(
         { ...row, ...common.removeEmptyValues(props.hiddenFormData) },
-        eventConfig
+        btn,
+        eventConfig == null ? void 0 : eventConfig.find((item) => item.name == "Click")
       );
-    };
+      const handleFunc = props.btnRollbackEvent[btn.id];
+      if (handleFunc && typeof handleFunc == "function") {
+        handleFunc();
+      }
+    }
     return (_ctx, _cache) => {
       const _component_el_link = index$1.ElLink;
       const _component_el_icon = index$2.ElIcon;
@@ -335,15 +343,16 @@ const _sfc_main = {
                 field
               }, () => [
                 field.prefix ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_2, vue.toDisplayString(field.prefix), 1)) : vue.createCommentVNode("", true),
-                field.isLink ? (vue.openBlock(), vue.createBlock(_component_el_link, vue.mergeProps({
+                field.isLink ? (vue.openBlock(), vue.createBlock(_component_el_link, {
                   key: 1,
-                  type: "primary"
-                }, vue.toHandlers(getEventHandlers(row, field, field.linkConfig))), {
+                  type: "primary",
+                  onClick: ($event) => handleButtonClick(row, field, field.linkConfig)
+                }, {
                   default: vue.withCtx(() => [
                     vue.createTextVNode(vue.toDisplayString(formatCellValue(row, field)), 1)
                   ]),
                   _: 2
-                }, 1040)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
+                }, 1032, ["onClick"])) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
                   vue.createTextVNode(vue.toDisplayString(formatCellValue(row, field)), 1)
                 ], 64)),
                 field.suffix ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_3, vue.toDisplayString(field.suffix), 1)) : vue.createCommentVNode("", true),
@@ -371,17 +380,18 @@ const _sfc_main = {
         }, {
           default: vue.withCtx(({ row }) => [
             (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(getVisibleOptBtns(row), (btn) => {
-              return vue.openBlock(), vue.createBlock(_component_el_button, vue.mergeProps({
+              return vue.openBlock(), vue.createBlock(_component_el_button, {
                 key: btn.id,
                 type: "primary",
                 link: "",
-                disabled: isBtnDisabled(row, btn)
-              }, vue.toHandlers(getEventHandlers(row, btn, btn.eventConfig))), {
+                disabled: isBtnDisabled(row, btn),
+                onClick: ($event) => handleButtonClick(row, btn, btn.eventConfig)
+              }, {
                 default: vue.withCtx(() => [
                   vue.createTextVNode(vue.toDisplayString(btn.label), 1)
                 ]),
                 _: 2
-              }, 1040, ["disabled"]);
+              }, 1032, ["disabled", "onClick"]);
             }), 128))
           ]),
           _: 1
@@ -390,5 +400,5 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-2352d631"]]);
+const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-77ad8323"]]);
 exports.default = TableColumn;

package/package.json

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