aldehyde 0.2.490 → 0.2.491

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

@@ -1,877 +1,883 @@
-import React from "react";
-import { ActionRenderProps, ColumnConfig, DtmplData, LtmplConfig, FieldConfig, CustomButton, CQueryConfig } from "../../tmpl/interface";
-import TableUnits from "../table-util";
-import SupportInputTypes from "../../tmpl/control-type-supportor";
-import { Button, Popconfirm, Popover, Space, Tooltip, Form as AntdForm, theme } from "antd";
-import { SortableHandle } from "react-sortable-hoc";
-import {
-    AlignLeftOutlined, CopyOutlined, DeleteOutlined,
-    EllipsisOutlined,
-    EyeInvisibleOutlined,
-    EyeOutlined,
-    FormOutlined,
-    KeyOutlined,
-    MenuOutlined, QuestionCircleOutlined, PlaySquareOutlined,
-    SettingOutlined, UpSquareFilled, DownSquareFilled
-} from "@ant-design/icons";
-import ActionUtils from "../../controls/action/utils";
-import ViewButton from "../../detail/button/view-button";
-import EditButton from "../../detail/button/edit-button";
-import InlineEditButton from "../../detail/button/inline-edit-button";
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-import Action from "../../controls/action";
-import CquickButton from "../../controls/cquery/cquick-button";
-import { ViewControl } from "../../index";
-import NewinFileView from "../../controls/file-view/newin-file-view";
-import { EntryControl } from "../../index";
-import TmplConfigAnalysis from "../../tmpl/tmpl-config-analysis";
-import Icon from "../../icon/aliIcon";
-import SelectCodeExport from "../../controls/file-export/select-code-export";
-import "./index.less";
-
-const FormItem = AntdForm.Item;
-
-// 负责提取 token
-const ThemeToken = (props) => {
-    const { token } = theme.useToken();
-    return props.children(token); // 使用 render props 模式
-};
-
-interface ColumnBuilderProps extends ActionRenderProps {
-    ltmplConfig: LtmplConfig,
-    hiddenColIds?: string[],
-    hiddenRowCodes?: string[],
-    sortedColConfigs?: ColumnConfig[],
-    unHiden?: () => any,
-    onHide?: (code: string) => any,
-    operatable?: boolean,
-    mainCode?: string,
-    criteriaData?: object,
-    actTableDoSearch?: (data: object) => void,
-    columnResize?: { [key: string]: number }
-}
-
-interface ReportColumnBuilderProps {
-    columnConfigs: ColumnConfig[],
-    hiddenColIds?: string[],
-    translate: (...strs: string[]) => string;
-    leftFixedCols: number,
-    hiddenRowCodes?: string[],
-    unHiden?: () => any,
-    onHide?: (code: string) => any,
-}
-
-
-export default {
-
-    buildTableColumns(props: ColumnBuilderProps) {
-        const {
-            ltmplConfig,
-            hiddenColIds,
-            hiddenRowCodes,
-            sortedColConfigs, unHiden,
-            onHide, translate,
-            sortColumns, serverKey,
-            editings, mainCode, criteriaData, actTableDoSearch, showView,
-            columnResize
-        } = props;
-
-        const { primaryColumn, secondColumn, primaryColumnLabel } = ltmplConfig.extDisplayConfig || {};
-
-        let tableColumns = [];
-        let s = 0;
-        let colConfigs = sortedColConfigs ? sortedColConfigs : ltmplConfig.columns;
-        let buttons = ltmplConfig.buttons || [];
-
-        let currentDataColIndex = 0;
-
-        colConfigs.forEach((item) => {
-            let column = {};
-            if (hiddenColIds && hiddenColIds.includes(item.originalId)) {
-                return
-            } else {
-                if (item.columnGroupName) { // 表头分组功能实现
-                    const groupIndex = tableColumns.findIndex(r => r.children?.length && r.title === item.columnGroupName);
-                    if (groupIndex !== -1) {
-                        tableColumns[groupIndex].children.push(column);
-                    } else {
-                        tableColumns.push({ title: item.columnGroupName, align: "center", children: [column] });
-                    }
-                } else {
-                    tableColumns.push(column);
-                }
-            }
-            let title1 = translate("${" + item.title + "}");
-            column["title"] = item.tip ? <>{title1}<Tooltip placement="top" title={item.tip}>
-                <Button type={'text'} size={'small'} disabled={true} icon={<QuestionCircleOutlined />} /></Tooltip> </> : title1;
-            column["dataIndex"] = item.id;
-            column["key"] = item.id;
-            if (item["colWidth"]) column["width"] = item["colWidth"];
-            if (item["statColType"]) column["statColType"] = item["statColType"];
-            if (item["aggFunc"]) column["cal"] = item["aggFunc"];
-            if (item["order"]) column["order"] = Number(item["order"]);
-            // column['ellipsis']= true;
-            s++;
-            let itemType = SupportInputTypes.getSupportControlType(item);
-            if (s < 12 && item.title != "操作" && item.title != "序号") {
-                if (hiddenColIds.includes("10000")) {
-                    const order = this.handleColumnOrder(column["dataIndex"], sortColumns);
-                    if (item.sortable) {
-                        TableUnits.sort(column, itemType, order);
-                    } else if (item.pageSortable) {
-                        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];
-                            // 判断是否为字符串数字
-                            const numA = Number(aVal);
-                            const numB = Number(bVal);
-                            const isNumeric = aVal && bVal && !isNaN(numA) && !isNaN(numB);
-                            return isNumeric ? numA - numB : aVal.localeCompare(bVal);
-                        };
-                        column["showSorterTooltip"] = false;
-                        column["sortIcon"] = ({ sortOrder }) =>
-                            <ThemeToken>
-                                {(token) => <span className="pageSortable" >
-                                    <UpSquareFilled className="ascend" style={sortOrder === 'ascend' ? { color: token.colorPrimary } : {}} />
-                                    <DownSquareFilled className="descend" style={sortOrder === 'descend' ? { color: token.colorPrimary } : {}} />
-                                </span>}
-                            </ThemeToken>
-                    }
-                }
-            }
-            //特殊列处理
-            //序号
-            if (item.title === "序号") {
-                column["width"] = item.colWidth ? item.colWidth : 50;
-                column["title"] = translate("${序号}");
-                column["align"] = item.valueAlign ? item.valueAlign : "center";
-                column["render"] = (text, record, index) => <label>{index + 1}</label>;
-                item["sorter"] = undefined;
-            } else if (item.id == "10000") {
-                this.setSortProps(column, item, translate);
-            } else if (item.id == "20000") {
-                this.setHiddenRecordOpt(column, hiddenRowCodes, unHiden, onHide, translate);
-            } else if (item.title === "操作" && props.operatable) {
-                column["操作"] = "1";
-                column["fixed"] = "right";
-                column["align"] = "left";
-                column["width"] = item.colWidth ? item.colWidth : 160;
-                column["className"] = "opsColumn";
-                column["title"] = <>{translate("${操作}")}</>;
-                column["render"] = (text, record) => this.renderAction(props, record);
-            } else {
-                currentDataColIndex++;
-                column["className"] = "opsColumn";
-                // column["title"] = item.tip? <>{title1}<Tooltip placement="top" title={item.tip}>
-                //     <Button icon={<QuestionCircleOutlined />} /></Tooltip> </>: title1;
-                column["width"] = item.colWidth ? item.colWidth : 160;
-                column["ellipsis"] = { showTitle: true };
-                column["align"] = item.valueAlign ? item.valueAlign : "left";
-                if (
-                    ltmplConfig.leftFixedCols &&
-                    ltmplConfig.leftFixedCols >= currentDataColIndex
-                ) {
-                    column["fixed"] = "left";
-                } else {
-                    column["fixed"] = item.colFixed
-                        ? item.colFixed == "right"
-                            ? "right"
-                            : "left"
-                        : false;
-                }
-                column["render"] = (text, record) => {
-                    let detailParams = undefined;
-                    if (showView && primaryColumn?.id === item.id) { // 首字段增加主题色显示/查看详情功能
-                        if (buttons.includes("detail")) {
-                            const classView = ltmplConfig.classViewConfigs.find(r => ActionUtils.isShow(r.preposes, [record], undefined));
-                            if (classView) {
-                                detailParams = { code: record.code, dtmplSourceId: classView.id };
-                            } else {
-                                const isdetail = ActionUtils.isShow(ltmplConfig.buttonViewAction?.preposes, [record], undefined);
-                                detailParams = isdetail ? { code: record.code } : undefined;
-                            }
-                        } else if (buttons.includes("customDetail")) {
-                            detailParams = { code: record.code, toCustomPage: true };
-                        }
-                    }
-
-                    // 首字段渲染
-                    const renderPrimaryColumn = <div className="column-table-primary">
-                        <div className="primary-column" onClick={() => detailParams && showView(detailParams)}>
-                            <ViewControl
-                                serverKey={serverKey}
-                                fieldConfig={item}
-                                value={record[item.id]}
-                                holderType="table"
-                            />
-                        </div>
-                        {primaryColumnLabel?.id ?
-                            <div className="primary-column-label" >
-                                <ViewControl
-                                    serverKey={serverKey}
-                                    fieldConfig={primaryColumnLabel}
-                                    value={record[primaryColumnLabel.id]}
-                                    holderType="table"
-                                />
-                            </div> :
-                            ""}
-                        {/* 首字段操作按钮 */}
-                        {this.renderColumnAction(props, record, "primary")}
-                    </div>;
-                    // 次字段渲染
-                    const renderSecondColumn = <div className="column-table-second">
-                        <ViewControl
-                            serverKey={serverKey}
-                            fieldConfig={item}
-                            value={record[item.id]}
-                            holderType="table"
-                        />
-                        {this.renderColumnAction(props, record, "secondary")}
-                    </div>;
-
-                    return (editings.includes(record.code) || buttons.includes("multiRowEdit") ?
-                        <FormItem style={{ margin: 0 }}
-                            name={record.code + "_" + item.id}
-                            key={record.code + "_" + item.id}
-                            rules={TmplConfigAnalysis.getRules(item, translate)}
-                            initialValue={record[item.id]}>
-                            <EntryControl
-                                serverKey={serverKey}
-                                fieldConfig={{ ...item }}
-                                value={record[item.id]}
-                                editStatus={record.editStatus}
-                            />
-                        </FormItem> :
-                        <div className={record['dataType'] ? record['dataType'] === "小计" ? "xiaoji" : 'heji' : ""}>
-                            {primaryColumn?.id === item.id ? renderPrimaryColumn : secondColumn?.id === item.id ? renderSecondColumn :
-                                <ViewControl
-                                    serverKey={serverKey}
-                                    fieldConfig={item}
-                                    value={record[item.id]}
-                                    holderType="table"
-                                />
-                            }
-                        </div>
-                    );
-                };
-            }
-            // 表头列搜索
-            if (item.appendCriteria) {
-                const criteria = item.appendCriteria;
-                let searchVal = criteriaData?.[`c_${criteria.id}`];
-                column["filterDropdown"] = ({ setSelectedKeys, selectedKeys, confirm, clearFilters }) => (<div style={{ padding: 8 }} onKeyDown={(e) => e.stopPropagation()}>
-                    <EntryControl
-                        serverKey={serverKey}
-                        mainCode={mainCode}
-                        value={searchVal}
-                        fieldConfig={criteria}
-                        onChange={(val) => {
-                            const value = val?.target ? val.target.value : val;
-                            setSelectedKeys(value ? [value] : []);
-                            searchVal = value;
-                        }}
-                    />
-                    <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center", paddingTop: 8 }}>
-                        <Button type="text" size="small" onClick={() => {
-                            clearFilters();
-                            searchVal = undefined;
-                        }}>{translate("${重置}")}</Button>
-                        <Button onClick={() => {
-                            actTableDoSearch({ [`c_${criteria.id}`]: selectedKeys[0] });
-                            confirm();
-                        }} type="primary" size="small">{translate("${确定}")}</Button>
-                    </div>
-                </div>);
-                column["filteredValue"] = searchVal || undefined;
-            }
-            if (columnResize?.[item.id]) { // 本地缓存存在列宽配置
-                column["width"] = columnResize[item.id];
-            }
-        });
-        return tableColumns;
-    },
-
-    setSortProps(column: object, item: ColumnConfig, translate) {
-        column["title"] = (
-            <Tooltip title={translate("${拖拽排序}")}>
-                {translate("${" + item.title + "}")}
-            </Tooltip>
-        );
-        column["width"] = 40;
-        column["dataIndex"] = item.id;
-        column["key"] = item.id;
-        column["className"] = "drag-visible";
-        column["render"] = () => <DragHandle />;
-    },
-    setHiddenRecordOpt(column: object, hiddenRowCodes, unHiden, onHide, translate) {
-        //隐藏
-        column["align"] = "center";
-        column["width"] = 40;
-        column["title"] = (
-            <>
-                {hiddenRowCodes.length > 0 ? (
-                    <Tooltip title={translate("${取消隐藏}")}>
-                        <Button
-                            style={{ marginRight: "0px" }}
-                            size="small"
-                            shape={"circle"}
-                            icon={<EyeOutlined />}
-                            type={"text"}
-                            onClick={() => unHiden()}
-                        ></Button>
-                    </Tooltip>
-                ) : (
-                    ""
-                )}
-            </>
-        );
-        column["render"] = (text, record) => (
-            <Tooltip title={translate("${隐藏}")}>
-                {" "}
-                <Button
-                    style={{ marginRight: "0px" }}
-                    icon={<EyeInvisibleOutlined />}
-                    type="dashed"
-                    size="small"
-                    onClick={() => onHide(record.code)}
-                ></Button>
-            </Tooltip>
-        );
-    },
-
-    buildReportTableColumns(props: ReportColumnBuilderProps) {
-        const {
-            columnConfigs, translate, leftFixedCols, hiddenColIds, hiddenRowCodes, unHiden, onHide
-        } = props;
-
-        let tableColumns = [];
-        let s = 0;
-        let colConfigs = columnConfigs;
-
-        let currentDataColIndex = 0;
-
-        colConfigs.forEach((item) => {
-            if (item.hidden || (hiddenColIds && hiddenColIds.includes(item.originalId))) {
-                return
-            }
-            let column = {};
-            if (item.upperColumnTitle) {
-                let parent;
-                tableColumns.forEach(t => {
-                    if (t.title == item.upperColumnTitle && t.children) {
-                        parent = t;
-                        return
-                    }
-                })
-                if (parent) {
-                    parent.children.push(column);
-                } else {
-                    tableColumns.push({ title: item.upperColumnTitle, children: [column] })
-                }
-            } else {
-                tableColumns.push(column);
-            }
-
-            let title1 = translate("${" + item.title + "}");
-            column["title"] = item.tip ? <>{title1}<Tooltip placement="top" title={item.tip}>
-                <Button type={'text'} size={'small'} disabled={true} icon={<QuestionCircleOutlined />} /></Tooltip> </> : title1;
-            column["dataIndex"] = item.id;
-            column["key"] = item.id;
-            if (item["colWidth"]) column["width"] = item["colWidth"];
-            if (item["order"]) column["order"] = Number(item["order"]);
-            // column['ellipsis']= true;
-            s++;
-
-            //特殊列处理
-            //序号
-            if (item.title === "序号") {
-                column["width"] = item.colWidth ? item.colWidth : 50;
-                column["title"] = translate("${序号}");
-                column["align"] = item.valueAlign ? item.valueAlign : "center";
-                column["render"] = (text, record, index) =>
-                    <label className={record['dataType'] ? record['dataType'] == "小计" ? "xiaoji" : 'heji' : ""}>{record[item.id]}</label>;
-                item["sorter"] = undefined;
-            } else if (item.id == "10000") {
-                this.setSortProps(column, item, translate);
-            } else if (item.id == "20000") {
-                this.setHiddenRecordOpt(column, hiddenRowCodes, unHiden, onHide, translate);
-            } else {
-                currentDataColIndex++;
-                column["className"] = "opsColumn";
-                //column["title"] = translate("${" + item.title + "}");
-                column["width"] = item.colWidth ? item.colWidth : 160;
-                column["ellipsis"] = { showTitle: true };
-                column["align"] = item.valueAlign ? item.valueAlign : "left";
-                if (
-                    leftFixedCols &&
-                    leftFixedCols >= currentDataColIndex
-                ) {
-                    column["fixed"] = "left";
-                } else {
-                    column["fixed"] = item.colFixed
-                        ? item.colFixed == "right"
-                            ? "right"
-                            : "left"
-                        : false;
-                }
-                column["render"] = (text, record) => {
-                    return (
-                        <div className={record['dataType'] ? record['dataType'] == "小计" ? "xiaoji" : 'heji' : ""}>
-                            <ViewControl
-                                // serverKey={serverKey}
-                                fieldConfig={item}
-                                value={record[item.id]}
-                                holderType={"table"}
-                            /></div>
-                    );
-                };
-            }
-        });
-
-        //  console.log("columns", tableColumns);
-
-        return tableColumns;
-    },
-
-    handleColumnOrder(columnId, sortColumns) {
-        //const sortColumns = this.props.criteriaData["sortColIds"];
-
-        if (!Array.isArray(sortColumns)) return undefined;
-
-        for (const column of sortColumns) {
-            const [key, sort] = column.split("_");
-
-            if (key === columnId) {
-                if (sort === "asc") return "ascend";
-                if (sort === "desc") return "descend";
-                continue;
-            }
-        }
-        return undefined;
-    },
-    renderColumnAction(props: ActionRenderProps, record: DtmplData, type: "primary" | "secondary") { // 主列/次列悬浮按钮渲染
-        const { ltmplConfig, serverKey, doRowAction, doRAction, doCustomButton, translate, readOnly } = props;
-        const { primaryColumnButtons, secondColumnButtons } = ltmplConfig;
-        const temButtons = type === "primary" ? primaryColumnButtons : secondColumnButtons;
-        if (readOnly || !temButtons?.length) {
-            return null;
-        }
-        const actionButtons: any[] = temButtons.map(item => {
-            switch (item.functionType) {
-                case "action": // 操作按钮
-                    if (ActionUtils.isShow(item.preposes, [record], undefined)) {
-                        return <Action
-                            serverKey={serverKey}
-                            iconType={"icon"}
-                            key={item.id}
-                            data={[record]}
-                            actionConfig={item}
-                            doAction={doRowAction}
-                            buttonSize={"small"}
-                            serial={1}
-                        />;
-                    } else {
-                        return undefined;
-                    }
-                case "raction": // 关系按钮
-                    if (ActionUtils.isShow(item?.preposes, [record], undefined)) {
-                        return <Button
-                            key={item.id}
-                            size="small"
-                            type="dashed"
-                            onClick={() => doRAction(item.id, record.code)}
-                        >
-                            {item.icon ?
-                                <Tooltip placement="top" title={translate("${" + item.title + "}")}>
-                                    <Icon type={item.icon} />
-                                </Tooltip>
-                                : translate("${" + item.title + "}")}
-                        </Button>;
-                    } else {
-                        return undefined;
-                    }
-                case "customButton": // 自由按钮
-                    if (ActionUtils.isShow(item.preposes, [record], undefined)) {
-                        return <Button
-                            key={item.id}
-                            size="small"
-                            type={item.buttonType || "dashed"}
-                            onClick={() => doCustomButton(item as unknown as CustomButton, [record])}
-                        >
-                            {item.icon ?
-                                <Tooltip placement="top" title={translate("${" + item.title + "}")}>
-                                    <Icon type={item.icon} />
-                                </Tooltip>
-                                : translate("${" + item.title + "}")}
-                        </Button>
-                    } else {
-                        return undefined;
-                    };
-                case "fileExport": // 文件导出
-                    if (ActionUtils.isShow(item.preposes, [record], undefined)) {
-                        return <SelectCodeExport
-                            serverKey={serverKey}
-                            hiddenType="disabled"
-                            codes={[record.code]}
-                            key={item.id}
-                            fileExport={item}
-                            disabled={false}
-                        />;
-                    } else {
-                        return undefined;
-                    }
-                case "customExport": // 自定义导出
-                    return undefined;
-                case "cQuery": // 关联查询
-                    if (ActionUtils.isShow(item.preposes, [record], undefined)) {
-                        const config: CQueryConfig = item;
-                        return <CquickButton
-                            serverKey={serverKey}
-                            key={config.id}
-                            size={"small"}
-                            pageType={"drawer"}
-                            cQueryConfig={config}
-                            mainCode={config.mainCodeColId ? record[config.mainCodeColId] : record.code}
-                        />;
-                    } else {
-                        return undefined;
-                    }
-                default:
-                    return undefined;
-            }
-        }).filter(Boolean);
-        return actionButtons?.length ? <div className="column-action"><Space wrap size={4}>{actionButtons}</Space></div> : undefined;
-    },
-    renderAction(props: ActionRenderProps, record: DtmplData) { // 操作列按钮渲染
-        const { ltmplConfig, showView,
-            doEdit,
-            doRAction,
-            customEditable,
-            serverKey,
-            readOnly,
-            sourceId, translate, doCustomButton, doRowJump, blockMenuTreeDrawerOpen,
-            doRowAction, doDeleteByCode, editRowEdit, editings, cancelRowEdit, saveRowData, doDelModalOpen,
-            doView2D, doEdit2D
-        } = props;
-        const { buttons, builtInButtons, defShowRowActionCount, strongDeleteConfirmText, edit2DBtnTitle, view2DBtnTitle, deleteBtnTitle } = ltmplConfig;
-
-        let actionButtons: any[] = [];
-
-        const isShowDetail = buttons.includes("detail") && showView && ActionUtils.isShow(ltmplConfig.buttonViewAction?.preposes, [record], undefined);
-        const isShowCustomDetail = buttons.includes("customDetail") && showView && ActionUtils.isShow(ltmplConfig.buttonViewAction?.preposes, [record], undefined);
-
-        if (isShowCustomDetail) { // 自定义详情
-            actionButtons.push(<Button
-                size="small"
-                type="primary"
-                icon={<AlignLeftOutlined />}
-                onClick={() => showView({ code: record.code, toCustomPage: true, })}
-            />)
-        }
-
-        if (isShowDetail) { // 默认详情
-            actionButtons.push(<ViewButton
-                showView={showView}
-                data={record}
-                ltmplConfig={ltmplConfig}
-                buttonType={isShowCustomDetail ? "default" : "primary"} />);
-        }
-
-        if (buttons.includes("dtmplEdit") && doEdit && !readOnly) {
-            (
-                actionButtons.push(<EditButton
-                    doEdit={doEdit}
-                    data={record}
-                    ltmplConfig={ltmplConfig}
-                ></EditButton>)
-            )
-        };
-
-        // 2D图编辑
-        if (buttons.includes("edit2D") && doEdit2D && !readOnly) {
-            actionButtons.push((!edit2DBtnTitle || edit2DBtnTitle?.length < 4) ? <Button size="small" onClick={() => doEdit2D(record.code)}>{edit2DBtnTitle || <SettingOutlined />}</Button> :
-                <Tooltip title={edit2DBtnTitle}><Button size="small" onClick={() => doEdit2D(record.code)} icon={<SettingOutlined />} /></Tooltip>)
-        }
-
-        // 2D图查看
-        if (buttons.includes("view2D") && doView2D && !readOnly) {
-            actionButtons.push((!view2DBtnTitle || view2DBtnTitle?.length < 4) ? <Button size="small" onClick={() => doView2D(record.code)}>{ltmplConfig.view2DBtnTitle || <PlaySquareOutlined />}</Button> :
-                <Tooltip title={edit2DBtnTitle}><Button size="small" onClick={() => doView2D(record.code)} icon={<PlaySquareOutlined />} /></Tooltip>)
-        }
-
-        // 行内编辑
-        if (buttons.includes("rowEdit") && !buttons.includes("multiRowEdit")) {
-            actionButtons.push(<InlineEditButton
-                editings={editings}
-                editRowEdit={editRowEdit}
-                cancelRowEdit={cancelRowEdit}
-                saveRowData={saveRowData}
-                data={record}
-            />);
-        }
-
-        if (builtInButtons?.includes("blockAuthMenuTree") && !readOnly) {
-            actionButtons.push(<Button
-                size="small"
-                type="dashed"
-                icon={
-                    <KeyOutlined
-                        rotate={180}
-                        style={{ color: "#f5222d", marginRight: "4px" }}
-                    />
-                }
-                onClick={() => blockMenuTreeDrawerOpen(record)
-                }
-            ></Button>)
-        }
-
-        if ((buttons.includes("dtmplCustomEdit") || customEditable) &&
-            doEdit &&
-            !readOnly &&
-            ActionUtils.isShow(
-                ltmplConfig.buttonEditAction?.preposes,
-                [record],
-                undefined
-            )) {
-            actionButtons.push(<Button
-                size="small"
-                type="dashed"
-                icon={<FormOutlined />}
-                onClick={() =>
-                    doEdit({
-                        code: record.code,
-                        mode: "update",
-                        toCustomPage: true,
-                    })
-                }
-            ></Button>)
-        }
-        if (buttons.includes("copy") && doEdit && !readOnly) {
-            actionButtons.push(<Tooltip title={translate("${复制}")}>
-                <Button
-                    size="small"
-                    type="dashed"
-                    icon={<CopyOutlined />}
-                    onClick={async () => {
-                        //先复制
-                        let toCustomPage = false;
-                        if (buttons.includes("dtmplCustomEdit") || customEditable) {
-                            toCustomPage = true;
-                        }
-                        let code = await HcserviceV3.doCopy(
-                            serverKey,
-                            sourceId,
-                            record.code
-                        );
-                        if (code) {
-                            doEdit({ code, mode: "update", toCustomPage });
-                        }
-                    }}
-                ></Button>
-            </Tooltip>)
-        }
-
-        if (ltmplConfig.rowCustomButtons) {
-            ltmplConfig.rowCustomButtons.map((customButton) => {
-                if (ActionUtils.isShow(
-                    customButton.preposes,
-                    [record],
-                    undefined
-                )) {
-                    actionButtons.push(
-                        <Button
-                            key={customButton.id}
-                            size="small"
-                            type={
-                                customButton.buttonType
-                                    ? customButton.buttonType
-                                    : "dashed"
-                            }
-                            onClick={() =>
-                                doCustomButton(customButton, [record])
-                            }
-                        >
-                            {customButton.icon ?
-                                <Tooltip placement="top" title={translate("${" + customButton.title + "}")}>
-                                    <Icon type={customButton.icon}></Icon>
-                                </Tooltip>
-                                : translate("${" + customButton.title + "}")}
-                        </Button>
-                    )
-                };
-            })
-        }
-        if (ltmplConfig.ractions && !readOnly) {
-            ltmplConfig.ractions.map((raction) => {
-                if (ActionUtils.isShow(
-                    raction?.preposes,
-                    [record],
-                    undefined
-                )) {
-                    actionButtons.push(
-                        <Button
-                            key={raction.id}
-                            size="small"
-                            type="dashed"
-                            onClick={() => doRAction(raction.id, record.code)}
-                        >
-                            {raction.icon ?
-                                <Tooltip placement="top" title={translate("${" + raction.title + "}")}>
-                                    <Icon type={raction.icon}></Icon>
-                                </Tooltip>
-                                : translate("${" + raction.title + "}")}
-                        </Button>
-                    );
-                }
-            })
-        }
-
-        if (ltmplConfig.rowActions &&
-            !readOnly &&
-            ltmplConfig.rowActions.length > 0) {
-            ltmplConfig.rowActions.map((action) => {
-                actionButtons.push(
-                    <Action
-                        serverKey={serverKey}
-                        iconType={"icon"}
-                        key={action.id}
-                        data={[record]}
-                        actionConfig={action}
-                        doAction={doRowAction}
-                        buttonSize={"small"}
-                        serial={1}
-                    ></Action>
-                );
-            })
-        }
-
-        if (ltmplConfig.rowJumps &&
-            ltmplConfig.rowJumps.length > 0 &&
-            !readOnly) {
-            ltmplConfig.rowJumps.map((jump) => {
-                if (ActionUtils.isShow(
-                    jump.preposes,
-                    [record],
-                    undefined
-                )) {
-                    actionButtons.push(
-                        <Button
-                            key={jump.id}
-                            size="small"
-                            type="dashed"
-                            onClick={() => doRowJump(jump, record)}
-                        >
-                            {jump.icon ?
-                                <Tooltip placement="top" title={translate("${" + jump.title + "}")}>
-                                    <Icon type={jump.icon}></Icon>
-                                </Tooltip>
-                                : translate("${" + jump.title + "}")}
-                        </Button>
-                    )
-                };
-            })
-        }
-        if (ltmplConfig.rowCQuerys &&
-            ltmplConfig.rowCQuerys.length > 0 &&
-            !readOnly
-        ) {
-            ltmplConfig.rowCQuerys.map((cquery) => {
-                if (ActionUtils.isShow(
-                    cquery.preposes,
-                    [record],
-                    undefined
-                )) {
-                    actionButtons.push(
-                        <CquickButton
-                            serverKey={serverKey}
-                            key={cquery.id}
-                            size={"small"}
-                            pageType={"drawer"}
-                            cQueryConfig={cquery}
-                            mainCode={
-                                cquery.mainCodeColId
-                                    ? record[cquery.mainCodeColId]
-                                    : record.code
-                            }
-                        />
-                    )
-                };
-            })
-        }
-        if (ltmplConfig.rowFileButtons &&
-            ltmplConfig.rowFileButtons.length > 0) {
-            ltmplConfig.rowFileButtons.map((openFileButton) => {
-                let v = record[openFileButton.fieldId];
-                if (v) {
-                    if (v instanceof Array) {
-                        v = v[0];
-                    }
-                    if (v.includes("@R@") > 0) {
-                        v = v.split("@R@")[1];
-                    }
-                    actionButtons.push(
-                        <NewinFileView
-                            title={openFileButton.title}
-                            filePath={HcserviceV3.toFilePath(v, serverKey)}
-                            serverKey={serverKey}
-                            key={openFileButton.id}
-                        //size={"small"}
-                        />
-                    );
-                }
-            })
-        }
-        if (buttons.includes("singleDelete") &&
-            !readOnly &&
-            ActionUtils.isShow(
-                ltmplConfig.buttonDeleteAction?.preposes,
-                [record],
-                undefined
-            )) {
-            actionButtons.push(
-                strongDeleteConfirmText ?
-                    ((!deleteBtnTitle || deleteBtnTitle?.length < 4) ?
-                        <Button size="small" type="dashed" danger onClick={() => doDelModalOpen(record)}>
-                            {deleteBtnTitle || <DeleteOutlined />}
-                        </Button> : <Tooltip title={deleteBtnTitle}>
-                            <Button size="small" type="dashed" danger onClick={() => doDelModalOpen(record)} icon={<DeleteOutlined />} />
-                        </Tooltip>)
-                    :
-                    <Popconfirm
-                        placement="rightBottom"
-                        title={translate("${确定要[删除]此数据吗}?")}
-                        onConfirm={() => doDeleteByCode(record)}
-                        okText={translate("${确定}")}
-                        cancelText={translate("${取消}")}
-                        okType={"danger"}
-                    >
-                        {(!deleteBtnTitle || deleteBtnTitle?.length < 4) ?
-                            <Button size="small" type="dashed" danger >{deleteBtnTitle || <DeleteOutlined />}</Button> :
-                            <Tooltip title={deleteBtnTitle}><Button size="small" type="dashed" danger icon={<DeleteOutlined />} /></Tooltip>}
-                    </Popconfirm>
-            )
-        }
-        let showButtons = [];
-        if (defShowRowActionCount <= 0 || defShowRowActionCount >= actionButtons.length) {
-            showButtons = actionButtons
-        } else {
-            showButtons = actionButtons.slice(0, defShowRowActionCount)
-            showButtons.push(
-                <Popover content={<Space wrap>
-                    {actionButtons.slice(defShowRowActionCount, actionButtons.length)}
-                </Space>} title={"更多操作"} trigger="hover">
-                    <Button size={"small"} icon={<EllipsisOutlined />} shape="circle" ></Button>
-                </Popover>
-            );
-        }
-        return <Space size={[0, 4]} wrap>
-            {showButtons}
-        </Space>
-    }
-
-}
-const DragHandle = SortableHandle(() => (
-    <MenuOutlined style={{ cursor: "grab", color: "#999" }} />
+import React from "react";
+import { ActionRenderProps, ColumnConfig, DtmplData, LtmplConfig, FieldConfig, CustomButton, CQueryConfig } from "../../tmpl/interface";
+import TableUnits from "../table-util";
+import SupportInputTypes from "../../tmpl/control-type-supportor";
+import { Button, Popconfirm, Popover, Space, Tooltip, Form as AntdForm, theme, message } from "antd";
+import { SortableHandle } from "react-sortable-hoc";
+import {
+    AlignLeftOutlined, CopyOutlined, DeleteOutlined,
+    EllipsisOutlined,
+    EyeInvisibleOutlined,
+    EyeOutlined,
+    FormOutlined,
+    KeyOutlined,
+    MenuOutlined, QuestionCircleOutlined, PlaySquareOutlined,
+    SettingOutlined, UpSquareFilled, DownSquareFilled
+} from "@ant-design/icons";
+import ActionUtils from "../../controls/action/utils";
+import ViewButton from "../../detail/button/view-button";
+import EditButton from "../../detail/button/edit-button";
+import InlineEditButton from "../../detail/button/inline-edit-button";
+import HcserviceV3 from "../../tmpl/hcservice-v3";
+import Action from "../../controls/action";
+import CquickButton from "../../controls/cquery/cquick-button";
+import { ViewControl } from "../../index";
+import NewinFileView from "../../controls/file-view/newin-file-view";
+import { EntryControl } from "../../index";
+import TmplConfigAnalysis from "../../tmpl/tmpl-config-analysis";
+import Icon from "../../icon/aliIcon";
+import SelectCodeExport from "../../controls/file-export/select-code-export";
+import "./index.less";
+
+const FormItem = AntdForm.Item;
+
+// 负责提取 token
+const ThemeToken = (props) => {
+    const { token } = theme.useToken();
+    return props.children(token); // 使用 render props 模式
+};
+
+interface ColumnBuilderProps extends ActionRenderProps {
+    ltmplConfig: LtmplConfig,
+    hiddenColIds?: string[],
+    hiddenRowCodes?: string[],
+    sortedColConfigs?: ColumnConfig[],
+    unHiden?: () => any,
+    onHide?: (code: string) => any,
+    operatable?: boolean,
+    mainCode?: string,
+    criteriaData?: object,
+    actTableDoSearch?: (data: object) => void,
+    columnResize?: { [key: string]: number }
+}
+
+interface ReportColumnBuilderProps {
+    columnConfigs: ColumnConfig[],
+    hiddenColIds?: string[],
+    translate: (...strs: string[]) => string;
+    leftFixedCols: number,
+    hiddenRowCodes?: string[],
+    unHiden?: () => any,
+    onHide?: (code: string) => any,
+}
+
+
+export default {
+
+    buildTableColumns(props: ColumnBuilderProps) {
+        const {
+            ltmplConfig,
+            hiddenColIds,
+            hiddenRowCodes,
+            sortedColConfigs, unHiden,
+            onHide, translate,
+            sortColumns, serverKey,
+            editings, mainCode, criteriaData, actTableDoSearch, showView,
+            columnResize
+        } = props;
+
+        const { primaryColumn, secondColumn, primaryColumnLabel } = ltmplConfig.extDisplayConfig || {};
+
+        let tableColumns = [];
+        let s = 0;
+        let colConfigs = sortedColConfigs ? sortedColConfigs : ltmplConfig.columns;
+        let buttons = ltmplConfig.buttons || [];
+
+        let currentDataColIndex = 0;
+
+        colConfigs.forEach((item) => {
+            let column = {};
+            if (hiddenColIds && hiddenColIds.includes(item.originalId)) {
+                return
+            } else {
+                if (item.columnGroupName) { // 表头分组功能实现
+                    const groupIndex = tableColumns.findIndex(r => r.children?.length && r.title === item.columnGroupName);
+                    if (groupIndex !== -1) {
+                        tableColumns[groupIndex].children.push(column);
+                    } else {
+                        tableColumns.push({ title: item.columnGroupName, align: "center", children: [column] });
+                    }
+                } else {
+                    tableColumns.push(column);
+                }
+            }
+            let title1 = translate("${" + item.title + "}");
+            column["title"] = item.tip ? <>{title1}<Tooltip placement="top" title={item.tip}>
+                <Button type={'text'} size={'small'} disabled={true} icon={<QuestionCircleOutlined />} /></Tooltip> </> : title1;
+            column["dataIndex"] = item.id;
+            column["key"] = item.id;
+            if (item["colWidth"]) column["width"] = item["colWidth"];
+            if (item["statColType"]) column["statColType"] = item["statColType"];
+            if (item["aggFunc"]) column["cal"] = item["aggFunc"];
+            if (item["order"]) column["order"] = Number(item["order"]);
+            // column['ellipsis']= true;
+            s++;
+            let itemType = SupportInputTypes.getSupportControlType(item);
+            if (s < 12 && item.title != "操作" && item.title != "序号") {
+                if (hiddenColIds.includes("10000")) {
+                    const order = this.handleColumnOrder(column["dataIndex"], sortColumns);
+                    if (item.sortable) {
+                        TableUnits.sort(column, itemType, order);
+                    } else if (item.pageSortable) {
+                        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];
+                            // 判断是否为字符串数字
+                            const numA = Number(aVal);
+                            const numB = Number(bVal);
+                            const isNumeric = aVal && bVal && !isNaN(numA) && !isNaN(numB);
+                            return isNumeric ? numA - numB : aVal.localeCompare(bVal);
+                        };
+                        column["showSorterTooltip"] = false;
+                        column["sortIcon"] = ({ sortOrder }) =>
+                            <ThemeToken>
+                                {(token) => <span className="pageSortable" >
+                                    <UpSquareFilled className="ascend" style={sortOrder === 'ascend' ? { color: token.colorPrimary } : {}} />
+                                    <DownSquareFilled className="descend" style={sortOrder === 'descend' ? { color: token.colorPrimary } : {}} />
+                                </span>}
+                            </ThemeToken>
+                    }
+                }
+            }
+            //特殊列处理
+            //序号
+            if (item.title === "序号") {
+                column["width"] = item.colWidth ? item.colWidth : 50;
+                column["title"] = translate("${序号}");
+                column["align"] = item.valueAlign ? item.valueAlign : "center";
+                column["render"] = (text, record, index) => <label>{index + 1}</label>;
+                item["sorter"] = undefined;
+            } else if (item.id == "10000") {
+                this.setSortProps(column, item, translate);
+            } else if (item.id == "20000") {
+                this.setHiddenRecordOpt(column, hiddenRowCodes, unHiden, onHide, translate);
+            } else if (item.title === "操作" && props.operatable) {
+                column["操作"] = "1";
+                column["fixed"] = "right";
+                column["align"] = "left";
+                column["width"] = item.colWidth ? item.colWidth : 160;
+                column["className"] = "opsColumn";
+                column["title"] = <>{translate("${操作}")}</>;
+                column["render"] = (text, record) => this.renderAction(props, record);
+            } else {
+                currentDataColIndex++;
+                column["className"] = "opsColumn";
+                // column["title"] = item.tip? <>{title1}<Tooltip placement="top" title={item.tip}>
+                //     <Button icon={<QuestionCircleOutlined />} /></Tooltip> </>: title1;
+                column["width"] = item.colWidth ? item.colWidth : 160;
+                column["ellipsis"] = { showTitle: true };
+                column["align"] = item.valueAlign ? item.valueAlign : "left";
+                if (
+                    ltmplConfig.leftFixedCols &&
+                    ltmplConfig.leftFixedCols >= currentDataColIndex
+                ) {
+                    column["fixed"] = "left";
+                } else {
+                    column["fixed"] = item.colFixed
+                        ? item.colFixed == "right"
+                            ? "right"
+                            : "left"
+                        : false;
+                }
+                column["render"] = (text, record) => {
+                    let detailParams = undefined;
+                    if (showView && primaryColumn?.id === item.id) { // 首字段增加主题色显示/查看详情功能
+                        if (buttons.includes("detail")) {
+                            const classView = ltmplConfig.classViewConfigs.find(r => ActionUtils.isShow(r.preposes, [record], undefined));
+                            if (classView) {
+                                detailParams = { code: record.code, dtmplSourceId: classView.id };
+                            } else {
+                                const isdetail = ActionUtils.isShow(ltmplConfig.buttonViewAction?.preposes, [record], undefined);
+                                detailParams = isdetail ? { code: record.code } : undefined;
+                            }
+                        } else if (buttons.includes("customDetail")) {
+                            detailParams = { code: record.code, toCustomPage: true };
+                        }
+                    }
+
+                    // 首字段渲染
+                    const renderPrimaryColumn = <div className="column-table-primary">
+                        <div className="primary-column" onClick={() => detailParams && showView(detailParams)}>
+                            <ViewControl
+                                serverKey={serverKey}
+                                fieldConfig={item}
+                                value={record[item.id]}
+                                holderType="table"
+                            />
+                        </div>
+                        {primaryColumnLabel?.id ?
+                            <div className="primary-column-label" >
+                                <ViewControl
+                                    serverKey={serverKey}
+                                    fieldConfig={primaryColumnLabel}
+                                    value={record[primaryColumnLabel.id]}
+                                    holderType="table"
+                                />
+                            </div> :
+                            ""}
+                        {/* 首字段操作按钮 */}
+                        {this.renderColumnAction(props, record, "primary")}
+                    </div>;
+                    // 次字段渲染
+                    const renderSecondColumn = <div className="column-table-second">
+                        <ViewControl
+                            serverKey={serverKey}
+                            fieldConfig={item}
+                            value={record[item.id]}
+                            holderType="table"
+                        />
+                        {this.renderColumnAction(props, record, "secondary")}
+                    </div>;
+
+                    return (editings.includes(record.code) || buttons.includes("multiRowEdit") ?
+                        <FormItem style={{ margin: 0 }}
+                            name={record.code + "_" + item.id}
+                            key={record.code + "_" + item.id}
+                            rules={TmplConfigAnalysis.getRules(item, translate)}
+                            initialValue={record[item.id]}>
+                            <EntryControl
+                                serverKey={serverKey}
+                                fieldConfig={{ ...item }}
+                                value={record[item.id]}
+                                editStatus={record.editStatus}
+                            />
+                        </FormItem> :
+                        <div className={record['dataType'] ? record['dataType'] === "小计" ? "xiaoji" : 'heji' : ""}>
+                            {primaryColumn?.id === item.id ? renderPrimaryColumn : secondColumn?.id === item.id ? renderSecondColumn :
+                                <ViewControl
+                                    serverKey={serverKey}
+                                    fieldConfig={item}
+                                    value={record[item.id]}
+                                    holderType="table"
+                                />
+                            }
+                        </div>
+                    );
+                };
+            }
+            // 表头列搜索
+            if (item.appendCriteria) {
+                const criteria = item.appendCriteria;
+                let searchVal = criteriaData?.[`c_${criteria.id}`];
+                column["filterDropdown"] = ({ setSelectedKeys, selectedKeys, confirm, clearFilters }) => (<div style={{ padding: 8 }} onKeyDown={(e) => e.stopPropagation()}>
+                    <EntryControl
+                        serverKey={serverKey}
+                        mainCode={mainCode}
+                        value={searchVal}
+                        fieldConfig={criteria}
+                        onChange={(val) => {
+                            const value = val?.target ? val.target.value : val;
+                            setSelectedKeys(value ? [value] : []);
+                            searchVal = value;
+                        }}
+                    />
+                    <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center", paddingTop: 8 }}>
+                        <Button type="text" size="small" onClick={() => {
+                            clearFilters();
+                            searchVal = undefined;
+                        }}>{translate("${重置}")}</Button>
+                        <Button onClick={() => {
+                            actTableDoSearch({ [`c_${criteria.id}`]: selectedKeys[0] });
+                            confirm();
+                        }} type="primary" size="small">{translate("${确定}")}</Button>
+                    </div>
+                </div>);
+                column["filteredValue"] = searchVal || undefined;
+            }
+            if (columnResize?.[item.id]) { // 本地缓存存在列宽配置
+                column["width"] = columnResize[item.id];
+            }
+        });
+        return tableColumns;
+    },
+
+    setSortProps(column: object, item: ColumnConfig, translate) {
+        column["title"] = (
+            <Tooltip title={translate("${拖拽排序}")}>
+                {translate("${" + item.title + "}")}
+            </Tooltip>
+        );
+        column["width"] = 40;
+        column["dataIndex"] = item.id;
+        column["key"] = item.id;
+        column["className"] = "drag-visible";
+        column["render"] = () => <DragHandle />;
+    },
+    setHiddenRecordOpt(column: object, hiddenRowCodes, unHiden, onHide, translate) {
+        //隐藏
+        column["align"] = "center";
+        column["width"] = 40;
+        column["title"] = (
+            <>
+                {hiddenRowCodes.length > 0 ? (
+                    <Tooltip title={translate("${取消隐藏}")}>
+                        <Button
+                            style={{ marginRight: "0px" }}
+                            size="small"
+                            shape={"circle"}
+                            icon={<EyeOutlined />}
+                            type={"text"}
+                            onClick={() => unHiden()}
+                        ></Button>
+                    </Tooltip>
+                ) : (
+                    ""
+                )}
+            </>
+        );
+        column["render"] = (text, record) => (
+            <Tooltip title={translate("${隐藏}")}>
+                {" "}
+                <Button
+                    style={{ marginRight: "0px" }}
+                    icon={<EyeInvisibleOutlined />}
+                    type="dashed"
+                    size="small"
+                    onClick={() => onHide(record.code)}
+                ></Button>
+            </Tooltip>
+        );
+    },
+
+    buildReportTableColumns(props: ReportColumnBuilderProps) {
+        const {
+            columnConfigs, translate, leftFixedCols, hiddenColIds, hiddenRowCodes, unHiden, onHide
+        } = props;
+
+        let tableColumns = [];
+        let s = 0;
+        let colConfigs = columnConfigs;
+
+        let currentDataColIndex = 0;
+
+        colConfigs.forEach((item) => {
+            if (item.hidden || (hiddenColIds && hiddenColIds.includes(item.originalId))) {
+                return
+            }
+            let column = {};
+            if (item.upperColumnTitle) {
+                let parent;
+                tableColumns.forEach(t => {
+                    if (t.title == item.upperColumnTitle && t.children) {
+                        parent = t;
+                        return
+                    }
+                })
+                if (parent) {
+                    parent.children.push(column);
+                } else {
+                    tableColumns.push({ title: item.upperColumnTitle, children: [column] })
+                }
+            } else {
+                tableColumns.push(column);
+            }
+
+            let title1 = translate("${" + item.title + "}");
+            column["title"] = item.tip ? <>{title1}<Tooltip placement="top" title={item.tip}>
+                <Button type={'text'} size={'small'} disabled={true} icon={<QuestionCircleOutlined />} /></Tooltip> </> : title1;
+            column["dataIndex"] = item.id;
+            column["key"] = item.id;
+            if (item["colWidth"]) column["width"] = item["colWidth"];
+            if (item["order"]) column["order"] = Number(item["order"]);
+            // column['ellipsis']= true;
+            s++;
+
+            //特殊列处理
+            //序号
+            if (item.title === "序号") {
+                column["width"] = item.colWidth ? item.colWidth : 50;
+                column["title"] = translate("${序号}");
+                column["align"] = item.valueAlign ? item.valueAlign : "center";
+                column["render"] = (text, record, index) =>
+                    <label className={record['dataType'] ? record['dataType'] == "小计" ? "xiaoji" : 'heji' : ""}>{record[item.id]}</label>;
+                item["sorter"] = undefined;
+            } else if (item.id == "10000") {
+                this.setSortProps(column, item, translate);
+            } else if (item.id == "20000") {
+                this.setHiddenRecordOpt(column, hiddenRowCodes, unHiden, onHide, translate);
+            } else {
+                currentDataColIndex++;
+                column["className"] = "opsColumn";
+                //column["title"] = translate("${" + item.title + "}");
+                column["width"] = item.colWidth ? item.colWidth : 160;
+                column["ellipsis"] = { showTitle: true };
+                column["align"] = item.valueAlign ? item.valueAlign : "left";
+                if (
+                    leftFixedCols &&
+                    leftFixedCols >= currentDataColIndex
+                ) {
+                    column["fixed"] = "left";
+                } else {
+                    column["fixed"] = item.colFixed
+                        ? item.colFixed == "right"
+                            ? "right"
+                            : "left"
+                        : false;
+                }
+                column["render"] = (text, record) => {
+                    return (
+                        <div className={record['dataType'] ? record['dataType'] == "小计" ? "xiaoji" : 'heji' : ""}>
+                            <ViewControl
+                                // serverKey={serverKey}
+                                fieldConfig={item}
+                                value={record[item.id]}
+                                holderType={"table"}
+                            /></div>
+                    );
+                };
+            }
+        });
+
+        //  console.log("columns", tableColumns);
+
+        return tableColumns;
+    },
+
+    handleColumnOrder(columnId, sortColumns) {
+        //const sortColumns = this.props.criteriaData["sortColIds"];
+
+        if (!Array.isArray(sortColumns)) return undefined;
+
+        for (const column of sortColumns) {
+            const [key, sort] = column.split("_");
+
+            if (key === columnId) {
+                if (sort === "asc") return "ascend";
+                if (sort === "desc") return "descend";
+                continue;
+            }
+        }
+        return undefined;
+    },
+    renderColumnAction(props: ActionRenderProps, record: DtmplData, type: "primary" | "secondary") { // 主列/次列悬浮按钮渲染
+        const { ltmplConfig, serverKey, doRowAction, doRAction, doCustomButton, translate, readOnly } = props;
+        const { primaryColumnButtons, secondColumnButtons } = ltmplConfig;
+        const temButtons = type === "primary" ? primaryColumnButtons : secondColumnButtons;
+        if (readOnly || !temButtons?.length) {
+            return null;
+        }
+        const actionButtons: any[] = temButtons.map(item => {
+            switch (item.functionType) {
+                case "action": // 操作按钮
+                    if (ActionUtils.isShow(item.preposes, [record], undefined)) {
+                        return <Action
+                            serverKey={serverKey}
+                            iconType={"icon"}
+                            key={item.id}
+                            data={[record]}
+                            actionConfig={item}
+                            doAction={doRowAction}
+                            buttonSize={"small"}
+                            serial={1}
+                        />;
+                    } else {
+                        return undefined;
+                    }
+                case "raction": // 关系按钮
+                    if (ActionUtils.isShow(item?.preposes, [record], undefined)) {
+                        return <Button
+                            key={item.id}
+                            size="small"
+                            type="dashed"
+                            onClick={() => doRAction(item.id, record.code)}
+                        >
+                            {item.icon ?
+                                <Tooltip placement="top" title={translate("${" + item.title + "}")}>
+                                    <Icon type={item.icon} />
+                                </Tooltip>
+                                : translate("${" + item.title + "}")}
+                        </Button>;
+                    } else {
+                        return undefined;
+                    }
+                case "customButton": // 自由按钮
+                    if (ActionUtils.isShow(item.preposes, [record], undefined)) {
+                        return <Button
+                            key={item.id}
+                            size="small"
+                            type={item.buttonType || "dashed"}
+                            onClick={() => doCustomButton(item as unknown as CustomButton, [record])}
+                        >
+                            {item.icon ?
+                                <Tooltip placement="top" title={translate("${" + item.title + "}")}>
+                                    <Icon type={item.icon} />
+                                </Tooltip>
+                                : translate("${" + item.title + "}")}
+                        </Button>
+                    } else {
+                        return undefined;
+                    };
+                case "fileExport": // 文件导出
+                    if (ActionUtils.isShow(item.preposes, [record], undefined)) {
+                        return <SelectCodeExport
+                            serverKey={serverKey}
+                            hiddenType="disabled"
+                            codes={[record.code]}
+                            key={item.id}
+                            fileExport={item}
+                            disabled={false}
+                        />;
+                    } else {
+                        return undefined;
+                    }
+                case "customExport": // 自定义导出
+                    return undefined;
+                case "cQuery": // 关联查询
+                    if (ActionUtils.isShow(item.preposes, [record], undefined)) {
+                        const config: CQueryConfig = item;
+                        return <CquickButton
+                            serverKey={serverKey}
+                            key={config.id}
+                            size={"small"}
+                            pageType={"drawer"}
+                            cQueryConfig={config}
+                            mainCode={config.mainCodeColId ? record[config.mainCodeColId] : record.code}
+                        />;
+                    } else {
+                        return undefined;
+                    }
+                default:
+                    return undefined;
+            }
+        }).filter(Boolean);
+        return actionButtons?.length ? <div className="column-action"><Space wrap size={4}>{actionButtons}</Space></div> : undefined;
+    },
+    renderAction(props: ActionRenderProps, record: DtmplData) { // 操作列按钮渲染
+        const { ltmplConfig, showView,
+            doEdit,
+            doRAction,
+            customEditable,
+            serverKey,
+            readOnly,
+            sourceId, translate, doCustomButton, doRowJump, blockMenuTreeDrawerOpen,
+            doRowAction, doDeleteByCode, editRowEdit, editings, cancelRowEdit, saveRowData, doDelModalOpen,
+            doView2D, doEdit2D, actTableDoSearch
+        } = props;
+        const { buttons, builtInButtons, defShowRowActionCount, strongDeleteConfirmText, edit2DBtnTitle, view2DBtnTitle, deleteBtnTitle, copyMode } = ltmplConfig;
+        let actionButtons: any[] = [];
+
+        const isShowDetail = buttons.includes("detail") && showView && ActionUtils.isShow(ltmplConfig.buttonViewAction?.preposes, [record], undefined);
+        const isShowCustomDetail = buttons.includes("customDetail") && showView && ActionUtils.isShow(ltmplConfig.buttonViewAction?.preposes, [record], undefined);
+
+        if (isShowCustomDetail) { // 自定义详情
+            actionButtons.push(<Button
+                size="small"
+                type="primary"
+                icon={<AlignLeftOutlined />}
+                onClick={() => showView({ code: record.code, toCustomPage: true, })}
+            />)
+        }
+
+        if (isShowDetail) { // 默认详情
+            actionButtons.push(<ViewButton
+                showView={showView}
+                data={record}
+                ltmplConfig={ltmplConfig}
+                buttonType={isShowCustomDetail ? "default" : "primary"} />);
+        }
+
+        if (buttons.includes("dtmplEdit") && doEdit && !readOnly) {
+            (
+                actionButtons.push(<EditButton
+                    doEdit={doEdit}
+                    data={record}
+                    ltmplConfig={ltmplConfig}
+                ></EditButton>)
+            )
+        };
+
+        // 2D图编辑
+        if (buttons.includes("edit2D") && doEdit2D && !readOnly) {
+            actionButtons.push((!edit2DBtnTitle || edit2DBtnTitle?.length < 4) ? <Button size="small" onClick={() => doEdit2D(record.code)}>{edit2DBtnTitle || <SettingOutlined />}</Button> :
+                <Tooltip title={edit2DBtnTitle}><Button size="small" onClick={() => doEdit2D(record.code)} icon={<SettingOutlined />} /></Tooltip>)
+        }
+
+        // 2D图查看
+        if (buttons.includes("view2D") && doView2D && !readOnly) {
+            actionButtons.push((!view2DBtnTitle || view2DBtnTitle?.length < 4) ? <Button size="small" onClick={() => doView2D(record.code)}>{ltmplConfig.view2DBtnTitle || <PlaySquareOutlined />}</Button> :
+                <Tooltip title={edit2DBtnTitle}><Button size="small" onClick={() => doView2D(record.code)} icon={<PlaySquareOutlined />} /></Tooltip>)
+        }
+
+        // 行内编辑
+        if (buttons.includes("rowEdit") && !buttons.includes("multiRowEdit")) {
+            actionButtons.push(<InlineEditButton
+                editings={editings}
+                editRowEdit={editRowEdit}
+                cancelRowEdit={cancelRowEdit}
+                saveRowData={saveRowData}
+                data={record}
+            />);
+        }
+
+        if (builtInButtons?.includes("blockAuthMenuTree") && !readOnly) {
+            actionButtons.push(<Button
+                size="small"
+                type="dashed"
+                icon={
+                    <KeyOutlined
+                        rotate={180}
+                        style={{ color: "#f5222d", marginRight: "4px" }}
+                    />
+                }
+                onClick={() => blockMenuTreeDrawerOpen(record)
+                }
+            ></Button>)
+        }
+
+        if ((buttons.includes("dtmplCustomEdit") || customEditable) &&
+            doEdit &&
+            !readOnly &&
+            ActionUtils.isShow(
+                ltmplConfig.buttonEditAction?.preposes,
+                [record],
+                undefined
+            )) {
+            actionButtons.push(<Button
+                size="small"
+                type="dashed"
+                icon={<FormOutlined />}
+                onClick={() =>
+                    doEdit({
+                        code: record.code,
+                        mode: "update",
+                        toCustomPage: true,
+                    })
+                }
+            ></Button>)
+        }
+        if (buttons.includes("copy") && doEdit && !readOnly) {
+            actionButtons.push(<Tooltip title={translate("${复制}")}>
+                <Button
+                    size="small"
+                    type="dashed"
+                    icon={<CopyOutlined />}
+                    onClick={async () => {
+                        //先复制
+                        let toCustomPage = false;
+                        if (buttons.includes("dtmplCustomEdit") || customEditable) {
+                            toCustomPage = true;
+                        }
+                        if (copyMode === "editCopy") { // 修改后再复制
+                            doEdit({ code: record.code, mode: "copy", toCustomPage });
+                        } else {
+                            let code = await HcserviceV3.doCopy(
+                                serverKey,
+                                sourceId,
+                                record.code
+                            ); // 复制
+                            if (code && copyMode !== "copyOnly") { // 先复制再编辑
+                                doEdit({ code, mode: "update", toCustomPage });
+                            } else if (code) {  // 仅复制
+                                message.success(translate("${复制成功}"));
+                                actTableDoSearch(null);
+                            }
+                        }
+                    }}
+                ></Button>
+            </Tooltip>)
+        }
+
+        if (ltmplConfig.rowCustomButtons) {
+            ltmplConfig.rowCustomButtons.map((customButton) => {
+                if (ActionUtils.isShow(
+                    customButton.preposes,
+                    [record],
+                    undefined
+                )) {
+                    actionButtons.push(
+                        <Button
+                            key={customButton.id}
+                            size="small"
+                            type={
+                                customButton.buttonType
+                                    ? customButton.buttonType
+                                    : "dashed"
+                            }
+                            onClick={() =>
+                                doCustomButton(customButton, [record])
+                            }
+                        >
+                            {customButton.icon ?
+                                <Tooltip placement="top" title={translate("${" + customButton.title + "}")}>
+                                    <Icon type={customButton.icon}></Icon>
+                                </Tooltip>
+                                : translate("${" + customButton.title + "}")}
+                        </Button>
+                    )
+                };
+            })
+        }
+        if (ltmplConfig.ractions && !readOnly) {
+            ltmplConfig.ractions.map((raction) => {
+                if (ActionUtils.isShow(
+                    raction?.preposes,
+                    [record],
+                    undefined
+                )) {
+                    actionButtons.push(
+                        <Button
+                            key={raction.id}
+                            size="small"
+                            type="dashed"
+                            onClick={() => doRAction(raction.id, record.code)}
+                        >
+                            {raction.icon ?
+                                <Tooltip placement="top" title={translate("${" + raction.title + "}")}>
+                                    <Icon type={raction.icon}></Icon>
+                                </Tooltip>
+                                : translate("${" + raction.title + "}")}
+                        </Button>
+                    );
+                }
+            })
+        }
+
+        if (ltmplConfig.rowActions &&
+            !readOnly &&
+            ltmplConfig.rowActions.length > 0) {
+            ltmplConfig.rowActions.map((action) => {
+                actionButtons.push(
+                    <Action
+                        serverKey={serverKey}
+                        iconType={"icon"}
+                        key={action.id}
+                        data={[record]}
+                        actionConfig={action}
+                        doAction={doRowAction}
+                        buttonSize={"small"}
+                        serial={1}
+                    ></Action>
+                );
+            })
+        }
+
+        if (ltmplConfig.rowJumps &&
+            ltmplConfig.rowJumps.length > 0 &&
+            !readOnly) {
+            ltmplConfig.rowJumps.map((jump) => {
+                if (ActionUtils.isShow(
+                    jump.preposes,
+                    [record],
+                    undefined
+                )) {
+                    actionButtons.push(
+                        <Button
+                            key={jump.id}
+                            size="small"
+                            type="dashed"
+                            onClick={() => doRowJump(jump, record)}
+                        >
+                            {jump.icon ?
+                                <Tooltip placement="top" title={translate("${" + jump.title + "}")}>
+                                    <Icon type={jump.icon}></Icon>
+                                </Tooltip>
+                                : translate("${" + jump.title + "}")}
+                        </Button>
+                    )
+                };
+            })
+        }
+        if (ltmplConfig.rowCQuerys &&
+            ltmplConfig.rowCQuerys.length > 0 &&
+            !readOnly
+        ) {
+            ltmplConfig.rowCQuerys.map((cquery) => {
+                if (ActionUtils.isShow(
+                    cquery.preposes,
+                    [record],
+                    undefined
+                )) {
+                    actionButtons.push(
+                        <CquickButton
+                            serverKey={serverKey}
+                            key={cquery.id}
+                            size={"small"}
+                            pageType={"drawer"}
+                            cQueryConfig={cquery}
+                            mainCode={
+                                cquery.mainCodeColId
+                                    ? record[cquery.mainCodeColId]
+                                    : record.code
+                            }
+                        />
+                    )
+                };
+            })
+        }
+        if (ltmplConfig.rowFileButtons &&
+            ltmplConfig.rowFileButtons.length > 0) {
+            ltmplConfig.rowFileButtons.map((openFileButton) => {
+                let v = record[openFileButton.fieldId];
+                if (v) {
+                    if (v instanceof Array) {
+                        v = v[0];
+                    }
+                    if (v.includes("@R@") > 0) {
+                        v = v.split("@R@")[1];
+                    }
+                    actionButtons.push(
+                        <NewinFileView
+                            title={openFileButton.title}
+                            filePath={HcserviceV3.toFilePath(v, serverKey)}
+                            serverKey={serverKey}
+                            key={openFileButton.id}
+                        //size={"small"}
+                        />
+                    );
+                }
+            })
+        }
+        if (buttons.includes("singleDelete") &&
+            !readOnly &&
+            ActionUtils.isShow(
+                ltmplConfig.buttonDeleteAction?.preposes,
+                [record],
+                undefined
+            )) {
+            actionButtons.push(
+                strongDeleteConfirmText ?
+                    ((!deleteBtnTitle || deleteBtnTitle?.length < 4) ?
+                        <Button size="small" type="dashed" danger onClick={() => doDelModalOpen(record)}>
+                            {deleteBtnTitle || <DeleteOutlined />}
+                        </Button> : <Tooltip title={deleteBtnTitle}>
+                            <Button size="small" type="dashed" danger onClick={() => doDelModalOpen(record)} icon={<DeleteOutlined />} />
+                        </Tooltip>)
+                    :
+                    <Popconfirm
+                        placement="rightBottom"
+                        title={translate("${确定要[删除]此数据吗}?")}
+                        onConfirm={() => doDeleteByCode(record)}
+                        okText={translate("${确定}")}
+                        cancelText={translate("${取消}")}
+                        okType={"danger"}
+                    >
+                        {(!deleteBtnTitle || deleteBtnTitle?.length < 4) ?
+                            <Button size="small" type="dashed" danger >{deleteBtnTitle || <DeleteOutlined />}</Button> :
+                            <Tooltip title={deleteBtnTitle}><Button size="small" type="dashed" danger icon={<DeleteOutlined />} /></Tooltip>}
+                    </Popconfirm>
+            )
+        }
+        let showButtons = [];
+        if (defShowRowActionCount <= 0 || defShowRowActionCount >= actionButtons.length) {
+            showButtons = actionButtons
+        } else {
+            showButtons = actionButtons.slice(0, defShowRowActionCount)
+            showButtons.push(
+                <Popover content={<Space wrap>
+                    {actionButtons.slice(defShowRowActionCount, actionButtons.length)}
+                </Space>} title={"更多操作"} trigger="hover">
+                    <Button size={"small"} icon={<EllipsisOutlined />} shape="circle" ></Button>
+                </Popover>
+            );
+        }
+        return <Space size={[0, 4]} wrap>
+            {showButtons}
+        </Space>
+    }
+
+}
+const DragHandle = SortableHandle(() => (
+    <MenuOutlined style={{ cursor: "grab", color: "#999" }} />
 ))