aldehyde 0.0.12 → 0.1.1

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

@@ -1,99 +0,0 @@
-import React from 'react'
-import {Col, Form, Row} from 'antd'
-import 'moment/locale/zh-cn';
-import {FieldConfig, FieldGroupConfig} from "../tmpl/interface";
-import EntryControl from "../controls/entry-control";
-import Units from './../units'
-
-
-
-const FormItem = Form.Item
-
-export interface FieldGroupProps {
-    fields: FieldConfig[],
-    nameAttr?:string,
-    valueMap: object,
-    width?: number,
-};
-
-interface FieldGroupState {
-    fileList: any,
-};
-
-export default class FormItemGroup extends React.PureComponent<FieldGroupProps, FieldGroupState> {
-
-    static defaultProps={
-        nameAttr:'id',
-    }
-
-    constructor(props) {
-        super(props);
-        this.state = {
-            fileList: [],
-        }
-    }
-
-    initFormList = () => {
-        const {fields, valueMap,nameAttr} = this.props
-        const formItemList = [];
-
-        if ( fields && fields.length > 0) {
-            fields.forEach((item, index) => {
-                const title = item.title;
-                let fieldValue = valueMap ? valueMap[item.id] : undefined;
-                //fieldValue 没有值时不能为null 要为 undefined。antd input所限制
-                fieldValue = (fieldValue || fieldValue==0 ) ? fieldValue : item.defaultValue ? Units.configParamTrans(item.defaultValue): undefined;
-
-                console.log("表单值：",valueMap[item.id],fieldValue);
-
-                const fieldKey = item.id + Math.random() * 100;
-                let formItem=null;
-                if(item.extControlType=='hidden'){
-                    formItem= <FormItem hidden={true}
-                                        initialValue={fieldValue}
-                                        name={item[nameAttr]} key={item.id}>
-                        <EntryControl value={fieldValue} fieldConfig={item} />
-                    </FormItem>
-                }else{
-                     formItem = <FormItem  label={item.title} name={item[nameAttr]} key={item.id}
-                                               labelCol={item.colNum == 1 ? {span: 6} : {span: 3}}
-                                               wrapperCol={item.colNum == 1 ? {span: 15} : {span: 19}}
-                                               tooltip={item.tip}
-                                               initialValue={fieldValue}
-                                               style={{ margin: 4}}
-                                               rules={item.required ? [{
-                                                   required: true, message: `请选择${title}`,
-                                               }] : undefined}>
-                        <EntryControl value={fieldValue} fieldConfig={item} />
-                    </FormItem>
-                }
-                formItemList.push(formItem);
-            });
-        }
-
-        const colList = [];
-
-        for (let i = 0; i < formItemList.length; i = i + 1) {
-            let colNum = fields[i].colNum;
-            if(fields[i].extControlType=='hidden'){
-                colNum=0;
-            }
-            let col = <Col key={i} span={12 * colNum}>
-                {formItemList[i]}
-            </Col>
-            colList.push(col);
-        }
-
-        const row =
-            <Row gutter={[16, 8]} key={1}>
-                {colList}
-            </Row>
-        return row;
-    }
-
-    render() {
-        return (
-            this.initFormList()
-        )
-    }
-}

package/src/components/layout/MainPage.tsx

@@ -1,230 +0,0 @@
-import React from 'react'
-import {FormInstance, Layout} from 'antd'
-import Footer from './footer';
-import {BlockMenu} from "../tmpl/interface";
-import Header from './header';
-import SideBar from './sidebar';
-import HCDataSource from "../tmpl/hc-data-source";
-import DocumentTitle from "react-document-title";
-import Units from '../units';
-import Scrollbars from 'react-custom-scrollbars';
-
-const {Content, Sider} = Layout;
-
-interface MainPageProps {
-    children: any,
-    match?: any,
-}
-
-interface MainPageState {
-    collapsed: boolean,
-    currentL2MenuId: string,
-    blocks: BlockMenu[],
-    currentBlockId?: string,
-    isImporter:boolean,
-}
-
-class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
-    scrollbarRef = React.createRef();
-    state = {
-        collapsed: false,
-        blocks: [],
-        currentL2MenuId: undefined,
-        currentBlockId: undefined,
-        isImporter:false,
-    }
-
-    async componentDidMount() {
-
-        var currentURL = new URL(window.location.href);
-        console.log('main page currentURL:',currentURL);
-        const search = window.location.href.split("?")[1];
-        var searchParams = new URLSearchParams('?' + search);
-        let blockId = searchParams.get('blockId');
-        let l2MenuId = searchParams.get('menuId');
-        //进一步找找l2MenuId
-        if (!l2MenuId) {
-            let sourcePart = currentURL.hash.match(/[\w]+\-[\d]+/);
-            if (sourcePart) {
-                let source = sourcePart[0].split('-');
-                if (source[0] === 'menu') {
-                    l2MenuId = source[1];
-                }
-            }
-        }
-        let blockRes = await HCDataSource.requestBlocks(l2MenuId ? l2MenuId : undefined, blockId ? blockId : undefined);
-        this.setState({
-            isImporter:currentURL.hash.indexOf('/importer')>0,
-            blocks: blockRes.blocks,
-            currentL2MenuId: blockRes.l2MenuId,
-            currentBlockId: blockRes.blockId,
-
-        });
-
-    }
-
-
-    async componentDidUpdate(prevProps, prevState) {
-
-        var currentURL = new URL(window.location.href);
-        const search = window.location.href.split("?")[1];
-        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({
-                isImporter:isImporter_,
-            })
-        }
-        //进一步找找l2MenuId
-        if (!l2MenuId) {
-            let sourcePart = currentURL.hash.match(/[\w]+\-[\d]+/);
-            if (sourcePart) {
-                let source = sourcePart[0].split('-');
-                if (source[0] === 'menu') {
-                    l2MenuId = source[1];
-                }
-            }
-        }
-
-        const {currentL2MenuId, currentBlockId} = this.state;
-        if (l2MenuId && currentL2MenuId != l2MenuId) {
-            this.setState({
-                currentL2MenuId: l2MenuId,
-            });
-        }
-
-        if (!blockId) {
-            blockId = this.findBlockIdOfL2Menu(l2MenuId);
-        }
-        if (blockId && currentBlockId != blockId) {
-            this.setState({
-                currentBlockId: blockId,
-            });
-        }
-    }
-
-    findBlockTitle = (blockId: string) => {
-        let blockTitle: string;
-        const {blocks} = this.state;
-        if (blockId) {
-            for (const block of blocks) {
-                if (block.id == blockId) {
-                    blockTitle = block.title;
-                    break;
-                }
-            }
-        }
-        let title = blockTitle ? blockTitle + '-' : "";
-        let programName = Units.programName() ? Units.programName() : 'HYDROCARBON';
-        title = title + programName;
-        return title;
-    }
-
-    findBlockIdOfL2Menu = (leMenuId: string) => {
-        let blockId: string = undefined;
-        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;
-                        }
-                    }
-                }
-            }
-        }
-        return blockId;
-    }
-
-    findCurrentBlock = () => {
-        const {blocks, currentL2MenuId, currentBlockId} = this.state;
-        let result: BlockMenu = undefined;
-
-        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 (currentBlockId && !result) {
-            for (const block of blocks) {
-                if (block.id === currentBlockId) {
-                    result = block;
-                    break;
-                }
-            }
-        }
-        if(!result){
-            result = blocks.at(0);
-        }
-        return result;
-    }
-
-    toggle = () => {
-        this.setState({
-            collapsed: !this.state.collapsed,
-        });
-    };
-
-    render() {
-        const {match}=this.props;
-
-        const {collapsed, currentL2MenuId, currentBlockId,isImporter} = this.state;
-        //滚动条回到顶部
-        // document.body.scrollTop = document.documentElement.scrollTop = 0;
-       // @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}>
-                <DocumentTitle title={(isImporter?'导入-':"") + this.findBlockTitle(currentBlockId)}>
-                    <Layout>
-                        <Sider
-                            style={{
-                                overflow: 'auto',
-                                height: '100vh',
-                                position: 'fixed',
-                                left: 0,
-                                top: 0,
-                                bottom: 0,
-                            }}
-                            collapsed={collapsed}
-                        >
-                            <SideBar blockMenu={this.findCurrentBlock()}
-                                     currentL2MenuId={currentL2MenuId} collapsed={collapsed}/>
-                        </Sider>
-                        <Layout style={collapsed ? {background: '#fff', marginLeft: 80} : {
-                            background: '#fff',
-                            marginLeft: 200
-                        }}>
-                            <Header toggle={this.toggle} {...this.state} />
-                            <Content style={{
-                                margin: '24px 16px 0',
-                                overflow: 'initial',
-                                minHeight: 'calc(100vh)',
-                                minWidth: 760,
-                                maxWidth: 1960,
-                                paddingBottom: '8px',
-                            }}>
-                                {this.props.children}
-                            </Content>
-                            <Footer/>
-                        </Layout>
-                    </Layout>
-                </DocumentTitle>
-            </Scrollbars>
-        )
-    }
-}
-
-export default MainPage;

package/src/components/layout/menu/l2menu-message-bar.tsx

@@ -1,118 +0,0 @@
-import React from 'react'
-import {Badge, Avatar, Dropdown, Menu} from 'antd'
-import {MessageTwoTone,BellOutlined} from '@ant-design/icons';
-import 'antd/dist/antd.css';
-import {Level2Menu} from "../../tmpl/interface";
-import HcserviceV3 from '../../tmpl/hcservice-v3'
-import {NavLink} from 'react-router-dom';
-import HCDataSource from './../../tmpl/hc-data-source'
-import Units from "../../units";
-interface L2MenuMessageBarProps {
-
-}
-
-interface MessageBar {
-    l2Menu: Level2Menu;
-    count: number;
-}
-
-interface L2MenuMessageBarState {
-    messageBars: MessageBar[];
-    anyState:boolean;
-}
-
-
-class L2MenuMessageBar extends React.PureComponent<L2MenuMessageBarProps, L2MenuMessageBarState> {
-    state={
-        messageBars:undefined,
-        anyState:false,
-    }
-
-    async componentDidMount() {
-        let l2Menus = await HCDataSource.messageMenus();
-        const messageBars:MessageBar[]= [];
-        for (const item of l2Menus) {
-           const messageBar:MessageBar={
-               l2Menu:item,
-               count:0,
-           };
-           let that=this;
-            setInterval(async () => {
-                let count = await HcserviceV3.requestLtmplCount(item.id);
-                messageBar.count = count;
-                this.setState({
-                    anyState:!this.state.anyState,
-                });
-            }, 180000);
-            let count = await HcserviceV3.requestLtmplCount(item.id);
-            messageBar.count=count;
-            messageBars.push(messageBar);
-        }
-        this.setState({
-            messageBars,
-        });
-    }
-
-
-    renderMessageBar = (messageBars: MessageBar[]) => {
-
-        let  total:number=0;
-
-        const menu = (
-            <Menu key={1}>
-                { messageBars.map((messageBar, index) => {
-                    if(messageBar.count){
-                        total=total+messageBar.count;
-                    }
-                    let defaultCriteriaData="";
-                    if(messageBar.l2Menu.defaultCriteriaValue){
-                        defaultCriteriaData='&'+ Units.transQueryParamsToStr(messageBar.l2Menu.defaultCriteriaValue);
-                    }
-               return <Menu.Item key={index}>
-                   <NavLink to={`/${messageBar.l2Menu.id}/act-table?menuId=${messageBar.l2Menu.id}${defaultCriteriaData}`} >
-                       {messageBar.l2Menu.title}<Badge  count={messageBar.count} overflowCount={99} offset={[2, -2]} size="small" /></NavLink>
-                  </Menu.Item>
-            })}
-            </Menu>
-        );
-
-        if(!messageBars || messageBars.length==0){
-            return;
-        }else if(messageBars.length==1){
-            let messageBar=messageBars[0];
-            const l2Menu = messageBar.l2Menu;
-            let defaultCriteriaData="";
-            if(l2Menu.defaultCriteriaValue){
-                defaultCriteriaData='&'+ Units.transQueryParamsToStr(l2Menu.defaultCriteriaValue);
-            }
-            return (<div  className={'message-bar'} >
-                <a href={l2Menu.customPath ? `/page-${l2Menu.id}${l2Menu.customPath}?menuId=${l2Menu.id}` : `#/${l2Menu.id}/act-table?menuId=${l2Menu.id}${defaultCriteriaData}`}
-                   className="head-example" >
-                    <Badge  count={messageBar.count}   overflowCount={99} offset={[8, -2]}>
-                        <span  style={{ fontSize: '20px', color: '#08c' }} ><BellOutlined /></span>
-                    </Badge>
-                </a>
-            </div>)
-        }else{
-            return <Dropdown overlay={menu} placement="bottomCenter"    >
-                <div  className={'message-bar'} >
-                        <Badge  count={total}   overflowCount={99} offset={[8, -2]}>
-                            <span  style={{ fontSize: '20px', color: '#08c' }} ><BellOutlined /></span>
-                        </Badge>
-                </div>
-            </Dropdown>
-        }
-    }
-
-
-    render() {
-        const {messageBars} = this.state;
-        return (
-            <>
-                {messageBars?this.renderMessageBar(messageBars):""}
-            </>
-        );
-    }
-}
-
-export default L2MenuMessageBar;

package/src/components/layout/menu/l2menu-quick-bar.tsx

@@ -1,132 +0,0 @@
-import React from 'react'
-import {Badge, Avatar, Dropdown, Menu, Timeline, Drawer, Space,Button} from 'antd'
-import {MessageTwoTone,AppstoreOutlined} from '@ant-design/icons';
-import 'antd/dist/antd.css';
-import {Level2Menu} from "../../tmpl/interface";
-// import HcserviceV3 from '../../tmpl/hcservice-v3'
-import HCDataSource from './../../tmpl/hc-data-source'
-import LtmplPage from "./../../module/ltmpl-page";
-
-interface L2MenuQuickBarProps {
-
-}
-
-interface QuickBar {
-    l2Menu: Level2Menu;
-    count: number;
-}
-
-interface L2MenuQuickBarState {
-    quickBars: QuickBar[];
-    anyState:boolean;
-    currentId:string;
-    showDraw:boolean;
-}
-
-
-class L2MenuQuickBar extends React.PureComponent<L2MenuQuickBarProps, L2MenuQuickBarState> {
-    state={
-        quickBars:undefined,
-        anyState:false,
-        currentId:undefined,
-        showDraw:false,
-    }
-
-    async componentDidMount() {
-        let l2Menus = await HCDataSource.quickEntranceMenus();
-        const quickBars:QuickBar[]= [];
-        for (const item of l2Menus) {
-           const quickBar:QuickBar={
-               l2Menu:item,
-               count:0,
-           };
-           let that=this;
-            quickBars.push(quickBar);
-        }
-        this.setState({
-            quickBars,
-        });
-    }
-    showDraw=(currentId:string)=>{
-        console.log("点击了L2MenuQuickBar",currentId);
-        this.setState({
-            currentId,
-            showDraw:true
-        })
-
-    }
-
-    closeDrawer=()=>{
-        this.setState({
-            showDraw:false
-        })
-    }
-
-    renderQuickBar = (quickBars: QuickBar[]) => {
-
-        let  total:number=0;
-
-        const menu = (
-            <Menu key={1}>
-                { quickBars.map((quickBar, index) => {
-                    if(quickBar.count){
-                        total=total+quickBar.count;
-                    }
-               return <Menu.Item key={index} >
-                   <span onClick={()=>this.showDraw(quickBar.l2Menu.id)}>
-                        {quickBar.l2Menu.title}
-                   </span>
-
-                  </Menu.Item>
-            })}
-            </Menu>
-        );
-
-        if(!quickBars || quickBars.length==0){
-            return;
-        }else if(quickBars.length==1){
-            let quickBar=quickBars[0];
-            const l2Menu = quickBar.l2Menu;
-            return (<div  className={'message-bar'} onClick={()=>this.showDraw(quickBar.l2Menu.id)}>
-                 <span  style={{ fontSize: '20px', color: '#08c' }} ><AppstoreOutlined /></span>
-            </div>)
-        }else{
-            return <Dropdown overlay={menu} placement="bottomCenter"   >
-                <div  className={'message-bar'} >
-                   <span  style={{ fontSize: '20px', color: '#08c' }} ><AppstoreOutlined /></span>
-                </div>
-            </Dropdown>
-        }
-    }
-
-
-    render() {
-        const {quickBars,showDraw,currentId} = this.state;
-        return (
-            <>
-                {quickBars?this.renderQuickBar(quickBars):""}
-                <Drawer
-                    placement={'left'}
-                    title="快捷查询"
-                    closable={true}
-                    mask={false}
-                    onClose={this.closeDrawer}
-                    visible={showDraw}
-                    width={'calc(100% - 280px)'}
-                    style={{
-                        maxWidth: 1960,
-                    }}
-                    extra={
-                        <Space>
-                            <Button onClick={this.closeDrawer}>关闭</Button>
-                        </Space>
-                    }
-                >
-                   <LtmplPage  sourceId={currentId}></LtmplPage>
-                </Drawer>
-            </>
-        );
-    }
-}
-
-export default L2MenuQuickBar;

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

@@ -1,70 +0,0 @@
-import React from 'react'
-import {Badge, Avatar, Dropdown, Menu, Timeline, Drawer, Space,Button} from 'antd'
-import {MessageTwoTone,AppstoreOutlined} from '@ant-design/icons';
-import 'antd/dist/antd.css';
-import {Level2Menu} from "../../tmpl/interface";
-// import HcserviceV3 from '../../tmpl/hcservice-v3'
-import HCDataSource from './../../tmpl/hc-data-source'
-import {UserOutlined,LogoutOutlined,ClearOutlined,KeyOutlined,SolutionOutlined} from '@ant-design/icons';
-import DtmplPage from "./../../module/dtmpl-page";
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-
-interface UserInfoBarProps {
-
-}
-
-interface UserInfoBarState {
-    showDraw:boolean;
-}
-
-
-class UserInfoBar extends React.PureComponent<UserInfoBarProps, UserInfoBarState> {
-    state={
-        showDraw:false,
-    }
-
-    async componentDidMount() {
-
-    }
-    showDraw=()=>{
-        this.setState({
-            showDraw:true
-        })
-    }
-
-    closeDrawer=()=>{
-        this.setState({
-            showDraw:false
-        })
-    }
-
-    render() {
-        const {showDraw} = this.state;
-        return (
-            <>
-                <span onClick={this.showDraw}><SolutionOutlined />个人信息</span>
-                <Drawer
-                    placement={'left'}
-                    title="个人信息"
-                    closable={true}
-                    mask={false}
-                    onClose={this.closeDrawer}
-                    visible={showDraw}
-                    width={'calc(100% - 280px)'}
-                    style={{
-                        maxWidth: 1960,
-                    }}
-                    extra={
-                        <Space>
-                            <Button onClick={this.closeDrawer}>关闭</Button>
-                        </Space>
-                    }
-                >
-                   <DtmplPage sourceId={'0'} code={"userCode"}></DtmplPage>
-                </Drawer>
-            </>
-        );
-    }
-}
-
-export default UserInfoBar;