@cloudbase/weda-ui 3.6.7 → 3.6.8

package/dist/web/components/wd-table/utils/index.js

@@ -184,22 +184,23 @@ const getSearchValues = (searchValues) => {
         };
     });
 };
+const orderByFieldKey = (key, columns) => {
+    var _a;
+    return ((_a = columns === null || columns === void 0 ? void 0 : columns.find((i) => key === (i === null || i === void 0 ? void 0 : i.slotKey))) === null || _a === void 0 ? void 0 : _a.fieldKey) || key;
+};
 const getPageParam = ({ defaultSort, sort: _sort, params, _defaultPageSize, _defaultPageIndex, supportManyRelated, columns, isSupportMultipleSort, }) => {
     let sort = defaultSort || [];
     // 运行态有值，以运行态为准
     if ((_sort === null || _sort === void 0 ? void 0 : _sort.length) && _sort[0].order) {
-        params.orderBy = _sort[0].by;
+        params.orderBy = orderByFieldKey(_sort[0].by, columns);
         params.orderType = _sort[0].order;
         sort = _sort;
     }
     // 后端根据业务字段排序
-    sort = sort === null || sort === void 0 ? void 0 : sort.map((n) => {
-        var _a;
-        return ({
-            ...n,
-            by: ((_a = columns === null || columns === void 0 ? void 0 : columns.find((i) => n.by === i.slotKey)) === null || _a === void 0 ? void 0 : _a.fieldKey) || n.by,
-        });
-    });
+    sort = sort === null || sort === void 0 ? void 0 : sort.map((n) => ({
+        ...n,
+        by: orderByFieldKey(n.by, columns),
+    }));
     const _pageSize = parseInt(`${params.pageSize}`);
     params.pageSize = isNaN(_pageSize) ? _defaultPageSize : _pageSize;
     const _pageNo = parseInt(`${params.pageNo}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/weda-ui",
-  "version": "3.6.7",
+  "version": "3.6.8",
   "main": "./dist/index.js",
   "module": "./dist/index",
   "miniprogram": "mpdist",