aldehyde 0.2.333 → 0.2.334

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

@@ -1,14 +1,9 @@
 import React from "react";
-import {
-  ActionRenderProps,
-  ColumnConfig,
-  DtmplData,
-  LtmplConfig,
-} from "../../tmpl/interface";
+import { ActionRenderProps, ColumnConfig, DtmplData, LtmplConfig, FieldConfig } from "../../tmpl/interface";
 import TableUnits from "../table-util";
 import SupportInputTypes from "../../tmpl/control-type-supportor";
-import {Button, Popconfirm, Popover, Space, Tooltip} from "antd";
-import {SortableHandle} from "react-sortable-hoc";
+import { Button, Popconfirm, Popover, Space, Tooltip, Form as AntdForm } from "antd";
+import { SortableHandle } from "react-sortable-hoc";
 import {
     AlignLeftOutlined, CopyOutlined, DeleteOutlined,
     EllipsisOutlined,
@@ -16,148 +11,174 @@ import {
     EyeOutlined,
     FormOutlined,
     KeyOutlined,
-    MenuOutlined, QuestionCircleOutlined
+    MenuOutlined, QuestionCircleOutlined,
 } 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 { ViewControl } from "../../index";
 import NewinFileView from "../../controls/file-view/newin-file-view";
+import { EntryControl } from "../../index";
+import TmplConfigAnalysis from "../../tmpl/tmpl-config-analysis";
 
+const FormItem = AntdForm.Item;
 
-interface ColumnBuilderProps extends ActionRenderProps{
-  ltmplConfig: LtmplConfig,
-  hiddenColIds?: string[],
-  hiddenRowCodes?: string[],
-  sortedColConfigs?: ColumnConfig[],
-  unHiden?:()=>any,
-    onHide?:(code: string)=>any,
-    operatable?:boolean,
+const isDisabled = (record: DtmplData, item: FieldConfig) => {
+    if (!item.rowEditType) {
+        return false;
+    }
+    let isNew: boolean = record.editStatus === "new";
+    let type = item.rowEditType;
+    if (type === "editable" || (type === "editonly" && !isNew) || (type === "addonly" && isNew)) {
+        return false;
+    } else if (type === "readonly") {
+        return true;
+    }
+    return true;
+}
+
+
+interface ColumnBuilderProps extends ActionRenderProps {
+    ltmplConfig: LtmplConfig,
+    hiddenColIds?: string[],
+    hiddenRowCodes?: string[],
+    sortedColConfigs?: ColumnConfig[],
+    unHiden?: () => any,
+    onHide?: (code: string) => any,
+    operatable?: boolean
 }
 
 interface ReportColumnBuilderProps {
     columnConfigs: ColumnConfig[],
     hiddenColIds?: string[],
-    translate:(...strs: string[]) => string;
+    translate: (...strs: string[]) => string;
     leftFixedCols: number,
     hiddenRowCodes?: string[],
-    unHiden?:()=>any,
-    onHide?:(code: string)=>any,
+    unHiden?: () => any,
+    onHide?: (code: string) => any,
 }
 
 
 export default {
 
     buildTableColumns(props: ColumnBuilderProps) {
-    const {
-      ltmplConfig,
-      hiddenColIds,
-      hiddenRowCodes,
-      sortedColConfigs, unHiden,
-        onHide,translate,
-       sortColumns,serverKey,
-    } = props;
-
-
-    let tableColumns = [];
-    let s = 0;
-    let colConfigs = sortedColConfigs ? sortedColConfigs : ltmplConfig.columns;
-
-    let currentDataColIndex = 0;
-
-    colConfigs.forEach((item) => {
-      let column = {};
-      if (hiddenColIds  && hiddenColIds.includes(item.originalId) ) {
-        return
-      }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);
-          }
-        }
-      }
-      //特殊列处理
-      //序号
-      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) => {
-          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;
-  },
+        const {
+            ltmplConfig,
+            hiddenColIds,
+            hiddenRowCodes,
+            sortedColConfigs, unHiden,
+            onHide, translate,
+            sortColumns, serverKey,
+            editings
+        } = props;
+
+
+        let tableColumns = [];
+        let s = 0;
+        let colConfigs = sortedColConfigs ? sortedColConfigs : ltmplConfig.columns;
+
+        let currentDataColIndex = 0;
+
+        colConfigs.forEach((item) => {
+            let column = {};
+            if (hiddenColIds && hiddenColIds.includes(item.originalId)) {
+                return
+            } 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);
+                    }
+                }
+            }
+            //特殊列处理
+            //序号
+            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) => {
+                    return (editings.indexOf(record.code) >= 0 ?
+                        <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, disabled: isDisabled(record, item) }}
+                                value={record[item.id]}
+                            />
+                        </FormItem> :
+                        <div className={record['dataType'] ? record['dataType'] === "小计" ? "xiaoji" : 'heji' : ""}>
+                            <ViewControl
+                                serverKey={serverKey}
+                                fieldConfig={item}
+                                value={record[item.id]}
+                                holderType="table"
+                            />
+                        </div>
+                    );
+                };
+            }
+        });
+        return tableColumns;
+    },
 
-    setSortProps(column:object,item:ColumnConfig,translate){
+    setSortProps(column: object, item: ColumnConfig, translate) {
         column["title"] = (
             <Tooltip title={translate("${拖拽排序}")}>
                 {translate("${" + item.title + "}")}
@@ -167,9 +188,9 @@ export default {
         column["dataIndex"] = item.id;
         column["key"] = item.id;
         column["className"] = "drag-visible";
-        column["render"] = () => <DragHandle/>;
+        column["render"] = () => <DragHandle />;
     },
-    setHiddenRecordOpt(column:object,hiddenRowCodes,unHiden,onHide,translate){
+    setHiddenRecordOpt(column: object, hiddenRowCodes, unHiden, onHide, translate) {
         //隐藏
         column["align"] = "center";
         column["width"] = 40;
@@ -178,10 +199,10 @@ export default {
                 {hiddenRowCodes.length > 0 ? (
                     <Tooltip title={translate("${取消隐藏}")}>
                         <Button
-                            style={{marginRight: "0px"}}
+                            style={{ marginRight: "0px" }}
                             size="small"
                             shape={"circle"}
-                            icon={<EyeOutlined/>}
+                            icon={<EyeOutlined />}
                             type={"text"}
                             onClick={() => unHiden()}
                         ></Button>
@@ -195,8 +216,8 @@ export default {
             <Tooltip title={translate("${隐藏}")}>
                 {" "}
                 <Button
-                    style={{marginRight: "0px"}}
-                    icon={<EyeInvisibleOutlined/>}
+                    style={{ marginRight: "0px" }}
+                    icon={<EyeInvisibleOutlined />}
                     type="dashed"
                     size="small"
                     onClick={() => onHide(record.code)}
@@ -205,393 +226,417 @@ export default {
         );
     },
 
-  buildReportTableColumns(props: ReportColumnBuilderProps) {
-    const {
-      columnConfigs,translate,  leftFixedCols,hiddenColIds,hiddenRowCodes,unHiden,onHide
-    } = props;
+    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"];
 
-    let tableColumns = [];
-    let s = 0;
-    let colConfigs = columnConfigs;
+        if (!Array.isArray(sortColumns)) return undefined;
 
-    let currentDataColIndex = 0;
+        for (const column of sortColumns) {
+            const [key, sort] = column.split("_");
 
-    colConfigs.forEach((item) => {
-        if (item.hidden || (hiddenColIds && hiddenColIds.includes(item.originalId)) ) {
-            return
+            if (key === columnId) {
+                if (sort === "asc") return "ascend";
+                if (sort === "desc") return "descend";
+                continue;
+            }
         }
-      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]})
+        return 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 } = props;
+        const { buttons, builtInButtons, defShowRowActionCount } = ltmplConfig;
+
+        let actionButtons: any[] = [];
+
+        if (buttons.includes("detail") &&
+            showView &&
+            ActionUtils.isShow(
+                ltmplConfig.buttonViewAction?.preposes,
+                [record],
+                undefined
+            )) {
+            actionButtons.push(<ViewButton
+                showView={showView}
+                data={record}
+                ltmplConfig={ltmplConfig}></ViewButton>);
         }
-      }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;
+        if (buttons.includes("customDetail") &&
+            showView &&
+            ActionUtils.isShow(
+                ltmplConfig.buttonViewAction?.preposes,
+                [record],
+                undefined
+            )) {
+            actionButtons.push(<Button
+                size="small"
+                type="primary"
+                icon={<AlignLeftOutlined />}
+                onClick={() => showView({ code: record.code })}
+            ></Button>)
         }
-        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);
+        if (buttons.includes("dtmplEdit") && doEdit && !readOnly) {
+            (
+                actionButtons.push(<EditButton
+                    doEdit={doEdit}
+                    data={record}
+                    ltmplConfig={ltmplConfig}
+                ></EditButton>)
+            )
+        };
+        // 行内编辑
+        if (buttons.includes("rowEdit")) {
+            actionButtons.push(<InlineEditButton
+                editings={editings}
+                editRowEdit={editRowEdit}
+                cancelRowEdit={cancelRowEdit}
+                saveRowData={saveRowData}
+                data={record}
+            />);
+        }
 
-    return tableColumns;
-  },
+        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>)
+        }
 
-   handleColumnOrder (columnId, sortColumns) {
-    //const sortColumns = this.props.criteriaData["sortColIds"];
+        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 (!Array.isArray(sortColumns)) return undefined;
+        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])
+                            }
+                        >
+                            {translate("${" + customButton.title + "}")}
+                        </Button>
+                    )
+                };
+            })
+        }
+        if (ltmplConfig.ractions && !readOnly) {
+            ltmplConfig.ractions.map((raction) => {
+                actionButtons.push(
+                    ActionUtils.isShow(
+                        raction?.preposes,
+                        [record],
+                        undefined
+                    ) ?
+                        <Button
+                            key={raction.id}
+                            size="small"
+                            type="dashed"
+                            onClick={() => doRAction(raction.id, record.code)}
+                        >
+                            {translate("${" + raction.title + "}")}
+                        </Button> : ""
+                );
+            })
+        }
 
-    for (const column of sortColumns) {
-      const [key, sort] = column.split("_");
+        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 (key === columnId) {
-        if (sort === "asc") return "ascend";
-        if (sort === "desc") return "descend";
-        continue;
-      }
+        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)}
+                        >
+                            {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(
+                <Popconfirm
+                    placement="rightBottom"
+                    title={translate("${确定要[删除]此数据吗}?")}
+                    onConfirm={() => {
+                        doDeleteByCode(record.code);
+                    }}
+                    okText={translate("${确定}")}
+                    cancelText={translate("${取消}")}
+                    okType={"danger"}
+                >
+                    <Button size="small" type="dashed" danger>
+                        <DeleteOutlined />
+                    </Button>
+                </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>
     }
-    return undefined;
-  },
-  renderAction(props:ActionRenderProps,  record:DtmplData){
-   const {ltmplConfig, showView,
-        doEdit,
-        doRAction,
-        customEditable,
-        serverKey,
-        readOnly,
-        sourceId, translate,doCustomButton, doRowJump, blockMenuTreeDrawerOpen,
-        doRowAction, doDeleteByCode}=props;
-    const {buttons, builtInButtons,defShowRowActionCount} = ltmplConfig;
-
-    let actionButtons:any[]=[];
-
-    if(buttons.includes("detail") &&
-          showView &&
-          ActionUtils.isShow(
-              ltmplConfig.buttonViewAction?.preposes,
-              [record],
-              undefined
-          ) ){actionButtons.push(<ViewButton
-        showView={showView}
-        data={record}
-        ltmplConfig={ltmplConfig}></ViewButton>);}
-          if(buttons.includes("customDetail") &&
-          showView &&
-          ActionUtils.isShow(
-              ltmplConfig.buttonViewAction?.preposes,
-              [record],
-              undefined
-          ) ) {
-              actionButtons.push(<Button
-                  size="small"
-                  type="primary"
-                  icon={<AlignLeftOutlined/>}
-                  onClick={() => showView({code: record.code})}
-              ></Button>)
-          }
-
-          if(buttons.includes("dtmplEdit") && doEdit && !readOnly ){ (
-              actionButtons.push(<EditButton
-                  doEdit={doEdit}
-                  data={record}
-                  ltmplConfig={ltmplConfig}
-              ></EditButton>)
-          ) };
-         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])
-                          }
-                      >
-                          {translate("${" + customButton.title + "}")}
-                      </Button>
-                  )};
-              })}
-          if(ltmplConfig.ractions && !readOnly){
-               ltmplConfig.ractions.map((raction) => {
-                   actionButtons.push (
-                      ActionUtils.isShow(
-                          raction?.preposes,
-                          [record],
-                          undefined
-                      ) ?
-                          <Button
-                              key={raction.id}
-                              size="small"
-                              type="dashed"
-                              onClick={() => doRAction(raction.id, record.code)}
-                          >
-                              {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)}
-                      >
-                          {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(
-              <Popconfirm
-                  placement="rightBottom"
-                  title={translate("${确定要[删除]此数据吗}?")}
-                  onConfirm={() => {
-                      doDeleteByCode(record.code);
-                  }}
-                  okText={translate("${确定}")}
-                  cancelText={translate("${取消}")}
-                  okType={"danger"}
-              >
-                  <Button size="small" type="dashed" danger>
-                      <DeleteOutlined/>
-                  </Button>
-              </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"}}/>
+    <MenuOutlined style={{ cursor: "grab", color: "#999" }} />
 ))