@cloudbase/weda-ui 3.20.0 → 3.20.2

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

@@ -5,10 +5,11 @@ import { Icon, Table, StatusTip, ConfigProvider } from 'tea-component';
 import { useResizeObserver } from '@react-hookz/web';
 import { useConfig } from '../../../../utils/config-context';
 import { isInIde } from '../../../../utils/platform';
-const { sortable, radioable, selectable, injectable, pageable, autotip, scrollable, columnsResizable, } = Table.addons;
+const { sortable, radioable, selectable, injectable, pageable, autotip, scrollable, columnsResizable } = Table.addons;
 import StatusContent from '../../../statusContent';
 import classNames from '../../../../utils/classnames';
 import { setTableHeaderStyle } from './util';
+import { orderByFieldKey } from '../../utils/index';
 const { LoadingTip } = StatusTip;
 const defaultTotal = 0;
 const pageIndexSpan = 1;
@@ -16,7 +17,7 @@ const miniPageSize = 10;
 // h5 端表格高度
 const tableHeight = { sm: 500, md: 580, lg: 880 };
 const tableHeaderHeight = 51;
-const renderStatus = ({ isH5, status, isNoDataSourceBind, _emptyText, errorObj, __innerSlot, }) => {
+const renderStatus = ({ isH5, status, isNoDataSourceBind, _emptyText, errorObj, __innerSlot }) => {
     var _a, _b;
     const text = {
         loading: '数据加载中,请稍候...',
@@ -39,9 +40,7 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
     const tableRef = useRef(null);
     const { classPrefix } = useConfig();
     // 是否展示全局loading
-    const isShowLoading = isH5
-        ? (queryParams === null || queryParams === void 0 ? void 0 : queryParams.pageIndex) === pageIndexSpan && isLoading
-        : isLoading;
+    const isShowLoading = isH5 ? (queryParams === null || queryParams === void 0 ? void 0 : queryParams.pageIndex) === pageIndexSpan && isLoading : isLoading;
     // table状态样式
     const showStatus = isShowLoading || isError || !(records === null || records === void 0 ? void 0 : records.length);
     const classes = {
@@ -64,7 +63,7 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
                     onQueryChange({ sort });
                 }
                 events === null || events === void 0 ? void 0 : events.sort({
-                    sort: sort.map((i) => ({ orderType: i.order, orderBy: i.by })),
+                    sort: sort.map((i) => ({ orderType: i.order, orderBy: orderByFieldKey(i.by, columns) })),
                 });
             },
         }),
@@ -148,20 +147,16 @@ onQueryChange, enablePagination, columnSelectType, defaultPageSize, defaultPageI
         tableAddons.push(selectable({
             value: selectedKeys,
             onChange: onSelectChange,
-            render: (element, { disabled }) => disabled ? _jsx(Icon, { type: "loading" }) : element,
-            targetColumnKey: (columns === null || columns === void 0 ? void 0 : columns.length) && columnSelectType === 'select'
-                ? 'weda_select'
-                : undefined,
+            render: (element, { disabled }) => (disabled ? _jsx(Icon, { type: "loading" }) : element),
+            targetColumnKey: (columns === null || columns === void 0 ? void 0 : columns.length) && columnSelectType === 'select' ? 'weda_select' : undefined,
         }));
     }
     else if (columnSelectType === 'radio') {
         tableAddons.push(radioable({
             value: selectedKeys === null || selectedKeys === void 0 ? void 0 : selectedKeys[0],
             onChange: onSelectChange,
-            render: (element, { disabled }) => disabled ? _jsx(Icon, { type: "loading" }) : element,
-            targetColumnKey: (columns === null || columns === void 0 ? void 0 : columns.length) && columnSelectType === 'radio'
-                ? 'weda_radio'
-                : undefined,
+            render: (element, { disabled }) => (disabled ? _jsx(Icon, { type: "loading" }) : element),
+            targetColumnKey: (columns === null || columns === void 0 ? void 0 : columns.length) && columnSelectType === 'radio' ? 'weda_radio' : undefined,
         }));
     }
     const showLoadingBottomTip = isLoading && (queryParams === null || queryParams === void 0 ? void 0 : queryParams.pageIndex) !== pageIndexSpan;

package/dist/web/components/wd-table/hooks/useTableData.js

@@ -19,12 +19,15 @@ export const useTableData = ({ dataSourceAPI, connectorMethod, query, events, is
         const fetchVersion = (fetchRef.current.version = getUuid());
         let data = { records: [], total: 0 };
         setTableLoading(true);
+        let canCallQuerySuccess = true;
         try {
             if (isModel) {
                 if (supportManyRelated) {
                     // select为空对象时报错，避免传空对象给数组
                     const select = (query === null || query === void 0 ? void 0 : query.select) || {};
+                    canCallQuerySuccess = false;
                     if (Object.keys(select).length !== 0) {
+                        canCallQuerySuccess = true;
                         data = await dataSourceAPI.getRecordListV2(query, { swr });
                         data.records = data.records || [];
                     }
@@ -50,9 +53,11 @@ export const useTableData = ({ dataSourceAPI, connectorMethod, query, events, is
             else {
                 setTableData(records);
             }
-            events === null || events === void 0 ? void 0 : events.querySuccess({
-                data: Object.assign({}, data, query),
-            });
+            if (canCallQuerySuccess) {
+                events === null || events === void 0 ? void 0 : events.querySuccess({
+                    data: Object.assign({}, data, query),
+                });
+            }
             (records === null || records === void 0 ? void 0 : records.length) === 0 &&
                 (events === null || events === void 0 ? void 0 : events.queryEmpty({
                     data: Object.assign({}, data, query),

package/dist/web/components/wd-table/utils/index.d.ts

@@ -20,6 +20,7 @@ export declare const getSearchValues: (searchValues?: any[]) => {
     }[];
     relatedSearchValues: any;
 };
+export declare const orderByFieldKey: (key: any, columns: any) => any;
 export declare const getQueryParams: ({ queryParams, wList, viewFieldsData, connectorParams, isModel, isViewTable, authFields, supportManyRelated, columns, selectFieldType, selectFields, isSupportMultipleSort, }: any) => {
     pageNo: number;
     pageSize: number;

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

@@ -188,7 +188,7 @@ export const getSearchValues = (searchValues = []) => {
         relatedSearchValues,
     };
 };
-const orderByFieldKey = (key, columns) => {
+export 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;
 };

package/package.json

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