1、添加表格自动换行

2添加表格列字体对其方式特殊属性 3添加折线图滑块默认100%

1、添加表格自动换行
2添加表格列字体对其方式特殊属性 3添加折线图滑块默认100%
qianbao
1 parent 572f20ef
Showing 10 changed files with 17 additions and 102 deletions
src/mixins/queryform.js
src/views/bigscreenDesigner/designer/widget/funnel/widgetConicalColumnChart.vue
src/views/bigscreenDesigner/designer/widget/funnel/widgetFunnel.vue
src/views/bigscreenDesigner/designer/widget/line/widgetLineCompareChart.vue
src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue
src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue
src/views/bigscreenDesigner/designer/widget/pie/widgetPieNightingaleRose.vue
src/views/bigscreenDesigner/designer/widget/pie/widgetPiechart.vue
src/views/bigscreenDesigner/designer/widget/pie/widgetRadioPiechart.vue
src/views/bigscreenDesigner/designer/widget/radar/widgetRadar.vue
@@ -118,29 +118,16 @@ export default {
       //barlineCharts 下拉框
       const chartType = params.chartType
       // console.log(data,chartType,'33333');
-      if (chartType == "widget-linechart") {
-        return this.barOrLineChartFn(params.chartProperties, data);
-      }else if (chartType == "widget-barlinechart" ) {
-        return this.barLineChartFn(params.chartProperties, data);
-      // }  else if ( chartType == "widget-barchart") {
-      //     return this.barOrLineChartFn(params.chartProperties, data);
-      } else if (
-        chartType == "widget-piechart" ||
-        chartType == "widget-funnel"
-      ) {
-        return this.piechartFn(params.chartProperties, data);
-      } else if (chartType == "widget-text") {
+      if (chartType == "widget-text") {
         return this.widgettext(params.chartProperties, data)
-      } else if (chartType == "widget-stackchart") {
-        return this.stackChartFn(params.chartProperties, data);
-        // return this.stackChartFn(params.chartProperties, data)
-      } else if (chartType == "widget-coord") {
+      }  else if (chartType == "widget-coord") {
         return this.coordChartFn(params.chartProperties, data)
       } else if (chartType == "widget-linemap") {
         return this.linemapChartFn(params.chartProperties, data)
-      } else if (chartType == "widget-radar") {
-        return this.radarChartFn(params.chartProperties, data)
-      } else if (chartType == "widget-select") {
+      // } else if (chartType == "widget-radar") {
+      //   return this.radarChartFn(params.chartProperties, data)
+      }
+      else if (chartType == "widget-select") {
         return this.selectChartFn(params.chartProperties, data)
       } else {
         return data
@@ -135,7 +135,8 @@ export default {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       data.then(res => {
-        this.renderingFn(res);
+        // this.renderingFn(res);
+        this.staticDataFn(val);
       });
     },
     renderingFn(val) {
@@ -236,7 +236,8 @@ export default {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       data.then(res => {
-        this.renderingFn(res);
+        this.staticDataFn(res)
+        // this.renderingFn(res);
       });
     },
     renderingFn(val) {
@@ -670,19 +670,7 @@ export default {
       });
     },
     renderingFn(optionsSetup, val) {
-      const legendName = [];
-      this.options.xAxis[0]['data'] = val.xAxis;
-      this.options.xAxis[1]['data'] = val.xAxis;
-      if (val.series[0].type == "line") {
-        this.options.series[0]['name'] = val.series[0].name;
-        this.options.series[0]['data'] = val.series[0].data;
-        this.options.series[1]['name'] = val.series[1].name;
-        this.options.series[1]['data'] = val.series[1].data;
-        legendName.push(val.series[0].name);
-        legendName.push(val.series[1].name);
-      }
-      this.options.legend['data'] = legendName;
-      this.setOptionsLegendName(legendName);
+      this.staticDataFn(val)
     }
   }
 };
@@ -450,64 +450,6 @@ export default {
     },
     renderingFn(optionsSetup, val) {
       this.staticDataFn(val);
-      //颜色
-      // const customColor = optionsSetup.customColor;
-      // const arrColor = [];
-      // for (let i = 0; i < customColor.length; i++) {
-      //   arrColor.push(customColor[i].color);
-      // }
-      // // x轴
-      // if (optionsSetup.verticalShow) {
-      //   this.options.xAxis.data = [];
-      //   this.options.yAxis.data = val.xAxis;
-      //   this.options.xAxis.type = "value";
-      //   this.options.yAxis.type = "category";
-      // } else {
-      //   this.options.xAxis.data = val.xAxis;
-      //   this.options.yAxis.data = [];
-      //   this.options.xAxis.type = "category";
-      //   this.options.yAxis.type = "value";
-      // }
-      // const series = [];
-      // const legendName = [];
-      // for (const i in val.series) {
-      //   if (val.series[i].type == "line") {
-      //     series.push({
-      //       name: val.series[i].name,
-      //       type: "line",
-      //       data: val.series[i].data,
-      //       width: optionsSetup.lineWidth,
-      //       symbol: optionsSetup.symbol,
-      //       showSymbol: optionsSetup.markPoint,
-      //       symbolSize: optionsSetup.pointSize,
-      //       symbolColor: arrColor[i],
-      //       smooth: optionsSetup.smoothCurve,
-      //       // 线条
-      //       lineStyle: {
-      //         color: arrColor[i],
-      //         width: optionsSetup.lineWidth,
-      //       },
-      //       //点
-      //       itemStyle: {
-      //         color: arrColor[i],
-      //       },
-      //       areaStyle: this.getOptionArea(),
-      //       // 标题部分
-      //       label: {
-      //         show: optionsSetup.isShow,
-      //         position: "top",
-      //         distance: 10,
-      //         fontSize: optionsSetup.fontSize,
-      //         color: optionsSetup.subTextColor,
-      //         fontWeight: optionsSetup.fontWeight,
-      //       },
-      //     })
-      //   }
-      //   legendName.push(val.series[i].name);
-      // }
-      // this.options.series = series;
-      // this.options.legend['data'] = legendName;
-      // this.setOptionsLegendName(legendName);
     }
   }
 };
@@ -365,7 +365,7 @@ export default {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       data.then(res => {
-        this.renderingFn(res);
+        this.staticDataFn(res);
       });
     },
     renderingFn(val) {
@@ -229,7 +229,7 @@ export default {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       data.then(res => {
-        this.renderingFn(res);
+        this.staticDataFn(val);
       });
     },
     renderingFn(val) {
@@ -244,11 +244,7 @@ export default {
       });
     },
     renderingFn(val) {
-      for (const key in this.options.series) {
-        if (this.options.series[key].type == "pie") {
-          this.options.series[key].data = val;
-        }
-      }
+      this.staticDataFn(val)
       const arrColorData = [];
       for (let i = 0; i < val.length; i++) {
         const res = val[i];
@@ -90,7 +90,7 @@ export default {
     this.optionsCollapse = this.value.collapse;
     this.optionsSetup = this.value.setup;
     this.editorOptions();
-    
+
   },
   methods: {
     // 修改图标options属性
@@ -244,7 +244,7 @@ export default {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       data.then(res => {
-        this.renderingFn(res);
+        this.staticDataFn(res);
       });
     },
     renderingFn(val) {
@@ -273,7 +273,7 @@ export default {
     getEchartData(val) {
       const data = this.queryEchartsData(val);
       data.then(res => {
-        this.renderingFn(res);
+        this.staticDataFn(res);
       });
     },
     renderingFn(val) {