npm - @fecp/designer - Versions diffs - 5.2.14 → 5.3.1 - Mend

@fecp/designer 5.2.14 → 5.3.1

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 (19) hide show

package/es/designer.css CHANGED Viewed

@@ -5348,18 +5348,18 @@ body,
 }
 .approval-history-content.flowChart[data-v-7be2a6d2] {
   background-color: #f9fafc;
-}.dialog-header-content[data-v-871f9831] {
+}.dialog-header-content[data-v-7e9fd985] {
   font-size: 16px;
   font-weight: 600;
   color: #303133;
 }
-.dialog-content-wrapper[data-v-871f9831] {
+.dialog-content-wrapper[data-v-7e9fd985] {
   min-height: 500px;
   flex-grow: 1;
   display: flex;
   flex-direction: column;
 }
-.empty-content[data-v-871f9831] {
+.empty-content[data-v-7e9fd985] {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -5367,13 +5367,13 @@ body,
   color: #909399;
   font-size: 14px;
 }
-.component-error[data-v-871f9831] {
+.component-error[data-v-7e9fd985] {
   padding: 40px 20px;
   text-align: center;
   color: #f56c6c;
   font-size: 14px;
 }
-.fec-dialog-table[data-v-871f9831] .table-pagination {
+.fec-dialog-table[data-v-7e9fd985] .table-pagination {
   padding: 8px 0 0 0;
 }.text-field-wrapper[data-v-b0c0d80f] {
   width: 100%;
@@ -5544,24 +5544,24 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-1ff2ad83] {
+.fec-form[data-v-f1c90d7c] {
   height: 100%;
 }
-[data-v-1ff2ad83] .vgl-item > .el-form-item {
+[data-v-f1c90d7c] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-1ff2ad83] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-f1c90d7c] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-1ff2ad83] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-f1c90d7c] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-1ff2ad83] .vgl-item > .el-container {
+[data-v-f1c90d7c] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-b57831f4] {
   display: inline-block;

package/es/packages/designer/package.json.mjs CHANGED Viewed

@@ -1,4 +1,4 @@
-const version = "5.2.14";
+const version = "5.3.1";
 const packageJson = {
   version
 };

package/es/packages/vue/src/api/index.mjs CHANGED Viewed

@@ -10,6 +10,9 @@ const api = {
   },
   getTemplateDialogById: ($http, id) => {
     return $http.postForm(`${$servers.base}/template/sysTemplateDialog/getById`, { id });
+  },
+  getProductData: ($http, prodId) => {
+    return $http.postForm(`${$servers.base}/design/getProductData`, { prodId });
   }
 };
 export {

package/es/packages/vue/src/components/dialog/DialogRenderer.vue2.mjs CHANGED Viewed

@@ -8,9 +8,9 @@ import { Form } from "../forms/form/index.mjs";
 import { parseRouteParams } from "../../utils/parseRouteParams.mjs";
 import { calculate } from "../../utils/formulajs/calculate.mjs";
 import { useEventFlow, executeEventFlow } from "../../utils/eventFlow/eventFlowHandler.mjs";
-/* empty css                                                                                                                                       */
 /* empty css                                                                                                                                     */
 /* empty css                                                                                                                                       */
+/* empty css                                                                                                                                       */
 /* empty css                    */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 /* empty css                                                                                                                                           */
@@ -193,6 +193,7 @@ const _sfc_main = {
               //     exposed: dialogTableRef.value,
               //   },
               // },
+              form: props.componentCtx,
               table: props.componentCtx
             },
             row: props.formData,
@@ -410,7 +411,7 @@ const _sfc_main = {
     };
   }
 };
-const DialogRenderer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-871f9831"]]);
+const DialogRenderer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7e9fd985"]]);
 export {
   DialogRenderer as default
 };

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

@@ -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,7 +292,157 @@ 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);
@@ -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) => {
@@ -693,7 +850,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1ff2ad83"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f1c90d7c"]]);
 export {
   _Form as default
 };

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

@@ -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/TableColumn.vue.mjs CHANGED Viewed

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

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

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

package/lib/designer.css CHANGED Viewed

@@ -5348,18 +5348,18 @@ body,
 }
 .approval-history-content.flowChart[data-v-7be2a6d2] {
   background-color: #f9fafc;
-}.dialog-header-content[data-v-871f9831] {
+}.dialog-header-content[data-v-7e9fd985] {
   font-size: 16px;
   font-weight: 600;
   color: #303133;
 }
-.dialog-content-wrapper[data-v-871f9831] {
+.dialog-content-wrapper[data-v-7e9fd985] {
   min-height: 500px;
   flex-grow: 1;
   display: flex;
   flex-direction: column;
 }
-.empty-content[data-v-871f9831] {
+.empty-content[data-v-7e9fd985] {
   display: flex;
   align-items: center;
   justify-content: center;
@@ -5367,13 +5367,13 @@ body,
   color: #909399;
   font-size: 14px;
 }
-.component-error[data-v-871f9831] {
+.component-error[data-v-7e9fd985] {
   padding: 40px 20px;
   text-align: center;
   color: #f56c6c;
   font-size: 14px;
 }
-.fec-dialog-table[data-v-871f9831] .table-pagination {
+.fec-dialog-table[data-v-7e9fd985] .table-pagination {
   padding: 8px 0 0 0;
 }.text-field-wrapper[data-v-b0c0d80f] {
   width: 100%;
@@ -5544,24 +5544,24 @@ body,
   width: 80px;
   font-size: var(--el-font-size-extra-small);
 }
-.fec-form[data-v-1ff2ad83] {
+.fec-form[data-v-f1c90d7c] {
   height: 100%;
 }
-[data-v-1ff2ad83] .vgl-item > .el-form-item {
+[data-v-f1c90d7c] .vgl-item > .el-form-item {
   width: 100%;
   padding: 12px 8px 0 8px;
   height: calc(100% - 15px);
   display: flex;
 }
-[data-v-1ff2ad83] .vgl-item > .el-form-item.el-form-item--label-top {
+[data-v-f1c90d7c] .vgl-item > .el-form-item.el-form-item--label-top {
   flex-direction: column;
 }
-[data-v-1ff2ad83] .vgl-item > .el-form-item .el-form-item__label {
+[data-v-f1c90d7c] .vgl-item > .el-form-item .el-form-item__label {
   line-height: 20px;
   display: flex;
   align-items: center;
 }
-[data-v-1ff2ad83] .vgl-item > .el-container {
+[data-v-f1c90d7c] .vgl-item > .el-container {
   height: auto !important;
 }.cell-content .cell-text[data-v-b57831f4] {
   display: inline-block;

package/lib/packages/designer/package.json.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const version = "5.2.14";
+const version = "5.3.1";
 const packageJson = {
   version
 };

package/lib/packages/vue/src/api/index.js CHANGED Viewed

@@ -12,6 +12,9 @@ const api = {
   },
   getTemplateDialogById: ($http, id) => {
     return $http.postForm(`${$servers.base}/template/sysTemplateDialog/getById`, { id });
+  },
+  getProductData: ($http, prodId) => {
+    return $http.postForm(`${$servers.base}/design/getProductData`, { prodId });
   }
 };
 exports.default = api;

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                                                                                                                                           */
@@ -195,6 +195,7 @@ const _sfc_main = {
               //     exposed: dialogTableRef.value,
               //   },
               // },
+              form: props.componentCtx,
               table: props.componentCtx
             },
             row: props.formData,
@@ -412,5 +413,5 @@ const _sfc_main = {
     };
   }
 };
-const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-871f9831"]]);
+const DialogRenderer = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-7e9fd985"]]);
 exports.default = DialogRenderer;

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

@@ -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,7 +294,157 @@ 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);
@@ -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) => {
@@ -695,5 +852,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-1ff2ad83"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-f1c90d7c"]]);
 exports.default = _Form;

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/TableColumn.vue.js CHANGED Viewed

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

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