@cloudbase/weda-ui 3.5.0 → 3.5.2

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

@@ -13,56 +13,63 @@ import { usePlatform, isInIde } from '../../utils/platform';
 import { convertWhere } from '../../utils/getModelParams';
 import isObjectEqual from '../../utils/isObjectEqual';
 import { useAuthFields } from './hooks/useAuthFields';
-import { useDataSourceTitle } from './hooks/useDataSource';
 import { useTableData } from './hooks/useTableData';
 import { useViewFields } from './hooks/useViewFields';
 import { useQueryParams } from './hooks/useQueryParams';
-import { getSlots, getFilterFields, getSelectedView, getSortColumns, mapTableDataWithView, } from './utils';
+import { WdCompError } from '../../utils/error';
+import { getSlots, getFilterFields, getSelectedView, getSortColumns, mapTableDataWithView, checkSupport, DataSourceType, getRecordKey, } from './utils';
 import { Mock } from './mock';
 import { getTableColumns, slotRender, mapColumKey, } from './components/FieldRender';
 import Modal from '../modal';
 import { WdButton } from '../wd-button';
 import '../style';
-const _defaultPageIndex = 1;
-const _defaultPageSize = 10;
-const TableOption = memo(function TableOption({ slots, ...props }) {
+export const _defaultPageIndex = 1;
+export const _defaultPageSize = 10;
+export const TableOption = memo(function TableOption({ slots, ...props }) {
     const component = useMemo(() => {
         // 计算单元格的值
         return slotRender(slots[CELL_CUSTOM_OPTION], props);
     }, [props, slots]);
     return component;
 });
-const GlobalButton = memo(function GlobalButtonDom({ classPrefix, slots, }) {
+export const GlobalButton = memo(function GlobalButtonDom({ classPrefix, slots, }) {
     return _jsx("div", { className: `${classPrefix}-global-btn`, children: slotRender(slots) });
 });
 // eslint-disable-next-line complexity
-export const WdTable = forwardRef(function TableComp({ className, style, dataSourceType, bindConnectMetadata = {
-    datasource: { id: '', name: '', title: '' },
-}, // APImock数据
-connectorMethod = { name: '', inParams: [], outParams: [], title: '' }, // API方法
-connectorParams: rawConnectorParams = {}, // API查询入参
-bindMetadata = {
-    datasource: {},
-    enabledFieldNames: [],
-    selectedViewIds: [],
-}, // 数据源+字段data对象
-filterFields, // 筛选字段
-columnSets, // 列管理，具备列排序/列勾选/列自定义渲染作用，存在时代替enabledFieldNames
-rowColor, // 行背景色
-id, // 组件id
-events, // 事件
-orderBy, // 排序字段
-orderType, // 排序方式
-fixedFront = '', // 冻结首列至本列
-fixedEnd = '', // 冻结本列至尾列
-enableCellCustomOption, // 是否显示插槽操作列
-enableGlobalButton, // 是否显示插槽全局按钮
-enablePagination = true, columnSelectType = 'select', defaultPageIndex = _defaultPageIndex, defaultPageSize = _defaultPageSize, 
-// 以下为非标准属性，config中没有
-// isOrderBy, // API是否支持排序(旧的表格有该属性)
-isMock = false, //是否mock数据
-enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props }, ref) {
-    const where = convertWhere(props); // 查询参数
+export const WdTable = forwardRef(function TableComp(tableProps, ref) {
+    const { className, style, dataSourceType = 'data-model', bindConnectMetadata = {
+        datasource: { id: '', name: '', title: '' },
+    }, // APImock数据
+    connectorMethod = { name: '', inParams: [], outParams: [], title: '' }, // API方法
+    connectorParams: rawConnectorParams = {}, // API查询入参
+    bindMetadata = {
+        datasource: { id: '', name: '', title: '' },
+        enabledFieldNames: [],
+        selectedViewIds: [],
+        isNewData: false,
+    }, // 数据源+字段data对象
+    filterFields, // 筛选字段
+    columnSets, // 列管理，具备列排序/列勾选/列自定义渲染作用，存在时代替enabledFieldNames
+    rowColor, // 行背景色
+    id, // 组件id
+    events, // 事件
+    orderBy = 'updatedAt', // 排序字段
+    orderType = 'desc', // 排序方式
+    fixedFront = '', // 冻结首列至本列
+    fixedEnd = '', // 冻结本列至尾列
+    enableCellCustomOption, // 是否显示插槽操作列
+    enableGlobalButton, // 是否显示插槽全局按钮
+    enablePagination = true, columnSelectType = 'select', defaultPageIndex = _defaultPageIndex, defaultPageSize = _defaultPageSize, 
+    // 以下为非标准属性，config中没有
+    // isOrderBy, // API是否支持排序(旧的表格有该属性)
+    isMock = false, //是否mock数据
+    enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText = '暂无数据', dataSourceData, //绑定表达式时的表格数据
+    recordKey: _recordKey = '_id', // 数据主键
+    total: _total, // 表格总条数
+    enableTotal = false, //是否开启动态分页
+    supportManyRelated, // 支持新版数据源关联查询
+    ...props } = tableProps;
+    const wList = convertWhere(props, supportManyRelated); // 查询参数
     const { classPrefix } = useConfig();
     const platform = usePlatform();
     const isH5 = platform === 'h5'; // 响应式判定
@@ -73,20 +80,27 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
     // 打开移动端筛选面板
     const [openMobileFilter, setOpenMobileFilter] = useState(false);
     const connectorParams = rawConnectorParams && JSON.parse(JSON.stringify(rawConnectorParams));
+    // 数据源类型是否时表达式
+    const isExpression = dataSourceType === DataSourceType.Expression;
     // 数据源类型是否是模型
-    const isModel = dataSourceType !== 'custom-connector';
-    const { datasource, enabledFieldNames, isNewData, selectedViewIds } = isModel
-        ? bindMetadata
-        : bindConnectMetadata;
+    const isModel = dataSourceType === DataSourceType.DataModel;
+    // 数据源类型是否是apis
+    const isApis = dataSourceType === DataSourceType.CustomConnector;
+    const { enabledFieldNames, isNewData, selectedViewIds } = bindMetadata;
+    const datasource = isModel
+        ? bindMetadata.datasource
+        : bindConnectMetadata.datasource;
     const { outParams } = connectorMethod;
     const dbName = datasource === null || datasource === void 0 ? void 0 : datasource.name;
+    // 数据源名称
+    const datasourceTitle = (datasource === null || datasource === void 0 ? void 0 : datasource.title) || dbName;
     const dbFieldNames = isModel ? enabledFieldNames : outParams;
     // 视图列表 列表
     const selectedView = getSelectedView(selectedViewIds);
     // 判断是否支持视图
-    const isViewTable = selectedView === null || selectedView === void 0 ? void 0 : selectedView.length;
+    const isViewTable = (selectedView === null || selectedView === void 0 ? void 0 : selectedView.length) && isModel;
     // 是否未绑定数据源
-    const isNoDataSourceBind = !dbName && !(connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name);
+    const isNoDataSourceBind = !dbName && !(connectorMethod === null || connectorMethod === void 0 ? void 0 : connectorMethod.name) && !isExpression;
     // wrap类名
     const wrapClassList = {
         [`${classPrefix}-table-wrap`]: true,
@@ -102,6 +116,10 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
     // 移动端操作按钮弹窗
     const [isMobileOptionVisible, setIsMobileOptionVisible] = useState(false);
     const modalRef = useRef(null);
+    const dataRef = useRef({
+        dataSourceData: [],
+        tableRecords: [],
+    });
     const { enumOptions } = useEnumContext();
     const dataSourceAPI = useMemo(() => new DataSource(dbName), [dbName]); // datasource 方法-模型
     // 插槽属性
@@ -110,13 +128,12 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
     }, [props]);
     // table选中key值
     const [selectedKeys, setSelectedKeys] = useState([]);
+    const [selectedRecords, setSelectedRecords] = useState([]);
     // 行点击出参
     const [rowData, setRowData] = useState({});
-    // 筛选条件
-    const wList = where;
     // 搜索和分页参数
-    let initPageIndex = isModel ? defaultPageIndex : connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.pageNo;
-    let initPageSize = isModel ? defaultPageSize : connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.pageSize;
+    let initPageIndex = isModel || isExpression ? defaultPageIndex : connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.pageNo;
+    let initPageSize = isModel || isExpression ? defaultPageSize : connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.pageSize;
     initPageIndex = parseInt(initPageIndex);
     initPageSize = parseInt(initPageSize);
     const [queryParams, setQueryParams] = useState({
@@ -127,11 +144,8 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         orderBy,
         orderType,
     });
-    const { dataSourceName } = useDataSourceTitle(dbName, isModel);
-    // 数据源名称
-    const datasourceTitle = dataSourceName || dbName;
     // 过滤权限字段
-    const { authFields, fieldsLoading } = useAuthFields(dbName, dbFieldNames, isNewData, isModel, connectorMethod);
+    const { authFields, fieldsLoading, isError: fieldsError, } = useAuthFields(dbName, dbFieldNames, isNewData, isModel, connectorMethod, isNoDataSourceBind, isExpression, isApis);
     // 视图
     const { viewFieldsData, viewFields, viewLoading } = useViewFields({
         selectedView,
@@ -141,7 +155,14 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         authFields,
         isViewTable,
     });
-    const fields = isViewTable ? viewFields : authFields;
+    let fields = isViewTable ? viewFields : authFields;
+    if (isExpression && Array.isArray(columnSets)) {
+        fields = columnSets === null || columnSets === void 0 ? void 0 : columnSets.map((i) => ({
+            ...i.schema,
+            name: i.key,
+            title: i.header,
+        }));
+    }
     // 筛选字段
     const filterFieldsData = getFilterFields(filterFields, fields);
     // 可排序字段
@@ -155,7 +176,7 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         if (isMock || (isInIde() && isNoDataSourceBind)) {
             return Mock.columns;
         }
-        if (fieldsLoading || isNoDataSourceBind) {
+        if (isNoDataSourceBind || (!isExpression && fieldsLoading)) {
             return [];
         }
         let baseColumns = getTableColumns({
@@ -165,6 +186,7 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
             fixedFront,
             fixedEnd,
             isH5,
+            supportManyRelated,
         });
         // 操作列
         if (enableCellCustomOption && !isH5) {
@@ -205,6 +227,7 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
     }, [
         isMock,
         isNoDataSourceBind,
+        isExpression,
         fieldsLoading,
         fields,
         columnSets,
@@ -215,8 +238,15 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         enableCellCustomOption,
         columnSelectType,
         classPrefix,
+        supportManyRelated,
         resizeColumns,
     ]);
+    // 主键
+    const recordKey = getRecordKey({
+        dataSourceType,
+        dataSourceData,
+        key: _recordKey,
+    });
     // 查询参数
     const { query } = useQueryParams({
         queryParams,
@@ -227,9 +257,11 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         isViewTable,
         events,
         columns,
+        authFields,
+        supportManyRelated,
     });
     // 查询数据
-    const { tableData, total, tableLoading, getNewList } = useTableData({
+    const { tableData, tableTotal, tableLoading, getNewList, isError, errorObj, emptyTable, } = useTableData({
         dataSourceAPI,
         dbName,
         connectorMethod,
@@ -238,29 +270,39 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         isModel,
         isH5,
         isNoDataSourceBind,
-        viewFieldsData,
-        isViewTable,
+        supportManyRelated,
     });
-    const refreshTable = () => {
+    const refreshTable = async () => {
         // 清除选中的 key
         setSelectedKeys([]);
+        setSelectedRecords([]);
         if (queryParams.pageIndex === _defaultPageIndex) {
-            getNewList();
+            await getNewList({ forceClear: true });
         }
         else {
             setQueryParams((queryParams) => ({ ...queryParams, pageIndex: 1 }));
         }
     };
-    const isTableLoading = !isNoDataSourceBind &&
-        (tableLoading ||
-            fieldsLoading ||
-            !fields.length ||
-            (viewLoading && isViewTable));
+    // 1.绑定数据源时请求返回的联合加载状态2.绑定表达式时，无加载状态
+    const getLoadingStatus = () => {
+        if (isExpression || isNoDataSourceBind) {
+            return false;
+        }
+        if (isModel) {
+            return tableLoading || fieldsLoading || (viewLoading && isViewTable);
+        }
+        return tableLoading || fieldsLoading;
+    };
+    const isTableLoading = getLoadingStatus();
     // 表格数据
     const mapTableData = () => {
         if (isMock || (isInIde() && isNoDataSourceBind)) {
             return Mock.records;
         }
+        // 绑定表达式则直接返回表达式的值
+        if (isExpression) {
+            return Array.isArray(dataSourceData) ? dataSourceData : [];
+        }
         // 加载过程中,pc端每次查询置空,h5端仅首页置空
         // 避免编辑器内切换数据源时,column更改,table render还未更新造成渲染问题
         if ((isTableLoading && !isH5) || isNoDataSourceBind) {
@@ -278,82 +320,200 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
     };
     const tableRecords = mapTableData();
     // 总数
+    let total = isExpression ? tableRecords === null || tableRecords === void 0 ? void 0 : tableRecords.length : tableTotal;
+    if (enableTotal && isExpression && !isNaN(parseInt(`${_total}`))) {
+        total = parseInt(`${_total}`);
+    }
+    useEffect(() => {
+        setSelectedKeys([]);
+        setSelectedRecords([]);
+    }, [_recordKey]);
+    useEffect(() => {
+        var _a, _b;
+        if (isExpression &&
+            Array.isArray(dataSourceData) &&
+            !isObjectEqual((_a = dataRef === null || dataRef === void 0 ? void 0 : dataRef.current) === null || _a === void 0 ? void 0 : _a.dataSourceData, dataSourceData)) {
+            dataRef.current.dataSourceData = dataSourceData || [];
+        }
+        if (!isObjectEqual((_b = dataRef === null || dataRef === void 0 ? void 0 : dataRef.current) === null || _b === void 0 ? void 0 : _b.tableRecords, tableRecords)) {
+            dataRef.current.tableRecords = tableRecords || [];
+        }
+    }, [dataSourceData, tableRecords, isExpression]);
     const beforeModalDestroy = () => {
         // 重新加载数据
         refreshTable();
     };
     // 事件属性
     useImperativeHandle(ref, () => ({
-        deleteOne: (params) => {
+        deleteOne: async (params) => {
             const selectedKeys = [];
             const { id } = params;
             if (id) {
                 selectedKeys.push(id);
             }
-            deleteRecord({
-                selectedKeys,
-                isModel,
-                dataSourceAPI,
-                beforeModalDestroy,
-            });
+            const { isSupport, message } = checkSupport(dataSourceType, 'deleteOne');
+            if (!isSupport) {
+                throw new WdCompError(`${message}` || '', {
+                    code: 'WdTable.ActionNotSupport',
+                });
+            }
+            try {
+                await deleteRecord({
+                    selectedKeys,
+                    dataSourceAPI,
+                    beforeModalDestroy,
+                    supportManyRelated,
+                });
+            }
+            catch (error) {
+                throw new WdCompError(`${error === null || error === void 0 ? void 0 : error.message}` || '', {
+                    code: (error === null || error === void 0 ? void 0 : error.code) || 'WdTable.DeleteOneError',
+                    requestId: error === null || error === void 0 ? void 0 : error.requestId,
+                    original: error === null || error === void 0 ? void 0 : error.original,
+                });
+            }
         },
         // 删除选中数据
-        deleteSelected: () => deleteRecord({
-            selectedKeys,
-            isModel,
-            dataSourceAPI,
-            beforeModalDestroy,
-        }),
+        deleteSelected: async () => {
+            try {
+                const { isSupport, message } = checkSupport(dataSourceType, 'deleteSelected');
+                if (!isSupport) {
+                    const errorMsg = {
+                        code: 'WdTable.ActionNotSupport',
+                        message,
+                        requestId: '',
+                    };
+                    throw errorMsg;
+                }
+                await deleteRecord({
+                    selectedKeys,
+                    dataSourceAPI,
+                    beforeModalDestroy,
+                    supportManyRelated,
+                });
+            }
+            catch (error) {
+                throw new WdCompError(`${error === null || error === void 0 ? void 0 : error.message}` || '', {
+                    code: (error === null || error === void 0 ? void 0 : error.code) || 'WdTable.DeleteSelectedError',
+                    requestId: error === null || error === void 0 ? void 0 : error.requestId,
+                    original: error === null || error === void 0 ? void 0 : error.original,
+                });
+            }
+        },
         // 导入
-        import: () => importHandleByApi({
-            isModel,
-            isH5,
-            setIsImportFileModalByApiVisible,
-        }),
+        import: () => {
+            const { isSupport, message } = checkSupport(dataSourceType, 'import');
+            if (isSupport) {
+                importHandleByApi({
+                    isH5,
+                    setIsImportFileModalByApiVisible,
+                });
+            }
+            else {
+                throw new WdCompError(`${message}` || '', {
+                    code: 'WdTable.ActionNotSupport',
+                });
+            }
+        },
         // 导出
-        export: () => exportHandle({
-            selectedKeys,
-            records: tableRecords,
-            enumOptions,
-            datasourceTitle,
-            columnSets,
-            fields: fields,
-        }),
+        export: () => {
+            const { isSupport, message } = checkSupport(dataSourceType, 'export');
+            if (isSupport) {
+                exportHandle({
+                    selectedKeys,
+                    records: tableRecords,
+                    enumOptions,
+                    datasourceTitle,
+                    columnSets,
+                    fields: fields,
+                });
+            }
+            else {
+                throw new WdCompError(`${message}` || '', {
+                    code: 'WdTable.ActionNotSupport',
+                });
+            }
+        },
         // 后端导出
-        exportOptionalMode: () => exportHandleByApi({ isModel, isH5, setIsExportFileModalByApiVisible }),
-        refresh: () => {
-            refreshTable();
+        exportOptionalMode: () => {
+            const { isSupport, message } = checkSupport(dataSourceType, 'exportOptionalMode');
+            if (isSupport) {
+                exportHandleByApi({
+                    isH5,
+                    setIsExportFileModalByApiVisible,
+                });
+            }
+            else {
+                throw new WdCompError(`${message}` || '', {
+                    code: 'WdTable.ActionNotSupport',
+                });
+            }
+        },
+        refresh: async () => {
+            try {
+                await refreshTable();
+            }
+            catch (error) {
+                throw new WdCompError(`${error === null || error === void 0 ? void 0 : error.message}` || '', {
+                    code: (error === null || error === void 0 ? void 0 : error.code) || 'WdTable.RefreshError',
+                    requestId: error === null || error === void 0 ? void 0 : error.requestId,
+                    original: error === null || error === void 0 ? void 0 : error.original,
+                });
+            }
         },
         // 刷新表格(查看当前页数据)
-        refreshKeepPage: () => {
-            if (isH5) {
-                // 移动端下拉分页不支持查看当前页，刷新即首页
-                refreshTable();
+        refreshKeepPage: async () => {
+            try {
+                if (isH5) {
+                    // 移动端下拉分页不支持查看当前页，刷新即首页
+                    await refreshTable();
+                }
+                else {
+                    // 清除选中的 key
+                    setSelectedKeys([]);
+                    setSelectedRecords([]);
+                    await getNewList({ forceClear: true });
+                }
             }
-            else {
-                // 清除选中的 key
-                setSelectedKeys([]);
-                getNewList();
+            catch (error) {
+                throw new WdCompError(`${error === null || error === void 0 ? void 0 : error.message}` || '', {
+                    code: (error === null || error === void 0 ? void 0 : error.code) || 'WdTable.RefreshKeepPageError',
+                    requestId: error === null || error === void 0 ? void 0 : error.requestId,
+                    original: error === null || error === void 0 ? void 0 : error.original,
+                });
             }
         },
         // 移动端打开弹窗
         openOperationDialog: () => {
-            if (isH5) {
-                setIsMobileOptionVisible(true);
+            const { isSupport, message } = checkSupport(dataSourceType, 'openOperationDialog');
+            if (isSupport) {
+                isH5 && setIsMobileOptionVisible(true);
+            }
+            else {
+                throw new WdCompError(`${message}` || '', {
+                    code: 'WdTable.ActionNotSupport',
+                });
             }
         },
         // 当前页数据
-        records: tableRecords,
+        records: dataRef.current.tableRecords,
         // 当前总数
         total: total,
         pageNo: query.pageNo,
         pageSize: query.pageSize,
-        selectedRecords: tableRecords.filter((_) => selectedKeys.find((key) => _._id === key)),
+        selectedRecords,
         dataSourceType,
+        error: errorObj,
         bindMetadata,
         columnSets,
         defaultPageSize,
         defaultPageIndex,
+        dataSourceData: dataRef.current.dataSourceData,
+        sort: supportManyRelated
+            ? query.orderBy
+            : [{ orderBy: query.orderBy, orderType: query.orderType }],
+        filter: supportManyRelated ? query.filter : query === null || query === void 0 ? void 0 : query.where,
+        dataSourceVersion: supportManyRelated ? 'v2' : 'v1',
     }), 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
@@ -363,21 +523,28 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         isH5,
         isModel,
         selectedKeys,
-        tableRecords === null || tableRecords === void 0 ? void 0 : tableRecords.length,
+        dataRef.current.tableRecords,
         total,
         query.pageNo,
         query.pageSize,
         dataSourceType,
+        errorObj,
         bindMetadata,
         defaultPageSize,
         defaultPageIndex,
+        dataRef.current.dataSourceData,
+        selectedRecords,
+        query === null || query === void 0 ? void 0 : query.orderBy,
+        query === null || query === void 0 ? void 0 : query.orderType,
+        query === null || query === void 0 ? void 0 : query.where,
+        query === null || query === void 0 ? void 0 : query.filter,
+        supportManyRelated,
     ]);
     // 表格更改上下文数据
     // 移动端和自定义APIs场景不支持导入功能，监听变化存到表格上下文中
     useEffect(() => {
         // 表格上下文
         if (typeof (events === null || events === void 0 ? void 0 : events.onDataChange) === 'function') {
-            const selectedRecords = tableRecords.filter((_) => selectedKeys.find((key) => _._id === key));
             events.onDataChange({
                 data: tableRecords,
                 state: {
@@ -391,9 +558,17 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
             });
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isH5, isModel, selectedKeys, total, tableRecords === null || tableRecords === void 0 ? void 0 : tableRecords.length]);
+    }, [
+        isH5,
+        isModel,
+        selectedRecords,
+        total,
+        tableRecords === null || tableRecords === void 0 ? void 0 : tableRecords.length,
+        query.pageNo,
+        query.pageSize,
+    ]);
     useEffect(() => {
-        if (isModel) {
+        if (isModel || isExpression) {
             setQueryParams((queryParams) => ({
                 ...queryParams,
                 searchValues: (queryParams === null || queryParams === void 0 ? void 0 : queryParams.searchValues) || [],
@@ -412,7 +587,18 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
                 sort: [],
             }));
         }
-    }, [defaultPageIndex, defaultPageSize, connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.pageSize, connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.pageNo, isModel, orderBy, orderType, connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.orderBy, connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.orderType]);
+    }, [
+        defaultPageIndex,
+        defaultPageSize,
+        connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.pageSize,
+        connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.pageNo,
+        isModel,
+        orderBy,
+        orderType,
+        connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.orderBy,
+        connectorParams === null || connectorParams === void 0 ? void 0 : connectorParams.orderType,
+        isExpression,
+    ]);
     useEffect(() => {
         if (isH5) {
             setQueryParams((queryParams) => ({ ...queryParams, pageIndex: 1 }));
@@ -427,8 +613,7 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
         // 仅当切换小屏的时候重新请求
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [isH5]);
-    const hasFilterButton = !!filterFieldsData.length;
-    const recordKey = isInIde() ? undefined : '_id';
+    const hasFilterButton = !!filterFieldsData.length && !isExpression;
     // 行点击事件
     const rowClick = (context) => {
         if (events === null || events === void 0 ? void 0 : events.tabTableRow) {
@@ -447,36 +632,52 @@ enableRefreshBtn = true, enableTableHeightSizeBtn = true, emptyText, ...props },
     // 选择事件
     const onSelectChange = (keys, context) => {
         setSelectedKeys([].concat(keys));
+        const selectValue = columnSelectType === 'radio' ? context === null || context === void 0 ? void 0 : context.record : context === null || context === void 0 ? void 0 : context.selectedRecords;
+        const data = [].concat(selectValue);
+        setSelectedRecords(data);
+        // 历史问题events?.rowsSelect方法出参存在问题，废弃
         if (events === null || events === void 0 ? void 0 : events.rowsSelect) {
-            const selectValue = columnSelectType === 'radio'
-                ? context === null || context === void 0 ? void 0 : context.record
-                : context === null || context === void 0 ? void 0 : context.selectedRecords;
             events.rowsSelect(selectValue);
         }
+        if (events === null || events === void 0 ? void 0 : events.rowsSelected) {
+            events.rowsSelected({ data });
+        }
     };
     // 查询参数改变
     const onQueryChange = (query) => {
-        setQueryParams({ ...queryParams, ...query });
+        setQueryParams((queryParams) => ({ ...queryParams, ...query }));
+    };
+    // 点击刷新按钮
+    const onRefreshBtnClick = () => {
+        refreshTable();
+        events === null || events === void 0 ? void 0 : events.onRefreshBtnClick();
+    };
+    // 筛选值变化
+    const onFilterChange = (searchValues = []) => {
+        if (isObjectEqual(queryParams.searchValues, searchValues)) {
+            getNewList();
+        }
+        else {
+            emptyTable();
+            setQueryParams((queryParams) => ({
+                ...queryParams,
+                searchValues,
+                pageIndex: 1,
+            }));
+        }
+        events === null || events === void 0 ? void 0 : events.onFilterChange({ searchValues });
     };
-    return (_jsx(ConfigProvider, { classPrefix: classPrefix, children: _jsx(EnumHoc, { fields: authFields, children: _jsxs("div", { className: classNames(wrapClassList, className), style: style, id: id, children: [_jsx(FilterFieldsPanel, { openMobileFilter: openMobileFilter, setOpenMobileFilter: setOpenMobileFilter, filterFields: filterFieldsData, fetchData: (searchValues = []) => {
-                            if (isObjectEqual(queryParams.searchValues, searchValues)) {
-                                getNewList();
-                            }
-                            else {
-                                setQueryParams({ ...queryParams, searchValues, pageIndex: 1 });
-                            }
-                        } }), _jsxs("div", { className: `${classPrefix}-table-container`, children: [!isH5 && !isNoDataSourceBind && (_jsxs("div", { className: `${classPrefix}-table-wrap-toolbar`, children: [enableGlobalButton && (_jsx("div", { className: `${classPrefix}-table-wrap-toolbar__col ${classPrefix}-table-wrap-toolbar__col-start`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) })), (enableRefreshBtn || enableTableHeightSizeBtn) && (_jsx("div", { className: `${classPrefix}-table-wrap-toolbar__col ${classPrefix}-table-wrap-toolbar__col-end`, children: _jsx(ToolBar, { hasFilterButton: hasFilterButton, total: total, refreshTable: refreshTable, setTableHightSize: setTableHightSize, currentSize: tableHightSize, setOpenMobileFilter: () => {
+    const errorStatus = isError || fieldsError;
+    const errorMsg = isError ? errorObj : fieldsError;
+    return (_jsx(ConfigProvider, { classPrefix: classPrefix, children: _jsx(EnumHoc, { fields: authFields, children: _jsxs("div", { className: classNames(wrapClassList, className), style: style, id: id, children: [hasFilterButton && (_jsx(FilterFieldsPanel, { openMobileFilter: openMobileFilter, setOpenMobileFilter: setOpenMobileFilter, filterFields: filterFieldsData, fetchData: onFilterChange })), _jsxs("div", { className: `${classPrefix}-table-container`, children: [!isH5 && !isNoDataSourceBind && (_jsxs("div", { className: `${classPrefix}-table-wrap-toolbar`, children: [enableGlobalButton && (_jsx("div", { className: `${classPrefix}-table-wrap-toolbar__col ${classPrefix}-table-wrap-toolbar__col-start`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) })), (enableRefreshBtn || enableTableHeightSizeBtn) && (_jsx("div", { className: `${classPrefix}-table-wrap-toolbar__col ${classPrefix}-table-wrap-toolbar__col-end`, children: _jsx(ToolBar, { hasFilterButton: hasFilterButton, total: total, refreshTable: onRefreshBtnClick, setTableHightSize: setTableHightSize, currentSize: tableHightSize, setOpenMobileFilter: () => {
                                                 setOpenMobileFilter(true);
                                             }, enableRefreshBtn: enableRefreshBtn, enableTableHeightSizeBtn: enableTableHeightSizeBtn, enablePagination: enablePagination }) }))] })), isH5 &&
                                 (enablePagination ||
                                     enableRefreshBtn ||
                                     enableTableHeightSizeBtn ||
-                                    hasFilterButton) && (_jsx(ToolBar, { hasFilterButton: hasFilterButton, total: total, refreshTable: refreshTable, setTableHightSize: setTableHightSize, currentSize: tableHightSize, setOpenMobileFilter: () => {
+                                    hasFilterButton) && (_jsx(ToolBar, { hasFilterButton: hasFilterButton, total: total, refreshTable: onRefreshBtnClick, setTableHightSize: setTableHightSize, currentSize: tableHightSize, setOpenMobileFilter: () => {
                                     setOpenMobileFilter(true);
-                                }, enableRefreshBtn: enableRefreshBtn, enableTableHeightSizeBtn: enableTableHeightSizeBtn, enablePagination: enablePagination })), _jsx(Table, { emptyText: emptyText, isH5: isH5, isNoDataSourceBind: isNoDataSourceBind, className: tableClassList, recordKey: recordKey, currentSize: tableHightSize, defaultPageIndex: defaultPageIndex, defaultPageSize: defaultPageSize, sortColumns: sortColumns, enablePagination: !isH5 && enablePagination, columnSelectType: columnSelectType, columns: columns, setColumns: setColumns, records: tableRecords, sort: queryParams.sort, selectedKeys: selectedKeys, onSelectChange: onSelectChange, isError: false, isLoading: isTableLoading, rowColor: rowColor, queryParams: queryParams, total: total, refreshTable: refreshTable, onQueryChange: onQueryChange, rowClick: rowClick }), isH5 && enableGlobalButton && !isNoDataSourceBind && (_jsx("div", { className: `${classPrefix}-h5-table-wrap-footer`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) }))] }), _jsx(ImportFileModal, { dbName: dbName, datasourceTitle: datasourceTitle, fields: fields, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, isImportFileModalByApiVisible: isImportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, refresh: () => {
-                            // 导入成功后刷新页面
-                            refreshTable();
-                        } }), _jsx(ExportFileModal, { whereList: wList, fields: fields, columns: mapColumKey(columns), isExportFileModalByApiVisible: isExportFileModalByApiVisible, selectedKeys: selectedKeys, dbName: dbName, query: query, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible }), _jsx(InOrOutRecordModal, { dbName: dbName, isInOrOutRecordModalVisible: isInOrOutRecordModalVisible, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible }), isH5 && (_jsx(Modal, { className: `${classPrefix}-h5-table-option-modal-wrap`, disableCloseIcon: true, title: "\u64CD\u4F5C", visible: isMobileOptionVisible, outerRef: modalRef, events: {
+                                }, enableRefreshBtn: enableRefreshBtn, enableTableHeightSizeBtn: enableTableHeightSizeBtn, enablePagination: enablePagination })), _jsx(Table, { events: events, emptyText: emptyText, isH5: isH5, isNoDataSourceBind: isNoDataSourceBind, className: tableClassList, recordKey: recordKey, currentSize: tableHightSize, defaultPageIndex: defaultPageIndex, defaultPageSize: defaultPageSize, sortColumns: sortColumns, enablePagination: !isH5 && enablePagination, columnSelectType: columnSelectType, columns: columns, setColumns: setColumns, records: tableRecords, sort: queryParams.sort, selectedKeys: selectedKeys, onSelectChange: onSelectChange, isLoading: isTableLoading, rowColor: rowColor, queryParams: queryParams, total: total, onQueryChange: onQueryChange, rowClick: rowClick, isError: errorStatus, errorObj: errorMsg }), isH5 && enableGlobalButton && !isNoDataSourceBind && (_jsx("div", { className: `${classPrefix}-h5-table-wrap-footer`, children: _jsx(GlobalButton, { classPrefix: classPrefix, slots: slots === null || slots === void 0 ? void 0 : slots.globalButton }) }))] }), _jsx(ImportFileModal, { dbName: dbName, datasourceTitle: datasourceTitle, fields: fields, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, isImportFileModalByApiVisible: isImportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, refresh: refreshTable, supportManyRelated: supportManyRelated }), _jsx(ExportFileModal, { whereList: wList, fields: fields, columns: mapColumKey(columns), isExportFileModalByApiVisible: isExportFileModalByApiVisible, selectedKeys: selectedKeys, dbName: dbName, query: query, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible, supportManyRelated: supportManyRelated }), _jsx(InOrOutRecordModal, { dbName: dbName, isInOrOutRecordModalVisible: isInOrOutRecordModalVisible, setIsImportFileModalByApiVisible: setIsImportFileModalByApiVisible, setIsExportFileModalByApiVisible: setIsExportFileModalByApiVisible, setIsInOrOutRecordModalVisible: setIsInOrOutRecordModalVisible }), isH5 && (_jsx(Modal, { overlayClassName: `${classPrefix}-h5-table-overlay`, className: `${classPrefix}-h5-table-option-modal-wrap`, disableCloseIcon: true, title: "\u64CD\u4F5C", visible: isMobileOptionVisible, outerRef: modalRef, events: {
                             close: () => {
                                 setIsMobileOptionVisible(false);
                             },