修改

src/chart/CustomChartBar/CustomChartBar.js → src/chart/echarts/CustomChartBar/CustomChartBar.js

@@ -1,5 +1,5 @@
 import utils from 'utils/index.js';
-import echarts from './echarts.min.js';
+import echarts from '../echarts.min.js';
 
 import styleConfig from './config/styleConfig';
 import dataConfig from './config/dataConfig';
@@ -28,34 +28,34 @@ export default class CustomChartBar{
     }
 
 
-    mergeOption(style, dataConfig){
-        style = utils.deepCopy(style);
-        style.xAxis.data = dataConfig.defaultData[dataConfig.configList[0].defaultKey];
-        style.color = style.color.color;
-        style.yAxis = {
-            type:'value'
-        }
+    // mergeOption(style, dataConfig){
+    //     style = utils.deepCopy(style);
+    //     style.xAxis.data = dataConfig.defaultData[dataConfig.configList[0].defaultKey];
+    //     style.color = style.color.color;
+    //     style.yAxis = {
+    //         type:'value'
+    //     }
 
-        style.series = [];
-        let series = dataConfig.configList[1].defaultKey;
-        if(Array.isArray(series) === true){
-            series.forEach( item => {
-                style.series.push({
-                    data:dataConfig.defaultData[item],
-                    type:'bar'
-                })
-            })
-        }else{
-            style.series = [
-                {
-                  data: dataConfig.defaultData[series],
-                  type: 'bar'
-                }
-              ]
-        }
+    //     style.series = [];
+    //     let series = dataConfig.configList[1].defaultKey;
+    //     if(Array.isArray(series) === true){
+    //         series.forEach( item => {
+    //             style.series.push({
+    //                 data:dataConfig.defaultData[item],
+    //                 type:'bar'
+    //             })
+    //         })
+    //     }else{
+    //         style.series = [
+    //             {
+    //               data: dataConfig.defaultData[series],
+    //               type: 'bar'
+    //             }
+    //           ]
+    //     }
         
-        return style;
-    }
+    //     return style;
+    // }
 
     getConfig(){
         return{

test/CustomChartBar/index.js

@@ -1,12 +0,0 @@
-import chart from '../../src/chart/CustomChartBar/CustomChartBar.js';
-import Utils from '../utils.js';
-
-let config = new chart(document.querySelector('#container'), {getConfig:true}).getConfig();
-let current_chart = new chart(document.querySelector('#container'));
-
-
-let styleConfig = config.styleConfig;
-let dataConfig = config.dataConfig;
-console.log(123, Utils.parseStyle(styleConfig), dataConfig)
-current_chart.setOption(Utils.parseStyle(styleConfig), dataConfig);
-

test/echarts/CustomChartBar/index.js

@@ -0,0 +1,10 @@
+import chart from '../../../src/chart/echarts/CustomChartBar/CustomChartBar.js';
+import Utils from '../../utils.js';
+
+let config = new chart(document.querySelector('#container'), {getConfig:true}).getConfig();
+let styleConfig = config.styleConfig;
+let dataConfig = config.dataConfig;
+
+let option = config.fun.themeMerge(Utils.parseStyle(styleConfig), Utils.parseData(dataConfig));
+new chart(document.querySelector('#container'), option)
+

test/utils.js

@@ -10,6 +10,30 @@ const Utils = {
             }
         }
 
+        return result;
+    },
+    parseData: function(dataConfig){
+        let result = {};
+
+        let { configList, defaultData } = dataConfig;
+        configList.forEach( item =>{
+            // if(item.comType == "single"){
+            //     result[item.type] = {
+            //         name:item.defaultKey,
+            //         data:defaultData[item.defaultKey]
+            //     }
+            // }
+
+            let columns = item.comType == "single" ? [item.defaultKey] : item.defaultKey;
+            result[item.type] = columns.map( key => {
+                return {
+                    name:key,
+                    data:defaultData[key]
+                }
+            })
+            
+        })
+
         return result;
     }
 }