@cloudbase/weda-ui 2.0.27 → 3.1.1

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

@@ -1,277 +0,0 @@
-import WxCanvas from './wx-canvas';
-import * as echarts from '../common/lib/echarts.min';
-
-let ctx;
-
-function compareVersion(v1, v2) {
-  v1 = v1.split('.');
-  v2 = v2.split('.');
-  const len = Math.max(v1.length, v2.length);
-
-  while (v1.length < len) {
-    v1.push('0');
-  }
-  while (v2.length < len) {
-    v2.push('0');
-  }
-
-  for (let i = 0; i < len; i++) {
-    const num1 = parseInt(v1[i]);
-    const num2 = parseInt(v2[i]);
-
-    if (num1 > num2) {
-      return 1;
-    } else if (num1 < num2) {
-      return -1;
-    }
-  }
-  return 0;
-}
-
-Component({
-  properties: {
-    canvasId: {
-      type: String,
-      value: 'ec-canvas',
-    },
-
-    ec: {
-      type: Object,
-    },
-
-    forceUseOldCanvas: {
-      type: Boolean,
-      value: false,
-    },
-  },
-
-  data: {
-    isUseNewCanvas: false,
-  },
-
-  ready: function () {
-    // Disable prograssive because drawImage doesn't support DOM as parameter
-    // See https://developers.weixin.qq.com/miniprogram/dev/api/canvas/CanvasContext.drawImage.html
-    echarts.registerPreprocessor((option) => {
-      if (option && option.series) {
-        if (option.series.length > 0) {
-          option.series.forEach((series) => {
-            series.progressive = 0;
-          });
-        } else if (typeof option.series === 'object') {
-          option.series.progressive = 0;
-        }
-      }
-    });
-
-    if (!this.data.ec) {
-      console.warn(
-        '组件需绑定 ec 变量，例：<ec-canvas id="mychart-dom-bar" ' +
-          'canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>'
-      );
-      return;
-    }
-
-    if (!this.data.ec.lazyLoad) {
-      this.init();
-    }
-  },
-
-  methods: {
-    init: function (callback) {
-      const version = wx.getSystemInfoSync().SDKVersion;
-
-      const canUseNewCanvas = compareVersion(version, '2.9.0') >= 0;
-      const forceUseOldCanvas = this.data.forceUseOldCanvas;
-      const isUseNewCanvas = canUseNewCanvas && !forceUseOldCanvas;
-      this.setData({ isUseNewCanvas });
-
-      if (forceUseOldCanvas && canUseNewCanvas) {
-        console.warn('开发者强制使用旧canvas,建议关闭');
-      }
-
-      if (isUseNewCanvas) {
-        // console.log('微信基础库版本大于2.9.0，开始使用<canvas type="2d"/>');
-        // 2.9.0 可以使用 <canvas type="2d"></canvas>
-        this.initByNewWay(callback);
-      } else {
-        const isValid = compareVersion(version, '1.9.91') >= 0;
-        if (!isValid) {
-          console.error(
-            '微信基础库版本过低，需大于等于 1.9.91。' +
-              '参见：https://github.com/ecomfe/echarts-for-weixin' +
-              '#%E5%BE%AE%E4%BF%A1%E7%89%88%E6%9C%AC%E8%A6%81%E6%B1%82'
-          );
-          return;
-        } else {
-          console.warn(
-            '建议将微信基础库调整大于等于2.9.0版本。升级后绘图将有更好性能'
-          );
-          this.initByOldWay(callback);
-        }
-      }
-    },
-
-    initByOldWay(callback) {
-      // 1.9.91 <= version < 2.9.0：原来的方式初始化
-      ctx = wx.createCanvasContext(this.data.canvasId, this);
-      const canvas = new WxCanvas(ctx, this.data.canvasId, false);
-
-      echarts.setCanvasCreator(() => {
-        return canvas;
-      });
-      // const canvasDpr = wx.getSystemInfoSync().pixelRatio // 微信旧的canvas不能传入dpr
-      const canvasDpr = 1;
-      var query = wx.createSelectorQuery().in(this);
-      query
-        .select('.ec-canvas')
-        .boundingClientRect(async (res) => {
-          if (typeof callback === 'function') {
-            this.chart = callback(canvas, res.width, res.height, canvasDpr);
-          } else if (
-            this.data.ec &&
-            typeof this.data.ec.onInit === 'function'
-          ) {
-            this.chart = await this.data.ec.onInit(
-              canvas,
-              res.width,
-              res.height,
-              canvasDpr
-            );
-          } else {
-            this.triggerEvent('init', {
-              canvas: canvas,
-              width: res.width,
-              height: res.height,
-              canvasDpr: canvasDpr, // 增加了dpr，可方便外面echarts.init
-            });
-          }
-        })
-        .exec();
-    },
-
-    initByNewWay(callback) {
-      // version >= 2.9.0：使用新的方式初始化
-      const query = wx.createSelectorQuery().in(this);
-      query
-        .select('.ec-canvas')
-        .fields({ node: true, size: true })
-        .exec(async (res) => {
-          const canvasNode = res[0].node;
-          this.canvasNode = canvasNode;
-
-          const canvasDpr = wx.getSystemInfoSync().pixelRatio;
-          const canvasWidth = res[0].width;
-          const canvasHeight = res[0].height;
-
-          const ctx = canvasNode.getContext('2d');
-
-          const canvas = new WxCanvas(
-            ctx,
-            this.data.canvasId,
-            true,
-            canvasNode
-          );
-          echarts.setCanvasCreator(() => {
-            return canvas;
-          });
-
-          if (typeof callback === 'function') {
-            this.chart = callback(canvas, canvasWidth, canvasHeight, canvasDpr);
-          } else if (
-            this.data.ec &&
-            typeof this.data.ec.onInit === 'function'
-          ) {
-            this.chart = await this.data.ec.onInit(
-              canvas,
-              canvasWidth,
-              canvasHeight,
-              canvasDpr
-            );
-          } else {
-            this.triggerEvent('init', {
-              canvas: canvas,
-              width: canvasWidth,
-              height: canvasHeight,
-              dpr: canvasDpr,
-            });
-          }
-        });
-    },
-    canvasToTempFilePath(opt) {
-      if (this.data.isUseNewCanvas) {
-        // 新版
-        const query = wx.createSelectorQuery().in(this);
-        query
-          .select('.ec-canvas')
-          .fields({ node: true, size: true })
-          .exec((res) => {
-            const canvasNode = res[0].node;
-            opt.canvas = canvasNode;
-            wx.canvasToTempFilePath(opt);
-          });
-      } else {
-        // 旧的
-        if (!opt.canvasId) {
-          opt.canvasId = this.data.canvasId;
-        }
-        ctx.draw(true, () => {
-          wx.canvasToTempFilePath(opt, this);
-        });
-      }
-    },
-
-    touchStart(e) {
-      if (this.chart && e.touches.length > 0) {
-        var touch = e.touches[0];
-        var handler = this.chart.getZr().handler;
-        handler.dispatch('mousedown', {
-          zrX: touch.x,
-          zrY: touch.y,
-        });
-        handler.dispatch('mousemove', {
-          zrX: touch.x,
-          zrY: touch.y,
-        });
-        handler.processGesture(wrapTouch(e), 'start');
-      }
-    },
-
-    touchMove(e) {
-      if (this.chart && e.touches.length > 0) {
-        var touch = e.touches[0];
-        var handler = this.chart.getZr().handler;
-        handler.dispatch('mousemove', {
-          zrX: touch.x,
-          zrY: touch.y,
-        });
-        handler.processGesture(wrapTouch(e), 'change');
-      }
-    },
-
-    touchEnd(e) {
-      if (this.chart) {
-        const touch = e.changedTouches ? e.changedTouches[0] : {};
-        var handler = this.chart.getZr().handler;
-        handler.dispatch('mouseup', {
-          zrX: touch.x,
-          zrY: touch.y,
-        });
-        handler.dispatch('click', {
-          zrX: touch.x,
-          zrY: touch.y,
-        });
-        handler.processGesture(wrapTouch(e), 'end');
-      }
-    },
-  },
-});
-
-function wrapTouch(event) {
-  for (let i = 0; i < event.touches.length; ++i) {
-    const touch = event.touches[i];
-    touch.offsetX = touch.x;
-    touch.offsetY = touch.y;
-  }
-  return event;
-}

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

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

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

@@ -1,4 +0,0 @@
-<!-- 新的：接口对齐了H5 -->
-<canvas wx:if="{{isUseNewCanvas}}" type="2d" class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>
-<!-- 旧的 -->
-<canvas wx:else class="ec-canvas" canvas-id="{{ canvasId }}" bindinit="init" bindtouchstart="{{ ec.disableTouch ? '' : 'touchStart' }}" bindtouchmove="{{ ec.disableTouch ? '' : 'touchMove' }}" bindtouchend="{{ ec.disableTouch ? '' : 'touchEnd' }}"></canvas>

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

@@ -1,4 +0,0 @@
-.ec-canvas {
-  width: 100%;
-  height: 100%;
-}

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

@@ -1,109 +0,0 @@
-class WxCanvas {
-  constructor(ctx, canvasId, isNew, canvasNode) {
-    this.ctx = ctx;
-    this.canvasId = canvasId;
-    this.chart = null;
-    this.isNew = isNew;
-    if (isNew) {
-      this.canvasNode = canvasNode;
-    } else {
-      this._initStyle(ctx);
-    }
-
-    // this._initCanvas(zrender, ctx);
-
-    this._initEvent();
-  }
-
-  getContext(contextType) {
-    if (contextType === '2d') {
-      return this.ctx;
-    }
-  }
-
-  // canvasToTempFilePath(opt) {
-  //   if (!opt.canvasId) {
-  //     opt.canvasId = this.canvasId;
-  //   }
-  //   return wx.canvasToTempFilePath(opt, this);
-  // }
-
-  setChart(chart) {
-    this.chart = chart;
-  }
-
-  attachEvent() {
-    // noop
-  }
-
-  detachEvent() {
-    // noop
-  }
-
-  _initCanvas(zrender, ctx) {
-    zrender.util.getContext = function () {
-      return ctx;
-    };
-
-    zrender.util.$override('measureText', function (text, font) {
-      ctx.font = font || '12px sans-serif';
-      return ctx.measureText(text);
-    });
-  }
-
-  _initStyle(ctx) {
-    ctx.createRadialGradient = () => {
-      return ctx.createCircularGradient(arguments);
-    };
-  }
-
-  _initEvent() {
-    this.event = {};
-    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) => {
-        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,
-        });
-      };
-    });
-  }
-
-  set width(w) {
-    if (this.canvasNode) this.canvasNode.width = w;
-  }
-  set height(h) {
-    if (this.canvasNode) this.canvasNode.height = h;
-  }
-
-  get width() {
-    if (this.canvasNode) return this.canvasNode.width;
-    return 0;
-  }
-  get height() {
-    if (this.canvasNode) return this.canvasNode.height;
-    return 0;
-  }
-}
-
-export default WxCanvas;

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

@@ -1,247 +0,0 @@
-import * as echarts from '../common/lib/echarts.min';
-import EchartLine from '../common/core/eChartLine';
-Component({
-  options: {
-    virtualHost: true,
-    multipleSlots: true,
-  },
-  properties: {
-    id: {
-      type: String,
-      value: '',
-    },
-    className: {
-      type: String,
-      value: '',
-    },
-    style: {
-      type: String,
-      value: '',
-    },
-    chartType: {
-      // 线条类型
-      type: String,
-      value: 'bight',
-    },
-    title: {
-      // 图表标题
-      type: String,
-    },
-    isTitle: {
-      // 是否显示标题
-      type: Boolean,
-      value: false,
-    },
-    titleLocation: {
-      type: String,
-      value: 'top',
-    },
-    dataSource: {
-      // 数据源
-      type: Object,
-    },
-    filterData: {
-      // 数据筛选
-      type: Array,
-      value: [],
-    },
-    xField: {
-      // x轴字段选择
-      type: Object,
-      value: {
-        format: '',
-        type: '', // 数据源字段 类型
-        title: '', // 字段名中文
-        name: '', // 字段名英文
-      },
-    },
-    xStatistics: {
-      // x轴统计维度
-      type: String,
-      value: '', // 统计纬度, 只有选择时间类型才有，y 年，m月，d 日，w周，h时，min 分，s秒
-    },
-    groupKey: {
-      // x轴字段选择
-      type: Object,
-      value: {
-        format: '',
-        type: '', // 数据源字段 类型
-        title: '', // 字段名中文
-        name: '', // 字段名英文
-      },
-    },
-    groupKeyTimeSpan: {
-      // x轴统计维度
-      type: String,
-      value: '', // 统计纬度, 只有选择时间类型才有，y 年，m月，d 日，w周，h时，min 分，s秒
-    },
-    xIsCountEmpty: {
-      // x轴 是否统计空值
-      type: Boolean,
-      value: false,
-    },
-    yField: {
-      // Y轴字段，分组字段，是否分组
-      type: Object,
-      value: {
-        numValue: [{ key: '', operationType: '' }],
-        groupKey: '',
-      },
-    },
-    isLegend: {
-      // 是否显示图例
-      type: Boolean,
-      value: false,
-    },
-    legend: {
-      // 图例
-      type: String,
-      value: 'bottom', // 左 left 右right, 上top，下 bottom
-    },
-
-    // 高级属性
-    isXaxisName: {
-      // 是否显示坐标轴名称
-      type: Boolean,
-      value: true,
-    },
-    xAxisName: {
-      // 是否显示坐标轴名称
-      type: String,
-      value: '',
-    },
-    isXaxisAxisLabelShow: {
-      // 是否显示标签
-      type: Boolean,
-      value: true,
-    },
-    isXaxisAxisTickShow: {
-      // 显示X轴刻度线
-      type: Boolean,
-      value: true,
-    },
-    isXaxisAxisLabelRotate: {
-      // 文字自动倾斜
-      type: Boolean,
-      value: false,
-    },
-    isYAxisShow: {
-      // 是否显示 Y 轴刻度线
-      type: Boolean,
-      value: true,
-    },
-    isYAxisName: {
-      // 是否显示 Y坐标轴名称
-      type: Boolean,
-      value: true,
-    },
-    isYAxisSplitlineLinestyleWidth: {
-      // 是否显示网格线 ,yAxis.splitLine.lineStyle.width设置为0
-      type: Boolean,
-      value: true,
-    },
-    yAxisSplitlineLinestyleType: {
-      // 网格线线条类型 solid,dashed,dotted
-      type: String,
-      value: 'dashed',
-    },
-    yAxisName: {
-      // Y坐标轴名称  显示名称后需要设置居中，轴线距离属性 yAxis.nameLocation='middle' yAxis.nameGap =20
-      type: String,
-      value: '',
-    },
-    yAxisMin: {
-      // Y轴刻度最小值
-      type: Number,
-      value: 0,
-    },
-    yAxisMax: {
-      // Y轴刻度最大值, 切记如果为0时，则不设置
-      type: Number,
-      value: 0,
-    },
-    isSeriesShowSymbol: {
-      // 是否显示数据标签 开启后 属性 series.label.show 要同时设置为true
-      type: Boolean,
-      value: true,
-    },
-    isUnit: {
-      // 显示单位
-      type: Boolean,
-      value: false,
-    },
-    unit: {
-      // 数字显示的单位 百分比，千分比，千，万，百万，亿，十亿
-      type: String,
-      value: '%',
-    },
-    decimalDigits: {
-      // 小数位数
-      type: Number,
-      value: 0,
-    },
-    suffix: {
-      // 后缀
-      type: String,
-      value: '',
-    },
-  },
-  data: {
-    ec: {},
-    canvas_id: {
-      type: String,
-      value: `canvas_line_${Date.now()}_${Math.random() * 100}`,
-    },
-  },
-  lifetimes: {
-    attached() {
-      // 在组件实例进入页面节点树时执行
-      this.initData();
-    },
-    detached() {
-      // 在组件实例被从页面节点树移除时执行
-    },
-  },
-  // 以下是旧式的定义方式，可以保持对 <2.2.3 版本基础库的兼容
-  attached() {
-    // 在组件实例进入页面节点树时执行
-    this.initData();
-  },
-  detached() {
-    // 在组件实例被从页面节点树移除时执行
-  },
-  methods: {
-    initData() {
-      this.setData({
-        ec: {
-          onInit: this.initChart.bind(this),
-        },
-      });
-    },
-    async initChart(canvas, width, height, dpr) {
-      const objEchart = echarts.init(canvas, null, {
-        width,
-        height,
-        devicePixelRatio: dpr,
-      });
-      canvas.setChart(objEchart);
-      const objEChartLine = new EchartLine();
-      await objEChartLine.setOptions(this.properties);
-      const options = await objEChartLine.getOptions();
-      // objEchart.clear();
-      console.log('设置前参数line', options);
-      objEchart.setOption(options);
-      this._chart = objEchart;
-      return objEchart;
-    },
-  },
-  observers: {
-    // 当参数变化时
-    '**': 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.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "ec-canvas": "../ec-canvas/ec-canvas"
-  }
-}

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

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

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

@@ -1,9 +0,0 @@
-/**index.wxss**/
-ec-canvas {
-  width: 100%;
-  height: 100%;
-}
-.ec_container {
-  width: 100%;
-  height: 380px;
-}