@cloudbase/weda-ui 2.0.10 → 2.0.26

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

@@ -7,6 +7,7 @@
   box-sizing: border-box;
   max-width: 100%;
   min-height: 140px;
+  font-size: 28rpx;
 }
 
 .weda-statistics-card .weda-statistics-card__wrapper {
@@ -16,29 +17,25 @@
 }
 
 .weda-statistics-card .weda-statistics-card__title {
-  font-size: 14px;
-  line-height: 22px;
+  font-size: 1em;
+  line-height: 1.57142em;
   color: rgba(0, 0, 0, 0.6);
 }
 
 .weda-statistics-card .weda-statistics-card__detail {
   margin-top: 4px;
-  font-size: 28px;
-  line-height: 34px;
-  color: rgba(0, 0, 0, 0.9);
-  word-break: break-all;
 }
 
 .weda-statistics-card .weda-statistics-card__count {
-  font-size: 28px;
-  line-height: 34px;
+  font-size: 2em;
+  line-height: 2.42857em;
   color: rgba(0, 0, 0, 0.9);
   word-break: break-all;
 }
 
 .weda-statistics-card .weda-statistics-card__unit {
-  font-size: 14px;
-  line-height: 22px;
+  font-size: 2em;
+  line-height: 2.42857em;
   color: rgba(0, 0, 0, 0.4);
   margin-left: 4px;
   vertical-align: middle;

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

@@ -1,15 +1,3 @@
-<list-view 
-  className="weda-data-view__containor {{className}}"
-  style="{{style}}"
-  datasource="{{datasource}}"
-  where="{{where}}"
-  pageSize="{{1}}"
-  pagination="none"
-  beforeDataChange="{{innerBeforeDataChange}}"
-  bindonDataChange="handleEvent"
-  bindqueryFail="handleEvent"
-  bindqueryEmpty="handleEvent"
-  bindquerySuccess="handleEvent"
->
+<list-view className="weda-data-view__containor {{className}}" style="{{style}}" datasource="{{datasource}}" where="{{where}}" pageSize="{{1}}" pagination="none" beforeDataChange="{{innerBeforeDataChange}}" bindonDataChange="handleEvent" bindqueryFail="handleEvent" bindqueryEmpty="handleEvent" bindquerySuccess="handleEvent">
   <slot></slot>
-</list-view>
+</list-view>

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

@@ -2,6 +2,7 @@ import classNames from '../../../utils/classnames';
 import destr from '../../../utils/destr';
 import handleEvents from '../../../utils/handleEvents';
 import { callWedaApi } from '../../../utils/tcb';
+import deepEqual from '../../../utils/deepEqual';
 
 Component({
   options: {
@@ -50,13 +51,13 @@ Component({
     enumName: {
       type: String,
       value: '',
-    }
+    },
   },
   data: {
     cls: '',
     subCls: '',
     isFlex: true,
-    defaultRange: []
+    defaultRange: [],
   },
   lifetimes: {
     attached() {
@@ -81,14 +82,18 @@ Component({
     _fetchData: async function () {
       let data = await callWedaApi({
         action: 'DescribeGeneralOptionsDetailList',
-        data: { OptNameList: [this.properties.enumName], PageIndex: 1, PageSize: 10 },
+        data: {
+          OptNameList: [this.properties.enumName],
+          PageIndex: 1,
+          PageSize: 10,
+        },
       });
       const config = destr(data?.Items?.[0]?.Config) ?? [];
-      const option = config.map(item => {
+      const option = config.map((item) => {
         return {
           label: item.value,
           value: item.key,
-          checked: false
+          checked: false,
         };
       });
       this.setData({ defaultRange: option });
@@ -103,7 +108,10 @@ Component({
   },
   observers: {
     range: function (range) {
-      if (this.properties.format !== 'x-enum') {
+      if (
+        this.properties.format !== 'x-enum' &&
+        !deepEqual(range, this.data.defaultRange)
+      ) {
         this.setData({ defaultRange: range });
       }
     },
@@ -111,6 +119,6 @@ Component({
       if (format === 'x-enum' && this.properties.enumName) {
         this._fetchData();
       }
-    }
+    },
   },
 });

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

@@ -1,25 +1,13 @@
-<formcell
-	className="{{cls}}" 
-	style="{{style}}"
-	label="{{labelVisible ? label : null}}"
-	layout="{{layout}}"
-	multiCell="{{true}}"
-	requiredFlag="{{requiredFlag}}"
->
-	<checkbox-group class="{{isFlex ? 'weui-flex__item' : ''}}" bindchange="change">
-		<label class="{{subCls}}" wx:for="{{defaultRange}}" wx:key="value">
-			<view class="weui-cell__hd">
-				<checkbox
-				 class="weui-check"
-				 value="{{item.value}}"
-				 checked="{{item.checked}}"
-				 disabled="{{disabled}}"
-				/>
-				<i class="weui-icon-checked" />
-			</view>
-			<view class="weui-cell__bd">
-				<view>{{item.label}}</view>
-			</view>
-		</label>
-	</checkbox-group>
-</formcell>
+<formcell className="{{cls}}" style="{{style}}" label="{{labelVisible ? label : null}}" layout="{{layout}}" multiCell="{{true}}" requiredFlag="{{requiredFlag}}">
+  <checkbox-group class="{{isFlex ? 'weui-flex__item' : ''}}" bindchange="change">
+    <label class="{{subCls}}" wx:for="{{defaultRange}}" wx:key="value">
+      <view class="weui-cell__hd">
+        <checkbox class="weui-check" value="{{item.value}}" checked="{{item.checked}}" disabled="{{disabled}}" />
+        <i class="weui-icon-checked" />
+      </view>
+      <view class="weui-cell__bd">
+        <view>{{item.label}}</view>
+      </view>
+    </label>
+  </checkbox-group>
+</formcell>

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

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

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

@@ -1,11 +1,11 @@
 <view class="{{className}}" style="{{style}}">
-	<view class="{{cls}}">
-		<view wx:if="{{!!label}}" class="weda-formcells__label weui-cell">
-			<label>{{label}}</label>
-			<label wx:if="{{requiredFlag}}" class="weda-formcells__flag">*</label>
-		</view>
-		<view class="weda-formcells__content {{isFlex ? 'weui-flex__item' : ''}}">
-			<slot></slot>
-		</view>
-	</view>
+  <view class="{{cls}}">
+    <view wx:if="{{!!label}}" class="weda-formcells__label weui-cell">
+      <label>{{label}}</label>
+      <label wx:if="{{requiredFlag}}" class="weda-formcells__flag">*</label>
+    </view>
+    <view class="weda-formcells__content {{isFlex ? 'weui-flex__item' : ''}}">
+      <slot></slot>
+    </view>
+  </view>
 </view>

package/src/mp/components/form/formcell/index.wxss

@@ -2,7 +2,7 @@
 
 .weda-formcells__flag {
   display: inline-block;
-  margin-right: 4px;
+  margin-left: 4px;
   font-family: SimSun;
   font-size: 12px;
   color: #f60;
@@ -11,12 +11,17 @@
 
 .weda-formcells.weui-flex .weda-formcells__label {
   width: 130px;
+  padding-bottom: 16px;
 }
 
 .weui-cells__group_form .weui-cell {
   padding: 16px 16px;
 }
 
+.weda-formcells .weda-formcells__label {
+  padding-bottom: 8px;
+}
+
 .weda-formcells__content.weui-flex__item .weui-cell_form {
   padding: 0;
 }

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

@@ -57,8 +57,8 @@ Component({
     },
     clearable: {
       type: Boolean,
-      value: true
-    }
+      value: true,
+    },
   },
   data: {
     isFlex: true,
@@ -74,7 +74,7 @@ Component({
     },
   },
   observers: {
-    'defaultValue': function (defaultValue) {
+    defaultValue: function (defaultValue) {
       this.setData({ value: defaultValue });
     },
   },
@@ -83,7 +83,7 @@ Component({
       this.setData({
         isFocus: true,
       });
-      this.triggerEvent('change', e.detail);
+      this.triggerEvent('focus', e.detail);
     },
     handleBlur: function (e) {
       this.setData({

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

@@ -1,31 +1,24 @@
-<formcell 
-	className="weda-ui weda-input {{className}}" 
-	style="{{style}}"
-	label="{{labelVisible ? label : null}}"
-	layout="{{layout}}"
-	multiCell="{{false}}"
-	requiredFlag="{{requiredFlag}}"
->
-	<view class="weui-cell weui-cell_active weui-cell_form}} {{disabled ? 'weui-cell_disabled' : ''}}">
-		<view class="weui-cell__bd weui-flex">
-			<input
-			 class="weui-input {{isFocus ? 'focus' : ''}} {{value ? 'not-placeholder-shown' : ''}}"
-			 type="{{type}}"
-			 placeholder="{{placeholder}}"
-			 placeholder-class="weui-input__placeholder"
-			 value="{{value}}"
-			 disabled="{{disabled}}"
-			 focus="{{focus}}"
-			 password="{{password}}"
-			 bindinput="handleChange"
-			 bindfocus="handleFocus"
-			 bindblur="handleBlur"
-			 bindconfirm="handleConfirm"
-			 maxlength="{{maxLength}}"
-			/>
-			<view wx:if="{{clearable}}" class="weui-btn_reset weui-btn_icon weui-btn_input-clear" bindtap="handleClear">
-				<i class="weui-icon-clear" />
-			</view>
-		</view>
-	</view>
-</formcell>
+<formcell className="weda-ui weda-input {{className}}" style="{{style}}" label="{{labelVisible ? label : null}}" layout="{{layout}}" multiCell="{{false}}" requiredFlag="{{requiredFlag}}">
+  <view class="weui-cell weui-cell_active weui-cell_form}} {{disabled ? 'weui-cell_disabled' : ''}}">
+    <view class="weui-cell__bd weui-flex">
+      <input
+        class="weui-input {{isFocus ? 'focus' : ''}} {{value ? 'not-placeholder-shown' : ''}}"
+        type="{{type}}"
+        placeholder="{{placeholder}}"
+        placeholder-class="weui-input__placeholder"
+        value="{{value}}"
+        disabled="{{disabled}}"
+        focus="{{focus}}"
+        password="{{password}}"
+        bindinput="handleChange"
+        bindfocus="handleFocus"
+        bindblur="handleBlur"
+        bindconfirm="handleConfirm"
+        maxlength="{{maxLength}}"
+      />
+      <view wx:if="{{clearable}}" class="weui-btn_reset weui-btn_icon weui-btn_input-clear" bindtap="handleClear">
+        <i class="weui-icon-clear" />
+      </view>
+    </view>
+  </view>
+</formcell>

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

@@ -4,13 +4,19 @@
 把weui-cell 的padding还回到input
 */
 .weda-ui .weui-input {
-    padding: 28rpx 0;
+  padding: 28rpx 0;
 }
 
 .weui-btn_input-clear {
-    align-self: center;
+  align-self: center;
+}
+.weda-ui.weda-input .weui-cell_form {
+  padding: 0 16px;
+}
+.weda-ui.weda-input .weui-flex__item .weui-cell_form {
+  padding: 0;
+  padding-right: 16px;
 }
-
 /**
  * END
  */

package/src/mp/components/form/location/components/mapChoose/index.json

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

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

@@ -2,7 +2,7 @@
 <view class="map-choose">
   <view class="map-choose-header">
     <view class="map-choose-header_title">选择地理位置</view>
-    <view class="cross" bindtap="comfirm" ></view>
+    <view class="cross" bindtap="comfirm"></view>
   </view>
   <view class="map-choose-body">
     <view class="map-choose-body-saerch {{isSearch?'map-choose-header_search_input_value':''}}">
@@ -18,18 +18,18 @@
     <view class="map-choose-search" wx:if="{{isSearch}}">
       <view class="map-choose-explore_ul map-choose-search_ul">
         <view class="map-choose-explore_li" wx:for="{{searchList}}" wx:key="index" data-location="{{item}}" bindtap="chooseSite" data-type="search">
-          <view class="map-choose-explore_li_con" style="font-size: 14px;">{{item.title}} </view>
-          <view class="map-choose-explore_li_con" style="color: rgb(146, 148, 150);">{{item.address}}</view>
+          <view class="map-choose-explore_li_con" style="font-size: 14px">{{item.title}} </view>
+          <view class="map-choose-explore_li_con" style="color: rgb(146, 148, 150)">{{item.address}}</view>
           <view class="map-choose-explore_li_arow" />
         </view>
       </view>
     </view>
     <view class="map-choose-explore" wx:if="{{!isSearch}}">
-      <map id="choose-map" longitude="{{choosedLocation.longitude}}" latitude="{{choosedLocation.latitude}}" scale="14" style="width: 100%; height: 200px;" bindregionchange="regionchange" markers="{{markers}}" ></map>
+      <map id="choose-map" longitude="{{choosedLocation.longitude}}" latitude="{{choosedLocation.latitude}}" scale="14" style="width: 100%; height: 200px" bindregionchange="regionchange" markers="{{markers}}"></map>
       <view class="map-choose-explore_ul">
         <view class="map-choose-explore_li {{choosedLocation.id==item.id?'map-choose-explore_li_choosed':''}} " wx:for="{{exploreList}}" wx:key="index" data-location="{{item}}" bindtap="chooseSite">
-          <view class="map-choose-explore_li_con" style="font-size: 14px;">{{item.title}} </view>
-          <view class="map-choose-explore_li_con" style="color: rgb(146, 148, 150);">{{item.address}}</view>
+          <view class="map-choose-explore_li_con" style="font-size: 14px">{{item.title}} </view>
+          <view class="map-choose-explore_li_con" style="color: rgb(146, 148, 150)">{{item.address}}</view>
           <view class="map-choose-explore_li_arow" />
         </view>
       </view>

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

@@ -57,6 +57,7 @@ Component({
         latitude: 39.98410411,
         longitude: 116.307503,
         poiname: '',
+        detailedAddress: '',
       },
     },
     locationType: {
@@ -69,6 +70,7 @@ Component({
         latitude: 22.540366,
         longitude: 113.934559,
         poiname: '深圳市南山区深南大道10000号腾讯大厦',
+        detailedAddress: '深圳市南山区深南大道10000号腾讯大厦',
       },
     },
   },
@@ -100,6 +102,7 @@ Component({
               latitude,
               longitude,
               poiname: '',
+              detailedAddress: '',
             };
             let marker = {
               id: 887,
@@ -230,6 +233,7 @@ Component({
       latitude: 39.98410411,
       longitude: 116.307503,
       poiname: '',
+      detailedAddress: '',
     },
     markers: [],
     isAddrShow: false,
@@ -279,6 +283,7 @@ Component({
             this.changeLocation({
               ...res,
               poiname: res.name,
+              detailedAddress: res.address,
             });
           }
         },
@@ -336,9 +341,10 @@ Component({
       this.changeValueFormat(value);
     },
     changeValueFormat(value) {
-      const { latitude, longitude, poiname } = value;
+      const { latitude, longitude, poiname, detailedAddress } = value;
       let location = {
         address: poiname,
+        detailedAddress,
         geopoint: {
           coordinates: [longitude, latitude],
           type: 'Point',

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

@@ -1,6 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "MapChoose":"./components/mapChoose/index"
+    "MapChoose": "./components/mapChoose/index"
   }
 }

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

@@ -2,24 +2,20 @@
 
 <view class="form-location">
   <view class="form-location-warp">
-    <view class="form-location-label form-location_cell" wx:if="{{labelVisible}}">
-      {{label}}
-    </view>
-    <view class="form-location-con form-location_cell" bindtap="chooseSite" data-value="{{true}}" >
+    <view class="form-location-label form-location_cell" wx:if="{{labelVisible}}"> {{label}} </view>
+    <view class="form-location-con form-location_cell" bindtap="chooseSite" data-value="{{true}}">
       <image class="form-location-con_img" src="https://qcloudimg.tencent-cloud.cn/raw/6542e1ce1dd36a90085b2eb979801df9.png"></image>
       <text class="form-location-con-text">选择地理位置</text>
     </view>
   </view>
   <view class="form-location-addr" wx:if="{{isAddrShow}}">
     <image wx:if="{{isAddrShow&&location.poiname}}" class="form-location-addr-image" src="https://qcloudimg.tencent-cloud.cn/raw/f9729e0b091f394110a6e12d3f4e7290.png" alt="" />
-    <view class="form-location-addr-box" >
+    <view class="form-location-addr-box">
       <view class="form-location-addr-title">{{location.poiname}}</view>
-      <view class="form-location-addr-lat" wx:if="{{showLngLat}}">
-        {{location.longitude}}N,{{location.latitude}}E
-      </view>
+      <view class="form-location-addr-lat" wx:if="{{showLngLat}}"> {{location.longitude}}N,{{location.latitude}}E </view>
     </view>
   </view>
-  <view style="padding-left: 32px;padding-right: 32px;margin-top: 8px;padding-bottom: 16px;" wx:if="{{showMap&&isAddrShow}}">
-    <map id="map" longitude="{{location.longitude}}" latitude="{{location.latitude}}" markers="{{markers}}" scale="16" enable-zoom="{{zoom}}" enable-scroll="{{drag}}"  style="width: 100%; height: 200px;"></map>
+  <view style="padding-left: 32px; padding-right: 32px; margin-top: 8px; padding-bottom: 16px" wx:if="{{showMap&&isAddrShow}}">
+    <map id="map" longitude="{{location.longitude}}" latitude="{{location.latitude}}" markers="{{markers}}" scale="16" enable-zoom="{{zoom}}" enable-scroll="{{drag}}" style="width: 100%; height: 200px"></map>
   </view>
 </view>

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

@@ -2,6 +2,7 @@ import classNames from '../../../utils/classnames';
 import destr from '../../../utils/destr';
 import handleEvents from '../../../utils/handleEvents';
 import { callWedaApi } from '../../../utils/tcb';
+import deepEqual from '../../../utils/deepEqual';
 
 Component({
   options: {
@@ -50,7 +51,7 @@ Component({
     enumName: {
       type: String,
       value: '',
-    }
+    },
   },
   data: {
     cls: '',
@@ -81,14 +82,18 @@ Component({
     _fetchData: async function () {
       let data = await callWedaApi({
         action: 'DescribeGeneralOptionsDetailList',
-        data: { OptNameList: [this.properties.enumName], PageIndex: 1, PageSize: 10 },
+        data: {
+          OptNameList: [this.properties.enumName],
+          PageIndex: 1,
+          PageSize: 10,
+        },
       });
       const config = destr(data?.Items?.[0]?.Config) ?? [];
-      const option = config?.map(item => {
+      const option = config?.map((item) => {
         return {
           label: item.value,
           value: item.key,
-          checked: false
+          checked: false,
         };
       });
       this.setData({ defaultRange: option });
@@ -103,7 +108,10 @@ Component({
   },
   observers: {
     range: function (range) {
-      if (this.properties.format !== 'x-enum') {
+      if (
+        this.properties.format !== 'x-enum' &&
+        !deepEqual(range, this.data.defaultRange)
+      ) {
         this.setData({ defaultRange: range });
       }
     },
@@ -111,6 +119,6 @@ Component({
       if (format === 'x-enum' && this.properties.enumName) {
         this._fetchData();
       }
-    }
+    },
   },
 });

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

@@ -1,25 +1,13 @@
-<formcell 
-	className="{{cls}}" 
-	style="{{style}}"
-	label="{{labelVisible ? label : null}}"
-	layout="{{layout}}"
-	multiCell="{{true}}"
-	requiredFlag="{{requiredFlag}}"
->
-	<radio-group class="{{isFlex ? 'weui-flex__item' : ''}}" bindchange="change">
-		<label class="{{subCls}}" wx:for="{{defaultRange}}" wx:key="value">
-			<view class="weui-cell__hd">
-				<radio
-				 class="weui-check"
-				 value="{{item.value}}"
-				 checked="{{item.checked}}"
-				 disabled="{{disabled}}"
-				/>
-				<i class="weui-icon-checked" />
-			</view>
-			<view class="weui-cell__bd">
-				<view>{{item.label}}</view>
-			</view>
-		</label>
-	</radio-group>
+<formcell className="{{cls}}" style="{{style}}" label="{{labelVisible ? label : null}}" layout="{{layout}}" multiCell="{{true}}" requiredFlag="{{requiredFlag}}">
+  <radio-group class="{{isFlex ? 'weui-flex__item' : ''}}" bindchange="change">
+    <label class="{{subCls}}" wx:for="{{defaultRange}}" wx:key="value">
+      <view class="weui-cell__hd">
+        <radio class="weui-check" value="{{item.value}}" checked="{{item.checked}}" disabled="{{disabled}}" />
+        <i class="weui-icon-checked" />
+      </view>
+      <view class="weui-cell__bd">
+        <view>{{item.label}}</view>
+      </view>
+    </label>
+  </radio-group>
 </formcell>