npm - @fecp/designer - Versions diffs - 5.3.14 → 5.3.16 - Mend

@fecp/designer 5.3.14 → 5.3.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (47) hide show

package/lib/packages/vue/src/components/details/header/Header.vue.js CHANGED Viewed

@@ -20,6 +20,10 @@ const _sfc_main = {
     pageHeaderConfig: {
       type: Object,
       required: true
+    },
+    isApproval: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["action-click"],
@@ -27,6 +31,10 @@ const _sfc_main = {
     const props = __props;
     const ctx = getInstance.getCurrentVueInstance();
     const emit = __emit;
+    const canBack = vue.computed(() => {
+      var _a;
+      return !props.isApproval && ((_a = props.pageHeaderConfig) == null ? void 0 : _a.canBack);
+    });
     const getButtonType = (btnStyle) => {
       return "primary";
     };
@@ -55,14 +63,14 @@ const _sfc_main = {
       emit("action-click", action);
     };
     return (_ctx, _cache) => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c;
       const _component_el_button = index$2.ElButton;
       const _component_el_page_header = index.ElPageHeader;
       return ((_a = __props.pageHeaderConfig) == null ? void 0 : _a.enabled) ? (vue.openBlock(), vue.createBlock(_component_el_page_header, {
         key: 0,
-        icon: ((_b = __props.pageHeaderConfig) == null ? void 0 : _b.canBack) ? vue.unref(index$1.ArrowLeft) : null,
+        icon: vue.unref(canBack) ? vue.unref(index$1.ArrowLeft) : null,
         onBack: handleBack,
-        class: vue.normalizeClass(["fec-header", { "can-not-back": !((_c = __props.pageHeaderConfig) == null ? void 0 : _c.canBack) }])
+        class: vue.normalizeClass(["fec-header", { "can-not-back": !vue.unref(canBack) }])
       }, vue.createSlots({
         content: vue.withCtx(() => {
           var _a2, _b2;
@@ -73,7 +81,7 @@ const _sfc_main = {
         }),
         _: 2
       }, [
-        ((_e = (_d = __props.pageHeaderConfig) == null ? void 0 : _d.actions) == null ? void 0 : _e.length) ? {
+        ((_c = (_b = __props.pageHeaderConfig) == null ? void 0 : _b.actions) == null ? void 0 : _c.length) ? {
           name: "extra",
           fn: vue.withCtx(() => {
             var _a2;
@@ -98,5 +106,5 @@ const _sfc_main = {
     };
   }
 };
-const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-93e082c1"]]);
+const component = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d2665303"]]);
 exports.default = component;

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

@@ -10,9 +10,9 @@ const index$2 = require("../forms/form/index.js");
 const parseRouteParams = require("../../utils/parseRouteParams.js");
 const calculate = require("../../utils/formulajs/calculate.js");
 const eventFlowHandler = require("../../utils/eventFlow/eventFlowHandler.js");
-;/* empty css                                                                                                                                       */
 ;/* empty css                                                                                                                                     */
 ;/* empty css                                                                                                                                       */
+;/* empty css                                                                                                                                       */
 ;/* empty css                    */
 const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_export-helper.js");
 ;/* empty css                                                                                                                                           */
@@ -169,6 +169,10 @@ const _sfc_main = {
         } else {
           console.log("未配置参数字段: displayField");
         }
+        const isRowDataAssignToForm = currentDialogConfig.value.isRowDataAssignToForm;
+        if (isRowDataAssignToForm) {
+          Object.assign(formData, tableSelectionRows.value[0]);
+        }
         const fieldMapping = currentDialogConfig.value.fieldMapping;
         if ((fieldMapping == null ? void 0 : fieldMapping.length) > 0) {
           fieldMapping.forEach((item) => {
@@ -413,5 +417,5 @@ const _sfc_main = {
     };
   }
 };
-const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7e9fd985"]]);
+const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-409d49b3"]]);
 exports.default = DialogRenderer;

package/lib/packages/vue/src/components/forms/checkbox/Checkbox.vue.js CHANGED Viewed

@@ -71,9 +71,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(options.value, (option) => {
             return vue.openBlock(), vue.createBlock(_component_el_checkbox, {
               value: option.value,
-              label: option.label,
-              disabled: option.disabled
-            }, null, 8, ["value", "label", "disabled"]);
+              label: option.label
+            }, null, 8, ["value", "label"]);
           }), 256))
         ]),
         _: 1

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

@@ -80,6 +80,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     initFormMode: {
       type: String,
       default: ""
+    },
+    isApproval: {
+      type: Boolean,
+      default: false
     }
   },
   emits: [
@@ -555,6 +559,24 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         (_a = button.eventConfig) == null ? void 0 : _a.find((item) => item.name == "Click")
       );
     };
+    const handleApprovalEvent = () => {
+      return new Promise((resolve, reject) => {
+        var _a, _b;
+        const actions = ((_a = localConfig.value.pageFooterConfig) == null ? void 0 : _a.actions) || [];
+        const approvalAction = actions.find((item) => item.isApproval);
+        if (approvalAction) {
+          handleEvent.value(
+            formData.value,
+            approvalAction,
+            (_b = approvalAction.eventConfig) == null ? void 0 : _b.find((item) => item.name == "Click")
+          ).then(() => {
+            resolve();
+          }).catch((error) => {
+            reject(error);
+          });
+        }
+      });
+    };
     const validate = () => {
       var _a;
       return (_a = formRef.value) == null ? void 0 : _a.validate();
@@ -899,7 +921,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       setFormData,
       getFormItemRef,
       formRef,
-      localConfig
+      localConfig,
+      handleApprovalEvent
     });
     return (_ctx, _cache) => {
       const _component_el_form = index$5.ElForm;
@@ -915,8 +938,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         default: vue.withCtx(() => [
           !configLoading.value && !__props.isSubForm && !__props.isDialog ? (vue.openBlock(), vue.createBlock(vue.unref(index$3.header), {
             key: 0,
+            isApproval: __props.isApproval,
             pageHeaderConfig: localConfig.value.pageHeaderConfig
-          }, null, 8, ["pageHeaderConfig"])) : vue.createCommentVNode("", true),
+          }, null, 8, ["isApproval", "pageHeaderConfig"])) : vue.createCommentVNode("", true),
           vue.createVNode(vue.unref(index$4.main), null, {
             default: vue.withCtx(() => [
               vue.createVNode(_component_el_form, {
@@ -971,7 +995,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             ]),
             _: 1
           }),
-          !__props.isSubForm && !__props.isDialog ? (vue.openBlock(), vue.createBlock(vue.unref(index$6.footer), {
+          !__props.isSubForm && !__props.isDialog && !__props.isApproval ? (vue.openBlock(), vue.createBlock(vue.unref(index$6.footer), {
             key: 1,
             formMode: formMode.value,
             pageFooterConfig: localConfig.value.pageFooterConfig,
@@ -983,5 +1007,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-01bfaf4f"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-bf001c7c"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/forms/radio/Radio.vue.js CHANGED Viewed

@@ -66,9 +66,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(options.value, (option) => {
             return vue.openBlock(), vue.createBlock(_component_el_radio, {
               value: option.value,
-              label: option.label,
-              disabled: option.disabled
-            }, null, 8, ["value", "label", "disabled"]);
+              label: option.label
+            }, null, 8, ["value", "label"]);
           }), 256))
         ]),
         _: 1

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

@@ -65,7 +65,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         ...props.localConfig.hiddenFields
       ];
     });
-    const initHiddenData = vue.computed(() => {
+    const initSearchData = vue.computed(() => {
       if (props.config.dataSourceFrom == "self") {
         const params = parseRouteParams.parseRouteParams(
           props.config.subTableParams,
@@ -90,7 +90,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         if (!item.showCondition) return true;
         return parseFilterConfig.checkFilterMatch(
           item.showCondition,
-          initHiddenData.value,
+          initSearchData.value,
           subTableFieldsData.value
         );
       });
@@ -101,7 +101,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         if (!item.showCondition) return true;
         return parseFilterConfig.checkFilterMatch(
           item.showCondition,
-          initHiddenData.value,
+          initSearchData.value,
           subTableFieldsData.value
         );
       });
@@ -198,11 +198,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           hasPagination: __props.config.isSubTablePagination,
           height: __props.config.subTableHeight,
           tableData: vue.unref(subTableData),
-          initHiddenData: vue.unref(initHiddenData),
+          initSearchData: vue.unref(initSearchData),
           canLoadBySearchData: __props.config.reloadOnParamsChange,
           readonly: __props.config.isSubTableReadOnly || __props.formMode == "query",
           btnRollbackEvent: vue.unref(btnRollbackEvent)
-        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "height", "tableData", "initHiddenData", "canLoadBySearchData", "readonly", "btnRollbackEvent"])
+        }, null, 8, ["templateKey", "mode", "titleMode", "hasPagination", "height", "tableData", "initSearchData", "canLoadBySearchData", "readonly", "btnRollbackEvent"])
       ], 64);
     };
   }

package/lib/packages/vue/src/components/forms/text/Text.vue.js CHANGED Viewed

@@ -4,9 +4,9 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                                                                                                        */
 ;/* empty css                                                                                                                                         */
 const vue = require("vue");
-;/* empty css                                                                                                                                          */
 ;/* empty css                                                                                                                                        */
 ;/* empty css                                                                                                                                          */
+;/* empty css                                                                                                                                          */
 const index$3 = require("../../dialog/index.js");
 const index$2 = require("../../../api/index.js");
 ;/* empty css                                                                                                                                              */

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

@@ -127,7 +127,10 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const configLoading = vue.ref(true);
     const localConfig = vue.ref({});
     const fieldsData = vue.ref({});
-    const hiddenFormData = vue.computed(() => props.initHiddenData);
+    const hiddenFormData = vue.computed(() => ({
+      ...props.initHiddenData,
+      ...props.initSearchData
+    }));
     const dataSourceOptions = vue.ref({});
     const dictionaryOptions = vue.ref({});
     const displayData = vue.computed(() => {
@@ -520,7 +523,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         initDataSourceManager();
       });
     });
-    const searchData = vue.ref(props.initSearchData);
+    const searchData = vue.ref({});
     vue.watch(
       () => props.initSearchData,
       (newVal, oldVal) => {
@@ -662,5 +665,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-3c129bed"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-23e9627d"]]);
 exports.default = _Table;

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

@@ -8,9 +8,9 @@ require("../../../../../node_modules/.pnpm/vxe-table@4.17.47_vue@3.5.13_typescri
 const index$3 = require("../../../../../node_modules/.pnpm/@element-plus_icons-vue@2.3.2_vue@3.5.13_typescript@5.7.3_/node_modules/@element-plus/icons-vue/dist/index.js");
 const parseFilterConfig = require("../../utils/parseFilterConfig.js");
 const common = require("../../utils/common.js");
-;/* empty css                                                                                                                                       */
 ;/* empty css                                                                                                                                     */
 ;/* empty css                                                                                                                                       */
+;/* empty css                                                                                                                                       */
 ;/* empty css                                                                                                                                      */
 ;/* empty css                                                                                                                                       */
 require("./index.js");

package/lib/packages/vue/src/composables/usePageEvents.js CHANGED Viewed

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
 ;/* empty css                                                                                                                              */
-;/* empty css                                                                                                                                    */
 ;/* empty css                                                                                                                                  */
 ;/* empty css                                                                                                                                    */
+;/* empty css                                                                                                                                    */
 ;/* empty css                                                                                                                                   */
 ;/* empty css                                                                                                                                    */
 ;/* empty css                                                                                                                                   */

package/lib/packages/vue/src/utils/datasource.js CHANGED Viewed

@@ -3,9 +3,9 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const parseRouteParams = require("./parseRouteParams.js");
 ;/* empty css                                                                                                                              */
-;/* empty css                                                                                                                                    */
 ;/* empty css                                                                                                                                  */
 ;/* empty css                                                                                                                                    */
+;/* empty css                                                                                                                                    */
 const index = require("../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/loading/index.js");
 const index$1 = 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");
 class DataSourceManager {

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

@@ -315,6 +315,66 @@ async function handleTableChildRefresh(node, data, fields, context) {
     };
   }
 }
+async function handleTableChildSelection(node, data, fields, context) {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  console.log("[EventFlow] 执行子表格选择赋值:", node.basic);
+  const basic = node.basic || {};
+  const formComponent = (_a = context.components) == null ? void 0 : _a.form;
+  const getFormDataMethod = (_c = (_b = formComponent == null ? void 0 : formComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.getFormData;
+  const setFormDataMethod = (_e = (_d = formComponent == null ? void 0 : formComponent.$) == null ? void 0 : _d.exposed) == null ? void 0 : _e.setFormData;
+  const getFormItemRefMethod = (_g = (_f = formComponent == null ? void 0 : formComponent.$) == null ? void 0 : _f.exposed) == null ? void 0 : _g.getFormItemRef;
+  if (typeof getFormItemRefMethod === "function") {
+    const subTableRef = getFormItemRefMethod(String(basic.selectSubTableFieldId));
+    const getSelectionMethod = (_h = subTableRef == null ? void 0 : subTableRef.subTableRef) == null ? void 0 : _h.getSelection;
+    if (typeof getSelectionMethod === "function") {
+      const rows = await getSelectionMethod();
+      const fieldMapping = basic.subTableSelectionFieldMapping;
+      if (fieldMapping && Array.isArray(fieldMapping)) {
+        let formData = getFormDataMethod();
+        fieldMapping.forEach((mapping) => {
+          const { field, value } = mapping;
+          const targetField = fields.find((item) => item.id == field);
+          if (!targetField) {
+            return {
+              success: false,
+              message: `未找到字段: ${field}`
+            };
+          }
+          const values = rows.map((row) => row[value]);
+          formData[targetField.fieldName] = values.join(",");
+        });
+        if (typeof setFormDataMethod === "function") {
+          setFormDataMethod(formData);
+          return {
+            success: true,
+            message: "赋值成功"
+          };
+        } else {
+          console.error("未找到表单组件的 setFormData 方法");
+          return {
+            success: false,
+            message: "表单组件未正确配置或 setFormData 方法未暴露",
+            shouldShowError: true
+          };
+        }
+      }
+    } else {
+      console.error("[EventFlow] 未找到子列表组件的 getSelection 方法");
+      return {
+        success: false,
+        message: "子列表组件未正确配置或 getSelection 方法未暴露",
+        shouldShowError: true
+      };
+    }
+  } else {
+    console.error("[EventFlow] 未找到表单组件的 getFormItemRef 方法");
+    return {
+      success: false,
+      message: "表单组件未正确配置或 getFormItemRef 方法未暴露",
+      shouldShowError: true
+    };
+  }
+}
 async function handleTableRowDelete(node, data, fields, context) {
   var _a, _b, _c;
   console.log("[EventFlow] 执行表格行删除:", node.basic);
@@ -675,6 +735,7 @@ const defaultActionHandlers = {
   "table-refresh": handleTableRefresh,
   "table-row-delete": handleTableRowDelete,
   "table-child-refresh": handleTableChildRefresh,
+  "table-child-selection": handleTableChildSelection,
   "form-setValue": handleFormSetValue,
   "form-submit": handleFormSubmit,
   "custom": handleCustomAction,
@@ -691,6 +752,7 @@ exports.handleMessage = handleMessage;
 exports.handlePageGoBack = handlePageGoBack;
 exports.handlePageJump = handlePageJump;
 exports.handleTableChildRefresh = handleTableChildRefresh;
+exports.handleTableChildSelection = handleTableChildSelection;
 exports.handleTableRefresh = handleTableRefresh;
 exports.handleTableRowDelete = handleTableRowDelete;
 exports.handleUpload = handleUpload;

package/package.json CHANGED Viewed

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