aldehyde 0.2.418 → 0.2.419

package/src/aldehyde/form/dtmpl-form.tsx

@@ -412,7 +412,7 @@ export default class DtmplForm extends React.PureComponent<
               serverKey={serverKey}
               valueMap={dtmplData ? dtmplData.fieldMap : undefined}
             /> :
-              <FormItemGroup layout={HcserviceV3.isForeignLanguageMode() ? "vertical" : "horizontal"}
+              <FormItemGroup layout={HcserviceV3.isForeignLanguageMode() ? "vertical" : (dtmplConfig.formLayout || "horizontal")}
                 serverKey={serverKey}
                 formRef={formRef}
                 mainCode={mainCode}
@@ -509,7 +509,7 @@ export default class DtmplForm extends React.PureComponent<
           </Card>
         ) : null}
         <AntdForm
-          layout={HcserviceV3.isForeignLanguageMode() ? "vertical" : "horizontal"}
+          layout={HcserviceV3.isForeignLanguageMode() ? "vertical" : (dtmplConfig.formLayout || "horizontal")}
           scrollToFirstError={true}
           labelWrap={true}
           ref={formRef}

package/src/aldehyde/index.tsx

@@ -147,6 +147,8 @@ import SplitViewLtmplRoute from "./routable/splitview-ltmpl-route";
 
 import SsoLogin from "./sso-Login";
 
+import NavigationTree from "./tree/navigation-tree";
+
 export {
   ActTable,
   SelectTable,
@@ -205,5 +207,6 @@ export {
   DtmplViewModal,
   DtmplViewDrawer,
   SplitViewLtmplRoute,
-  SsoLogin
+  SsoLogin,
+  NavigationTree
 };

package/src/aldehyde/routable/ltmpl-route.tsx

@@ -40,6 +40,7 @@ export interface LtmplRouteState {
     viewSourceId?: string;
     editSourceId?: string;
     toCustomPage?: boolean;
+    userPageConfig?: { [key: string]: any };
 }
 
 class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
@@ -66,10 +67,12 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         viewSourceId: undefined,
         editSourceId: undefined,
         toCustomPage: false,
+        userPageConfig: undefined,
     };
 
     async componentDidMount() {
         this.loadData();
+        this.getUserPageConfig();
     }
     Z
     get computedLayoutPath() {
@@ -78,6 +81,30 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         return "";
     }
 
+    // 获取用户页面配置
+    getUserPageConfig = () => {
+        const { params } = this.props;
+        const { sourceId } = params;
+        const config = Units.getUserPageConfig(sourceId);
+        this.setState({ userPageConfig: config });
+    };
+
+    // 设置用户页面配置
+    setUserPageConfig = (config: { [key: string]: any }) => {
+        const { params } = this.props;
+        const { sourceId } = params;
+        const temConfig = Units.setUserPageConfig(sourceId, config);
+        this.setState({ userPageConfig: temConfig });
+    };
+
+    // 重置本地缓存页面配置
+    resetUserPageConfig = () => {
+        const { params } = this.props;
+        const { sourceId } = params;
+        Units.resetUserPageConfig(sourceId);
+        this.setState({ userPageConfig: undefined });
+    }
+
     onRoute = (path) => {
         this.props.navigate(path);
     };
@@ -110,10 +137,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             null,
             sourceId
         );
-
-        this.setState({
-            ltmplConfigRes: ltmplConfigRes,
-        });
+        this.setState({ ltmplConfigRes: ltmplConfigRes });
     };
 
     async componentDidUpdate(prevProps) {
@@ -319,14 +343,14 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         let params = Units.transQueryStrToParams(search, null);
         params["pageNo"] = pageNo;
         params["pageSize"] = pageSize;
-
         this.doSearch(params);
+        this.setUserPageConfig({ pageSize });
     };
 
     render() {
         const {
             ltmplConfigRes, showDraw, showWindowType, ractionId, selectedCode,
-            showViewDrawer, showViewModal, showEdit, editSourceId, viewSourceId, toCustomPage
+            showViewDrawer, showViewModal, showEdit, editSourceId, viewSourceId, toCustomPage, userPageConfig
         } = this.state;
         const { location, params, tableType, rowOperatable, defShowType } = this.props;
         const { sourceId } = params;
@@ -338,7 +362,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             search,
             ltmplConfigRes?.ltmplConfig
         );
-        let pageSize = criteriaData["pageSize"];
+        let pageSize = userPageConfig?.["pageSize"] || criteriaData["pageSize"];
         let pageNo = criteriaData["pageNo"];
 
         if (search.indexOf("mainCode") > 0) {
@@ -369,7 +393,8 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
                         mainCode={mainCode} showView={this.showView} doSearch={this.onChangeSearch} doEdit={this.doEdit}
                         doCreate={this.doCreate} sourceId={sourceId}
                         criteriaData={criteriaData} ltmplConfig={ltmplConfig} doRAction={this.doRAction}
-                        defShowType={defShowType}
+                        defShowType={defShowType} userPageConfig={userPageConfig} setUserPageConfig={this.setUserPageConfig}
+                        resetUserPageConfig={this.resetUserPageConfig}
                     />
                     {showDraw ? (
                         <Drawer

package/src/aldehyde/routable/splitview-ltmpl-route.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useMemo } from "react";
 import { useParams, useLocation, useNavigate } from "react-router-dom";
-import { DoEditParam, LtmplConfig, LtmplConfigRes, PageType, RouterCompProps, ShowViewParam } from "../tmpl/interface";
+import { DoEditParam, LtmplConfig, LtmplConfigRes, PageType, RouterCompProps, ShowViewParam, ActTableViewModel } from "../tmpl/interface";
 import Units from "../units";
 import ActTable from "../table/act-table";
 import HCDataSource from "../tmpl/hc-data-source";
@@ -19,10 +19,11 @@ export interface Props extends RouterCompProps {
     layoutRootPath?: string;
     tableType?: "common" | "report";
     rowOperatable?: boolean;
+    defShowType?: ActTableViewModel;
 }
 
 const Index = (props: Props) => {
-    const { layoutRootPath, tableType, rowOperatable, basePath = "" } = props;
+    const { layoutRootPath, tableType, rowOperatable, basePath = "", defShowType } = props;
     const [pageInfo, setPageInfo] = useState<{ pageNo: number, pageSize: number }>();
     const [ltmplConfig, setLtmplConfig] = useState<LtmplConfig>();
     const [splitterSize, setSplitterSize] = useState<number | string>("50%");
@@ -36,6 +37,7 @@ const Index = (props: Props) => {
     const [toCustomPage, setToCustomPage] = useState<boolean>(false);
     const [viewSourceId, setViewSourceId] = useState<string>();
     const [editSourceId, setEditSourceId] = useState<string>();
+    const [userPageConfig, setUserPageConfig] = useState<{ [key: string]: any }>();
     const { sourceId } = useParams();
     const { search } = useLocation();
     const { translate } = useLocale();
@@ -57,9 +59,28 @@ const Index = (props: Props) => {
         setPageLayout(ltmplConfig?.pageLayout || "none");
     };
 
+    // 获取用户页面配置
+    const getUserPageConfig = () => {
+        const config = Units.getUserPageConfig(sourceId);
+        setUserPageConfig(config);
+    };
+
+    // 设置用户页面配置
+    const handleSetUserPageConfig = (config: { [key: string]: any }) => {
+        const temConfig = Units.setUserPageConfig(sourceId, config);
+        setUserPageConfig(temConfig);
+    };
+
+    // 重置本地缓存页面配置
+    const resetUserPageConfig = () => {
+        Units.resetUserPageConfig(sourceId);
+        setUserPageConfig(undefined);
+    }
+
     useEffect(() => {
         if (sourceId) {
             getLtmplConfig();
+            getUserPageConfig();
         }
     }, [sourceId]);
 
@@ -79,6 +100,7 @@ const Index = (props: Props) => {
         params["pageSize"] = pageSize;
         setPageInfo({ pageNo, pageSize });
         doSearch(params);
+        handleSetUserPageConfig({ pageSize });
     };
 
     const onShowView = (showViewParam: ShowViewParam) => {
@@ -172,13 +194,17 @@ const Index = (props: Props) => {
     const renderActTable = () => {
         let criteriaData = Units.transQueryStrToParams(search, ltmplConfig);
         return <ActTable key={"acttable" + sourceId}
-            tableType={tableType} serverKey={null} pageSize={pageInfo?.pageSize} pageNo={pageInfo?.pageNo} onChangePage={onChangePage}
+            tableType={tableType} serverKey={null} pageSize={userPageConfig?.pageSize || pageInfo?.pageSize} pageNo={pageInfo?.pageNo} onChangePage={onChangePage}
             menuId={menuId} operatable={rowOperatable}
             mainCode={mainCode} showView={onShowView} doSearch={onChangeSearch} doEdit={doEdit}
             doCreate={doCreate} sourceId={sourceId}
             criteriaData={criteriaData} ltmplConfig={ltmplConfig || null} doRAction={doRAction}
             doDelete={() => pageLayout !== "none" && doCreate(editSourceId)}
-        />
+            defShowType={defShowType}
+            userPageConfig={userPageConfig}
+            setUserPageConfig={handleSetUserPageConfig}
+            resetUserPageConfig={resetUserPageConfig}
+        />;
     };
 
     const doSubmited = (code?: string, isContinueSave?: boolean) => {

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

@@ -6,7 +6,7 @@ import {
 import {
   ExportOutlined, FundOutlined, LineChartOutlined,
   PlusCircleOutlined, PlusOutlined, ReloadOutlined, RetweetOutlined, SearchOutlined,
-  TableOutlined, ImportOutlined,
+  TableOutlined, ImportOutlined, SyncOutlined
 } from "@ant-design/icons";
 import "./index.css";
 import {
@@ -72,6 +72,9 @@ interface ActTableProps extends TmplBaseProps {
   defShowType?: ActTableViewModel; // 默认视图
   showPagination?: boolean; // 是否显示分页
   showAggregates?: boolean; // 是否显示统计数据
+  userPageConfig?: { [key: string]: any }; // 用户页面配置本地缓存
+  setUserPageConfig?: (config: { [key: string]: any }) => void; // 更新用户页面配置本地缓存
+  resetUserPageConfig?: () => void; // 重置用户页面配置本地缓存
 }
 
 interface ActTableStat {
@@ -154,36 +157,47 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   // 获取标签选项
-  getTabsOptions = () => {
-    const { ltmplConfig, criteriaData } = this.props;
+  getTabsOptions = async () => {
+    const { ltmplConfig, criteriaData, sourceId } = this.props;
     const { translate } = this.context;
-    if (!ltmplConfig?.split2TabCriterias) {
+    const { split2TabCriterias, showSplitTabDataCount } = ltmplConfig || {};
+    if (!split2TabCriterias) {
       return;
     }
     const allIds = [];
-    const options = ltmplConfig.split2TabCriterias.map(fieldConfig => {
+    let groupCount = [];
+    if (showSplitTabDataCount) {
+      groupCount = await HcserviceV3.getLtmplDataGroupCount(sourceId);
+    }
+    const options = split2TabCriterias.map(fieldConfig => {
       const id = `c_${fieldConfig.id}`;
       allIds.push(id);
       if (enumTypes.includes(fieldConfig.controlType || fieldConfig.extControlType)) {
         const items = HCDataSource.getEnums(fieldConfig.mstrucId);
-        const options = items.map((item) => ({
-          label: <span style={{ padding: "0 10px" }}>{translate("${" + item.title + "}")}</span>,
-          key: item.value,
-          id,
-          title: translate("${" + item.title + "}"),
-          value: item.value
-        }));
+        const options = items.map((item) => {
+          const count = groupCount.find(r => r[0]?.fieldId === fieldConfig.id && r[0]?.value === item.title)?.[1]?.value;
+          const countVal = (count || count === 0) ? ` (${count})` : "";
+          return {
+            label: <span style={{ padding: "0 10px" }}>{translate("${" + item.title + "}")}{countVal}</span>,
+            key: item.value,
+            id,
+            title: translate("${" + item.title + "}") + countVal,
+            value: item.value
+          };
+        });
         if (fieldConfig.relDeduplication && fieldConfig.exceptCodes?.length) {
           return options.filter(item => !fieldConfig.exceptCodes.includes(item.key));
         }
         return options;
       }
       if ([fieldConfig.controlType, fieldConfig.extControlType].includes("single-checkbox")) {
+        const count = groupCount.find(r => r[0]?.fieldId === fieldConfig.id)?.[1]?.value;
+        const countVal = (count || count === 0) ? ` (${count})` : "";
         return [{
-          label: <span style={{ padding: "0 10px" }}>{translate("${" + fieldConfig.title + "}")}</span>,
+          label: <span style={{ padding: "0 10px" }}>{translate("${" + fieldConfig.title + "}")}{countVal}</span>,
           key: "1",
           id,
-          title: translate("${" + fieldConfig.title + "}"),
+          title: translate("${" + fieldConfig.title + "}") + countVal,
           value: "1",
         }];
       }
@@ -208,7 +222,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   ) => {
     const {
       sourceId, criteriaData, ltmplConfig,
-      mainCode, level, pageNo, pageSize, serverKey, defShowType
+      mainCode, level, pageNo, pageSize, serverKey, defShowType, userPageConfig
     } = this.props;
 
     if (!this.isSameSourceQuery(sourceId, criteriaData)) {
@@ -219,10 +233,12 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     if (!ltmplConfig) {
       return;
     }
-
+    // 处理菜单切换，查询条件清空，重置tab拆解条件选中项
+    const tabActiveKey = ltmplConfig.split2TabCriterias?.find(r => criteriaData[`c_${r.id}`])?.id;
     this.setState({
       loading: true,
       userCriteriaData: criteriaData,
+      tabActiveKey: tabActiveKey ? criteriaData[`c_${tabActiveKey}`] : "all"
     });
     let disabledColIds: string[] = [];
     let hiddenColIds_ = [...hiddenColIds];
@@ -258,11 +274,11 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     const { defaultPageSize, showType } = ltmplConfig;
 
     let pageInfo = {
-      pageNo: pageNo ? pageNo : 1,
-      pageSize: pageSize ? pageSize : defaultPageSize ? defaultPageSize : 10,
+      pageNo: pageNo || 1,
+      pageSize: pageSize || defaultPageSize || 10,
       virtualEndPageNo: undefined,
     };
-    const viewModels = this.state.viewModels.length > 0 ? this.state.viewModels : [defShowType || showType || "table"];
+    const viewModels = this.state.viewModels.length > 0 ? this.state.viewModels : (userPageConfig?.["viewModels"] || [defShowType || showType || "table"]);
 
     /** 构建 dataSource **/
     //构建过滤条件
@@ -449,7 +465,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
 
   async componentDidMount() {
-    const { ltmplConfig, tableType } = this.props;
+    const { ltmplConfig, tableType, userPageConfig } = this.props;
+    const { sortedColIds } = userPageConfig || {};
     const { translate } = this.context;
     let sortedColConfigs = undefined;
     if (ltmplConfig) {
@@ -458,13 +475,16 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         { id: "20000", title: translate("${隐藏}"), originalId: "20000" },
         ...ltmplConfig.columns,
       ];
+      if (sortedColIds) { // 使用缓存的列排序
+        sortedColConfigs.sort((a, b) => sortedColIds.indexOf(a.id) - sortedColIds.indexOf(b.id));
+      }
+      this.loadData(userPageConfig?.hiddenColIds || defaultDisabledColIds, [], sortedColConfigs);
     }
     this.getTabsOptions();
-    this.loadData(defaultDisabledColIds, [], sortedColConfigs);
   }
 
   async componentDidUpdate(prevProps, prevState) {
-    const { sourceId, criteriaData, ltmplConfig, tableType, pageSize, pageNo } = this.props;
+    const { sourceId, criteriaData, ltmplConfig, tableType, pageSize, pageNo, userPageConfig } = this.props;
     // const {userCriteriaData:preUserCriteriaData}=prevState;
     const { userCriteriaData } = this.state;
     const { translate } = this.context;
@@ -504,16 +524,18 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         await this.loadData(hiddenColIds, [], sortedColConfigs);
       } else {
         let sColConfigs = undefined;
+        const { sortedColIds } = userPageConfig || {};
         if (ltmplConfig) {
-          sColConfigs = tableType == "report" ? ltmplConfig.columns : [
+          sColConfigs = tableType == 'report' ? ltmplConfig.columns : [
             { id: "10000", title: translate("${排序}"), originalId: "10000" },
             { id: "20000", title: translate("${隐藏}"), originalId: "20000" },
             ...ltmplConfig.columns,
-
           ];
+          if (sortedColIds) { // 使用缓存的列排序
+            sColConfigs.sort((a, b) => sortedColIds.indexOf(a.id) - sortedColIds.indexOf(b.id));
+          }
         }
-        this.setState({ viewModels: [ltmplConfig?.showType || "table"] });
-        await this.loadData(defaultDisabledColIds, [], sColConfigs);
+        await this.loadData(userPageConfig?.hiddenColIds || defaultDisabledColIds, [], sColConfigs);
       }
 
     } else {
@@ -559,7 +581,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   changeViewModel = (viewModels) => {
+    const { setUserPageConfig } = this.props;
     const { hiddenColIds, hiddenRowCodes, sortedColConfigs, viewModels: oldViewModels } = this.state;
+    setUserPageConfig({ viewModels });
     this.setState({ viewModels }, () => {
       if (viewModels.length && viewModels.includes("ganttChart") !== oldViewModels.includes("ganttChart")) {
         this.loadData(hiddenColIds, hiddenRowCodes, sortedColConfigs); // 前后选择是否存在甘特图，刷新数据
@@ -568,10 +592,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   changeHiddenColumns = (hiddenColIds: string[]) => {
-    this.setState({
-      showL2Chart: false,
-      hiddenColIds,
-    });
+    const { setUserPageConfig } = this.props;
+    this.setState({ showL2Chart: false, hiddenColIds });
+    setUserPageConfig({ hiddenColIds });
   };
 
   doSelectedAction = async (actionId: string, codes, params: object) => {
@@ -841,11 +864,19 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
   onChangeColSort = (sortedColConfigs: ColumnConfig[]) => {
-    this.setState({
-      sortedColConfigs,
-    });
+    const { setUserPageConfig } = this.props;
+    this.setState({ sortedColConfigs });
+    const sortedColIds = sortedColConfigs.map(r => r.id);
+    setUserPageConfig({ sortedColIds });
   };
 
+  // 更新本地缓存列宽度
+  onChangeResize = (colResize: { [key: string]: number }) => {
+    const { setUserPageConfig, userPageConfig } = this.props;
+    const oldColResize = userPageConfig?.colResize || {};
+    setUserPageConfig({ colResize: { ...oldColResize, ...colResize } });
+  }
+
   getAddTmplButton = (classAddConfigs: ClassAddConfig[]) => {
     const { translate } = this.context;
     if (classAddConfigs && classAddConfigs.length < 1) {
@@ -866,6 +897,22 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     });
   };
 
+  // 重置当前页面配置
+  handleResetUserPageConfig = () => {
+    const { resetUserPageConfig, ltmplConfig, tableType, defShowType } = this.props;
+    const { translate } = this.context;
+    let sortedColConfigs = undefined;
+    if (ltmplConfig) {
+      sortedColConfigs = tableType === 'report' ? ltmplConfig.columns : [
+        { id: "10000", title: translate("${排序}"), originalId: "10000" },
+        { id: "20000", title: translate("${隐藏}"), originalId: "20000" },
+        ...ltmplConfig.columns,
+      ];
+    }
+    this.setState({ viewModels: [defShowType || ltmplConfig.showType || "table"], hiddenColIds: defaultDisabledColIds, sortedColConfigs });
+    resetUserPageConfig();
+  }
+
   renderHeaderButtons = () => {
     let {
       hiddenColIds, viewModels, sortedColConfigs, disabledColIds, showL2Chart,
@@ -873,7 +920,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     } = this.state;
     const {
       ltmplConfig, sourceId, doCreate, doSearch, menuId,
-      funcMode, customCreatable, serverKey, readOnly,
+      funcMode, customCreatable, serverKey, readOnly, userPageConfig
     } = this.props;
     const { translate } = this.context;
     let { buttons } = ltmplConfig;
@@ -882,6 +929,13 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     return (
       <>
         <Space>
+          {userPageConfig ? // 本地缓存重置按钮
+            <Tooltip title={translate("${重置}")}>
+              <Button onClick={() => this.handleResetUserPageConfig()}>
+                <SyncOutlined />
+              </Button>
+            </Tooltip>
+            : ""}
           {funcMode == "common" && this.criteriaFormUseful() ? (
             <Popover trigger="click" content={this.renderCriteriaForm()}>
               <Button>
@@ -1371,7 +1425,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       mainCode, sourceId, ltmplConfig, funcMode, operatable,
       title, collapsible,
       onChangePage, serverKey, criteriaData,
-      showView, doEdit, doRAction, customEditable, readOnly, tableType, showPagination, showAggregates
+      showView, doEdit, doRAction, customEditable, readOnly, tableType, showPagination, showAggregates, userPageConfig
     } = this.props;
     const { translate } = this.context;
 
@@ -1396,7 +1450,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         blockMenuTreeDrawerOpen: this.blockMenuTreeDrawerOpen,
         doRowAction: this.doRowAction, doDeleteByCode: this.doDeleteByCode, sortColumns: criteriaData["sortColIds"],
         editings, editRowEdit: this.editRowEdit, cancelRowEdit: this.cancelRowEdit, saveRowData: this.saveRowData,
-        doDelModalOpen: this.doDelModalOpen, mainCode, criteriaData: userCriteriaData, actTableDoSearch: this.actTableDoSearch
+        doDelModalOpen: this.doDelModalOpen, mainCode, criteriaData: userCriteriaData, actTableDoSearch: this.actTableDoSearch,
+        columnResize: userPageConfig?.colResize
       }
     );
 
@@ -1435,6 +1490,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       selectedRows={selectedRows} queryKey={queryKey}
       onChangeRowSelection={this.changeRowSelection}
       leftFixedCols={ltmplConfig.leftFixedCols}
+      onChangeResize={this.onChangeResize}
     /> :
       <QueryTable key={"querytable" + sourceId} sourceId={sourceId}
         // queryTotal={this.queryTotal}
@@ -1464,6 +1520,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         showView={showView}
         showPagination={showPagination}
         onChangeAggregateVO={(val) => this.setState({ aggregateVO: val })}
+        onChangeResize={this.onChangeResize}
       />);
 
     // tab拆解条件渲染

package/src/aldehyde/table/column/column-builder.tsx

@@ -54,7 +54,8 @@ interface ColumnBuilderProps extends ActionRenderProps {
     operatable?: boolean,
     mainCode?: string,
     criteriaData?: object,
-    actTableDoSearch?: (data: object) => void
+    actTableDoSearch?: (data: object) => void,
+    columnResize?: { [key: string]: number }
 }
 
 interface ReportColumnBuilderProps {
@@ -78,7 +79,8 @@ export default {
             sortedColConfigs, unHiden,
             onHide, translate,
             sortColumns, serverKey,
-            editings, mainCode, criteriaData, actTableDoSearch, showView
+            editings, mainCode, criteriaData, actTableDoSearch, showView,
+            columnResize
         } = props;
 
         const { primaryColumn, primaryColumnLabel } = ltmplConfig
@@ -247,6 +249,9 @@ export default {
                 </div>);
                 column["filteredValue"] = searchVal || undefined;
             }
+            if (columnResize?.[item.id]) { // 本地缓存存在列宽配置
+                column["width"] = columnResize[item.id];
+            }
         });
         return tableColumns;
     },

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

@@ -433,7 +433,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       cardListConfig,
       ltmplConfig,
       showView,
-      showPagination
+      showPagination,
+      onChangeResize
     } = this.props;
     //debugger
     const { touchEnd, aggregateVO, loading, virtualEndPageNo, dataSource, errorText } = this.state;
@@ -592,6 +593,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                 }
               }
             } : undefined}
+            onChangeResize={onChangeResize}
           />
         ) : (
           ""

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

@@ -7,13 +7,11 @@ import ColumnBuilder from "./column/column-builder";
 import ResizableTable from "./resizable-table";
 
 const ReportTable = (props: ReportTableProps) => {
-
     const [loading, setLoading] = useState<boolean>(false);
     const [dataSource, setDataSource] = useState<object[]>(undefined);
     const [reportData, setReportData] = useState<ReportData>(undefined);
-
     const { getServiceLangStr, translate } = useLocale();
-    const { tableProps, columns, queryKey, serverKey, leftFixedCols, hiddenColIds } = props
+    const { tableProps, columns, queryKey, serverKey, leftFixedCols, hiddenColIds, onChangeResize } = props
 
     useEffect(() => {
         const queryData = async () => {
@@ -118,7 +116,9 @@ const ReportTable = (props: ReportTableProps) => {
         }
         bordered
         pagination={false}
-        style={{ display: columns ? "block" : "none", marginBottom: "12px" }}></ResizableTable>
+        style={{ display: columns ? "block" : "none", marginBottom: "12px" }}
+        onChangeResize={onChangeResize}
+    />
 }
 
 export default ReportTable;

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

@@ -1,7 +1,8 @@
-import React, {useEffect, useState} from 'react';
-import {Table} from "antd";
+import React, { useEffect, useState } from 'react';
+import { Table } from "antd";
 import { Resizable } from 'react-resizable';
 import "./index.css";
+
 const ResizableTitle = props => {
     const { onResize, width, ...restProps } = props;
     // useEffect(() => {
@@ -26,7 +27,7 @@ const ResizableTitle = props => {
     return (
         <Resizable draggableOpts={{ enableUserSelectHack: false }}
             width={width}
-                   minConstraints={[40, 0]}
+            minConstraints={[40, 0]}
             height={0}    // 不需要调整高度，设为 0
             onResize={onResize}
             handle={
@@ -42,7 +43,7 @@ const ResizableTitle = props => {
 
 const ResizableTable = props => {
 
-    const {columns:columns_,components:components_,...other}=props
+    const { columns: columns_, components: components_, onChangeResize, ...other } = props
     // const [columns, setColumns] = useState(columns_.map((col) => {
     //         col['onHeaderCell']=(col) => ({
     //             ...col['onHeaderCell'],
@@ -53,22 +54,22 @@ const ResizableTable = props => {
     // }
     // ));
 
-     const [columns, setColumns] = useState([]);
+    const [columns, setColumns] = useState([]);
     // 每一列增加 width, onResize 作为 ResizableTitle 的 props
 
     useEffect(() => {
-       columns_.forEach((col) => (
-           col['onHeaderCell']=(col) => ({
-               width: col.width,
-               onResize: handleResize(col.dataIndex),
-           })
-           )
+        columns_.forEach((col) => (
+            col['onHeaderCell'] = (col) => ({
+                width: col.width,
+                onResize: handleResize(col.dataIndex),
+            })
+        )
         );
         setColumns(columns_);
     }, [columns_]);
 
     // 拖动时更新表格列
-   let handleResize = dataIndex => (e, { size }) => {
+    let handleResize = dataIndex => (e, { size }) => {
         setColumns((columns) => (
             columns.map((column) => {
                 if (column.dataIndex === dataIndex) {
@@ -80,16 +81,16 @@ const ResizableTable = props => {
                     return column;
                 }
             })
-        ))
+        ));
+        onChangeResize && onChangeResize({ [dataIndex]: size.width }); // 列尺寸缓存本地
     };
 
-    const components={...components_,
-        header: {
-            cell: ResizableTitle
-        }
+    const components = {
+        ...components_,
+        header: { cell: ResizableTitle }
     }
 
-    return <Table components={components}  columns={columns}  {...other}   size="small" />;
+    return <Table components={components} columns={columns}  {...other} size="small" />;
 }
 
 export default ResizableTable;