@fecp/designer 5.3.11 → 5.3.12

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

@@ -1,4 +1,4 @@
-const version = "5.3.11";
+const version = "5.3.12";
 const packageJson = {
   version
 };

package/es/packages/designer/src/components/ParamsConfig.vue2.mjs

@@ -3,7 +3,7 @@
 /* empty css                                                                                                                                   */
 import { computed, createElementBlock, openBlock, createBlock, unref, withCtx, createTextVNode, createElementVNode, Fragment, renderList, createVNode } from "vue";
 import { Plus as plus_default, Delete as delete_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 ValueSelector from "./ValueSelector.vue2.mjs";
+import ValueSelector from "./ValueSelector.vue.mjs";
 /* empty css                  */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.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";

package/es/packages/designer/src/components/ValueSelector.vue.mjs

@@ -0,0 +1,190 @@
+import { computed, createBlock, openBlock, resolveDynamicComponent, withCtx, createVNode } from "vue";
+import ValueSelectorPopover from "./ValueSelectorPopover.vue2.mjs";
+import { getEditConfigData, getEditConfigDataFields } from "../packages/utils/common.mjs";
+/* empty css                    */
+import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
+import { ElInputTag } from "../../../../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.mjs";
+import { ElInput } from "../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.mjs";
+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 = computed(() => {
+      return props.multiple ? ElInputTag : ElInput;
+    });
+    const hiddenFieldsData = computed(() => {
+      const editConfigData = getEditConfigData();
+      return (editConfigData == null ? void 0 : editConfigData.hiddenFields) || [];
+    });
+    const availableFields = computed(() => {
+      const fields = getEditConfigDataFields() || [];
+      return fields.map((item) => ({
+        id: item.id,
+        label: item.label,
+        fieldName: item.fieldName,
+        fieldType: item.fieldType
+      }));
+    });
+    const displayText = 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 = 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 = 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 openBlock(), createBlock(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: withCtx(() => [
+          createVNode(ValueSelectorPopover, {
+            "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__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e5b87efa"]]);
+export {
+  ValueSelector as default
+};

package/es/packages/designer/src/layout/aside/HiddenFieldDialog.vue.mjs

@@ -15,6 +15,7 @@ import { Plus as plus_default, RefreshRight as refresh_right_default, Delete as
 import { getEditConfigData, getEditingType, cloneDeep, getEditConfigDataFields } from "../../packages/utils/common.mjs";
 import { defaultProperty } from "../../packages/form/aside/index.mjs";
 import { defaultProperty as defaultProperty$1 } from "../../packages/table/aside/index.mjs";
+import ValueSelector from "../../components/ValueSelector.vue.mjs";
 /* empty css                        */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElDialog } from "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/dialog/index.mjs";
@@ -334,10 +335,10 @@ const _sfc_main = {
                 }),
                 createVNode(_component_el_table_column, { label: "初值" }, {
                   default: withCtx(({ row }) => [
-                    createVNode(_component_el_input, {
+                    createVNode(ValueSelector, {
                       modelValue: row.value,
                       "onUpdate:modelValue": ($event) => row.value = $event,
-                      placeholder: "请输入初值"
+                      size: "default"
                     }, null, 8, ["modelValue", "onUpdate:modelValue"])
                   ]),
                   _: 1
@@ -372,7 +373,7 @@ const _sfc_main = {
     };
   }
 };
-const HiddenFieldDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-396c5fa5"]]);
+const HiddenFieldDialog = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c3d621bb"]]);
 export {
   HiddenFieldDialog as default
 };

package/es/packages/designer/src/packages/advancedFilter/ValueInput.vue2.mjs

@@ -13,7 +13,7 @@ import "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescr
 /* empty css                                                                                                                                      */
 import { computed, watch, ref, createElementBlock, unref, openBlock, createBlock, isRef, createVNode, createElementVNode, withCtx, Fragment, renderList } from "vue";
 import { useVModel } from "../../../../../node_modules/.pnpm/@vueuse_core@14.2.1_vue@3.5.13_typescript@5.7.3_/node_modules/@vueuse/core/dist/index.mjs";
-import ValueSelector from "../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../components/ValueSelector.vue.mjs";
 import api from "../../api/index.mjs";
 import { getEditConfigDataSources } from "../utils/common.mjs";
 import { createDataSource } from "../utils/datasource.mjs";

package/es/packages/designer/src/packages/dataLinkage/index.vue.mjs

@@ -29,7 +29,7 @@ import "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescr
 /* empty css                                                                                                                                     */
 /* empty css                                         */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";
-/* empty css                                  */
+/* empty css                                   */
 import "../../axios/config.mjs";
 import "../../../../../_virtual/FileSaver.min.mjs";
 import "../../../../../_virtual/index.mjs";

package/es/packages/designer/src/packages/dialogGlobal/index.vue.mjs

@@ -77,7 +77,7 @@ import "../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescr
 import "../../../../../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.mjs";
 /* empty css                                                                                                                                     */
 /* empty css                                         */
-/* empty css                                  */
+/* empty css                                   */
 import "../../axios/config.mjs";
 /* empty css                                                                                                                                     */
 /* empty css                                                                                                                                       */

package/es/packages/designer/src/packages/form/components/ComponentPreviewWrapper.vue.mjs

@@ -165,7 +165,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: withCtx(() => [
                   createVNode(_component_el_button, { class: "suffixButton" }, {
@@ -298,7 +298,7 @@ const _sfc_main = {
     };
   }
 };
-const ComponentPreviewWrapper = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b12e41a1"]]);
+const ComponentPreviewWrapper = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-09ce9664"]]);
 export {
   ComponentPreviewWrapper as default
 };

package/es/packages/designer/src/packages/form/index.vue.mjs

@@ -15,7 +15,7 @@ import H2Wrapper from "./components/H2Wrapper.vue.mjs";
 import SubForm from "./components/SubForm.vue.mjs";
 import ApprovalHistory from "./components/ApprovalHistory.vue.mjs";
 import SubTable from "./components/SubTable.vue.mjs";
-import { StarFilled as star_filled_default, Star as star_default, Lock as lock_default, Unlock as unlock_default, Delete as delete_default, View as view_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 { StarFilled as star_filled_default, Star as star_default, Lock as lock_default, Unlock as unlock_default, Delete as delete_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 { getEditConfigData, setSelectedItem, setHoverItem, getCurrentClass, isSelectedItem } from "../utils/common.mjs";
 import { throttle as eo } from "../../../../../node_modules/.pnpm/@vexip-ui_utils@2.16.4/node_modules/@vexip-ui/utils/dist/index.mjs";
 /* empty css                                                                                                                                     */
@@ -48,10 +48,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",
@@ -434,13 +430,6 @@ const _sfc_main = {
                                   ]),
                                   _: 1
                                 })
-                              ])) : item.component.readOnly ? (openBlock(), createElementBlock("div", _hoisted_12, [
-                                createVNode(_component_el_icon, null, {
-                                  default: withCtx(() => [
-                                    createVNode(unref(view_default))
-                                  ]),
-                                  _: 1
-                                })
                               ])) : createCommentVNode("", true)
                             ]),
                             createElementVNode("div", {
@@ -499,7 +488,7 @@ const _sfc_main = {
     };
   }
 };
-const formWorkArea = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1d0d8388"]]);
+const formWorkArea = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f7bfeb0a"]]);
 export {
   formWorkArea as default
 };

package/es/packages/designer/src/packages/form/property/approvalHistory.vue.mjs

@@ -10,7 +10,7 @@
 import { computed, ref, watch, createBlock, openBlock, unref, isRef, withCtx, createVNode, createElementBlock, createCommentVNode, createTextVNode, Fragment } from "vue";
 import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
 import emitter from "../../utils/eventBus.mjs";
-import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue.mjs";
 import { ElCollapse, ElCollapseItem } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/collapse/index.mjs";
 import { ElForm, ElFormItem } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.mjs";
 import { ElInput } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.mjs";

package/es/packages/designer/src/packages/form/property/subForm.vue.mjs

@@ -12,7 +12,7 @@ import { computed, ref, createBlock, openBlock, unref, isRef, withCtx, createVNo
 import { getCurrentItem, getEditConfigData } from "../../utils/common.mjs";
 import TemplateSelector from "../../../components/TemplateSelector.vue.mjs";
 import emitter from "../../utils/eventBus.mjs";
-import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue.mjs";
 import { ElCollapse, ElCollapseItem } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/collapse/index.mjs";
 import { ElForm, ElFormItem } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/form/index.mjs";
 import { ElInput } from "../../../../../../node_modules/.pnpm/element-plus@2.13.2_vue@3.5.13_typescript@5.7.3_/node_modules/element-plus/es/components/input/index.mjs";

package/es/packages/designer/src/packages/prod/index.vue.mjs

@@ -13,7 +13,7 @@
 import { useModel, ref, watch, computed, createBlock, openBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, createTextVNode, unref } from "vue";
 import { Plus as plus_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 { getEditConfigData, getEditConfigDataFields, setEditConfigData } from "../utils/common.mjs";
-import ValueSelector from "../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../components/ValueSelector.vue.mjs";
 import api from "../../api/index.mjs";
 /* empty css            */
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.mjs";

package/es/packages/designer/src/packages/table/headerBtn.vue.mjs

@@ -44,7 +44,7 @@ import { Connection as connection_default, Grid as grid_default, ChatLineSquare
 /* empty css                                                                                                                                     */
 import "../../store/index.mjs";
 /* empty css                                         */
-/* empty css                                  */
+/* empty css                                   */
 /* empty css                                 */
 /* empty css                                                                                                                                   */
 /* empty css                                                                                                                                      */

package/es/packages/mobile/src/components/base/card/Card.vue.mjs

@@ -6,13 +6,13 @@
 /* empty css                                                                                                                    */
 /* empty css                                                                                                                   */
 import { createBlock, openBlock, withCtx, createVNode, renderSlot } from "vue";
+/* empty css           */
+import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
 /* empty css                                                                                                                       */
 /* empty css                                                                                                                              */
 /* empty css                                                                                                                    */
 /* empty css                                                                                                                  */
 /* empty css                                                                                                                   */
-/* empty css           */
-import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { SwipeCell } from "../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/swipe-cell/index.mjs";
 import { showConfirmDialog } from "../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/dialog/function-call.mjs";
 import "../../../../../../node_modules/.pnpm/vant@4.9.17_vue@3.5.13_typescript@5.7.3_/node_modules/vant/es/dialog/index.mjs";

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

@@ -12,6 +12,7 @@ import getJsonAsyncUtil from "../../../utils/getJsonAsyncUtil.mjs";
 import _FormItem from "../formItem/FormItem.vue.mjs";
 import { createDataSource } from "../../../utils/datasource.mjs";
 import { generateFieldRules } from "./validation.mjs";
+import { parseSingleParamValue } from "../../../utils/parseRouteParams.mjs";
 import { cloneDeep } from "../../../utils/common.mjs";
 /* empty css                                                                                                                                         */
 /* empty css                                                                                                                                          */
@@ -203,7 +204,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 = 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;
+            }
           }
         });
       }
@@ -971,7 +981,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-bf77b845"]]);
+const _Form = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e047372a"]]);
 export {
   _Form as default
 };

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

@@ -199,7 +199,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         }, 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,
@@ -249,7 +249,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Text = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b0c0d80f"]]);
+const _Text = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b0a06421"]]);
 export {
   _Text as default
 };

package/es/packages/vue/src/utils/eventFlow/actionHandlers.mjs

@@ -537,7 +537,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/es/packages/vue/src/utils/parseRouteParams.mjs

@@ -8,7 +8,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];
     }