@fecp/designer 5.3.11 → 5.3.12

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

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

package/lib/packages/designer/src/components/ParamsConfig.vue2.js

@@ -5,7 +5,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                                                                                                   */
 const vue = require("vue");
 const index$1 = 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 ValueSelector = require("./ValueSelector.vue2.js");
+const ValueSelector = require("./ValueSelector.vue.js");
 ;/* empty css                  */
 const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
 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/button/index.js");

package/lib/packages/designer/src/components/ValueSelector.vue.js

@@ -0,0 +1,190 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const vue = require("vue");
+const ValueSelectorPopover = require("./ValueSelectorPopover.vue2.js");
+const common = require("../packages/utils/common.js");
+;/* empty css                    */
+const _pluginVue_exportHelper = require("../../../../_virtual/_plugin-vue_export-helper.js");
+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/input-tag/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/input/index.js");
+const _sfc_main = {
+  __name: "ValueSelector",
+  props: {
+    // modelValue 的格式：
+    // 单选：{ type: 'field', value: '字段ID' }
+    // 多选：[{ type: 'field', value: '字段ID1' }, { type: 'field', value: '字段ID2' }]
+    modelValue: {
+      default: () => null
+    },
+    placeholder: {
+      type: String,
+      default: "请输入或选择值"
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    size: {
+      type: String,
+      default: "small"
+    }
+    // // 可选的字段列表（从父组件传入）
+    // availableFields: {
+    //   type: Array,
+    //   default: () => [],
+    //   validator: (value) => Array.isArray(value),
+    // },
+  },
+  emits: ["update:modelValue"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emit = __emit;
+    const inputComponent = vue.computed(() => {
+      return props.multiple ? index.ElInputTag : index$1.ElInput;
+    });
+    const hiddenFieldsData = vue.computed(() => {
+      const editConfigData = common.getEditConfigData();
+      return (editConfigData == null ? void 0 : editConfigData.hiddenFields) || [];
+    });
+    const availableFields = vue.computed(() => {
+      const fields = common.getEditConfigDataFields() || [];
+      return fields.map((item) => ({
+        id: item.id,
+        label: item.label,
+        fieldName: item.fieldName,
+        fieldType: item.fieldType
+      }));
+    });
+    const displayText = vue.computed(() => {
+      if (!props.modelValue) return "";
+      if (!props.multiple && typeof props.modelValue === "object" && !Array.isArray(props.modelValue)) {
+        const val = props.modelValue;
+        if (val.label) return val.label;
+        const field = availableFields.value.find((f) => f.id === val.value);
+        return (field == null ? void 0 : field.label) || (field == null ? void 0 : field.fieldName) || val.value;
+      } else if (!props.multiple && typeof props.modelValue === "string") {
+        return props.modelValue;
+      }
+      return "";
+    });
+    const tags = vue.computed({
+      get() {
+        if (!props.multiple || !Array.isArray(props.modelValue)) {
+          return [];
+        }
+        return props.modelValue.map((item) => {
+          if (item.label) return item.label;
+          const field = availableFields.value.find((f) => f.id === item.value);
+          return (field == null ? void 0 : field.label) || (field == null ? void 0 : field.fieldName) || item.value;
+        }).filter(Boolean);
+      },
+      set(val) {
+        if (Array.isArray(props.modelValue)) {
+          const newModelValue = props.modelValue.filter((item) => {
+            const itemLabel = item.label || (() => {
+              const field = [
+                ...availableFields.value,
+                ...hiddenFieldsData.value
+              ].find((f) => f.id === item.value);
+              return (field == null ? void 0 : field.label) || (field == null ? void 0 : field.fieldName) || item.value;
+            })();
+            return val.includes(itemLabel);
+          });
+          emit("update:modelValue", newModelValue);
+        }
+      }
+    });
+    const unifiedInputValue = vue.computed({
+      get() {
+        return props.multiple ? tags.value : displayText.value;
+      },
+      set(val) {
+        if (props.multiple && Array.isArray(val)) {
+          tags.value = val;
+        } else if (!props.multiple && typeof val === "string") {
+          emit("update:modelValue", val);
+        }
+      }
+    });
+    const handleConfirm = (selected) => {
+      let result = null;
+      if (selected.type === "field") {
+        const field = [...availableFields.value, ...hiddenFieldsData.value].find(
+          (f) => f.id === selected.value
+        );
+        result = {
+          label: `\${${(field == null ? void 0 : field.label) || (field == null ? void 0 : field.fieldName) || selected.value}}`,
+          type: "field",
+          value: selected.value
+        };
+      } else if (selected.type === "userInfo") {
+        result = {
+          label: `\${用户信息: ${getUserInfoLabel(selected.value)}}`,
+          type: "userInfo",
+          value: selected.value
+        };
+      } else if (selected.type === "urlParam") {
+        result = {
+          label: `\${路由参数: ${selected.value}}`,
+          type: "urlParam",
+          value: selected.value
+        };
+      }
+      if (!result) return;
+      if (props.multiple) {
+        const currentValue = Array.isArray(props.modelValue) ? props.modelValue : [];
+        const exists = currentValue.some((item) => item.value === result.value);
+        if (!exists) {
+          emit("update:modelValue", [...currentValue, result]);
+        }
+      } else {
+        emit("update:modelValue", result);
+      }
+    };
+    const getUserInfoLabel = (key) => {
+      const labels = {
+        userCode: "用户编号",
+        userName: "用户名称",
+        roleCode: "角色编号",
+        roleName: "角色名称",
+        orgCode: "机构编号",
+        orgName: "机构名称"
+      };
+      return labels[key] || key;
+    };
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(inputComponent.value), {
+        modelValue: unifiedInputValue.value,
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unifiedInputValue.value = $event),
+        placeholder: __props.placeholder,
+        disabled: __props.disabled,
+        readonly: __props.readOnly,
+        trigger: __props.multiple ? "Space" : void 0,
+        "collapse-tags": "",
+        "collapse-tags-tooltip": "",
+        "max-collapse-tags": 1,
+        class: "value-selector-input",
+        size: __props.size
+      }, {
+        suffix: vue.withCtx(() => [
+          vue.createVNode(ValueSelectorPopover.default, {
+            "available-fields": availableFields.value,
+            disabled: __props.disabled,
+            onConfirm: handleConfirm
+          }, null, 8, ["available-fields", "disabled"])
+        ]),
+        _: 1
+      }, 8, ["modelValue", "placeholder", "disabled", "readonly", "trigger", "size"]);
+    };
+  }
+};
+const ValueSelector = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e5b87efa"]]);
+exports.default = ValueSelector;

package/lib/packages/designer/src/layout/aside/HiddenFieldDialog.vue.js

@@ -17,6 +17,7 @@ const index$2 = require("../../../../../node_modules/.pnpm/@element-plus_icons-v
 const common = require("../../packages/utils/common.js");
 const index$5 = require("../../packages/form/aside/index.js");
 const index$6 = require("../../packages/table/aside/index.js");
+const ValueSelector = require("../../components/ValueSelector.vue.js");
 ;/* empty css                        */
 const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_export-helper.js");
 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/dialog/index.js");
@@ -336,10 +337,10 @@ const _sfc_main = {
                 }),
                 vue.createVNode(_component_el_table_column, { label: "初值" }, {
                   default: vue.withCtx(({ row }) => [
-                    vue.createVNode(_component_el_input, {
+                    vue.createVNode(ValueSelector.default, {
                       modelValue: row.value,
                       "onUpdate:modelValue": ($event) => row.value = $event,
-                      placeholder: "请输入初值"
+                      size: "default"
                     }, null, 8, ["modelValue", "onUpdate:modelValue"])
                   ]),
                   _: 1
@@ -374,5 +375,5 @@ const _sfc_main = {
     };
   }
 };
-const HiddenFieldDialog = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-396c5fa5"]]);
+const HiddenFieldDialog = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-c3d621bb"]]);
 exports.default = HiddenFieldDialog;

package/lib/packages/designer/src/packages/advancedFilter/ValueInput.vue2.js

@@ -15,7 +15,7 @@ require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typesc
 ;/* empty css                                                                                                                                      */
 const vue = require("vue");
 const index = require("../../../../../node_modules/.pnpm/@vueuse_core@14.2.1_vue@3.5.13_typescript@5.7.3_/node_modules/@vueuse/core/dist/index.js");
-const ValueSelector = require("../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../components/ValueSelector.vue.js");
 const index$1 = require("../../api/index.js");
 const common = require("../utils/common.js");
 const datasource = require("../utils/datasource.js");

package/lib/packages/designer/src/packages/dataLinkage/index.vue.js

@@ -31,7 +31,7 @@ require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typesc
 ;/* empty css                                                                                                                                     */
 ;/* empty css                                         */
 const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_export-helper.js");
-;/* empty css                                  */
+;/* empty css                                   */
 require("../../axios/config.js");
 require("../../../../../_virtual/FileSaver.min.js");
 require("../../../../../_virtual/index.js");

package/lib/packages/designer/src/packages/dialogGlobal/index.vue.js

@@ -79,7 +79,7 @@ require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typesc
 require("../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/theme-chalk/el-tab-pane.css.js");
 ;/* empty css                                                                                                                                     */
 ;/* empty css                                         */
-;/* empty css                                  */
+;/* empty css                                   */
 require("../../axios/config.js");
 ;/* empty css                                                                                                                                     */
 ;/* empty css                                                                                                                                       */

package/lib/packages/designer/src/packages/form/components/ComponentPreviewWrapper.vue.js

@@ -167,7 +167,7 @@ const _sfc_main = {
                 ]),
                 key: "1"
               } : void 0,
-              !__props.componentData.readOnly && !__props.componentData.disabled && __props.componentData.suffixButton && __props.componentData.suffixButton != "none" ? {
+              !__props.componentData.disabled && __props.componentData.suffixButton && __props.componentData.suffixButton != "none" ? {
                 name: "append",
                 fn: vue.withCtx(() => [
                   vue.createVNode(_component_el_button, { class: "suffixButton" }, {
@@ -300,5 +300,5 @@ const _sfc_main = {
     };
   }
 };
-const ComponentPreviewWrapper = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b12e41a1"]]);
+const ComponentPreviewWrapper = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-09ce9664"]]);
 exports.default = ComponentPreviewWrapper;

package/lib/packages/designer/src/packages/form/index.vue.js

@@ -50,10 +50,6 @@ const _hoisted_11 = {
   key: 1,
   class: "status-tag disabled-tag"
 };
-const _hoisted_12 = {
-  key: 2,
-  class: "status-tag readonly-tag"
-};
 const dropId = "drop";
 const _sfc_main = {
   __name: "index",
@@ -436,13 +432,6 @@ const _sfc_main = {
                                   ]),
                                   _: 1
                                 })
-                              ])) : item.component.readOnly ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_12, [
-                                vue.createVNode(_component_el_icon, null, {
-                                  default: vue.withCtx(() => [
-                                    vue.createVNode(vue.unref(index$4.View))
-                                  ]),
-                                  _: 1
-                                })
                               ])) : vue.createCommentVNode("", true)
                             ]),
                             vue.createElementVNode("div", {
@@ -501,5 +490,5 @@ const _sfc_main = {
     };
   }
 };
-const formWorkArea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-1d0d8388"]]);
+const formWorkArea = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-f7bfeb0a"]]);
 exports.default = formWorkArea;

package/lib/packages/designer/src/packages/form/property/approvalHistory.vue.js

@@ -12,7 +12,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const common = require("../../utils/common.js");
 const eventBus = require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.js");
 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/collapse/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/form/index.js");
 const index$2 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.js");

package/lib/packages/designer/src/packages/form/property/subForm.vue.js

@@ -14,7 +14,7 @@ const vue = require("vue");
 const common = require("../../utils/common.js");
 const TemplateSelector = require("../../../components/TemplateSelector.vue.js");
 const eventBus = require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.js");
 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/collapse/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/form/index.js");
 const index$2 = require("../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.js");

package/lib/packages/designer/src/packages/prod/index.vue.js

@@ -15,7 +15,7 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const vue = require("vue");
 const index$6 = 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 common = require("../utils/common.js");
-const ValueSelector = require("../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../components/ValueSelector.vue.js");
 const index = require("../../api/index.js");
 ;/* empty css            */
 const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_export-helper.js");

package/lib/packages/designer/src/packages/table/headerBtn.vue.js

@@ -46,7 +46,7 @@ const index$1 = require("../../../../../node_modules/.pnpm/@element-plus_icons-v
 ;/* empty css                                                                                                                                     */
 require("../../store/index.js");
 ;/* empty css                                         */
-;/* empty css                                  */
+;/* empty css                                   */
 ;/* empty css                                 */
 ;/* empty css                                                                                                                                   */
 ;/* empty css                                                                                                                                      */

package/lib/packages/mobile/src/components/base/card/Card.vue.js

@@ -8,13 +8,13 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 ;/* empty css                                                                                                                    */
 ;/* empty css                                                                                                                   */
 const vue = require("vue");
+;/* empty css           */
+const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 ;/* empty css                                                                                                                       */
 ;/* empty css                                                                                                                              */
 ;/* empty css                                                                                                                    */
 ;/* empty css                                                                                                                  */
 ;/* empty css                                                                                                                   */
-;/* empty css           */
-const _pluginVue_exportHelper = require("../../../../../../_virtual/_plugin-vue_export-helper.js");
 const index$1 = require("../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/swipe-cell/index.js");
 const functionCall = require("../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/dialog/function-call.js");
 require("../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/dialog/index.js");

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

@@ -14,6 +14,7 @@ const getJsonAsyncUtil = require("../../../utils/getJsonAsyncUtil.js");
 const FormItem = require("../formItem/FormItem.vue.js");
 const datasource = require("../../../utils/datasource.js");
 const validation = require("./validation.js");
+const parseRouteParams = require("../../../utils/parseRouteParams.js");
 const common = require("../../../utils/common.js");
 ;/* empty css                                                                                                                                         */
 ;/* empty css                                                                                                                                          */
@@ -205,7 +206,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       if (hiddenFields.value && hiddenFields.value.length > 0) {
         hiddenFields.value.forEach((field) => {
           if (field.fieldName) {
-            defaultData[field.fieldName] = field.value !== void 0 ? field.value : null;
+            if (typeof field.value == "object") {
+              debugger;
+              const value = parseRouteParams.parseSingleParamValue(field.value, defaultData, [
+                ...fieldsData.value,
+                ...hiddenFields.value
+              ]);
+              defaultData[field.fieldName] = value !== void 0 ? value : null;
+            } else {
+              defaultData[field.fieldName] = field.value !== void 0 ? field.value : null;
+            }
           }
         });
       }
@@ -973,5 +983,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-bf77b845"]]);
+const _Form = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-e047372a"]]);
 exports.default = _Form;

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

@@ -201,7 +201,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }, vue.toHandlers(__props.config.eventHandlers), {
           placeholder: __props.placeholder,
           disabled: __props.disabled,
-          readonly: __props.suffixButton == "dialog" ? true : __props.readonly,
+          readonly: __props.suffixButton == "dialog" ? true : false,
           maxlength: __props.maxLength,
           "show-word-limit": __props.showWordCount,
           onChange: handleChange,
@@ -251,5 +251,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Text = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b0c0d80f"]]);
+const _Text = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-b0a06421"]]);
 exports.default = _Text;

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

@@ -539,7 +539,6 @@ async function handleDialog(node, data, fields, context) {
     const dialogList = context.localConfig.dialogs || [];
     dialog = dialogList.find((item) => item.id == (basic == null ? void 0 : basic.dialogId));
     dialog.subFormMode = basic.subFormMode;
-    dialog.selectionMode = basic.selectionMode;
   }
   if (!dialog) {
     console.error("ui-dialog: 未找到匹配的弹层配置，" + (basic == null ? void 0 : basic.dialogId));

package/lib/packages/vue/src/utils/parseRouteParams.js

@@ -10,7 +10,7 @@ function parseSingleParamValue(value, data, fields) {
   }
   const type = value.type;
   if (type === "field") {
-    const field = fields.find((f) => f.id === value.value);
+    const field = fields.find((f) => f.id == value.value);
     if (field) {
       return data[field.fieldName];
     }

package/package.json

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