@fecp/designer 5.4.82 → 5.4.83

package/lib/packages/vue/src/components/forms/h2/H2.vue.js

@@ -38,5 +38,5 @@ const _sfc_main = {
     };
   }
 };
-const _H2 = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-60bd3722"]]);
+const _H2 = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-6852826d"]]);
 exports.default = _H2;

package/lib/packages/vue/src/components/table/DynamicQuery.vue.js

@@ -312,8 +312,7 @@ const _sfc_main = {
               }, vue.createSlots({
                 suffix: vue.withCtx(() => [
                   vue.createVNode(_component_el_icon, {
-                    class: "el-input__icon",
-                    style: { "cursor": "pointer" },
+                    class: "el-input__icon search",
                     onClick: handleSearch
                   }, {
                     default: vue.withCtx(() => [
@@ -472,5 +471,5 @@ const _sfc_main = {
     };
   }
 };
-const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-349ed4c5"]]);
+const DynamicQuery = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-fe7f988e"]]);
 exports.default = DynamicQuery;

package/lib/packages/vue/src/components/table/Table.vue.js

@@ -9,6 +9,7 @@ require("../../../../../node_modules/element-plus/es/index.js");
 ;/* empty css                                                                */
 const vue = require("vue");
 require("../../../../../node_modules/vxe-table/es/components.js");
+const index = require("../../../../../_virtual/index2.js");
 ;/* empty css                                                   */
 const datasource = require("../../utils/datasource.js");
 const Pagination = require("./Pagination.vue.js");
@@ -44,9 +45,9 @@ const _pluginVue_exportHelper = require("../../../../../_virtual/_plugin-vue_exp
 ;/* empty css                                                                       */
 const getJsonAsyncUtil = require("../../utils/getJsonAsyncUtil.js");
 ;/* empty css            */
-const index = require("../../../../../node_modules/element-plus/es/components/container/index.js");
-const index$1 = require("../../../../../node_modules/vxe-table/es/table/index.js");
-const index$2 = require("../../../../../node_modules/element-plus/es/components/message/index.js");
+const index$1 = require("../../../../../node_modules/element-plus/es/components/container/index.js");
+const index$2 = require("../../../../../node_modules/vxe-table/es/table/index.js");
+const index$3 = require("../../../../../node_modules/element-plus/es/components/message/index.js");
 const _hoisted_1 = { class: "fec-vxe-table" };
 const _sfc_main = /* @__PURE__ */ Object.assign({
   inheritAttrs: false
@@ -146,13 +147,26 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     }));
     const dataSourceOptions = vue.ref({});
     const dictionaryOptions = vue.ref({});
+    const staticSortData = vue.ref({});
     const displayData = vue.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 index.default.orderBy(mockList, fields);
+    };
     const isPagination = vue.computed(() => {
       var _a;
       if (props.isSubTable || props.isDialog) {
@@ -444,9 +458,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 });
     };
@@ -582,6 +603,11 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       range: true,
       reserve: true
     });
+    const sortConfig = vue.reactive({
+      multiple: true,
+      chronological: true,
+      remote: true
+    });
     const handlePersonalize = () => {
       if (tableRef.value) {
         tableRef.value.openCustom();
@@ -665,7 +691,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
         emit("loaded", option);
       } catch (error) {
         console.error("加载配置失败:", error);
-        index$2.ElMessage.error("加载配置失败");
+        index$3.ElMessage.error("加载配置失败");
       } finally {
         configLoading.value = false;
       }
@@ -718,7 +744,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
       handleCustomBtnClick
     });
     return (_ctx, _cache) => {
-      const _component_el_container = index.ElContainer;
+      const _component_el_container = index$1.ElContainer;
       return vue.openBlock(), vue.createBlock(_component_el_container, {
         direction: "vertical",
         class: vue.normalizeClass(`fec-table ${__props.isSubTable ? "fec-table-sub" : ""}`),
@@ -766,7 +792,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                 hiddenFormData: hiddenFormData.value
               }, null, 8, ["readonly", "isSubTable", "localConfig", "fields-data", "hiddenFormData"])) : vue.createCommentVNode("", true),
               vue.createElementVNode("div", _hoisted_1, [
-                vue.createVNode(vue.unref(index$1.VxeTable), {
+                vue.createVNode(vue.unref(index$2.VxeTable), {
                   ref_key: "tableRef",
                   ref: tableRef,
                   data: displayData.value,
@@ -777,6 +803,7 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
                   "row-config": rowConfig.value,
                   "radio-config": vue.unref(radioConfig),
                   "checkbox-config": vue.unref(checkboxConfig),
+                  "sort-config": vue.unref(sortConfig),
                   "show-footer": summaryConfig.value.enabled,
                   "footer-data": footerData.value,
                   onSortChange: handleSortChange,
@@ -817,7 +844,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 ? (vue.openBlock(), vue.createBlock(Pagination.default, {
                 key: 2,
@@ -833,5 +860,5 @@ const _sfc_main = /* @__PURE__ */ Object.assign({
     };
   }
 });
-const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-d33cfe9f"]]);
+const _Table = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-578f27a6"]]);
 exports.default = _Table;

package/lib/packages/vue/src/components/table/TableColumn.vue.js

@@ -378,11 +378,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: vue.withCtx(({ row }) => [
               vue.renderSlot(_ctx.$slots, `cell-${field.fieldName}`, {
@@ -393,7 +394,7 @@ const _sfc_main = {
                 field.isLink ? (vue.openBlock(), vue.createBlock(_component_el_link, {
                   key: 1,
                   type: "primary",
-                  underline: false,
+                  underline: "never",
                   onClick: ($event) => handleButtonClick(row, field, field.linkConfig)
                 }, {
                   default: vue.withCtx(() => [
@@ -417,7 +418,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 ? (vue.openBlock(), vue.createBlock(vue.unref(index.VxeColumn), {
           key: 3,
@@ -448,5 +449,5 @@ const _sfc_main = {
     };
   }
 };
-const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-25279910"]]);
+const TableColumn = /* @__PURE__ */ _pluginVue_exportHelper.default(_sfc_main, [["__scopeId", "data-v-5138d230"]]);
 exports.default = TableColumn;

package/lib/packages/vue/src/components/table/TableFilter.vue.js

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

package/lib/packages/vue/src/utils/datasource.js

@@ -257,19 +257,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fecp/designer",
-  "version": "5.4.82",
+  "version": "5.4.83",
   "main": "lib/designer/index.js",
   "module": "es/designer/index.mjs",
   "files": [