zzz-pc-view 0.0.164 → 0.0.166

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zzz-pc-view",
-  "version": "0.0.164",
+  "version": "0.0.166",
   "main": "src/index.umd.js",
   "module": "src/index.es.js",
   "types": "src/index.d.ts",

package/src/decorators/CurdKey/index.d.ts

@@ -450,6 +450,14 @@ export declare abstract class CurdHandler<T extends object = object, P extends P
      * 最后，它会将解析后的对象绑定到 FilterTarget 上，并将结果赋值给 searchQueryRef。
      */
     protected setSearchQuery(): void;
+    protected readonly sortInfoRef: import('vue').ShallowRef<{
+        prop: keyof T;
+        order: 1 | -1;
+    } | undefined, {
+        prop: keyof T;
+        order: 1 | -1;
+    } | undefined>;
+    setSortInfo(prop: keyof T, order: 1 | -1): void;
     /**
      * 创建一个浅引用，用于存储列表数据。
      * 这个引用将用于在组件中存储和更新列表数据。

package/src/index.es.js

@@ -1544,6 +1544,26 @@ const sort = (list2, sortKey) => {
     return 0;
   });
 };
+const sortByField = (arr, field, order = 1, nullLast = true) => {
+  const list2 = [...arr];
+  list2.sort((a, b) => {
+    const valA = a[field];
+    const valB = b[field];
+    const isANull = valA === null || valA === void 0;
+    const isBNull = valB === null || valB === void 0;
+    if (isANull && isBNull) return 0;
+    if (isANull) return nullLast ? 1 : -1;
+    if (isBNull) return nullLast ? -1 : 1;
+    if (typeof valA === "number" && typeof valB === "number") {
+      return order * (valA - valB);
+    }
+    const strA = String(valA).trim();
+    const strB = String(valB).trim();
+    const compareRes = strA.localeCompare(strB, void 0, { numeric: true });
+    return order * compareRes;
+  });
+  return list2;
+};
 const create$1 = (option) => {
   const rootNodes = [];
   const buildMap = {};
@@ -1720,6 +1740,7 @@ const index$g = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   ratioByHorizontal,
   ratioByVertical,
   sort,
+  sortByField,
   sumGroupByHorizontal,
   sumGroupByVertical,
   toKeyValue,
@@ -5639,6 +5660,7 @@ class CurdHandler extends FilterHandler {
      * @description 这对于性能优化很重要，因为它避免了不必要的更新。
      */
     __publicField(this, "searchQueryRef", shallowRef());
+    __publicField(this, "sortInfoRef", shallowRef());
     /**
      * 创建一个浅引用，用于存储列表数据。
      * 这个引用将用于在组件中存储和更新列表数据。
@@ -5657,6 +5679,10 @@ class CurdHandler extends FilterHandler {
      */
     __publicField(this, "displayListComputed", computed(() => {
       let displayList = this.listRef.value;
+      const sortInfo = this.sortInfoRef.value;
+      if (sortInfo) {
+        displayList = sortByField([...displayList], sortInfo.prop, sortInfo.order);
+      }
       const { pagination } = this;
       if (!this.api.hasServerPagination && pagination) {
         const { currentPage, pageSize } = pagination;
@@ -5964,6 +5990,9 @@ class CurdHandler extends FilterHandler {
     }
     this.searchQueryRef.value = searchQuery;
   }
+  setSortInfo(prop, order) {
+    this.sortInfoRef.value = { prop, order };
+  }
   /**
    * 获取当前显示的列表数据。
    * 这个方法返回 displayListComputed 计算属性的值，它表示当前显示的列表数据。
@@ -12335,8 +12364,9 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
   }
 });
 const _hoisted_1$a = { class: "flex column wrapper data-wrapper" };
-const _hoisted_2$7 = { class: "flex flex-wrap gap-10 data-wrapper-header" };
-const _hoisted_3$5 = { class: "flex gap-10 data-wrapper-footer" };
+const _hoisted_2$7 = { class: "data-wrapper-header" };
+const _hoisted_3$5 = { class: "flex flex-wrap gap-10 data-wrapper-header-inner" };
+const _hoisted_4$5 = { class: "flex gap-10 data-wrapper-footer" };
 const _sfc_main$l = /* @__PURE__ */ defineComponent({
   __name: "DataWrapperView",
   props: {
@@ -12347,7 +12377,9 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
       const _component_el_scrollbar = resolveComponent("el-scrollbar");
       return openBlock(), createElementBlock("div", _hoisted_1$a, [
         createElementVNode("div", _hoisted_2$7, [
-          renderSlot(_ctx.$slots, "header")
+          createElementVNode("div", _hoisted_3$5, [
+            renderSlot(_ctx.$slots, "header")
+          ])
         ]),
         createVNode(_component_el_scrollbar, {
           "view-class": _ctx.bodyViewClass || "wrapper data-wrapper-body",
@@ -12358,7 +12390,7 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
           ]),
           _: 3
         }, 8, ["view-class"]),
-        createElementVNode("div", _hoisted_3$5, [
+        createElementVNode("div", _hoisted_4$5, [
           renderSlot(_ctx.$slots, "footer")
         ]),
         renderSlot(_ctx.$slots, "extra")
@@ -12554,8 +12586,13 @@ const _hoisted_2$6 = {
   key: 0,
   class: "curd-list-aside"
 };
-const _hoisted_3$4 = { class: "flex-1 fit-size curd-list-content" };
-const _hoisted_4$4 = {
+const _hoisted_3$4 = { class: "flex column flex-1 fit-size" };
+const _hoisted_4$4 = { class: "flex-1 fit-size curd-list-content" };
+const _hoisted_5$3 = {
+  key: 0,
+  class: "curd-list-pagination"
+};
+const _hoisted_6$2 = {
   key: 1,
   class: "curd-list-aside"
 };
@@ -12568,8 +12605,8 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
     const props = __props;
     const { pagination } = props.viewHandler;
     return (_ctx, _cache) => {
-      const _component_el_card = resolveComponent("el-card");
       const _component_el_pagination = resolveComponent("el-pagination");
+      const _component_el_card = resolveComponent("el-card");
       const _directive_loading = resolveDirective("loading");
       return openBlock(), createBlock(_sfc_main$l, null, {
         header: withCtx(() => [
@@ -12600,7 +12637,24 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
               }, {
                 default: withCtx(() => [
                   createElementVNode("div", _hoisted_3$4, [
-                    createVNode(_sfc_main$i, { "view-handler": _ctx.viewHandler }, null, 8, ["view-handler"])
+                    createElementVNode("div", _hoisted_4$4, [
+                      createVNode(_sfc_main$i, { "view-handler": _ctx.viewHandler }, null, 8, ["view-handler"])
+                    ]),
+                    unref(pagination) ? (openBlock(), createElementBlock("div", _hoisted_5$3, [
+                      createVNode(_component_el_pagination, {
+                        "current-page": unref(pagination).currentPage,
+                        "onUpdate:currentPage": _cache[0] || (_cache[0] = ($event) => unref(pagination).currentPage = $event),
+                        "page-size": unref(pagination).pageSize,
+                        "onUpdate:pageSize": _cache[1] || (_cache[1] = ($event) => unref(pagination).pageSize = $event),
+                        "page-sizes": [10, 20, 30, 40, 50, 100],
+                        total: _ctx.viewHandler.total,
+                        disabled: _ctx.viewHandler.listLoadStatus,
+                        layout: "total, sizes, prev, pager, next",
+                        background: "",
+                        onCurrentChange: _ctx.viewHandler.onCurrentPageChange,
+                        onSizeChange: _ctx.viewHandler.onPageSizeChange
+                      }, null, 8, ["current-page", "page-size", "total", "disabled", "onCurrentChange", "onSizeChange"])
+                    ])) : createCommentVNode("", true)
                   ])
                 ]),
                 _: 1
@@ -12608,7 +12662,7 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
                 [_directive_loading, _ctx.viewHandler.listLoadStatus]
               ])
             ]),
-            _ctx.viewHandler.displayFilterConfigMap[unref(ZDecorators).FilterKey.PositionEnum.RIGHT] ? (openBlock(), createElementBlock("div", _hoisted_4$4, [
+            _ctx.viewHandler.displayFilterConfigMap[unref(ZDecorators).FilterKey.PositionEnum.RIGHT] ? (openBlock(), createElementBlock("div", _hoisted_6$2, [
               createVNode(_sfc_main$m, {
                 "view-handler": _ctx.viewHandler,
                 position: unref(ZDecorators).FilterKey.PositionEnum.RIGHT,
@@ -12617,22 +12671,6 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
             ])) : createCommentVNode("", true)
           ])
         ]),
-        footer: withCtx(() => [
-          unref(pagination) ? (openBlock(), createBlock(_component_el_pagination, {
-            key: 0,
-            "current-page": unref(pagination).currentPage,
-            "onUpdate:currentPage": _cache[0] || (_cache[0] = ($event) => unref(pagination).currentPage = $event),
-            "page-size": unref(pagination).pageSize,
-            "onUpdate:pageSize": _cache[1] || (_cache[1] = ($event) => unref(pagination).pageSize = $event),
-            "page-sizes": [10, 20, 30, 40, 50, 100],
-            total: _ctx.viewHandler.total,
-            disabled: _ctx.viewHandler.listLoadStatus,
-            layout: "total, sizes, prev, pager, next",
-            background: "",
-            onCurrentChange: _ctx.viewHandler.onCurrentPageChange,
-            onSizeChange: _ctx.viewHandler.onPageSizeChange
-          }, null, 8, ["current-page", "page-size", "total", "disabled", "onCurrentChange", "onSizeChange"])) : createCommentVNode("", true)
-        ]),
         extra: withCtx(() => [
           renderSlot(_ctx.$slots, "editor"),
           renderSlot(_ctx.$slots, "extra")