aldehyde 0.2.63 → 0.2.65

package/src/aldehyde/detail/button/submit-button-bar.tsx

@@ -1,15 +1,17 @@
 import React, {RefObject} from 'react'
 import './index.css'
-import {ActionConfig, ButtonName, DtmplConfig, TmplBase} from "../../../aldehyde/tmpl/interface";
+import {ActionConfig, ButtonName, ButtonPosition, DtmplConfig, TmplBase} from "../../../aldehyde/tmpl/interface";
 import {Affix, Button, Popconfirm, Popover} from "antd";
 import {LeftOutlined, SaveOutlined} from '@ant-design/icons';
 import Action from "../../controls/action";
+import FixRightSubmitButtonBar from './fix-right-submit-button-bar'
 import {FormInstance} from "antd/lib/form/hooks/useForm";
+import BottomSubmitButtonBar from "./bottom-submit-button-bar";
 
-interface SubmitButtonProps {
+export  interface SubmitButtonProps {
     serverKey?:string,
     dtmplConfig: DtmplConfig,
-   // dtmplData:DtmplData,
+    position?:ButtonPosition,
     doSubmit: (actionId?: string,codes?:string[],params?:object) => void;
     formRef: RefObject<FormInstance>,
     serial:number,
@@ -27,126 +29,18 @@ class SubmitButtonBar extends React.PureComponent<SubmitButtonProps, SubmitButto
       // stateSerial:0,
     }
 
-    calcOffsetBottom = (buttons: ButtonName[], actions: ActionConfig[]) => {
-        let buttonSize:number=0;
-        if(actions ){
-            buttonSize=buttonSize+actions.length;
-        }
-        if((buttons && buttons.includes('dtmplSave')) ){
-            buttonSize=buttonSize+1;
-        }
-        if (buttonSize>=3) {
-            return 120;
-        } else if (buttonSize==2){
-            return 86;
-        }else{
-            return 80;
-        }
-    }
-
-   //  async componentDidMount() {
-   //      console.log("SubmitButtonBar this.loadData()");
-   //
-   //      console.log("SubmitButtonBar this.loadData()1");
-   //          //  if(code!=preCode || (!code && preCode)){
-   //          //     await this.loadData();
-   //          // }else{
-   //          //      formRef.current.resetFields();
-   //          //  }
-   // }
+    static defaultProps={
 
-    // loadData = async () => {
-    //     console.log("SubmitButtonBar this.loadData()2");
-    //     this.setState({
-    //         stateSerial: this.state.stateSerial + 1,
-    //     })
-    // }
+    }
 
     render() {
-       const {}=this.state;
-        const {dtmplConfig, doSubmit,formRef,serial,serverKey} = this.props
-        const {buttons, actions} = dtmplConfig;
-        const cardList: TmplBase[] = [];
-
-        //console.log(" submit-button-bar serial:",serial);
-       // console.log(" submit-button-bar stateSerial:",stateSerial);
-
-        if (dtmplConfig.premises && dtmplConfig.premises.length > 0) {
-            cardList.push({
-                id: '1', title: '默认字段',
-            });
-        }
-        dtmplConfig.groups.forEach(g => {
-            cardList.push({
-                title: g.title,
-                id: g.id,
-            });
-        })
-
-        let content
-        if (actions && actions.length > 1) {
-            content = (
-                <div className="btns">
-                    {actions.map((item, index) => {
-                        if (index > 1) {
-                            // return <Popconfirm key={item.id} placement="top" title={"确定要保存修改并执行此操作吗?"}
-                            //                    onConfirm={() => doSubmit(item.id)} okText="确定" cancelText="取消">
-                            // <Button
-                            //     type="primary"
-                            // >{item.title}</Button>
-                            // </Popconfirm>
-                           return <Action serverKey={serverKey} iconType={'icon-title'} hiddenType={'disabled'} buttonType={'primary'} serial={serial} key={item.id}   formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
-                        }
-                    })
-                    }
-                </div>
-            );
-        }
-
+        const {position, doSubmit, serial, dtmplConfig, formRef} = this.props;
+        let posi = position ? position : dtmplConfig.buttonPosition ? dtmplConfig.buttonPosition : undefined
 
-        return (
-            <Affix
-                //style={{position: 'absolute', right: 10, maxHeight: 100}}
-                   // offsetBottom={this.calcOffsetBottom(buttons, actions)}>
-                   style={{position: 'absolute',bottom:60,right: 15,}}  offsetBottom={this.calcOffsetBottom(buttons, actions)}
-            >
-                <div className={'submitButtonBar'} >
-                    <ul>
-                        {buttons.includes('dtmplSave') ? <li key={100}>
-                            <Button
-                                onClick={() => doSubmit()}
-                                type='primary'
-                                icon={<SaveOutlined/>}
-                                key="btn" block
-                            >保 存</Button>
-                        </li> : ""
-                        }
-                        {//处理前两个
-                            actions ? actions.map((item, index) => {
-                                    if (index < 2) {
-                                        return <li key={index}>
-                                            {/*<Popconfirm placement="left" title={"确定要保存修改并执行此操作吗?"} onConfirm={() => doSubmit(item.id)} okText="确定" cancelText="取消">*/}
-                                            {/*<Button  block*/}
-                                            {/*        type={'primary'}>{item.title}</Button>*/}
-                                            {/*</Popconfirm>*/}
-                                            <Action serverKey={serverKey} hiddenType={'disabled'} buttonType={'primary-block'} serial={serial}  key={item.id}  formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
-                                        </li>
-                                    }
-                                }
-                            ) : ""
-                        }
-                        {//处理后面的
-                        actions && actions.length > 2 ?
-                                <Popover placement="leftTop" content={content} trigger="hover">
-                                    <Button block>
-                                        <LeftOutlined/>{'更多'}
-                                    </Button>
-                                </Popover> : ""
-                        }
-                    </ul>
-                </div>
-            </Affix>
-        )
+        return <>{!posi || posi == 'fixedBottomRight' ?
+            <FixRightSubmitButtonBar doSubmit={doSubmit} serial={serial} dtmplConfig={dtmplConfig} formRef={formRef}/>
+            : <BottomSubmitButtonBar position={posi} doSubmit={doSubmit} serial={serial} dtmplConfig={dtmplConfig} formRef={formRef}/>
+        }</>
     }
 }
 

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

@@ -210,7 +210,7 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
                 {showRightNav ?
                     <RightBar  parentId={id} dtmplConfig={dtmplConfig}/> : ""
                 }
-                <SubmitButtonBar serverKey={serverKey} serial={serial} dtmplConfig={dtmplConfig} doSubmit={this.doSubmit}  formRef={this.formRef}></SubmitButtonBar>
+                <SubmitButtonBar serverKey={serverKey} serial={serial} dtmplConfig={dtmplConfig} doSubmit={this.doSubmit} formRef={this.formRef}></SubmitButtonBar>
                 <CqueryButtonBar  serverKey={serverKey} dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
                 <PostResult
                     open={showPostResult}

package/src/aldehyde/detail/edit/row-editor.tsx

@@ -62,7 +62,6 @@ export default class RowEditor extends React.PureComponent<RowEditorProps, RowEd
                 <Button
                     disabled={disabled}
                     style={buttonStyle}
-                    type='primary'
                     icon={buttonIcon}
                     size="small"
                     onClick={() => {

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

@@ -40,7 +40,7 @@ export default class ModalDtmplView extends React.PureComponent<ModalDtmplViewPr
             open={open}
             title={"查看"}
             // style={style}
-            width={'1250px'}
+            width={"82vh"}
             centered
             wrapClassName={'aaa'}
             bodyStyle={{height: height, overflow: 'auto'}}

package/src/aldehyde/layout/MainPage.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Layout} from 'antd'
+import {Layout} from 'antd'
 import Footer from './footer/index';
 import {BlockMenu} from "../tmpl/interface";
 import Header from './header';
@@ -11,6 +11,7 @@ import Scrollbars from 'react-custom-scrollbars';
 import "./common.css"
 import "./coverstyle.css"
 import withRouter from "../routable/withroute";
+
 const {Content, Sider} = Layout;
 
 interface MainPageProps {
@@ -23,8 +24,8 @@ interface MainPageState {
     currentL2MenuId?: string,
     blocks?: BlockMenu[],
     currentBlockId?: string,
-    isImporter?:boolean,
-    sideBartitle?:string,
+    isImporter?: boolean,
+    sideBartitle?: string,
 }
 
 class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
@@ -34,8 +35,8 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
         blocks: [],
         currentL2MenuId: undefined,
         currentBlockId: undefined,
-        isImporter:false,
-        sideBartitle:undefined,
+        isImporter: false,
+        sideBartitle: undefined,
     }
 
     async componentDidMount() {
@@ -56,12 +57,12 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
             }
         }
         let blockRes = await HCDataSource.requestBlocks(l2MenuId ? l2MenuId : undefined, blockId ? blockId : undefined);
-        this.setState((state)=>({
-            isImporter:currentURL.hash.indexOf('/importer')>0,
-            blocks: blockRes.blocks?blockRes.blocks:[],
+        this.setState((state) => ({
+            isImporter: currentURL.hash.indexOf('/importer') > 0,
+            blocks: blockRes.blocks ? blockRes.blocks : [],
             currentL2MenuId: blockRes.l2MenuId,
             currentBlockId: blockRes.blockId,
-            sideBartitle:blockRes.programName,
+            sideBartitle: blockRes.programName,
         }));
 
     }
@@ -74,10 +75,10 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
         var searchParams = new URLSearchParams('?' + search);
         let blockId = searchParams.get('blockId');
         let l2MenuId = searchParams.get('menuId');
-        let isImporter_= currentURL.hash.indexOf('/importer')>0;
-        if(prevState.isImporter!=isImporter_){
-            this.setState((state)=>({
-                isImporter:isImporter_,
+        let isImporter_ = currentURL.hash.indexOf('/importer') > 0;
+        if (prevState.isImporter != isImporter_) {
+            this.setState((state) => ({
+                isImporter: isImporter_,
             }))
         }
         //进一步找找l2MenuId
@@ -93,7 +94,7 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
 
         const {currentL2MenuId, currentBlockId} = this.state;
         if (l2MenuId && currentL2MenuId != l2MenuId) {
-            this.setState((state)=>({
+            this.setState((state) => ({
                 currentL2MenuId: l2MenuId,
             }));
         }
@@ -102,7 +103,7 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
             blockId = this.findBlockIdOfL2Menu(l2MenuId);
         }
         if (blockId && currentBlockId != blockId) {
-            this.setState((state)=>({
+            this.setState((state) => ({
                 currentBlockId: blockId,
             }));
         }
@@ -130,11 +131,29 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
         const {blocks} = this.state;
         if (leMenuId) {
             for (const block of blocks) {
-                for (const menul1 of block.l1Menus) {
-                    for (const menul2 of menul1.l2Menus) {
-                        if (menul2.id == leMenuId) {
-                            blockId = block.id;
-                            break;
+                if (block.l1Menus) {
+                    for (const menul1 of block.l1Menus) {
+                        for (const menul2 of menul1.l2Menus) {
+                            if (menul2.id == leMenuId) {
+                                blockId = block.id;
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    for (const menul1 of block.items) {
+                        if (menul1.items) {
+                            for (const menul2 of menul1.items) {
+                                if (menul2.id == leMenuId) {
+                                    blockId = block.id;
+                                    break;
+                                }
+                            }
+                        } else {
+                            if (menul1.id == leMenuId) {
+                                blockId = block.id;
+                                break;
+                            }
                         }
                     }
                 }
@@ -147,13 +166,32 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
         const {blocks, currentL2MenuId, currentBlockId} = this.state;
         let result: BlockMenu = undefined;
 
-        if (currentL2MenuId ) {
+        if (currentL2MenuId) {
             for (const block of blocks) {
-                for (const menul1 of block.l1Menus) {
-                    for (const menul2 of menul1.l2Menus) {
-                        if (menul2.id == currentL2MenuId) {
-                            result = block;
-                            break;
+
+                if (block.l1Menus) {
+                    for (const menul1 of block.l1Menus) {
+                        for (const menul2 of menul1.l2Menus) {
+                            if (menul2.id == currentL2MenuId) {
+                                result = block;
+                                break;
+                            }
+                        }
+                    }
+                } else {
+                    for (const menul1 of block.items) {
+                        if (menul1.items) {
+                            for (const menul2 of menul1.items) {
+                                if (menul2.id == currentL2MenuId) {
+                                    result = block;
+                                    break;
+                                }
+                            }
+                        } else {
+                            if (menul1.id == currentL2MenuId) {
+                                result = block;
+                                break;
+                            }
                         }
                     }
                 }
@@ -167,50 +205,50 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
                 }
             }
         }
-        if(!result){
+        if (!result) {
             result = blocks.at(0);
         }
         return result;
     }
 
     toggle = () => {
-        this.setState((state)=>({
+        this.setState((state) => ({
             collapsed: !this.state.collapsed,
         }));
     };
 
     render() {
 
-        const {collapsed, currentL2MenuId, currentBlockId,isImporter,sideBartitle} = this.state;
+        const {collapsed, currentL2MenuId, currentBlockId, isImporter, sideBartitle} = this.state;
         //滚动条回到顶部
         // document.body.scrollTop = document.documentElement.scrollTop = 0;
-       // @ts-ignore
+        // @ts-ignore
         // eslint-disable-next-line no-unused-expressions
         this.scrollbarRef?.current?.scrollToTop();
         return (
-            <Scrollbars ref={this.scrollbarRef} style={{ height: 'calc(100vh)' }} autoHide autoHideTimeout={1000}>
+            <Scrollbars ref={this.scrollbarRef} style={{height: 'calc(100vh)'}} autoHide autoHideTimeout={1000}>
 
-                    {/*<Row  justify="space-around" align="middle" style={{'background':'#0f4da1',height:'80px'}}>*/}
-                    {/*    <Col span={12}>*/}
-                    {/*        <img style={{height:'60px'}} src={Logo}></img>*/}
-                    {/*    </Col>*/}
-                    {/*    <Col  span={4}>*/}
+                {/*<Row  justify="space-around" align="middle" style={{'background':'#0f4da1',height:'80px'}}>*/}
+                {/*    <Col span={12}>*/}
+                {/*        <img style={{height:'60px'}} src={Logo}></img>*/}
+                {/*    </Col>*/}
+                {/*    <Col  span={4}>*/}
 
-                    {/*    </Col>*/}
-                    {/*</Row>*/}
-                <DocumentTitle title={(isImporter?'导入-':"") + this.findBlockTitle(currentBlockId)}>
+                {/*    </Col>*/}
+                {/*</Row>*/}
+                <DocumentTitle title={(isImporter ? '导入-' : "") + this.findBlockTitle(currentBlockId)}>
                     <Layout>
                         <Sider theme={"light"}
-                            style={{
-                                // background: '#0f4da1',
-                                overflow: 'auto',
-                                height: '100vh',
-                                position: 'fixed',
-                                left: 0,
-                                top: 0,
-                                bottom: 0,
-                            }}
-                            collapsed={collapsed}
+                               style={{
+                                   // background: '#0f4da1',
+                                   overflow: 'auto',
+                                   height: '100vh',
+                                   position: 'fixed',
+                                   left: 0,
+                                   top: 0,
+                                   bottom: 0,
+                               }}
+                               collapsed={collapsed}
                         >
                             <SideBar title={sideBartitle} blockMenu={this.findCurrentBlock()}
                                      currentL2MenuId={currentL2MenuId} collapsed={collapsed}/>

package/src/aldehyde/layout/menu/block.tsx

@@ -20,25 +20,33 @@ class Block extends React.PureComponent<BlockProps, BlockState> {
         super(props);
     }
 
-    renderBlockMenu = (blockMenu:BlockMenu)=>{
-        return <Menu>
-            {MenuRender.renderL1Menu(blockMenu.l1Menus,null)}
-        </Menu>
-
+    getSubMenu = (blockMenu:BlockMenu)=>{
+        return MenuRender.getMenu(blockMenu,null);
     }
 
-
     findBlockId = (blocks:BlockMenu[],currentL2MenuId:string) => {
         let blockId:string=undefined;
         for(const block of blocks){
-            for(const menul1 of block.l1Menus){
-                for(const menul2 of menul1.l2Menus){
-                    if(menul2.id===currentL2MenuId){
-                        blockId=block.id;
-                        return blockId;
+            if(block.l1Menus){
+                for(const menul1 of block.l1Menus){
+                    for(const menul2 of menul1.l2Menus){
+                        if(menul2.id===currentL2MenuId){
+                            blockId=block.id;
+                            return blockId;
+                        }
+                    }
+                }
+            }else{
+                for(const menul1 of block.items){
+                    for(const menul2 of menul1.items){
+                        if(menul2.id===currentL2MenuId){
+                            blockId=block.id;
+                            return blockId;
+                        }
                     }
                 }
             }
+
         }
         return blockId;
     }
@@ -63,7 +71,7 @@ class Block extends React.PureComponent<BlockProps, BlockState> {
             blocks.map((item, index) => {
                 return <div key={index}
                             className={`${item.id == blockId ? "active" : ""} header-block`}  style={syyy}>
-                    <Dropdown overlay={this.renderBlockMenu(item)}>
+                    <Dropdown menu={{ items:this.getSubMenu(item) }}>
                         <a  className="dropdown-link"
                             style={item.id == blockId?{color:'#fff'}:{color:activeColor}}
                             rel="noopener noreferrer"

package/src/aldehyde/layout/menu/menu-2layers.tsx

@@ -20,7 +20,7 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
     componentDidMount() {
         const {currentL2MenuId, blockMenu,collapsed} = this.props;
         const {openKeys} = this.state;
-        let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
+        let openKey = blockMenu?MenuRender.findOpenId(blockMenu, currentL2MenuId):undefined;
         if(openKey && openKeys.length<1){
             this.setState({
                 openKeys:[openKey.toString()]
@@ -34,15 +34,15 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
 
         if(!preBlockMenu || !blockMenu  || blockMenu.id!=preBlockMenu.id ){
                 //console.log('currentL2MenuId:',currentL2MenuId);
-            let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
+            let openKey = blockMenu? MenuRender.findOpenId(blockMenu, currentL2MenuId):undefined;
                 if (openKey) {
                     this.setState({
                         openKeys:[openKey],
                     })
                 }
         }else {
-            let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
-            let preOpenKey = blockMenu?MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId):undefined;
+            let openKey = blockMenu?MenuRender.findOpenId(blockMenu, currentL2MenuId):undefined;
+            let preOpenKey = blockMenu?MenuRender.findOpenId(preBlockMenu, preMenuId):undefined;
             if((!preOpenKey && openKey) || (openKey && openKey!=preOpenKey)){
                 this.setState({
                     openKeys:[openKey],
@@ -70,8 +70,8 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
                 onOpenChange={this.handleOpen} //手风琴
                 selectedKeys={currentL2MenuId ? [currentL2MenuId.toString()] : undefined}
                 openKeys={!collapsed?openKeys:undefined}
+                items={blockMenu ? MenuRender.getMenu(blockMenu, undefined,basePath) : []}
             >
-                {blockMenu ? MenuRender.renderL1Menu(blockMenu.l1Menus, undefined,basePath) : ""}
             </Menu>
         );
     }