@fecp/designer 5.3.22 → 5.4.2

package/es/designer/package.json.mjs

@@ -1,4 +1,4 @@
-const version = "5.3.21";
+const version = "5.4.2";
 const packageJson = {
   version
 };

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

@@ -79,7 +79,7 @@ import "../../../../node_modules/element-plus/theme-chalk/el-date-picker.css.mjs
 import "../../../../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/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/subForm.vue.mjs

@@ -13,7 +13,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/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/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/aside/index.mjs

@@ -10,7 +10,8 @@ const defaultProperty = {
   headerAlign: "center",
   align: "center",
   isOverflowWrap: true,
-  isShow: true
+  isShow: true,
+  canSort: true
 };
 const components = [
   {

package/es/designer/src/packages/table/default.mjs

@@ -1,26 +1,26 @@
 const defaultTableConfig = {
-  "fieldsData": [
+  fieldsData: [
     {
-      "fieldType": "text",
-      "label": "文本",
-      "fieldName": "fieldName",
-      "format": "number",
-      "hasDecimalPlaces": true,
-      "decimalPlaces": 2,
-      "optionStyle": "default",
-      "dateType": "date",
-      "widthMode": "auto",
-      "minWidth": 80,
-      "headerAlign": "center",
-      "align": "center",
-      "isShow": true,
-      "id": 1770347203793,
-      "type": "widgets"
+      fieldType: "text",
+      label: "文本",
+      fieldName: "fieldName",
+      format: "number",
+      hasDecimalPlaces: true,
+      decimalPlaces: 2,
+      optionStyle: "default",
+      dateType: "date",
+      widthMode: "auto",
+      minWidth: 80,
+      headerAlign: "center",
+      align: "center",
+      isShow: true,
+      id: 1770347203793,
+      type: "widgets"
     }
   ],
-  "showTitle": true,
-  "isOptBtns": true,
-  "optBtns": [
+  showTitle: true,
+  isOptBtns: true,
+  optBtns: [
     // {
     //     "id": 1770347228880,
     //     "label": "修改",
@@ -34,8 +34,8 @@ const defaultTableConfig = {
     //     "btnStyle": "default"
     // }
   ],
-  "customBtns": {
-    "left": [
+  customBtns: {
+    left: [
       // {
       //     "id": 1770347217788,
       //     "label": "新增",
@@ -44,40 +44,38 @@ const defaultTableConfig = {
       //     "btnStyle": "default"
       // }
     ],
-    "right": []
+    right: []
   },
-  "selectMode": "none",
-  "showIndex": false,
-  "heightMode": "auto",
-  "height": 500,
-  "editable": false,
-  "events": {},
-  "dataSourceId": "",
-  "sortRules": [],
-  "paginationConfig": {
-    "enabled": true,
-    "pageSize": 10,
-    "pageSizes": [
-      10,
-      20,
-      50,
-      100,
-      200,
-      500
-    ],
-    "layout": "full",
-    "background": true,
-    "size": "small"
+  selectMode: "none",
+  showIndex: false,
+  heightMode: "auto",
+  height: 500,
+  editable: false,
+  events: {},
+  dataSourceId: "",
+  sortRules: [],
+  paginationConfig: {
+    enabled: true,
+    pageSize: 10,
+    pageSizes: [10, 20, 50, 100, 200, 500],
+    layout: "full",
+    background: true,
+    size: "small"
+  },
+  mode: [],
+  dataSources: [],
+  dialogs: [],
+  queryConfig: {
+    enabled: true,
+    mode: "fixed",
+    columnCount: 4,
+    collapseRows: 2,
+    filterFields: []
   },
-  "mode": [],
-  "dataSources": [],
-  "dialogs": [],
-  "queryConfig": {
-    "enabled": true,
-    "mode": "fixed",
-    "columnCount": 4,
-    "collapseRows": 2,
-    "filterFields": []
+  summaryConfig: {
+    enabled: false,
+    mode: "current",
+    summaryFields: []
   }
 };
 const defaultCustomBtn = {

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/index.vue.mjs

@@ -22,6 +22,7 @@ import { Setting as setting_default, Hide as hide_default, Delete as delete_defa
 import TableSetting from "./TableSetting.vue.mjs";
 import QueryModule from "./queryModule/index.vue.mjs";
 import TablePagination from "./tablePagination.vue.mjs";
+import TableSummary from "./tableSummary.vue.mjs";
 import { getEditConfigData, setSelectedItem, setHoverItem, getCurrentClass } from "../utils/common.mjs";
 /* empty css                                                              */
 /* empty css                                                                */
@@ -465,12 +466,13 @@ const _sfc_main = {
             }, 8, ["modelValue"])
           ], 2)
         ]),
+        createVNode(TableSummary),
         createVNode(TablePagination)
       ], 64);
     };
   }
 };
-const tableWorkArea = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f581ce52"]]);
+const tableWorkArea = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-271403ad"]]);
 export {
   tableWorkArea as default
 };

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

@@ -0,0 +1,112 @@
+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                                                                     */
+/* empty css                                                               */
+/* empty css                                                                */
+/* empty css                                                               */
+import { computed, reactive, watch, createElementBlock, openBlock, createElementVNode, createVNode, withCtx, Fragment, renderList, createBlock } 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 { 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";
+const _hoisted_1 = { class: "table-summary-config" };
+const _hoisted_2 = { class: "config-row" };
+const _sfc_main = {
+  __name: "tableSummary",
+  setup(__props) {
+    var _a;
+    const editConfigData = computed(() => getEditConfigData());
+    const availableFields = computed(() => {
+      var _a2;
+      const fields = ((_a2 = editConfigData.value) == null ? void 0 : _a2.fieldsData) || [];
+      return fields.filter((field) => field.isShow && field.fieldType === "number");
+    });
+    const summaryConfig = reactive({
+      enabled: false,
+      mode: "current",
+      summaryFields: [],
+      ...((_a = editConfigData.value) == null ? void 0 : _a.summaryConfig) || {}
+    });
+    watch(
+      summaryConfig,
+      (val) => {
+        editConfigData.value.summaryConfig = val;
+      },
+      { deep: true }
+    );
+    return (_ctx, _cache) => {
+      const _component_el_switch = ElSwitch;
+      const _component_el_divider = ElDivider;
+      const _component_el_option = ElOption;
+      const _component_el_select = ElSelect;
+      const _component_el_radio_button = ElRadioButton;
+      const _component_el_radio_group = ElRadioGroup;
+      return openBlock(), createElementBlock("div", _hoisted_1, [
+        createElementVNode("div", _hoisted_2, [
+          _cache[3] || (_cache[3] = createElementVNode("span", { class: "config-label" }, "开启合计:", -1)),
+          createVNode(_component_el_switch, {
+            modelValue: summaryConfig.enabled,
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => summaryConfig.enabled = $event),
+            size: "small"
+          }, null, 8, ["modelValue"]),
+          createVNode(_component_el_divider, { direction: "vertical" }),
+          _cache[4] || (_cache[4] = createElementVNode("span", { class: "config-label" }, "合计列:", -1)),
+          createVNode(_component_el_select, {
+            modelValue: summaryConfig.summaryFields,
+            "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => summaryConfig.summaryFields = $event),
+            multiple: "",
+            size: "small",
+            style: { "width": "200px" },
+            "collapse-tags": "",
+            "collapse-tags-tooltip": "",
+            placeholder: "请选择要合计的列"
+          }, {
+            default: withCtx(() => [
+              (openBlock(true), createElementBlock(Fragment, null, renderList(availableFields.value, (field) => {
+                return openBlock(), createBlock(_component_el_option, {
+                  key: field.fieldName,
+                  label: field.label || field.fieldName,
+                  value: field.fieldName
+                }, null, 8, ["label", "value"]);
+              }), 128))
+            ]),
+            _: 1
+          }, 8, ["modelValue"]),
+          createVNode(_component_el_divider, { direction: "vertical" }),
+          _cache[5] || (_cache[5] = createElementVNode("span", { class: "config-label" }, "合计模式:", -1)),
+          createVNode(_component_el_radio_group, {
+            modelValue: summaryConfig.mode,
+            "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => summaryConfig.mode = $event),
+            size: "small"
+          }, {
+            default: withCtx(() => [
+              createVNode(_component_el_radio_button, {
+                label: "当前页数据",
+                value: "current"
+              }),
+              createVNode(_component_el_radio_button, {
+                label: "全部数据",
+                value: "all"
+              })
+            ]),
+            _: 1
+          }, 8, ["modelValue"])
+        ])
+      ]);
+    };
+  }
+};
+const TableSummary = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-95806c79"]]);
+export {
+  TableSummary as default
+};