@fecp/designer 5.2.13 → 5.3.1

package/es/packages/vue/src/components/forms/form/Form.vue.mjs

@@ -24,6 +24,7 @@ import { useEventFlow } from "../../../utils/eventFlow/eventFlowHandler.mjs";
 /* empty css                                                                                                                                          */
 /* empty css                               */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
+import api from "../../../api/index.mjs";
 /* empty css                                                                                                                                              */
 /* empty css                                                                                                                                        */
 import { usePageEvents } from "../../../composables/usePageEvents.mjs";
@@ -98,6 +99,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     const formRules = ref({});
     const dataSourceOptions = ref({});
     const dictionaryOptions = ref({});
+    const productData = ref({});
     const fieldsData = ref({});
     const hiddenFields = ref({});
     const rowHeight = ref(1);
@@ -144,8 +146,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(
@@ -156,6 +158,9 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
             await pageEvents.executeEvent("onCreated");
           }
         }
+        await loadProductData();
+        applyProductConfigToForm();
+        mergeOptionsToFields();
       } catch (error) {
         console.error("加载配置失败:", error);
         ElMessage.error("加载配置失败");
@@ -164,12 +169,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 = generateFieldRules(component);
@@ -182,11 +187,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 () => {
@@ -251,7 +256,6 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
           console.error("Failed to load dictionary data:", error);
         }
       }
-      mergeOptionsToFields();
     };
     const mergeOptionsToFields = () => {
       if (fieldsData.value) {
@@ -288,9 +292,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 api.getProductData(ctx.$http, prodIdValue);
+        productData.value = response;
+        console.log("产品数据加载成功:", productData.value);
+      } catch (error) {
+        console.error("获取产品数据失败:", error);
+        productData.value = {};
+      }
+    };
+    const prodRules = 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 = ref(null);
     function loadEventFlow() {
       const {
@@ -411,6 +565,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) => {
@@ -500,8 +657,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;
@@ -540,10 +701,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) {
@@ -682,7 +850,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a84aa0ec"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f1c90d7c"]]);
 export {
   _Form as default
 };

package/es/packages/vue/src/components/forms/h2/H2.vue.mjs

@@ -6,6 +6,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: {
@@ -23,13 +25,18 @@ const _sfc_main = {
           createElementVNode("div", _hoisted_4, toDisplayString(__props.config.subLabel), 1)
         ]),
         createElementVNode("div", _hoisted_5, [
-          renderSlot(_ctx.$slots, "default", {}, void 0, true)
+          createElementVNode("div", _hoisted_6, [
+            renderSlot(_ctx.$slots, "left", {}, void 0, true)
+          ]),
+          createElementVNode("div", _hoisted_7, [
+            renderSlot(_ctx.$slots, "default", {}, void 0, true)
+          ])
         ])
       ]);
     };
   }
 };
-const _H2 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7d7c888b"]]);
+const _H2 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b5645d10"]]);
 export {
   _H2 as default
 };

package/es/packages/vue/src/components/forms/subTable/SubTable.vue.mjs

@@ -1,8 +1,11 @@
-import { inject, computed, createElementBlock, openBlock, Fragment, createCommentVNode, createVNode, createBlock, unref } from "vue";
+/* empty css                                                                                                                                    */
+/* empty css                                                                                                                                         */
+import { inject, computed, ref, createElementBlock, openBlock, Fragment, createCommentVNode, createVNode, createBlock, unref, createSlots, withCtx, renderList, createTextVNode, toDisplayString } from "vue";
 import _Table from "../../table/Table.vue.mjs";
 import { SubTitle } from "../subTitle/index.mjs";
 import { H2 } from "../h2/index.mjs";
 import { parseRouteParams } from "../../../utils/parseRouteParams.mjs";
+import { ElButton } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/button/index.mjs";
 const _hoisted_1 = {
   key: 0,
   style: { "height": "60px", "position": "relative" }
@@ -70,7 +73,13 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       }
       return {};
     });
+    const subTableOption = ref({});
+    const customBtns = 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
       );
@@ -81,18 +90,71 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         gridLayout.value.resizeEvent();
       }
     }
+    const tableRef = 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 = ElButton;
       return openBlock(), createElementBlock(Fragment, null, [
         __props.config.titleMode != "none" ? (openBlock(), createElementBlock("div", _hoisted_1, [
           __props.config.titleMode == "label" ? (openBlock(), createBlock(unref(H2), {
             key: 0,
             config: __props.config
-          }, null, 8, ["config"])) : __props.config.titleMode == "subLabel" ? (openBlock(), createBlock(unref(SubTitle), {
+          }, createSlots({
+            default: withCtx(() => [
+              (openBlock(true), createElementBlock(Fragment, null, renderList(unref(customBtns).right, (btn) => {
+                return openBlock(), createElementBlock(Fragment, null, [
+                  btn.btnType == "custom" ? (openBlock(), createBlock(_component_el_button, {
+                    key: btn.id,
+                    link: "",
+                    type: "primary",
+                    onClick: ($event) => handleClick(btn, $event)
+                  }, {
+                    default: withCtx(() => [
+                      createTextVNode(toDisplayString(btn.label), 1)
+                    ]),
+                    _: 2
+                  }, 1032, ["onClick"])) : createCommentVNode("", true)
+                ], 64);
+              }), 256))
+            ]),
+            _: 2
+          }, [
+            unref(customBtns).left ? {
+              name: "left",
+              fn: withCtx(() => [
+                (openBlock(true), createElementBlock(Fragment, null, renderList(unref(customBtns).left, (btn) => {
+                  return openBlock(), createElementBlock(Fragment, null, [
+                    btn.btnType == "custom" ? (openBlock(), createBlock(_component_el_button, {
+                      key: btn.id,
+                      link: "",
+                      type: "primary",
+                      onClick: ($event) => handleClick(btn, $event)
+                    }, {
+                      default: withCtx(() => [
+                        createTextVNode(toDisplayString(btn.label), 1)
+                      ]),
+                      _: 2
+                    }, 1032, ["onClick"])) : createCommentVNode("", true)
+                  ], 64);
+                }), 256))
+              ]),
+              key: "0"
+            } : void 0
+          ]), 1032, ["config"])) : __props.config.titleMode == "subLabel" ? (openBlock(), createBlock(unref(SubTitle), {
             key: 1,
             config: __props.config
           }, null, 8, ["config"])) : createCommentVNode("", true)
         ])) : createCommentVNode("", true),
         createVNode(unref(_Table), {
+          ref_key: "tableRef",
+          ref: tableRef,
           templateKey: __props.config.subTableKey,
           isSubTable: "",
           onLoaded: subTableLoaded,

package/es/packages/vue/src/components/forms/text/Text.vue.mjs

@@ -2,9 +2,9 @@
 /* empty css                                                                                                                                        */
 /* empty css                                                                                                                                         */
 import { computed, getCurrentInstance, inject, createElementBlock, openBlock, createVNode, createCommentVNode, mergeProps, toHandlers, createSlots, withCtx, createElementVNode, toDisplayString, createBlock, createTextVNode, unref } from "vue";
-/* empty css                                                                                                                                          */
 /* empty css                                                                                                                                        */
 /* empty css                                                                                                                                          */
+/* empty css                                                                                                                                          */
 import { openDialog } from "../../dialog/index.mjs";
 import api from "../../../api/index.mjs";
 /* empty css                                                                                                                                              */

package/es/packages/vue/src/components/table/DynamicQuery.vue.mjs

@@ -68,6 +68,10 @@ const _sfc_main = {
     fieldsData: {
       type: Array,
       default: () => []
+    },
+    isSubTable: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["click", "search"],
@@ -295,7 +299,7 @@ const _sfc_main = {
               ref: "toolbarRef"
             }, {
               tools: withCtx(() => [
-                rightButtons.value.length ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(rightButtons.value, (btn) => {
+                !__props.isSubTable && rightButtons.value.length ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(rightButtons.value, (btn) => {
                   return openBlock(), createBlock(_component_el_button, {
                     key: btn.id,
                     type: getBtnType(btn),
@@ -419,7 +423,7 @@ const _sfc_main = {
     };
   }
 };
-const DynamicQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-59950eea"]]);
+const DynamicQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ba091c4f"]]);
 export {
   DynamicQuery as default
 };

package/es/packages/vue/src/components/table/Table.vue.mjs

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

package/es/packages/vue/src/components/table/TableColumn.vue.mjs

@@ -5,9 +5,9 @@ import { getCurrentInstance, computed, createElementBlock, openBlock, createBloc
 import "../../../../../node_modules/.pnpm/vxe-table@4.17.47_vue@3.5.13_typescript@5.7.3_/node_modules/vxe-table/es/components.mjs";
 import { CopyDocument as copy_document_default } from "../../../../../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.mjs";
 import { checkFilterMatch } from "../../utils/parseFilterConfig.mjs";
-/* empty css                                                                                                                                       */
 /* empty css                                                                                                                                     */
 /* empty css                                                                                                                                       */
+/* empty css                                                                                                                                       */
 /* empty css                                                                                                                                      */
 /* empty css                                                                                                                                       */
 import "./index.mjs";

package/es/packages/vue/src/composables/usePageEvents.mjs

@@ -1,8 +1,8 @@
 import { onUnmounted, onBeforeUnmount, onMounted } from "vue";
 /* empty css                                                                                                                              */
-/* empty css                                                                                                                                    */
 /* empty css                                                                                                                                  */
 /* empty css                                                                                                                                    */
+/* empty css                                                                                                                                    */
 /* empty css                                                                                                                                   */
 /* empty css                                                                                                                                    */
 /* empty css                                                                                                                                   */

package/es/packages/vue/src/utils/datasource.mjs

@@ -1,9 +1,9 @@
 import { reactive } from "vue";
 import { parseRouteParams } from "./parseRouteParams.mjs";
 /* empty css                                                                                                                              */
-/* empty css                                                                                                                                    */
 /* empty css                                                                                                                                  */
 /* empty css                                                                                                                                    */
+/* empty css                                                                                                                                    */
 import { ElLoading } from "../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/loading/index.mjs";
 import { ElMessage } from "../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/message/index.mjs";
 class DataSourceManager {