aldehyde 0.0.12 → 0.1.3

package/src/components/layout/header/index.tsx

@@ -1,58 +0,0 @@
-import React from 'react'
-import {Col, Layout, Row} from 'antd'
-import {MenuFoldOutlined, MenuUnfoldOutlined} from '@ant-design/icons';
-import 'antd/dist/antd.css';
-import "./index.css"
-import Block, {BlockProps} from "../menu/block";
-import L2MenuMessageBar from '../menu/l2menu-message-bar';
-import L2MenuQuickBar  from '../menu/l2menu-quick-bar';
-import UserBar from '../menu/user-bar';
-
-const { Header:AntdHeader, } = Layout;
-
-interface HeaderProps extends BlockProps {
-    toggle: any;
-    collapsed: boolean;
-}
-
-interface HeaderState {
-
-}
-
-class Header extends React.PureComponent<HeaderProps, HeaderState> {
-
-    toggle = () => {
-        this.props.toggle();
-    };
-
-    render() {
-
-        let {collapsed}=this.props;
-        return (
-            <AntdHeader style={{ padding: 0 , height: 'auto'}}>
-                    <Row className="header-top" wrap={false}>
-                        <Col span={20} className="header-col" >
-                            <div style={{float: 'left'}}>
-                                {React.createElement(collapsed ? MenuUnfoldOutlined : MenuFoldOutlined, {
-                                    className: 'trigger',
-                                    onClick: this.toggle,
-                                })}
-                            </div>
-                            <Block {...this.props} />
-                        </Col>
-                        <Col span={1} style={{width: '100%'}}>
-                            <L2MenuQuickBar></L2MenuQuickBar>
-                        </Col>
-                        <Col span={1} style={{width: '100%'}}>
-                            <L2MenuMessageBar></L2MenuMessageBar>
-                        </Col>
-                        <Col span={2}>
-                            <UserBar></UserBar>
-                        </Col>
-                    </Row>
-            </AntdHeader>
-        )
-    }
-}
-
-export default Header

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

@@ -1,88 +0,0 @@
-import React from "react";
-import {Badge, Col, Dropdown, Menu, Row} from 'antd';
-import {BlockMenu} from "../../tmpl/interface";
-import {NavLink, withRouter} from 'react-router-dom';
-import {
-    AppstoreTwoTone,
-    FormOutlined,
-    LogoutOutlined,
-    MenuFoldOutlined,
-    MenuUnfoldOutlined,
-    MessageTwoTone,
-    UserOutlined
-} from '@ant-design/icons';
-import MenuRender from './menu-render';
-
-
-export interface BlockProps{
-    blocks:BlockMenu[];
-    currentBlockId?:string;
-    currentL2MenuId?: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}=this.props;
-        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`}>
-                <Dropdown overlay={this.renderBlockMenu(item)}>
-                    <a  className="dropdown-link"
-                       // href={`#/home?blockId=${item.id}`}
-                       rel="noopener noreferrer"
-                    >
-                        {item.title}
-                    </a>
-                </Dropdown>
-            </div>
-        })
-        );
-    }
-
-}
-
-export default withRouter(Block);

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;

package/src/components/login.js

@@ -1,137 +0,0 @@
-import React from 'react'
-import {Button, Col, Form, Image, Input, message, Row} from 'antd'
-import {LockOutlined, SafetyCertificateOutlined, UserOutlined} from '@ant-design/icons';
-import HCserviceV3 from "./tmpl/hcservice-v3"
-
-
-export default class Loginit extends React.Component {
-    state = {
-        username: "",
-        password: "",
-        loading: true,
-        needKaptcha:false,
-        kaptchaImg:null,
-        kaptchaToken:null
-    }
-    formRef = React.createRef();
-
-    componentDidMount=async ()=> {
-
-        let pubkey = await HCserviceV3.getRasPubkey();
-        this.setState({
-            pubkey,
-            loading: false
-        })
-
-    }
-
-    getKaptchaToken=async ()=>{
-       let res= await HCserviceV3.getKaptchaToken();
-       if(res){
-           let  kaptchaImg=`data:image/png;base64,${res.img}`;
-           this.setState({
-               kaptchaImg,
-               kaptchaToken:res.kaptchaToken,
-               needKaptcha:true
-           })
-       }
-    }
-
-    handleSubmit = async () => {
-
-        this.setState({
-            loading: true
-        })
-        let {kaptchaToken,pubkey}=this.state
-
-        await this.formRef.current.validateFields().then(async (values) => {
-                let res = await HCserviceV3.login(values.username, values.password,kaptchaToken,values.kaptchaText,pubkey);
-                if (res.status === 'error') {
-                    //message.info(res.message);
-                    await this.getKaptchaToken();
-                }
-            }
-        ).catch(errorInfo => {
-        })
-        this.setState({
-            loading: false
-        })
-    }
-
-    handleKeyDown = (event) => { //按下enter键，触发login事件
-        switch (event.keyCode) {
-            case 13:
-                this.handleSubmit();
-                break;
-            default:
-                break;
-        }
-    }
-
-    changeKaptcha =async  (event) => { //切换验证码
-        await  this.getKaptchaToken();
-    }
-
-    componentDidMount() {
-        window.removeEventListener('keydown', this.handleKeyDown)
-    }
-
-    render() {
-        const {username, password, loading,needKaptcha,kaptchaImg} = this.state
-
-        return (<Row type="flex" justify="center" align="middle" className="login">
-                <Col>
-                    <Form style={{width: 350}} ref={this.formRef}
-                          name="normal_login"
-                          className="login-form"
-                          initialValues={{remember: true}}
-                    ><h3>欢迎登录</h3>
-                        <Form.Item
-                            name="username"
-                            rules={[{required: true, message: '请输入用户名!'}, {max: 20, min: 0, message: '输入0-20个字符'},]}
-                        >
-                            <Input prefix={<UserOutlined className="site-form-item-icon"/>} placeholder="用户名"
-                            />
-                        </Form.Item>
-                        <Form.Item
-                            name="password"
-                            rules={[{required: true, message: '请输入密码!'}]}
-                        >
-                            <Input.Password
-                                            placeholder="密码"
-                                            onKeyDown={this.handleKeyDown}
-                                            prefix={<LockOutlined className="site-form-item-icon"/>}
-                            />
-                        </Form.Item>
-                        {
-                            needKaptcha?<Row gutter={8} >
-                                <Col span={12}>
-                                    <Form.Item
-                                        name="kaptchaText"
-                                        rules={[{required: true, message: '请输入验证码!'}]}
-                                    >
-                                        <Input prefix={<SafetyCertificateOutlined className="site-form-item-icon"/>}
-                                               placeholder="验证码"
-                                               onKeyDown={this.handleKeyDown}
-                                        />
-                                    </Form.Item>
-                                </Col>
-                                <Col span={12}>
-                                    <img style={{"cursor":"pointer"}}  height={30} width={90}  title={'点击刷新'} onClick={this.changeKaptcha}
-                                           src={kaptchaImg}></img>
-                                </Col>
-                            </Row>:""
-                        }
-                        <Form.Item>
-                            <Button type="primary" style={{width: '100%'}} loading={loading} onClick={this.handleSubmit}
-                                    className="login-form-button">
-                                登录
-                            </Button>
-                        </Form.Item>
-                    </Form>
-                </Col>
-            </Row>
-        )
-    }
-
-}