mali-applet-ui 0.1.25 → 0.1.26

package/components/ml-province-city-picker/ml-province-city-picker.vue

@@ -2,13 +2,13 @@
 	<view v-if="isFromReadonly" class="ml-province-city-picker is-readonly">
 		<view class="ml-province-city-picker-readonly-content">{{ selectLabel }}</view>
 	</view>
-  <view v-else class="ml-province-city-picker" :class="[className || '', {'is-border': border, 'is-clear': value !== null}]">
+  <view v-else class="ml-province-city-picker" :class="[className || '', {'is-border': border, 'is-clear': (value ? (value.length || province) : province)}]">
     <view class="ml-province-city-picker-warpper" @click="openPopup()">
       <view class="ml-province-city-picker-text">
-        <text v-if="value !== null">{{ selectLabel }}</text>
+        <text v-if="(value ? (value.length || province) : province)">{{ selectLabel }}</text>
         <text v-else class="picker-placeholder">{{ placeholder }}</text>
       </view>
-      <view v-if="clearable && value !== null" class="ml-province-city-picker-clear-icon" @click.stop="clearEvent">
+      <view v-if="clearable && (value ? (value.length || province) : province)" class="ml-province-city-picker-clear-icon" @click.stop="clearEvent">
         <ml-icon name="delete-filling"></ml-icon>
       </view>
       <view v-else class="ml-province-city-picker-icon">
@@ -77,7 +77,10 @@ export default {
       const provinceItem = this.provinceList.find(item => item[this.optValueField] === province)
       const cityItem = provinceItem && provinceItem.children? provinceItem.children.find(item => item[this.optValueField] === city) : null
       if (provinceItem) {
-        return [provinceItem ? provinceItem[this.optLabelField] : '', cityItem ? cityItem[this.optLabelField] : ''].join(' / ')
+        if (cityItem) {
+          return [provinceItem[this.optLabelField] || '', cityItem[this.optLabelField] || ''].join(' / ')
+        }
+        return provinceItem[this.optLabelField] || ''
       }
       return ''
     },
@@ -122,6 +125,16 @@ export default {
     changeEvent (e) {
       this.selectVals = e.detail.value
     },
+    clearEvent () {
+      const value = ['', '']
+      this.selectVals = [0]
+      this.$emit('update:province', value[0])
+      this.$emit('update:city', value[1])
+      this.$emit('input', value)
+      this.$emit('change', { value })
+      this.$emit('clear', { value })
+      this.closePopup()
+    },
     confirmEvent () {
       const value = [this.selectProvinceValue, this.selectCityValue]
       this.$emit('update:province', value[0])
@@ -171,7 +184,7 @@ export default {
     border-radius: 0 10rpx 10rpx 0;
   }
   .ml-province-city-picker-icon {
-    width: 60rpx;
+    width: 34rpx;
     display: flex;
     flex-shrink: 0;
     align-items: center;

package/components/ml-select-picker/ml-select-picker.vue

@@ -139,7 +139,7 @@ export default {
   white-space: nowrap;
 }
 .ml-select-picker-clear-icon {
-  width: 60rpx;
+  width: 34rpx;
   display: flex;
   flex-shrink: 0;
   align-items: center;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mali-applet-ui",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "码里云小程序组件库",
   "files": [
     "components",