aldehyde 0.2.479 → 0.2.481

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

@@ -1,126 +1,126 @@
-import React, { useEffect, useState } from 'react'
-import "./index.css"
-import { ReportData, ReportTableProps } from "../tmpl/interface";
-import HcserviceV3 from "../tmpl/hcservice-v3";
-import { useLocale } from "../locale/useLocale";
-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);
-    const { getServiceLangStr, translate } = useLocale();
-    const { tableProps, columns, queryKey, serverKey, leftFixedCols, hiddenColIds, onChangeResize } = props
-
-    useEffect(() => {
-        const queryData = async () => {
-            if (queryKey) {
-                await loadData(queryKey.key, serverKey);
-            }
-        };
-        queryData()
-    }, [queryKey?.key]);
-
-
-
-    const loadData = async (
-        queryKey: string, serverKey: string
-    ) => {
-        setLoading(true);
-        let reportData: ReportData = await HcserviceV3.requestQueryReportData(
-            serverKey,
-            queryKey, getServiceLangStr()
-        );
-        if (reportData?.key != queryKey) {
-            return;
-        } else {
-            let dataSource: object[] = [];
-            if (reportData.entities) {
-                reportData.entities.forEach((item, index) => {
-                    if (item) {
-                        let row = {
-                            key: item.code,
-                            code: item.code, //增加code,为了删除操作
-                            ...item.fieldMap,
-                            index,
-                        };
-                        dataSource.push(row);
-                    }
-                });
-            }
-
-            setDataSource(dataSource);
-            setReportData(reportData);
-            setLoading(false);
-        }
-    }
-    const addColumnOnCell = (current_cols, hiddenColIds: string[]) => {
-        if (!reportData) {
-            return;
-        }
-        const { rowGrids } = reportData
-        current_cols.forEach((c) => {
-            debugger
-            if (rowGrids) {
-                c.onCell = (record, index) => {
-                    let rowGrid = rowGrids[record.code];
-                    if (rowGrid && rowGrid.cellMap) {
-                        if (rowGrid.cellMap[c.dataIndex]) {
-                            let a = {
-                                ...rowGrid.cellMap[c.dataIndex]
-                            }
-                            if (a.colSpan > 1) {
-                                let hiddenDim = 0;
-                                if (hiddenColIds) {
-                                    debugger
-                                    hiddenColIds.forEach(id => {
-                                        if (rowGrid.cellMap[id]) {
-                                            hiddenDim++;
-                                        }
-                                    })
-                                }
-                                return { colSpan: a.colSpan - hiddenDim, rowSpan: 1 }
-                            } else {
-                                return a;
-                            }
-                        } else {
-                            return { colSpan: 1, rowSpan: 1 }
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-    let current_cols = reportData?.columnConfigs ? ColumnBuilder.buildReportTableColumns({ columnConfigs: [...reportData.columnConfigs], translate, leftFixedCols, hiddenColIds }) : columns;
-    let table_x = 20;
-
-    current_cols.forEach((c) => {
-        table_x = table_x + (c.width ? c.width : 140);
-    });
-    addColumnOnCell(current_cols, hiddenColIds);
-
-    return <ResizableTable
-        size={tableProps?.size ? tableProps.size : undefined}
-        loading={loading}
-        columns={current_cols}
-        dataSource={dataSource}
-        scroll={
-            tableProps?.scrollY == -1 || tableProps?.scrollY == 0
-                ? null
-                : {
-                    y: tableProps?.scrollY,
-                    x: table_x,
-                }
-        }
-        bordered
-        pagination={false}
-        style={{ display: columns ? "block" : "none", marginBottom: "12px" }}
-        onChangeResize={onChangeResize}
-        showEmpty={showEmpty}
-    />
-}
-
+import React, { useEffect, useState } from 'react'
+import "./index.css"
+import { ReportData, ReportTableProps } from "../tmpl/interface";
+import HcserviceV3 from "../tmpl/hcservice-v3";
+import { useLocale } from "../locale/useLocale";
+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);
+    const { getServiceLangStr, translate } = useLocale();
+    const { tableProps, columns, queryKey, serverKey, leftFixedCols, hiddenColIds, onChangeResize } = props
+
+    useEffect(() => {
+        const queryData = async () => {
+            if (queryKey) {
+                await loadData(queryKey.key, serverKey);
+            }
+        };
+        queryData()
+    }, [queryKey?.key]);
+
+
+
+    const loadData = async (
+        queryKey: string, serverKey: string
+    ) => {
+        setLoading(true);
+        let reportData: ReportData = await HcserviceV3.requestQueryReportData(
+            serverKey,
+            queryKey, getServiceLangStr()
+        );
+        if (reportData?.key != queryKey) {
+            return;
+        } else {
+            let dataSource: object[] = [];
+            if (reportData.entities) {
+                reportData.entities.forEach((item, index) => {
+                    if (item) {
+                        let row = {
+                            key: item.code,
+                            code: item.code, //增加code,为了删除操作
+                            ...item.fieldMap,
+                            index,
+                        };
+                        dataSource.push(row);
+                    }
+                });
+            }
+
+            setDataSource(dataSource);
+            setReportData(reportData);
+            setLoading(false);
+        }
+    }
+    const addColumnOnCell = (current_cols, hiddenColIds: string[]) => {
+        if (!reportData) {
+            return;
+        }
+        const { rowGrids } = reportData
+        current_cols.forEach((c) => {
+            debugger
+            if (rowGrids) {
+                c.onCell = (record, index) => {
+                    let rowGrid = rowGrids[record.code];
+                    if (rowGrid && rowGrid.cellMap) {
+                        if (rowGrid.cellMap[c.dataIndex]) {
+                            let a = {
+                                ...rowGrid.cellMap[c.dataIndex]
+                            }
+                            if (a.colSpan > 1) {
+                                let hiddenDim = 0;
+                                if (hiddenColIds) {
+                                    debugger
+                                    hiddenColIds.forEach(id => {
+                                        if (rowGrid.cellMap[id]) {
+                                            hiddenDim++;
+                                        }
+                                    })
+                                }
+                                return { colSpan: a.colSpan - hiddenDim, rowSpan: 1 }
+                            } else {
+                                return a;
+                            }
+                        } else {
+                            return { colSpan: 1, rowSpan: 1 }
+                        }
+                    }
+                }
+            }
+        });
+    }
+
+    let current_cols = reportData?.columnConfigs ? ColumnBuilder.buildReportTableColumns({ columnConfigs: [...reportData.columnConfigs], translate, leftFixedCols, hiddenColIds }) : columns;
+    let table_x = 20;
+
+    current_cols.forEach((c) => {
+        table_x = table_x + (c.width ? c.width : 140);
+    });
+    addColumnOnCell(current_cols, hiddenColIds);
+
+    return <ResizableTable
+        size={tableProps?.size ? tableProps.size : undefined}
+        loading={loading}
+        columns={current_cols}
+        dataSource={dataSource}
+        scroll={
+            tableProps?.scrollY == -1 || tableProps?.scrollY == 0
+                ? null
+                : {
+                    y: tableProps?.scrollY,
+                    x: table_x,
+                }
+        }
+        bordered
+        pagination={false}
+        style={{ display: columns ? "block" : "none", marginBottom: "12px" }}
+        onChangeResize={onChangeResize}
+        showEmpty={showEmpty}
+    />
+}
+
 export default ReportTable;

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

@@ -1,97 +1,97 @@
-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(() => {
-    //     // 使用选择器，获取所有拖动按钮的 Dom 对象
-    //     document.querySelectorAll('.react-resizable-handle').forEach((elem) => {
-    //         if (elem['onclick']) {
-    //             return;
-    //         }
-    //         elem['onclick'] = (event) => {
-    //             // 阻止冒泡
-    //             event.stopPropagation();
-    //             return false;
-    //         };
-    //     });
-    // }, []);
-
-    // 没有原始宽度的列，不支持伸缩；会出现从自适应宽度一下子跳到拖动位置；也可以自行增加参数，如 disableResize
-    if (!width) {
-        return <th {...restProps} />;
-    }
-
-    return (
-        <Resizable draggableOpts={{ enableUserSelectHack: false }}
-            width={width}
-            minConstraints={[40, 0]}
-            height={0}    // 不需要调整高度，设为 0
-            onResize={onResize}
-            handle={
-                <span className="react-resizable-handle" onClick={(e) => { e.stopPropagation() }} />
-            }
-        >
-            <th {...restProps} />
-        </Resizable>
-    );
-};
-
-
-
-const ResizableTable = props => {
-
-    const { columns: columns_, components: components_, onChangeResize, showEmpty, ...other } = props
-    // const [columns, setColumns] = useState(columns_.map((col) => {
-    //         col['onHeaderCell']=(col) => ({
-    //             ...col['onHeaderCell'],
-    //             width: col.width,
-    //             onResize: handleResize(col.dataIndex),
-    //         })
-    //         return col;
-    // }
-    // ));
-
-    const [columns, setColumns] = useState([]);
-    // 每一列增加 width, onResize 作为 ResizableTitle 的 props
-
-    useEffect(() => {
-        columns_.forEach((col) => (
-            col['onHeaderCell'] = (col) => ({
-                width: col.width,
-                onResize: handleResize(col.dataIndex),
-            })
-        )
-        );
-        setColumns(columns_);
-    }, [columns_]);
-
-    // 拖动时更新表格列
-    let handleResize = dataIndex => (e, { size }) => {
-        setColumns((columns) => (
-            columns.map((column) => {
-                if (column.dataIndex === dataIndex) {
-                    return {
-                        ...column,
-                        width: size.width,
-                    };
-                } else {
-                    return column;
-                }
-            })
-        ));
-        onChangeResize && onChangeResize({ [dataIndex]: size.width }); // 列尺寸缓存本地
-    };
-
-    const components = {
-        ...components_,
-        header: { cell: ResizableTitle }
-    }
-
-    return <Table components={components} columns={columns}  {...other} locale={showEmpty !== false ? undefined : { emptyText: false }} size="small" />;
-}
-
-export default ResizableTable;
-
+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(() => {
+    //     // 使用选择器，获取所有拖动按钮的 Dom 对象
+    //     document.querySelectorAll('.react-resizable-handle').forEach((elem) => {
+    //         if (elem['onclick']) {
+    //             return;
+    //         }
+    //         elem['onclick'] = (event) => {
+    //             // 阻止冒泡
+    //             event.stopPropagation();
+    //             return false;
+    //         };
+    //     });
+    // }, []);
+
+    // 没有原始宽度的列，不支持伸缩；会出现从自适应宽度一下子跳到拖动位置；也可以自行增加参数，如 disableResize
+    if (!width) {
+        return <th {...restProps} />;
+    }
+
+    return (
+        <Resizable draggableOpts={{ enableUserSelectHack: false }}
+            width={width}
+            minConstraints={[40, 0]}
+            height={0}    // 不需要调整高度，设为 0
+            onResize={onResize}
+            handle={
+                <span className="react-resizable-handle" onClick={(e) => { e.stopPropagation() }} />
+            }
+        >
+            <th {...restProps} />
+        </Resizable>
+    );
+};
+
+
+
+const ResizableTable = props => {
+
+    const { columns: columns_, components: components_, onChangeResize, showEmpty, ...other } = props
+    // const [columns, setColumns] = useState(columns_.map((col) => {
+    //         col['onHeaderCell']=(col) => ({
+    //             ...col['onHeaderCell'],
+    //             width: col.width,
+    //             onResize: handleResize(col.dataIndex),
+    //         })
+    //         return col;
+    // }
+    // ));
+
+    const [columns, setColumns] = useState([]);
+    // 每一列增加 width, onResize 作为 ResizableTitle 的 props
+
+    useEffect(() => {
+        columns_.forEach((col) => (
+            col['onHeaderCell'] = (col) => ({
+                width: col.width,
+                onResize: handleResize(col.dataIndex),
+            })
+        )
+        );
+        setColumns(columns_);
+    }, [columns_]);
+
+    // 拖动时更新表格列
+    let handleResize = dataIndex => (e, { size }) => {
+        setColumns((columns) => (
+            columns.map((column) => {
+                if (column.dataIndex === dataIndex) {
+                    return {
+                        ...column,
+                        width: size.width,
+                    };
+                } else {
+                    return column;
+                }
+            })
+        ));
+        onChangeResize && onChangeResize({ [dataIndex]: size.width }); // 列尺寸缓存本地
+    };
+
+    const components = {
+        ...components_,
+        header: { cell: ResizableTitle }
+    }
+
+    return <Table components={components} columns={columns}  {...other} locale={showEmpty !== false ? undefined : { emptyText: false }} size="small" />;
+}
+
+export default ResizableTable;
+