aldehyde 0.2.98 → 0.2.100

package/src/aldehyde/tree/tree-node.tsx

@@ -52,9 +52,6 @@ class TreeNode extends React.PureComponent<TreeNodeProps, TreeNodeState> {
             bodyCss = treeCardTitleBody0;
         }
 
-
-
-
         return <Card bordered={nodeData.level==2?false:false} bodyStyle={bodyCss} style={{marginBottom:2,backgroundColor}} className={'tree-node'}>
             <Row>
                 <Col span={24}>

package/src/aldehyde/welcome/HCWelcome.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import {Card, Col, Row,Image,Carousel} from 'antd';
+import {Card, Col, Row, Image, Carousel} from 'antd';
 import QuickEntrance from './quick-entrance'
 import Workbench from './workbench';
 import './index.css';
@@ -12,12 +12,12 @@ import LtmplTable from "../module/ltmpl-table";
 import Units from "../units";
 import withRouter from "../routable/withroute";
 
- class HCWelcome extends React.Component {
+class HCWelcome extends React.Component {
     state = {}
 
     intervals = [];
 
-     componentDidMount=async () =>{
+    componentDidMount = async () => {
         var option;
 
         option = {
@@ -83,11 +83,11 @@ import withRouter from "../routable/withroute";
             ]
         };
 
-       // option && myChart.setOption(option);
+        // option && myChart.setOption(option);
 
         // var chartDom = document.getElementById('echart2');
         // var myChart = Echarts.init(chartDom);
-         var option;
+        var option;
 
         option = {
             legend: {
@@ -96,10 +96,10 @@ import withRouter from "../routable/withroute";
             toolbox: {
                 show: true,
                 feature: {
-                    mark: { show: true },
-                    dataView: { show: true, readOnly: false },
-                    restore: { show: true },
-                    saveAsImage: { show: true }
+                    mark: {show: true},
+                    dataView: {show: true, readOnly: false},
+                    restore: {show: true},
+                    saveAsImage: {show: true}
                 }
             },
             series: [
@@ -113,14 +113,14 @@ import withRouter from "../routable/withroute";
                         borderRadius: 8
                     },
                     data: [
-                        { value: 40, name: 'rose 1' },
-                        { value: 38, name: 'rose 2' },
-                        { value: 32, name: 'rose 3' },
-                        { value: 30, name: 'rose 4' },
-                        { value: 28, name: 'rose 5' },
-                        { value: 26, name: 'rose 6' },
-                        { value: 22, name: 'rose 7' },
-                        { value: 18, name: 'rose 8' }
+                        {value: 40, name: 'rose 1'},
+                        {value: 38, name: 'rose 2'},
+                        {value: 32, name: 'rose 3'},
+                        {value: 30, name: 'rose 4'},
+                        {value: 28, name: 'rose 5'},
+                        {value: 26, name: 'rose 6'},
+                        {value: 22, name: 'rose 7'},
+                        {value: 18, name: 'rose 8'}
                     ]
                 }
             ]
@@ -141,120 +141,88 @@ import withRouter from "../routable/withroute";
         }
         this.intervals = [];
     }
+
     cardStyle = {
         height: '400px',
         // background: '#364d79',
     };
-    carouselStyle={
+    carouselStyle = {
         background: '#fff',
-        borderRadius:'6px'
+        borderRadius: '6px'
     }
 
     render() {
-        const {params}=this.props;
+        const {params} = this.props;
         Units.setProgramCode4RoutePath(params);
         return <>
-        <Row className={'home-page'} gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>
-            <Col span={24} >
-                <Card className="hovercard">
-                    <Row gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>
-                        <Col span={12}><Image  src={PainPoint} ></Image></Col>
-                        <Col span={12}> <Image  src={Target} ></Image></Col>
+            <Row className={'home-page'} gutter={{xs: 4, sm: 8, md: 12, lg: 16}}>
+                <Col span={24}>
+                    <Row style={{minHeight: '100px'}} gutter={{xs: 4, sm: 8, md: 12, lg: 16}}>
+                        <Col span={12} style={{width: '100%'}}>
+                            <Workbench className="hovercard"></Workbench>
+                        </Col>
+                        <Col span={12} style={{width: '100%'}}>
+                            <QuickEntrance className="hovercard"></QuickEntrance>
+                        </Col>
                     </Row>
-                </Card>
-                {/*<Card className="hovercard">*/}
-                {/*    */}
-                {/*</Card>*/}
-            </Col>
-            <Col span={24} >
-                <Row style={{minHeight:'100px'}} gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>
-                    <Col span={12} style={{width: '100%'}}>
-                        <Workbench className="hovercard" ></Workbench>
-                        <QuickEntrance   className="hovercard"></QuickEntrance>
-                    </Col>
-                    <Col span={12} style={{'height':'410px'}}  >
-                        <Card className="hovercard" style={this.cardStyle} bodyStyle={{padding:'2px'}}>
-                        <Carousel  autoplay >
-                            <div >
-                                <Image src={TimePrograss} ></Image>
-                            </div >
-                            <div >
-                                <Image src={Development} ></Image>
-                            </div>
-                            <div >
-                                <Image src={TimeCost} ></Image>
-                            </div>
-                        </Carousel>
-                        </Card>
-                    </Col>
-                </Row>
-            </Col>
-            {/*<Col span={24} >*/}
-            {/*    <Row style={{minHeight:'100px'}} gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>*/}
-            {/*        <Col span={12} style={{width: '100%','height':'400px'}}>*/}
-            {/*            <Image src={Development} ></Image>*/}
-            {/*        </Col>*/}
-            {/*        <Col span={12} style={{'height':'400px'}} >*/}
-            {/*            <Image src={TimeCost} ></Image>*/}
-            {/*        </Col>*/}
-            {/*    </Row>*/}
-            {/*</Col>*/}
-            <Col span={24}>
-            < Row gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>
-                <Col style={{width: '100%'}}>
-                    <Card className="hovercard"
-                        title={'统计视图'}>
-                        < Row gutter={[{xs: 8, sm: 16, md: 24, lg: 32},{xs: 8, sm: 16, md: 24, lg: 32}]}>
-                            {/*{this.state.piecharts}*/}
-                        <Col span={16} style={{'height':'400px'}} id={'echart1'} >
+                </Col>
+                <Col span={24}>
+                    <Row gutter={{xs: 4, sm: 8, md: 12, lg: 16}}>
+                        <Col style={{width: '100%'}}>
+                            <Card className="hovercard"
+                                  title={'统计视图'}>
+                                < Row gutter={[{xs: 4, sm: 8, md: 12, lg: 16}, {xs: 4, sm: 8, md: 12, lg: 16}]}>
+                                    {/*{this.state.piecharts}*/}
+                                    <Col span={16} style={{'height': '400px'}} id={'echart1'}>
+                                    </Col>
+                                    <Col span={8} style={{'height': '400px'}} id={'echart2'}>
+                                    </Col>
+                                    {/*{this.state.piecharts}*/}
+                                </Row>
+                            </Card>
                         </Col>
-                            <Col span={8} style={{'height':'400px'}}  id={'echart2'}>
-                            </Col>
-                            {/*{this.state.piecharts}*/}
-                        </Row>
-                    </Card>
+                    </Row>
                 </Col>
-            </Row>
-            </Col>
-            {/*<Col span={24}>*/}
+                {/*<Col span={24}>*/}
 
-            {/*        <LtmplTable serverKey={"carbonthinking"} title={'系统角色'} funcMode={'common'} collapsible={false} initCollapse={true}*/}
-            {/*                    sourceId={"299215579645779972"}*/}
-            {/*        ></LtmplTable>*/}
-            {/*</Col>*/}
-            {/*<Col>*/}
-            {/*    <Card bodyStyle={{padding: '4px'}}>*/}
-            {/*        <LtmplPage doCreate={(d)=>{*/}
-            {/*            d();*/}
-            {/*        }} title={<><UnorderedListOutlined style={{color:'#2f54eb'}} /> 列表管理</>} mainCode={'DGUYqE2lWO'} funcMode={'common'}*/}
-            {/*                   sourceId={'231313748303873'}></LtmplPage>*/}
-            {/*    </Card>*/}
-            {/*</Col>*/}
-            {/*<Col span={12}>*/}
-            {/*    <Card bodyStyle={{padding: '4px'}}>*/}
-            {/*        <LtmplPage collapsible={true} initCollapse={true}  doCreate={(d)=>{*/}
-            {/*            d();*/}
-            {/*        }} title={<><UnorderedListOutlined style={{color:'#2f54eb'}} /> 列表管理</>} mainCode={'DGUYqE2lWO'} funcMode={'common'}*/}
-            {/*                   sourceId={'231313748303873'}></LtmplPage>*/}
-            {/*    </Card>*/}
-            {/*</Col>*/}
+                {/*        <LtmplTable serverKey={"carbonthinking"} title={'系统角色'} funcMode={'common'} collapsible={false} initCollapse={true}*/}
+                {/*                    sourceId={"299215579645779972"}*/}
+                {/*        ></LtmplTable>*/}
+                {/*</Col>*/}
+                {/*<Col>*/}
+                {/*    <Card bodyStyle={{padding: '4px'}}>*/}
+                {/*        <LtmplPage doCreate={(d)=>{*/}
+                {/*            d();*/}
+                {/*        }} title={<><UnorderedListOutlined style={{color:'#2f54eb'}} /> 列表管理</>} mainCode={'DGUYqE2lWO'} funcMode={'common'}*/}
+                {/*                   sourceId={'231313748303873'}></LtmplPage>*/}
+                {/*    </Card>*/}
+                {/*</Col>*/}
+                {/*<Col span={12}>*/}
+                {/*    <Card bodyStyle={{padding: '4px'}}>*/}
+                {/*        <LtmplPage collapsible={true} initCollapse={true}  doCreate={(d)=>{*/}
+                {/*            d();*/}
+                {/*        }} title={<><UnorderedListOutlined style={{color:'#2f54eb'}} /> 列表管理</>} mainCode={'DGUYqE2lWO'} funcMode={'common'}*/}
+                {/*                   sourceId={'231313748303873'}></LtmplPage>*/}
+                {/*    </Card>*/}
+                {/*</Col>*/}
 
-        {/*    <Col span={12}>*/}
-        {/*        <Card bodyStyle={{padding: '4px'}}>*/}
-        {/*            <LtmplTable collapsible={true} initCollapse={false}  doCreate={(d)=>{*/}
-        {/*                d();*/}
-        {/*            }} title={<>模板组合</>} mainCode={'DGUYqE2lWO'} funcMode={'common'}*/}
-        {/*                       sourceId={'227679302098960'}></LtmplTable>*/}
-        {/*        </Card>*/}
-        {/*    </Col>*/}
-        </Row>
+                {/*    <Col span={12}>*/}
+                {/*        <Card bodyStyle={{padding: '4px'}}>*/}
+                {/*            <LtmplTable collapsible={true} initCollapse={false}  doCreate={(d)=>{*/}
+                {/*                d();*/}
+                {/*            }} title={<>模板组合</>} mainCode={'DGUYqE2lWO'} funcMode={'common'}*/}
+                {/*                       sourceId={'227679302098960'}></LtmplTable>*/}
+                {/*        </Card>*/}
+                {/*    </Col>*/}
+            </Row>
             {/*<Row>*/}
             {/*    <Col span={24}>*/}
             {/*        <DtmplEditCard  code={'8999231441132377'} sourceId={'246909250609153'} ></DtmplEditCard>*/}
             {/*    </Col>*/}
             {/*</Row>*/}
-            </>
+        </>
     }
 
 }
+
 export default withRouter(HCWelcome);

package/src/aldehyde/welcome/HCWelcome1.js

@@ -0,0 +1,260 @@
+import React from 'react'
+import {Card, Col, Row,Image,Carousel} from 'antd';
+import QuickEntrance from './quick-entrance'
+import Workbench from './workbench';
+import './index.css';
+import TimeCost from './img/time-cost.png';
+import TimePrograss from './img/time-prograss.png';
+import PainPoint from './img/pain-point.png';
+import Target from './img/target.png';
+import Development from './img/development.png';
+import LtmplTable from "../module/ltmpl-table";
+import Units from "../units";
+import withRouter from "../routable/withroute";
+
+ class HCWelcome extends React.Component {
+    state = {}
+
+    intervals = [];
+
+     componentDidMount=async () =>{
+        var option;
+
+        option = {
+            title: {
+                text: 'Line'
+            },
+            tooltip: {
+                trigger: 'axis'
+            },
+            legend: {
+                data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine']
+            },
+            grid: {
+                left: '3%',
+                right: '4%',
+                bottom: '3%',
+                containLabel: true
+            },
+            toolbox: {
+                feature: {
+                    saveAsImage: {}
+                }
+            },
+            xAxis: {
+                type: 'category',
+                boundaryGap: false,
+                data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+            },
+            yAxis: {
+                type: 'value'
+            },
+            series: [
+                {
+                    name: 'Email',
+                    type: 'line',
+                    stack: 'Total',
+                    data: [120, 132, 101, 134, 90, 230, 210]
+                },
+                {
+                    name: 'Union Ads',
+                    type: 'line',
+                    stack: 'Total',
+                    data: [220, 182, 191, 234, 290, 330, 310]
+                },
+                {
+                    name: 'Video Ads',
+                    type: 'line',
+                    stack: 'Total',
+                    data: [150, 232, 201, 154, 190, 330, 410]
+                },
+                {
+                    name: 'Direct',
+                    type: 'line',
+                    stack: 'Total',
+                    data: [320, 332, 301, 334, 390, 330, 320]
+                },
+                {
+                    name: 'Search Engine',
+                    type: 'line',
+                    stack: 'Total',
+                    data: [820, 932, 901, 934, 1290, 1330, 1320]
+                }
+            ]
+        };
+
+       // option && myChart.setOption(option);
+
+        // var chartDom = document.getElementById('echart2');
+        // var myChart = Echarts.init(chartDom);
+         var option;
+
+        option = {
+            legend: {
+                top: 'bottom'
+            },
+            toolbox: {
+                show: true,
+                feature: {
+                    mark: { show: true },
+                    dataView: { show: true, readOnly: false },
+                    restore: { show: true },
+                    saveAsImage: { show: true }
+                }
+            },
+            series: [
+                {
+                    name: 'Nightingale Chart',
+                    type: 'pie',
+                    radius: [16, 80],
+                    center: ['50%', '50%'],
+                    roseType: 'area',
+                    itemStyle: {
+                        borderRadius: 8
+                    },
+                    data: [
+                        { value: 40, name: 'rose 1' },
+                        { value: 38, name: 'rose 2' },
+                        { value: 32, name: 'rose 3' },
+                        { value: 30, name: 'rose 4' },
+                        { value: 28, name: 'rose 5' },
+                        { value: 26, name: 'rose 6' },
+                        { value: 22, name: 'rose 7' },
+                        { value: 18, name: 'rose 8' }
+                    ]
+                }
+            ]
+        };
+
+        // option && myChart.setOption(option);
+        //
+        // this.setState({
+        //     piecharts
+        // })
+    }
+
+    componentWillUnmount() {
+        if (this.intervals.length > 0) {
+            for (let i of this.intervals) {
+                clearInterval(i);
+            }
+        }
+        this.intervals = [];
+    }
+    cardStyle = {
+        height: '400px',
+        // background: '#364d79',
+    };
+    carouselStyle={
+        background: '#fff',
+        borderRadius:'6px'
+    }
+
+    render() {
+        const {params}=this.props;
+        Units.setProgramCode4RoutePath(params);
+        return <>
+        <Row className={'home-page'} gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>
+            <Col span={24} >
+                <Card className="hovercard">
+                    <Row gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>
+                        <Col span={12}><Image  src={PainPoint} ></Image></Col>
+                        <Col span={12}> <Image  src={Target} ></Image></Col>
+                    </Row>
+                </Card>
+                {/*<Card className="hovercard">*/}
+                {/*    */}
+                {/*</Card>*/}
+            </Col>
+            <Col span={24} >
+                <Row style={{minHeight:'100px'}} gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>
+                    <Col span={12} style={{width: '100%'}}>
+                        <Workbench className="hovercard" ></Workbench>
+                        <QuickEntrance   className="hovercard"></QuickEntrance>
+                    </Col>
+                    <Col span={12} style={{'height':'410px'}}  >
+                        <Card className="hovercard" style={this.cardStyle} bodyStyle={{padding:'2px'}}>
+                        <Carousel  autoplay >
+                            <div >
+                                <Image src={TimePrograss} ></Image>
+                            </div >
+                            <div >
+                                <Image src={Development} ></Image>
+                            </div>
+                            <div >
+                                <Image src={TimeCost} ></Image>
+                            </div>
+                        </Carousel>
+                        </Card>
+                    </Col>
+                </Row>
+            </Col>
+            {/*<Col span={24} >*/}
+            {/*    <Row style={{minHeight:'100px'}} gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>*/}
+            {/*        <Col span={12} style={{width: '100%','height':'400px'}}>*/}
+            {/*            <Image src={Development} ></Image>*/}
+            {/*        </Col>*/}
+            {/*        <Col span={12} style={{'height':'400px'}} >*/}
+            {/*            <Image src={TimeCost} ></Image>*/}
+            {/*        </Col>*/}
+            {/*    </Row>*/}
+            {/*</Col>*/}
+            <Col span={24}>
+            < Row gutter={{xs: 8, sm: 16, md: 24, lg: 32}}>
+                <Col style={{width: '100%'}}>
+                    <Card className="hovercard"
+                        title={'统计视图'}>
+                        < Row gutter={[{xs: 8, sm: 16, md: 24, lg: 32},{xs: 8, sm: 16, md: 24, lg: 32}]}>
+                            {/*{this.state.piecharts}*/}
+                        <Col span={16} style={{'height':'400px'}} id={'echart1'} >
+                        </Col>
+                            <Col span={8} style={{'height':'400px'}}  id={'echart2'}>
+                            </Col>
+                            {/*{this.state.piecharts}*/}
+                        </Row>
+                    </Card>
+                </Col>
+            </Row>
+            </Col>
+            {/*<Col span={24}>*/}
+
+            {/*        <LtmplTable serverKey={"carbonthinking"} title={'系统角色'} funcMode={'common'} collapsible={false} initCollapse={true}*/}
+            {/*                    sourceId={"299215579645779972"}*/}
+            {/*        ></LtmplTable>*/}
+            {/*</Col>*/}
+            {/*<Col>*/}
+            {/*    <Card bodyStyle={{padding: '4px'}}>*/}
+            {/*        <LtmplPage doCreate={(d)=>{*/}
+            {/*            d();*/}
+            {/*        }} title={<><UnorderedListOutlined style={{color:'#2f54eb'}} /> 列表管理</>} mainCode={'DGUYqE2lWO'} funcMode={'common'}*/}
+            {/*                   sourceId={'231313748303873'}></LtmplPage>*/}
+            {/*    </Card>*/}
+            {/*</Col>*/}
+            {/*<Col span={12}>*/}
+            {/*    <Card bodyStyle={{padding: '4px'}}>*/}
+            {/*        <LtmplPage collapsible={true} initCollapse={true}  doCreate={(d)=>{*/}
+            {/*            d();*/}
+            {/*        }} title={<><UnorderedListOutlined style={{color:'#2f54eb'}} /> 列表管理</>} mainCode={'DGUYqE2lWO'} funcMode={'common'}*/}
+            {/*                   sourceId={'231313748303873'}></LtmplPage>*/}
+            {/*    </Card>*/}
+            {/*</Col>*/}
+
+        {/*    <Col span={12}>*/}
+        {/*        <Card bodyStyle={{padding: '4px'}}>*/}
+        {/*            <LtmplTable collapsible={true} initCollapse={false}  doCreate={(d)=>{*/}
+        {/*                d();*/}
+        {/*            }} title={<>模板组合</>} mainCode={'DGUYqE2lWO'} funcMode={'common'}*/}
+        {/*                       sourceId={'227679302098960'}></LtmplTable>*/}
+        {/*        </Card>*/}
+        {/*    </Col>*/}
+        </Row>
+            {/*<Row>*/}
+            {/*    <Col span={24}>*/}
+            {/*        <DtmplEditCard  code={'8999231441132377'} sourceId={'246909250609153'} ></DtmplEditCard>*/}
+            {/*    </Col>*/}
+            {/*</Row>*/}
+            </>
+    }
+
+}
+export default withRouter(HCWelcome);