aldehyde 0.2.438 → 0.2.440

package/src/aldehyde/table/page-config-button.tsx

@@ -28,6 +28,7 @@ const Index = (props: Props) => {
     const { translate } = useLocale();
     const { token } = useToken();
     const [form] = Form.useForm();
+    const menuRef = useRef(null);
 
     // 设置默认配置
     const setPageConfigDefault = async () => {
@@ -78,6 +79,7 @@ const Index = (props: Props) => {
                     okText={translate("${确定}")}
                     cancelText={translate("${取消}")}
                     okType={"danger"}
+                    getPopupContainer={() => menuRef.current}
                 >
                     <Tooltip title={translate("${更新}")}><UploadOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorPrimary }} /></Tooltip>
                 </Popconfirm>
@@ -91,12 +93,13 @@ const Index = (props: Props) => {
                     okText={translate("${确定}")}
                     cancelText={translate("${取消}")}
                     okType={"danger"}
+                    getPopupContainer={() => menuRef.current}
                 >
                     <Tooltip title={translate("${拉取云端默认配置}")}><DownloadOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorPrimary }} /></Tooltip>
                 </Popconfirm> : ""}
                 {key !== "default" ?
                     <>
-                        <Popover placement="bottom" open={editOpen && currentKey === item.key} destroyOnHidden={true} onOpenChange={(val) => { setEditOpen(val); form.setFieldValue("name", val ? item.name : undefined); }} zIndex={9999} content={renderAddForm} trigger="click">
+                        <Popover placement="bottom" open={editOpen && currentKey === item.key} destroyOnHidden={true} onOpenChange={(val) => { setEditOpen(val); val ? form.setFieldValue("name", item.name) : form.resetFields(); }} zIndex={9999} content={renderAddForm} trigger="click" getPopupContainer={() => menuRef.current} >
                             <Tooltip title={translate("${编辑}")}>
                                 <EditOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorPrimary }} />
                             </Tooltip>
@@ -111,6 +114,7 @@ const Index = (props: Props) => {
                             okText={translate("${确定}")}
                             cancelText={translate("${取消}")}
                             okType={"danger"}
+                            getPopupContainer={() => menuRef.current}
                         >
                             <Tooltip title={translate("${删除}")}><DeleteOutlined onClick={(e) => onClickOperation(e, item)} className="page-config-menu-item-icon" style={{ color: token.colorError }} /></Tooltip>
                         </Popconfirm>
@@ -177,14 +181,14 @@ const Index = (props: Props) => {
     </Form>;
 
     return <Dropdown trigger={["click"]} menu={{ items: [renderMenuItem({ key: "default", name: "默认" }), ...menus.map(r => renderMenuItem({ ...r, key: r.recordCode }))].filter(Boolean) }} popupRender={(menu) => (
-        <div style={contentStyle}>
+        <div style={contentStyle} ref={menuRef}>
             {React.cloneElement(menu as any, { style: { boxShadow: 'none' } },)}
             <Divider style={{ margin: 0 }} />
             <div style={{ padding: "4px", display: "flex", justifyContent: "space-between", alignItems: "center" }}>
                 <Tooltip title={translate("${重置}")}>
                     <Button onClick={handleResetUserPageConfig} icon={<SyncOutlined />} />
                 </Tooltip>
-                <Popover placement="bottomRight" destroyOnHidden={true} open={addOpen} onOpenChange={setAddOpen} getPopupContainer={(val) => val} zIndex={9999} content={renderAddForm} trigger="click">
+                <Popover placement="bottomRight" destroyOnHidden={true} open={addOpen} onOpenChange={(val => { setCurrentKey(undefined); setAddOpen(val); })} getPopupContainer={(val) => val} zIndex={9999} content={renderAddForm} trigger="click">
                     <Tooltip title={translate("${添加我的菜单}")}><Button disabled={menus?.length > 4} icon={<PlusOutlined />} /></Tooltip>
                 </Popover>
             </div>

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

@@ -64,6 +64,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     cardListConfig: {},
     ltmplConfig: {},
     showPagination: true,
+    showEmpty: true,
   };
 
   defaultAggregateShowSize = 7;
@@ -153,7 +154,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     this.setState({ loading: true, errorText: undefined });
     let { queryDataCache } = this.state;
     const { translate } = this.context;
-    let { serverKey, tableProps, viewModels, ltmplConfig } = this.props;
+    let { serverKey, tableProps, viewModels, ltmplConfig, loadDataCallback } = this.props;
     let queryCache: Map<string, CacheData>;
     if (cleanCache || !queryDataCache) {
       queryCache = new Map<string, CacheData>();
@@ -214,6 +215,10 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           loading: false,
         });
 
+        if (loadDataCallback) { // 请求数据回调函数
+          loadDataCallback(dataSource);
+        }
+
         if (!tableProps.clickDisplayTotal) {
           await this.queryTotal();
         }
@@ -436,7 +441,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       showPagination,
       onChangeResize,
       pageSizeOptions,
-      onChangePage
+      onChangePage,
+      showEmpty
     } = this.props;
     //debugger
     const { touchEnd, aggregateVO, loading, virtualEndPageNo, dataSource, errorText } = this.state;
@@ -596,6 +602,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
               }
             } : undefined}
             onChangeResize={onChangeResize}
+            showEmpty={showEmpty}
           />
         ) : (
           ""

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

@@ -7,6 +7,7 @@ import ColumnBuilder from "./column/column-builder";
 import ResizableTable from "./resizable-table";
 
 const ReportTable = (props: ReportTableProps) => {
+    const { showEmpty = true } = props;
     const [loading, setLoading] = useState<boolean>(false);
     const [dataSource, setDataSource] = useState<object[]>(undefined);
     const [reportData, setReportData] = useState<ReportData>(undefined);
@@ -118,6 +119,7 @@ const ReportTable = (props: ReportTableProps) => {
         pagination={false}
         style={{ display: columns ? "block" : "none", marginBottom: "12px" }}
         onChangeResize={onChangeResize}
+        showEmpty={showEmpty}
     />
 }
 

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

@@ -43,7 +43,7 @@ const ResizableTitle = props => {
 
 const ResizableTable = props => {
 
-    const { columns: columns_, components: components_, onChangeResize, ...other } = props
+    const { columns: columns_, components: components_, onChangeResize, showEmpty, ...other } = props
     // const [columns, setColumns] = useState(columns_.map((col) => {
     //         col['onHeaderCell']=(col) => ({
     //             ...col['onHeaderCell'],
@@ -90,7 +90,7 @@ const ResizableTable = props => {
         header: { cell: ResizableTitle }
     }
 
-    return <Table components={components} columns={columns}  {...other} size="small" />;
+    return <Table components={components} columns={columns}  {...other} locale={showEmpty !== false ? undefined : { emptyText: false }} size="small" />;
 }
 
 export default ResizableTable;

package/src/aldehyde/tmpl/interface.tsx

@@ -47,6 +47,7 @@ export interface ReportTableProps {
   ) => void;
   queryKey: QueryKey;
   onChangeResize?: (value: { [key: string]: number }) => void; // 表格列尺寸更新
+  showEmpty?: boolean;
 }
 
 export interface CardListConfig {
@@ -94,6 +95,8 @@ export interface QueryTableProps extends ReportTableProps {
   onChangeAggregateVO?: (aggregateVO: AggregateVO) => void;
   onChangeResize?: (value: { [key: string]: number }) => void; // 表格列尺寸更新
   pageSizeOptions?: number[]; // 分页数配置
+  showEmpty?: boolean; // 是否显示空状态
+  loadDataCallback?: (val: object[]) => void; // 请求数据回调函数
 }
 
 export interface AggregateVO {