@fecp/designer 5.5.1 → 5.5.2

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.5.1";
+const version = "5.5.2";
 const packageJson = {
   version
 };

package/es/designer/src/components/DocumentParam.vue.mjs

@@ -9,7 +9,7 @@ import "../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                            */
 import { computed, ref, createElementBlock, openBlock, createBlock, unref, withCtx, createTextVNode, createElementVNode, Fragment, renderList, createVNode } from "vue";
 import { Plus as plus_default, Delete as delete_default } from "../../../node_modules/@element-plus/icons-vue/dist/index.mjs";
-import ValueSelector from "./ValueSelector.vue2.mjs";
+import ValueSelector from "./ValueSelector.vue.mjs";
 import api from "../api/index.mjs";
 /* empty css                    */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";

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

@@ -4,7 +4,7 @@ import "../../../node_modules/element-plus/es/index.mjs";
 /* 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/@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/element-plus/es/components/button/index.mjs";

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

@@ -0,0 +1,191 @@
+import { computed, createBlock, openBlock, resolveDynamicComponent, withCtx, createVNode } from "vue";
+import "../../../node_modules/element-plus/es/index.mjs";
+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/element-plus/es/components/input-tag/index.mjs";
+import { ElInput } from "../../../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/designer/src/layout/aside/HiddenFieldDialog.vue.mjs

@@ -16,7 +16,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.vue2.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/element-plus/es/components/dialog/index.mjs";

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

@@ -14,7 +14,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-tooltip.css.mjs";
 import "../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.mjs";
 import { computed, watch, ref, createElementBlock, unref, openBlock, createBlock, isRef, createVNode, createElementVNode, withCtx, Fragment, renderList } from "vue";
 import { useVModel } from "../../../../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/designer/src/packages/dataLinkage/index.vue.mjs

@@ -30,7 +30,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.mjs
 /* 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/designer/src/packages/dialogGlobal/index.vue.mjs

@@ -84,7 +84,7 @@ import widgets from "../table/property/widgets.vue.mjs";
 import "../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.mjs";
 /* empty css                                                              */
 /* empty css                                         */
-/* empty css                                  */
+/* empty css                                   */
 /* empty css                                                            */
 /* empty css                                                            */
 /* empty css                             */

package/es/designer/src/packages/eventFlow/dialog/action/RiskSch.vue.mjs

@@ -4,7 +4,7 @@ import "../../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                     */
 import { createElementBlock, openBlock, Fragment, createVNode, withCtx } from "vue";
 import RiskSchemeSelector from "../../../../components/RiskSchemeSelector.vue2.mjs";
-import ValueSelector from "../../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../../components/ValueSelector.vue.mjs";
 import ParamsConfig from "../../../../components/ParamsConfig.vue2.mjs";
 import { ElFormItem } from "../../../../../../node_modules/element-plus/es/components/form/index.mjs";
 import { ElSwitch } from "../../../../../../node_modules/element-plus/es/components/switch/index.mjs";

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

@@ -11,7 +11,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 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/element-plus/es/components/collapse/index.mjs";
 import { ElForm, ElFormItem } from "../../../../../node_modules/element-plus/es/components/form/index.mjs";
 import { ElInput } from "../../../../../node_modules/element-plus/es/components/input/index.mjs";

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

@@ -17,7 +17,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 import { computed, ref, createBlock, openBlock, withCtx, createVNode, createTextVNode, createElementBlock, Fragment, renderList } from "vue";
 import { getCurrentItem } from "../../utils/common.mjs";
 import "../../utils/eventBus.mjs";
-import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue.mjs";
 import api from "../../../api/index.mjs";
 import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
 /* empty css               */

package/es/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.vue2.mjs";
 import emitter from "../../utils/eventBus.mjs";
-import ValueSelector from "../../../components/ValueSelector.vue2.mjs";
+import ValueSelector from "../../../components/ValueSelector.vue.mjs";
 import ParamsConfig from "../../../components/ParamsConfig.vue2.mjs";
 import { ElCollapse, ElCollapseItem } from "../../../../../node_modules/element-plus/es/components/collapse/index.mjs";
 import { ElForm, ElFormItem } from "../../../../../node_modules/element-plus/es/components/form/index.mjs";

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

@@ -14,7 +14,7 @@ import "../../../../node_modules/element-plus/es/index.mjs";
 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/@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/designer/src/packages/table/default.mjs

@@ -56,8 +56,8 @@ const defaultTableConfig = {
   sortRules: [],
   paginationConfig: {
     enabled: true,
-    pageSize: 10,
-    pageSizes: [10, 20, 50, 100, 200, 500],
+    pageSize: 15,
+    pageSizes: [15, 20, 50, 100, 200, 500],
     layout: "full",
     background: true,
     size: "small"

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

@@ -45,7 +45,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/designer/src/packages/table/tablePagination.vue.mjs

@@ -8,21 +8,15 @@ import "../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                     */
 /* empty css                                                               */
 /* empty css                                                                   */
-/* empty css                                                              */
-/* empty css                                                                    */
-/* empty css                                                                     */
-/* empty css                                                                     */
 /* empty css                                                                */
 /* empty css                                                               */
-import { computed, reactive, watch, createElementBlock, openBlock, createElementVNode, createVNode, withCtx, normalizeClass, createCommentVNode, toDisplayString } from "vue";
+import { computed, reactive, watch, ref, createElementBlock, openBlock, createElementVNode, createVNode, withCtx, normalizeClass, createBlock, createCommentVNode, unref, toDisplayString, nextTick } from "vue";
 import { getEditConfigData } from "../utils/common.mjs";
 /* empty css                      */
 import _export_sfc from "../../../../_virtual/_plugin-vue_export-helper.mjs";
 import { ElSwitch } from "../../../../node_modules/element-plus/es/components/switch/index.mjs";
 import { ElDivider } from "../../../../node_modules/element-plus/es/components/divider/index.mjs";
-import { ElInputNumber } from "../../../../node_modules/element-plus/es/components/input-number/index.mjs";
 import { ElSelect, ElOption } from "../../../../node_modules/element-plus/es/components/select/index.mjs";
-import { ElRadioGroup, ElRadioButton } from "../../../../node_modules/element-plus/es/components/radio/index.mjs";
 import { ElPagination } from "../../../../node_modules/element-plus/es/components/pagination/index.mjs";
 const _hoisted_1 = { class: "table-pagination-config" };
 const _hoisted_2 = { class: "config-row" };
@@ -37,8 +31,8 @@ const _sfc_main = {
     const editConfigData = computed(() => getEditConfigData());
     const paginationConfig = reactive({
       enabled: true,
-      pageSize: 10,
-      pageSizes: [10, 20, 50, 100, 200, 500],
+      pageSize: 15,
+      pageSizes: [15, 20, 50, 100, 200, 500],
       layout: "full",
       background: true,
       size: "small",
@@ -59,49 +53,40 @@ const _sfc_main = {
     function getLayout(layout) {
       return layoutMap[layout] || layoutMap.full;
     }
+    const showPagination = ref(true);
+    function pageSizeChange() {
+      showPagination.value = false;
+      nextTick(() => {
+        showPagination.value = true;
+      });
+    }
     return (_ctx, _cache) => {
       const _component_el_switch = ElSwitch;
       const _component_el_divider = ElDivider;
-      const _component_el_input_number = ElInputNumber;
       const _component_el_option = ElOption;
       const _component_el_select = ElSelect;
-      const _component_el_radio_button = ElRadioButton;
-      const _component_el_radio_group = ElRadioGroup;
       const _component_el_pagination = ElPagination;
       return openBlock(), createElementBlock("div", _hoisted_1, [
         createElementVNode("div", _hoisted_2, [
-          _cache[5] || (_cache[5] = createElementVNode("span", { class: "config-label" }, "开启分页:", -1)),
+          _cache[2] || (_cache[2] = createElementVNode("span", { class: "config-label" }, "开启分页:", -1)),
           createVNode(_component_el_switch, {
             modelValue: paginationConfig.enabled,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => paginationConfig.enabled = $event),
             size: "small"
           }, null, 8, ["modelValue"]),
           createVNode(_component_el_divider, { direction: "vertical" }),
-          _cache[6] || (_cache[6] = createElementVNode("span", { class: "config-label" }, "每页条数:", -1)),
-          createVNode(_component_el_input_number, {
+          _cache[3] || (_cache[3] = createElementVNode("span", { class: "config-label" }, "每页条数:", -1)),
+          createVNode(_component_el_select, {
             modelValue: paginationConfig.pageSize,
             "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => paginationConfig.pageSize = $event),
-            min: 1,
-            max: 500,
-            size: "small",
-            "controls-position": "right",
-            style: { "width": "100px" }
-          }, null, 8, ["modelValue"]),
-          createVNode(_component_el_divider, { direction: "vertical" }),
-          _cache[7] || (_cache[7] = createElementVNode("span", { class: "config-label" }, "可选条数:", -1)),
-          createVNode(_component_el_select, {
-            modelValue: paginationConfig.pageSizes,
-            "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => paginationConfig.pageSizes = $event),
-            multiple: "",
             size: "small",
-            style: { "width": "180px" },
-            "collapse-tags": "",
-            "collapse-tags-tooltip": ""
+            style: { "width": "100px" },
+            onChange: pageSizeChange
           }, {
             default: withCtx(() => [
               createVNode(_component_el_option, {
-                label: "10",
-                value: 10
+                label: "15",
+                value: 15
               }),
               createVNode(_component_el_option, {
                 label: "20",
@@ -125,60 +110,16 @@ const _sfc_main = {
               })
             ]),
             _: 1
-          }, 8, ["modelValue"]),
-          createVNode(_component_el_divider, { direction: "vertical" }),
-          _cache[8] || (_cache[8] = createElementVNode("span", { class: "config-label" }, "分页样式:", -1)),
-          createVNode(_component_el_select, {
-            modelValue: paginationConfig.layout,
-            "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => paginationConfig.layout = $event),
-            size: "small",
-            style: { "width": "140px" }
-          }, {
-            default: withCtx(() => [
-              createVNode(_component_el_option, {
-                label: "简单",
-                value: "simple"
-              }),
-              createVNode(_component_el_option, {
-                label: "标准",
-                value: "standard"
-              }),
-              createVNode(_component_el_option, {
-                label: "完整",
-                value: "full"
-              })
-            ]),
-            _: 1
-          }, 8, ["modelValue"]),
-          createVNode(_component_el_divider, { direction: "vertical" }),
-          createVNode(_component_el_radio_group, {
-            modelValue: paginationConfig.size,
-            "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => paginationConfig.size = $event),
-            size: "small"
-          }, {
-            default: withCtx(() => [
-              createVNode(_component_el_radio_button, {
-                label: "紧凑",
-                value: "small"
-              }),
-              createVNode(_component_el_radio_button, {
-                label: "标准",
-                value: "default"
-              }),
-              createVNode(_component_el_radio_button, {
-                label: "大号",
-                value: "large"
-              })
-            ]),
-            _: 1
           }, 8, ["modelValue"])
         ]),
         createElementVNode("div", {
           class: normalizeClass(["preview-section", { disabled: !paginationConfig.enabled }])
         }, [
-          createVNode(_component_el_pagination, {
+          unref(showPagination) ? (openBlock(), createBlock(_component_el_pagination, {
+            key: 0,
             style: { "width": "100%" },
-            "page-sizes": paginationConfig.pageSizes,
+            "page-sizes": [15, 20, 50, 100, 200, 500],
+            "default-page-size": paginationConfig.pageSize,
             layout: getLayout(paginationConfig.layout),
             total: 100,
             background: paginationConfig.background,
@@ -189,13 +130,13 @@ const _sfc_main = {
               getLayout(paginationConfig.layout).includes("slot") ? (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(1) + "/" + toDisplayString(Math.ceil(100 / paginationConfig.pageSize)) + "页 ", 1)) : createCommentVNode("", true)
             ]),
             _: 1
-          }, 8, ["page-sizes", "layout", "background", "size", "disabled"])
+          }, 8, ["default-page-size", "layout", "background", "size", "disabled"])) : createCommentVNode("", true)
         ], 2)
       ]);
     };
   }
 };
-const TablePagination = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-802d10b6"]]);
+const TablePagination = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-12c51ab8"]]);
 export {
   TablePagination as default
 };