aldehyde 0.2.72 → 0.2.74

package/lib/tree/tmpl-tree.js

@@ -0,0 +1,482 @@
+"use strict";
+// import React from 'react'
+// import {Avatar, Button, Card, Col, Input, Popconfirm, Popover, Row, Space, Tooltip, Tree, Typography} from 'antd';
+// import {DtmplEditPage, HydrocarbonService} from "aldehyde";
+// import './index.css'
+// import {
+//     ReloadOutlined,
+//     BlockOutlined,
+//     DeleteOutlined,
+//     DeleteTwoTone,
+//     DeploymentUnitOutlined,
+//     DownOutlined,
+//     EditOutlined,
+//     FileSyncOutlined,
+//     PlusOutlined,HolderOutlined,CopyOutlined
+// } from '@ant-design/icons';
+// import {DataNode, TmplField} from "../tmpl-interface";
+// import TreeNode from "./tree-node";
+// import {TmplGroupDragTreeNode} from './../utils/dnd-service'
+// import TreeUtils from "./tree-utils";
+// import HydrogenConstant from "../hydrogen-constant";
+// import {TrtmplNodeConfig} from "../mstruc-interface";
+// import Hcservice from "../utils/hcservice";
+// import Scrollbars from 'react-custom-scrollbars';
+// import ModelStrucV3 from "../utils/model-struc-v3";
+//
+// const {Text, Title} = Typography
+//
+// interface ModuleGroupTreeProps {
+//     readOnly:boolean,
+//     titleClickedKey?: string,
+//     onEditPage?:(moduleCode:string,moduleName:string,moduleType:string,pageCode?:string)=>void,
+//     onPageChange?: () => void,
+//     draggable?: boolean,
+//     searchValue: string,
+//     onChangeSearchValue: (string) => void,
+//     onClickPageTmpl?: (title: string, code: string) => void,
+// }
+//
+// interface ModuleGroupTreeState {
+//     data?: DataNode[],
+//     expandedKeys: string[],
+//     loadedKeys: string[],
+//     loading: boolean,
+//     drawSourceId: string,
+//     showDraw: boolean,
+//     drawTitle: string,
+//     drawCode: string,
+//     drawMainCode: string,
+//     parentNodeData: DataNode,
+//     currentNodeData: DataNode,
+//     anyValue: boolean,
+//     currentModelKey: string | number,
+//     currentPageKey: string | number,
+// }
+//
+//
+// class TmplTree extends React.PureComponent<ModuleGroupTreeProps, ModuleGroupTreeState> {
+//
+//     state = {
+//         data: [],
+//         expandedKeys: [],
+//         loadedKeys: [],
+//         loading: false,
+//         drawSourceId: undefined,
+//         showDraw: false,
+//         drawTitle: undefined,
+//         currentEditKey: undefined,
+//         drawCode: undefined,
+//         drawMainCode: undefined,
+//         parentNodeData: undefined,
+//         currentNodeData:undefined,
+//         anyValue: false,
+//         currentModelKey: undefined,
+//         currentPageKey: undefined,
+//     }
+//
+//     static gtmplModuleCode = "7JXJelyRv2";
+//     static moduleModuleCode = "5uLpK3DwJi";
+//
+//     static defaultProps = {
+//         draggable: false,
+//         readOnly:false
+//     }
+//
+//
+//     doAdd = (parent: DataNode,moduleType:string) => {
+//         const {onEditPage}=this.props;
+//         onEditPage?onEditPage(parent.code,parent.name,moduleType,undefined):
+//         this.setState({
+//             showDraw: true,
+//             drawMainCode: parent.code,
+//             drawSourceId: this.getGtmplRatmplSourceId(moduleType),
+//             parentNodeData: parent,
+//             currentNodeData:undefined,
+//             drawCode: undefined,
+//             drawTitle: `添加-模块【${parent.name}】的页面`,
+//             currentModelKey: parent.key,
+//         })
+//     }
+//
+//     getGtmplRatmplSourceId=(moduleType:string)=>{
+//        return  moduleType=='SQL统计模型'?HydrogenConstant.moduleGstmplRatmpl.sourceId:moduleType=='SQL查询模型'?HydrogenConstant.moduleGqtmplRatmpl.sourceId: HydrogenConstant.moduleGtmplRatmpl.sourceId;
+//     }
+//
+//     doEdit = (current: DataNode, parent: DataNode,moduleType:string) => {
+//         const {onEditPage}=this.props;
+//         onEditPage?onEditPage(parent.code,parent.name,moduleType,current.code):
+//         this.setState({
+//             showDraw: true,
+//             drawSourceId:this.getGtmplRatmplSourceId(moduleType),
+//             drawMainCode: parent.code,
+//             drawCode: current.code,
+//             parentNodeData: parent,
+//             currentNodeData:current,
+//             drawTitle: `编辑-页面【${current.name}】`,
+//             currentPageKey: current.key,
+//         })
+//     }
+//
+//     doDelete = async (node: DataNode) => {
+//         let res = await HydrocarbonService.deleteByCode(null, HydrogenConstant.moduleGtmplRatmpl.sourceId, [node.code]);
+//         await this.onChange(node);
+//     }
+//
+//     drawSubmited = async () => {
+//         this.onChange();
+//         this.doClose();
+//     }
+//
+//     doClose = () => {
+//         this.setState({
+//             showDraw: false,
+//             drawSourceId: undefined,
+//             parentNodeData: undefined,
+//         })
+//     }
+//
+//
+//     node = {
+//         key: 'a0001',
+//         title: "版块",
+//         isLeaf: false,
+//         level: 0,
+//         ratmplSourceId: undefined,
+//         children: [],
+//         code: null
+//     };
+//     completeModuleAvatar = (res: object) => {
+//         let mtype = res['模型类型'];
+//         let astring = null;
+//         let modelType = undefined;
+//         let backgroundColor = null;
+//         switch (mtype) {
+//             case '普通模型':
+//                 modelType = '普通模型';
+//                 //astring = <DeploymentUnitOutlined style={{fontSize: '20px', color: 'green'}}/>
+//                 //backgroundColor = '#fff';
+//                 // astring='o';
+//                 backgroundColor = '#85a5ff';
+//                 break;
+//             case 'SQL统计模型':
+//                 modelType = 'SQL统计模型';
+//                 // astring = <DeploymentUnitOutlined style={{fontSize: '20px', color: '#2f54eb'}}/>
+//                 // backgroundColor = '#fff';
+//                 // astring='C';
+//                 backgroundColor = "#2f54eb";
+//                 break;
+//             case 'SQL查询模型':
+//                 modelType = 'SQL查询模型';
+//
+//                 //astring = <DeploymentUnitOutlined style={{fontSize: '20px', color: '#2f54eb'}}/>
+//                 //backgroundColor = '#fff';
+//                 //astring='Q';
+//                 backgroundColor = "#2f54eb";
+//
+//                 break;
+//             case '文档模型':
+//                 modelType = '文档模型';
+//                 //astring = <DeploymentUnitOutlined style={{fontSize: '20px', color: '#52c41a'}}/>
+//                 //backgroundColor = '#fff';
+//                 backgroundColor = "#52c41a";
+//                 //astring='D';
+//                 break;
+//             case '服务模型':
+//                 modelType = '服务模型';
+//                 // astring = <DeploymentUnitOutlined style={{fontSize: '20px', color: '#722ed1'}}/>
+//                 //backgroundColor = '#fff';
+//                 //astring='S';
+//                 backgroundColor = "#722ed1";
+//                 break;
+//             default:
+//                 // astring='A';
+//                 astring = <DeploymentUnitOutlined style={{fontSize: '20px', color: 'red'}}/>
+//                 backgroundColor = '#fff';
+//                 backgroundColor = "red";
+//                 break;
+//         }
+//
+//         return <Tooltip placement={'topLeft'} title={modelType}>
+//             <Avatar shape="square" size={10} style={{
+//                 backgroundColor,
+//                 height: 22,
+//                 width: 6,
+//                 // paddingTop:6
+//             }}>{astring}</Avatar></Tooltip>
+//
+//
+//     }
+//
+//     completeGtmplAvatar(res: object) {
+//
+//         let content = null;
+//         let avatarBackgroundColor = null;
+//         let hasMenu = res['二级菜单'];
+//
+//         return <Popover content={content}> <Avatar shape="square" size={10} style={{
+//             backgroundColor: '#fff',
+//             height: 20,
+//             width: 20
+//         }}><BlockOutlined style={{fontSize: '20px', color: hasMenu ? "#389e0d" : '#ffc53d'}}/></Avatar></Popover>
+//
+//     }
+//
+//     async componentDidMount() {
+//         const {} = this.props
+//         this.setState({
+//             loading: true
+//         })
+//         //模块
+//         await this.refresh();
+//     }
+//
+//     toModuleNode = (e: object, loadedKeys: (string | number)[], gtmplRes: object[]) => {
+//         const {onClickPageTmpl,readOnly} = this.props
+//         let moduleCode = e['唯一编码'];
+//
+//         let module: DataNode = {
+//             key: moduleCode,
+//             code: moduleCode,
+//             name: e['名称'],
+//             config: null,
+//             level: 1,
+//             order: e['所属模块排序']
+//         }
+//         let moduleType=e['模型类型'];
+//         module.title =<>{readOnly?module.name:<Popover placement="topLeft"  zIndex={100} content={<><Space>
+//             <Button size={'small'} onClick={() => {
+//                 this.doSync(moduleCode);
+//             }}><FileSyncOutlined
+//                 style={{color: 'green'}}/>同步默认页面</Button>
+//             <Button onClick={() => {
+//                 this.doAdd(module,moduleType);
+//             }
+//             } size={'small'}><PlusOutlined/>创建页面</Button>
+//         </Space></>} arrow={false}>{module.name}
+//             {/*<HolderOutlined style={{color:'#bfbfbf'}} />*/}
+//         </Popover>}</>;
+//         module.children = [];
+//
+//         module.avatar = this.completeModuleAvatar(e);
+//         if (gtmplRes) {
+//             for (let res of gtmplRes) {
+//                 if (moduleCode != res['所属模块编码']) {
+//                     continue;
+//                 }
+//                 let gtmpl: DataNode = {
+//                     key: res['唯一编码'],
+//                     code: res['唯一编码'],
+//                     name: res['名称'],
+//                     config: null,
+//                     level: 2,
+//                     isLeaf: true
+//                 };
+//
+//                 let hasMenu = res['二级菜单'] ? true : false;
+//                 gtmpl.title = <>{readOnly?gtmpl.name:<Popover zIndex={100} content={<><Space>
+//                     {/*<Button onClick={() => {*/}
+//                     {/*    onClickPageTmpl(gtmpl.name, gtmpl.code);*/}
+//                     {/*    this.setState({*/}
+//                     {/*        currentPageKey: gtmpl.key*/}
+//                     {/*    })*/}
+//                     {/*}} size={'small'}>查看菜单项</Button>*/}
+//                     <Button onClick={() => {
+//                         this.doEdit(gtmpl, {...module},moduleType);
+//                         this.setState({
+//                             currentPageKey: gtmpl.key
+//                         })
+//                     }} size={'small'}><EditOutlined style={{color: 'blue'}}/>编辑</Button>
+//
+//                     <Popconfirm placement="topLeft" title={'确认复制吗？'}
+//                                 onConfirm={() => this.doCopy(gtmpl.code)}
+//                                 okText="确定" cancelText="取消">
+//                         <Button size={'small'}><CopyOutlined
+//                             style={{color: 'blue'}}/>复制</Button>
+//                     </Popconfirm>
+//                     < Popconfirm placement="topLeft" title={hasMenu ? `页面模板会连同二级菜单一起删除` : `删除页面模板【${e['名称']}】吗？`}
+//                                  onConfirm={() => {
+//                                      this.doDelete(gtmpl);
+//                                      this.setState({currentModelKey: moduleCode})
+//                                  }
+//                                  }
+//                                  okText="确定" cancelText="取消">
+//                         <Tooltip>
+//                             <Button size={'small'} danger={true}>{hasMenu ?
+//                                 <DeleteTwoTone twoToneColor={'#a8071a'}/> : <DeleteOutlined/>}</Button>
+//                         </Tooltip>
+//                     </Popconfirm>
+//                 </Space></>} arrow={false}>{gtmpl.name}
+//                     {/*<HolderOutlined style={{color:'#bfbfbf'}} />*/}
+//                 </Popover>}</>;
+//
+//                 gtmpl.avatar = this.completeGtmplAvatar(res);
+//                 gtmpl['hasMenu']=hasMenu;
+//                 module.children.push(gtmpl);
+//             }
+//
+//         }
+//         return module;
+//
+//     }
+//
+//     async refresh() {
+//         const {moduleTreeSttmpl} = this.props;
+//         this.setState({
+//             loading: true,
+//         })
+//         let loadedKeys = [];
+//         let res = await ModelStrucV3.get(TmplTree.moduleModuleCode, {depth: 1},);
+//         let gtmplRes = await ModelStrucV3.get(TmplTree.gtmplModuleCode, {depth: 1},);
+//
+//         let data: DataNode[] = [];
+//         if (res.entities) {
+//             for (let e of res.entities) {
+//                 data.push(this.toModuleNode(e, loadedKeys, gtmplRes ? gtmplRes.entities : []));
+//             }
+//         }
+//         //完善 avatar
+//         //this.completeAvatar(data);
+//         this.setState({
+//             data,
+//             loading: false,
+//             loadedKeys
+//         })
+//     }
+//
+//     async componentWillUnmount() {
+//
+//     }
+//
+//     onChange = async (node?:DataNode) => {
+//         const {expandedKeys,parentNodeData,currentNodeData} = this.state;
+//         const {onPageChange}=this.props;
+//         let nood=node?node:currentNodeData;
+//         if(nood && nood['hasMenu'] && onPageChange ){
+//             onPageChange();
+//         }
+//         await this.refresh();
+//         this.setState({expandedKeys: [parentNodeData.key, ...expandedKeys]})
+//     }
+//
+//     onExpand = (expandedKeys) => {
+//         this.setState({
+//             expandedKeys
+//         })
+//     }
+//
+//
+//     doSync = async (moduleCode: string) => {
+//         this.setState({
+//             loading: true,
+//         })
+//         await Hcservice.doSync(moduleCode);
+//         await this.refresh();
+//         this.setState({
+//             currentModelKey: moduleCode
+//         })
+//     }
+//
+//     doCopy = async (code: string) => {
+//         this.setState({
+//             loading: true,
+//         })
+//         await Hcservice.doCopy(HydrogenConstant.groupTmpl.sourceId, code);
+//         await this.refresh();
+//         this.setState({
+//             currentPageKey: code
+//         })
+//     }
+//
+//
+//     render() {
+//         const {draggable, searchValue, onChangeSearchValue,readOnly} = this.props;
+//         const {
+//             data, loadedKeys, loading, showDraw,
+//             drawSourceId,
+//             drawCode,
+//             drawMainCode, drawTitle, currentModelKey, currentPageKey
+//         } = this.state;
+//         let treeData = data;
+//         if (searchValue) {
+//             treeData = TreeUtils.filterTree(data, searchValue);
+//         }
+//         return <>
+//             <Row>
+//                 <Col span={24}>
+//                     <Card style={{marginBottom: 0, width: '100%'}} bordered={false}
+//                           bodyStyle={{padding: '4px 2px 4px 8px'}}>
+//                         <Row align="middle">
+//                             <Col span={6}>
+//                                 <Avatar shape="square" size={10}
+//                                         icon={<BlockOutlined style={{fontSize: '18px', color: '#389e0d'}}/>}
+//                                         style={{backgroundColor: '#fff', height: 24, width: 20, paddingLeft: '10'}}/>
+//                                 <span style={{fontSize: 18, fontWeight: 560}}>页面</span>
+//                             </Col>
+//                             <Col span={18}>
+//                                     <Input.Search value={searchValue} allowClear placeholder="输入名称查找" onChange={(e) => {
+//                                         onChangeSearchValue(e.target.value)
+//                                     }}  onSearch={(value) => {
+//                                         this.refresh()
+//                                     }} enterButton={<ReloadOutlined  />}/>
+//                             </Col>
+//                         </Row>
+//                     </Card>
+//                 </Col>
+//             </Row>
+//             <Row>
+//                 <Col span={24}>
+//                     {treeData && treeData.length>0 ?
+//                     <Card bodyStyle={{padding: '4px 4px 4px 16px', height: '80vh', minWidth: '320px'}}
+//                           loading={loading}>
+//                         <Scrollbars style={{height: '80vh'}} autoHide autoHideTimeout={1000}>
+//                             <Tree defaultExpandAll={true} switcherIcon={<DownOutlined/>}
+//                                   checkable={false}
+//                                   loadedKeys={loadedKeys}
+//                                   onExpand={this.onExpand}
+//                                   showLine={false}
+//                                   titleRender={(nodeData) => {
+//                                       return draggable ?
+//                                           <TmplGroupDragTreeNode currentActiveKey={[currentModelKey, currentPageKey]}
+//                                                                  syncButtonTip={'更新默认页面'}
+//                                                                  nodeData={nodeData}/> :
+//                                           <TreeNode currentActiveKey={[currentModelKey, currentPageKey]}
+//                                                     syncButtonTip={'更新默认页面'}
+//                                                     nodeData={nodeData}></TreeNode>
+//
+//                                   }}
+//                                   treeData={treeData}
+//                             />
+//                             {/*{readOnly?null:*/}
+//                             {/*<Card style={{marginTop:24}} bodyStyle={{padding: '12px 6px 6px 6px'}}>*/}
+//                             {/*    <Space direction="vertical">*/}
+//                             {/*        <Title level={5}>【页面定义】使用说明</Title>*/}
+//                             {/*        <span><Text*/}
+//                             {/*            type="danger">1.模型生成页面：</Text><Text>鼠标悬停在【模型节点】的【名称】上，点击气泡卡片的【同步默认页面】按钮。</Text></span>*/}
+//                             {/*        <span><Text*/}
+//                             {/*            type="danger">2.创建页面：</Text><Text>鼠标悬停在【模型节点】的【名称】上，点击气泡卡片的【+创建页面】按钮,填写并保存右边弹出的抽屉页面。</Text></span>*/}
+//                             {/*        <span><Text*/}
+//                             {/*            type="danger">3.复制页面：</Text><Text>鼠标悬停在【页面节点】的【名称】上，点击气泡卡片的【复制】按钮。</Text></span>*/}
+//                             {/*    </Space>*/}
+//                             {/*</Card>}*/}
+//                         </Scrollbars>
+//                     </Card>: <Card><Space><Text type={'danger'}>* 页面配置需基于模型。请先创建一个或多个模型。</Text>
+//                             <Button  href={'#/application-workbench/carbon-model-def'} type={'primary'}><DeploymentUnitOutlined />模 型</Button></Space>
+//                     </Card>}
+//                 </Col>
+//             </Row>
+//
+//             {drawSourceId ? <DtmplEditPage title={drawTitle} maxColsOnRow={1} pageType={"drawer"} placement={'right'}
+//                                            open={showDraw}
+//                                            onCancel={this.doClose}
+//                                            width={640} mainCode={drawMainCode}
+//                                            sourceId={drawSourceId}
+//                                            code={drawCode}
+//                                            onOk={this.drawSubmited}/> : null}
+//
+//         </>
+//     }
+// }
+//
+// export default TmplTree
+//# sourceMappingURL=tmpl-tree.js.map

package/lib/tree/tmpl-tree.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tmpl-tree.js","sourceRoot":"","sources":["../../../../src/aldehyde/tree/tmpl-tree.tsx"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,qHAAqH;AACrH,8DAA8D;AAC9D,uBAAuB;AACvB,WAAW;AACX,sBAAsB;AACtB,qBAAqB;AACrB,sBAAsB;AACtB,qBAAqB;AACrB,8BAA8B;AAC9B,oBAAoB;AACpB,oBAAoB;AACpB,wBAAwB;AACxB,+CAA+C;AAC/C,8BAA8B;AAC9B,yDAAyD;AACzD,sCAAsC;AACtC,+DAA+D;AAC/D,wCAAwC;AACxC,uDAAuD;AACvD,wDAAwD;AACxD,8CAA8C;AAC9C,oDAAoD;AACpD,sDAAsD;AACtD,EAAE;AACF,mCAAmC;AACnC,EAAE;AACF,mCAAmC;AACnC,wBAAwB;AACxB,gCAAgC;AAChC,kGAAkG;AAClG,iCAAiC;AACjC,2BAA2B;AAC3B,2BAA2B;AAC3B,6CAA6C;AAC7C,+DAA+D;AAC/D,IAAI;AACJ,EAAE;AACF,mCAAmC;AACnC,yBAAyB;AACzB,8BAA8B;AAC9B,4BAA4B;AAC5B,wBAAwB;AACxB,4BAA4B;AAC5B,yBAAyB;AACzB,yBAAyB;AACzB,wBAAwB;AACxB,4BAA4B;AAC5B,gCAAgC;AAChC,iCAAiC;AACjC,yBAAyB;AACzB,wCAAwC;AACxC,uCAAuC;AACvC,IAAI;AACJ,EAAE;AACF,EAAE;AACF,2FAA2F;AAC3F,EAAE;AACF,gBAAgB;AAChB,oBAAoB;AACpB,4BAA4B;AAC5B,0BAA0B;AAC1B,0BAA0B;AAC1B,mCAAmC;AACnC,2BAA2B;AAC3B,gCAAgC;AAChC,qCAAqC;AACrC,+BAA+B;AAC/B,mCAAmC;AACnC,qCAAqC;AACrC,qCAAqC;AACrC,2BAA2B;AAC3B,sCAAsC;AACtC,qCAAqC;AACrC,QAAQ;AACR,EAAE;AACF,6CAA6C;AAC7C,8CAA8C;AAC9C,EAAE;AACF,8BAA8B;AAC9B,4BAA4B;AAC5B,yBAAyB;AACzB,QAAQ;AACR,EAAE;AACF,EAAE;AACF,wDAAwD;AACxD,yCAAyC;AACzC,+EAA+E;AAC/E,0BAA0B;AAC1B,8BAA8B;AAC9B,yCAAyC;AACzC,qEAAqE;AACrE,sCAAsC;AACtC,yCAAyC;AACzC,mCAAmC;AACnC,qDAAqD;AACrD,2CAA2C;AAC3C,aAAa;AACb,QAAQ;AACR,EAAE;AACF,oDAAoD;AACpD,qMAAqM;AACrM,QAAQ;AACR,EAAE;AACF,4EAA4E;AAC5E,yCAAyC;AACzC,kFAAkF;AAClF,0BAA0B;AAC1B,8BAA8B;AAC9B,oEAAoE;AACpE,yCAAyC;AACzC,sCAAsC;AACtC,sCAAsC;AACtC,uCAAuC;AACvC,mDAAmD;AACnD,2CAA2C;AAC3C,aAAa;AACb,QAAQ;AACR,EAAE;AACF,6CAA6C;AAC7C,2HAA2H;AAC3H,qCAAqC;AACrC,QAAQ;AACR,EAAE;AACF,mCAAmC;AACnC,2BAA2B;AAC3B,0BAA0B;AAC1B,QAAQ;AACR,EAAE;AACF,wBAAwB;AACxB,0BAA0B;AAC1B,+BAA+B;AAC/B,uCAAuC;AACvC,yCAAyC;AACzC,aAAa;AACb,QAAQ;AACR,EAAE;AACF,EAAE;AACF,eAAe;AACf,wBAAwB;AACxB,uBAAuB;AACvB,yBAAyB;AACzB,oBAAoB;AACpB,qCAAqC;AACrC,wBAAwB;AACxB,qBAAqB;AACrB,SAAS;AACT,gDAAgD;AAChD,mCAAmC;AACnC,8BAA8B;AAC9B,qCAAqC;AACrC,sCAAsC;AACtC,2BAA2B;AAC3B,2BAA2B;AAC3B,sCAAsC;AACtC,mGAAmG;AACnG,8CAA8C;AAC9C,kCAAkC;AAClC,+CAA+C;AAC/C,yBAAyB;AACzB,8BAA8B;AAC9B,yCAAyC;AACzC,sGAAsG;AACtG,+CAA+C;AAC/C,kCAAkC;AAClC,+CAA+C;AAC/C,yBAAyB;AACzB,8BAA8B;AAC9B,yCAAyC;AACzC,EAAE;AACF,qGAAqG;AACrG,8CAA8C;AAC9C,iCAAiC;AACjC,+CAA+C;AAC/C,EAAE;AACF,yBAAyB;AACzB,2BAA2B;AAC3B,sCAAsC;AACtC,qGAAqG;AACrG,8CAA8C;AAC9C,+CAA+C;AAC/C,iCAAiC;AACjC,yBAAyB;AACzB,2BAA2B;AAC3B,sCAAsC;AACtC,sGAAsG;AACtG,8CAA8C;AAC9C,iCAAiC;AACjC,+CAA+C;AAC/C,yBAAyB;AACzB,uBAAuB;AACvB,kCAAkC;AAClC,+FAA+F;AAC/F,4CAA4C;AAC5C,2CAA2C;AAC3C,yBAAyB;AACzB,YAAY;AACZ,EAAE;AACF,mEAAmE;AACnE,wDAAwD;AACxD,mCAAmC;AACnC,8BAA8B;AAC9B,4BAA4B;AAC5B,kCAAkC;AAClC,8CAA8C;AAC9C,EAAE;AACF,EAAE;AACF,QAAQ;AACR,EAAE;AACF,yCAAyC;AACzC,EAAE;AACF,8BAA8B;AAC9B,4CAA4C;AAC5C,qCAAqC;AACrC,EAAE;AACF,uFAAuF;AACvF,uCAAuC;AACvC,0BAA0B;AAC1B,wBAAwB;AACxB,oHAAoH;AACpH,EAAE;AACF,QAAQ;AACR,EAAE;AACF,kCAAkC;AAClC,gCAAgC;AAChC,0BAA0B;AAC1B,4BAA4B;AAC5B,aAAa;AACb,eAAe;AACf,gCAAgC;AAChC,QAAQ;AACR,EAAE;AACF,2FAA2F;AAC3F,wDAAwD;AACxD,sCAAsC;AACtC,EAAE;AACF,mCAAmC;AACnC,+BAA+B;AAC/B,gCAAgC;AAChC,6BAA6B;AAC7B,4BAA4B;AAC5B,wBAAwB;AACxB,iCAAiC;AACjC,YAAY;AACZ,oCAAoC;AACpC,8GAA8G;AAC9G,sDAAsD;AACtD,2CAA2C;AAC3C,mCAAmC;AACnC,4DAA4D;AAC5D,uCAAuC;AACvC,iDAAiD;AACjD,gBAAgB;AAChB,4DAA4D;AAC5D,mDAAmD;AACnD,iEAAiE;AACjE,0BAA0B;AAC1B,gCAAgC;AAChC,EAAE;AACF,wDAAwD;AACxD,0BAA0B;AAC1B,0CAA0C;AAC1C,qDAAqD;AACrD,gCAAgC;AAChC,oBAAoB;AACpB,0CAA0C;AAC1C,wCAAwC;AACxC,yCAAyC;AACzC,uCAAuC;AACvC,oCAAoC;AACpC,gCAAgC;AAChC,mCAAmC;AACnC,qBAAqB;AACrB,EAAE;AACF,4DAA4D;AAC5D,gGAAgG;AAChG,qDAAqD;AACrD,yEAAyE;AACzE,gDAAgD;AAChD,8DAA8D;AAC9D,mCAAmC;AACnC,6DAA6D;AAC7D,+CAA+C;AAC/C,sEAAsE;AACtE,0CAA0C;AAC1C,wDAAwD;AACxD,6BAA6B;AAC7B,2FAA2F;AAC3F,EAAE;AACF,uEAAuE;AACvE,4EAA4E;AAC5E,+DAA+D;AAC/D,+DAA+D;AAC/D,mEAAmE;AACnE,oCAAoC;AACpC,oHAAoH;AACpH,sDAAsD;AACtD,6DAA6D;AAC7D,oFAAoF;AACpF,qCAAqC;AACrC,qCAAqC;AACrC,gEAAgE;AAChE,oCAAoC;AACpC,8EAA8E;AAC9E,0GAA0G;AAC1G,qCAAqC;AACrC,oCAAoC;AACpC,0DAA0D;AAC1D,yEAAyE;AACzE,kCAAkC;AAClC,EAAE;AACF,gEAAgE;AAChE,4CAA4C;AAC5C,+CAA+C;AAC/C,gBAAgB;AAChB,EAAE;AACF,YAAY;AACZ,yBAAyB;AACzB,EAAE;AACF,QAAQ;AACR,EAAE;AACF,wBAAwB;AACxB,iDAAiD;AACjD,0BAA0B;AAC1B,6BAA6B;AAC7B,aAAa;AACb,+BAA+B;AAC/B,oFAAoF;AACpF,wFAAwF;AACxF,EAAE;AACF,qCAAqC;AACrC,8BAA8B;AAC9B,4CAA4C;AAC5C,kGAAkG;AAClG,gBAAgB;AAChB,YAAY;AACZ,sBAAsB;AACtB,uCAAuC;AACvC,0BAA0B;AAC1B,oBAAoB;AACpB,8BAA8B;AAC9B,yBAAyB;AACzB,aAAa;AACb,QAAQ;AACR,EAAE;AACF,qCAAqC;AACrC,EAAE;AACF,QAAQ;AACR,EAAE;AACF,6CAA6C;AAC7C,4EAA4E;AAC5E,2CAA2C;AAC3C,8CAA8C;AAC9C,wDAAwD;AACxD,8BAA8B;AAC9B,YAAY;AACZ,gCAAgC;AAChC,+EAA+E;AAC/E,QAAQ;AACR,EAAE;AACF,qCAAqC;AACrC,0BAA0B;AAC1B,2BAA2B;AAC3B,aAAa;AACb,QAAQ;AACR,EAAE;AACF,EAAE;AACF,+CAA+C;AAC/C,0BAA0B;AAC1B,6BAA6B;AAC7B,aAAa;AACb,8CAA8C;AAC9C,gCAAgC;AAChC,0BAA0B;AAC1B,0CAA0C;AAC1C,aAAa;AACb,QAAQ;AACR,EAAE;AACF,yCAAyC;AACzC,0BAA0B;AAC1B,6BAA6B;AAC7B,aAAa;AACb,6EAA6E;AAC7E,gCAAgC;AAChC,0BAA0B;AAC1B,mCAAmC;AACnC,aAAa;AACb,QAAQ;AACR,EAAE;AACF,EAAE;AACF,iBAAiB;AACjB,qFAAqF;AACrF,kBAAkB;AAClB,mDAAmD;AACnD,4BAA4B;AAC5B,wBAAwB;AACxB,uEAAuE;AACvE,0BAA0B;AAC1B,+BAA+B;AAC/B,6BAA6B;AAC7B,kEAAkE;AAClE,YAAY;AACZ,oBAAoB;AACpB,oBAAoB;AACpB,kCAAkC;AAClC,sFAAsF;AACtF,sEAAsE;AACtE,+CAA+C;AAC/C,6CAA6C;AAC7C,mEAAmE;AACnE,+GAA+G;AAC/G,wHAAwH;AACxH,0FAA0F;AAC1F,qCAAqC;AACrC,8CAA8C;AAC9C,2HAA2H;AAC3H,8EAA8E;AAC9E,iEAAiE;AACjE,yDAAyD;AACzD,6EAA6E;AAC7E,qCAAqC;AACrC,iCAAiC;AACjC,8BAA8B;AAC9B,yBAAyB;AACzB,qBAAqB;AACrB,oBAAoB;AACpB,kCAAkC;AAClC,uDAAuD;AACvD,yGAAyG;AACzG,+CAA+C;AAC/C,gGAAgG;AAChG,2FAA2F;AAC3F,sDAAsD;AACtD,4DAA4D;AAC5D,6DAA6D;AAC7D,qDAAqD;AACrD,iEAAiE;AACjE,2DAA2D;AAC3D,wHAAwH;AACxH,4FAA4F;AAC5F,2FAA2F;AAC3F,2GAA2G;AAC3G,+EAA+E;AAC/E,sFAAsF;AACtF,EAAE;AACF,uCAAuC;AACvC,wDAAwD;AACxD,iCAAiC;AACjC,oDAAoD;AACpD,4GAA4G;AAC5G,qEAAqE;AACrE,gFAAgF;AAChF,wDAAwD;AACxD,uIAAuI;AACvI,wDAAwD;AACxD,mJAAmJ;AACnJ,wDAAwD;AACxD,iIAAiI;AACjI,iDAAiD;AACjD,6CAA6C;AAC7C,wCAAwC;AACxC,kGAAkG;AAClG,yJAAyJ;AACzJ,+BAA+B;AAC/B,yBAAyB;AACzB,qBAAqB;AACrB,EAAE;AACF,wHAAwH;AACxH,6DAA6D;AAC7D,qEAAqE;AACrE,iFAAiF;AACjF,qEAAqE;AACrE,6DAA6D;AAC7D,gFAAgF;AAChF,EAAE;AACF,cAAc;AACd,QAAQ;AACR,IAAI;AACJ,EAAE;AACF,0BAA0B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.2.72",
+  "version": "0.2.74",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",

package/src/aldehyde/controls/entity-select/entity-select.tsx

@@ -356,7 +356,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             criteriaData[formItemName] = searchText;
             let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey,fieldConfig.id, {
                 ...criteriaData, ...pageInfo,
-                mainCode:currentMainCode,
+                mainCode:currentMainCode
             });
             let sourceData = await this.loadData(queryKey.key, pageInfo, titleId);
 

package/src/aldehyde/custom-page/dtmpl-custom-edit-modal-page.tsx

@@ -43,10 +43,10 @@ export default class DtmplCustomEditModalPage extends React.PureComponent<DtmplC
     }
 
     customPage = () => {
-        const {code, sourceId, open, mainCode, customPath,} = this.props
+        const {code, sourceId, open, mainCode, customPath,onOk} = this.props
         if (open) {
             let Page = ProgramConfig.getCustomPage(customPath) || DefCustomPage;
-            return React.createElement(Page, {code, sourceId, mainCode,pageName:customPath});
+            return React.createElement(Page, {code, sourceId, mainCode,pageName:customPath,onOk});
         }
     }
 

package/src/aldehyde/detail/view/act-dtmpl-view.tsx

@@ -11,6 +11,7 @@ import ToolTipBar from "../tooltipbar";
 
 export interface ActDtmplViewProps extends DtmplBaseProps {
     versionId?: number;
+    title?:any,
 };
 
 export interface ActDtmplViewStat {
@@ -81,7 +82,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
     }
 
     render() {
-        const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl,serverKey,codeSource} = this.props;
+        const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl,serverKey,codeSource,title} = this.props;
         const {dtmplConfig, premisesTitle, loading, layout, snapshotOpen,refreshCode} = this.state;
         const buttons = dtmplConfig ? dtmplConfig.buttons : undefined;
         const premises = dtmplConfig ? dtmplConfig.premises : undefined;
@@ -96,7 +97,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
                       className="hoverable pageHeader"
                 >
                     <h3>
-                        {'详情'}{dtmplConfig?<ToolTipBar content={dtmplConfig.tip} />:null}
+                        {title?title:'详情'}{dtmplConfig?<ToolTipBar content={dtmplConfig.tip} />:null}
                         <div className="fr">
                             {buttons && buttons.includes("dtmplEdit") && goDtmpl && !dtmplConfig.editAction ?
                                     <Button

package/src/aldehyde/detail/view/modal-dtmpl-view.tsx

@@ -2,9 +2,11 @@ import React from 'react';
 import {Modal, ModalProps as AntdModalProps,Form,Button} from 'antd'
 import ActDtmplView, {ActDtmplViewProps} from "./act-dtmpl-view";
 import Scrollbars from 'react-custom-scrollbars';
-interface ModalDtmplViewProps extends AntdModalProps, ActDtmplViewProps{
-    height:any,
+interface ModalDtmplViewProps extends  ActDtmplViewProps{
+    height?:any,
     onCancel:()=>any,
+    open?:boolean,
+    children?:any,
 }
 
 interface ModalDtmplViewState {
@@ -33,13 +35,11 @@ export default class ModalDtmplView extends React.PureComponent<ModalDtmplViewPr
 
     render() {
         // console.log('antdModalProps:',this.antdModalProps);
-        const {height,onOk,onCancel,code,style,sourceId,open,serverKey} = this.props
-        //console.log('antdModalProps code :',code);
-        //const {code} = this.state;o
+        const {code,sourceId,serverKey,open,onCancel,height} = this.props
+
         return <Modal
             open={open}
             title={"查看"}
-            // style={style}
             width={"82vw"}
             centered
             wrapClassName={'aaa'}

package/src/aldehyde/index.tsx

@@ -52,6 +52,7 @@ import ImportRoute from './routable/import-route';
 // const ImportRoute = loadable(() =>
 //     import("./routable/import-route"), {fallback: Loading});
 import LtmplRoute from "./routable/ltmpl-route";
+import TtmplRoute from "./routable/ttmpl-route";
 // const LtmplRoute = loadable(() =>
 //     import("./routable/ltmpl-route"), {fallback: Loading});
 import DtmplViewCard from './module/dtmpl-view-card';
@@ -115,7 +116,7 @@ import DatePicker from './controls/date-picker';
 
 import ModelStrucV3 from './tmpl/model-struc-v3';
 
-export {ActTable,SelectTable,Login,DtmplRoute,ImportRoute,LtmplRoute,DtmplViewCard,DtmplEditDrawer,DtmplEditModal,LtmplModal,LtmplDrawer,LtmplTable,Menu2layers,Block,UserBar,
+export {ActTable,SelectTable,Login,DtmplRoute,ImportRoute,LtmplRoute,TtmplRoute,DtmplViewCard,DtmplEditDrawer,DtmplEditModal,LtmplModal,LtmplDrawer,LtmplTable,Menu2layers,Block,UserBar,
     ResetPassword,Footer,EntryControl,ViewControl,ProgramConfig,HydrocarbonService,QuickEntrance,Workbench,PopoverEntitySelect,DtmplEditCard,RouterLogin
 ,DatePicker,DtmplEditPage,TmplInterface,TmplDataSource,Superagent,DtmplEdit,HCWelcome,MainPage,ExcelImportRoute,CustomPageRouter,HCCustomPageRouter,L2MenuMessageBar,L2MenuQuickBar,ContextSetter,withRouter,ModelStrucV3}
 

package/src/aldehyde/layout/menu/menu-render.tsx

@@ -64,6 +64,9 @@ export default {
                 case "列表":
                     routePath = 'act-table';
                     break;
+                case "树":
+                    routePath = 'act-tree';
+                    break;
                 case "添加":
                     routePath = 'detail-edit';
                     codeSource = '&codeSource=new';

package/src/aldehyde/layout/menu/userinfo-bar.tsx

@@ -43,7 +43,7 @@ class UserInfoBar extends React.PureComponent<UserInfoBarProps, UserInfoBarState
             <>{userCode?
                 <>
                 <span onClick={this.showDraw}>个人信息</span>
-                {showDraw  ?<DtmplViewDrawer serverKey={null} editable={editable} title={'个人信息'} width={'calc(100% - 280px)'}  sourceId={gtmplSourceId} open={showDraw} code={userCode} onClose={this.closeDrawer}></DtmplViewDrawer>:null}
+                {showDraw  ?<DtmplViewDrawer serverKey={null} editable={editable} title={'个人信息'}   sourceId={gtmplSourceId} open={showDraw} code={userCode} onClose={this.closeDrawer}></DtmplViewDrawer>:null}
            </>:null } </>
         );
     }

package/src/aldehyde/module/dtmpl-view-card.tsx

@@ -6,6 +6,7 @@ import {CodeSource} from "../tmpl/interface";
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
 export interface DtmplViewCardProps  {
+    title?:any,
     serverKey?:string,
     sourceId?:string,
     code?:string;
@@ -51,7 +52,7 @@ class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCar
 
     render() {
         const {showDtmplEdit} = this.state;
-        const { sourceId,code,mainCode,editable,serverKey,codeSource} = this.props;
+        const { sourceId,code,mainCode,editable,serverKey,codeSource,title} = this.props;
             return <>
                 <ActDtmplView codeSource={codeSource} serverKey={serverKey} goDtmpl={editable?this.goDtmpl:null}  sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
                 {showDtmplEdit? <DtmplEditModal  codeSource={codeSource} serverKey={serverKey} open={showDtmplEdit} onCancel={()=>{