aldehyde 0.1.86 → 0.2.2

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

@@ -185,7 +185,7 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                              sourceId={sourceId} criteriaData={criteriaData}
                              ltmplConfig={ltmplConfigRes.ltmplConfig} />
                 {buttons.includes('detail') ?
-                    <ModalDtmplView visible={showDtmplView} onCancel={()=>{
+                    <ModalDtmplView open={showDtmplView} onCancel={()=>{
                     this.setState({
                         showDtmplView:false,
                     })}
@@ -193,7 +193,7 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                                     sourceId={sourceId}
                                     code={selectedCode}> </ModalDtmplView> : ""}
                 {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                    <DtmplEditPage visible={showDtmplEdit} onCancel={()=>{
+                    <DtmplEditPage open={showDtmplEdit} onCancel={()=>{
                         this.setState({
                             showDtmplEdit:false,
                         })}}
@@ -208,7 +208,7 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                     closable={true}
                     mask={false}
                     onClose={this.closeDrawer}
-                    visible={showDraw}
+                    open={showDraw}
                     width={'calc(100% - 280px)'}
                     style={{
                         maxWidth: 1960,

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

@@ -43,7 +43,7 @@ import ColumnSelector from './column/column-selector';
 import ExportFrame from '../exportor/export-frame';
 import {SortableHandle} from 'react-sortable-hoc';
 import L2ActTable from "./l2-act-table";
-import StatViewL2Chart from '../chart/statview-l2-chart'
+//import StatViewL2Chart from '../chart/statview-l2-chart'
 import Action from '../controls/action'
 import Restat from "./stat/restat"
 import ActionUtils from '../controls/action/utils'
@@ -90,7 +90,6 @@ interface ActTableStat {
     viewModels?: ActTableViewModel[];
     showL2ActTable: boolean;
     showL2Chart: boolean;
-    // drillingPopoverVisible:boolean;
 };
 
 class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
@@ -110,7 +109,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         disabledColIds: undefined,
         showL2ActTable: false,
         showL2Chart: false,
-        //drillingPopoverVisible:false,
     }
 
     static defaultProps = {
@@ -689,12 +687,13 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         }
         return (
             <>
-                {buttons.includes("showChart") && showL2Chart ? <div>
-                    <StatViewL2Chart queryKey={queryKey.key} ltmplConfig={ltmplConfig} hiddenColIds={hiddenColIds}
-                                     hiddenRowCodes={hiddenRowCodes}/>
-                    {/*<Divider dashed style={{borderTopColor: "#40a9ff",}} plain></Divider>*/}
-                </div> : ""
-                }
+                {/*暂时不支持L2chart 后续用echart*/}
+                {/*{buttons.includes("showChart") && showL2Chart ? <div>*/}
+                {/*    <StatViewL2Chart queryKey={queryKey.key} ltmplConfig={ltmplConfig} hiddenColIds={hiddenColIds}*/}
+                {/*                     hiddenRowCodes={hiddenRowCodes}/>*/}
+                {/*    /!*<Divider dashed style={{borderTopColor: "#40a9ff",}} plain></Divider>*!/*/}
+                {/*</div> : ""*/}
+                {/*}*/}
                 {buttons.includes("analysis") && showL2ActTable ? <div>
                     <L2ActTable innerQueryKey={queryKey.key} sourceId={sourceId}/>
                     <Divider dashed style={{borderTopColor: "#40a9ff",}} plain></Divider>

package/src/aldehyde/table/modal-select-table.tsx

@@ -13,7 +13,7 @@ import SelectedRowsCard from './selected-rows-card'
 
 interface ModelSelectTableProps {
     maxSelectedRows: number,
-    visible: boolean,
+    open: boolean,
     sourceId: string,
     mainCode:string,
     exceptCodes?: string[],
@@ -66,8 +66,8 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
     }
 
     async componentDidMount() {
-        const { sourceId, visible} = this.props;
-        if (sourceId && visible) {
+        const { sourceId, open} = this.props;
+        if (sourceId && open) {
             await this.loadData(await this.loadConfig(), {});
         }
     }
@@ -119,11 +119,11 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
     }
 
     async componentDidUpdate(prevProps) {
-        const {exceptCodes, visible} = this.props;
+        const {exceptCodes, open} = this.props;
         const {selectConfig, criteriaData, queryKey, loading} = this.state;
-        const {exceptCodes: preExceptCodes, visible: preVisible} = prevProps;
+        const {exceptCodes: preExceptCodes, open: preOpen} = prevProps;
         let config = selectConfig;
-        if (visible) {
+        if (open) {
             if (!config) {
                 config = await this.loadConfig();
             }
@@ -205,7 +205,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
 
 
     render() {
-        let {visible, maxSelectedRows} = this.props;
+        let {open, maxSelectedRows} = this.props;
         let {queryKey, columns, selectConfig, criteriaData, loading, selectedRows} = this.state;
 
         if (!selectConfig) {
@@ -223,7 +223,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
 
         return (
             <Modal
-                visible={visible}
+                open={open}
                 title={<SelectedRowsCard value={selectedRows} onChange={this.changeRowSelection}></SelectedRowsCard>}
                 style={{maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'}}
                 width={'1250px'}

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

@@ -559,22 +559,22 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         </div>
                     </CollapseCard>
                     {buttons.includes('detail') ?
-                        <ModalDtmplView mainCode={mainCode1}  visible={showDtmplView} onCancel={this.hiddenEntityView}
+                        <ModalDtmplView mainCode={mainCode1}  open={showDtmplView} onCancel={this.hiddenEntityView}
                                         sourceId={fieldGroupConfig.id}
                                         code={selectedCode}> </ModalDtmplView> : ""}
                     {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                        <DtmplEditPage mainCode={mainCode1} visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
+                        <DtmplEditPage mainCode={mainCode1} open={showDtmplEdit} onCancel={this.hiddenEntityEdit}
                                        sourceId={fieldGroupConfig.id}
                                        code={selectedCode}
                                        onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd} />
                         : ""}
                     {/*{buttons.includes('rowEdit') || buttons.includes('rowAdd') ?*/}
-                    {/*    <ModalRowEdit visible={showRowEdit} onCancel={this.hiddenRowEdit}*/}
+                    {/*    <ModalRowEdit open={showRowEdit} onCancel={this.hiddenRowEdit}*/}
                     {/*                  onOk={this.handleRowEdit} dtmplData={selectedDtmplData}*/}
                     {/*                  fieldGroupConfig={fieldGroupConfig}> </ModalRowEdit>*/}
                     {/*    : ""}*/}
                     {buttons.includes('selectAdd') ?
-                        <ModelSelectTable maxSelectedRows={fieldGroupConfig.max} visible={showSelectTable}
+                        <ModelSelectTable maxSelectedRows={fieldGroupConfig.max} open={showSelectTable}
                                           onOK={this.select} onCancel={() => {
                             this.setState({showSelectTable: false})
                         }} exceptCodes={exceptCodes} mainCode={mainCode1}

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

@@ -118,7 +118,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
     async componentDidUpdate(prevProps) {
         const {} = this.props;
         const {selectConfig, criteriaData, queryKey, loading} = this.state;
-        const {exceptCodes: preExceptCodes, visible: preVisible} = prevProps;
+        const {exceptCodes: preExceptCodes, open: preOpen} = prevProps;
         let config = selectConfig;
         //if (visible) {
         if (!config) {

package/src/aldehyde/table/stat/restat.tsx

@@ -13,7 +13,7 @@ interface RestatProps {
 };
 
 interface RestatStat {
-    popoverVisible: boolean;
+    popoverOpen: boolean;
     loading:boolean,
 };
 
@@ -21,7 +21,7 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
 
     static defaultProps = {}
     state = {
-        popoverVisible: false,
+        popoverOpen: false,
         loading:false,
     }
     formRef = React.createRef<FormInstance>();
@@ -38,9 +38,9 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
     }
 
     render() {
-        const {popoverVisible,loading} = this.state;
+        const {popoverOpen,loading} = this.state;
         const {fields, value} = this.props;
-        return <Popover visible={popoverVisible}
+        return <Popover open={popoverOpen}
                         content={
                             <Card loading={loading}
                                 style={{width: 1000}}
@@ -54,7 +54,7 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
                                         >确定</Button>
                                    }
                                     {<Button onClick={() => {
-                                        this.setState({popoverVisible: false});
+                                        this.setState({popoverOpen: false});
                                     }}><CloseOutlined/></Button>
                                     }
                                 </Space></>}
@@ -68,7 +68,7 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
                         placement="bottomLeft"
                         trigger="click">
             <Tooltip title={'重新统计'}><Button onClick={() => {
-                this.setState({popoverVisible: !popoverVisible});
+                this.setState({popoverOpen: !popoverOpen});
             }}>
                 <CalculatorOutlined/>
             </Button></Tooltip>

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -2,7 +2,8 @@ import Units from '../units'
 import Super from "./superagent";
 import {message} from 'antd'
 import EncryptUtils from '../units/EncryptUtils'
-import moment from 'moment';
+// import moment from 'moment';
+import format from 'dayjs';
 import { PageInfo,SelectedRow} from "./interface";
 import HCDataSource from "./hc-data-source";
 
@@ -162,7 +163,7 @@ export default class HcserviceV3 {
 
     static async requestSelectedData(sourceId, codes) {
         if (!codes) {
-            message.warn("没有选择实体")
+            message.warning("没有选择实体")
             return null;
         }
         let url = `/v3/field-group/data/selected`
@@ -589,7 +590,7 @@ export default class HcserviceV3 {
 
     static async login(json,kaptchaToken,kaptchaText,pubkey) {
 
-     let datetime= moment(new Date()).format("YYYY-MM-DD HH:mm:ss")
+     let datetime= format(new Date()).format("YYYY-MM-DD HH:mm:ss")
         let programCode
         json['datetime']=datetime;
 

package/src/aldehyde/tmpl/superagent.js

@@ -93,10 +93,10 @@ export default class Superagent {
                             Units.toLogin();
                         } else if (res.status === 404 || res.status === 504) {
                             message.error("服务资源未找到("+res.status+")")
-                            resolve(undefined);
+                            resolve(res);
                         } else if (res.status === 500) {
                             message.error("后台处理错误(" + res.text + ")")
-                            resolve(undefined);
+                            resolve(res);
                         } else {
                             message.error("服务资源请求失败!");
                             reject(res.body)

package/src/aldehyde/tmpl/tmpl-config-analysis.tsx

@@ -1,5 +1,6 @@
-import moment, {DurationInputArg2} from "moment";
+// import moment, {DurationInputArg2} from "moment";
 
+import dayjs,{ManipulateType} from "dayjs";
 
 function TmplConfigAnalysis() {
 
@@ -48,7 +49,7 @@ TmplConfigAnalysis.currentL1 =  function ( config: string,format:string) {
     let unit=match[3];
        //没有单位
        if(unit==""){
-           return moment().format(format);
+           return dayjs().format(format);
        }else{
            //系数
            let symbol=match[1];
@@ -60,37 +61,37 @@ TmplConfigAnalysis.currentL1 =  function ( config: string,format:string) {
                nstr="1";
            }
            let n:number=parseInt(nstr);
-           let momentUnit:DurationInputArg2="days";
+           let dayjsUnit:ManipulateType="days";
 
            switch (unit) {
                case "D":
-                   momentUnit="days";
+                   dayjsUnit="days";
                   break;
                case "M":
-                   momentUnit="months";
+                   dayjsUnit="months";
                    break;
                case "Y":
-                   momentUnit="years";
+                   dayjsUnit="years";
                    break;
                case "W":
-                   momentUnit="weeks";
+                   dayjsUnit="weeks";
                    break;
                case "h":
-                   momentUnit="hours";
+                   dayjsUnit="hours";
                    break;
                case "m":
-                   momentUnit="minutes";
+                   dayjsUnit="minutes";
                    break;
                case "s":
-                   momentUnit="seconds";
+                   dayjsUnit="seconds";
                    break;
            }
            if(symbol=="-"){
-              // console.log("moment().subtract(n,momentUnit)",moment().subtract(n,momentUnit).format(format));
-              return moment().subtract(n,momentUnit).format(format);
+              // console.log("moment().subtract(n,dayjsUnit)",moment().subtract(n,dayjsUnit).format(format));
+              return dayjs().subtract(n,dayjsUnit).format(format);
            }else{
-              // console.log("moment().add(n,momentUnit)",moment().add(n,momentUnit).format(format));
-              return moment().add(n,momentUnit).format(format);
+              // console.log("moment().add(n,dayjsUnit)",moment().add(n,dayjsUnit).format(format));
+              return dayjs().add(n,dayjsUnit).format(format);
            }
        }
    }else{

package/src/aldehyde/units/index.tsx

@@ -4,7 +4,7 @@ import Axios from "axios";
 import Logo from "./logo.png";
 import {DtmplConfig, DtmplData, EnumItem} from "../tmpl/interface";
 import HCDataSource from "../tmpl/hc-data-source";
-import moment from "moment";
+import dayjs from "dayjs";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
 
 const Option = Select.Option;
@@ -121,7 +121,7 @@ export default {
 
     formateDate(time) {
         if (!time) return '';
-        return moment(new Date(time)).format("YYYY-MM-DD HH:mm:ss");
+        return dayjs(new Date(time)).format("YYYY-MM-DD HH:mm:ss");
         //let str=date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
         // return str;
     },
@@ -466,7 +466,7 @@ export default {
             return false;    //非空
         }
         return true;
-    }, getMomentFormat(itemType) {
+    }, getDayjsFormat(itemType) {
         let format = 'YYYY-MM-DD HH:mm:ss'
 
         switch (itemType) {

package/src/aldehyde/welcome/quick-entrance.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import {Badge, Button, Card, Layout, Space,CardProps} from 'antd'
 import {CodeTwoTone} from '@ant-design/icons';
-import 'antd/dist/antd.css';
+import 'antd/dist/reset.css';
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import HCDataSource from '../tmpl/hc-data-source'
 import {Level2Menu} from "../tmpl/interface";

package/src/aldehyde/welcome/workbench.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import {Button, Card, Space, Statistic,CardProps} from 'antd'
 import {LikeOutlined,RightCircleOutlined,HeartOutlined,RocketOutlined,RocketTwoTone } from '@ant-design/icons';
-import 'antd/dist/antd.css';
+import 'antd/dist/reset.css';
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import HCDataSource from '../tmpl/hc-data-source'
 import {Level2Menu} from "../tmpl/interface";

package/lib/chart/antd/Chart.d.ts

@@ -1,10 +0,0 @@
-export default class Chart extends React.Component<any, any, any> {
-    constructor(props: any);
-    constructor(props: any, context: any);
-    state: {};
-    componentWillReceiveProps(nextProps: any): Promise<void>;
-    getChart: () => void;
-    render(): JSX.Element;
-}
-import React from "react";
-//# sourceMappingURL=Chart.d.ts.map

package/lib/chart/antd/Chart.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/chart/antd/Chart.js"],"names":[],"mappings":"AAEA;IA6BwsmB,wBAA8C;IAAA,sCAAyJ;IA3B34mB,UAAU;IAGV,yDAEC;IAED,qBAGC;IAED,sBAYC;CAEJ"}

package/lib/chart/antd/Chart.js

@@ -1,31 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import React from 'react';
-import LineChart from './Max2DimLineChart';
-export default class Chart extends React.Component {
-    constructor() {
-        super(...arguments);
-        this.state = {};
-        this.getChart = () => {
-        };
-    }
-    componentWillReceiveProps(nextProps) {
-        return __awaiter(this, void 0, void 0, function* () {
-        });
-    }
-    render() {
-        let { data, statView, ltmpl } = this.props;
-        return (React.createElement("div", null, statView.refL2ChartType == '10000' || statView.refL2ChartType == '折线图' ?
-            React.createElement(LineChart, { data: data, statView: statView, ltmpl: ltmpl }, " ")
-            :
-                React.createElement("div", null, "\u6CA1\u6709\u627E\u5230\u5339\u914D\u7684\u56FE\u8868")));
-    }
-}
-//# sourceMappingURL=Chart.js.map

package/lib/chart/antd/Chart.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Chart.js","sourceRoot":"","sources":["../../../../../src/aldehyde/chart/antd/Chart.js"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,SAAS,MAAM,oBAAoB,CAAA;AAC1C,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,KAAK,CAAC,SAAS;IAAlD;;QAEI,UAAK,GAAG,EAAE,CAAA;QAOV,aAAQ,GAAG,GAAG,EAAE;QAGhB,CAAC,CAAA;IAgBL,CAAC;IAvBS,yBAAyB,CAAC,SAAS;;QAEzC,CAAC;KAAA;IAOD,MAAM;QACF,IAAI,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACzC,OAAO,CAAC,iCAEE,QAAQ,CAAC,cAAc,IAAI,OAAO,IAAG,QAAQ,CAAC,cAAc,IAAE,KAAK,CAAC,CAAC;YACnE,oBAAC,SAAS,IAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,QAAe;YAC9E,CAAC;gBACG,0FAAoB,CAElB,CAET,CAAC;IACN,CAAC;CAEJ"}

package/lib/chart/antd/Max2DimLineChart.d.ts

@@ -1,15 +0,0 @@
-export default class Max2DimLineChart extends React.Component<any, any, any> {
-    constructor(props: any);
-    constructor(props: any, context: any);
-    state: {
-        dataArray: any[];
-    };
-    componentWillMount(): Promise<void>;
-    componentWillReceiveProps(nextprops: any): void;
-    init: (data: any, statView: any, ltmpl: any) => void;
-    get2DimChart: (lineData: any) => any[];
-    getChart1: (refL2ChartType: any, val: any) => JSX.Element;
-    render(): JSX.Element;
-}
-import React from "react";
-//# sourceMappingURL=Max2DimLineChart.d.ts.map

package/lib/chart/antd/Max2DimLineChart.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Max2DimLineChart.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/chart/antd/Max2DimLineChart.js"],"names":[],"mappings":"AAOA;IAwH49e,wBAA8C;IAAA,sCAAyJ;IAtH/pf;;MAEC;IAED,oCAOC;IAED,gDAGC;IAED,qDAmDC;IAED,uCAcC;IAED,0DASC;IAED,sBAiBC;CAEJ"}

package/lib/chart/antd/Max2DimLineChart.js

@@ -1,126 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import React from 'react';
-import LineChart from './LineChart-sub';
-import ColumnChart from './ColumnChart-sub';
-import PieChart from './PieChart-sub';
-import { Col, Divider, Row } from "antd";
-import chartUtils from "./ChartUtils";
-export default class Max2DimLineChart extends React.Component {
-    constructor() {
-        super(...arguments);
-        this.state = {
-            dataArray: [],
-        };
-        this.init = (data, statView, ltmpl) => {
-            let data_;
-            let firstDim = undefined, secondDim = undefined, dimensions = [], facts = [];
-            ltmpl.columns.forEach((col) => {
-                if ("fact" == col.colClass) {
-                    facts.push(col);
-                }
-                else if ("dimension" == col.colClass) {
-                    dimensions.push(col);
-                }
-            });
-            let lineData;
-            if (dimensions.length > 1) {
-                firstDim = dimensions[0];
-                secondDim = dimensions[1];
-                data_ = chartUtils.transValueFloatGroupByDim(ltmpl, data, firstDim);
-                lineData = new Map();
-                for (let [key, data1] of data_) {
-                    lineData.set(key, []);
-                    facts.forEach((fact) => {
-                        let obj1 = {};
-                        obj1.data = data1;
-                        obj1.config = {
-                            xAxisTitle: key,
-                            yAxisTitle: fact.title,
-                            xField: secondDim.title,
-                            yField: fact.title
-                        };
-                        lineData.get(key).push(obj1);
-                    });
-                }
-            }
-            else if (dimensions.length == 1) {
-                lineData = [];
-                secondDim = dimensions[0];
-                data_ = chartUtils.transValueFloat(ltmpl, data.list);
-                facts.forEach((fact) => {
-                    let obj1 = {};
-                    obj1.data = data_;
-                    obj1.config = {
-                        xAxisTitle: secondDim.title,
-                        yAxisTitle: fact.title,
-                        xField: secondDim.title,
-                        yField: fact.title
-                    };
-                    lineData.push(obj1);
-                });
-            }
-            this.setState({
-                lineData
-            });
-        };
-        this.get2DimChart = (lineData) => {
-            let refL2ChartType = this.props.statView.refL2ChartType;
-            let list = [];
-            let that = this;
-            for (let [key, obj] of lineData) {
-                obj.map(function (val) {
-                    list.push(React.createElement(Col, { span: 12, key: val.config.yAxisTitle },
-                        that.getChart1(refL2ChartType, val),
-                        React.createElement(Divider, { dashed: true, style: { borderTopColor: "#40a9ff", }, plain: true })));
-                });
-            }
-            return list;
-        };
-        this.getChart1 = (refL2ChartType, val) => {
-            return refL2ChartType == '折线图' ?
-                React.createElement(LineChart, { data: val.data, config: val.config })
-                : refL2ChartType == '柱图' ?
-                    React.createElement(ColumnChart, { data: val.data, config: val.config })
-                    :
-                        refL2ChartType == '饼图' ?
-                            React.createElement(PieChart, { data: val.data, config: val.config }) :
-                            React.createElement("div", null, "\u6682\u4E0D\u652F\u6301\u7684\u56FE\u5F62");
-        };
-    }
-    componentWillMount() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { data, statView, ltmpl } = this.props;
-            // console.log("data:", data);
-            // console.log("statView:", statView);
-            // console.log("ltmpl:", ltmpl);
-            this.init(data, statView, ltmpl);
-        });
-    }
-    componentWillReceiveProps(nextprops) {
-        let { data, statView, ltmpl } = nextprops;
-        this.init(data, statView, ltmpl);
-    }
-    render() {
-        let { lineData } = this.state;
-        let refL2ChartType = this.props.refL2ChartType;
-        ;
-        let that = this;
-        return React.createElement("div", null,
-            React.createElement(Row, { style: { padding: '8px 0' }, gutter: [32, { xs: 8, sm: 16, md: 24, lg: 32 }] }, lineData instanceof Map ?
-                that.get2DimChart(lineData)
-                : lineData ? lineData.map(function (val) {
-                    return React.createElement(Col, { span: 12, key: val.config.yAxisTitle },
-                        that.getChart1(refL2ChartType, val),
-                        React.createElement(Divider, { dashed: true, style: { borderTopColor: "#40a9ff", }, plain: true }));
-                }) : ""));
-    }
-}
-//# sourceMappingURL=Max2DimLineChart.js.map

package/lib/chart/antd/Max2DimLineChart.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Max2DimLineChart.js","sourceRoot":"","sources":["../../../../../src/aldehyde/chart/antd/Max2DimLineChart.js"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,SAAS,MAAM,iBAAiB,CAAC;AACxC,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAC5C,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAC,MAAM,MAAM,CAAC;AACvC,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,KAAK,CAAC,SAAS;IAA7D;;QAEI,UAAK,GAAG;YACJ,SAAS,EAAE,EAAE;SAChB,CAAA;QAgBD,SAAI,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;YAC7B,IAAI,KAAK,CAAC;YAEV,IAAI,QAAQ,GAAG,SAAS,EAAE,SAAS,GAAG,SAAS,EAAE,UAAU,GAAG,EAAE,EAAE,KAAK,GAAG,EAAE,CAAC;YAC7E,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC1B,IAAI,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE;oBACxB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACnB;qBAAM,IAAI,WAAW,IAAI,GAAG,CAAC,QAAQ,EAAE;oBACpC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBACxB;YACL,CAAC,CAAC,CAAC;YACH,IAAI,QAAQ,CAAC;YACb,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvB,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;gBACzB,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC1B,KAAK,GAAG,UAAU,CAAC,yBAAyB,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;gBACpE,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;gBACrB,KAAK,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,KAAK,EAAE;oBAC5B,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBACtB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;wBACnB,IAAI,IAAI,GAAG,EAAE,CAAC;wBACd,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;wBAClB,IAAI,CAAC,MAAM,GAAG;4BACV,UAAU,EAAE,GAAG;4BACf,UAAU,EAAE,IAAI,CAAC,KAAK;4BACtB,MAAM,EAAE,SAAS,CAAC,KAAK;4BACvB,MAAM,EAAE,IAAI,CAAC,KAAK;yBACrB,CAAC;wBACF,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACjC,CAAC,CAAC,CAAA;iBACL;aACJ;iBAAM,IAAI,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC/B,QAAQ,GAAG,EAAE,CAAC;gBACd,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;gBAC1B,KAAK,GAAG,UAAU,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBACrD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACnB,IAAI,IAAI,GAAG,EAAE,CAAC;oBACd,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;oBAClB,IAAI,CAAC,MAAM,GAAG;wBACV,UAAU,EAAE,SAAS,CAAC,KAAK;wBAC3B,UAAU,EAAE,IAAI,CAAC,KAAK;wBACtB,MAAM,EAAE,SAAS,CAAC,KAAK;wBACvB,MAAM,EAAE,IAAI,CAAC,KAAK;qBACrB,CAAC;oBACF,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxB,CAAC,CAAC,CAAA;aACL;YAED,IAAI,CAAC,QAAQ,CAAC;gBACV,QAAQ;aACX,CAAC,CAAA;QACN,CAAC,CAAA;QAED,iBAAY,GAAG,CAAC,QAAQ,EAAE,EAAE;YACxB,IAAI,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC;YACxD,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAI,IAAI,GAAC,IAAI,CAAC;YACd,KAAK,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,QAAQ,EAAE;gBAC7B,GAAG,CAAC,GAAG,CAAC,UAAU,GAAG;oBACjB,IAAI,CAAC,IAAI,CAAC,oBAAC,GAAG,IAAC,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU;wBAC7C,IAAI,CAAC,SAAS,CAAC,cAAc,EAAC,GAAG,CAAC;wBAEpC,oBAAC,OAAO,IAAC,MAAM,QAAC,KAAK,EAAE,EAAC,cAAc,EAAE,SAAS,GAAE,EAAE,KAAK,SAAW,CACnE,CAAC,CAAA;gBACX,CAAC,CAAC,CAAA;aACL;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAA;QAED,cAAS,GAAG,CAAC,cAAc,EAAE,GAAG,EAAE,EAAE;YAChC,OAAO,cAAc,IAAI,KAAK,CAAC,CAAC;gBAC5B,oBAAC,SAAS,IAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG;gBAChD,CAAC,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC;oBACtB,oBAAC,WAAW,IAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG;oBAClD,CAAC;wBACD,cAAc,IAAI,IAAI,CAAC,CAAC;4BACpB,oBAAC,QAAQ,IAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;4BACjD,8EAAkB,CAAA;QAClC,CAAC,CAAA;IAqBL,CAAC;IAjHS,kBAAkB;;YAEpB,IAAI,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACzC,8BAA8B;YAC9B,sCAAsC;YACtC,gCAAgC;YAChC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QACrC,CAAC;KAAA;IAED,yBAAyB,CAAC,SAAS;QAC/B,IAAI,EAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAC,GAAG,SAAS,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IACrC,CAAC;IAkFD,MAAM;QACF,IAAI,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC5B,IAAI,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC;QAAA,CAAC;QAChD,IAAI,IAAI,GAAC,IAAI,CAAC;QACd,OAAO;YACH,oBAAC,GAAG,IAAC,KAAK,EAAE,EAAC,OAAO,EAAE,OAAO,EAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAC,CAAC,IACxE,QAAQ,YAAY,GAAG,CAAC,CAAC;gBACtB,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;gBAC3B,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,GAAG;oBACnC,OAAO,oBAAC,GAAG,IAAC,IAAI,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,UAAU;wBAC3C,IAAI,CAAC,SAAS,CAAC,cAAc,EAAC,GAAG,CAAC;wBACnC,oBAAC,OAAO,IAAC,MAAM,QAAC,KAAK,EAAE,EAAC,cAAc,EAAE,SAAS,GAAE,EAAE,KAAK,SAAW,CACnE,CAAA;gBACV,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAET,CACJ,CAAA;IACV,CAAC;CAEJ"}

package/lib/chart/antd/chart-utils.d.ts

@@ -1,7 +0,0 @@
-import { DtmplData, LtmplConfig } from "../../tmpl/interface";
-declare const _default: {
-    transValueFloat(ltmpl: LtmplConfig, data: DtmplData[]): any[];
-    transValueFloatGroupByDim(ltmpl: LtmplConfig, data: DtmplData[], dimension: any): Map<any, any>;
-};
-export default _default;
-//# sourceMappingURL=chart-utils.d.ts.map

package/lib/chart/antd/chart-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"chart-utils.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/chart/antd/chart-utils.tsx"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,sBAAsB,CAAC;;2BAIlC,WAAW,QAAM,SAAS,EAAE;qCAqBlB,WAAW,QAAM,SAAS,EAAE;;AAtBhE,wBA6CC"}

package/lib/chart/antd/chart-utils.js

@@ -1,46 +0,0 @@
-export default {
-    transValueFloat(ltmpl, data) {
-        let data_ = [];
-        let cols = ltmpl.columns;
-        if (data) {
-            data.map(function (val) {
-                let value = {};
-                Object.keys(val.fieldMap).forEach((key) => {
-                    cols.forEach((col) => {
-                        if (col.id == key) {
-                            let v1 = parseFloat(val.fieldMap[key]);
-                            value[col.title] = isNaN(v1) ? val.fieldMap[key] : v1;
-                            return;
-                        }
-                    });
-                });
-                data_.push(value);
-            });
-        }
-        // console.log("chartData:",data_);
-        return data_;
-    },
-    transValueFloatGroupByDim(ltmpl, data, dimension) {
-        let dimKey = dimension.id;
-        //先分类
-        let map1 = new Map();
-        if (data) {
-            data.map(function (val) {
-                let v1 = val.fieldMap[dimKey];
-                if (v1) {
-                    if (!map1.has(v1)) {
-                        map1.set(v1, []);
-                    }
-                    map1.get(v1).push(val);
-                }
-            });
-        }
-        let map2 = new Map();
-        //再转换
-        for (let [key, value] of map1) {
-            map2.set(key, this.transValueFloat(ltmpl, value));
-        }
-        return map2;
-    },
-};
-//# sourceMappingURL=chart-utils.js.map

package/lib/chart/antd/chart-utils.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"chart-utils.js","sourceRoot":"","sources":["../../../../../src/aldehyde/chart/antd/chart-utils.tsx"],"names":[],"mappings":"AAIA,eAAe;IACX,eAAe,CAAC,KAAiB,EAAC,IAAgB;QAC9C,IAAI,KAAK,GAAC,EAAE,CAAC;QACb,IAAI,IAAI,GAAE,KAAK,CAAC,OAAO,CAAC;QACxB,IAAG,IAAI,EAAC;YACJ,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG;gBAClB,IAAI,KAAK,GAAC,EAAE,CAAC;gBACb,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAC,EAAE;oBACrC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAC,EAAE;wBAChB,IAAG,GAAG,CAAC,EAAE,IAAE,GAAG,EAAC;4BACX,IAAI,EAAE,GAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;4BACrC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,GAAC,KAAK,CAAC,EAAE,CAAC,CAAA,CAAC,CAAA,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAC,CAAA,EAAE,CAAC;4BAChD,OAAO;yBACV;oBACL,CAAC,CAAC,CAAA;gBACN,CAAC,CAAC,CAAC;gBACH,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC,CAAC,CAAA;SACL;QACF,mCAAmC;QAClC,OAAO,KAAK,CAAC;IACjB,CAAC;IACD,yBAAyB,CAAC,KAAiB,EAAC,IAAgB,EAAC,SAAS;QAElE,IAAI,MAAM,GAAC,SAAS,CAAC,EAAE,CAAC;QACxB,KAAK;QACL,IAAI,IAAI,GAAC,IAAI,GAAG,EAAE,CAAC;QACnB,IAAG,IAAI,EAAC;YACJ,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG;gBAClB,IAAI,EAAE,GAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC5B,IAAG,EAAE,EAAC;oBACF,IAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAC;wBACb,IAAI,CAAC,GAAG,CAAC,EAAE,EAAC,EAAE,CAAC,CAAC;qBACnB;oBACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;iBAC1B;YACL,CAAC,CAAC,CAAA;SACL;QACD,IAAI,IAAI,GAAC,IAAI,GAAG,EAAE,CAAC;QACnB,KAAK;QACL,KAAI,IAAI,CAAC,GAAG,EAAC,KAAK,CAAC,IAAI,IAAI,EAAC;YACxB,IAAI,CAAC,GAAG,CAAC,GAAG,EAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAC,KAAK,CAAC,CAAC,CAAC;SACnD;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA"}