aldehyde 0.2.1 → 0.2.3

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

@@ -1,25 +1,32 @@
 import * as React from 'react'
-import {Button, Select, Spin} from 'antd'
+import {Button, Col, Divider, Row, Select, Spin, Tag} from 'antd'
 import {EControlProps, PageInfo, QueryData, QueryKey, SelectConfig} from "../../tmpl/interface";
-import {SearchOutlined} from '@ant-design/icons';
+import {AlignLeftOutlined, EditOutlined, PlusOutlined, SearchOutlined} from '@ant-design/icons';
 import debounce from 'lodash/debounce';
 import './index.css';
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import HCDataSource from "../../tmpl/hc-data-source";
+import DtmplViewPage from "../../detail/view/dtmpl-view-page";
+import DtmplEditPage from "../../detail/edit/dtmpl-edit-page";
+import {CustomTagProps} from 'rc-select/lib/BaseSelect';
 
 interface InnerEntitySelectProps extends EControlProps {
     maxSelected?: number,
     onEntityClick?: (code: string) => void,
-    baseCriteria:object,
+    baseCriteria: object,
+    actions: Array<'add' | 'delete' | 'edit' | 'detail'>
 };
 
 interface InnerEntitySelectState {
     titleId: string,
     optionCacheKey: string,
-    pageNo:number,
+    pageNo: number,
     loading: boolean,
-    optionsCache: object ;
-    selectConfig: SelectConfig
+    optionsCache: object;
+    selectConfig: SelectConfig,
+    showView: boolean,
+    drawCode: string,
+    showEdit: boolean,
 };
 
 type OptionCache = {
@@ -45,19 +52,57 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
     state = {
         titleId: undefined,
         optionCacheKey: undefined,
-        pageNo:1,
+        pageNo: 1,
         loading: false,
         optionsCache: {},
-        selectConfig:undefined,
+        selectConfig: undefined,
+        showView: false,
+        showEdit: false,
+        drawCode: undefined,
     }
+    dropdownRender = (menu) => {
+        const {fieldConfig, actions} = this.props;
+        // console.log("menu",menu);
+        return <>
+            {menu}
+            {actions && actions.indexOf('add') ?
+                <>
+                    <Divider style={{margin: '8px 0'}}/>
+                    <Row justify="end">
+                        <Col>
+                            <Button type="text" icon={<PlusOutlined style={{color: '#0958d9'}}/>}
+                                    onClick={() => this.editItem()}>
+                                添加{fieldConfig.title}
+                            </Button>
+                        </Col>
+                    </Row></> : null}
+        </>
+    };
+
+    editItem = (code?) => {
+        this.setState({
+            showEdit: true,
+            showView: false,
+            drawCode: code,
+        });
+    }
+
+    showItem = (code) => {
+        this.setState({
+            showEdit: false,
+            showView: true,
+            drawCode: code,
+        });
+    }
+
 
     componentDidUpdate(prevProps) {
-        const {baseCriteria,mainCode,fieldConfig} = this.props;
-        let {baseCriteria:preBaseCriteria,mainCode:preMainCode,fieldConfig:preFieldConfig}=prevProps;
-        if((baseCriteria && JSON.stringify(baseCriteria) != JSON.stringify(preBaseCriteria) )||(mainCode && mainCode != preMainCode)
-        ||(fieldConfig && preFieldConfig && fieldConfig.id != preFieldConfig.id)){
+        const {baseCriteria, mainCode, fieldConfig} = this.props;
+        let {baseCriteria: preBaseCriteria, mainCode: preMainCode, fieldConfig: preFieldConfig} = prevProps;
+        if ((baseCriteria && JSON.stringify(baseCriteria) != JSON.stringify(preBaseCriteria)) || (mainCode && mainCode != preMainCode)
+            || (fieldConfig && preFieldConfig && fieldConfig.id != preFieldConfig.id)) {
             this.setState({
-                optionsCache:{}
+                optionsCache: {}
             })
         }
     }
@@ -70,22 +115,50 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
 
 
     toOption = (code: string, title: string, onEntityClick) => {
+        const {actions}=this.props;
         let option = {
-            code:code,
+            code: code,
             value: code + '@R@' + title,
-            showlabel: onEntityClick ? <Button size={'small'} style={{padding: '0px'}} type="link" title=""
-                                               onClick={(e) => {
-                                                   e.stopPropagation();
-                                                   onEntityClick(code);
-                                               }}>{title}
-            </Button> : title,
-            label: title,
+            // showlabel: onEntityClick ? <Button size={'small'} style={{padding: '0px'}} type="link" title=""
+            //                                    onClick={(e) => {
+            //                                        e.stopPropagation();
+            //                                        onEntityClick(code);
+            //                                    }}>{title}
+            // </Button> : title,
+            label: <>
+                {title}
+                {actions && actions.indexOf("detail")  ?
+                <Button size={'small'} type={'text'}><AlignLeftOutlined style={{color: '#0958d9'}} onClick={(event) => {
+                    event.stopPropagation();
+                    this.showItem(code);
+                }}/></Button>:null}
+
+                {actions && actions.indexOf("edit")  ?
+                <Button size={'small'} type={'text'}><EditOutlined style={{color: '#0958d9'}} onClick={(event) => {
+                    event.stopPropagation();
+                    this.editItem(code);
+                }}/></Button>:null}
+
+            </>,
         };
         return option;
     }
 
-    toValueArray=(value)=>{
-        let valueArray: string[]=[];
+    doClose = () => {
+        this.setState({
+            drawCode: undefined,
+            showEdit: false,
+            showView: false,
+        })
+
+    }
+
+    drawSubmited = () => {
+        this.doClose();
+    }
+
+    toValueArray = (value) => {
+        let valueArray: string[] = [];
         if (value instanceof Array) {
             valueArray = value;
         } else {
@@ -95,11 +168,11 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
                 valueArray = [];
             }
         }
-        let result=[];
+        let result = [];
         for (let v of valueArray) {
             if (v) {
                 let vs = v.split("@R@");
-                if(vs[1]!='null'){
+                if (vs[1] != 'null') {
                     result.push(v);
                 }
             }
@@ -112,27 +185,27 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
         let options: object[] = [];
         //console.log('options value', value);
 
-        let valueArray: string[]=this.toValueArray(value);
+        let valueArray: string[] = this.toValueArray(value);
         for (let v of valueArray) {
-                if (v) {
-                    let vs = v.split("@R@");
-                    if(vs[1]!='null'){
-                        options.push(this.toOption(vs[0], vs[1], onEntityClick));
-                    }
+            if (v) {
+                let vs = v.split("@R@");
+                if (vs[1] != 'null') {
+                    options.push(this.toOption(vs[0], vs[1], onEntityClick));
                 }
+            }
         }
 
         //添加补充项
-        if(fieldConfig.suppleOptions){
-            fieldConfig.suppleOptions.forEach((o)=>{
-                let had=false;
-                options.forEach((s)=>{
-                    if(s['code']==o.code){
-                        had=true;
+        if (fieldConfig.suppleOptions) {
+            fieldConfig.suppleOptions.forEach((o) => {
+                let had = false;
+                options.forEach((s) => {
+                    if (s['code'] == o.code) {
+                        had = true;
                         return;
                     }
                 })
-                if(!had) {
+                if (!had) {
                     options.push(this.toOption(o.code, o.title, undefined));
                 }
             })
@@ -142,7 +215,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
     }
 
     fetchNextPage = async () => {
-        const {optionCacheKey, titleId,optionsCache} = this.state;
+        const {optionCacheKey, titleId, optionsCache} = this.state;
         let optionCache = optionsCache[optionCacheKey];
         let pageInfo = optionCache.pageInfo;
         if (!optionCache.touchEnd) {
@@ -153,15 +226,15 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
                 optionCache.touchEnd = dataSource.touchEnd;
             }
             this.setState({
-                pageNo:pageInfo.pageNo,
+                pageNo: pageInfo.pageNo,
             })
         }
     }
 
     fetchOptions = async (searchText) => {
-        const { fieldConfig,mainCode,baseCriteria} = this.props;
-        const {optionsCache,selectConfig}=this.state;
-        let optionCacheKey="withoutValue";
+        const {fieldConfig, mainCode, baseCriteria} = this.props;
+        const {optionsCache, selectConfig} = this.state;
+        let optionCacheKey = "withoutValue";
         //先从缓存里拿
         if (searchText) {
             optionCacheKey = searchText;
@@ -172,9 +245,9 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             this.setState({
                 loading: true,
             })
-            let selectConfig_=selectConfig;
+            let selectConfig_ = selectConfig;
             if (!selectConfig_) {
-                selectConfig_ = await HCDataSource.requestSelectConfig( fieldConfig.id);
+                selectConfig_ = await HCDataSource.requestSelectConfig(fieldConfig.id);
             }
             let pageInfo = {
                 pageNo: 1,
@@ -196,15 +269,18 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             /** 构建 dataSource **/
                 //构建过滤条件
             let criteriaData = {};
-            let mainCode_=mainCode;
-            if(baseCriteria){
-                criteriaData={...baseCriteria}
-                if(!mainCode){
-                    mainCode_=baseCriteria['mainCode']; //当只在条件中设置mainCode时，保证生效不被设置为null
+            let mainCode_ = mainCode;
+            if (baseCriteria) {
+                criteriaData = {...baseCriteria}
+                if (!mainCode) {
+                    mainCode_ = baseCriteria['mainCode']; //当只在条件中设置mainCode时，保证生效不被设置为null
                 }
             }
             criteriaData[formItemName] = searchText;
-            let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey( fieldConfig.id, {...criteriaData, ...pageInfo,mainCode});
+            let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(fieldConfig.id, {
+                ...criteriaData, ...pageInfo,
+                mainCode
+            });
             let sourceData = await this.loadData(queryKey.key, pageInfo, titleId);
 
             optionCache = {
@@ -214,12 +290,12 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
                 searchValue: searchText,
                 touchEnd: sourceData.touchEnd
             };
-            optionsCache[optionCacheKey]=optionCache;
+            optionsCache[optionCacheKey] = optionCache;
             this.setState({
                 optionCacheKey,
                 titleId,
-                optionsCache:{...optionsCache},
-                selectConfig:selectConfig_,
+                optionsCache: {...optionsCache},
+                selectConfig: selectConfig_,
                 loading: false,
             })
         } else {
@@ -252,9 +328,27 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
         }
     }
 
+    tagRender = (props: CustomTagProps) => {
+        const {label, closable, onClose} = props;
+        const onPreventMouseDown = (event: React.MouseEvent<HTMLSpanElement>) => {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+        return (
+            <Tag
+                onMouseDown={onPreventMouseDown}
+                closable={closable}
+                onClose={onClose}
+                style={{marginRight: 3}}
+            >
+                {label}
+            </Tag>
+        );
+    };
+
 
     loadData = async (queryKey: string, pageInfo: PageInfo, titleId: string): Promise<LoadDataSource> => {
-        const {onEntityClick,baseCriteria} = this.props;
+        const {onEntityClick, baseCriteria} = this.props;
 
         let queryData: QueryData = await HcserviceV3.requestQueryData(queryKey, pageInfo);
         let options: object[] = [];
@@ -264,11 +358,11 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             //放入全局对象缓存
             //这个缓存后续还需要完善，因为太多了，容易爆掉
             HCDataSource.cache(item);
-            if(title){
-                let ts=title.split('@R@');
-                let t=ts && ts.length>0?ts[ts.length-1]:title;
-                if(t!='null'){
-                    let option = this.toOption(item.code,t , onEntityClick);
+            if (title) {
+                let ts = title.split('@R@');
+                let t = ts && ts.length > 0 ? ts[ts.length - 1] : title;
+                if (t != 'null') {
+                    let option = this.toOption(item.code, t, onEntityClick);
                     options.push(option);
                 }
             }
@@ -294,8 +388,8 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
     }
 
     render() {
-        const {id,value,  fieldConfig, onChange,disabled, style,  maxSelected, onEntityClick} = this.props;
-        const {optionCacheKey, loading,optionsCache} = this.state;
+        const {id, value, fieldConfig, onChange, disabled, style, maxSelected, onEntityClick, actions} = this.props;
+        const {optionCacheKey, loading, optionsCache, drawCode, showEdit, showView} = this.state;
         let initOptions = this.toOptions(value, onEntityClick);
         let exists;
         let properOptions = [...initOptions];
@@ -313,7 +407,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             }
         }
 
-        return <Select
+        return <><Select
             disabled={disabled}
             id={id}
             style={{...style}}
@@ -325,6 +419,8 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             allowClear={true}
             showArrow={true}
             suffixIcon={<SearchOutlined/>}
+            dropdownRender={this.dropdownRender}
+            tagRender={actions && (actions.indexOf("detail") || actions.indexOf("edit")) ? this.tagRender : undefined}
             onSearch={this.debounceFetcher()}
             onClick={() => {
                 debounce(this.fetchOptions, 100)(undefined)
@@ -337,7 +433,19 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
                 }
             }}>
         </Select>
+            {showView && drawCode ?
+                <DtmplViewPage pageType={"drawer"} placement={'left'} onClose={this.doClose} open={showView}
+                               sourceId={fieldConfig.id} code={drawCode}></DtmplViewPage> : null}
+            {showEdit ? <DtmplEditPage pageType={"drawer"} placement={'left'} open={showEdit}
+                                       onCancel={this.doClose}
+                                       width={960}
+                                       sourceId={fieldConfig.id}
+                                       code={drawCode}
+                                       onOk={this.drawSubmited}/> : null}
+        </>
     }
+
+
 }
 
 

package/src/aldehyde/controls/html-editor/draft.tsx

@@ -140,7 +140,7 @@ export default class Draft extends React.PureComponent<DraftProps, DraftState>{
             },
         }
 
-        entryControl= <Card style={{width:'100%'}} bodyStyle={{padding:'2px',minHeight:'280px'}}>
+        entryControl= <Card style={{width:'100%'}} bodyStyle={{padding:'2px',minHeight:'280px'}} size={'small'}>
             <Editor
                 readOnly={disabled}
                 toolbarHidden={viewOrEdit=='view'? true: false}

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

@@ -1,5 +1,5 @@
-import React from 'react';
-import {Button, Drawer, FormInstance, Modal, Popconfirm, Space} from 'antd'
+import React, {ReactNode} from 'react';
+import {Button, Drawer, FormInstance, Modal, Popconfirm, Space,Card} from 'antd'
 import {DtmplBaseProps, DtmplConfig, DtmplData, PageType} from "../../tmpl/interface";
 import DtmplForm from '../../form/dtmpl-form';
 import HCDataSource from "../../tmpl/hc-data-source";
@@ -14,7 +14,8 @@ interface ModalEditorProps extends DtmplBaseProps {
     onOk: (code: string) => void,
     onCancel: () => void,
     pageType:PageType;
-    placement?:'top' | 'right' | 'bottom' | 'left'
+    placement?:'top' | 'right' | 'bottom' | 'left',
+    title?:ReactNode,
 }
 
 interface ModalEditorState {
@@ -186,13 +187,15 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
 
     render() {
-        const {height, onOk, onCancel, code, sourceId,  open,mainCode,width,pageType,placement,maxColsOnRow} = this.props
+        const {height, onOk, onCancel, code, sourceId,  open,mainCode,width,pageType,placement,maxColsOnRow,title} = this.props
         const {dtmplConfig,id,dtmplData} = this.state;
 
+        let title1=title?title:dtmplConfig ? dtmplConfig.title : "";
+
         return (<> {pageType=='modal'? <Modal
             open={open}
             width={width}
-            title={dtmplConfig ? dtmplConfig.title : ""}
+            title={title1}
             bodyStyle={{height: height, overflow: 'auto'}}
             destroyOnClose={true}
             centered
@@ -205,8 +208,9 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
                            showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange}  />
             </div>
             </Modal>
-            :
+            :pageType=='drawer'?
             <Drawer
+                title={title1}
                 placement={placement}
                 closable={true}
                 mask={false}
@@ -223,7 +227,12 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
                 <DtmplForm mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
                            onFinish={onOk}   maxColsOnRow={maxColsOnRow}
                            showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
-            </Drawer>
+            </Drawer>:<Card  title={title1}>
+                        <DtmplForm mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} sourceId={sourceId}
+                                   onFinish={onOk}   maxColsOnRow={maxColsOnRow}
+                                   showConfirm={false} dtmplData={dtmplData} onValuesChange={this.onValuesChange} />
+                    </Card>
+
        }
        </>
     )

package/src/aldehyde/detail/edit/fields-edit-card.tsx

@@ -85,7 +85,7 @@ export default class FieldsEditCard extends React.PureComponent<FieldsEditCardPr
                 >确定</Button>
         }
 
-        return <Card
+        return <Card size={'small'}
             style={{width: 1000}}
             title={title}
             bodyStyle={{overflow: 'auto'}}

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

@@ -93,7 +93,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
         }
         return (
             <div className={`detailPage ${showRightNav_ ? 'showRightNav' : 'noRightNav'}`}>
-                <Card bordered={false}
+                <Card bordered={false} size={'small'}
                       key={"detailTitle"}
                       className="hoverable pageHeader"
                 >

package/src/aldehyde/{module/dtmpl-view-page.tsx → detail/view/dtmpl-view-card.tsx}

@@ -1,20 +1,20 @@
 import React from 'react'
-import DtmplEditPage from "../detail/edit/dtmpl-edit-page";
-import ActDtmplView from "../detail/view/act-dtmpl-view";
+import DtmplEditPage from "../edit/dtmpl-edit-page";
+import ActDtmplView from "./act-dtmpl-view";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
-export interface DtmplViewPageProps  {
+export interface DtmplViewCardProps  {
     sourceId?:string,
     code?:string;
     mainCode?:string;
 };
 
-export interface DtmplViewPageState  {
+export interface DtmplViewCardState  {
     showDtmplEdit:boolean;
 };
 
-class DtmplViewPage extends React.PureComponent<DtmplViewPageProps, DtmplViewPageState> {
+class DtmplViewCard extends React.PureComponent<DtmplViewCardProps, DtmplViewCardState> {
 
     state = {
         showDtmplEdit:false,
@@ -48,16 +48,16 @@ class DtmplViewPage extends React.PureComponent<DtmplViewPageProps, DtmplViewPag
         const { sourceId,code,mainCode} = this.props;
             return <>
                 <ActDtmplView goDtmpl={this.goDtmpl} sourceId={sourceId} code={code} mainCode={mainCode}></ActDtmplView>
-                    <DtmplEditPage open={showDtmplEdit} onCancel={()=>{
+                {showDtmplEdit? <DtmplEditPage open={showDtmplEdit} onCancel={()=>{
                         this.setState({
                             showDtmplEdit:false,
                         })}}
                                    sourceId={sourceId}
                                    code={code}
-                                   onOk={this.handleDtmplEdit} />
+                                   onOk={this.handleDtmplEdit} />:null}
               </>
     }
 }
 
-export default DtmplViewPage;
+export default DtmplViewCard;
 

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

@@ -0,0 +1,79 @@
+import React, {ReactNode} from 'react'
+import {Drawer, Space, Button, Modal} from 'antd'
+import {SolutionOutlined} from '@ant-design/icons';
+import DtmplViewCard from "../../detail/view/dtmpl-view-card";
+import {DtmplBaseProps, PageType} from "../../tmpl/interface";
+
+interface DtmplViewPageProps extends DtmplBaseProps{
+    title?:ReactNode,
+    open: boolean,
+    onClose: () => void,
+    pageType?:PageType;
+    placement?:'top' | 'right' | 'bottom' | 'left',
+    width?:string|number,
+    height?:string|number,
+}
+
+interface DtmplViewPageState {
+
+}
+
+
+class DtmplViewPage extends React.PureComponent<DtmplViewPageProps, DtmplViewPageState> {
+    state={
+
+    }
+
+    static defaultProps = {
+        height: 500,
+        width:1250,
+        forceRender: true,
+        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
+        cancelText: "关闭",
+        pageType:'modal',
+        placement:'left',
+        open:false,
+    }
+
+    async componentDidMount() {
+
+    }
+
+    render() {
+        const {title,sourceId,code,placement,open,onClose,pageType,width,height}=this.props;
+        return <>{pageType=="modal"?
+                <Modal
+                    open={open}
+                    width={width}
+                    title={title}
+                    bodyStyle={{height: height, overflow: 'auto'}}
+                    destroyOnClose={true}
+                    centered
+                    onCancel={onClose}
+                ><DtmplViewCard sourceId={sourceId} code={code}></DtmplViewCard>
+                </Modal>
+                    :pageType=='drawer'?
+                <Drawer
+                    placement={placement}
+                    title={title}
+                    closable={true}
+                    mask={false}
+                    onClose={onClose}
+                    open={open}
+                    width={width}
+                    style={{
+                        maxWidth: 1960,
+                    }}
+                    extra={
+                        <Space>
+                            <Button onClick={()=>onClose()}>关闭</Button>
+                        </Space>
+                    }
+                >
+                   <DtmplViewCard sourceId={sourceId} code={code}></DtmplViewCard>
+                </Drawer>: <DtmplViewCard sourceId={sourceId} code={code}></DtmplViewCard>}
+            </>
+    }
+}
+
+export default DtmplViewPage;

package/src/aldehyde/form/form-Item-group.tsx

@@ -1,12 +1,10 @@
 import React, {RefObject} from 'react'
 import {Col, Form, Row} from 'antd'
-import 'moment/locale/zh-cn';
 import {FieldConfig} from "../tmpl/interface";
 import EntryControl from "../controls/entry-control";
 import Units from '../units'
 import {FormInstance} from "antd/lib/form/hooks/useForm";
 
-
 const FormItem = Form.Item
 
 export interface FieldGroupProps {

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

@@ -247,7 +247,7 @@ export default class ExcelImport extends React.PureComponent<ExcelImportProps, E
                 </h3>              
                 <Row>
                     <Col span={14} offset={5}>
-                        <Card style={{minWidth:600}}>
+                        <Card size={'small'} style={{minWidth:600}}>
                             <Upload {...props}>
                                 <Button>
                                     <UploadOutlined />选择导入文件

package/src/aldehyde/index.tsx

@@ -52,8 +52,8 @@ const ImportRoute = loadable(() =>
 const LtmplRoute = loadable(() =>
     import("./routable/ltmpl-route"), {fallback: Loading});
 //import DtmplViewPage from './module/dtmpl-view-page';
-const DtmplViewPage = loadable(() =>
-    import("./module/dtmpl-view-page"), {fallback: Loading});
+const DtmplViewCard = loadable(() =>
+    import("./detail/view/dtmpl-view-card"), {fallback: Loading});
 const DtmplEditCard = loadable(() =>
     import("./detail/edit/dtmpl-edit-card"), {fallback: Loading});
 // import DtmplEdit from './detail/edit/dtmpl-edit';
@@ -91,7 +91,7 @@ const DtmplEditPage = loadable(() =>
 
 
 
-export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplViewPage,LtmplPage,Menu2layers,Block,UserBar,
+export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplViewCard,LtmplPage,Menu2layers,Block,UserBar,
     ResetPassword,Footer,EntryControl,ViewControl,ProgramConfig,HydrocarbonService,QuickEntrance,Workbench,PopoverEntitySelect,DtmplEditCard
 ,DatePicker,DtmplEditPage,TmplInterface,TmplDataSource,Superagent,DtmplEdit,HCWelcome,MainPage,ExcelImportRoute,CustomPageRouter,HCCustomPageRouter,L2MenuMessageBar,L2MenuQuickBar,ContextSetter,}
 

package/src/aldehyde/layout/coverstyle.css

@@ -32,6 +32,9 @@
 	line-height: 1;
 	overflow-x: auto;
 }
+.ant-table-thead > tr > th {
+	font-weight: 500!important;
+}
 .ant-table-thead > tr > th, .ant-table-tbody > tr > td{
 	padding:8px 10px;
 	white-space :nowrap;