aldehyde 0.2.63 → 0.2.65

package/src/aldehyde/layout/menu/menu-render.tsx

@@ -1,46 +1,84 @@
-import {Level1Menu, Level2Menu} from "../../tmpl/interface";
+import {BlockMenu, Level1Menu, Level2Menu} from "../../tmpl/interface";
 import {Menu} from "antd";
+import type {MenuProps} from "antd";
 import React from "react";
 import {NavLink} from 'react-router-dom';
 import Units from "../../units";
-const {SubMenu} = Menu;
+
 
 export default {
-    renderL1Menu(menus:Level1Menu[],target,basePath=""){
-        return menus.map((item) => {
-            if (item.l2Menus) {
-                return <SubMenu title={item.title} key={item.id}>
-                    {this.renderL2Menu(item.l2Menus,target,basePath)}
-                </SubMenu>
-            }
-        })
+
+    getMenu(blockMenu: BlockMenu , target, basePath = ""){
+        if(blockMenu.l1Menus){
+           return this.toL1Menu(blockMenu.l1Menus, target, basePath = "")
+        }else{
+            return this.toSubMenu(blockMenu.items, target, basePath = "");
+        }
+
+    },
+
+    toL1Menu(subMenus: (Level1Menu)[], target, basePath = "") {
+        let menus:MenuProps['items'] =[];
+        let menu;
+        if(subMenus){
+            subMenus.map((item) => {
+                menu = {key: item.id};
+                let subItems = item.l2Menus;
+                if (subItems) {//菜单
+                    menu.label = item.title;
+                    menu.children = this.toSubMenu(subItems, target, basePath);
+                }
+                menus.push(menu);
+            })
+        }
+        return menus;
+    },
+
+    toSubMenu(subMenus: (Level2Menu |BlockMenu)[], target, basePath = "") {
+        let menus:MenuProps['items'] =[];
+        let menu;
+        if(subMenus){
+            subMenus.map((item) => {
+                menu = {key: item.id};
+                let subItems = item.items;
+                if (subItems) {//菜单
+                    menu.label = item.title;
+                    menu.children = this.toSubMenu(subItems, target, basePath);
+                } else {
+                    let i:Level2Menu=item as Level2Menu;
+                    menu.label = this.toL2MenuTitle(i , target, basePath);
+                }
+                menus.push(menu);
+            })
+        }
+        return menus;
     },
-    getRoutePath(menu:Level2Menu,basePath,defaultCriteriaData){
-        if(menu){
-            let pageType=menu.pageType;
+    getRoutePath(menu: Level2Menu, basePath, defaultCriteriaData) {
+        if (menu) {
+            let pageType = menu.pageType;
 
-            let routePath='act-table';
+            let routePath = 'act-table';
 
-            let codeSource='';
+            let codeSource = '';
             switch (pageType) {
                 case "列表":
-                    routePath='act-table';
+                    routePath = 'act-table';
                     break;
                 case "添加":
-                    routePath='detail-edit';
-                    codeSource='&codeSource=new';
+                    routePath = 'detail-edit';
+                    codeSource = '&codeSource=new';
                     break;
                 case "编辑":
-                    routePath='detail-edit';
-                    codeSource='&codeSource=listop';
+                    routePath = 'detail-edit';
+                    codeSource = '&codeSource=listop';
                     break;
                 case "编辑或添加":
-                    routePath='detail-edit';
-                    codeSource='&codeSource=listop-new';
+                    routePath = 'detail-edit';
+                    codeSource = '&codeSource=listop-new';
                     break;
                 case "详情":
-                    routePath='detail-view';
-                    codeSource='&codeSource=listop';
+                    routePath = 'detail-view';
+                    codeSource = '&codeSource=listop';
                     break;
             }
 
@@ -49,37 +87,59 @@ export default {
         }
         return null;
     },
-    renderL2Menu(menus:Level2Menu[],target,basePath=""){
-        return menus.map((item) => {
-            let delimiter="/";
-            let customPath=item.customPath;
-            if(customPath){
-                if(customPath.startsWith('/') || customPath.startsWith('\\')){
-                    delimiter="";
-                }
-            }
-            let defaultCriteriaData="";
-            if(item.defaultCriteriaValue){
-                defaultCriteriaData='&'+ Units.transQueryParamsToStr(item.defaultCriteriaValue);
+    toL2MenuTitle(item: Level2Menu, target, basePath = "") {
+
+        if(!item){
+            return null;
+        }
+
+        let delimiter = "/";
+        let customPath = item.customPath;
+        if (customPath) {
+            if (customPath.startsWith('/') || customPath.startsWith('\\')) {
+                delimiter = "";
             }
+        }
+        let defaultCriteriaData = "";
+        if (item['defaultCriteriaValue']) {
+            defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
+        }
 
-            let path=customPath ?`${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` :this.getRoutePath(item,basePath,defaultCriteriaData);
+        let path = customPath ? `${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
 
-            return <Menu.Item key={item.id}>
-                <NavLink to={path} target={target} >{item.title}</NavLink>
-            </Menu.Item>
-        })
+        return <NavLink to={path} target={target}>{item.title}</NavLink>;
     },
-    findOpenId(l1Menus:Level1Menu[],currentL2MenuId:string){
-        let openL2MenuId:string=undefined;
-        for(const menul1 of l1Menus){
-            for(const menul2 of menul1.l2Menus){
-                if(menul2.id==currentL2MenuId){
-                    openL2MenuId=menul1.id;
-                    return openL2MenuId;
+    findOpenId(blockMenu: BlockMenu, currentL2MenuId: string) {
+        let openL2MenuId: string = undefined;
+        if(blockMenu.l1Menus){
+            for (const menul1 of blockMenu.l1Menus) {
+                    for (const menul2 of menul1.l2Menus) {
+                        if (menul2.id == currentL2MenuId) {
+                            openL2MenuId = menul1.id;
+                            return openL2MenuId;
+                        }
+                    }
+                }
+        }else{
+            for (const menul1 of blockMenu.items) {
+                if(menul1.items){
+                    for (const menul2 of menul1.items) {
+                        if (menul2.id == currentL2MenuId) {
+                            openL2MenuId = menul1.id;
+                            return openL2MenuId;
+                        }
+                    }
+                }else{
+                    if (menul1.id == currentL2MenuId) {
+                        openL2MenuId = menul1.id;
+                        return openL2MenuId;
+                    }
                 }
+
             }
         }
+
+
         return openL2MenuId;
     }
 }

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

@@ -39,8 +39,8 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
     }
     static defaultProps = {
         showConfirm: true,
-        height: 580,
-        width:1250,
+        height: '76vh',
+        width:'76vw',
         bodyWidth:'100%',
         //antd modal
         forceRender: true,

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

@@ -25,8 +25,8 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
     }
 
     static defaultProps = {
-        height: 500,
-        width:1250,
+        height: "82vh",
+        width:"82vw",
         forceRender: true,
         cancelText: "关闭",
         placement:'left',
@@ -49,7 +49,7 @@ class DtmplViewDrawer extends React.PureComponent<DtmplViewDrawerProps, DtmplVie
                     open={open}
                     width={width}
                     style={{
-                        maxWidth: 1960,
+                        maxWidth: "92vh",
                     }}
                     extra={
                         <Space>

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

@@ -22,8 +22,8 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
     }
 
     static defaultProps = {
-        height: 500,
-        width:1250,
+        height: "82vh",
+        width:"82vw",
         forceRender: true,
         style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
         open:false,
@@ -44,7 +44,7 @@ class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewM
                     centered
                     onCancel={onClose}
                 >
-            <Scrollbars style={{ height: Number(height)-40 }} autoHide autoHideTimeout={1000}>
+            <Scrollbars  autoHide autoHideTimeout={1000}>
             <DtmplViewCard  codeSource={codeSource} serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
         </Scrollbars>
                 </Modal>

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

@@ -19,9 +19,9 @@ export default class LtmplDrawer extends React.PureComponent<LtmplDrawPageProps,
 
     static defaultProps = {
         showConfirm: true,
-        width:1250,
+        width:'76vw',
         forceRender: true,
-        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
+        style: {maxWidth: '92vw', maxHeight: '92vh'},
         okText: "确定",
         cancelText: "取消",
         placement:'left',
@@ -43,7 +43,7 @@ export default class LtmplDrawer extends React.PureComponent<LtmplDrawPageProps,
                 open={open}
                 width={width}
                 style={{
-                    maxWidth: 1960,
+                    maxWidth: '92vw',
                 }}
                 // extra={
                 //     <Space>{this.getFooter()}</Space>

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

@@ -19,8 +19,8 @@ export default class LtmplDrawer extends React.PureComponent<LtmplDrawPageProps,
 
     static defaultProps = {
         showConfirm: true,
-        height: 580,
-        width:1250,
+        height:'82vh' ,
+        width:'82vw',
         forceRender: true,
         style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)',padding:10},
         okText: "确定",
@@ -39,17 +39,15 @@ export default class LtmplDrawer extends React.PureComponent<LtmplDrawPageProps,
                 width={width}
                 title={title}
                 closable={false}
-                bodyStyle={{height: height, overflow: 'auto',padding:6}}
+                bodyStyle={{height: height, overflow: 'auto',padding:"6 0 6 6"}}
                 destroyOnClose={true}
                 centered
                 onOk={onCancel}
                 onCancel={onCancel}
-                footer={[<Button onClick={onCancel}>关 闭</Button>]}
-            > <Scrollbars style={{ height: Number(height)-40 }} autoHide autoHideTimeout={1000}>
-                <Card bordered={false} bodyStyle={{padding:'4px 0 0 0'}} >
-
+                footer={[<Button onClick={onCancel}>关 闭</Button>]}>
+             <Scrollbars  autoHide autoHideTimeout={1000}>
+                <Card bordered={false} bodyStyle={{padding:'4px 10px 0  0'}} >
                     <LtmplTable {...other}></LtmplTable>
-
                 </Card>
             </Scrollbars>
         </Modal>

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

@@ -190,7 +190,6 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                     {dtmplEdit ?
                         <Button disabled={disabled}
                                 title="编辑当实体"
-                                type='primary'
                                 icon={<FormOutlined/>}
                                 size="small"
                                 onClick={() => this.showEditDtmplModel(record)}
@@ -470,7 +469,6 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         {buttons.includes('dtmplAdd') ?
                             <Button
                                 disabled={buttonDisabled}
-                                type='primary'
                                 icon={<PlusSquareOutlined/>}
                                 size="small"
                                 onClick={this.showAddDtmplModel}

package/src/aldehyde/tmpl/interface.tsx

@@ -79,6 +79,7 @@ export interface JumpConfig extends OrderableTmplBase {
 }
 
 export interface Level2Menu extends MenuBase {
+    items:(BlockMenu|Level2Menu)[],
     customPath?: string;
     displayTotal?: boolean;
     count?:number;
@@ -95,7 +96,8 @@ export interface MenuBase extends OrderableTmplBase {
 }
 
 export interface BlockMenu extends MenuBase {
-    l1Menus: Level1Menu[]
+    l1Menus: Level1Menu[],
+    items:(BlockMenu|Level2Menu)[]
 }
 
 export interface CriteriaConfig extends FieldConfig {
@@ -108,6 +110,8 @@ export interface ColumnConfig extends FieldConfig {
 
 export type CodeSource = 'new'|'listop'|'listop-new'|undefined;
 
+export type ButtonPosition = 'fixedBottomRight'|'bottomLeft'|'bottomCenter'|'bottomRight'|undefined;
+
 export type FieldGroupType = 'relation' | 'fieldGroup' ;
 
 export type ButtonName = 'rowAdd' | 'rowEdit' | 'batchDelete'|'singleDelete'| 'selectAdd' | 'dtmplAdd' | 'dtmplEdit' | 'copy'|
@@ -146,6 +150,7 @@ export interface DtmplConfig extends TmplBase {
     actions: ActionConfig[];
     premises: FieldConfig[];
     groups: FieldGroupConfig[];
+    buttonPosition:ButtonPosition;
     onValuesChange:(changedValues,allValues:DtmplData,formInstance:FormInstance)=>void
 }
 

package/lib/layout/menu/block1.d.ts

@@ -1,18 +0,0 @@
-import React from "react";
-import { BlockMenu } from "../../tmpl/interface";
-export interface BlockProps {
-    blocks: BlockMenu[];
-    currentBlockId?: string;
-    currentL2MenuId?: string;
-    activeColor?: string;
-}
-interface BlockState {
-}
-declare class Block extends React.PureComponent<BlockProps, BlockState> {
-    constructor(props: any);
-    renderBlockMenu: (blockMenu: BlockMenu) => React.JSX.Element;
-    findBlockId: (blocks: BlockMenu[], currentL2MenuId: string) => string;
-    render(): React.JSX.Element | React.JSX.Element[];
-}
-export default Block;
-//# sourceMappingURL=block1.d.ts.map

package/lib/layout/menu/block1.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"block1.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block1.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAI/C,MAAM,WAAW,UAAU;IACvB,MAAM,EAAC,SAAS,EAAE,CAAC;IACnB,cAAc,CAAC,EAAC,MAAM,CAAC;IACvB,eAAe,CAAC,EAAC,MAAM,CAAC;IACxB,WAAW,CAAC,EAAC,MAAM,CAAC;CACvB;AACD,UAAU,UAAU;CAEnB;AAED,cAAM,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC;gBAE/C,KAAK,KAAA;IAIjB,eAAe,cAAc,SAAS,uBAKrC;IAGD,WAAW,WAAW,SAAS,EAAE,mBAAiB,MAAM,YAavD;IAED,MAAM;CAiCT;AAED,eAAe,KAAK,CAAC"}

package/lib/layout/menu/block1.js

@@ -1,46 +0,0 @@
-import React from "react";
-import { Dropdown, Menu } from 'antd';
-import MenuRender from './menu-render';
-class Block extends React.PureComponent {
-    constructor(props) {
-        super(props);
-        this.renderBlockMenu = (blockMenu) => {
-            return React.createElement(Menu, null, MenuRender.renderL1Menu(blockMenu.l1Menus, null));
-        };
-        this.findBlockId = (blocks, currentL2MenuId) => {
-            let blockId = 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;
-                        }
-                    }
-                }
-            }
-            return blockId;
-        };
-    }
-    render() {
-        const { currentBlockId, blocks, currentL2MenuId, activeColor } = this.props;
-        const syyy = { '--header-block-active-bottom-color': activeColor ? activeColor : "#1E90FF", '--header-top-active-background': activeColor ? activeColor : "#1E90FF" };
-        if (!blocks || blocks.length < 1) {
-            return React.createElement(React.Fragment, null);
-        }
-        let blockId = currentBlockId;
-        if (currentL2MenuId && !blockId) {
-            blockId = this.findBlockId(blocks, currentL2MenuId);
-        }
-        if (!blockId) {
-            blockId = blocks.at(0).id;
-        }
-        return (blocks.map((item, index) => {
-            return React.createElement("div", { key: index, className: `${item.id == blockId ? "active" : ""} header-block`, style: syyy },
-                React.createElement(Dropdown, { overlay: this.renderBlockMenu(item) },
-                    React.createElement("a", { className: "dropdown-link", style: item.id == blockId ? { color: '#fff' } : { color: activeColor }, rel: "noopener noreferrer" }, item.title)));
-        }));
-    }
-}
-export default Block;
-//# sourceMappingURL=block1.js.map

package/lib/layout/menu/block1.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"block1.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block1.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAC,MAAM,MAAM,CAAC;AAErC,OAAO,UAAU,MAAM,eAAe,CAAC;AAavC,MAAM,KAAM,SAAQ,KAAK,CAAC,aAAqC;IAE3D,YAAY,KAAK;QACb,KAAK,CAAC,KAAK,CAAC,CAAC;QAGjB,oBAAe,GAAG,CAAC,SAAmB,EAAC,EAAE;YACrC,OAAO,oBAAC,IAAI,QACP,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,EAAC,IAAI,CAAC,CAC7C,CAAA;QAEX,CAAC,CAAA;QAGD,gBAAW,GAAG,CAAC,MAAkB,EAAC,eAAsB,EAAE,EAAE;YACxD,IAAI,OAAO,GAAQ,SAAS,CAAC;YAC7B,KAAI,MAAM,KAAK,IAAI,MAAM,EAAC;gBACtB,KAAI,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAC;oBAC9B,KAAI,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAC;wBAC/B,IAAG,MAAM,CAAC,EAAE,KAAG,eAAe,EAAC;4BAC3B,OAAO,GAAC,KAAK,CAAC,EAAE,CAAC;4BACjB,OAAO,OAAO,CAAC;yBAClB;qBACJ;iBACJ;aACJ;YACD,OAAO,OAAO,CAAC;QACnB,CAAC,CAAA;IAvBD,CAAC;IAyBD,MAAM;QACF,MAAM,EAAC,cAAc,EAAC,MAAM,EAAC,eAAe,EAAC,WAAW,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;QAErE,MAAM,IAAI,GAAC,EAAC,oCAAoC,EAAC,WAAW,CAAA,CAAC,CAAA,WAAW,CAAA,CAAC,CAAA,SAAS,EAAC,gCAAgC,EAAC,WAAW,CAAA,CAAC,CAAA,WAAW,CAAA,CAAC,CAAA,SAAS,EAAkB,CAAA;QAEvK,IAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,GAAC,CAAC,EAAC;YAC1B,OAAO,yCAAK,CAAC;SAChB;QACD,IAAI,OAAO,GAAC,cAAc,CAAC;QAC3B,IAAG,eAAe,IAAI,CAAC,OAAO,EAAC;YAC3B,OAAO,GAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAC,eAAe,CAAC,CAAC;SACpD;QACD,IAAG,CAAC,OAAO,EAAC;YACR,OAAO,GAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3B;QAED,OAAO,CACP,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACvB,OAAO,6BAAK,GAAG,EAAE,KAAK,EACV,SAAS,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,eAAe,EAAG,KAAK,EAAE,IAAI;gBACrF,oBAAC,QAAQ,IAAC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;oBACzC,2BAAI,SAAS,EAAC,eAAe,EACzB,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,OAAO,CAAA,CAAC,CAAA,EAAC,KAAK,EAAC,MAAM,EAAC,CAAA,CAAC,CAAA,EAAC,KAAK,EAAC,WAAW,EAAC,EAC7D,GAAG,EAAC,qBAAqB,IAEvB,IAAI,CAAC,KAAK,CACX,CACG,CACT,CAAA;QACV,CAAC,CAAC,CACD,CAAC;IACN,CAAC;CAEJ;AAED,eAAe,KAAK,CAAC"}

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

@@ -1,81 +0,0 @@
-import React, {CSSProperties} from "react";
-import { Dropdown, Menu} from 'antd';
-import {BlockMenu} from "../../tmpl/interface";
-import MenuRender from './menu-render';
-
-
-export interface BlockProps{
-    blocks:BlockMenu[];
-    currentBlockId?:string;
-    currentL2MenuId?:string;
-    activeColor?:string;
-}
-interface BlockState{
-
-}
-
-class Block extends React.PureComponent<BlockProps, BlockState> {
-
-    constructor(props) {
-        super(props);
-    }
-
-    renderBlockMenu = (blockMenu:BlockMenu)=>{
-        return <Menu>
-            {MenuRender.renderL1Menu(blockMenu.l1Menus,null)}
-        </Menu>
-
-    }
-
-
-    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;
-                    }
-                }
-            }
-        }
-        return blockId;
-    }
-
-    render(){
-        const {currentBlockId,blocks,currentL2MenuId,activeColor}=this.props;
-
-        const syyy={'--header-block-active-bottom-color':activeColor?activeColor:"#1E90FF",'--header-top-active-background':activeColor?activeColor:"#1E90FF"} as CSSProperties
-
-        if(!blocks || blocks.length<1){
-            return <></>;
-        }
-        let blockId=currentBlockId;
-        if(currentL2MenuId && !blockId){
-            blockId=this.findBlockId(blocks,currentL2MenuId);
-        }
-        if(!blockId){
-            blockId=blocks.at(0).id;
-        }
-
-        return (
-        blocks.map((item, index) => {
-            return <div key={index}
-                        className={`${item.id == blockId ? "active" : ""} header-block`}  style={syyy}>
-                <Dropdown overlay={this.renderBlockMenu(item)}>
-                    <a  className="dropdown-link"
-                        style={item.id == blockId?{color:'#fff'}:{color:activeColor}}
-                       rel="noopener noreferrer"
-                    >
-                        {item.title}
-                    </a>
-                </Dropdown>
-            </div>
-        })
-        );
-    }
-
-}
-
-export default Block;