aldehyde 0.2.510 → 0.2.512

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

@@ -48,6 +48,7 @@ interface SelectTableStat {
     drawCode?: string;
     showEdit?: boolean;
     ltmplConfig?: LtmplConfig;
+    userPageConfig?: { [key: string]: any };  // 列宽等配置本地缓存
 };
 
 let serial_number = new Date().getTime();
@@ -75,6 +76,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         drawCode: undefined,
         showEdit: false,
         ltmplConfig: undefined,
+        userPageConfig: undefined
     }
 
     loadData = async (selectConfig: SelectConfig, criteriaData: { [key: string]: any }, npageNo?: number) => {
@@ -110,6 +112,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         let criteriaData = {};
         let search = location.search;
         const ltmplConfig = await this.loadConfig();
+        this.getUserPageConfig();
         if (this.getIsPopoverTable()) {
             const defSearch = ltmplConfig.criteria?.map(r => r.defaultValue ? `c_${r.id}=${r.defaultValue}` : false)?.filter(Boolean)?.join("&");
             // 自定义页面中使用组件选择表格，设置默认查询条件（当前search只有menuId：页面初始化）
@@ -464,10 +467,38 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         }
     };
 
+    // 获取当前selectTable缓存配置
+    getUserPageConfig = async () => {
+        const { sourceId } = this.props;
+        const config = await Units.getUserPageConfig(sourceId);
+        this.setState({ userPageConfig: config });
+    };
+
+    // 设置当前selectTable缓存配置
+    setUserPageConfig = (config: { [key: string]: any }) => {
+        const { sourceId } = this.props;
+        const temConfig = Units.setUserPageConfig(sourceId, config);
+        this.setState({ userPageConfig: temConfig });
+    };
+
+    // 重置当前selectTable本地缓存配置
+    resetUserPageConfig = () => {
+        const { sourceId } = this.props;
+        Units.resetUserPageConfig(sourceId);
+        this.setState({ userPageConfig: undefined });
+    }
+
+    // 更新本地缓存列宽度
+    onChangeResize = (colResize: { [key: string]: number }) => {
+        const { userPageConfig } = this.state;
+        const oldColResize = userPageConfig?.colResize || {};
+        this.setUserPageConfig({ colResize: { ...oldColResize, ...colResize } });
+    }
+
 
     render() {
         let { maxSelectedRows, selectedRows, selectedDatas, serverKey, sourceId, mainCode, fieldConfig, funcMode, onClosePopover } = this.props;
-        let { queryKey, columns, selectConfig, criteriaData, loading, pageNo, pageSize, showView, drawCode, showEdit, ltmplConfig } = this.state;
+        let { queryKey, columns, selectConfig, criteriaData, loading, pageNo, pageSize, showView, drawCode, showEdit, ltmplConfig, userPageConfig } = this.state;
         const { translate } = this.context;
         if (!selectConfig) {
             return <>
@@ -485,6 +516,11 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
 
         const addAction = actions?.includes("add") ? [{ id: "add", buttonType: 'primary', title: translate("${添加}"), defDisabled: false, onClick: () => { this.editItem() } }] : [];
         const closePopover = onClosePopover ? [{ id: "closePopover", buttonType: 'primary', title: translate("${确认}"), defDisabled: false, onClick: () => onClosePopover() }] : [];
+        const temColumns = columns.map(item => {
+            const itemWidth = userPageConfig?.colResize?.[item.dataIndex];
+            // 本地缓存存在列宽配置
+            return itemWidth ? { ...item, width: itemWidth } : item;
+        });
 
         // debugger
         return (
@@ -508,12 +544,13 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
                             doSearch={this.doSearch} loading={loading}
                             doCustomButton={this.doCustomButton}
                             doAction={this.doSelectedAction}
+                            resetUserPageConfig={userPageConfig ? this.resetUserPageConfig : undefined}
                         />
                     </div> : null}
                 <QueryTable key={"QueryTable" + sourceId} serverKey={serverKey} maxSelectedRows={maxSelectedRows ? maxSelectedRows : selectConfig.maxSelectedRows}
                     selectedRows={selectedRows}
                     primaryColumn={selectConfig.primaryColumn}
-                    columns={columns}
+                    columns={temColumns}
                     pageInfo={{
                         pageNo,
                         pageSize: pageSize ? pageSize : selectConfig.defaultPageSize
@@ -524,6 +561,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
                     sortColumnData={[]}
                     doSearch={this.doSearch}
                     loadDataCallback={() => this.setState({ loading: false })}
+                    onChangeResize={this.onChangeResize}
                 />
                 {showView && drawCode ? (
                     <DtmplViewDrawer