@cloudbase/weda-ui 2.0.10 → 2.0.26

package/src/mp/components/chart/common/core/eChartBar.js

@@ -37,13 +37,14 @@ class EchartBar extends EchartBase {
         name,
         methodName,
         type,
-        params,
+        params
       );
       // 获取 x 轴数据
       const sortedXAxisData = this.sortXAxisData(arrSourData, xField.format);
       const arrXaxisData = this.setXaxis(sortedXAxisData, xField.format);
       const arrXisCountEmptyIndex = []; // 记录空值的key
-      if (Object.keys(groupKey ?? {}).length === 0) { // 没有分组
+      if (Object.keys(groupKey ?? {}).length === 0) {
+        // 没有分组
         const numLine = arrSourData[0].YLabels.length;
         if (numLine > 0) {
           for (let j = 0; j < numLine; j++) {
@@ -58,16 +59,21 @@ class EchartBar extends EchartBase {
               stack: isPile ? 'pile' : null,
               data: [],
             };
-            sortedXAxisData.forEach((itemSource,index) => {
+            sortedXAxisData.forEach((itemSource, index) => {
               this.config.series[j].name = itemSource.YLabels[j].Cn_Name;
-              if ((!itemSource.YLabels[j].Value === undefined || itemSource.YLabels[j].Value === null) && !xIsCountEmpty) {
+              if (
+                (!itemSource.YLabels[j].Value === undefined ||
+                  itemSource.YLabels[j].Value === null) &&
+                !xIsCountEmpty
+              ) {
                 arrXisCountEmptyIndex.push(index);
               } else {
-                const value = itemSource.YLabels[j].Value ? itemSource.YLabels[j].Value : 0;
+                const value = itemSource.YLabels[j].Value
+                  ? itemSource.YLabels[j].Value
+                  : 0;
                 this.config.series[j].data.push(value);
               }
             });
-
           }
         }
         // 处理显示空值问题
@@ -103,23 +109,13 @@ class EchartBar extends EchartBase {
             label: {
               show: true,
             },
-            data: this.getSeriesDataGroup(
-              arrXaxisData,
-              objGroupKey[groupKey],
-            ),
+            data: this.getSeriesDataGroup(arrXaxisData, objGroupKey[groupKey]),
             stack: isPile ? 'pile' : null,
           };
           return serie;
         });
-        this.config.tooltip.formatter = params => (
-          `${params.data.dimensionality
-          }\r\n${
-            params.data.name
-          }\r\n${
-            params.seriesName
-          }:${
-            params.value}`
-        );
+        this.config.tooltip.formatter = (params) =>
+          `${params.data.dimensionality}\r\n${params.data.name}\r\n${params.seriesName}:${params.value}`;
       }
       console.log('sourData处理后数据bar:', this.config.series);
     }
@@ -140,19 +136,17 @@ class EchartBar extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     decimalDigits = Math.max(0, decimalDigits);
-    this.config.series.length > 0
-      && this.config.series.forEach((itemSeries) => {
+    this.config.series.length > 0 &&
+      this.config.series.forEach((itemSeries) => {
         itemSeries.showSymbol = isSeriesShowSymbol;
         itemSeries.label.show = isSeriesShowSymbol;
         if (isUnit) {
           itemSeries.label.formatter = (params) => {
             const objNewValue = this.getValueByUnit(params.value, unit);
-            return (
-              `${objNewValue.toFixed(decimalDigits)}${suffix}`
-            );
+            return `${objNewValue.toFixed(decimalDigits)}${suffix}`;
           };
         }
       });
@@ -166,17 +160,18 @@ class EchartBar extends EchartBase {
     }
   }
   // 设置柱状图X,Y倒转
-  setDirectionType({directionType}) {
+  setDirectionType({ directionType }) {
     let temAxis = {};
-    if (directionType === 'crosswise') { // 横向
+    if (directionType === 'crosswise') {
+      // 横向
       temAxis = this.config.xAxis;
       // @ts-ignore
       this.config.xAxis = this.config.yAxis;
       // @ts-ignore
       this.config.yAxis = temAxis;
-      this.config.yAxis.inverse =  true;
-
-    } else { // 纵向
+      this.config.yAxis.inverse = true;
+    } else {
+      // 纵向
       if (this.config.yAxis.inverse) {
         temAxis = this.config.yAxis;
         // @ts-ignore
@@ -220,7 +215,7 @@ class EchartBar extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     if (dataSource) {
       await this.setSourceData({
@@ -241,7 +236,7 @@ class EchartBar extends EchartBase {
     this.setIsXaxisAxisLabelShow({ isXaxisAxisLabelShow });
     this.setIsXaxisName({ isXaxisName, xAxisName });
     this.setIsXaxisAxisTickShow({ isXaxisAxisTickShow });
-    this.setIsXaxisAxisLabelRotate({ isXaxisAxisLabelRotate, xStatistics});
+    this.setIsXaxisAxisLabelRotate({ isXaxisAxisLabelRotate, xStatistics });
     this.setIsYAxisSplitlineLinestyleWidth({
       isYAxisSplitlineLinestyleWidth,
       yAxisSplitlineLinestyleType,
@@ -254,9 +249,9 @@ class EchartBar extends EchartBase {
       isUnit,
       unit,
       decimalDigits,
-      suffix
+      suffix,
     });
-    this.setDirectionType({directionType});
+    this.setDirectionType({ directionType });
   }
 }
 

package/src/mp/components/chart/common/core/eChartBase.js

@@ -1,5 +1,5 @@
 import getConfig from '../config/global';
-import {callWedaApi, callDataSource} from '../../../../utils/tcb';
+import { callWedaApi, callDataSource } from '../../../../utils/tcb';
 /**
  * 图表处理基类
  * @author loonglong
@@ -30,28 +30,29 @@ class EchartBase {
       dimension: {},
       group: {},
     };
-    if (filterData && filterData.length > 0) { // 协议转化，把首字母改成大写
+    if (filterData && filterData.length > 0) {
+      // 协议转化，把首字母改成大写
       objReturnData.where = filterData.map((val) => {
         let arrLogicData = val.logicData;
         if (val.logicData && val.logicData.length > 0) {
-          arrLogicData = val.logicData.map((mval)=>{
+          arrLogicData = val.logicData.map((mval) => {
             return {
               Key: mval.key,
               Rel: mval.rel,
               Value: mval.value,
               Logic: mval.logic,
               Extra: {
-                Type:mval?.extra?.type,
-                Format:mval?.extra?.format,
-                IsExpression:mval.extra.isExpression,
+                Type: mval?.extra?.type,
+                Format: mval?.extra?.format,
+                IsExpression: mval.extra.isExpression,
               },
-              ValueType:mval.valueType,
-              Expression:mval.expression
+              ValueType: mval.valueType,
+              Expression: mval.expression,
             };
           });
         }
         return {
-          GroupLogic:val.groupLogic,
+          GroupLogic: val.groupLogic,
           LogicData: arrLogicData,
         };
       });
@@ -149,20 +150,20 @@ class EchartBase {
         break;
     }
   }
-  setLegend({ isLegend, legend= 'top'}) {
+  setLegend({ isLegend, legend = 'top' }) {
     this.config.legend.show = isLegend;
     switch (legend) {
-      case 'top' :
+      case 'top':
         this.config.legend.orient = 'horizontal';
         this.config.legend.x = 'center';
         this.config.legend.top = '6%';
         break;
-      case 'left' :
+      case 'left':
         this.config.legend.orient = 'vertical';
         this.config.legend.top = '30%';
         this.config.legend.left = '1%';
         break;
-      case 'right' :
+      case 'right':
         this.config.legend.orient = 'vertical';
         this.config.legend.top = '30%';
         this.config.legend.right = '-6%';
@@ -186,11 +187,11 @@ class EchartBase {
       sortedXAxisData.forEach((itemSource) => {
         let value = itemSource.XLabel.Value;
         if (formatType === 'datetime') {
-          value =  this.formatTime(itemSource.XLabel.Value, 'dt');
+          value = this.formatTime(itemSource.XLabel.Value, 'dt');
         } else if (formatType === 'date') {
-          value =  this.formatTime(itemSource.XLabel.Value, 'd');
+          value = this.formatTime(itemSource.XLabel.Value, 'd');
         } else if (formatType === 'time') {
-          value =  this.formatTime(itemSource.XLabel.Value, 't');
+          value = this.formatTime(itemSource.XLabel.Value, 't');
         }
         xAxisData.push(value);
       });
@@ -201,16 +202,19 @@ class EchartBase {
 
   sortXAxisData(arrData, formatType = '') {
     let xFields = [...arrData];
-    if(['datetime', 'date', 'time'].includes(formatType)) {
+    if (['datetime', 'date', 'time'].includes(formatType)) {
       xFields.sort((a, b) => {
-        if(a.XLabel.Value && b.XLabel.Value ) {
-          return new Date(a.XLabel.Value).getTime() - new Date(b.XLabel.Value).getTime();
+        if (a.XLabel.Value && b.XLabel.Value) {
+          return (
+            new Date(a.XLabel.Value).getTime() -
+            new Date(b.XLabel.Value).getTime()
+          );
         }
         // 产品需求空值放最后
-        if(!a.XLabel.Value) {
+        if (!a.XLabel.Value) {
           return 1;
         }
-        if(!b.XLabel.Value) {
+        if (!b.XLabel.Value) {
           return -1;
         }
       });
@@ -224,16 +228,17 @@ class EchartBase {
    * @param { string } timeType 需要格式化的类型 dt：日期时间，d：日期，t：时间
    * @returns { string } 格式化结果
    */
-  formatTime(time, timeType='dt') {
-    if(typeof time === 'undefined' || time === null) {
+  formatTime(time, timeType = 'dt') {
+    if (typeof time === 'undefined' || time === null) {
       return '空';
     }
-    if (typeof(time) === 'string') { // 如果是字符串，代表后台返回的就是格式化的时间格式，则这里不再做格式化处理
+    if (typeof time === 'string') {
+      // 如果是字符串，代表后台返回的就是格式化的时间格式，则这里不再做格式化处理
       return time;
     }
     const date = new Date(time + 8 * 3600 * 1000);
     let startNum = 0;
-    let endNum =  19;
+    let endNum = 19;
     if (timeType === 'd') {
       startNum = 0;
       endNum = 10;
@@ -293,13 +298,18 @@ class EchartBase {
   }
   // 显示X轴刻度线
   setIsXaxisAxisTickShow({ isXaxisAxisTickShow }) {
-    this.config.xAxis.axisTick = { show : isXaxisAxisTickShow };
+    this.config.xAxis.axisTick = { show: isXaxisAxisTickShow };
   }
   // X 轴文字倾斜
   // X 轴文字倾斜
-  setIsXaxisAxisLabelRotate({ isXaxisAxisLabelRotate, xStatistics, angle = 30}) {
+  setIsXaxisAxisLabelRotate({
+    isXaxisAxisLabelRotate,
+    xStatistics,
+    angle = 30,
+  }) {
     this.config.xAxis.axisLabel.rotate = isXaxisAxisLabelRotate ? angle : 0;
-    if (isXaxisAxisLabelRotate || xStatistics) { // 如果X轴是时间类型，自动斜30度展示
+    if (isXaxisAxisLabelRotate || xStatistics) {
+      // 如果X轴是时间类型，自动斜30度展示
       this.config.xAxis.axisLabel.rotate = angle;
     } else {
       this.config.xAxis.axisLabel.rotate = 0;
@@ -311,8 +321,10 @@ class EchartBase {
     isYAxisSplitlineLinestyleWidth,
     yAxisSplitlineLinestyleType,
   }) {
-    this.config.yAxis.splitLine = {lineStyle:{}};
-    this.config.yAxis.splitLine.lineStyle.width =      isYAxisSplitlineLinestyleWidth ? 1 : 0;
+    this.config.yAxis.splitLine = { lineStyle: {} };
+    this.config.yAxis.splitLine.lineStyle.width = isYAxisSplitlineLinestyleWidth
+      ? 1
+      : 0;
     this.config.yAxis.splitLine.lineStyle.type = yAxisSplitlineLinestyleType;
   }
   // 显示 Y 轴刻度 最大值，最小值
@@ -336,7 +348,9 @@ class EchartBase {
    */
   setEmptyValue(xIsCountEmpty) {
     if (!xIsCountEmpty) {
-      const nonEmpty = this.config.xAxis.data.filter(item => item !== undefined && item !== null);
+      const nonEmpty = this.config.xAxis.data.filter(
+        (item) => item !== undefined && item !== null
+      );
       this.config.xAxis.data = nonEmpty;
     }
   }
@@ -349,7 +363,7 @@ class EchartBase {
   removeEmpty(arrXAxis) {
     const arrNewxAxis = [];
     if (arrXAxis.length > 0) {
-      for(let i = 0; i < arrXAxis.length; i++) {
+      for (let i = 0; i < arrXAxis.length; i++) {
         if (arrXAxis[i]) {
           arrNewxAxis.push(arrXAxis[i]);
         }

package/src/mp/components/chart/common/core/eChartLine.js

@@ -36,7 +36,7 @@ class EchartLine extends EchartBase {
         name,
         methodName,
         type,
-        params,
+        params
       );
       // 获取 x 轴数据
       const sortedXAxisData = this.sortXAxisData(arrSourData, xField.format);
@@ -57,12 +57,18 @@ class EchartLine extends EchartBase {
               },
               data: [],
             };
-            sortedXAxisData.forEach((itemSource,index) => {
+            sortedXAxisData.forEach((itemSource, index) => {
               this.config.series[j].name = itemSource.YLabels[j].Cn_Name;
-              if ((!itemSource.YLabels[j].Value === undefined || itemSource.YLabels[j].Value === null) && !xIsCountEmpty) {
+              if (
+                (!itemSource.YLabels[j].Value === undefined ||
+                  itemSource.YLabels[j].Value === null) &&
+                !xIsCountEmpty
+              ) {
                 arrXisCountEmptyIndex.push(index);
               } else {
-                const value = itemSource.YLabels[j].Value ? itemSource.YLabels[j].Value : 0;
+                const value = itemSource.YLabels[j].Value
+                  ? itemSource.YLabels[j].Value
+                  : 0;
                 this.config.series[j].data.push(value);
               }
             });
@@ -90,38 +96,28 @@ class EchartLine extends EchartBase {
         // 组装图表需要的数据
         const groupNames = Object.keys(objGroupKey);
         this.config.series = groupNames.map((groupKey) => {
-            // groupKey分组字段中文名
-            const serie = {
-              name: groupKey,
-              connectNulls: true,
-              data: this.getSeriesDataGroup(
-                arrXaxisData,
-                objGroupKey[groupKey],
-              ),
-              type: 'line',
-              smooth: true,
-              showSymbol: true, // 是否显示线条上数据标签
-              label: {
-                show: true, // 显示线条上的数据
-              },
-            };
-            return serie;
-          });
-        this.config.tooltip.formatter = params => (
-          `${params.data.dimensionality
-          }\r\n${
-            params.data.name
-          }\r\n${
-            params.seriesName
-          }:${
-            params.value}`
-        );
+          // groupKey分组字段中文名
+          const serie = {
+            name: groupKey,
+            connectNulls: true,
+            data: this.getSeriesDataGroup(arrXaxisData, objGroupKey[groupKey]),
+            type: 'line',
+            smooth: true,
+            showSymbol: true, // 是否显示线条上数据标签
+            label: {
+              show: true, // 显示线条上的数据
+            },
+          };
+          return serie;
+        });
+        this.config.tooltip.formatter = (params) =>
+          `${params.data.dimensionality}\r\n${params.data.name}\r\n${params.seriesName}:${params.value}`;
       }
     }
   }
   setChartType({ chartType }) {
-    this.config.series.length > 0
-      && this.config.series.forEach((itemSeries) => {
+    this.config.series.length > 0 &&
+      this.config.series.forEach((itemSeries) => {
         itemSeries.smooth = chartType !== 'line';
       });
   }
@@ -132,19 +128,17 @@ class EchartLine extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     decimalDigits = decimalDigits < 0 ? 0 : decimalDigits;
-    this.config.series.length > 0
-      && this.config.series.forEach((itemSeries) => {
+    this.config.series.length > 0 &&
+      this.config.series.forEach((itemSeries) => {
         itemSeries.showSymbol = isSeriesShowSymbol;
         itemSeries.label.show = isSeriesShowSymbol;
         if (isUnit) {
           itemSeries.label.formatter = (params) => {
             const objNewValue = this.getValueByUnit(params.value, unit);
-            return (
-              `${objNewValue.toFixed(decimalDigits)}${suffix}`
-            );
+            return `${objNewValue.toFixed(decimalDigits)}${suffix}`;
           };
         }
       });
@@ -188,7 +182,7 @@ class EchartLine extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     if (dataSource) {
       await this.setSourceData({
@@ -221,7 +215,7 @@ class EchartLine extends EchartBase {
       isUnit,
       unit,
       decimalDigits,
-      suffix
+      suffix,
     });
   }
 }

package/src/mp/components/chart/common/core/eChartPie.js

@@ -32,7 +32,7 @@ class EchartPie extends EchartBase {
         name,
         methodName,
         type,
-        params,
+        params
       );
       // 获取 x 轴数据
       if (arrSourData.length >= 0) {
@@ -59,8 +59,8 @@ class EchartPie extends EchartBase {
     }
   }
   setChartType({ chartType }) {
-    this.config.series.length > 0
-      && this.config.series.forEach((itemSeries) => {
+    this.config.series.length > 0 &&
+      this.config.series.forEach((itemSeries) => {
         if (chartType === 'pie') {
           itemSeries.radius = '70%';
         } else {
@@ -76,7 +76,7 @@ class EchartPie extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     decimalDigits = decimalDigits < 0 ? 0 : decimalDigits;
     let show = false;
@@ -92,10 +92,12 @@ class EchartPie extends EchartBase {
     } else {
       this.config.series[0].label.normal.formatter = (objValue) => {
         let reData = '';
-        if (isSeriesShowSymbol) { // 显示数值
+        if (isSeriesShowSymbol) {
+          // 显示数值
           reData = objValue.value;
         }
-        if (isUnit) { // 显示单位
+        if (isUnit) {
+          // 显示单位
           if (unit) {
             const objNewValue = this.getValueByUnit(objValue.value, unit);
             reData = `${objNewValue.toFixed(decimalDigits)}${suffix}`;
@@ -109,7 +111,8 @@ class EchartPie extends EchartBase {
             };
           });
         }
-        if (isPercent) { // 显示百分比
+        if (isPercent) {
+          // 显示百分比
           reData = `${reData}(${objValue.percent}%)`;
         }
         return reData;
@@ -135,7 +138,7 @@ class EchartPie extends EchartBase {
     isUnit,
     unit,
     decimalDigits,
-    suffix
+    suffix,
   }) {
     if (dataSource) {
       await this.setSourceData({
@@ -158,7 +161,7 @@ class EchartPie extends EchartBase {
       isUnit,
       unit,
       decimalDigits,
-      suffix
+      suffix,
     });
   }
 }

package/src/mp/components/chart/ec-canvas/ec-canvas.json

@@ -1,4 +1,4 @@
 {
   "component": true,
   "usingComponents": {}
-}
+}

package/src/mp/components/chart/ec-canvas/wx-canvas.js

@@ -6,8 +6,7 @@ class WxCanvas {
     this.isNew = isNew;
     if (isNew) {
       this.canvasNode = canvasNode;
-    }
-    else {
+    } else {
       this._initStyle(ctx);
     }
 
@@ -60,26 +59,31 @@ class WxCanvas {
 
   _initEvent() {
     this.event = {};
-    const eventNames = [{
-      wxName: 'touchStart',
-      ecName: 'mousedown'
-    }, {
-      wxName: 'touchMove',
-      ecName: 'mousemove'
-    }, {
-      wxName: 'touchEnd',
-      ecName: 'mouseup'
-    }, {
-      wxName: 'touchEnd',
-      ecName: 'click'
-    }];
+    const eventNames = [
+      {
+        wxName: 'touchStart',
+        ecName: 'mousedown',
+      },
+      {
+        wxName: 'touchMove',
+        ecName: 'mousemove',
+      },
+      {
+        wxName: 'touchEnd',
+        ecName: 'mouseup',
+      },
+      {
+        wxName: 'touchEnd',
+        ecName: 'click',
+      },
+    ];
 
-    eventNames.forEach(name => {
-      this.event[name.wxName] = e => {
+    eventNames.forEach((name) => {
+      this.event[name.wxName] = (e) => {
         const touch = e.touches[0];
         this.chart.getZr().handler.dispatch(name.ecName, {
           zrX: name.wxName === 'tap' ? touch.clientX : touch.x,
-          zrY: name.wxName === 'tap' ? touch.clientY : touch.y
+          zrY: name.wxName === 'tap' ? touch.clientY : touch.y,
         });
       };
     });
@@ -93,13 +97,11 @@ class WxCanvas {
   }
 
   get width() {
-    if (this.canvasNode)
-      return this.canvasNode.width;
+    if (this.canvasNode) return this.canvasNode.width;
     return 0;
   }
   get height() {
-    if (this.canvasNode)
-      return this.canvasNode.height;
+    if (this.canvasNode) return this.canvasNode.height;
     return 0;
   }
 }

package/src/mp/components/chart/line/index.js

@@ -237,11 +237,11 @@ Component({
   },
   observers: {
     // 当参数变化时
-    '**': async function() {
+    '**': async function () {
       const objEChartLine = new EchartLine();
       await objEChartLine.setOptions(this.properties);
       const options = objEChartLine.getOptions();
       this._chart && this._chart.setOption(options);
     },
-  }
+  },
 });

package/src/mp/components/chart/line/index.wxml

@@ -1,3 +1,3 @@
 <view wx:if="ec" class="{{className}} ec_container" style="{{style}}" id="{{id}}">
-    <ec-canvas canvas-id="{{canvas_id}}" ec="{{ ec }}"></ec-canvas>
+  <ec-canvas canvas-id="{{canvas_id}}" ec="{{ ec }}"></ec-canvas>
 </view>

package/src/mp/components/chart/pie/index.js

@@ -147,7 +147,7 @@ Component({
   },
   observers: {
     // 当参数变化时
-    '**': async function() {
+    '**': async function () {
       const objEChartPie = new EchartPie();
       await objEChartPie.setOptions(this.properties);
       const options = await objEChartPie.getOptions();

package/src/mp/components/chart/pie/index.wxml

@@ -1,4 +1,3 @@
 <view wx:if="ec" class="{{className}} ec_container" style="{{style}}" id="{{id}}">
-    <ec-canvas canvas-id="{{canvas_id}}" ec="{{ ec }}"></ec-canvas>
+  <ec-canvas canvas-id="{{canvas_id}}" ec="{{ ec }}"></ec-canvas>
 </view>
-