aldehyde 0.2.2 → 0.2.4

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

@@ -230,7 +230,7 @@ function  renderControl(id:any,mainCode:string|Promise<string>,fieldConfig: Fiel
         case 'relselect':
         case 'refselect':
         case 'entity-select':
-            entryControl=<EntitySelect maxSelected={max?parseInt(max):undefined} {...controlProps} />
+            entryControl=<EntitySelect maxSelected={max?parseInt(max):undefined}  actions={fieldConfig.actions} {...controlProps} />
             break;
         case 'table-entity-select':
             entryControl=<PopoverEntitySelect maxSelected={max?parseInt(max):undefined} {...controlProps}  />

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/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;

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

@@ -1,6 +1,6 @@
 import React from 'react'
-import {Avatar, Button, Descriptions, Dropdown, Menu, Popover, Tooltip,Row,Col} from 'antd';
-import {ClearOutlined, LogoutOutlined, UserOutlined,ProfileOutlined} from '@ant-design/icons';
+import {Avatar, Col, Dropdown, Menu, Row, Tooltip} from 'antd';
+import {ClearOutlined, LogoutOutlined, ProfileOutlined, UserOutlined} from '@ant-design/icons';
 import {UserInfo} from "../../tmpl/interface";
 import HcserviceV3 from '../../tmpl/hcservice-v3';
 import HCDataSource from "../../tmpl/hc-data-source";
@@ -15,7 +15,7 @@ interface UserBarProps {
 
 
 interface UserBarState extends UserInfo {
-
+    context: Array<object>,
 }
 
 
@@ -31,7 +31,7 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
         let userInfo = await HcserviceV3.getUser();
         //查询 上下文配置信息
         let context = await HcserviceV3.getContextSourceValue();
-       // console.log('context', context);
+        // console.log('context', context);
         this.setState({
             context,
             ...userInfo
@@ -51,35 +51,50 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
         if (context) {
             console.log('context', context);
             return <>
-                {context.map((c)=>{
+                {context.map((c) => {
                     return <Row><Col>{c.label} : {c.content}</Col></Row>
-            })}
+                })}
             </>
         }
         return "无"
 
     }
-    toSetContext=()=>{
+    toSetContext = () => {
         window.location.hash = "#/context-setter";
     }
 
-    render() {
+    getTitle = () => {
         const {name, context} = this.state;
+        return <>
+            <p>{name}</p>
+            {context?
+                context.map((con) => {
+                        return <p>{con.label} : {con.content}</p>
+               }):null
+            }
+        </>
+    }
+
+    render() {
+        const {name, context, roles} = this.state;
 
         const menu = (
             <Menu style={{minWidth: '100px'}}>
                 <Menu.Item>
                     <UserInfoBar/>
                 </Menu.Item>
-                {context && context.length>0 ? <Menu.Item>
-                        <span onClick={this.toSetContext} ><ProfileOutlined />全局配置</span>
+                {context && context.length > 0 ? <Menu.Item>
+                    <span onClick={this.toSetContext}><ProfileOutlined/>全局配置</span>
                 </Menu.Item> : null}
                 <Menu.Item>
                     <ResetPassword></ResetPassword>
                 </Menu.Item>
-                <Menu.Item>
-                    <span onClick={this.cleanCache}><ClearOutlined/>清空缓存</span>
-                </Menu.Item>
+                {roles && roles.indexOf("admin") >= 0 ?
+                    <Menu.Item>
+                        <span onClick={this.cleanCache}><ClearOutlined/>清空缓存</span>
+                    </Menu.Item> : null
+                }
+
                 <Menu.Item>
                     <span onClick={HcserviceV3.logout}><LogoutOutlined/>退出登录</span>
                 </Menu.Item>
@@ -94,7 +109,7 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
                         {/*</Avatar>*/}
                         {/*</Tooltip>*/}
                         {/*<UserOutlined/>*/}
-                        <Tooltip placement="left" title={name}>
+                        <Tooltip placement="left" title={this.getTitle()}>
                             <Avatar className={'loginAvatar'} icon={<UserOutlined/>} size="large">
                                 {/*{name ?name.substring(0,1).toUpperCase():null}*/}
                             </Avatar>

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

@@ -1,7 +1,8 @@
 import React from 'react'
 import { Drawer, Space,Button} from 'antd'
 import {SolutionOutlined} from '@ant-design/icons';
-import DtmplViewPage from "../../module/dtmpl-view-page";
+import DtmplViewCard from "../../detail/view/dtmpl-view-card";
+import DtmplViewPage from "../../detail/view/dtmpl-view-page";
 
 interface UserInfoBarProps {
 
@@ -37,25 +38,7 @@ class UserInfoBar extends React.PureComponent<UserInfoBarProps, UserInfoBarState
         return (
             <>
                 <span onClick={this.showDraw}><SolutionOutlined />个人信息</span>
-                <Drawer
-                    placement={'left'}
-                    title="个人信息"
-                    closable={true}
-                    mask={false}
-                    onClose={this.closeDrawer}
-                    open={showDraw}
-                    width={'calc(100% - 280px)'}
-                    style={{
-                        maxWidth: 1960,
-                    }}
-                    extra={
-                        <Space>
-                            <Button onClick={this.closeDrawer}>关闭</Button>
-                        </Space>
-                    }
-                >
-                   <DtmplViewPage sourceId={'0'} code={"userCode"}></DtmplViewPage>
-                </Drawer>
+                {showDraw?<DtmplViewPage title={'个人信息'} width={'calc(100% - 280px)'} pageType={'drawer'} sourceId={'0'} open={showDraw} code={"userCode"} onClose={this.closeDrawer}></DtmplViewPage>:null}
             </>
         );
     }

package/src/aldehyde/login/context-setter.tsx

@@ -27,6 +27,7 @@ class LtmplPage extends React.PureComponent<ContextSetterProps, ContextSetterSta
     static defaultProps = {}
 
     async componentDidMount() {
+
         let config = await HCserviceV3.getContextSourceConfig();
         let context = await HCserviceV3.getContextSourceValue();
         if (!config || config.length==0 ) {
@@ -70,7 +71,6 @@ class LtmplPage extends React.PureComponent<ContextSetterProps, ContextSetterSta
 
 
     render() {
-
         const {config,loading,context}=this.state;
         return <Modal title="全局配置" closable={false} open={true} footer={[]}>
             <Row  justify="center" align="middle" >

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

@@ -288,7 +288,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
         return (
             <>
                 {viewModels.includes('table') ?
-                    <Table
+                    <Table size={'middle'}
                         rowSelection={this.getRowSelection()}
                         columns={columns ? columns : []}
                         dataSource={this.getUnHidenDataSource()}
@@ -312,7 +312,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                             dataSource={this.getUnHidenDataSource()}
                             renderItem={item => (
                                 <List.Item key={item['id']}>
-                                    <Card bodyStyle={{padding:'4px'}}><Descriptions column={4}>
+                                    <Card size={'small'} bodyStyle={{padding:'4px'}}><Descriptions column={4}>
                                         {this.initViewList(item)}
                                     </Descriptions></Card>
                                 </List.Item>

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

@@ -547,7 +547,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                     >
                         <div className="editTableList">
                             {this.buildButtons()}
-                            <Table scroll={{scrollToFirstRowOnChange: false}}
+                            <Table size={'small'} scroll={{scrollToFirstRowOnChange: false}}
                                    locale={{emptyText:<div style={{textAlign:'center',width:'100%'}}><Text  disabled>暂无数据...</Text></div>}}
                                    bordered
                                    loading={tableLoading}