@cloudbase/weda-ui 0.2.16 → 1.0.24

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

@@ -0,0 +1,182 @@
+import * as echarts from '../common/lib/echarts.min';
+import EchartPie from '../common/core/eChartPie';
+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: [],
+    },
+    setColor: {
+      // 设置颜色
+      type: Array,
+      value: [],
+    },
+    xField: {
+      // x轴字段选择
+      type: Object,
+      value: {
+        format: '',
+        type: '', // 数据源字段 类型
+        title: '', // 字段名中文
+        name: '', // 字段名英文
+      },
+    },
+    xStatistics: {
+      // 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
+    },
+
+    // 高级属性
+    isSeriesShowSymbol: {
+      // 是否显示数据标签 开启后 属性 series.label.show 要同时设置为true
+      type: Boolean,
+      value: true,
+    },
+    isPercent: {
+      // 百分比
+      type: Boolean,
+      value: false,
+    },
+    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_pie_${Date.now()}_${Math.random() * 100}`,
+    },
+  },
+  lifetimes: {
+    attached() {
+      // 在组件实例进入页面节点树时执行
+      this.initData();
+    },
+    detached() {
+      // 在组件实例被从页面节点树移除时执行
+    },
+  },
+  // 以下是旧式的定义方式，可以保持对 <2.2.3 版本基础库的兼容
+  attached() {
+    // 在组件实例进入页面节点树时执行
+    this.initData();
+  },
+  detached() {
+    // 在组件实例被从页面节点树移除时执行
+  },
+  observers: {
+    // 当参数变化时
+    '**': async function() {
+      const objEChartPie = new EchartPie();
+      await objEChartPie.setOptions(this.properties);
+      const options = await objEChartPie.getOptions();
+      this._chart && this._chart.setOption(options);
+    },
+  },
+  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 objEChartPie = new EchartPie();
+      await objEChartPie.setOptions(this.properties);
+      const options = await objEChartPie.getOptions();
+      // objEchart.clear();
+      console.log('设置前参数pie', options);
+      objEchart.setOption(options);
+      this._chart = objEchart;
+      return objEchart;
+    },
+  },
+});

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

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

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

@@ -0,0 +1,4 @@
+<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/pie/index.wxss

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

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

@@ -108,15 +108,32 @@ Component({
       }
       return integer;
     },
+    addDelimiter: function (fixedString, digit) {
+      let len = fixedString.length;
+      let result = '';
+      const decimalPoint = digit > 0 ? digit + 1 : 0;
+      for (let i = len - 1; i >= 0; i--) {
+        let stepFromTail = len - 1 - i;
+        let char = fixedString.charAt(i);
+
+        if (stepFromTail <= decimalPoint) {
+          // 小数部分不处理
+          result = char + result;
+        } else {
+          if ((stepFromTail - decimalPoint) % 3 === 0) {
+            if (char !== '-') {
+              result = ',' + result;
+            }
+          }
+          result = char + result;
+        }
+      }
+      return result;
+    },
     formatNumber: function (val, digits = 0) {
       return isNaN(val)
         ? val
-        : Intl
-        ? Intl.NumberFormat('en-US', {
-            maximumFractionDigits: 10,
-            minimumFractionDigits: digits,
-          }).format(this.customToFixed(val, digits))
-        : val;
+        : this.addDelimiter(this.customToFixed(val, digits), digits);
     },
     getSourceData: async function (
       dataSource,
@@ -223,4 +240,14 @@ Component({
       this._fetchData();
     },
   },
+  attached() {
+    this._fetchData();
+  },
+  observers: {
+    // 当参数变化时
+    'datasource,filterData,field,operationType,label,isCountEmpty,isShowUnit,unit,decimalDigits,suffix':
+      function () {
+        this._fetchData();
+      },
+  },
 });

package/src/mp/components/form/checkbox/index.js

@@ -1,5 +1,7 @@
 import classNames from '../../../utils/classnames';
+import destr from '../../../utils/destr';
 import handleEvents from '../../../utils/handleEvents';
+import { callWedaApi } from '../../../utils/tcb';
 
 Component({
   options: {
@@ -41,15 +43,24 @@ Component({
       type: Boolean,
       value: false,
     },
+    format: {
+      type: String,
+      value: '',
+    },
+    enumName: {
+      type: String,
+      value: '',
+    }
   },
   data: {
     cls: '',
     subCls: '',
     isFlex: true,
+    defaultRange: []
   },
   lifetimes: {
     attached() {
-      const { className, layout, disabled } = this.properties;
+      const { className, layout, disabled, range } = this.properties;
       const isFlex = layout !== 'vertical';
       const cls = classNames({
         'weda-ui': true,
@@ -63,10 +74,26 @@ Component({
         'weui-cell_disabled': disabled,
       });
 
-      this.setData({ cls, subCls, isFlex });
+      this.setData({ cls, subCls, isFlex, defaultRange: range });
     },
   },
   methods: {
+    _fetchData: async function () {
+      let data = await callWedaApi({
+        action: 'DescribeGeneralOptionsDetailList',
+        data: { OptNameList: [this.properties.enumName], PageIndex: 1, PageSize: 10 },
+      });
+      const config = destr(data?.Items?.[0]?.Config) ?? [];
+      const option = config.map(item => {
+        return {
+          label: item.value,
+          value: item.key,
+          checked: false
+        };
+      });
+      this.setData({ defaultRange: option });
+    },
+
     ...handleEvents([
       {
         name: 'change',
@@ -74,4 +101,16 @@ Component({
       },
     ]),
   },
+  observers: {
+    range: function (range) {
+      if (this.properties.format !== 'x-enum') {
+        this.setData({ defaultRange: range });
+      }
+    },
+    format: function (format) {
+      if (format === 'x-enum' && this.properties.enumName) {
+        this._fetchData();
+      }
+    }
+  },
 });

package/src/mp/components/form/checkbox/index.wxml

@@ -7,7 +7,7 @@
 	requiredFlag="{{requiredFlag}}"
 >
 	<checkbox-group class="{{isFlex ? 'weui-flex__item' : ''}}" bindchange="change">
-		<label class="{{subCls}}" wx:for="{{range}}" wx:key="value">
+		<label class="{{subCls}}" wx:for="{{defaultRange}}" wx:key="value">
 			<view class="weui-cell__hd">
 				<checkbox
 				 class="weui-check"

package/src/mp/components/form/form/index.wxml

@@ -1,6 +1,5 @@
-<view class="weui-form weda-ui {{className}} {{style}}">
+<view class="weui-form weda-ui {{className}}" style="{{style}}">
 	<view class="weui-cells__group weui-cells__group_form">
 		<slot name="contentSlot" />
 	</view>
 </view>
-

package/src/mp/components/form/input/index.js

@@ -101,7 +101,7 @@ Component({
       this.setData({
         value: '',
       });
-      this.triggerEvent('change', e.detail);
+      this.triggerEvent('clear', e.detail);
     },
     handleConfirm: function (e) {
       this.triggerEvent('confirm', e.detail);

package/src/mp/components/form/location/index.js

@@ -156,7 +156,48 @@ Component({
       };
       const { locationType, customLocation } = this.properties;
       if (locationType === 1 || locationType === 2) {
-        getCurrentLocation(locationType);
+        // 可以通过 wx.getSetting 先查询一下用户是否授权了 "scope.record" 这个 scope
+        wx.getSetting({
+          success: (res) => {
+            if (!res.authSetting['scope.userLocation']) {
+              // 没有授权
+              wx.authorize({
+                scope: 'scope.userLocation',
+                success: () => {
+                  // 用户已经同意小程序使用定位功能，后续调用 wx.getLocation 接口不会弹窗询问
+                  getCurrentLocation(locationType);
+                },
+                fail: (err) => {
+                  console.log('authorize fail', err);
+                  this.setData({
+                    currentPosition: {
+                      status: false,
+                      message: err.errMsg,
+                    },
+                    currentLocations: {},
+                  });
+                  this.triggerEvent('change', {
+                    value: null,
+                  });
+                  wx.showToast({
+                    icon: 'none',
+                    title: err.errMsg,
+                  });
+                },
+              });
+            } else {
+              // 已经授权
+              getCurrentLocation(locationType);
+            }
+          },
+          fail: (err) => {
+            console.log('getSetting fail', err);
+            wx.showToast({
+              icon: 'none',
+              title: 'getSetting fail',
+            });
+          },
+        });
       } else if (locationType === 3) {
         this.setData({
           currentPosition: {
@@ -299,7 +340,7 @@ Component({
       let location = {
         address: poiname,
         geopoint: {
-          coordinates: [latitude, longitude],
+          coordinates: [longitude, latitude],
           type: 'Point',
         },
       };

package/src/mp/components/form/radio/index.js

@@ -1,5 +1,7 @@
 import classNames from '../../../utils/classnames';
+import destr from '../../../utils/destr';
 import handleEvents from '../../../utils/handleEvents';
+import { callWedaApi } from '../../../utils/tcb';
 
 Component({
   options: {
@@ -41,6 +43,14 @@ Component({
       type: Boolean,
       value: false,
     },
+    format: {
+      type: String,
+      value: '',
+    },
+    enumName: {
+      type: String,
+      value: '',
+    }
   },
   data: {
     cls: '',
@@ -68,6 +78,22 @@ Component({
     },
   },
   methods: {
+    _fetchData: async function () {
+      let data = await callWedaApi({
+        action: 'DescribeGeneralOptionsDetailList',
+        data: { OptNameList: [this.properties.enumName], PageIndex: 1, PageSize: 10 },
+      });
+      const config = destr(data?.Items?.[0]?.Config) ?? [];
+      const option = config?.map(item => {
+        return {
+          label: item.value,
+          value: item.key,
+          checked: false
+        };
+      });
+      this.setData({ defaultRange: option });
+    },
+
     ...handleEvents([
       {
         name: 'change',
@@ -75,4 +101,16 @@ Component({
       },
     ]),
   },
+  observers: {
+    range: function (range) {
+      if (this.properties.format !== 'x-enum') {
+        this.setData({ defaultRange: range });
+      }
+    },
+    format: function (format) {
+      if (format === 'x-enum' && this.properties.enumName) {
+        this._fetchData();
+      }
+    }
+  },
 });