aldehyde 0.2.73 → 0.2.75

package/lib/tree/tree-node.js

@@ -0,0 +1,62 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import React from 'react';
+import { Avatar, Card, Col, Row, Space, Badge } from 'antd';
+const treeCardTitleBody0 = {
+    padding: '4px 4px 4px 4px',
+    maxWidth: '300px',
+};
+const buttonIcon = { color: '#597ef7' };
+class TreeNode extends React.PureComponent {
+    constructor() {
+        super(...arguments);
+        this.state = {
+            sorts: [],
+        };
+        this.onDelete = (nodeData) => __awaiter(this, void 0, void 0, function* () {
+        });
+    }
+    componentDidMount() {
+        return __awaiter(this, void 0, void 0, function* () {
+        });
+    }
+    componentDidUpdate(preProps) {
+        return __awaiter(this, void 0, void 0, function* () {
+        });
+    }
+    componentWillUnmount() {
+        return __awaiter(this, void 0, void 0, function* () {
+        });
+    }
+    render() {
+        const { nodeData, currentActiveKey } = this.props;
+        const { sorts } = this.state;
+        let backgroundColor = '#fff';
+        let avatarBackgroundColor = '#fff';
+        let bodyCss = treeCardTitleBody0;
+        if (nodeData.level == 0) {
+            avatarBackgroundColor = '#fff';
+            bodyCss = treeCardTitleBody0;
+        }
+        return React.createElement(Card, { bordered: nodeData.level == 2 ? false : false, bodyStyle: bodyCss, style: { marginBottom: 2, backgroundColor }, className: 'tree-node' },
+            React.createElement(Row, null,
+                React.createElement(Col, { span: 24 },
+                    React.createElement(Space, null,
+                        nodeData.avatar ? nodeData.avatar : React.createElement(Avatar, { shape: "square", size: 10, style: {
+                                backgroundColor: avatarBackgroundColor,
+                                height: 24,
+                                width: 10
+                            } }),
+                        nodeData.title,
+                        currentActiveKey && currentActiveKey.indexOf(nodeData.key) >= 0 ? React.createElement(Badge, { key: "red", color: 'red' }) : null))));
+    }
+}
+export default TreeNode;
+//# sourceMappingURL=tree-node.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tree-node.js","sourceRoot":"","sources":["../../../../src/aldehyde/tree/tree-node.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAW,GAAG,EAAE,KAAK,EAAC,KAAK,EAAC,MAAM,MAAM,CAAA;AAajE,MAAM,kBAAkB,GAAG;IACvB,OAAO,EAAE,iBAAiB;IAC1B,QAAQ,EAAE,OAAO;CACpB,CAAA;AAGD,MAAM,UAAU,GAAC,EAAC,KAAK,EAAC,SAAS,EAAC,CAAA;AAElC,MAAM,QAAS,SAAQ,KAAK,CAAC,aAA2C;IAAxE;;QACI,UAAK,GAAG;YACJ,KAAK,EAAE,EAAE;SACZ,CAAA;QAcD,aAAQ,GAAG,CAAO,QAAqB,EAAE,EAAE;QAE3C,CAAC,CAAA,CAAA;IAkCL,CAAC;IAhDS,iBAAiB;;QAEvB,CAAC;KAAA;IAEK,kBAAkB,CAAC,QAAQ;;QAEjC,CAAC;KAAA;IAEK,oBAAoB;;QAE1B,CAAC;KAAA;IAMD,MAAM;QACF,MAAM,EAAC,QAAQ,EAAC,gBAAgB,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC/C,MAAM,EAAC,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC3B,IAAI,eAAe,GAAG,MAAM,CAAC;QAC5B,IAAI,qBAAqB,GAAG,MAAM,CAAC;QACpC,IAAI,OAAO,GAAG,kBAAkB,CAAC;QACjC,IAAI,QAAQ,CAAC,KAAK,IAAI,CAAC,EAAE;YACrB,qBAAqB,GAAG,MAAM,CAAC;YAC/B,OAAO,GAAG,kBAAkB,CAAC;SAChC;QAKD,OAAO,oBAAC,IAAI,IAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,IAAE,CAAC,CAAA,CAAC,CAAA,KAAK,CAAA,CAAC,CAAA,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,EAAC,YAAY,EAAC,CAAC,EAAC,eAAe,EAAC,EAAE,SAAS,EAAE,WAAW;YACrI,oBAAC,GAAG;gBACA,oBAAC,GAAG,IAAC,IAAI,EAAE,EAAE;oBACT,oBAAC,KAAK;wBACD,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,oBAAC,MAAM,IAAC,KAAK,EAAC,QAAQ,EAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE;gCACzE,eAAe,EAAE,qBAAqB;gCACtC,MAAM,EAAE,EAAE;gCACV,KAAK,EAAE,EAAE;6BACZ,GAAW;wBAAE,QAAQ,CAAC,KAAK;wBAC5B,gBAAgB,IAAI,gBAAgB,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA,oBAAC,KAAK,IAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,GAAK,CAAA,CAAC,CAAA,IAAI,CAEtG,CACN,CACJ,CAEF,CAAA;IACZ,CAAC;CAEJ;AAED,eAAe,QAAQ,CAAA"}

package/lib/tree/tree-utils.d.ts

@@ -0,0 +1,55 @@
+import React from "react";
+import { DataNode } from "antd/es/tree";
+import { DtmplData, LtmplConfig, TtmplConfig } from "../tmpl/interface";
+export interface TtmplNodeConfig extends TtmplConfig {
+    leafTitleId?: string;
+    branchTitleId?: string;
+    rootTitleId?: string;
+    rootLTmplConfig?: LtmplConfig;
+    branchLTmplConfig?: LtmplConfig;
+    leafLTmplConfig?: LtmplConfig;
+}
+export interface TreeDataNode extends DataNode {
+    parent: TreeDataNode;
+    code: string;
+    name: string;
+    avatar: any;
+    level: number;
+    children: any;
+}
+export default class TreeUtils {
+    static initTtmplNodeConfig: (config: TtmplConfig) => Promise<TtmplNodeConfig>;
+    static loadRootNodeData: (config: TtmplNodeConfig) => Promise<any[]>;
+    static pushNodeData: (parentNode: TreeDataNode, config: TtmplNodeConfig, brancEntities: any[], leafEntities: any[]) => void;
+    static pushSameCodeNodeData: (parentNodes: TreeDataNode[], config: TtmplNodeConfig) => Promise<void>;
+    static toLeafTreeNodeData: (item: DtmplData, config: TtmplNodeConfig, parent: TreeDataNode) => {
+        code: string;
+        key: string;
+        name: any;
+        title: React.JSX.Element;
+        children: any[];
+        isLeaf: boolean;
+        parent: TreeDataNode;
+    };
+    static toBanchTreeNodeData: (item: DtmplData, config: TtmplNodeConfig, parent: TreeDataNode) => {
+        code: string;
+        key: string;
+        name: any;
+        title: React.JSX.Element;
+        children: any[];
+        isLeaf: boolean;
+        parent: TreeDataNode;
+    };
+    static toTreeNodeData: (item: DtmplData, titleId: string, parent: TreeDataNode, isLeaf: boolean) => {
+        code: string;
+        key: string;
+        name: any;
+        title: React.JSX.Element;
+        children: any[];
+        isLeaf: boolean;
+        parent: TreeDataNode;
+    };
+    static filterNode: (node: any, searchValue: string) => TreeDataNode[];
+    static filterTree: (nodes: any[], searchValue: string) => any[];
+}
+//# sourceMappingURL=tree-utils.d.ts.map

package/lib/tree/tree-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree-utils.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tree/tree-utils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,QAAQ,EAAC,MAAM,cAAc,CAAC;AAEtC,OAAO,EAAC,SAAS,EAAE,WAAW,EAAkB,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAGtF,MAAM,WAAW,eAAgB,SAAQ,WAAW;IAChD,WAAW,CAAC,EAAC,MAAM,CAAC;IACpB,aAAa,CAAC,EAAC,MAAM,CAAC;IACtB,WAAW,CAAC,EAAC,MAAM,CAAC;IACpB,eAAe,CAAC,EAAC,WAAW,CAAC;IAC7B,iBAAiB,CAAC,EAAC,WAAW,CAAC;IAC/B,eAAe,CAAC,EAAC,WAAW,CAAC;CAEhC;AAED,MAAM,WAAW,YAAa,SAAQ,QAAQ;IAC1C,MAAM,EAAC,YAAY,CAAC;IACpB,IAAI,EAAC,MAAM,CAAC;IACZ,IAAI,EAAC,MAAM,CAAC;IACZ,MAAM,EAAC,GAAG,CAAC;IACX,KAAK,EAAC,MAAM,CAAC;IACb,QAAQ,EAAC,GAAG,CAAC;CAChB;AAED,MAAM,CAAC,OAAO,OAAO,SAAS;IAE1B,MAAM,CAAC,mBAAmB,WAAkB,WAAW,8BA0BtD;IAED,MAAM,CAAC,gBAAgB,WAAkB,eAAe,oBAUvD;IAED,MAAM,CAAC,YAAY,eAAiB,YAAY,UAAU,eAAe,iBAAe,GAAG,EAAE,gBAAc,GAAG,EAAE,UAgB/G;IAED,MAAM,CAAC,oBAAoB,gBAAuB,YAAY,EAAE,UAAU,eAAe,mBAexF;IAGD,MAAM,CAAC,kBAAkB,SAAU,SAAS,UAAQ,eAAe,UAAU,YAAY;;;;;;;;MAGxF;IAED,MAAM,CAAC,mBAAmB,SAAU,SAAS,UAAQ,eAAe,UAAU,YAAY;;;;;;;;MAGzF;IAED,MAAM,CAAC,cAAc,SAAU,SAAS,WAAS,MAAM,UAAU,YAAY,UAAQ,OAAO;;;;;;;;MAa3F;IAED,MAAM,CAAC,UAAU,2BAAuB,MAAM,oBA6B7C;IAED,MAAM,CAAC,UAAU,UAAW,GAAG,EAAE,eAAe,MAAM,WAIrD;CAEJ"}

package/lib/tree/tree-utils.js

@@ -0,0 +1,142 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var _a;
+import React from "react";
+import { HydrocarbonService } from "../index";
+import HCDataSource from "../tmpl/hc-data-source";
+class TreeUtils {
+}
+_a = TreeUtils;
+TreeUtils.initTtmplNodeConfig = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!config) {
+        return null;
+    }
+    let ttmplNodeConfig = Object.assign({}, config);
+    if (ttmplNodeConfig.rootGtmplId) {
+        let res = yield HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.rootGtmplId);
+        let rootLTmplConfig = res.ltmplConfig;
+        ttmplNodeConfig.rootLTmplConfig = rootLTmplConfig;
+        ttmplNodeConfig.rootTitleId = rootLTmplConfig.primaryColumn.id;
+    }
+    if (ttmplNodeConfig.branchRatmplId) {
+        let res = yield HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.branchRatmplId);
+        let branchLTmplConfig = res.ltmplConfig;
+        ttmplNodeConfig.branchLTmplConfig = branchLTmplConfig;
+        ttmplNodeConfig.branchTitleId = branchLTmplConfig.primaryColumn.id;
+    }
+    if (ttmplNodeConfig.leafRatmplId) {
+        let res = yield HCDataSource.requestLtmplConfig(null, ttmplNodeConfig.leafRatmplId);
+        let leafLTmplConfig = res.ltmplConfig;
+        ttmplNodeConfig.leafLTmplConfig = leafLTmplConfig;
+        ttmplNodeConfig.leafTitleId = leafLTmplConfig.primaryColumn.id;
+    }
+    return ttmplNodeConfig;
+});
+TreeUtils.loadRootNodeData = (config) => __awaiter(void 0, void 0, void 0, function* () {
+    let res = yield HydrocarbonService.requestTtmplRootData(null, config.id, {});
+    let data = [];
+    //组织data
+    if (res.entities) {
+        res.entities.forEach((item, index) => {
+            data.push(_a.toTreeNodeData(item, config.rootTitleId, null, false));
+        });
+    }
+    return data;
+});
+TreeUtils.pushNodeData = (parentNode, config, brancEntities, leafEntities) => {
+    //先查询branch
+    parentNode.children.splice(0, parentNode.children.length);
+    if (brancEntities) {
+        brancEntities.forEach((item, index) => {
+            parentNode.children.push(_a.toBanchTreeNodeData(item, config, parentNode));
+        });
+    }
+    //debugger
+    //再查询leaf
+    if (leafEntities) {
+        leafEntities.forEach((item, index) => {
+            parentNode.children.push(_a.toLeafTreeNodeData(item, config, parentNode));
+        });
+    }
+};
+TreeUtils.pushSameCodeNodeData = (parentNodes, config) => __awaiter(void 0, void 0, void 0, function* () {
+    if (parentNodes.length > 0) {
+        //先查询branch
+        let brancEntities;
+        if (config.branchRatmplId) {
+            let res = yield HydrocarbonService.requestLtmplQueryTop(null, config.branchRatmplId, { mainCode: parentNodes[0].code });
+            brancEntities = res.entities;
+        }
+        let res1 = yield HydrocarbonService.requestLtmplQueryTop(null, config.leafRatmplId, { mainCode: parentNodes[0].code });
+        let leafEntities = res1.entities;
+        for (let parentNode of parentNodes) {
+            _a.pushNodeData(parentNode, config, brancEntities, leafEntities);
+        }
+    }
+});
+TreeUtils.toLeafTreeNodeData = (item, config, parent) => {
+    let d = _a.toTreeNodeData(item, config.leafTitleId, parent, true);
+    return d;
+};
+TreeUtils.toBanchTreeNodeData = (item, config, parent) => {
+    let d = _a.toTreeNodeData(item, config.branchTitleId, parent, false);
+    return d;
+};
+TreeUtils.toTreeNodeData = (item, titleId, parent, isLeaf) => {
+    let name = item.fieldMap[titleId];
+    let d = {
+        code: item.code,
+        key: (parent === null || parent === void 0 ? void 0 : parent.code) + item.code,
+        name,
+        title: React.createElement(React.Fragment, null,
+            React.createElement("span", null, name ? name : item.code)),
+        children: [],
+        isLeaf,
+        parent,
+    };
+    return d;
+};
+TreeUtils.filterNode = (node, searchValue) => {
+    let children = [...node.children];
+    let newNodes = [];
+    let tagNodes = [];
+    children.forEach((no) => {
+        let n = Object.assign({}, no);
+        let v = n.searchValue ? n.searchValue : n.name;
+        if (v.indexOf(searchValue) >= 0) {
+            newNodes.push(n);
+        }
+        if (n.children && n.children.length > 0) {
+            let retNodes = _a.filterNode(n, searchValue);
+            if (retNodes.length > 0) {
+                n.children = retNodes;
+                //补充父没有的
+                if ((n.searchValue ? n.searchValue : n.name).indexOf(searchValue) < 0) {
+                    newNodes.push(n);
+                }
+            }
+            else {
+                // 没有子节点情况
+                n.children = [];
+                // 标记,循环结束后删除
+                tagNodes.push(n);
+            }
+        }
+    });
+    node.children = newNodes;
+    return newNodes;
+};
+TreeUtils.filterTree = (nodes, searchValue) => {
+    let root = { code: "", config: undefined, key: undefined, children: [...nodes] };
+    _a.filterNode(root, searchValue);
+    return root.children;
+};
+export default TreeUtils;
+//# sourceMappingURL=tree-utils.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tree-utils.js","sourceRoot":"","sources":["../../../../src/aldehyde/tree/tree-utils.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.2.73",
+  "version": "0.2.75",
   "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/custom-page-router.tsx

@@ -62,7 +62,6 @@ export interface CustomPageRouterStat {
     }
 
     render() {
-        debugger
         // console.log("CustomPageRouter",this.props);
         let pageName = this.props.params.pageName;
         let search = this.props.location.search;

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/form/dtmpl-form.tsx

@@ -207,7 +207,6 @@ export default class DtmplForm extends React.PureComponent<DtmplFormProps, Dtmpl
                 { showHeader?  <Card bordered={false}
                       key={"detailTitle"}
                       className="hoverable pageHeader"
-                    // loading={loading}
                 >
                       <h3>
                         {code || (currentDtmplData && currentDtmplData.code)?"[编辑]":"[新增]"}

package/src/aldehyde/import/excel-import.tsx

@@ -116,44 +116,51 @@ export default class ExcelImport extends React.PureComponent<ExcelImportProps, E
                 interrupted: importStatus=='stop',
             }          
         },"","none").then((res)=>{
-            const MSG=[]
-            for(let item of res.messageSequence.messages){
-                let color="";
-                let logLevel="";
-                let createTime=Units.formateDate(item.createTime);
-                if(item.type==="SUC"){
-                    color="green"
-                    logLevel='成功';
-                }else if(item.type==="INFO"){
-                    color="black"
-                    logLevel='常规';
-                }else if(item.type==="ERROR"){
-                    color="red"
-                    logLevel='错误';
-                }else if(item.type==="WARN"){
-                    color="rgb(250, 225, 4)"
-                    logLevel='警告';
-                }
-                const msg=<div ><p>{createTime}</p><p style={{color:color}}>{`【${logLevel}】`+item.text}</p></div>
-                MSG.push({level:item.type,msg})
-            }
 
-            this.setState({
-                statusMsg:res.message,
-                percent:Math.floor((res.current/res.totalCount)*100),
-                logs:MSG,
-            })
-            if(res.completed===true){
-                clearInterval(this.timerId);
-                message.success('导入完成！');
-                this.setState({
-                    importStatus:'success'
-                });
-            }
-            if(importStatus=='stop'){
+            const MSG=[]
+            if(res.status === 'error'){
                 clearInterval(this.timerId);
+            }else {
+                for (let item of res.messageSequence.messages) {
+                    let color = "";
+                    let logLevel = "";
+                    let createTime = Units.formateDate(item.createTime);
+                    if (item.type === "SUC") {
+                        color = "green"
+                        logLevel = '成功';
+                    } else if (item.type === "INFO") {
+                        color = "black"
+                        logLevel = '常规';
+                    } else if (item.type === "ERROR") {
+                        color = "red"
+                        logLevel = '错误';
+                    } else if (item.type === "WARN") {
+                        color = "rgb(250, 225, 4)"
+                        logLevel = '警告';
+                    }
+                    const msg = <div><p>{createTime}</p><p style={{color: color}}>{`【${logLevel}】` + item.text}</p>
+                    </div>
+                    MSG.push({level: item.type, msg});
+                    this.setState({
+                        statusMsg: res.message,
+                        percent: Math.floor((res.current / res.totalCount) * 100),
+                        logs: MSG,
+                    })
+                    if (res.completed === true) {
+                        if(this.timerId){
+                            clearInterval(this.timerId);
+                            this.timerId=undefined;
+                            message.success('导入完成！');
+                            this.setState({
+                                importStatus: 'success'
+                            });
+                        }
+                    }
+                    if (importStatus == 'stop') {
+                        clearInterval(this.timerId);
+                    }
+                }
             }
-
         })
     } 
     onChangeShowLogLevelList = (showLogLevelList) => { //日志checkbox选择

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,9 +52,9 @@ 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>
+                <ActDtmplView title={title} 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={()=>{
                         this.setState({
                             showDtmplEdit:false,

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

@@ -49,7 +49,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
                     open={open}
                     width={width}
                     style={{
-                        maxWidth: "92vh",
+                        maxWidth: "92vw",
                     }}
                     extra={
                         <Space>
@@ -57,7 +57,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
                         </Space>
                     }
                 >
-                   <DtmplViewCard codeSource={codeSource} serverKey={serverKey} editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
+                   <DtmplViewCard  codeSource={codeSource} serverKey={serverKey} editable={editable} sourceId={sourceId} code={code}></DtmplViewCard>
              </Drawer>)
     }
 }

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

@@ -0,0 +1,77 @@
+import React from 'react'
+import {AddOrUpdate, LtmplConfigRes, RouterCompProps, TtmplConfig} from '../tmpl/interface';
+
+import HCDataSource from "../tmpl/hc-data-source";
+import withRouter from "../routable/withroute";
+import ActTree from "../tree/act-tree";
+import {Card} from "antd";
+export interface TtmplRouteProps extends RouterCompProps {
+
+};
+
+export interface TtmplRouteState {
+    ttmplConfig?: TtmplConfig,
+};
+
+class TtmplRoute extends React.PureComponent<TtmplRouteProps, TtmplRouteState> {
+    static defaultProps = {
+        basePath: "",
+    }
+    state = {
+        ttmplConfig: undefined,
+    }
+
+    async componentDidMount() {
+        this.loadData();
+    }
+
+    onRoute = (path) => {
+        this.props.navigate(path);
+    }
+
+    getMenuId = () => {
+        const {searchParams} = this.props;
+        let menuId = searchParams.get('menuId');
+        return menuId;
+    }
+
+    loadData = async () => {
+        const {params} = this.props;
+        const {sourceId} = params;
+         let ttmplConfig:TtmplConfig = await HCDataSource.requestTtmplConfig(null,sourceId);
+         //debugger
+         if(ttmplConfig.type=='1M'){
+             this.props.navigate(`/${ttmplConfig.id}/act-table`);
+         }else{
+             this.setState({
+                 ttmplConfig:{...ttmplConfig},
+             })
+         }
+    }
+
+    async componentDidUpdate(prevProps) {
+        const {location,params} = this.props;
+        const {sourceId} = params;
+        let {sourceId: preSourceId} = prevProps.params;
+        let {location: preLocation} = prevProps;
+
+        if (sourceId && preSourceId && sourceId==preSourceId) {
+            return;
+        }
+        await this.loadData();
+    }
+
+    render() {
+        const { } = this.props;
+        const {ttmplConfig}=this.state;
+        if(!ttmplConfig){
+            return <Card loading={true}></Card>
+        }else{
+            return <><ActTree ttmplConfig={ttmplConfig}></ActTree></>;
+        }
+
+    }
+}
+
+export default withRouter(TtmplRoute);
+

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

@@ -242,7 +242,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                     }
                 })
                 selectedRows.forEach((item) => {
-                    selectedRows_.push({code: item.code, title: item[titleColId]});
+                    selectedRows_.push({code: item['code'], title: item[titleColId]});
                     selectedDatas.push(item);
                 })
                 if (onChangeRowSelection) {