@fecp/designer 5.4.82 → 5.4.84

package/es/packages/vue/src/components/forms/h2/H2.vue.mjs

@@ -36,7 +36,7 @@ const _sfc_main = {
     };
   }
 };
-const _H2 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-60bd3722"]]);
+const _H2 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6852826d"]]);
 export {
   _H2 as default
 };

package/es/packages/vue/src/components/table/DynamicQuery.vue.mjs

@@ -310,8 +310,7 @@ const _sfc_main = {
               }, createSlots({
                 suffix: withCtx(() => [
                   createVNode(_component_el_icon, {
-                    class: "el-input__icon",
-                    style: { "cursor": "pointer" },
+                    class: "el-input__icon search",
                     onClick: handleSearch
                   }, {
                     default: withCtx(() => [
@@ -470,7 +469,7 @@ const _sfc_main = {
     };
   }
 };
-const DynamicQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-349ed4c5"]]);
+const DynamicQuery = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fe7f988e"]]);
 export {
   DynamicQuery as default
 };

package/es/packages/vue/src/components/table/Table.vue.mjs

@@ -7,6 +7,7 @@ import "../../../../../node_modules/element-plus/es/index.mjs";
 /* empty css                                                                */
 import { ref, getCurrentInstance, computed, reactive, watch, onMounted, onUnmounted, createBlock, openBlock, normalizeClass, withCtx, createElementBlock, createCommentVNode, normalizeStyle, createElementVNode, Fragment, createVNode, unref, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps } from "vue";
 import "../../../../../node_modules/vxe-table/es/components.mjs";
+import XEUtils from "../../../../../_virtual/index2.mjs";
 /* empty css                                                   */
 import { createDataSource } from "../../utils/datasource.mjs";
 import Pagination from "./Pagination.vue.mjs";
@@ -144,13 +145,26 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     }));
     const dataSourceOptions = ref({});
     const dictionaryOptions = ref({});
+    const staticSortData = ref({});
     const displayData = computed(() => {
       var _a;
       if (props.tableData && props.tableData.length > 0) {
-        return props.tableData;
+        return sortDataWithStaticRules(props.tableData);
       }
-      return ((_a = dataSourceManager.value) == null ? void 0 : _a.getData().list) || [];
+      const data = ((_a = dataSourceManager.value) == null ? void 0 : _a.getData().list) || [];
+      return sortDataWithStaticRules(data);
     });
+    const sortDataWithStaticRules = (data) => {
+      if (!data || data.length === 0) return data;
+      const sortFields = Object.keys(staticSortData.value);
+      if (sortFields.length === 0) return data;
+      const mockList = data.map((item) => ({ ...item }));
+      const fields = sortFields.map((field) => ({
+        field,
+        order: staticSortData.value[field]
+      }));
+      return XEUtils.orderBy(mockList, fields);
+    };
     const isPagination = computed(() => {
       var _a;
       if (props.isSubTable || props.isDialog) {
@@ -442,9 +456,16 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
     const handleSortChange = ({ property, order }) => {
       const orderValue = order ? order.replace("ending", "") : "";
-      if (dataSourceManager.value) {
+      const field = fieldsData.value.find((item) => item.fieldName == property);
+      if ((field == null ? void 0 : field.sortRule) == "server") {
         dataSourceManager.value.updateSort(property, orderValue);
         tableDataFetch();
+      } else if ((field == null ? void 0 : field.sortRule) == "static") {
+        if (orderValue) {
+          staticSortData.value[property] = orderValue;
+        } else {
+          delete staticSortData.value[property];
+        }
       }
       emit("sort-change", { field: property, order: orderValue });
     };
@@ -580,6 +601,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       range: true,
       reserve: true
     });
+    const sortConfig = reactive({
+      multiple: true,
+      chronological: true,
+      remote: true
+    });
     const handlePersonalize = () => {
       if (tableRef.value) {
         tableRef.value.openCustom();
@@ -775,6 +801,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                   "row-config": rowConfig.value,
                   "radio-config": unref(radioConfig),
                   "checkbox-config": unref(checkboxConfig),
+                  "sort-config": unref(sortConfig),
                   "show-footer": summaryConfig.value.enabled,
                   "footer-data": footerData.value,
                   onSortChange: handleSortChange,
@@ -815,7 +842,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                     ];
                   }),
                   _: 3
-                }, 8, ["data", "auto-resize", "height", "export-config", "row-config", "radio-config", "checkbox-config", "show-footer", "footer-data"])
+                }, 8, ["data", "auto-resize", "height", "export-config", "row-config", "radio-config", "checkbox-config", "sort-config", "show-footer", "footer-data"])
               ]),
               isPagination.value ? (openBlock(), createBlock(Pagination, {
                 key: 2,
@@ -831,7 +858,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d33cfe9f"]]);
+const _Table = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-578f27a6"]]);
 export {
   _Table as default
 };

package/es/packages/vue/src/components/table/TableColumn.vue.mjs

@@ -376,11 +376,12 @@ const _sfc_main = {
             fixed: field.isFixed ? "left" : void 0,
             align: field.align,
             "header-align": field.headerAlign,
-            sortable: field.canSort,
+            sortable: field.sortRule && field.sortRule != "none",
             resizable: false,
             "show-header-overflow": "",
             "show-footer-overflow": "",
-            "show-overflow": field.isOverflowWrap ? false : "title"
+            "show-overflow": field.isOverflowWrap ? false : "title",
+            "header-class-name": field.sortRule == "server" ? "serverSort" : ""
           }, {
             default: withCtx(({ row }) => [
               renderSlot(_ctx.$slots, `cell-${field.fieldName}`, {
@@ -391,7 +392,7 @@ const _sfc_main = {
                 field.isLink ? (openBlock(), createBlock(_component_el_link, {
                   key: 1,
                   type: "primary",
-                  underline: false,
+                  underline: "never",
                   onClick: ($event) => handleButtonClick(row, field, field.linkConfig)
                 }, {
                   default: withCtx(() => [
@@ -415,7 +416,7 @@ const _sfc_main = {
               ], true)
             ]),
             _: 2
-          }, 1032, ["field", "title", "width", "min-width", "fixed", "align", "header-align", "sortable", "show-overflow"]);
+          }, 1032, ["field", "title", "width", "min-width", "fixed", "align", "header-align", "sortable", "show-overflow", "header-class-name"]);
         }), 128)),
         !__props.readonly && shouldShowOptColumn.value ? (openBlock(), createBlock(unref(VxeColumn), {
           key: 3,
@@ -446,7 +447,7 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-25279910"]]);
+const TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5138d230"]]);
 export {
   TableColumn as default
 };

package/es/packages/vue/src/components/table/TableFilter.vue.mjs

@@ -46,7 +46,7 @@ const _sfc_main = {
   emits: ["search", "reset"],
   setup(__props, { expose: __expose, emit: __emit }) {
     useCssVars((_ctx) => ({
-      "77d1952d": `${config.value.collapseRows * 90}px`
+      "0b02222c": `${config.value.collapseRows * 90}px`
     }));
     const props = __props;
     const emit = __emit;
@@ -240,7 +240,7 @@ const _sfc_main = {
                 onClick: handleSearch
               }, {
                 default: withCtx(() => _cache[1] || (_cache[1] = [
-                  createTextVNode("搜索")
+                  createTextVNode("查询")
                 ])),
                 _: 1
               }),
@@ -282,7 +282,7 @@ const _sfc_main = {
     };
   }
 };
-const TableFilter = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7a5f97c4"]]);
+const TableFilter = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b60de83e"]]);
 export {
   TableFilter as default
 };

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

@@ -255,19 +255,17 @@ class DataSourceManager {
    * 更新排序
    */
   updateSort(field, order) {
-    const existingIndex = this.sortRules.findIndex(
-      (rule) => rule.field === field
-    );
+    const existingIndex = this.sortRules.findIndex((rule) => rule.field === field);
+    debugger;
     if (!order) {
       if (existingIndex > -1) {
         this.sortRules.splice(existingIndex, 1);
       }
     } else {
       if (existingIndex > -1) {
-        this.sortRules[existingIndex].order = order;
-      } else {
-        this.sortRules.push({ field, order });
+        this.sortRules.splice(existingIndex, 1);
       }
+      this.sortRules.unshift({ field, order });
     }
   }
   /**

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

@@ -650,23 +650,8 @@ async function handleRiskSchDialog(node, data, fields, context) {
   if (basic == null ? void 0 : basic.formValidate) {
     const formComponent = (_a = context.components) == null ? void 0 : _a.form;
     const validateMethod = (_c = (_b = formComponent == null ? void 0 : formComponent.$) == null ? void 0 : _b.exposed) == null ? void 0 : _c.validate;
-    try {
-      if (typeof validateMethod === "function") {
-        await validateMethod();
-      } else {
-        console.error("未找到表单组件的 validate 方法");
-        return {
-          success: false,
-          message: "表单组件未正确配置或 validate 方法未暴露",
-          shouldShowError: true
-        };
-      }
-    } catch (error) {
-      return {
-        success: false,
-        message: "表单验证失败！",
-        shouldShowError: false
-      };
+    if (typeof validateMethod === "function") {
+      await validateMethod();
     }
   }
   const schNo = basic.schNo;

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.4.82";
+const version = "5.4.84";
 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/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");

package/lib/designer/src/packages/dialog/useDialogDialog.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index.vue.js");
+const index = require("./index.vue2.js");
 const vue = require("vue");
 function useDialogDialog() {
   const dialogDialogVisible = vue.ref(false);

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

@@ -86,7 +86,7 @@ const widgets = require("../table/property/widgets.vue.js");
 require("../../../../node_modules/element-plus/theme-chalk/el-tab-pane.css.js");
 ;/* empty css                                                              */
 ;/* empty css                                         */
-;/* empty css                                  */
+;/* empty css                                   */
 ;/* empty css                                                            */
 ;/* empty css                                                            */
 ;/* empty css                             */

package/lib/designer/src/packages/dialogGlobal/useDialogGlobalDialog.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index.vue.js");
+const index = require("./index.vue2.js");
 const vue = require("vue");
 function useDialogGlobalDialog() {
   const dialogGlobalDialogVisible = vue.ref(false);

package/lib/designer/src/packages/eventFlow/dialog/action/RiskSch.vue.js

@@ -6,7 +6,7 @@ require("../../../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                                     */
 const vue = require("vue");
 const RiskSchemeSelector = require("../../../../components/RiskSchemeSelector.vue2.js");
-const ValueSelector = require("../../../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../../../components/ValueSelector.vue.js");
 const ParamsConfig = require("../../../../components/ParamsConfig.vue2.js");
 const index = require("../../../../../../node_modules/element-plus/es/components/form/index.js");
 const index$1 = require("../../../../../../node_modules/element-plus/es/components/switch/index.js");

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

@@ -13,7 +13,7 @@ require("../../../../../node_modules/element-plus/es/index.js");
 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/element-plus/es/components/collapse/index.js");
 const index$1 = require("../../../../../node_modules/element-plus/es/components/form/index.js");
 const index$2 = require("../../../../../node_modules/element-plus/es/components/input/index.js");

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

@@ -19,7 +19,7 @@ require("../../../../../node_modules/element-plus/es/index.js");
 const vue = require("vue");
 const common = require("../../utils/common.js");
 require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.js");
 const index = require("../../../api/index.js");
 const ParamsConfig = require("../../../components/ParamsConfig.vue2.js");
 ;/* empty css               */

package/lib/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.vue2.js");
 const eventBus = require("../../utils/eventBus.js");
-const ValueSelector = require("../../../components/ValueSelector.vue2.js");
+const ValueSelector = require("../../../components/ValueSelector.vue.js");
 const ParamsConfig = require("../../../components/ParamsConfig.vue2.js");
 const index = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");
 const index$1 = require("../../../../../node_modules/element-plus/es/components/form/index.js");

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

@@ -54,8 +54,8 @@ const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_exp
 require("../../../components/TemplateSelector.vue.js");
 require("../../table/default.js");
 ;/* empty css                                 */
-;/* empty css                       */
-;/* empty css                             */
+;/* empty css                      */
+;/* empty css                            */
 require("../../../store/index.js");
 ;/* empty css              */
 const index$2 = require("../../../../../node_modules/element-plus/es/components/collapse/index.js");

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

@@ -16,7 +16,7 @@ require("../../../../node_modules/element-plus/es/index.js");
 const vue = require("vue");
 const index$6 = require("../../../../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/designer/src/packages/table/aside/index.js

@@ -13,7 +13,7 @@ const defaultProperty = {
   align: "center",
   isOverflowWrap: true,
   isShow: true,
-  canSort: true
+  sortRule: "none"
 };
 const components = [
   {

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

@@ -47,7 +47,7 @@ const index$1 = require("../../../../node_modules/@element-plus/icons-vue/dist/i
 ;/* empty css                                                              */
 require("../../store/index.js");
 ;/* empty css                                         */
-;/* empty css                                  */
+;/* empty css                                   */
 ;/* empty css                                 */
 ;/* empty css                                                            */
 ;/* empty css                                                               */