@fecp/designer 5.2.13 → 5.3.1

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

@@ -26,6 +26,7 @@ const eventFlowHandler = require("../../../utils/eventFlow/eventFlowHandler.js")
 ;/* empty css                                                                                                                                          */
 ;/* empty css                               */
 const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
+const index$6 = require("../../../api/index.js");
 ;/* empty css                                                                                                                                              */
 ;/* empty css                                                                                                                                        */
 const usePageEvents = require("../../../composables/usePageEvents.js");
@@ -100,6 +101,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const formRules = vue.ref({});
     const dataSourceOptions = vue.ref({});
     const dictionaryOptions = vue.ref({});
+    const productData = vue.ref({});
     const fieldsData = vue.ref({});
     const hiddenFields = vue.ref({});
     const rowHeight = vue.ref(1);
@@ -146,8 +148,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           return item.component;
         });
         hiddenFields.value = option.hiddenFields || [];
-        loadFormData();
         await loadFieldDataSources();
+        loadFormData();
         loadEventFlow();
         if (pageEvents && localConfig.value.pageEventConfig) {
           const onCreatedEvent = localConfig.value.pageEventConfig.find(
@@ -158,6 +160,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             await pageEvents.executeEvent("onCreated");
           }
         }
+        await loadProductData();
+        applyProductConfigToForm();
+        mergeOptionsToFields();
       } catch (error) {
         console.error("加载配置失败:", error);
         index$5.ElMessage.error("加载配置失败");
@@ -166,12 +171,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
     };
     const loadFormData = () => {
-      const data = {};
+      const defaultData = {};
       const rules = {};
       if (fieldsData.value) {
         fieldsData.value.forEach((component) => {
           if (component.fieldName) {
-            data[component.fieldName] = component.defaultValue ? component.defaultValue : null;
+            defaultData[component.fieldName] = component.defaultValue ? component.defaultValue : null;
           }
           if (component.fieldName) {
             const fieldRules = validation.generateFieldRules(component);
@@ -184,11 +189,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       if (hiddenFields.value && hiddenFields.value.length > 0) {
         hiddenFields.value.forEach((field) => {
           if (field.fieldName) {
-            data[field.fieldName] = field.value !== void 0 ? field.value : null;
+            defaultData[field.fieldName] = field.value !== void 0 ? field.value : null;
           }
         });
       }
-      formData.value = { ...data, ...props.modelValue };
+      formData.value = { ...defaultData, ...props.modelValue };
       formRules.value = rules;
     };
     const loadFieldDataSources = async () => {
@@ -253,7 +258,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           console.error("Failed to load dictionary data:", error);
         }
       }
-      mergeOptionsToFields();
     };
     const mergeOptionsToFields = () => {
       if (fieldsData.value) {
@@ -290,9 +294,159 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           } else if (optionSource === "custom") {
             component.optionConfig.options = component.optionConfig.options || [];
           }
+          applyProductConfigFilter(component);
         });
       }
     };
+    const loadProductData = async () => {
+      if (!localConfig.value || !localConfig.value.prodConfig) {
+        return;
+      }
+      const { prodId } = localConfig.value.prodConfig;
+      if (!prodId) {
+        return;
+      }
+      const field = [...fieldsData.value, ...hiddenFields.value].find(
+        (item) => item.id == prodId.value
+      );
+      if (!field) {
+        return;
+      }
+      const prodIdValue = formData.value[field.fieldName];
+      if (!prodIdValue) {
+        return;
+      }
+      try {
+        const response = await index$6.default.getProductData(ctx.$http, prodIdValue);
+        productData.value = response;
+        console.log("产品数据加载成功:", productData.value);
+      } catch (error) {
+        console.error("获取产品数据失败:", error);
+        productData.value = {};
+      }
+    };
+    const prodRules = vue.ref({});
+    const applyProductConfigToForm = () => {
+      if (!localConfig.value || !localConfig.value.prodConfig || !productData.value) {
+        return;
+      }
+      const { defaultValueConfigs, validationConfigs } = localConfig.value.prodConfig;
+      if (defaultValueConfigs && defaultValueConfigs.length > 0) {
+        defaultValueConfigs.forEach((config) => {
+          if (config.pageField && config.productConfigField) {
+            const defaultValue = productData.value[config.productConfigField];
+            if (defaultValue !== void 0) {
+              const formField = [...fieldsData.value, ...hiddenFields.value].find(
+                (item) => item.id == config.pageField
+              );
+              if (formField && !formData.value[formField.fieldName]) {
+                formData.value[formField.fieldName] = defaultValue;
+              }
+            }
+          }
+        });
+      }
+      if (validationConfigs && validationConfigs.length > 0) {
+        validationConfigs.forEach((config) => {
+          if (config.pageField && (config.minProductField || config.maxProductField)) {
+            const minValue = productData.value[config.minProductField];
+            const maxValue = productData.value[config.maxProductField];
+            if (minValue !== void 0 || maxValue !== void 0) {
+              const formField = [...fieldsData.value, ...hiddenFields.value].find(
+                (item) => item.id == config.pageField
+              );
+              if (formField && !prodRules.value[formField.fieldName]) {
+                prodRules.value[formField.fieldName] = [];
+              }
+              const customValidator = (rule, value, callback) => {
+                console.log(
+                  "🚀 ~ customValidator 被调用 ~ 字段:",
+                  formField == null ? void 0 : formField.fieldName,
+                  "值:",
+                  value,
+                  "minValue:",
+                  minValue,
+                  "maxValue:",
+                  maxValue
+                );
+                if (value === null || value === void 0 || value === "") {
+                  callback();
+                  return;
+                }
+                const numValue = Number(value);
+                if (isNaN(numValue)) {
+                  callback(new Error("请输入有效的数字"));
+                  return;
+                }
+                let errorMessage = "";
+                if (minValue !== void 0 && numValue < Number(minValue)) {
+                  errorMessage = `不能小于 ${minValue}`;
+                }
+                if (maxValue !== void 0 && numValue > Number(maxValue)) {
+                  if (errorMessage) {
+                    errorMessage = `${errorMessage} 且 不能大于 ${maxValue}`;
+                  } else {
+                    errorMessage = `不能大于 ${maxValue}`;
+                  }
+                }
+                if (errorMessage) {
+                  callback(new Error(errorMessage));
+                } else {
+                  callback();
+                }
+              };
+              const customRule = {
+                validator: customValidator,
+                trigger: "blur"
+              };
+              prodRules.value[formField.fieldName].push(customRule);
+            }
+          }
+        });
+        for (let fieldName in prodRules.value) {
+          if (formRules.value[fieldName]) {
+            formRules.value[fieldName].push(...prodRules.value[fieldName]);
+          } else {
+            formRules.value[fieldName] = prodRules.value[fieldName];
+          }
+        }
+      }
+    };
+    const applyProductConfigFilter = (component) => {
+      if (!localConfig.value || !localConfig.value.prodConfig || !productData.value) {
+        return;
+      }
+      const { optionConfigs } = localConfig.value.prodConfig;
+      if (!optionConfigs || !component.optionConfig || !component.optionConfig.options) {
+        return;
+      }
+      const componentConfig = optionConfigs.find(
+        (item) => item.pageField == component.id
+      );
+      if (!componentConfig || !componentConfig.productConfigField) {
+        return;
+      }
+      const fieldValue = productData.value[componentConfig.productConfigField];
+      if (!fieldValue) {
+        return;
+      }
+      const allowedValues = Array.isArray(fieldValue) ? fieldValue : fieldValue.split("|");
+      component.optionConfig.options = component.optionConfig.options.filter(
+        (option) => {
+          const optionValue = option.value !== void 0 ? option.value : option;
+          return allowedValues.includes(optionValue);
+        }
+      );
+      if (component.optionConfig.options.length === 0) {
+        component.optionConfig.options = [
+          {
+            label: `无可用选项（产品配置限制）`,
+            value: "",
+            disabled: true
+          }
+        ];
+      }
+    };
     const handleEvent = vue.ref(null);
     function loadEventFlow() {
       const {
@@ -413,6 +567,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           }
         }
       });
+      for (let fieldName in prodRules.value) {
+        rules[fieldName] = prodRules.value[fieldName];
+      }
       formRules.value = rules;
       const readonlyArr = (linkedConfig == null ? void 0 : linkedConfig.readonly) || [];
       readonlyArr.forEach((item) => {
@@ -502,8 +659,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         const fieldType = field.fieldType;
         const value = result[fieldName];
         if (fieldName && (fieldType === "checkbox" || fieldType === "multipleSelection" || fieldType === "cascader" || fieldType === "area" || fieldType === "industry")) {
+          let splitStr = "|";
+          if (fieldType === "cascader" || fieldType === "area" || fieldType === "industry") {
+            splitStr = ",";
+          }
           if (Array.isArray(value)) {
-            result[fieldName] = value.join("|");
+            result[fieldName] = value.join(splitStr);
           }
         } else if (fieldName && fieldType === "date" && value) {
           const dateValueType = field.dateValueType;
@@ -542,10 +703,17 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       const processField = (field) => {
         const fieldName = field.fieldName;
         const fieldType = field.fieldType;
+        if (!processedData.hasOwnProperty(fieldName)) {
+          return;
+        }
         const value = processedData[fieldName];
         if (fieldName && (fieldType === "checkbox" || fieldType === "multipleSelection" || fieldType === "cascader" || fieldType === "area" || fieldType === "industry")) {
-          if (typeof value === "string" && value.includes("|")) {
-            processedData[fieldName] = value.split("|");
+          let splitStr = "|";
+          if (fieldType === "cascader" || fieldType === "area" || fieldType === "industry") {
+            splitStr = ",";
+          }
+          if (typeof value === "string" && value.includes(splitStr)) {
+            processedData[fieldName] = value.split(splitStr);
           } else if (typeof value === "string" && value !== "") {
             processedData[fieldName] = [value];
           } else if (value === "" || value === null || value === void 0) {
@@ -684,5 +852,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-a84aa0ec"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-f1c90d7c"]]);
 exports.default = _Form;

package/lib/packages/vue/src/components/forms/h2/H2.vue.js

@@ -8,6 +8,8 @@ const _hoisted_2 = { class: "fec-label" };
 const _hoisted_3 = { class: "fec-label-title" };
 const _hoisted_4 = { class: "fec-label-sub-title" };
 const _hoisted_5 = { class: "fec-buttons" };
+const _hoisted_6 = { class: "left" };
+const _hoisted_7 = { class: "right" };
 const _sfc_main = {
   __name: "H2",
   props: {
@@ -25,11 +27,16 @@ const _sfc_main = {
           vue.createElementVNode("div", _hoisted_4, vue.toDisplayString(__props.config.subLabel), 1)
         ]),
         vue.createElementVNode("div", _hoisted_5, [
-          vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
+          vue.createElementVNode("div", _hoisted_6, [
+            vue.renderSlot(_ctx.$slots, "left", {}, void 0, true)
+          ]),
+          vue.createElementVNode("div", _hoisted_7, [
+            vue.renderSlot(_ctx.$slots, "default", {}, void 0, true)
+          ])
         ])
       ]);
     };
   }
 };
-const _H2 = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7d7c888b"]]);
+const _H2 = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b5645d10"]]);
 exports.default = _H2;

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

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+;/* empty css                                                                                                                                    */
+;/* empty css                                                                                                                                         */
 const vue = require("vue");
 const Table = require("../../table/Table.vue.js");
-const index$1 = require("../subTitle/index.js");
+const index$2 = require("../subTitle/index.js");
 const index = require("../h2/index.js");
 const parseRouteParams = require("../../../utils/parseRouteParams.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/button/index.js");
 const _hoisted_1 = {
   key: 0,
   style: { "height": "60px", "position": "relative" }
@@ -72,7 +75,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
       return {};
     });
+    const subTableOption = vue.ref({});
+    const customBtns = vue.computed(() => {
+      return subTableOption.value.customBtns || {};
+    });
     function subTableLoaded(subOption) {
+      subTableOption.value = subOption;
+      console.log("🚀 ~ subTableLoaded ~ subOption:", subOption);
       const foundItem = props.localConfig.fieldsData.find(
         (item) => item.id == props.config.id
       );
@@ -83,18 +92,71 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         gridLayout.value.resizeEvent();
       }
     }
+    const tableRef = vue.ref();
+    const handleClick = (btn, event) => {
+      var _a;
+      (_a = tableRef.value) == null ? void 0 : _a.handleCustomBtnClick({
+        btn,
+        event,
+        type: "custom"
+      });
+    };
     return (_ctx, _cache) => {
+      const _component_el_button = index$1.ElButton;
       return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
         __props.config.titleMode != "none" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
           __props.config.titleMode == "label" ? (vue.openBlock(), vue.createBlock(vue.unref(index.H2), {
             key: 0,
             config: __props.config
-          }, null, 8, ["config"])) : __props.config.titleMode == "subLabel" ? (vue.openBlock(), vue.createBlock(vue.unref(index$1.SubTitle), {
+          }, vue.createSlots({
+            default: vue.withCtx(() => [
+              (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(customBtns).right, (btn) => {
+                return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
+                  btn.btnType == "custom" ? (vue.openBlock(), vue.createBlock(_component_el_button, {
+                    key: btn.id,
+                    link: "",
+                    type: "primary",
+                    onClick: ($event) => handleClick(btn, $event)
+                  }, {
+                    default: vue.withCtx(() => [
+                      vue.createTextVNode(vue.toDisplayString(btn.label), 1)
+                    ]),
+                    _: 2
+                  }, 1032, ["onClick"])) : vue.createCommentVNode("", true)
+                ], 64);
+              }), 256))
+            ]),
+            _: 2
+          }, [
+            vue.unref(customBtns).left ? {
+              name: "left",
+              fn: vue.withCtx(() => [
+                (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(customBtns).left, (btn) => {
+                  return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
+                    btn.btnType == "custom" ? (vue.openBlock(), vue.createBlock(_component_el_button, {
+                      key: btn.id,
+                      link: "",
+                      type: "primary",
+                      onClick: ($event) => handleClick(btn, $event)
+                    }, {
+                      default: vue.withCtx(() => [
+                        vue.createTextVNode(vue.toDisplayString(btn.label), 1)
+                      ]),
+                      _: 2
+                    }, 1032, ["onClick"])) : vue.createCommentVNode("", true)
+                  ], 64);
+                }), 256))
+              ]),
+              key: "0"
+            } : void 0
+          ]), 1032, ["config"])) : __props.config.titleMode == "subLabel" ? (vue.openBlock(), vue.createBlock(vue.unref(index$2.SubTitle), {
             key: 1,
             config: __props.config
           }, null, 8, ["config"])) : vue.createCommentVNode("", true)
         ])) : vue.createCommentVNode("", true),
         vue.createVNode(vue.unref(Table.default), {
+          ref_key: "tableRef",
+          ref: tableRef,
           templateKey: __props.config.subTableKey,
           isSubTable: "",
           onLoaded: subTableLoaded,

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

@@ -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/DynamicQuery.vue.js

@@ -70,6 +70,10 @@ const _sfc_main = {
     fieldsData: {
       type: Array,
       default: () => []
+    },
+    isSubTable: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["click", "search"],
@@ -297,7 +301,7 @@ const _sfc_main = {
               ref: "toolbarRef"
             }, {
               tools: vue.withCtx(() => [
-                rightButtons.value.length ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(rightButtons.value, (btn) => {
+                !__props.isSubTable && rightButtons.value.length ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(rightButtons.value, (btn) => {
                   return vue.openBlock(), vue.createBlock(_component_el_button, {
                     key: btn.id,
                     type: getBtnType(btn),
@@ -421,5 +425,5 @@ const _sfc_main = {
     };
   }
 };
-const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-59950eea"]]);
+const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-ba091c4f"]]);
 exports.default = DynamicQuery;

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

@@ -536,7 +536,8 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       clearSelection,
       exportData: handleExport,
       localConfig,
-      setFormData
+      setFormData,
+      handleCustomBtnClick
     });
     return (_ctx, _cache) => {
       const _component_el_container = index.ElContainer;
@@ -559,15 +560,14 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             )
           }, [
             localConfig.value.queryConfig.mode == "fixed" ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
-              !__props.isSubTable ? (vue.openBlock(), vue.createBlock(TableFilter.default, {
-                key: 0,
+              vue.createVNode(TableFilter.default, {
                 "query-config": localConfig.value.queryConfig,
                 "fields-data": fieldsData.value,
                 onSearch: handleFilterSearch,
                 onReset: handleFilterReset
-              }, null, 8, ["query-config", "fields-data"])) : vue.createCommentVNode("", true),
-              !__props.readonly ? (vue.openBlock(), vue.createBlock(CustomButtons.default, {
-                key: 1,
+              }, null, 8, ["query-config", "fields-data"]),
+              !__props.readonly && !__props.isSubTable ? (vue.openBlock(), vue.createBlock(CustomButtons.default, {
+                key: 0,
                 "custom-btns": localConfig.value.customBtns,
                 localConfig: localConfig.value,
                 onClick: handleCustomBtnClick
@@ -575,11 +575,12 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             ], 64)) : vue.createCommentVNode("", true),
             localConfig.value.queryConfig.mode == "dynamic" ? (vue.openBlock(), vue.createBlock(DynamicQuery.default, {
               key: 1,
+              isSubTable: __props.isSubTable,
               localConfig: localConfig.value,
               "fields-data": fieldsData.value,
               onSearch: handleFilterSearch,
               onClick: handleCustomBtnClick
-            }, null, 8, ["localConfig", "fields-data"])) : vue.createCommentVNode("", true),
+            }, null, 8, ["isSubTable", "localConfig", "fields-data"])) : vue.createCommentVNode("", true),
             vue.createElementVNode("div", _hoisted_1, [
               vue.createVNode(vue.unref(index$1.VxeTable), {
                 ref_key: "tableRef",
@@ -644,5 +645,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-89c88084"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d0a13549"]]);
 exports.default = _Table;

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

@@ -7,9 +7,9 @@ const vue = require("vue");
 require("../../../../../node_modules/.pnpm/vxe-table@4.17.47_vue@3.5.13_typescript@5.7.3_/node_modules/vxe-table/es/components.js");
 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");
-;/* empty css                                                                                                                                       */
 ;/* empty css                                                                                                                                     */
 ;/* empty css                                                                                                                                       */
+;/* empty css                                                                                                                                       */
 ;/* empty css                                                                                                                                      */
 ;/* empty css                                                                                                                                       */
 require("./index.js");

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

@@ -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

@@ -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/package.json

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