aldehyde 0.2.19 → 0.2.21

package/src/aldehyde/table/act-table.tsx

@@ -61,6 +61,9 @@ const defaultDisabledColIds: string[] = ['20000', '10000']
 
 interface ActTableProps extends TmplBaseProps {
     criteriaData: object,
+    pageNo:number,
+    pageSize:number,
+    onChangePage:(pageNo:number,pageSize:number)=>void,
     ltmplConfig: LtmplConfig,
     menuId?: string,
     showView?: (code: string, toCustomPage?: boolean) => void,
@@ -77,20 +80,19 @@ interface ActTableProps extends TmplBaseProps {
 };
 
 interface ActTableStat {
-    tableColumns: object[];
-    sortedColConfigs: ColumnConfig[];
-    queryKey: QueryKey;
-    loading: boolean;
-    criteriaData: object;
-    selectedRows: SelectedRow[];
-    selectedDatas: DtmplData[];
+    tableColumns?: object[];
+    sortedColConfigs?: ColumnConfig[];
+    queryKey?: QueryKey;
+    loading?: boolean;
+    selectedRows?: SelectedRow[];
+    selectedDatas?: DtmplData[];
     hiddenColIds?: string[];
     drillingColIds?: string[];
-    disabledColIds: string[];
+    disabledColIds?: string[];
     hiddenRowCodes?: string[];
     viewModels?: ActTableViewModel[];
-    showL2ActTable: boolean;
-    showL2Chart: boolean;
+    showL2ActTable?: boolean;
+    showL2Chart?: boolean;
 };
 
 class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
@@ -99,7 +101,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         sortedColConfigs: undefined,
         queryKey: undefined,
         loading: true,
-        criteriaData: undefined,
         disableCols: undefined,
         hiddenColIds: defaultDisabledColIds,
         selectedRows: [],
@@ -120,7 +121,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     loadData = async (hiddenColIds: string[], hiddenRowCodes: string[], sortedColConfigs: ColumnConfig[]) => {
-        const {sourceId, criteriaData, ltmplConfig, mainCode, level} = this.props;
+        const {sourceId, criteriaData, ltmplConfig, mainCode, level,pageNo,pageSize} = this.props;
         if (!ltmplConfig) {
             return;
         }
@@ -149,11 +150,11 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         /** 构建column **/
         let tableColumns = this.buildTableColumns(ltmplConfig, hiddenColIds_, hiddenRowCodes, sortedColConfigs);
 
-        const {defaultPageSize, buttons} = ltmplConfig;
+        const {defaultPageSize} = ltmplConfig;
 
         let pageInfo = {
-            pageNo: 1,
-            pageSize: defaultPageSize ? defaultPageSize : 10,
+            pageNo:pageNo?pageNo:1,
+            pageSize:pageSize?pageSize:defaultPageSize ? defaultPageSize : 10,
             virtualEndPageNo: undefined,
         }
 
@@ -180,7 +181,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
             sortedColConfigs,
             tableColumns,
             queryKey,
-            criteriaData,
             loading: false,
             showL2Chart: false,
             selectedRows: [],
@@ -190,7 +190,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     buildTableColumns = (ltmplConfig: LtmplConfig, hiddenColIds: string[], hiddenRowCodes: string[], sortedColConfigs: ColumnConfig[]) => {
-        const {mainCode, showView, doEdit, menuId, doRAction, doDelete} = this.props
+        const { showView, doEdit, doRAction} = this.props
         const {buttons} = ltmplConfig;
         let tableColumns = [];
         let s = 0;
@@ -354,15 +354,14 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     async componentDidUpdate(prevProps) {
-        const {sourceId, criteriaData, ltmplConfig} = this.props;
-        let {ltmplConfig: preLtmplConfig, criteriaData: preCriteriaData} = prevProps;
+        const {sourceId,criteriaData, ltmplConfig} = this.props;
+        let {ltmplConfig: preLtmplConfig, criteriaData: preCriteriaData,sourceId:preSourceId} = prevProps;
 
         let {hiddenColIds, sortedColConfigs} = this.state;
 
-        // console.log("UnitscriteriaData)", Units.transQueryParamsToStr(criteriaData));
-        // console.log("preCriteriaData)", Units.transQueryParamsToStr(preCriteriaData));
-        // console.log("preCriteriaData) bool", Units.transQueryParamsToStr(preCriteriaData) == Units.transQueryParamsToStr(criteriaData));
-        if (ltmplConfig && (!preLtmplConfig || ltmplConfig.id != preLtmplConfig.id) || (Units.transQueryParamsToStr(criteriaData) != Units.transQueryParamsToStr(preCriteriaData))) {
+        if ((sourceId && preSourceId!=sourceId) ||
+            (ltmplConfig && (!preLtmplConfig || ltmplConfig.id != preLtmplConfig.id)) ||
+            (Units.transQueryParamsToStr(criteriaData) != Units.transQueryParamsToStr(preCriteriaData))) {
 
             if (ltmplConfig.id == preLtmplConfig.id) {
                 this.loadData(hiddenColIds, [], sortedColConfigs);
@@ -647,8 +646,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     renderCriteriaForm = () => {
-        let {criteriaData, loading, selectedRows, selectedDatas} = this.state;
-        let {ltmplConfig, doSearch} = this.props;
+        let { loading, selectedRows, selectedDatas} = this.state;
+        let {ltmplConfig, doSearch,criteriaData} = this.props;
         return <CriteriaForm loading={loading} selectedDatas={selectedDatas} selectedRows={selectedRows}
                              ltmplConfig={ltmplConfig} data={criteriaData}
                              doCQuery={this.doSelectedCQuery}
@@ -659,8 +658,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     renderContent() {
-        let {queryKey, tableColumns, criteriaData, loading, selectedRows, selectedDatas, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable, showL2Chart} = this.state;
-        let {sourceId, ltmplConfig, doSearch, funcMode, title, collapsible} = this.props;
+        let {queryKey, tableColumns, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable} = this.state;
+        let {sourceId, ltmplConfig, funcMode, title, collapsible,pageSize,pageNo,onChangePage} = this.props;
 
         if (!ltmplConfig || !sourceId) {
             return <>
@@ -670,7 +669,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 </Table>
             </>
         }
-        let {buttons, criterias, jumps, actions} = ltmplConfig
+        let {buttons} = ltmplConfig
         let displayCriteriaCard: boolean = false;
         if (funcMode == 'simple' || funcMode == 'common') {
             displayCriteriaCard = false;
@@ -715,12 +714,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                     }
                     {
                         loading ? "" :
-                            <QueryTable viewModels={viewModels} columnConfigs={columnConfigs}
+                            <QueryTable onChangePage={onChangePage} viewModels={viewModels} columnConfigs={columnConfigs}
                                         maxSelectedRows={this.checkBoxUseful() ? 10000 : -1}
                                         selectedRows={selectedRows}
                                         columns={tableColumns}
                                         hiddenRowCodes={hiddenRowCodes}
-                                        defaultPageSize={ltmplConfig.defaultPageSize}
+                                        pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:ltmplConfig.defaultPageSize}}
                                         queryKey={queryKey}
                                         onChangeRowSelection={this.changeRowSelection}/>
                     }
@@ -730,8 +729,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     render() {
-        let {queryKey, tableColumns, criteriaData, loading, selectedRows, selectedDatas, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable, showL2Chart} = this.state;
-        let {sourceId, ltmplConfig, doSearch, funcMode, title, collapsible,initCollapse} = this.props;
+        let {queryKey, loading} = this.state;
+        let {sourceId, ltmplConfig, title, collapsible,initCollapse} = this.props;
 
         if (!ltmplConfig || !sourceId) {
             return <>

package/src/aldehyde/table/l2-act-table.tsx

@@ -1,10 +1,6 @@
 import React from 'react'
-import {Card, Collapse, Table} from 'antd';
-import {MenuOutlined} from '@ant-design/icons';
 import "./index.css"
 import {LtmplConfigRes, TmplBaseProps} from "../tmpl/interface";
-import Units from "../units";
-import {SortableHandle} from 'react-sortable-hoc';
 import HCDataSource from "../tmpl/hc-data-source";
 import ActTable from './act-table'
 
@@ -13,13 +9,17 @@ interface L2ActTableProps extends TmplBaseProps {
 };
 
 interface L2ActTableStat {
-    ltmplConfigRes: LtmplConfigRes,
-    criteriaData:object,
+    ltmplConfigRes?: LtmplConfigRes,
+    criteriaData?:object,
+    pageNo?:number,
+    pageSize?:number,
 };
 
 
 class L2ActTable extends React.PureComponent<L2ActTableProps, L2ActTableStat> {
     state = {
+        pageNo:undefined,
+        pageSize:undefined,
         ltmplConfigRes: undefined,
         criteriaData:{},
     }
@@ -71,12 +71,19 @@ class L2ActTable extends React.PureComponent<L2ActTableProps, L2ActTableStat> {
         })
     }
 
+    onChangePage=(pageNo,pageSize)=>{
+        this.setState({
+            pageNo,pageSize
+        })
+
+    }
+
     render() {
-        let {ltmplConfigRes,criteriaData} = this.state;
+        let {ltmplConfigRes,criteriaData,pageNo,pageSize} = this.state;
         let {sourceId} = this.props;
         return (
             ltmplConfigRes?
-                <ActTable doSearch={this.doSearch} level={'l2'} criteriaData={criteriaData} sourceId={sourceId}
+                <ActTable pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}  doSearch={this.doSearch} level={'l2'} criteriaData={criteriaData} sourceId={sourceId}
                           ltmplConfig={ltmplConfigRes.ltmplConfig} /> : ""
          );
     }

package/src/aldehyde/table/modal-select-table.tsx

@@ -10,6 +10,7 @@ import QueryTable from './query-table';
 import CriteriaForm from "../form/criteria-form";
 import ViewControl from "../controls/view-control";
 import SelectedRowsCard from './selected-rows-card'
+import ActTable from "./act-table";
 
 interface ModelSelectTableProps {
     maxSelectedRows: number,
@@ -22,12 +23,14 @@ interface ModelSelectTableProps {
 };
 
 interface ModelSelectTableStat {
-    selectConfig: SelectConfig;
-    columns: object[];
-    queryKey: QueryKey;
-    loading: boolean;
-    criteriaData: object;
-    selectedRows: SelectedRow[];
+    selectConfig?: SelectConfig;
+    columns?: object[];
+    queryKey?: QueryKey;
+    loading?: boolean;
+    criteriaData?: object;
+    pageNo?:number,
+    pageSize?:number,
+    selectedRows?: SelectedRow[];
 };
 
 class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelSelectTableStat> {
@@ -37,6 +40,8 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
         queryKey: undefined,
         loading: true,
         criteriaData: undefined,
+        pageNo:undefined,
+        pageSize:undefined,
         disableCols: undefined,
         selectedRows: [],
     }
@@ -46,12 +51,12 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
         this.setState({
             loading: true,
         })
-
+        const {pageNo,pageSize} = this.state;
         const {defaultPageSize} = selectConfig;
 
         let pageInfo = {
-            pageNo: 1,
-            pageSize: defaultPageSize ? defaultPageSize : 10,
+            pageNo: pageNo,
+            pageSize:pageSize?pageSize: defaultPageSize,
             virtualEndPageNo: undefined,
         }
         const {sourceId, exceptCodes,mainCode} = this.props;
@@ -139,6 +144,12 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
         await this.loadData(selectConfig, params);
     }
 
+    onChangePage=(pageNo,pageSize)=>{
+        this.setState({
+            pageNo,pageSize
+        })
+    }
+
     handleOk = () => {
         this.props.onOK(this.state.selectedRows);
         this.setState({
@@ -206,7 +217,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
 
     render() {
         let {open, maxSelectedRows} = this.props;
-        let {queryKey, columns, selectConfig, criteriaData, loading, selectedRows} = this.state;
+        let {queryKey, columns, selectConfig, criteriaData, loading, selectedRows,pageSize,pageNo} = this.state;
 
         if (!selectConfig) {
             return <>
@@ -236,8 +247,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
                 <div className="actTable">
                     <CriteriaForm selectedRows={selectedRows} ltmplConfig={selectConfig} data={criteriaData}
                                   doSearch={this.doSearch} loading={loading} />
-                    <QueryTable maxSelectedRows={maxSelectedRows} selectedRows={selectedRows} columns={columns}
-                                defaultPageSize={selectConfig.defaultPageSize}
+                    <QueryTable  pageInfo={{pageNo:pageNo?pageNo:1,pageSize:pageSize?pageSize:selectConfig.defaultPageSize}} onChangePage={this.onChangePage} maxSelectedRows={maxSelectedRows} selectedRows={selectedRows} columns={columns}
                                 queryKey={queryKey}
                                 onChangeRowSelection={this.changeRowSelection}/>
                 </div>

package/src/aldehyde/table/pagination.tsx

@@ -24,7 +24,6 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
         if(!pageInfo){
             return <></>
         }
-
         let virtualTotal;
         let myTotal;
         let sewTotal: boolean = true;
@@ -42,11 +41,11 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
             seeTotalTitle = `点击查看总数`;
         } else {//这里还有问题
             sewTotal = false;
-            virtualTotal = pageInfo.virtualEndPageNo * pageInfo.pageSize + 1;
+            virtualTotal = pageInfo.virtualEndPageNo *  pageInfo.pageSize + 1;
             seeTotalTitle = `点击查看总数`;
         }
 
-        return (virtualTotal<pageInfo.pageSize?"":
+        return (!virtualTotal || virtualTotal < pageInfo.pageSize?"":
             <div className='Pagination'>
                         <span className={sewTotal ? 'sewTotal' : 'seeTotal'} onClick={queryTotal}>
                             {seeTotalTitle}
@@ -57,7 +56,7 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
                     showSizeChanger
                     pageSizeOptions={['5', '10', '20', '50', '100', '500']}
                     defaultCurrent={1}
-                    current={pageInfo.pageNo}
+                    current={parseInt(pageInfo.pageNo.toString())}
                     pageSize={pageInfo.pageSize}
                     onChange={(page, pageSize) => pageTo(page, pageSize)}
                     onShowSizeChange={(current, size) => pageTo(current, size)}

package/src/aldehyde/table/query-table.tsx

@@ -29,10 +29,15 @@ interface CacheData {
 
 interface QueryTableProps {
     viewModels?: ActTableViewModel[];
-    defaultPageSize?: number;
+    // defaultPageSize?: number;
+    pageInfo: {
+        pageNo: number,
+        pageSize: number
+    },
     columns: any[];
     queryKey: QueryKey;
-    onChangeRowSelection?: (selectedRows: SelectedRow[],selectedDatas: DtmplData[], allRowKeys: string[]) => void;
+    onChangePage: (pageNo: number, pageSize: number) => void,
+    onChangeRowSelection?: (selectedRows: SelectedRow[], selectedDatas: DtmplData[], allRowKeys: string[]) => void;
     maxSelectedRows?: number;
     selectedRows?: SelectedRow[];
     hiddenRowCodes?: string[],
@@ -42,17 +47,22 @@ interface QueryTableProps {
 
 
 interface QueryTableStat {
-    queryDataCache: Map<string, CacheData>;
-    pageInfo: PageInfo;
-    dataSource: object[];
-    loading: boolean;
-    touchEnd: boolean;
-    total: number;
+    queryDataCache?: Map<string, CacheData>;
+    virtualEndPageNo?: number;
+    dataSource?: object[];
+    loading?: boolean;
+    touchEnd?: boolean;
+    total?: number;
 };
 
 class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
     static defaultProps = {
+        pageInfo: {
+            pageNo: 1,
+            pageSize: 10,
+            virtualEndPageNo: undefined
+        },
         hiddenRowCodes: [],
         selectedRows: [],
         viewModels: ['table']
@@ -60,7 +70,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
 
     state = {
         queryDataCache: undefined,
-        pageInfo: undefined,
+        virtualEndPageNo: undefined,
         dataSource: undefined,
         loading: true,
         touchEnd: undefined,
@@ -68,31 +78,30 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     }
 
     async componentDidMount() {
-        const {columns, queryKey, defaultPageSize} = this.props;
-        let pageInfo = {
-            pageNo: 1,
-            pageSize: defaultPageSize ? defaultPageSize : 10,
-            virtualEndPageNo: undefined,
-        }
+        const { queryKey, pageInfo} = this.props;
+        // let pageInfo = {
+        //     pageNo: 1,
+        //     pageSize: defaultPageSize ? defaultPageSize : 10,
+        //     virtualEndPageNo: undefined,
+        // }
         if (queryKey) {
             await this.loadData(queryKey.key, pageInfo);
         }
     }
 
     componentWillUnmount() {
-        this.setState = ()=>false;
+        this.setState = () => false;
     }
 
     async componentDidUpdate(prevProps) {
-        const {queryKey: preQueryKey} = prevProps;
-        const {columns, queryKey, defaultPageSize} = this.props;
-        if (queryKey && preQueryKey?.key != queryKey.key) {
-            let pageInfo = {
-                pageNo: 1,
-                pageSize: defaultPageSize ? defaultPageSize : 10,
-                virtualEndPageNo: undefined,
+        const {queryKey: preQueryKey, pageInfo: prePageInfo} = prevProps;
+        const {queryKey, pageInfo} = this.props;
+        if (queryKey) {
+            if (preQueryKey?.key != queryKey.key) {
+                await this.loadData(queryKey.key, pageInfo, true);
+            } else if (prePageInfo?.pageNo != pageInfo.pageNo || prePageInfo?.pageSize != pageInfo.pageSize) {
+                await this.loadData(queryKey.key, pageInfo, false);
             }
-            await this.loadData(queryKey.key, pageInfo, true);
         }
     }
 
@@ -132,11 +141,11 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         this.setState({
             loading: true,
         })
-
         let {queryDataCache} = this.state;
         let queryCache: Map<string, CacheData>;
         if (cleanCache || !queryDataCache) {
             queryCache = new Map<string, CacheData>();
+            this.setState({total: undefined,})
         } else {
             queryCache = queryDataCache;
         }
@@ -144,7 +153,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
             let cacheData = queryCache.get(pageInfo.pageNo + "_" + pageInfo.pageSize);
             this.setState({
                 dataSource: cacheData.dataSource,
-                pageInfo: cacheData.pageInfo,
+                virtualEndPageNo: cacheData.pageInfo.virtualEndPageNo,
                 loading: false,
             })
         } else {
@@ -165,23 +174,25 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
             queryCache.set(pageInfo.pageNo + "_" + pageInfo.pageSize, {dataSource, pageInfo});
             this.setState({
                 dataSource,
-                pageInfo,
+                virtualEndPageNo: pageInfo.virtualEndPageNo,
                 queryDataCache: queryCache,
                 touchEnd,
                 loading: false,
-                total: undefined,
             })
         }
     }
 
     pageTo = async (pageNo: number, pageSize: number) => {
+        const {onChangePage}=this.props
+        const {virtualEndPageNo} = this.state;
         let pageInfo = {
             pageNo,
             pageSize: pageSize ? pageSize : 10,
-            virtualEndPageNo: undefined,
+            virtualEndPageNo,
         }
         const {queryKey} = this.props;
         await this.loadData(queryKey.key, pageInfo);
+        onChangePage(pageNo,pageSize);
     }
 
     queryTotal = async () => {
@@ -207,7 +218,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                 allRowKeys.push(d.code);
             }
         }
-        if(maxSelectedRows==-1){
+        if (maxSelectedRows == -1) {
             return null;
         }
         const rowSelection: TableRowSelection<any> = {
@@ -231,7 +242,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                     selectedDatas.push(item);
                 })
                 if (onChangeRowSelection) {
-                    onChangeRowSelection(selectedRows_,selectedDatas, allRowKeys);
+                    onChangeRowSelection(selectedRows_, selectedDatas, allRowKeys);
                 }
             }
         }
@@ -259,11 +270,11 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         const formItemList = [];
         if (columnConfigs.length > 0) {
             columnConfigs.forEach((item, index) => {
-                if (item.id != '10000' && item.title != '操作' && item.id != '20000' ) {
+                if (item.id != '10000' && item.title != '操作' && item.id != '20000') {
                     const title = item.title;
                     let fieldValue = data ? data[item.id] : undefined;
-                    if(title=='序号'){
-                        fieldValue=data.index;
+                    if (title == '序号') {
+                        fieldValue = data.index;
                     }
                     //fieldValue 没有值时不能为null 要为 undefined。antd input所限制
                     fieldValue = fieldValue ? fieldValue : item.defaultValue ? item.defaultValue : undefined;
@@ -283,28 +294,29 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     }
 
     render() {
-        const {columns, viewModels} = this.props;
-        const {pageInfo, touchEnd, total, loading} = this.state;
+        const {pageInfo, columns, viewModels, onChangePage} = this.props;
+        const {touchEnd, total, loading, virtualEndPageNo} = this.state;
         return (
             <>
                 {viewModels.includes('table') ?
                     <Table size={'middle'}
-                        rowSelection={this.getRowSelection()}
-                        columns={columns ? columns : []}
-                        dataSource={this.getUnHidenDataSource()}
-                        bordered
-                        pagination={false}
-                        style={{display: columns ? "block" : "none"}}
-                        loading={loading}
-                        components={{
-                            body: {
-                                wrapper: this.DraggableContainer,
-                                row: this.DraggableBodyRow,
-                            },
-                        }}
+                           rowSelection={this.getRowSelection()}
+                           columns={columns ? columns : []}
+                           dataSource={this.getUnHidenDataSource()}
+                           bordered
+                           pagination={false}
+                           style={{display: columns ? "block" : "none"}}
+                           loading={loading}
+                           components={{
+                               body: {
+                                   wrapper: this.DraggableContainer,
+                                   row: this.DraggableBodyRow,
+                               },
+                           }}
                     >
                     </Table> : ""}
-                <Pagination touchEnd={touchEnd} pageInfo={pageInfo} pageTo={this.pageTo} queryTotal={this.queryTotal}
+                <Pagination touchEnd={touchEnd} pageInfo={{...pageInfo, virtualEndPageNo}} pageTo={this.pageTo}
+                            queryTotal={this.queryTotal}
                             total={total}/>
                 {viewModels.includes('verticalList') ?
                     <Card style={{marginTop: '10px'}}>
@@ -312,7 +324,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                             dataSource={this.getUnHidenDataSource()}
                             renderItem={item => (
                                 <List.Item key={item['id']}>
-                                    <Card size={'small'} bodyStyle={{padding:'4px'}}><Descriptions column={4}>
+                                    <Card size={'small'} bodyStyle={{padding: '4px'}}><Descriptions column={4}>
                                         {this.initViewList(item)}
                                     </Descriptions></Card>
                                 </List.Item>

package/src/aldehyde/table/relation-table.tsx

@@ -38,15 +38,15 @@ interface RelationTableProps {
 };
 
 interface RelationTableStat {
-    selectedCode: string,
-    showDtmplView: boolean,
-    showDtmplEdit: boolean,
-    showSelectTable: boolean,
-    tableLoading: boolean,
-    showRowEdit: boolean,
-    selectedDtmplData: DtmplData,
-    filterStr: string,
-    pageSize: number,
+    selectedCode?: string,
+    showDtmplView?: boolean,
+    showDtmplEdit?: boolean,
+    showSelectTable?: boolean,
+    tableLoading?: boolean,
+    showRowEdit?: boolean,
+    selectedDtmplData?: DtmplData,
+    filterStr?: string,
+    pageSize?: number,
 };