aldehyde 0.2.57 → 0.2.60

package/lib/tmpl/model-struc-v3.js

@@ -0,0 +1,109 @@
+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 { message } from 'antd';
+import Superagent from "./superagent";
+class ModelStrucV3 {
+    static post(sourceId, jsonEntity, serverKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const formData = new FormData();
+            formData.append('sourceId', sourceId);
+            formData.append('jsonEntity', JSON.stringify(jsonEntity));
+            let res = yield Superagent.super({
+                url: this.url,
+                serverKey,
+                data: formData,
+                method: 'POST'
+            }, 'formdata', null);
+            let code = null;
+            if (res) {
+                if (res.status === "success") {
+                    if (message) {
+                        if (res.message) {
+                            message.warning("保存成功! " + res.message, 4);
+                        }
+                        else {
+                            message.success("保存成功! ", 1);
+                        }
+                    }
+                    code = res.entityCode ? res.entityCode : res.code;
+                }
+            }
+            else {
+                if (message) {
+                    message.error("保存失败");
+                }
+            }
+            return { code, status: res ? res.status : 'error' };
+        });
+    }
+    static get(sourceId, params, serverKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let res = yield Superagent.super({
+                url: this.url,
+                serverKey,
+                query: Object.assign({ pageSize: 1000, sourceId }, params),
+                method: 'GET'
+            }, null, null);
+            let code = null;
+            if (res) {
+                if (res.status === "success") {
+                    if (message) {
+                        if (res.message) {
+                            message.warning("查询成功! " + res.message, 4);
+                        }
+                    }
+                    code = res.entityCode ? res.entityCode : res.code;
+                }
+                else {
+                    message.error("查询失败! " + res.message, 6);
+                }
+            }
+            else {
+                if (message) {
+                    message.error("查询失败");
+                }
+            }
+            return res ? res : { status: "error" };
+        });
+    }
+    static delete(sourceId, codes, serverKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let res = yield Superagent.super({
+                url: this.url,
+                serverKey,
+                query: { sourceId, codes },
+                method: 'DELETE'
+            }, null, null);
+            let code = null;
+            if (res) {
+                if (res.status === "success") {
+                    if (message) {
+                        if (res.message) {
+                            message.warning("删除成功! " + res.message, 4);
+                        }
+                    }
+                    code = res.entityCode ? res.entityCode : res.code;
+                }
+                else {
+                    message.error("删除失败! " + res.message, 6);
+                }
+            }
+            else {
+                if (message) {
+                    message.error("删除失败");
+                }
+            }
+            return res;
+        });
+    }
+}
+ModelStrucV3.url = '/v3/mstruc/data';
+export default ModelStrucV3;
+//# sourceMappingURL=model-struc-v3.js.map

package/lib/tmpl/model-struc-v3.js.map

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

package/lib/tmpl/superagent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"superagent.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/superagent.js"],"names":[],"mappings":"AAIA;IACI,+DAuEC;IAiCD,uCAkBC;IAED;;;MAKC;CAGJ"}
+{"version":3,"file":"superagent.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/superagent.js"],"names":[],"mappings":"AAIA;IACI,+DA4EC;IAiCD,uCAkBC;IAED;;;MAKC;CAGJ"}

package/lib/tmpl/superagent.js

@@ -42,8 +42,13 @@ export default class Superagent {
                     if (res.status === 200) {
                         //Units.setHydrocarbonToken("hydrocarbonToken", hydrocarbonToken)
                         let result = res.body;
-                        if (result && result.status === 'error') {
-                            message.error("错误消息：" + result.message, 6);
+                        if (result) {
+                            if (result.status === 'error') {
+                                message.error("错误消息：" + result.message, 6);
+                            }
+                            // else if(result.message){
+                            //     message.warn(result.message,4)
+                            // }
                         }
                         resolve(result);
                     }

package/lib/tmpl/superagent.js.map

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

package/package.json

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

package/src/aldehyde/controls/action/index.tsx

@@ -36,7 +36,6 @@ interface ActionState {
 export default class Action extends React.PureComponent<ActionProps, ActionState> {
 
     static defaultProps = {
-        buttonType: 'dashed',
         hiddenType: 'hidden',
         buttonSize: undefined,
         iconType:'icon-title',
@@ -123,9 +122,9 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
 
 
     getButtonType = () => {
-        const {buttonType} = this.props;
+        const {buttonType,actionConfig} = this.props;
         let bType: ButtonType = !buttonType ? "dashed" : buttonType.split("-")[0] == "dashed" ? "dashed" : "primary";
-        return bType;
+        return  buttonType?bType:actionConfig.buttonType?actionConfig.buttonType:"dashed";
     }
 
     blockButton = (): boolean => {
@@ -137,7 +136,7 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
 
     formButton = () => {
         const {popoverOpen} = this.state;
-        const {actionConfig, doAction, data, disabled, buttonType,hiddenType, buttonSize,serverKey} = this.props;
+        const {actionConfig, disabled,hiddenType, buttonSize,serverKey} = this.props;
         let disabled_ = disabled;
         if (!this.isShow()) {
             if (!hiddenType || hiddenType == 'hidden') {
@@ -150,25 +149,33 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
             <FieldsEditCard serverKey={serverKey} okDanger={actionConfig.beforeExeConfirm == 'danger'} needConfirm={true} title={actionConfig.title} onCancel={() => this.onCancel()} fields={actionConfig.writes}
                             value={this.getValue()} onOk={this.onOk}
                             onValuesChange={this.onValuesChange}/>}>
-            <Button danger={actionConfig.beforeExeConfirm == 'danger'} type={this.getButtonType()} block={this.blockButton()} size={buttonSize}
-                    onClick={() => this.setState({popoverOpen: !popoverOpen})}
-                    disabled={disabled_} >{this.getTitle()}</Button>
+                <Button danger={actionConfig.danger } type={this.getButtonType()} shape={actionConfig.buttonShape} block={this.blockButton()} size={buttonSize}
+                        onClick={() => this.setState({popoverOpen: !popoverOpen})}
+                        disabled={disabled_} >{this.getTitle()}</Button>
+
         </Popover>
     }
 
     getTitle=()=>{
         const {actionConfig,iconType} = this.props;
+        let title=null;
         if(actionConfig.icon){
             if(iconType=='icon-title'){
-              return  <><Icon type={actionConfig.icon}></Icon>{actionConfig.title}</>
+                title=  <><Icon type={actionConfig.icon}></Icon>{actionConfig.title}</>
             }else if(iconType=='icon'){
-               return <Tooltip placement="top" title={actionConfig.title}><Icon type={actionConfig.icon}></Icon>{''}</Tooltip>
+                title= <Tooltip placement="top" title={actionConfig.title}><Icon type={actionConfig.icon}></Icon>{''}</Tooltip>
             }else{
-                return actionConfig.title;
+                title= actionConfig.title;
             }
         }else{
-           return actionConfig.title;
+            title= actionConfig.title;
         }
+
+        if(actionConfig.tip && iconType!='icon'){
+            title=<><Tooltip title={actionConfig.tip}>{title}</Tooltip></>
+        }
+
+        return title;
     }
 
 
@@ -211,7 +218,7 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
                         okText="确定"
                         cancelText="取消"
             >
-                <Button size={buttonSize} type={bType} block={block} disabled={disabled_}
+                <Button size={buttonSize}  danger={actionConfig.danger } type={bType} shape={actionConfig.buttonShape} block={block} disabled={disabled_}
                 >{this.getTitle()}</Button>
             </Popconfirm> :
             actionConfig.beforeExeConfirm == 'danger' ?
@@ -226,10 +233,10 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
                             cancelText="取消"
                             okType={'danger'}
                 >
-                    <Button type={bType} block={block} danger={true} size={buttonSize} disabled={disabled_}
+                    <Button type={bType} block={block} danger={true} shape={actionConfig.buttonShape} size={buttonSize} disabled={disabled_}
                     >{this.getTitle()}</Button>
                 </Popconfirm> :
-                <Button type={bType} block={block} size={buttonSize}
+                <Button type={bType} block={block} size={buttonSize} shape={actionConfig.buttonShape}  danger={actionConfig.danger}
                         onClick={() => doAction(actionConfig.id, codes, {})}
                         disabled={disabled_}
                 >{this.getTitle()}</Button>

package/src/aldehyde/controls/collapse-card/index.tsx

@@ -3,13 +3,15 @@ import {Button, Card} from 'antd'
 import './index.css'
 import {DownOutlined, RightOutlined} from '@ant-design/icons';
 import {CardProps} from "antd/lib/card";
+import ToolTipBar from "../../detail/tooltipbar";
 
 interface CollapseCardProps extends CardProps {
     initCollapse?: boolean,
+    tip?:any,
 };
 
 interface CollapseCardState {
-    collapse?: boolean
+    collapse?: boolean,
 };
 export default class CollapseCard extends React.PureComponent<CollapseCardProps, CollapseCardState> {
 
@@ -34,26 +36,28 @@ export default class CollapseCard extends React.PureComponent<CollapseCardProps,
     }
 
     cardTitle = () => {
-        const {title} = this.props;
+        const {title,tip} = this.props;
         const {collapse} = this.state;
         if(!title || 'null'==title){//没title不显示card 头 ，同时不支持伸缩。
             return null;
-        }
+        };
+        let titleBegin=null;
         if (collapse) {
-            return <Button type="text" onClick={() => {
+            titleBegin= <Button type="text" onClick={() => {
                 this.setState({collapse: false})
             }}><RightOutlined/>{title}</Button>
         } else {
-            return <Button type="text" onClick={() => {
+            titleBegin= <Button type="text" onClick={() => {
                 this.setState({collapse: true})
             }}><DownOutlined/>{title}</Button>
         }
+        return <>{titleBegin}<ToolTipBar content={tip}></ToolTipBar></>;
     }
 
     render() {
         const {collapse} = this.state;
             const { extra, title, className,initCollapse, ...other } = this.props;
-        return <Card {...other} size={'small'} extra={collapse ? "" : extra}
+        return <Card {...other}  size={'small'} extra={collapse ? "" : extra}
                      className={`${className} ${collapse ? 'collapse' : ""}`} title={this.cardTitle()}>
             {collapse ? null : this.props.children}
         </Card>;

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

@@ -525,7 +525,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             }}>
         </Select>
             {showView && drawCode ?
-                <DtmplViewDrawer serverKey={serverKey} placement={'left'} onClose={this.doClose} open={showView}
+                <DtmplViewDrawer  serverKey={serverKey} placement={'left'} onClose={this.doClose} open={showView}
                                sourceId={fieldConfig.id} code={drawCode}></DtmplViewDrawer> : null}
             {showEdit && ltmplConfig ?ltmplConfig.customEditPagePath?<DtmplCustomEditModalPage  open={showEdit} onOk={() => {
                     this.drawSubmited();

package/src/aldehyde/controls/entry-control.tsx

@@ -209,7 +209,7 @@ function  renderControl(id:any,mainCode:string|Promise<string>,fieldConfig: Fiel
             break;
         case 'password':
             entryControl =  <Input.Password
-                {...antdControlProps}
+                {...antdControlProps} autoComplete="new-password"
                 prefix={<LockOutlined className="site-form-item-icon"/>}
             />
             break;

package/src/aldehyde/detail/edit/dtmpl-edit.tsx

@@ -102,7 +102,11 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
     }
 
     loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,addOrUpdate,serverKey} = this.props;
+        const { sourceId, code:propsCode,addOrUpdate,serverKey,codeSource} = this.props;
+        let code=propsCode;
+        if(!code && codeSource){
+            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
+        }
         if (code) {
             this.setState({
                 loading: true,

package/src/aldehyde/detail/tooltipbar/index.tsx

@@ -0,0 +1,32 @@
+import React from 'react'
+import {QuestionCircleOutlined} from '@ant-design/icons';
+import { Button,Popover  } from "antd";
+import {ButtonProps} from "antd/lib/button";
+import {TooltipPlacement} from "antd/lib/tooltip";
+interface ToolTipBarProps extends ButtonProps{
+   content:any,
+    placement:TooltipPlacement,
+}
+
+
+interface ToolTipBarState {
+
+}
+
+export default class ToolTipBar extends React.PureComponent<ToolTipBarProps, ToolTipBarState> {
+
+    static defaultProps = {
+        placement:'right',
+        size:'small',
+        type:'text',
+    }
+
+
+    render() {
+        const {placement,icon,content,...other} = this.props
+        // @ts-ignore
+        return (content? <Popover  placement={placement} content={<div  dangerouslySetInnerHTML={{__html:content}} ></div>}>
+                <Button  {...other} icon={icon?icon:<QuestionCircleOutlined />} /></Popover>:null
+        )
+    }
+}

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

@@ -7,6 +7,7 @@ import '../dtmpl.css';
 import SnapshotTimeline from "./snapshot-timeline";
 import DtmplView from "./dtmpl-view";
 import Units from '../../units'
+import ToolTipBar from "../tooltipbar";
 
 export interface ActDtmplViewProps extends DtmplBaseProps {
     versionId?: number;
@@ -80,7 +81,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
     }
 
     render() {
-        const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl,serverKey} = this.props;
+        const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl,serverKey,codeSource} = this.props;
         const {dtmplConfig, premisesTitle, loading, layout, snapshotOpen,refreshCode} = this.state;
         const buttons = dtmplConfig ? dtmplConfig.buttons : undefined;
         const premises = dtmplConfig ? dtmplConfig.premises : undefined;
@@ -95,7 +96,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
                       className="hoverable pageHeader"
                 >
                     <h3>
-                        {'详情'}
+                        {'详情'}{dtmplConfig?<ToolTipBar content={dtmplConfig.tip} />:null}
                         <div className="fr">
                             {buttons && buttons.includes("dtmplEdit") && goDtmpl && !dtmplConfig.editAction ?
                                     <Button
@@ -121,7 +122,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
                         </div>
                     </h3>
                 </Card>
-                <DtmplView serverKey={serverKey} refreshCode={refreshCode} showRightNav={showRightNav_} rightBarPositionRight={rightBarPositionRight}
+                <DtmplView codeSource={codeSource} serverKey={serverKey} refreshCode={refreshCode} showRightNav={showRightNav_} rightBarPositionRight={rightBarPositionRight}
                            dtmplConfig={dtmplConfig} sourceId={sourceId}
                            code={code}></DtmplView>
             </div>

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

@@ -55,7 +55,11 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
     }
 
     loadData = async () => {
-        const { sourceId, code, versionId,serverKey} = this.props;
+        const { sourceId, code:propsCode, versionId,serverKey,codeSource} = this.props;
+        let code=propsCode;
+        if(!code && codeSource){
+            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
+        }
         if (code) {
             this.setState({
                 loading: true,
@@ -93,7 +97,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
                                               viewOrEdit={"view"}/>
                     }
                 } else {//字段组
-                    return <CollapseCard
+                    return <CollapseCard tip={item.tip}
                         title={item.title}
                         key={item.id}
                         id={id+item.id}

package/src/aldehyde/form/dtmpl-form.tsx

@@ -9,6 +9,7 @@ import RelationTable from "../table/relation-table";
 import './dtmpl-form.css';
 import CollapseCard from "../controls/collapse-card";
 import {ProgramConfig} from "../index";
+import ToolTipBar from "../detail/tooltipbar";
 
 
 
@@ -165,6 +166,7 @@ export default class DtmplForm extends React.PureComponent<DtmplFormProps, Dtmpl
                     }
                 } else {//字段组
                     return <CollapseCard
+                        tip={item.tip}
                         title={item.title}
                         key={item.id}
                         id={parentId+item.id}
@@ -173,11 +175,8 @@ export default class DtmplForm extends React.PureComponent<DtmplFormProps, Dtmpl
                         loading={loading}
                         bodyStyle={{padding:'6px'}}
                     >
-
                         <FormItemGroup serverKey={serverKey} formRef={formRef} mainCode={mainCode} maxColsOnRow={maxColsOnRow} fields={item?item.fields:undefined} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
                             ></FormItemGroup>
-
-
                     </CollapseCard>
                 }
             }
@@ -211,7 +210,8 @@ export default class DtmplForm extends React.PureComponent<DtmplFormProps, Dtmpl
                     // loading={loading}
                 >
                       <h3>
-                        {code || (currentDtmplData && currentDtmplData.code)? "[编辑]":"[新增]"}
+                        {code || (currentDtmplData && currentDtmplData.code)?"[编辑]":"[新增]"}
+                        {dtmplConfig?<ToolTipBar content={dtmplConfig.tip} />:null}
                         <div className="fr">
                             {buttons && buttons.includes('fusionMode') ?
                                 <Switch

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

@@ -96,7 +96,11 @@ export default class DtmplEditCard extends React.PureComponent<DtmplEditCardProp
     }
 
     loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,defaultDtmplData,serverKey} = this.props;
+        const { sourceId, code:propsCode,defaultDtmplData,serverKey,codeSource} = this.props;
+        let code=propsCode;
+        if(!code && codeSource){
+            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
+        }
         if (code) {
             this.setState({
                 loading: true,

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -114,10 +114,14 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,defaultDtmplData,open,serverKey} = this.props;
+        const { sourceId, code:propsCode,defaultDtmplData,open,serverKey,codeSource} = this.props;
         if(!open){
             return;
         }
+        let code=propsCode;
+        if(!code && codeSource){
+            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
+        }
         if (code) {
             this.setState({
                 loading: true,

package/src/aldehyde/module/dtmpl-editor.tsx

@@ -95,10 +95,14 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code,defaultDtmplData,open,serverKey} = this.props;
+        const { sourceId, code:propsCode,defaultDtmplData,open,serverKey,codeSource} = this.props;
         if(!open){
             return;
         }
+        let code=propsCode;
+        if(!code && codeSource){
+            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
+        }
         if (code) {
             this.setState({
                 loading: true,

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

@@ -1,6 +1,7 @@
 import React from 'react'
 import ActDtmplView from "./../detail/view/act-dtmpl-view";
 import DtmplEditModal from './dtmpl-edit-modal';
+import {CodeSource} from "../tmpl/interface";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
@@ -10,6 +11,7 @@ export interface DtmplViewCardProps  {
     code?:string;
     mainCode?:string;
     editable?:boolean;
+    codeSource?:CodeSource,
 };
 
 export interface DtmplViewCardState  {
@@ -49,10 +51,10 @@ class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCar
 
     render() {
         const {showDtmplEdit} = this.state;
-        const { sourceId,code,mainCode,editable,serverKey} = this.props;
+        const { sourceId,code,mainCode,editable,serverKey,codeSource} = this.props;
             return <>
-                <ActDtmplView serverKey={serverKey} goDtmpl={editable?this.goDtmpl:null}  sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
-                {showDtmplEdit? <DtmplEditModal serverKey={serverKey} open={showDtmplEdit} onCancel={()=>{
+                <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={()=>{
                         this.setState({
                             showDtmplEdit:false,
                         })}}

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

@@ -2,6 +2,7 @@ import React, {ReactNode} from 'react'
 import {Drawer, Space, Button} from 'antd'
 import DtmplViewCard from "./dtmpl-view-card";
 import {DtmplBaseProps} from "../tmpl/interface";
+import ToolTipBar from "../detail/tooltipbar";
 
 interface DtmplViewDrawerProps extends DtmplBaseProps{
     title?:ReactNode,
@@ -38,10 +39,10 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
     }
 
     render() {
-        const {title,sourceId,code,placement,open,onClose,width,cancelText,editable,serverKey}=this.props;
+        const {title,sourceId,code,placement,open,onClose,width,cancelText,editable,serverKey,codeSource}=this.props;
         return  (<Drawer
                     placement={placement}
-                    title={title}
+                    title={<>{title}</>}
                     closable={true}
                     mask={false}
                     onClose={onClose}
@@ -56,7 +57,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
                         </Space>
                     }
                 >
-                   <DtmplViewCard 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/module/dtmpl-view-modal.tsx

@@ -34,7 +34,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
     }
 
     render() {
-        const {title,sourceId,code,open,onClose,width,height,serverKey}=this.props;
+        const {title,sourceId,code,open,onClose,width,height,serverKey,codeSource}=this.props;
         return <Modal
                     open={open}
                     width={width}
@@ -43,7 +43,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
                     destroyOnClose={true}
                     centered
                     onCancel={onClose}
-                ><DtmplViewCard serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
+                ><DtmplViewCard  codeSource={codeSource} serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
                 </Modal>
     }
 }

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

@@ -22,6 +22,7 @@ export interface LtmplTableProps {
     doRAction?: (ractionId: string, mainCode: string) => void,
     funcMode?: ActTableMode,
     title?: ReactNode,
+    tip?:any,
     collapsible?: boolean,
     initCollapse?: boolean,
 };
@@ -201,14 +202,14 @@ class LtmplTable extends React.PureComponent<LtmplTableProps, LtmplTableState> {
 
     render() {
         const {ltmplConfigRes, criteriaData,pageSize,pageNo, showDtmplView, selectedCode, showDtmplEdit, showDtmplCustomEdit, ractionId, showDraw, collapse} = this.state;
-        const {sourceId, mainCode, showView, doSearch, doRAction, funcMode, title, collapsible, initCollapse,doCustomEdit,doCustomCreate,serverKey} = this.props;
+        const {sourceId, mainCode, showView, doSearch, doRAction, funcMode, tip,title, collapsible, initCollapse,doCustomEdit,doCustomCreate,serverKey} = this.props;
 
         if (!ltmplConfigRes) {
             return <></>;
         } else {
             const {buttons,customEditPagePath} = ltmplConfigRes.ltmplConfig
             return <>
-                <ActTable serverKey={serverKey} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}  collapsible={collapsible} initCollapse={initCollapse && collapse} title={title}
+                <ActTable tip={tip} serverKey={serverKey} pageSize={pageSize} pageNo={pageNo} onChangePage={this.onChangePage}  collapsible={collapsible} initCollapse={initCollapse && collapse} title={title}
                           funcMode={funcMode} mainCode={mainCode} showView={showView ? showView : this.showView}
                           doRAction={doRAction ? doRAction : this.doRAction}
                           doSearch={doSearch ? doSearch : this.doSearch} doEdit={this.doEdit} doCreate={this.doCreate}