aldehyde 0.2.514 → 0.2.516

package/src/aldehyde/routable/ttmpl-table-route.tsx

@@ -0,0 +1,390 @@
+import React, { useEffect, useState, useMemo } from "react";
+import { useParams, useLocation, useNavigate } from "react-router-dom";
+import { DoEditParam, LtmplConfig, LtmplConfigRes, PageType, RouterCompProps, ShowViewParam, ActTableViewModel, ThemeConfig, EttmplConfig } from "../tmpl/interface";
+import Units from "../units";
+import ActTable from "../table/act-table";
+import HCDataSource from "../tmpl/hc-data-source";
+import withRouter from "../routable/withroute";
+import { Button, Drawer, Space, theme } from "antd";
+import LtmplTable from "../module/ltmpl-table";
+import TtmplTable from "../module/ttmpl-table";
+import DtmplViewDrawer from "../module/dtmpl-view-drawer";
+import DtmplCustomEditModalPage from "../custom-page/dtmpl-custom-edit-modal-page";
+import CustomDetailModalPage from "../custom-page/custom-detail-modal-page";
+import DtmplEditPage from "../module/dtmpl-edit-page";
+import DtmplViewModal from "../module/dtmpl-view-modal";
+import { useLocale } from "../index";
+import "./index.less";
+
+const { useToken } = theme;
+
+export interface Props extends RouterCompProps {
+    layoutRootPath?: string;
+    tableType?: "common" | "report";
+    rowOperatable?: boolean;
+    defShowType?: ActTableViewModel;
+}
+
+const Index = (props: Props) => {
+    const { layoutRootPath, tableType, rowOperatable, basePath = "", defShowType } = props;
+    const [pageInfo, setPageInfo] = useState<{ pageNo: number, pageSize: number }>();
+    const [ltmplConfig, setLtmplConfig] = useState<LtmplConfig>();
+    const [pageLayout, setPageLayout] = useState<string>("none");
+    const [selectedCode, setSelectedCode] = useState<string>();
+    const [showEdit, setShowEdit] = useState<boolean>(true);
+    const [ractionId, setRactionId] = useState<string>();
+    const [showDraw, setShowDraw] = useState<boolean>(false);
+    const [showView, setShowView] = useState<boolean>(false);
+    const [showWindowType, setShowWindowType] = useState<PageType>("default");
+    const [toCustomPage, setToCustomPage] = useState<boolean>(false);
+    const [viewSourceId, setViewSourceId] = useState<string>();
+    const [editSourceId, setEditSourceId] = useState<string>();
+    const [userPageConfig, setUserPageConfig] = useState<{ [key: string]: any }>();
+    const [userPageConfigLoading, setUserPageConfigLoading] = useState<boolean>(true);
+    const [pageSizeOptions, setPageSizeOptions] = useState<number[]>([]); // 分页条数
+    const [themeConfig, setThemeConfig] = useState<ThemeConfig>();     // 主题配置信息
+    const [drawerSize, setDrawerSize] = useState<number | string>("92vw");
+    const [isCopy, setIsCopy] = useState<boolean>(false); // 是否复制
+    const [ettmplConfig, setEttmplConfig] = useState<EttmplConfig>(); // 展开树配置
+    const { sourceId } = useParams();
+    const { search } = useLocation();
+    const { translate } = useLocale();
+    const navigate = useNavigate();
+    const { token } = useToken();
+    const computedLayoutPath = layoutRootPath !== undefined ? `/${layoutRootPath}` : "";
+
+    const { mainCode, menuId, serverKey } = useMemo(() => {
+        const temParams = new URLSearchParams(search);
+        const mainCode = temParams.get("mainCode");
+        const menuId = temParams.get("menuId");
+        const serverKey = temParams.get("serverKey") || null;
+        return { mainCode, menuId, serverKey }
+    }, [search])
+
+    const getLtmplConfig = async () => {
+        const ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(serverKey, sourceId);
+        const ettmplConfig: EttmplConfig = await HCDataSource.requestEttmplConfig(serverKey, sourceId);
+        const ltmplConfig = ltmplConfigRes?.ltmplConfig;
+        setLtmplConfig(ltmplConfig);
+        setEttmplConfig(ettmplConfig);
+        setPageLayout(ltmplConfig?.pageLayout || "none");
+    };
+
+    // 获取用户页面配置
+    const getUserPageConfig = async () => {
+        const config = await Units.getUserPageConfig(sourceId);
+        setUserPageConfig(config);
+        setUserPageConfigLoading(false);
+    };
+
+    // 获取全局主题配置
+    const getThemeConfig = async () => {
+        const theme: ThemeConfig = await Units.getThemeConfig();
+        setThemeConfig(theme);
+    }
+
+    // 设置用户页面配置
+    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();
+            getThemeConfig();
+        }
+    }, [sourceId]);
+
+    const doSearch = (params_) => {
+        let params = {
+            ...Units.transQueryStrToParams(search, ltmplConfig),
+            ...params_,
+        };
+        const newfliter = Units.transQueryParamsToStr({ ...params });
+        navigate(`${basePath}${computedLayoutPath}/${sourceId}/tree-act-table?${newfliter}`, { replace: true });
+    };
+
+    const onChangePage = (pageNo: number, pageSize: number, pageSizes?: number[]) => {
+        const temPageSizeOptions = pageSizes ? pageSizes : pageSizeOptions;
+        let params = Units.transQueryStrToParams(search, null);
+        params["pageNo"] = pageNo;
+        params["pageSize"] = pageSize;
+        doSearch(params);
+        const temPagesize = temPageSizeOptions.indexOf(pageSize);
+        if (temPagesize == -1) {
+            return;
+        }
+        setPageSizeOptions(temPageSizeOptions);
+        setPageInfo({ pageNo, pageSize });
+        handleSetUserPageConfig({ pageSize: temPagesize });
+    };
+
+    // 更新分页数数组
+    const onUpdatePageSizeOptions = (val: number[]) => {
+        setPageSizeOptions(val);
+    }
+
+    const onShowView = (showViewParam: ShowViewParam) => {
+        doClose();
+        let showType: PageType = !ltmplConfig.buttonViewConfig ? "default" : ltmplConfig.buttonViewConfig.showType;
+        let dtmplSourceId = showViewParam.dtmplSourceId ? showViewParam.dtmplSourceId : sourceId;
+        let path = `${basePath}${computedLayoutPath}/${dtmplSourceId}/detail-view?code=${showViewParam.code}&menuId=${menuId}`;
+        if (showViewParam.toCustomPage && ltmplConfig.customViewPagePath) {
+            path = `${basePath}${computedLayoutPath}${ltmplConfig.customViewPagePath}?menuId=${menuId}&sourceId=${sourceId}`;
+        }
+        if (showType === "routing") {
+            navigate(path);
+        } else if (showType === "blank") {
+            window.open("#" + path, '_blank');
+        } else {
+            setShowView(true);
+            setSelectedCode(showViewParam.code);
+            setViewSourceId(dtmplSourceId);
+            setToCustomPage(showViewParam.toCustomPage);
+            setShowWindowType(pageLayout === "none" ? "drawer" : showType);
+        }
+    };
+
+    const onChangeSearch = (params_) => {
+        let params = { ...params_ };
+        if (mainCode) {
+            params["mainCode"] = mainCode;
+        }
+        params["pageNo"] = 1;
+        if (pageInfo?.pageSize) {
+            params["pageSize"] = pageInfo?.pageSize;
+        }
+        params["menuId"] = menuId;
+        params["sourceId"] = sourceId;
+        doSearch(params);
+    };
+
+    const doEdit = (param: DoEditParam) => {
+        doClose();
+        let showType: PageType = !ltmplConfig.buttonEditConfig ? "default" : ltmplConfig.buttonEditConfig.showType;
+        let dtmplSourceId = param.dtmplSourceId ? param.dtmplSourceId : sourceId;
+        let path = `${basePath}${computedLayoutPath}/${dtmplSourceId}/detail-edit?code=${param.code}&menuId=${menuId}&mode=${param.mode}`;
+        if (param.toCustomPage && ltmplConfig.customEditPagePath) {
+            path = `${basePath}${computedLayoutPath}/page/${dtmplSourceId}${ltmplConfig.customEditPagePath}?code=${param.code}&menuId=${menuId}`;
+        }
+        if (mainCode) {
+            path = path + `&mainCode=${mainCode}`;
+        }
+        if (showType === "routing") {
+            navigate(path);
+        } else if (showType === "blank") {
+            window.open("#" + path, '_blank');
+        } else {
+            setShowEdit(true);
+            setShowWindowType(pageLayout === "none" ? "drawer" : showType);
+            setEditSourceId(dtmplSourceId);
+            setSelectedCode(param.code);
+            setIsCopy(param.mode === "copy");
+        }
+    };
+
+    const doCreate = (addTmplId: string, toCustomPage: boolean = false) => {
+        doClose();
+        let showType: PageType = !ltmplConfig.buttonAddConfig ? "default" : ltmplConfig.buttonAddConfig.showType;
+        let path = `${basePath}${computedLayoutPath}/${sourceId}/detail-edit?menuId=${menuId}&addTmplId=${addTmplId ? addTmplId : ""}`;
+        if (toCustomPage && ltmplConfig.customEditPagePath) {
+            path = `${basePath}${computedLayoutPath}/page/${sourceId}${ltmplConfig.customEditPagePath}?menuId=${menuId}`;
+        }
+        if (mainCode) {
+            path = path + `&mainCode=${mainCode}`;
+        }
+        if (showType === "routing") {
+            navigate(path);
+        } else if (showType === "blank") {
+            window.open("#" + path, '_blank');
+        } else {
+            let editSourceId = addTmplId ? addTmplId : sourceId;
+            setTimeout(() => {
+                setShowEdit(true);
+                setShowWindowType(pageLayout === "none" ? "drawer" : showType);
+                setEditSourceId(editSourceId);
+            }, 100);
+        }
+    };
+
+    const doRAction = (ractionId: string, mainCode: string) => {
+        setSelectedCode(mainCode);
+        setRactionId(ractionId);
+        setShowDraw(true);
+    };
+
+    // 嵌套表格配置
+    const expandedRowRender = (val: { [key: string]: any }) => {
+        const { subNodes, recursiveRatmplId } = ettmplConfig;
+        return <div style={{ marginLeft: "24px", background: token.colorBgContainer }}>
+            {recursiveRatmplId ?
+                <TtmplTable
+                    ettmplConfig={ettmplConfig}
+                    hideOnSinglePage={true}
+                    funcMode="simple"
+                    serverKey={serverKey}
+                    sourceId={recursiveRatmplId}
+                    mainCode={val.code}
+                    bordered={false} showHeader={false} /> : ""}
+            {subNodes?.map(item => <div>
+                {subNodes.length > 1 ? <h4 style={{ padding: "12px 0 0 12px" }}>{item.title}</h4> : ""}
+                <TtmplTable
+                    ettmplConfig={item}
+                    hideOnSinglePage={true}
+                    funcMode="simple"
+                    serverKey={serverKey}
+                    sourceId={item.sourceId}
+                    mainCode={val.code}
+                    bordered={false} showHeader={false} />
+            </div>
+            )}
+        </div>;
+    };
+
+    const renderActTable = () => {
+        const { subNodes, recursiveRatmplId } = ettmplConfig || {};
+        let criteriaData = Units.transQueryStrToParams(search, ltmplConfig);
+        const cachePageSize = userPageConfig?.pageSize; // 获取缓存分页数配置，其配置的是分页数组下标
+        let pageSize = cachePageSize ? pageSizeOptions[cachePageSize] : pageInfo?.pageSize;
+        if (!ltmplConfig || userPageConfigLoading) {
+            return <></>;
+        }
+        return <ActTable key={"acttable" + sourceId}
+            tableType={tableType} serverKey={serverKey} pageSize={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}
+            defShowType={defShowType}
+            userPageConfig={userPageConfig}
+            setUserPageConfig={handleSetUserPageConfig}
+            resetUserPageConfig={resetUserPageConfig}
+            allowUserConfig={themeConfig?.allowUserConfig}
+            onUpdatePageSizeOptions={onUpdatePageSizeOptions}
+            expandable={(recursiveRatmplId || subNodes.length) ? { expandedRowRender } : undefined} // 嵌套表格
+            bordered={false}
+            showHeader={false}
+        />;
+    };
+
+    const doSubmited = (code?: string, isContinueSave?: boolean) => {
+        onChangeSearch({ serial_number: Units.getReactKey() });
+        if (isContinueSave) {
+            setSelectedCode(code);
+        } else {
+            doClose();
+        }
+    }
+
+    const doClose = () => {
+        setShowDraw(false);
+        setShowView(false);
+        setShowEdit(false);
+        setShowWindowType(undefined);
+        setSelectedCode(undefined);
+        setToCustomPage(false);
+    };
+
+    // 关联查询close
+    const doCloseShowDraw = () => {
+        if (showWindowType === "default") {
+            doCreate(editSourceId);
+        } else {
+            doClose();
+        }
+    }
+
+    const windowSize = useMemo(() => {
+        const { buttonViewConfig, buttonEditConfig } = ltmplConfig || {};
+        let width = buttonViewConfig?.windowWidth
+        width = width && width > 0 ? width : 1280;
+        let height: number | string = buttonViewConfig?.windowHeight;
+        height = height && height > 0 ? height : '80vh';
+        let editWidth = buttonEditConfig?.windowWidth;
+        editWidth = editWidth && editWidth > 0 ? editWidth : 1280;
+        let editHeight: number | string = buttonEditConfig?.windowHeight;
+        editHeight = editHeight && editHeight > 0 ? editHeight : '80vh';
+        return { width, height, editWidth, editHeight };
+    }, [ltmplConfig]);
+
+    return <div className="ttmpl-table-route">
+        {renderActTable()}
+        {showDraw ? (
+            <Drawer
+                placement="left" title={translate("${关联查询}")} closable={true} mask={false} onClose={doCloseShowDraw}
+                open={showDraw}
+                resizable={{ onResize: (newSize => setDrawerSize(newSize)) }}
+                size={drawerSize}
+                styles={{ body: { minWidth: "720px" } }}
+                extra={
+                    <Space>
+                        <Button onClick={doCloseShowDraw}>{translate("${关闭}")}</Button>
+                    </Space>
+                }
+            >
+                <LtmplTable serverKey={serverKey} sourceId={ractionId} mainCode={selectedCode} />
+            </Drawer>
+        ) : null}
+        {showView && showWindowType === "drawer" && selectedCode ? (
+            toCustomPage && ltmplConfig?.customViewPagePath ? <CustomDetailModalPage width={1000} minHeight="70vh" mainCode={mainCode} sourceId={sourceId} code={selectedCode} open={showView} customPath={ltmplConfig?.customViewPagePath} onCancel={doClose} />
+                :
+                <DtmplViewDrawer
+                    serverKey={serverKey} placement={ltmplConfig?.buttonViewConfig?.windowPosition}
+                    width={windowSize.width}
+                    height={windowSize.height}
+                    onClose={doClose}
+                    open={showView}
+                    sourceId={viewSourceId ? viewSourceId : sourceId}
+                    code={selectedCode}
+                />
+        ) : null}
+        {showView && showWindowType === "modal" && selectedCode ? (
+            toCustomPage && ltmplConfig?.customViewPagePath ? <CustomDetailModalPage width={1000} minHeight="70vh" mainCode={mainCode} sourceId={sourceId} code={selectedCode} open={showView} customPath={ltmplConfig?.customViewPagePath} onCancel={doClose} />
+                :
+                <DtmplViewModal
+                    serverKey={serverKey} width={windowSize.width} height={windowSize.height} onClose={doClose}
+                    open={showView} sourceId={viewSourceId ? viewSourceId : sourceId}
+                    code={selectedCode}
+                />
+        ) : null}
+        {showEdit && showWindowType !== "default" && ltmplConfig ? (
+            ltmplConfig?.customEditPagePath ? (
+                <DtmplCustomEditModalPage
+                    open={showEdit}
+                    onOk={doSubmited}
+                    customPath={ltmplConfig?.customEditPagePath}
+                    sourceId={sourceId}
+                    mainCode={mainCode}
+                    code={selectedCode}
+                    isCopy={isCopy}
+                />
+            ) : (
+                <DtmplEditPage
+                    defaultDtmplData={ltmplConfig?.defaultDtmplData}
+                    serverKey={serverKey}
+                    pageType={showWindowType === "modal" ? "modal" : "drawer"}
+                    placement={ltmplConfig?.buttonEditConfig?.windowPosition}
+                    open={showEdit}
+                    width={windowSize.editWidth}
+                    height={windowSize.editHeight}
+                    onCancel={doClose}
+                    mainCode={mainCode}
+                    sourceId={editSourceId}
+                    code={selectedCode}
+                    onOk={doSubmited}
+                    isCopy={isCopy}
+                />
+            )
+        ) : null}
+    </div>;
+};
+
+export default withRouter(Index);

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

@@ -89,6 +89,10 @@ interface ActTableProps extends TmplBaseProps {
   doEdit2D?: (val: string) => void; // 2D图编辑
   doView2D?: (val: string) => void; // 2D图查看
   showTableAdd?: boolean; // 是否支持添加列表
+  expandable?: { expandedRowRender: (val: { [key: string]: any }) => React.JSX.Element }; // 嵌套表格
+  hideOnSinglePage?: boolean; // 分页配置,只有一页时是否隐藏分页器
+  bordered?: boolean; // 表格是否显示边框
+  showHeader?: boolean; // 表格是否显示表头
 }
 
 interface ActTableStat {
@@ -1565,7 +1569,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       title, collapsible,
       onChangePage, serverKey, criteriaData, showEmpty, loadDataCallback,
       showView, doEdit, doRAction, customEditable, readOnly, tableType, showPagination, showAggregates, userPageConfig,
-      doEdit2D, doView2D, showTableAdd, setUserPageConfig
+      doEdit2D, doView2D, showTableAdd, setUserPageConfig, expandable, hideOnSinglePage, bordered, showHeader
     } = this.props;
     const { translate } = this.context;
 
@@ -1667,6 +1671,10 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         pageSizeOptions={pageSizeOptions}
         showEmpty={showEmpty}
         loadDataCallback={loadDataCallback}
+        expandable={expandable}
+        hideOnSinglePage={hideOnSinglePage}
+        bordered={bordered}
+        showHeader={showHeader}
       />);
 
     // tab拆解条件渲染

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

@@ -122,13 +122,15 @@ export default {
                         column["sorter"] = (a, b) => {
                             let aVal = a[column["dataIndex"]];
                             let bVal = b[column["dataIndex"]];
-                            if (aVal?.includes["@R@"]) aVal = aVal.split("@R@")[1];
-                            if (bVal?.includes["@R@"]) bVal = bVal.split("@R@")[1];
+                            if (Array.isArray(aVal)) aVal = aVal[0];
+                            if (Array.isArray(bVal)) bVal = bVal[0];
+                            if (aVal?.includes("@R@")) aVal = aVal.split("@R@")[1];
+                            if (bVal?.includes("@R@")) bVal = bVal.split("@R@")[1];
                             // 判断是否为字符串数字
                             const numA = Number(aVal);
                             const numB = Number(bVal);
                             const isNumeric = aVal && bVal && !isNaN(numA) && !isNaN(numB);
-                            return isNumeric ? numA - numB : aVal.localeCompare(bVal);
+                            return isNumeric ? numA - numB : aVal?.localeCompare(bVal);
                         };
                         column["showSorterTooltip"] = false;
                         column["sortIcon"] = ({ sortOrder }) =>

package/src/aldehyde/table/index.css

@@ -75,11 +75,11 @@
 /*    padding:0px;*/
 /*}*/
 
-.ant-table-cell:has(.xiaoji) {
+.ant-table-cell:not(.ant-table-expanded-row > .ant-table-cell):has(.xiaoji) {
   background-color: var(--color-1) !important;
 }
 
-.ant-table-cell:has(.heji) {
+.ant-table-cell:not(.ant-table-expanded-row > .ant-table-cell):has(.heji) {
   background-color: var(--color-3) !important;
 }
 

package/src/aldehyde/table/pagination.tsx

@@ -15,6 +15,7 @@ interface PaginationProps {
   touchEnd: boolean;
   paginationPosition?: "left" | "middle" | "right";
   pageSizeOptions?: number[]; //配置的分页数 
+  hideOnSinglePage?: boolean; // 只有一页时是否隐藏分页器
 }
 
 interface PaginationStat { }
@@ -24,7 +25,7 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
   context: React.ContextType<typeof LocaleContext>;
 
   render() {
-    const { queryTotal, pageInfo, total, pageTo, touchEnd, paginationPosition, pageSizeOptions } = this.props;
+    const { queryTotal, pageInfo, total, pageTo, touchEnd, paginationPosition, pageSizeOptions, hideOnSinglePage } = this.props;
     const { translate } = this.context;
 
     if (!pageInfo) {
@@ -53,13 +54,14 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
     }
 
     return (
-      <div className="Pagination" style={{ justifyContent: paginationPosition === "middle" ? "center" : (paginationPosition || "left") }}>
-        <span
-          className={sewTotal ? "sewTotal" : "seeTotal"}
-          onClick={queryTotal}
-        >
-          {seeTotalTitle}
-        </span>
+      <div className="Pagination" style={{ justifyContent: paginationPosition === "middle" ? "center" : (paginationPosition || "left"), marginTop: !(hideOnSinglePage && (total < (pageInfo.pageSize || 10))) ? "10px" : 0 }}>
+        {!(hideOnSinglePage && (total < (pageInfo.pageSize || 10))) ?
+          <span
+            className={sewTotal ? "sewTotal" : "seeTotal"}
+            onClick={queryTotal}
+          >
+            {seeTotalTitle}
+          </span> : ""}
         <AntdPagination
           style={{ display: "inline-block" }}
           showQuickJumper
@@ -70,7 +72,7 @@ class Pagination extends React.PureComponent<PaginationProps, PaginationStat> {
           pageSize={pageInfo.pageSize ? pageInfo.pageSize : 10}
           onChange={(page, pageSize) => { pageTo(page, pageSize) }}
           //onShowSizeChange={(current, size) => {debugger;pageTo(current, size)}}
-          hideOnSinglePage={total === 0}
+          hideOnSinglePage={hideOnSinglePage || (total === 0)}
           total={virtualTotal}
         />
       </div>

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

@@ -66,6 +66,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
     ltmplConfig: {},
     showPagination: true,
     showEmpty: true,
+    bordered: true,
+    showHeader: true,
   };
 
   defaultAggregateShowSize = 7;
@@ -131,7 +133,11 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       const index = dataSource.findIndex(
         (x) => x.key === restProps["data-row-key"]
       );
-      return <SortableItem key={index} index={index} {...restProps} />;
+      // 处理嵌套子表格展开收起异常
+      const rowProps: any = { ...restProps, className, style };
+      return (
+        <SortableItem key={index} index={index} {...rowProps} />
+      );
     } else {
       return <></>;
     }
@@ -448,7 +454,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
       onChangeResize,
       pageSizeOptions,
       onChangePage,
-      showEmpty
+      showEmpty, expandable, hideOnSinglePage, bordered, showHeader
     } = this.props;
     //debugger
     const { touchEnd, aggregateVO, loading, virtualEndPageNo, dataSource, errorText, localSorter } = this.state;
@@ -594,6 +600,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         {/*)}*/}
         {viewModels.includes("table") ? (
           <ResizableTable
+            rowKey="code"
             tableLayout={ltmplConfig.tableLayout || "fixed"}
             size={tableProps.size ? tableProps.size : undefined}
             rowSelection={this.getRowSelection()}
@@ -607,7 +614,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                   x: table_x,
                 }
             }
-            bordered
             pagination={false}
             style={{ display: columns ? "block" : "none" }}
             summary={summary}
@@ -626,8 +632,10 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                   this.getChildrenData(record.code);
                 }
               }
-            } : undefined}
+            } : expandable}
             onChangeResize={onChangeResize}
+            bordered={bordered}
+            showHeader={showHeader}
           />
         ) : (
           ""
@@ -671,6 +679,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
           total={aggregateVO?.count}
           paginationPosition={ltmplConfig?.paginationPosition}
           pageSizeOptions={pageSizeOptions}
+          hideOnSinglePage={hideOnSinglePage}
         /> : ""}
       </>
     );

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -10,6 +10,7 @@ import {
   LtmplConfigRes,
   SelectConfig,
   TtmplConfig,
+  EttmplConfig
 } from "./interface";
 import HcserviceV3 from "./hcservice-v3";
 import ControlTypeSupportor from "./control-type-supportor";
@@ -46,6 +47,7 @@ const l2LtmplConfigMap: Map<string, LtmplConfigRes> = new Map<
 >();
 const dtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
 const ttmplConfigMap: Map<string, TtmplConfig> = new Map<string, TtmplConfig>();
+const ettmplConfigMap: Map<string, EttmplConfig> = new Map<string, EttmplConfig>();
 const viewDtmplConfigMap: Map<string, DtmplConfig> = new Map<
   string,
   DtmplConfig
@@ -316,6 +318,15 @@ HCDataSource.requestTtmplConfig = async function (
   return ttmplConfigMap.get(sourceId);
 };
 
+// 展开树请求
+HCDataSource.requestEttmplConfig = async function (serverKey: string, sourceId: string) {
+  if (!ettmplConfigMap.has(sourceId)) {
+    let res = await HcserviceV3.requestEttmplConfig(serverKey, sourceId);
+    ettmplConfigMap.set(sourceId, res);
+  }
+  return ettmplConfigMap.get(sourceId);
+};
+
 HCDataSource.requestViewDtmplConfig = async function (
   serverKey: string,
   sourceId: string
@@ -569,6 +580,7 @@ HCDataSource.clear = async function () {
   // workbenchCache.splice(0, workbenchCache.length);
   objctCacheMap.clear();
   ttmplConfigMap.clear();
+  ettmplConfigMap.clear();
 };
 
 export default HCDataSource; //对外 TmplDataSource

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -126,6 +126,17 @@ export default class HcserviceV3 {
     return res.ttmplConfig;
   }
 
+  static async requestEttmplConfig(serverKey: string, sourceId: string) {
+    let url = `/v3/ettmpl/config`;
+    let res = await Super.super({
+      url,
+      serverKey,
+      method: "GET",
+      query: { sourceId },
+    });
+    return res.ettmplConfig;
+  }
+
   static async requestViewDtmplConfig(serverKey: string, sourceId: string) {
     let url = `/v3/view-dtmpl/config`;
     let res = await Super.super({

package/src/aldehyde/tmpl/interface.tsx

@@ -1,5 +1,5 @@
 import { MenuProps } from "antd/lib/menu";
-import { FormInstance } from "antd";
+import { FormInstance, PaginationProps } from "antd";
 import { HTMLAttributeAnchorTarget, RefObject } from "react";
 import { ButtonShape, ButtonType } from "antd/lib/button";
 
@@ -100,6 +100,10 @@ export interface QueryTableProps extends ReportTableProps {
   pageSizeOptions?: number[]; // 分页数配置
   showEmpty?: boolean; // 是否显示空状态
   loadDataCallback?: (val: object[]) => void; // 请求数据回调函数
+  expandable?: { expandedRowRender: (val: { [key: string]: any }) => React.JSX.Element }; // 嵌套表格
+  hideOnSinglePage?: boolean; // 分页配置,只有一页时是否隐藏分页器
+  bordered?: boolean;
+  showHeader?: boolean;
 }
 
 export interface AggregateVO {
@@ -586,6 +590,14 @@ export interface TtmplConfig extends TmplBase {
   allSameModel?: boolean;
 }
 
+export interface EttmplConfig {
+  id: string;
+  sourceId: string;
+  title: string;
+  recursiveRatmplId: string;
+  subNodes: EttmplConfig[];
+}
+
 // export interface StatViewConfig extends SelectConfig {
 //
 //     // reStat query analysis
@@ -918,7 +930,7 @@ export interface BlockType {
   hiddenOnDisabled?: boolean; // 是否隐藏
   customPath?: string; // 自定义页面路径
   dragDropPageId?: string;
-  pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树" | "导入" | "报表" | "分屏-列表" | "分屏-报表" | "甘特图" | "日历"; // 页面类型
+  pageType?: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树" | "导入" | "报表" | "分屏-列表" | "分屏-报表" | "甘特图" | "日历" | "可展开列表"; // 页面类型
   defaultCriteriaValue?: { [key: string]: string }; // 一些组件参数
   linkTarget?: HTMLAttributeAnchorTarget; // 页面跳转方式
   items?: BlockType[];