@cloudbase/weda-ui 0.2.17 → 1.0.21

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/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',
@@ -77,7 +103,14 @@ Component({
   },
   observers: {
     range: function (range) {
-      this.setData({ defaultRange: range });
+      if (this.properties.format !== 'x-enum') {
+        this.setData({ defaultRange: range });
+      }
     },
+    format: function (format) {
+      if (format === 'x-enum' && this.properties.enumName) {
+        this._fetchData();
+      }
+    }
   },
 });