aldehyde 0.2.91 → 0.2.93

package/src/aldehyde/module/ltmpl-table.tsx

@@ -40,6 +40,7 @@ export interface LtmplTableState {
     showDtmplCustomEdit?: boolean;
     ractionId?: string,
     collapse?: boolean,
+    addTmplId?:string,
 };
 
 class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
@@ -56,6 +57,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
         showDraw: false,
         ractionId: undefined,
         collapse: false,
+        addTmplId:undefined,
     }
 
     static defaultProps = {
@@ -143,7 +145,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
             ractionId
         })
     }
-    doCreate = (toCustomPage) => {
+    doCreate = (addTmplId:string,toCustomPage?:boolean,) => {
         const {doCustomCreate} = this.props
         if (toCustomPage) {
             if (doCustomCreate) {
@@ -160,6 +162,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
             this.setState({
                 selectedCode: null,
                 showDtmplEdit: true,
+                addTmplId,
             })
         }
     }
@@ -203,7 +206,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
 
 
     render() {
-        const {ltmplConfigRes, criteriaData,pageSize,pageNo, showDtmplView, selectedCode, showDtmplEdit, showDtmplCustomEdit, ractionId, showDraw, collapse} = this.state;
+        const {ltmplConfigRes, criteriaData,pageSize,pageNo, showDtmplView, selectedCode, showDtmplEdit, showDtmplCustomEdit, ractionId, showDraw, collapse,addTmplId} = this.state;
         const {sourceId, mainCode, showView, doSearch, doRAction, funcMode, tip,title, collapsible, initCollapse,doCustomEdit,doCustomCreate,serverKey,readOnly} = this.props;
 
         if (!ltmplConfigRes) {
@@ -227,7 +230,7 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
                                     sourceId={sourceId}
                                     code={selectedCode}> </ModalDtmplView> : ""}
                 {(buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd')) && showDtmplEdit ?
-                    <DtmplEditPage serverKey={serverKey} open={showDtmplEdit} onCancel={() => {
+                    <DtmplEditPage addTmplId={addTmplId} serverKey={serverKey} open={showDtmplEdit} onCancel={() => {
                         this.setState({
                             showDtmplEdit: false,
                         })

package/src/aldehyde/routable/dtmpl-route.tsx

@@ -114,8 +114,10 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
     }
 
     render() {
-        const {location,params}=this.props;
-        const {sourceId,} = params;
+
+        const {location,params,searchParams}=this.props;
+        const {sourceId} = params;
+
         const {codeSource}=this.state;
         if(!location){
             return <></>;
@@ -132,7 +134,7 @@ class DtmplRoute extends React.Component<DtmplRouteProps, DtmplRoutePropsStat> {
             );
         }else{
             return (
-                <DtmplEdit serverKey={null} addOrUpdate={this.getMode()} sourceId={sourceId} code={code} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
+                <DtmplEdit addTmplId={searchParams.get('addTmplId')} serverKey={null} addOrUpdate={this.getMode()} sourceId={sourceId} code={code} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
             );
         }
 

package/src/aldehyde/routable/ltmpl-route.tsx

@@ -101,11 +101,11 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         return mainCode;
     }
 
-    doCreate = (toCustomPage: boolean = false) => {
+    doCreate = (addTmplId:string,toCustomPage: boolean = false) => {
         const {basePath} = this.props;
         const {sourceId} = this.props.params;
         const {ltmplConfigRes} = this.state;
-        let path = `${basePath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}`;
+        let path = `${basePath}/${sourceId}/detail-edit?menuId=${this.getMenuId()}&addTmplId=${addTmplId}`;
         if (toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath) {
             path = `${basePath}/page/${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?menuId=${this.getMenuId()}`;
         }

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

@@ -25,7 +25,7 @@ import "./index.css"
 import {
     ActTableMode,
     ActTableViewModel,
-    AddOrUpdate,
+    AddOrUpdate, ClassifiedAddConfig,
     ColumnConfig,
     DtmplData, JumpConfig,
     LtmplConfig,
@@ -68,7 +68,7 @@ interface ActTableProps extends TmplBaseProps {
     ltmplConfig: LtmplConfig,
     menuId?: string,
     showView?: (code: string, toCustomPage?: boolean) => void,
-    doCreate?: (toCustomPage?: boolean) => void,
+    doCreate?: (addtmplId:string,toCustomPage: boolean) => void,
     customCreatable?:boolean,
     doEdit?: (code: string, mode: AddOrUpdate, toCustomPage?: boolean) => void,
     customEditable?:boolean,
@@ -199,7 +199,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     }
 
     buildTableColumns = (ltmplConfig: LtmplConfig, hiddenColIds: string[], hiddenRowCodes: string[], sortedColConfigs: ColumnConfig[]) => {
-        const { showView, doEdit, doRAction,customEditable,serverKey,readOnly} = this.props
+        const { showView, doEdit, doRAction,customEditable,serverKey,readOnly,sourceId} = this.props
         const {buttons} = ltmplConfig;
         let tableColumns = [];
         let s = 0;
@@ -280,7 +280,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                                 icon={<EditOutlined/>}
                                 onClick={() => doEdit(record.code, 'update')}>
                             </Button> : ""}
-                        {(buttons.includes('dtmplCustomEdit') ||customEditable) && doEdit && !readOnly
+                        {(buttons.includes('dtmplCustomEdit') || customEditable) && doEdit && !readOnly
                         && (!ltmplConfig.editAction || ActionUtils.isShow(ltmplConfig.editAction, [record], undefined)) ?
                             < Button
                                 size="small"
@@ -294,7 +294,17 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                                 size="small"
                                 type="dashed"
                                 icon={<CopyOutlined/>}
-                                onClick={() => doEdit(record.code, 'copy')}>
+                                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, 'update',toCustomPage);
+                                    }
+                                }}>
                             </Button></Tooltip> : ""}
                         {ltmplConfig.ractions && !readOnly ? ltmplConfig.ractions.map((raction) => {
                             return <Button
@@ -595,6 +605,18 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         })
     }
 
+    getAddTmplButton= (classifiedAddConfigs: ClassifiedAddConfig[]) => {
+        if(classifiedAddConfigs && classifiedAddConfigs.length<1){
+            return "没有分类添加按钮";
+        }
+        return classifiedAddConfigs.map((config)=>{
+            return <p><Button size={'small'} type={'text'}
+                onClick={() => this.props.doCreate(config.id,false)}>
+                {config.title}
+            </Button></p>
+        })
+    }
+
 
     renderHeaderButtons = () => {
         let {hiddenColIds, queryKey, viewModels, sortedColConfigs, disabledColIds, showL2Chart, showL2ActTable} = this.state;
@@ -609,15 +631,23 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                 : null
             }
             {buttons.includes("dtmplAdd") && doCreate && !readOnly ?
-                <Tooltip title={'创建'}>
+                ltmplConfig.classifiedAddConfigs && ltmplConfig.classifiedAddConfigs.length>0 ?
+                    <Popover arrow={false}  content={this.getAddTmplButton(ltmplConfig.classifiedAddConfigs)}
+                             placement="bottomRight"
+                             >
+                        <Tooltip >
+                            <Button><PlusOutlined/></Button>
+                        </Tooltip>
+                    </Popover>
+                    :<Tooltip title={'创建'}>
                     <Button
-                        onClick={() => doCreate()}>
+                        onClick={() => doCreate(null,false)}>
                         <PlusOutlined/>
                     </Button> </Tooltip> : ''}
             {(buttons.includes("dtmplCustomAdd") || customCreatable) && doCreate && !readOnly?
                 <Tooltip title={'创建'}>
                     <Button
-                        onClick={() => doCreate(true)}><PlusCircleOutlined/></Button></Tooltip> : ''}
+                        onClick={() => doCreate(null,true)}><PlusCircleOutlined/></Button></Tooltip> : ''}
             {buttons.includes("importLtmplExcel")  && !readOnly ? <Tooltip title={'导入'}> <Button
                 href={`#/${sourceId}/importer?menuId=${menuId}`} target={'_blank'}>
                 <UploadOutlined/>

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import {Button, Col, Form, message, Row, Space, Table, Tooltip, Typography} from 'antd';
+import {Button, Col, Form, message, Popover, Row, Space, Table, Tooltip, Typography} from 'antd';
 import {
     AlignLeftOutlined,
     DeleteOutlined,
@@ -9,7 +9,7 @@ import {
     SnippetsOutlined
 } from '@ant-design/icons';
 import "./index.css";
-import {DtmplData, FieldGroupConfig, SelectedRow, ViewOrEdit} from "../tmpl/interface";
+import {ClassifiedAddConfig, DtmplData, FieldGroupConfig, SelectedRow, ViewOrEdit} from "../tmpl/interface";
 import SupportInputTypes from '../tmpl/control-type-supportor';
 import TableUnits from "./table-util";
 import ViewControl from "../controls/view-control";
@@ -49,6 +49,7 @@ interface RelationTableStat {
     selectedDtmplData?: DtmplData,
     filterStr?: string,
     pageSize?: number,
+    addTmplId?:string,
 };
 
 
@@ -64,6 +65,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         selectedDtmplData: undefined,
         filterStr: undefined,
         pageSize: 10,
+        addTmplId:undefined,
         // columns:[],
         // dataSource:[],
         // current:1,
@@ -439,19 +441,33 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         //this.hiddenRowEdit();
     }
 
-    showAddDtmplModel = () => {
+    showAddDtmplModel = (addTmplId?:string) => {
         this.setState({
             showDtmplEdit: true,
+            addTmplId,
             selectedCode: undefined,
         })
     }
     showEditDtmplModel = (record) => {
         this.setState({
             showDtmplEdit: true,
+            addTmplId:undefined,
             selectedCode: record.code,
         })
     }
 
+    getAddTmplButton= (classifiedAddConfigs: ClassifiedAddConfig[]) => {
+        if(classifiedAddConfigs && classifiedAddConfigs.length<1){
+            return "没有分类添加按钮";
+        }
+        return classifiedAddConfigs.map((config)=>{
+            return <p><Button size={'small'} type={'text'}
+                              onClick={() => this.showAddDtmplModel(config.id)}>
+                {config.title}
+            </Button></p>
+        })
+    }
+
     buildButtons = () => {
         const {fieldGroupConfig, viewOrEdit, value,serverKey} = this.props;
         const {buttons, disabled} = fieldGroupConfig;
@@ -469,11 +485,20 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                             ></RowEditor>
                             : ''}
                         {buttons.includes('dtmplAdd') ?
+                            fieldGroupConfig.classifiedAddConfigs && fieldGroupConfig.classifiedAddConfigs.length>0 ?
+                                <Popover arrow={false}  content={this.getAddTmplButton(fieldGroupConfig.classifiedAddConfigs)}
+                                          placement="bottomRight"
+                                >
+                                    <Tooltip >
+                                        <Button icon={<PlusSquareOutlined/>}>新增</Button>
+                                    </Tooltip>
+                                </Popover>
+                                :
                             <Button
                                 disabled={buttonDisabled}
                                 icon={<PlusSquareOutlined/>}
                                 size="small"
-                                onClick={this.showAddDtmplModel}
+                                onClick={()=>this.showAddDtmplModel()}
                                 style={{marginBottom: 10}}
                             >新增</Button> : ""}
                         {buttons.includes('selectAdd') ?
@@ -513,7 +538,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
     render() {
 
         const {fieldGroupConfig, value, parentId, loading, initCollapse, mainCode,serverKey,showRightNav} = this.props;
-        const {pageSize, selectedCode, showDtmplView, showSelectTable, showDtmplEdit, tableLoading, showRowEdit, selectedDtmplData} = this.state;
+        const {pageSize, selectedCode, showDtmplView, showSelectTable, showDtmplEdit,addTmplId, tableLoading, showRowEdit, selectedDtmplData} = this.state;
 
         const {buttons} = fieldGroupConfig;
         let mainCode1 = fieldGroupConfig.mainCode ? fieldGroupConfig.mainCode : mainCode ? mainCode : parentId;
@@ -570,7 +595,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                                         sourceId={fieldGroupConfig.id}
                                         code={selectedCode}> </ModalDtmplView> : ""}
                     {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                        <DtmplEditPage serverKey={serverKey} mainCode={mainCode1} open={showDtmplEdit} onCancel={this.hiddenEntityEdit}
+                        <DtmplEditPage addTmplId={addTmplId}  serverKey={serverKey} mainCode={mainCode1} open={showDtmplEdit} onCancel={this.hiddenEntityEdit}
                                        sourceId={fieldGroupConfig.id}
                                        code={selectedCode}
                                        onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd}/>

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

@@ -101,6 +101,9 @@ async function loadEnumOfSelectConfig(serverKey: string, selectConfig: SelectCon
 
 async function loadEnumOfLtmplConfig(serverKey: string, selectConfig: LtmplConfig) {
     const mstrucIds = [];
+    if(!selectConfig){
+        return;
+    }
     let subs = findUnloadEnumMstrucIdOfFields(selectConfig.columns);
     concat(mstrucIds, subs);
     subs = findUnloadEnumMstrucIdOfFields(selectConfig.criterias);
@@ -160,7 +163,6 @@ HCDataSource.getOptions = async function (serverKey: string, mstrucId: string) {
             }
             enumMap.set(mstrucId, reqOptions);
         }
-
     }
 
     return enumMap.get(mstrucId);
@@ -229,13 +231,14 @@ HCDataSource.requestViewDtmplConfig = async function (serverKey: string, sourceI
     return viewDtmplConfigMap.get(sourceId);
 };
 
-HCDataSource.requestAddDtmplConfig = async function (serverKey: string, sourceId: string) {
-    if (!addDtmplConfigMap.has(sourceId)) {
-        addDtmplConfigMap.set(sourceId, await HcserviceV3.requestAddDtmplConfig(serverKey, sourceId));
+HCDataSource.requestAddDtmplConfig = async function (serverKey: string, sourceId: string,addTmplId:string) {
+   let key=addTmplId?addTmplId:sourceId;
+    if (!addDtmplConfigMap.has(key)) {
+        addDtmplConfigMap.set(key, await HcserviceV3.requestAddDtmplConfig(serverKey, sourceId,addTmplId));
         //加载枚举
-        await loadEnumOfDtmplConfig(serverKey, addDtmplConfigMap.get(sourceId));
+        await loadEnumOfDtmplConfig(serverKey, addDtmplConfigMap.get(key));
     }
-    return addDtmplConfigMap.get(sourceId);
+    return addDtmplConfigMap.get(key);
 };
 
 HCDataSource.getEnums = function (mstrucId: string): EnumItem[] {

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

@@ -72,14 +72,14 @@ export default class HcserviceV3 {
         return res.dtmplConfig;
     }
 
-    static async requestAddDtmplConfig(serverKey:string,sourceId: string) {
+    static async requestAddDtmplConfig(serverKey:string,sourceId: string,addTmplId:string) {
 
         let url = `/v3/add-dtmpl/config`
         let res = await Super.super({
             url,
             serverKey,
             method: "GET",
-            query: {sourceId}
+            query: {sourceId,addTmplId}
         });
         return res.dtmplConfig;
     }
@@ -501,7 +501,7 @@ export default class HcserviceV3 {
         return res;
     }
 
-    static async doCopy(serverKey:string,sourceId:string,code:string,copyRelation,copyOpp2One) {
+    static async doCopy(serverKey:string,sourceId:string,code:string,copyRelation?,copyOpp2One?) {
         let res = await Super.super({
             url: `/v3/mstruc/copy-data`,
             serverKey,
@@ -511,12 +511,12 @@ export default class HcserviceV3 {
                 code,copyRelation,copyOpp2One
             }
         },null,null);
-        if(res.status != 'success'){
+        if(res.status == 'success' ){
             if(res.message){
-                message.error("错误消息：" + res.message,4)
+                message.info("提示信息：" + res.message,4)
             }
         }
-        return res;
+        return res.entityCode;
     }
 
     // static downloadDetailExcel(sourceId, entityCode) {

package/src/aldehyde/tmpl/interface.tsx

@@ -77,6 +77,10 @@ export interface JumpConfig extends OrderableTmplBase {
     searchParams:FieldConfig[],
     routeParams:FieldConfig[],
 }
+export interface ClassifiedAddConfig extends OrderableTmplBase {
+
+}
+
 
 export interface Level2Menu extends MenuBase {
     items:(BlockMenu|Level2Menu)[],
@@ -142,6 +146,7 @@ export interface FieldGroupConfig extends OrderableTmplBase {
     pageSourceFieldMstrucId:string,
     codeSourceFieldMstrucId:string,
     pointSourceId:string,
+    classifiedAddConfigs?:ClassifiedAddConfig[],
 }
 
 export type SaveJumpType = 'list' | 'add' | 'edit';
@@ -251,6 +256,7 @@ export interface LtmplConfig extends SelectConfig {
     reStatParams?: CriteriaConfig[];
     customEditPagePath?:string;
     customViewPagePath?:string;
+    classifiedAddConfigs?:ClassifiedAddConfig[],
     drillingParams?: CriteriaConfig[];
     footer?:string;
     header?:string;
@@ -369,6 +375,7 @@ export interface DtmplBaseProps extends TmplBaseProps {
     serialNumber?: number,
     goDtmpl?: (code?:string) => void,
     maxColsOnRow?:1|2,
+    addTmplId?:string,
 };
 
 export interface ChartConfig {

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

@@ -21,6 +21,7 @@ interface ActTreeState {
     mainCode?: string,
     sourceId?: string,
     cardtitle?:string,
+    addTmplId?:string,
 }
 
 export default class ActTree extends React.PureComponent<ActTreeProps, ActTreeState> {
@@ -34,6 +35,7 @@ export default class ActTree extends React.PureComponent<ActTreeProps, ActTreeSt
         mainCode: undefined,
         sourceId: undefined,
         cardtitle:undefined,
+        addTmplId:undefined
     }
 
     refTmplTree: any = React.createRef();
@@ -67,42 +69,42 @@ export default class ActTree extends React.PureComponent<ActTreeProps, ActTreeSt
         const {ttmplConfig} = this.props;
         this.showCard(title,ttmplConfig.rootGtmplId,null,code,true,false);
     };
-    showCard=(cardtitle,sourceId,mainCode,recordCode,showEdit,showView)=>{
+    showCard=(cardtitle,sourceId,mainCode,recordCode,showEdit,showView,addTmplId?:string)=>{
         this.setState({
             mainCode,
             cardtitle,
             recordCode,
             showEdit,
             showView,
-            sourceId,
+            sourceId,addTmplId
         })
     }
     onViewRoot = (title:string,code?: string) => {
         const {ttmplConfig} = this.props;
-        this.showCard(title,ttmplConfig.rootGtmplId,null,code,false,true);
+        this.showCard(title,ttmplConfig.rootGtmplId,null,code,false,true,null);
     };
 
     onEditSub = (title:string,sourceId:string,mainCode:string,recordCode?: string) => {
-        this.showCard(title,sourceId,mainCode,recordCode,true,false);
+        this.showCard(title,sourceId,mainCode,recordCode,true,false,null);
     };
 
     onViewSub = (title:string,sourceId:string,mainCode:string,recordCode?: string) => {
 
-        this.showCard(title,sourceId,mainCode,recordCode,false,true);
+        this.showCard(title,sourceId,mainCode,recordCode,false,true,null);
     };
 
     onDelete=(sourceId:string,recordCode?: string) => {
         HcserviceV3.deleteByCode(null,sourceId, [recordCode]);
     };
-    onAddSub=(title:string,sourceId:string,mainCode: string) => {
+    onAddSub=(title:string,sourceId:string,mainCode: string,addTmplId: string) => {
         
-        this.showCard(title,sourceId,mainCode,null,true,false);
+        this.showCard(title,sourceId,mainCode,null,true,false,addTmplId);
     };
 
     render() {
         const {} = this.props;
 
-        const {ttmplNodeConfig,showView, showEdit, recordCode, mainCode, sourceId,cardtitle} = this.state;
+        const {ttmplNodeConfig,showView, showEdit, recordCode, mainCode, sourceId,cardtitle,addTmplId} = this.state;
         if (!ttmplNodeConfig) {
             return <Card loading={true}></Card>
         }
@@ -128,7 +130,7 @@ export default class ActTree extends React.PureComponent<ActTreeProps, ActTreeSt
             </Sider>
             <Layout style={{marginLeft: 322, backgroundColor: '#fff'}}>
                 <Content style={{overflow: 'initial'}}>
-                    {showEdit ? <DtmplEditCard title={<>{recordCode ? <>编辑 {cardtitle?cardtitle:""}</> : <>添加 {cardtitle?cardtitle:""}</>} </>}
+                    {showEdit ? <DtmplEditCard addTmplId={addTmplId} title={<>{recordCode ? <>编辑 {cardtitle?cardtitle:""}</> : <>添加 {cardtitle?cardtitle:""}</>} </>}
                                                mainCode={mainCode}
                                                sourceId={sourceId}
                                                code={recordCode}

package/src/aldehyde/tree/tmpl-tree.tsx

@@ -24,7 +24,7 @@ interface TmplTreeProps {
     doEditRoot?: (title:string,code?: string) => void,
     doViewRoot?: (title:string,code?: string) => void,
     doDelete?: (ratmplId: string, code?: string) => void,
-    doAddSub?: (title:string,ratmplId: string, mainCode: string) => void,
+    doAddSub?: (title:string,ratmplId: string, mainCode: string,addTmplId:string) => void,
 }
 
 interface TmplTreeState {
@@ -236,7 +236,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
         const {doAddSub} = this.props;
         return <Button onClick={(e) => {
             this.stopPropagation(e)
-            doAddSub(title,ratmplId, mainCode);
+            doAddSub(title,ratmplId, mainCode,null);
         }} size={'small'}>{icon}{title}</Button>
     }
 
@@ -245,19 +245,19 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
         let buttons = [];
         if (dataNode.parent) {//说明是sub
             if (dataNode.isLeaf) {
-                if (ttmplNodeConfig.leafLTmplConfig.buttons.indexOf("dtmplEdit") > 0) {
+                if (ttmplNodeConfig.leafLTmplConfig?.buttons.indexOf("dtmplEdit") > 0) {
                     buttons.push(<Button onClick={(e) => {
                         this.stopPropagation(e)
                         doEditSub(ttmplNodeConfig.leafTitle,ttmplNodeConfig.leafRatmplId, dataNode.parent.code, dataNode.code);
                     }} size={'small'}><EditOutlined/>编辑</Button>);
                 }
-                if (ttmplNodeConfig.leafLTmplConfig.buttons.indexOf("detail") > 0) {
+                if (ttmplNodeConfig.leafLTmplConfig?.buttons.indexOf("detail") > 0) {
                     buttons.push(<Button onClick={(e) => {
                         this.stopPropagation(e)
                         doViewSub(ttmplNodeConfig.leafTitle,ttmplNodeConfig.leafRatmplId, dataNode.parent.code, dataNode.code);
                     }} size={'small'}><AlignLeftOutlined/>查看</Button>);
                 }
-                if (ttmplNodeConfig.leafLTmplConfig.buttons.indexOf("singleDelete") > 0) {
+                if (ttmplNodeConfig.leafLTmplConfig?.buttons.indexOf("singleDelete") > 0) {
                     buttons.push(this.getDeleteButton(ttmplNodeConfig.leafRatmplId, dataNode.code)
                     );
                 }
@@ -269,7 +269,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
                         doEditSub(ttmplNodeConfig.branchTitle,ttmplNodeConfig.branchRatmplId, dataNode.parent.code, dataNode.code);
                     }} size={'small'}><EditOutlined/>编辑</Button>);
                 }
-                if (ttmplNodeConfig.branchLTmplConfig.buttons.indexOf("detail") > 0) {
+                if (ttmplNodeConfig.branchLTmplConfig?.buttons.indexOf("detail") > 0) {
                     buttons.push(<Button onClick={(e) => {
                         this.stopPropagation(e)
                         doViewSub(ttmplNodeConfig.branchTitle,ttmplNodeConfig.branchRatmplId, dataNode.parent.code, dataNode.code);
@@ -277,18 +277,18 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
 
                 }
 
-                if (ttmplNodeConfig.branchLTmplConfig.buttons.indexOf("dtmplAdd") > 0) {
+                if (ttmplNodeConfig.branchLTmplConfig?.buttons.indexOf("dtmplAdd") > 0) {
                     buttons.push(this.getAddButton(ttmplNodeConfig.branchTitle,
                         <PlusSquareOutlined/>, ttmplNodeConfig.branchRatmplId, dataNode.code)
                     );
                 }
 
-                if (ttmplNodeConfig.leafLTmplConfig.buttons.indexOf("dtmplAdd") > 0) {
+                if (ttmplNodeConfig.leafLTmplConfig?.buttons.indexOf("dtmplAdd") > 0) {
                     buttons.push(this.getAddButton(ttmplNodeConfig.leafTitle,
                         <PlusOutlined/>, ttmplNodeConfig.leafRatmplId, dataNode.code)
                     );
                 }
-                if (ttmplNodeConfig.branchLTmplConfig.buttons.indexOf("singleDelete") > 0) {
+                if (ttmplNodeConfig.branchLTmplConfig?.buttons.indexOf("singleDelete") > 0) {
                     buttons.push(this.getDeleteButton(ttmplNodeConfig.branchRatmplId, dataNode.code));
                 }
             }
@@ -313,7 +313,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
                     );
                 }
             }
-            if (ttmplNodeConfig.leafLTmplConfig.buttons.indexOf("dtmplAdd") > 0) {
+            if (ttmplNodeConfig.leafLTmplConfig?.buttons.indexOf("dtmplAdd") > 0) {
                 buttons.push(this.getAddButton(ttmplNodeConfig.leafTitle,
                     <PlusOutlined/>, ttmplNodeConfig.leafRatmplId, dataNode.code)
                 );

package/src/aldehyde/tree/tree-utils.tsx

@@ -59,7 +59,7 @@ export default class TreeUtils {
         //组织data
         if (res.entities) {
             res.entities.forEach((item, index) => {
-                data.push(this.toTreeNodeData(item,config.rootTitleId,null,false));
+                data.push(this.toTreeNodeData(item,config.rootTitleId,null,false,"R"));
             })
         }
         return data;
@@ -91,9 +91,12 @@ export default class TreeUtils {
                 let res = await HydrocarbonService.requestLtmplQueryTop(null, config.branchRatmplId, {mainCode: parentNodes[0].code});
                  brancEntities = res.entities;
             }
+            let leafEntities: any[];
+            if(config.leafRatmplId){
+                let res1 = await HydrocarbonService.requestLtmplQueryTop(null, config.leafRatmplId, {mainCode: parentNodes[0].code});
+                leafEntities = res1.entities;
+            }
 
-            let res1 = await HydrocarbonService.requestLtmplQueryTop(null, config.leafRatmplId, {mainCode: parentNodes[0].code});
-            let leafEntities: any[] = res1.entities;
             for(let parentNode of parentNodes){
                 this.pushNodeData(parentNode, config,brancEntities,leafEntities);
             }
@@ -101,21 +104,22 @@ export default class TreeUtils {
     }
 
 
-    static toLeafTreeNodeData = (item: DtmplData,config:TtmplNodeConfig, parent: TreeDataNode) => {
-        let d=  this.toTreeNodeData(item,config.leafTitleId,parent,true);
+    static toLeafTreeNodeData = (item: DtmplData,config:TtmplNodeConfig, parent: TreeDataNode ) => {
+        let d=  this.toTreeNodeData(item,config.leafTitleId,parent,true,"B");
         return d;
     }
 
     static toBanchTreeNodeData = (item: DtmplData,config:TtmplNodeConfig, parent: TreeDataNode) => {
-      let d=  this.toTreeNodeData(item,config.branchTitleId,parent,false);
+      let d=  this.toTreeNodeData(item,config.branchTitleId,parent,false,"L");
         return d;
     }
 
-    static toTreeNodeData = (item: DtmplData,titleId:string, parent: TreeDataNode,isLeaf:boolean) => {
+    static toTreeNodeData = (item: DtmplData,titleId:string, parent: TreeDataNode,isLeaf:boolean,keyPrex
+        :string) => {
         let name = item.fieldMap[titleId];
         let d = {
             code: item.code,
-            key: parent?.code+item.code,
+            key: keyPrex + parent?.code+item.code,
             name,
             title: <><span>{name?name:item.code}</span></>,
             children: [],