@fecp/designer 5.5.1 → 5.5.3

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

@@ -1,9 +1,9 @@
 import { onUnmounted, onBeforeUnmount, onMounted } from "vue";
 /* empty css                                                          */
-/* empty css                                                                */
 /* empty css                                                              */
 /* empty css                                                                */
 /* empty css                                                                */
+/* empty css                                                                */
 /* empty css                                                               */
 /* empty css                                                               */
 import "../utils/formulajs/functionCore.mjs";

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

@@ -2,9 +2,9 @@ import { reactive } from "vue";
 import { parseRouteParams } from "./parseRouteParams.mjs";
 import "../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                          */
-/* empty css                                                                */
 /* empty css                                                              */
 /* empty css                                                                */
+/* empty css                                                                */
 import { ElLoading } from "../../../../node_modules/element-plus/es/components/loading/index.mjs";
 import { ElMessage } from "../../../../node_modules/element-plus/es/components/message/index.mjs";
 class DataSourceManager {

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

@@ -18,15 +18,15 @@ function checkGroupMatch(group, data, fields) {
       results.push(checkGroupMatch(g, data, fields));
     });
   }
-  if (operator === "and") {
-    return results.every((r) => r === true);
+  if (operator == "and") {
+    return results.every((r) => r == true);
   } else {
-    return results.some((r) => r === true);
+    return results.some((r) => r == true);
   }
 }
 function checkConditionMatch(condition, data, fields) {
   const { field, operator, value } = condition;
-  const fieldInfo = fields.find((f) => f.id === field);
+  const fieldInfo = fields.find((f) => f.id == field);
   const fieldName = (fieldInfo == null ? void 0 : fieldInfo.fieldName) || field;
   const dataValue = data[fieldName];
   const parsedValue = parseSingleParamValue(value, data, fields);
@@ -44,7 +44,7 @@ function checkConditionMatch(condition, data, fields) {
     case "lte":
       return Number(dataValue) <= Number(parsedValue);
     case "range":
-      if (!parsedValue || parsedValue.min === null || parsedValue.max === null) return false;
+      if (!parsedValue || parsedValue.min == null || parsedValue.max == null) return false;
       const numValue = Number(dataValue);
       return numValue >= Number(parsedValue.min) && numValue <= Number(parsedValue.max);
     case "contains":
@@ -64,7 +64,7 @@ function checkConditionMatch(condition, data, fields) {
       }
       return !parsedValue.some((v) => dataValue == v);
     case "is_null":
-      return dataValue === null || dataValue === void 0 || dataValue === "";
+      return dataValue == null || dataValue == void 0 || dataValue == "";
     case "is_not_null":
       return dataValue !== null && dataValue !== void 0 && dataValue !== "";
     default:
@@ -80,7 +80,7 @@ function checkFieldInFilterConfig(filterConfig, fieldId) {
 function checkFieldInGroup(group, targetFieldId) {
   const { conditions, groups } = group;
   if (conditions && conditions.length > 0) {
-    const foundInConditions = conditions.some((cond) => cond.field === targetFieldId);
+    const foundInConditions = conditions.some((cond) => cond.field == targetFieldId);
     if (foundInConditions) {
       return true;
     }

package/lib/designer/package.json.js

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

package/lib/designer/src/components/DocumentParam.vue.js

@@ -11,7 +11,7 @@ require("../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                            */
 const vue = require("vue");
 const index$2 = require("../../../node_modules/@element-plus/icons-vue/dist/index.js");
-const ValueSelector = require("./ValueSelector.vue2.js");
+const ValueSelector = require("./ValueSelector.vue.js");
 const index = require("../api/index.js");
 ;/* empty css                    */
 const _pluginVue_exportHelper = require("../../../_virtual/_plugin-vue_export-helper.js");

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

@@ -6,7 +6,7 @@ require("../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                            */
 const vue = require("vue");
 const index$1 = require("../../../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/element-plus/es/components/button/index.js");

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

@@ -0,0 +1,191 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const vue = require("vue");
+require("../../../node_modules/element-plus/es/index.js");
+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/element-plus/es/components/input-tag/index.js");
+const index$1 = require("../../../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/designer/src/layout/aside/HiddenFieldDialog.vue.js

@@ -18,7 +18,7 @@ const index$2 = require("../../../../node_modules/@element-plus/icons-vue/dist/i
 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.vue2.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/element-plus/es/components/dialog/index.js");

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

@@ -16,7 +16,7 @@ require("../../../../node_modules/element-plus/theme-chalk/el-tooltip.css.js");
 require("../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.js");
 const vue = require("vue");
 const index = require("../../../../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/designer/src/packages/dataLinkage/index.vue.js

@@ -32,7 +32,7 @@ require("../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.js
 ;/* 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");