aldehyde 0.2.435 → 0.2.436

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

@@ -8,13 +8,13 @@ import {
   PlusCircleOutlined, PlusOutlined, ReloadOutlined, RetweetOutlined, SearchOutlined,
   TableOutlined, ImportOutlined
 } from "@ant-design/icons";
+import _ from "lodash";
 import "./index.css";
 import {
   ActTableMode, ActTableViewModel, AggregateVO, ClassAddConfig, ColumnConfig,
   CustomButton, CustomButtonConfig, DoEditParam, DtmplData, JumpConfig, LtmplConfig, QueryKey,
   SelectedRow, ShowViewParam, TmplBaseProps,
 } from "../tmpl/interface";
-
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import HCDataSource from "../tmpl/hc-data-source";
 import QueryTable from "./query-table";
@@ -23,7 +23,6 @@ import ProgramConfig from "../units";
 import ColumnSelector from "./column/column-selector";
 import ExportFrame, { ExportType, ExportMode } from "../export/export-frame";
 import L2ActTable from "./l2-act-table";
-
 import Restat from "./stat/restat";
 import CollapseCard from "../controls/collapse-card";
 import ToolTipBar from "../detail/tooltipbar";
@@ -36,6 +35,7 @@ import EntryControl from "../controls/entry-control";
 import DraggableModal from "../module/draggable-modal";
 import Icon from "../icon/aliIcon";
 import PageConfigButton from "./page-config-button";
+import { defPageSizeOptions } from "./pagination"; // 默认分页数
 
 const { Content, Sider } = Layout;
 const { Text } = Typography;
@@ -51,7 +51,7 @@ interface ActTableProps extends TmplBaseProps {
   criteriaData: object;
   pageNo: number;
   pageSize: number;
-  onChangePage: (pageNo: number, pageSize: number) => void;
+  onChangePage: (pageNo: number, pageSize: number, pageSizeOptions?: number[]) => void;
   ltmplConfig: LtmplConfig;
   menuId?: string;
   showView?: (showVievParam: ShowViewParam) => void;
@@ -80,6 +80,7 @@ interface ActTableProps extends TmplBaseProps {
   resetUserPageConfig?: () => void; // 重置用户页面配置本地缓存
   allowUserConfig?: boolean; // 是否可用户自定义配置
   deleteCallback?: (val: object) => void; // 删除回调
+  onUpdatePageSizeOptions?: (val: number[]) => void; // 更新分页数数组
 }
 
 interface ActTableStat {
@@ -111,6 +112,7 @@ interface ActTableStat {
   delModalOpen?: boolean; // 强删除弹窗是否打开
   tabsOptions?: { key: string, value: string, label: React.ReactNode, title?: string, id?: string, ids?: string[] }[]; // tabs选项
   tabActiveKey?: string; // Tabs选中项
+  pageSizeOptions?: number[]; // 设备分页数
 }
 let serial_number = new Date().getTime();
 let busyReminderTime = 0;
@@ -146,6 +148,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     delModalOpen: false, // 强删除弹窗是否打开
     tabsOptions: [],
     tabActiveKey: "all",
+    pageSizeOptions: defPageSizeOptions
   };
 
   static contextType = LocaleContext;
@@ -472,7 +475,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
 
   async componentDidMount() {
-    const { ltmplConfig, tableType, userPageConfig } = this.props;
+    const { ltmplConfig, tableType, userPageConfig, defShowType, onUpdatePageSizeOptions, setUserPageConfig, pageSize } = this.props;
     const { sortedColIds } = userPageConfig || {};
     const { translate } = this.context;
     let sortedColConfigs = undefined;
@@ -485,11 +488,41 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       if (sortedColIds) { // 使用缓存的列排序
         sortedColConfigs.sort((a, b) => sortedColIds.indexOf(a.id) - sortedColIds.indexOf(b.id));
       }
-      this.loadData(userPageConfig?.hiddenColIds || defaultDisabledColIds, [], sortedColConfigs);
+      const temViewModels = userPageConfig?.["viewModels"] || [defShowType || ltmplConfig?.showType || "table"];
+      this.setState({ viewModels: temViewModels });
+      if (onUpdatePageSizeOptions && temViewModels.includes("cardList")) { // 初始化是卡片视图，则更新父组件中分页数组
+        const temPageSizes = Array.from({ length: 7 }, (_, i) => ltmplConfig.rowCardCount * Math.pow(2, i));
+        onUpdatePageSizeOptions(temPageSizes);
+        if (setUserPageConfig && !(userPageConfig?.pageSize >= 0)) setUserPageConfig({ pageSize: 1 });
+        this.setState({ pageSizeOptions: temPageSizes });
+      } else {
+        this.loadData(userPageConfig?.hiddenColIds || defaultDisabledColIds, [], sortedColConfigs);
+      }
     }
     this.getTabsOptions();
   }
 
+  // 卡片列表-更新列表分页数
+  handleCardListPageSize(preViewModels, viewModels) {
+    const { ltmplConfig, onChangePage, pageSize, pageNo } = this.props;
+    const { defaultPageSize } = ltmplConfig || {};
+    const preIsCard = preViewModels.includes("cardList");
+    const isCard = viewModels.includes("cardList");
+    let temPageSizes = defPageSizeOptions;
+    let temPageSize = defaultPageSize;
+    if ((!preIsCard && !isCard) || (preIsCard && isCard)) {
+      return;
+    }
+    if (!preIsCard && isCard) { // 普通切换到Card
+      temPageSizes = Array.from({ length: 7 }, (_, i) => ltmplConfig.rowCardCount * Math.pow(2, i));
+      temPageSize = temPageSizes.includes(Number(pageSize)) ? pageSize : (temPageSizes.includes(Number(defaultPageSize)) ? defaultPageSize : temPageSizes[1]);
+    } else if (preIsCard && !isCard) { // card切换到普通
+      temPageSize = defPageSizeOptions.includes(Number(pageSize)) ? pageSize : (defPageSizeOptions.includes(Number(defaultPageSize)) ? defaultPageSize : defPageSizeOptions[1]);
+    }
+    this.setState({ pageSizeOptions: temPageSizes });
+    onChangePage(pageNo || 1, temPageSize, temPageSizes);
+  }
+
   async componentDidUpdate(prevProps, prevState) {
     const { sourceId, criteriaData, ltmplConfig, tableType, pageSize, pageNo, userPageConfig, defShowType } = this.props;
     // const {userCriteriaData:preUserCriteriaData}=prevState;
@@ -514,6 +547,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     if (!preUserPageConfig && userPageConfig) {
       this.setState({ viewModels: userPageConfig?.["viewModels"] || [defShowType || ltmplConfig?.showType || "table"] });
     }
+    if (!_.isEqual(prevState.viewModels, this.state.viewModels)) { // 显示视图变化-更改卡片列表分页条数
+      this.handleCardListPageSize(prevState.viewModels, this.state.viewModels);
+    }
     let { hiddenColIds, sortedColConfigs } = this.state;
     let currentQueryParams = ProgramConfig.transQueryParamsToStr(criteriaData, false, [
       "pageSize",
@@ -928,7 +964,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
   // 更新当前页面配置
   handleUpdateUserPageConfig = (val: { [key: string]: any }) => {
-    const { sortedColIds, hiddenColIds, viewModels, criteriaData } = val;
+    const { sortedColIds, hiddenColIds, viewModels, criteriaData } = val || {};
     const { setUserPageConfig, ltmplConfig, tableType, defShowType, menuId } = this.props;
     const { userCriteriaData } = this.state;
     const { translate } = this.context;
@@ -1455,7 +1491,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   renderContent = () => {
     let {
       queryKey, loading, selectedRows, hiddenRowCodes, viewModels, sortedColConfigs, hiddenColIds, showL2ActTable,
-      pageInfo, editings, userCriteriaData, tabsOptions, tabActiveKey
+      pageInfo, editings, userCriteriaData, tabsOptions, tabActiveKey, pageSizeOptions
     } = this.state;
     let {
       mainCode, sourceId, ltmplConfig, funcMode, operatable,
@@ -1557,6 +1593,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         showPagination={showPagination}
         onChangeAggregateVO={(val) => this.setState({ aggregateVO: val })}
         onChangeResize={this.onChangeResize}
+        pageSizeOptions={pageSizeOptions}
       />);
 
     // tab拆解条件渲染

package/src/aldehyde/table/pagination.tsx

@@ -4,6 +4,9 @@ import { Pagination as AntdPagination } from "antd";
 import "./pagination.css";
 import { LocaleContext } from "../locale/LocaleProvider";
 
+// 默认分页数
+export const defPageSizeOptions = [5, 10, 20, 50, 100, 200, 500];
+
 interface PaginationProps {
   pageTo: (pageNo: number, pageSize: number) => void;
   queryTotal: () => void;
@@ -11,6 +14,7 @@ interface PaginationProps {
   total: number;
   touchEnd: boolean;
   paginationPosition?: "left" | "middle" | "right";
+  pageSizeOptions?: number[]; //配置的分页数 
 }
 
 interface PaginationStat { }
@@ -20,7 +24,7 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
   context: React.ContextType<typeof LocaleContext>;
 
   render() {
-    const { queryTotal, pageInfo, total, pageTo, touchEnd, paginationPosition } = this.props;
+    const { queryTotal, pageInfo, total, pageTo, touchEnd, paginationPosition, pageSizeOptions } = this.props;
     const { translate } = this.context;
 
     if (!pageInfo) {
@@ -60,7 +64,7 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
           style={{ display: "inline-block" }}
           showQuickJumper
           showSizeChanger
-          pageSizeOptions={["5", "10", "20", "50", "100", "200", "500"]} //
+          pageSizeOptions={pageSizeOptions || defPageSizeOptions}
           defaultCurrent={1}
           current={parseInt(pageInfo.pageNo ? pageInfo.pageNo.toString() : "1")}
           pageSize={pageInfo.pageSize ? pageInfo.pageSize : 10}

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

@@ -434,7 +434,9 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       ltmplConfig,
       showView,
       showPagination,
-      onChangeResize
+      onChangeResize,
+      pageSizeOptions,
+      onChangePage
     } = this.props;
     //debugger
     const { touchEnd, aggregateVO, loading, virtualEndPageNo, dataSource, errorText } = this.state;
@@ -619,6 +621,9 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
             sourceId={this.props.sourceId}
             loading={loading}
             errorText={errorText}
+            total={aggregateVO?.count}
+            pageInfo={pageInfo}
+            onChangePage={onChangePage}
           />
         ) : (
           ""
@@ -633,6 +638,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           queryTotal={this.queryTotal}
           total={aggregateVO?.count}
           paginationPosition={ltmplConfig?.paginationPosition}
+          pageSizeOptions={pageSizeOptions}
         /> : ""}
       </>
     );

package/src/aldehyde/tmpl/interface.tsx

@@ -93,6 +93,7 @@ export interface QueryTableProps extends ReportTableProps {
   showPagination?: boolean;
   onChangeAggregateVO?: (aggregateVO: AggregateVO) => void;
   onChangeResize?: (value: { [key: string]: number }) => void; // 表格列尺寸更新
+  pageSizeOptions?: number[]; // 分页数配置
 }
 
 export interface AggregateVO {