@cloudbase/weda-ui 2.0.11 → 2.0.27

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

@@ -10,7 +10,13 @@
 .weui-btn_input-clear {
   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

@@ -5,78 +5,31 @@
     <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':''}}"
-    >
+    <view class="map-choose-body-saerch {{isSearch?'map-choose-header_search_input_value':''}}">
       <view class="map-choose-header_search_input">
-        <input
-          type="text"
-          value="{{searchValue}}"
-          bindinput="changeInput"
-          bindfocus="focusInput"
-        />
+        <input type="text" value="{{searchValue}}" bindinput="changeInput" bindfocus="focusInput" />
         <view class="map-choose-header_search_place" wx:if="{{!isSearch}}">
-          <image
-            src="https://qcloudimg.tencent-cloud.cn/raw/388c48cdcbe9ca07f5682fb10d05ebdd.png"
-          ></image>
+          <image src="https://qcloudimg.tencent-cloud.cn/raw/388c48cdcbe9ca07f5682fb10d05ebdd.png"></image>
           <text>搜索地点</text>
         </view>
       </view>
-      <view
-        class="map-choose-header_search_input_cancle"
-        wx:if="{{isSearch}}"
-        bindtap="cancleSearch"
-        >取消</view
-      >
+      <view class="map-choose-header_search_input_cancle" wx:if="{{isSearch}}" bindtap="cancleSearch">取消</view>
     </view>
     <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" 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_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 {{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_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,56 +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}}"
-    >
-      <image
-        class="form-location-con_img"
-        src="https://qcloudimg.tencent-cloud.cn/raw/6542e1ce1dd36a90085b2eb979801df9.png"
-      ></image>
+    <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=""
-    />
+    <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-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: {
@@ -107,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 });
       }
     },

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

@@ -1,20 +1,8 @@
-<formcell
-  className="{{cls}}"
-  style="{{style}}"
-  label="{{labelVisible ? label : null}}"
-  layout="{{layout}}"
-  multiCell="{{true}}"
-  requiredFlag="{{requiredFlag}}"
->
+<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}}"
-        />
+        <radio class="weui-check" value="{{item.value}}" checked="{{item.checked}}" disabled="{{disabled}}" />
         <i class="weui-icon-checked" />
       </view>
       <view class="weui-cell__bd">

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

@@ -374,9 +374,9 @@ Component({
       if (records && records.length !== 0 && primaryField) {
         const option = records.map((item) => {
           return {
-            label: item[primaryField],
+            label: item[primaryField] || item._id,
             value: item._id,
-            name: item[primaryField],
+            name: item[primaryField] || item._id,
           };
         });
         this.setData({ selectRange: option.map((item) => item.label), option });

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

@@ -1,40 +1,10 @@
-<formcell
-  className="{{cls}}"
-  style="{{style}}"
-  label="{{labelVisible ? label : null}}"
-  layout="{{layout}}"
-  multiCell="{{false}}"
-  requiredFlag="{{requiredFlag}}"
->
+<formcell className="{{cls}}" style="{{style}}" label="{{labelVisible ? label : null}}" layout="{{layout}}" multiCell="{{false}}" requiredFlag="{{requiredFlag}}">
   <view class="{{subCls}}">
     <view class="weui-cell__bd">
-      <picker
-        wx:if="{{mode!='mutiRegion'}}"
-        class="weui-picker__group weui-input"
-        bindchange="onChange"
-        bindcancel="onCancel"
-        mode="{{mode}}"
-        range="{{selectRange}}"
-        disabled="{{disabled}}"
-        start="{{start}}"
-        end="{{end}}"
-        disabled="{{disabled}}"
-        value="{{value}}"
-        fields="{{dateMode}}"
-      >
+      <picker wx:if="{{mode!='mutiRegion'}}" class="weui-picker__group weui-input" bindchange="onChange" bindcancel="onCancel" mode="{{mode}}" range="{{selectRange}}" disabled="{{disabled}}" start="{{start}}" end="{{end}}" disabled="{{disabled}}" value="{{value}}" fields="{{dateMode}}">
         <label class="{{displayCls}}">{{displayValue}}</label>
       </picker>
-      <picker
-        wx:if="{{mode=='mutiRegion'}}"
-        mode="multiSelector"
-        disabled="{{disabled}}"
-        range="{{multiArray}}"
-        range-key="value"
-        bindcolumnchange="columnchange"
-        value="{{multiIndex}}"
-        bindchange="onChange"
-        class="weui-picker__group weui-input"
-      >
+      <picker wx:if="{{mode=='mutiRegion'}}" mode="multiSelector" disabled="{{disabled}}" range="{{multiArray}}" range-key="value" bindcolumnchange="columnchange" value="{{multiIndex}}" bindchange="onChange" class="weui-picker__group weui-input">
         <label class="{{displayCls}}">{{displayValue}}</label>
       </picker>
     </view>

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

@@ -5,3 +5,12 @@
 .weda-ui .weui-flex__item .weui-cell.weui-check__label {
   padding-left: 0;
 }
+
+.weda-ui.weda-select .weui-cell_form {
+  padding: 0 16px;
+}
+
+.weda-ui.weda-select .weui-flex__item .weui-cell_form {
+  padding: 0;
+  padding-right: 16px;
+}

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

@@ -1,20 +1,9 @@
-<formcell
-  className="{{cls}}"
-  style="{{style}}"
-  label="{{labelVisible ? label : null}}"
-  layout="{{layout}}"
-  multiCell="{{false}}"
-  requiredFlag="{{requiredFlag}}"
->
+<formcell className="{{cls}}" style="{{style}}" label="{{labelVisible ? label : null}}" layout="{{layout}}" multiCell="{{false}}" requiredFlag="{{requiredFlag}}">
   <view class="{{subCls}}">
     <view wx:if="{{isFlex}}" class="weui-cell__bd" />
     <view class="{{ isFlex? 'weui-cell__ft' : 'weui-cell__bd'}}">
       <label class="weui-switch-cp">
-        <switch
-          class="weui-switch-cp__input"
-          checked="{{checked}}"
-          bindchange="change"
-        />
+        <switch class="weui-switch-cp__input" checked="{{checked}}" bindchange="change" />
         <view class="weui-switch-cp__box" />
       </label>
     </view>

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

@@ -80,5 +80,11 @@ Component({
       this.setData({ value: e.detail.value });
       this.triggerEvent('change', e.detail);
     },
+    handleFocus: function (e) {
+      this.triggerEvent('focus', e.detail);
+    },
+    handleBlur: function (e) {
+      this.triggerEvent('blur', e.detail);
+    },
   },
 });

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

@@ -1,27 +1,8 @@
-<formcell
-  className="{{cls}}"
-  style="{{style}}"
-  label="{{labelVisible ? label : null}}"
-  layout="{{layout}}"
-  multiCell="{{true}}"
-  requiredFlag="{{requiredFlag}}"
->
-  <view
-    class="weui-cell weui-cell_active weui-cell_form}} {{disabled ? 'weui-cell_disabled' : ''}}"
-  >
+<formcell className="{{cls}}" style="{{style}}" label="{{labelVisible ? label : null}}" layout="{{layout}}" multiCell="{{true}}" requiredFlag="{{requiredFlag}}">
+  <view class="weui-cell weui-cell_active weui-cell_form}} {{disabled ? 'weui-cell_disabled' : ''}}">
     <view class="weui-cell__bd">
-      <textarea
-        class="weui-textarea"
-        placeholder="{{placeholder}}"
-        placeholder-class="weui-input__placeholder"
-        bindinput="handleChange"
-        value="{{value}}"
-        disable="{{disabled}}"
-        maxlength="{{maxLength}}"
-      ></textarea>
-      <view wx:if="{{counterVisible}}" class="weui-textarea-counter"
-        ><span>{{!!value ? value.length : 0}}</span>/{{maxLength}}</view
-      >
+      <textarea class="weui-textarea" placeholder="{{placeholder}}" placeholder-class="weui-input__placeholder" bindinput="handleChange" value="{{value}}" disable="{{disabled}}" maxlength="{{maxLength}}" bindfocus="handleFocus" bindblur="handleBlur"></textarea>
+      <view wx:if="{{counterVisible}}" class="weui-textarea-counter"><span>{{!!value ? value.length : 0}}</span>/{{maxLength}}</view>
     </view>
   </view>
 </formcell>

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

@@ -3,3 +3,8 @@
 .weda-ui .weda-textarea .weui-cell_form {
   padding: 16px;
 }
+
+.weda-ui .weda-textarea .weui-flex__item .weui-cell_form {
+  padding: 16px;
+  padding-left: 0;
+}

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

@@ -1,23 +1,5 @@
-<view
-  class="weda-ui weui-cells weui-cells_form {{className}}"
-  id="{{id}}"
-  style="{{style}}"
->
-  <mp-uploader
-    max-size="{{maxSize  * 1024 * 1024}}"
-    files="{{files}}"
-    title="{{title}}"
-    showDelete="{{true}}"
-    ext-class="{{layout}}"
-    bindfail="uploadError"
-    bindsuccess="uploadSuccess"
-    layout="{{layout}}"
-    select="{{selectFile}}"
-    upload="{{uploadFile}}"
-    maxCount="{{maxCount}}"
-    binddelete="onDelete"
-  >
-  </mp-uploader>
+<view class="weda-ui weui-cells weui-cells_form {{className}}" id="{{id}}" style="{{style}}">
+  <mp-uploader max-size="{{maxSize  * 1024 * 1024}}" files="{{files}}" title="{{title}}" showDelete="{{true}}" ext-class="{{layout}}" bindfail="uploadError" bindsuccess="uploadSuccess" layout="{{layout}}" select="{{selectFile}}" upload="{{uploadFile}}" maxCount="{{maxCount}}" binddelete="onDelete"> </mp-uploader>
 </view>
 
 <!-- uploader delete 实际代码接受 showDelete

package/src/mp/components/form/uploader/weui-uploader.json

@@ -1,7 +1,7 @@
 {
-    "component": true,
-    "usingComponents": {
-        "mp-gallery": "weui-miniprogram/gallery/gallery"
-    },
-    "styleIsolation": "shared"
-}
+  "component": true,
+  "usingComponents": {
+    "mp-gallery": "weui-miniprogram/gallery/gallery"
+  },
+  "styleIsolation": "shared"
+}

package/src/mp/components/form/uploader/weui-uploader.wxml

@@ -4,9 +4,7 @@
       <block wx:if="{{layout === 'horizontal'}}">
         <view class="">
           <view class="weui-uploader__title">{{title}}</view>
-          <view class="weui-uploader__info" wx:if="{{maxCount > 1}}"
-            >{{currentFiles.length}}/{{maxCount}}</view
-          >
+          <view class="weui-uploader__info" wx:if="{{maxCount > 1}}">{{currentFiles.length}}/{{maxCount}}</view>
         </view>
         <label wx:if="{{true}}" class="weda-formcells__flag">*</label>
       </block>
@@ -15,74 +13,33 @@
           <view class="weui-uploader__title">{{title}}</view>
           <label wx:if="{{true}}" class="weda-formcells__flag">*</label>
         </view>
-        <view class="weui-uploader__info" wx:if="{{maxCount > 1}}"
-          >{{currentFiles.length}}/{{maxCount}}</view
-        >
+        <view class="weui-uploader__info" wx:if="{{maxCount > 1}}">{{currentFiles.length}}/{{maxCount}}</view>
       </block>
     </view>
   </view>
   <view class="weui-uploader__bd">
     <view class="weui-uploader__files">
       <block wx:for="{{currentFiles}}" wx:key="*this">
-        <view
-          wx:if="{{item.error}}"
-          data-index="{{index}}"
-          bindtap="previewImage"
-          class="weui-uploader__file weui-uploader__file_status"
-        >
-          <image
-            class="weui-uploader__img"
-            src="{{item.url}}"
-            mode="aspectFill"
-          />
+        <view wx:if="{{item.error}}" data-index="{{index}}" bindtap="previewImage" class="weui-uploader__file weui-uploader__file_status">
+          <image class="weui-uploader__img" src="{{item.url}}" mode="aspectFill" />
           <view class="weui-uploader__file-content">
             <icon type="warn" size="23" color="#F43530"></icon>
           </view>
         </view>
-        <view
-          wx:elif="{{item.loading}}"
-          data-index="{{index}}"
-          bindtap="previewImage"
-          class="weui-uploader__file weui-uploader__file_status"
-        >
-          <image
-            class="weui-uploader__img"
-            src="{{item.url}}"
-            mode="aspectFill"
-          />
+        <view wx:elif="{{item.loading}}" data-index="{{index}}" bindtap="previewImage" class="weui-uploader__file weui-uploader__file_status">
+          <image class="weui-uploader__img" src="{{item.url}}" mode="aspectFill" />
           <view class="weui-uploader__file-content">
             <view class="weui-loading"></view>
           </view>
         </view>
-        <view
-          wx:else
-          class="weui-uploader__file"
-          data-index="{{index}}"
-          bindtap="previewImage"
-        >
-          <image
-            class="weui-uploader__img"
-            src="{{item.url}}"
-            mode="aspectFill"
-          />
+        <view wx:else class="weui-uploader__file" data-index="{{index}}" bindtap="previewImage">
+          <image class="weui-uploader__img" src="{{item.url}}" mode="aspectFill" />
         </view>
       </block>
     </view>
-    <view
-      wx:if="{{currentFiles.length < maxCount}}"
-      class="weui-uploader__input-box"
-      hover-class="weui-active"
-    >
+    <view wx:if="{{currentFiles.length < maxCount}}" class="weui-uploader__input-box" hover-class="weui-active">
       <view class="weui-uploader__input" bindtap="chooseImage"></view>
     </view>
   </view>
-  <mp-gallery
-    class="gallery"
-    hide-on-click="{{true}}"
-    show-delete="{{showDelete}}"
-    show="{{showPreview}}"
-    binddelete="deletePic"
-    img-urls="{{previewImageUrls}}"
-    current="{{previewCurrent}}"
-  ></mp-gallery>
+  <mp-gallery class="gallery" hide-on-click="{{true}}" show-delete="{{showDelete}}" show="{{showPreview}}" binddelete="deletePic" img-urls="{{previewImageUrls}}" current="{{previewCurrent}}"></mp-gallery>
 </view>