@10yun/cv-mobile-ui 0.5.3 → 0.5.4

package/ui-cv/cv-radio-opt-base/cv-radio-opt-base.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="cv-radio-opt-base">
     <label class="cv-radio-opt__label">
-      <radio :value="localVal" :checked="checked" style="transform: scale(0.7)" />
+      <radio :value="localVal" :checked="localChecked" style="transform: scale(0.7)" />
       <view>
         <slot>{{ label }}</slot>
       </view>
@@ -27,18 +27,52 @@ export default {
   },
   data() {
     return {
-      localVal: ''
+      localVal: '',
+      localChecked: false,
+      parentObj: null
     };
   },
   watch: {
     value(newVal) {
       this.localVal = String(newVal);
+    },
+    checked(newVal) {
+      this.localChecked = newVal;
+    },
+    'parentObj.localVal'(newVal) {
+      // console.log('----', newVal);
+      this.localChecked = newVal == this.value ? true : false;
     }
   },
   created() {
     this.localVal = String(this.value);
+    this.localChecked = this.checked;
+  },
+  mounted() {
+    this.parentObj = this.getParent();
   },
-  methods: {}
+  methods: {
+    funcOnClick() {
+      // let parentObj = this.getParent();
+      // console.log(parentObj.$children);
+      // let { value } = parentObj;
+      // console.log(value, this.localVal);
+      // this.localChecked = newVal == this.value ? true : false;
+    },
+    /**
+     * 获取父元素实例
+     */
+    getParent(name = 'cvRadioGroup') {
+      let parent = this.$parent;
+      let parentName = parent.$options.name;
+      while (parentName !== name) {
+        parent = parent.$parent;
+        if (!parent) return false;
+        parentName = parent.$options.name;
+      }
+      return parent;
+    }
+  }
 };
 </script>
 

package/ui-cv/cv-radio-opt-tag/cv-radio-opt-tag.vue

@@ -39,7 +39,7 @@ export default {
     checked(newVal) {
       this.localChecked = newVal;
     },
-    'parentObj.value'(newVal) {
+    'parentObj.localVal'(newVal) {
       // console.log('----', newVal);
       this.localChecked = newVal == this.value ? true : false;
     }

package/ui-cv/cv-rate/cv-rate.vue

@@ -25,6 +25,15 @@ export default {
     }
   },
   props: {
+    // 当前评分
+    value: {
+      type: [Number, String],
+      default: 1
+    },
+    modelValue: {
+      type: [Number, String],
+      default: 1
+    },
     isFill: {
       // 星星的类型，是否镂空
       type: [Boolean, String],
@@ -45,11 +54,6 @@ export default {
       type: [Number, String],
       default: 24
     },
-    value: {
-      // 当前评分
-      type: [Number, String],
-      default: 1
-    },
     max: {
       // 最大评分
       type: [Number, String],
@@ -97,6 +101,7 @@ export default {
       let value = e.target.dataset.value;
       this.locaValue = value;
       this.$emit('input', value);
+      this.$emit('update:modelValue', value);
     }
   }
 };

package/ui-cv/cv-search/cv-search.vue

@@ -39,7 +39,11 @@ export default {
   },
   props: {
     value: {
-      type: String,
+      type: [Number, String],
+      default: ''
+    },
+    modelValue: {
+      type: [Number, String],
       default: ''
     },
     placeholder: {
@@ -72,6 +76,7 @@ export default {
       /* 判断是否禁止实时更新父级数据 */
       if (this.disableRealTime === false) {
         this.$emit('input', this.localVal);
+        this.$emit('update:modelValue', this.localVal);
       }
     },
     onEmpty() {
@@ -81,6 +86,7 @@ export default {
     onSearch() {
       this.$emit('search', this.localVal);
       this.$emit('input', this.localVal);
+      this.$emit('update:modelValue', this.localVal);
     }
   }
 };

package/ui-cv/cv-switch/cv-switch.vue

@@ -13,14 +13,17 @@ export default {
     }
   },
   props: {
+    value: {
+      type: [Number, String, Boolean],
+      default: 0
+    },
+    modelValue: {
+      type: [Number, String, Boolean],
+      default: 0
+    },
     disabled: {
       type: Boolean,
       default: false
-    },
-    //默认输入框内容
-    value: {
-      type: [String, Number, Boolean],
-      default: 0
     }
   },
   data() {
@@ -33,29 +36,40 @@ export default {
   },
   watch: {
     value(newVal) {
+      this.localVal = newVal;
+      this._dealDataList();
+    },
+    modelValue(newVal) {
+      this.localVal = newVal;
       this._dealDataList();
     }
   },
   created() {
+    this.localVal = this.doValueGet();
     this._dealDataList();
   },
   methods: {
+    doValueGet() {
+      if (this.value === '') return this.modelValue;
+      if (this.modelValue === '') return this.value;
+      return this.value;
+    },
     /* 整理数据 */
     _dealDataList() {
-      this.dataType = typeof this.value;
+      this.dataType = typeof this.localVal;
       switch (this.dataType) {
         case 'boolean':
-          this.checked = this.value;
+          this.checked = this.localVal;
           break;
         case 'number':
-          if (this.value === 1) {
+          if (this.localVal === 1) {
             this.checked = true;
           } else {
             this.checked = false;
           }
           break;
         case 'string':
-          if (this.value === '1') {
+          if (this.localVal === '1') {
             this.checked = true;
           } else {
             this.checked = false;
@@ -88,6 +102,7 @@ export default {
           break;
       }
       this.$emit('input', this.localVal);
+      this.$emit('update:modelValue', this.localVal);
     }
   }
 };

package/ui-cv/cv-textarea/cv-textarea.vue

@@ -33,17 +33,21 @@ export default {
   },
   props: {
     value: {
-      type: String,
+      type: [Number, String],
       default: ''
     },
-    maxlength: {
+    modelValue: {
       type: [Number, String],
-      default: -1
+      default: ''
     },
     placeholder: {
       type: [String],
       default: '请输入文本'
     },
+    maxlength: {
+      type: [Number, String],
+      default: -1
+    },
     clearable: {
       type: Boolean,
       default: false
@@ -53,7 +57,6 @@ export default {
       default: true
     }
   },
-
   data() {
     return {
       localVal: '',
@@ -64,15 +67,25 @@ export default {
     value(newVal) {
       this.localVal = newVal;
       this.tempLength = this.localVal.length;
+    },
+    modelValue(newVal) {
+      this.localVal = newVal;
+      this.tempLength = this.localVal.length;
     }
   },
   created() {
-    this.localVal = this.value;
+    this.localVal = this.doValueGet();
   },
   methods: {
+    doValueGet() {
+      if (this.value === '') return this.modelValue;
+      if (this.modelValue === '') return this.value;
+      return this.value;
+    },
     funcOnInput(e) {
       this.tempLength = this.localVal.length;
       this.$emit('input', this.localVal);
+      this.$emit('update:modelValue', this.localVal);
     },
     /* 监听自己清除按钮点击事件 */
     onEmpty() {

package/ui-cv/cv-time-base/cv-time-base.vue

@@ -17,9 +17,7 @@
 </template>
 
 <script>
-import MixinsPicker from '../mixins/mixins-picker.js';
 export default {
-  mixins: [MixinsPicker],
   name: 'cvPickerTime',
   props: {
     //默认输入框
@@ -27,6 +25,10 @@ export default {
       type: String,
       default: ''
     },
+    modelValue: {
+      type: String,
+      default: ''
+    },
     startTime: {
       type: String,
       default: ''
@@ -34,6 +36,19 @@ export default {
     endTime: {
       type: String,
       default: ''
+    },
+    // 占位符
+    placeholder: {
+      type: String,
+      default: '请选择'
+    }
+  },
+  watch: {
+    value(newVal) {
+      this.localVal = newVal;
+    },
+    modelValue(newVal) {
+      this.localVal = newVal;
     }
   },
   data() {
@@ -43,13 +58,25 @@ export default {
     };
   },
   created() {
-    this.localVal = this.value;
+    this.localVal = this.doValueGet();
   },
   methods: {
+    doValueGet() {
+      if (this.value === '') return this.modelValue;
+      if (this.modelValue === '') return this.value;
+      return this.value;
+    },
     bindTimeChange: function (e) {
       this.localVal = e.detail.value;
+      this.iconTop = false;
       this.$emit('input', this.localVal);
+      this.$emit('update:modelValue', this.localVal);
+    },
+    bindPickerCancel() {
       this.iconTop = false;
+    },
+    changeIconTop() {
+      this.iconTop = true;
     }
   }
 };

package/ui-cv/cv-treaty/cv-treaty.vue

@@ -3,7 +3,7 @@
     <view class="cv-treaty-item">
       <label class="cv-treaty-label">
         <checkbox-group class="cv-treaty-item-group" @change="hindChange">
-          <checkbox value="true" :checked="vModel" :disabled="disabled" style="transform: scale(0.7)" />
+          <checkbox value="true" :checked="localVal" :disabled="disabled" style="transform: scale(0.7)" />
           {{ explain }}
         </checkbox-group>
       </label>
@@ -18,6 +18,18 @@
 export default {
   name: 'cvTreaty',
   props: {
+    value: {
+      type: Boolean,
+      default: false
+    },
+    modelValue: {
+      type: Boolean,
+      default: false
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     explain: {
       type: String,
       default: '我已阅读'
@@ -29,28 +41,21 @@ export default {
     url: {
       type: String,
       default: ''
-    },
-    value: {
-      type: Boolean,
-      default: false
-    },
-    disabled: {
-      type: Boolean,
-      default: false
     }
   },
   data() {
     return {
-      vModel: false
+      localVal: false
     };
   },
   created() {
-    this.vModel = this.value;
+    this.localVal = this.value;
   },
   methods: {
     hindChange(e) {
-      this.vModel = e.detail.value[0] ? true : false;
-      this.$emit('input', this.vModel);
+      this.localVal = e.detail.value[0] ? true : false;
+      this.$emit('input', this.localVal);
+      this.$emit('update:modelValue', this.localVal);
     },
     handleClick() {
       if (this.url) {

package/ui-cv/cv-upload-avatar/cv-upload-avatar.vue

@@ -10,6 +10,14 @@
 export default {
   name: 'cvUploadAvatar',
   props: {
+    value: {
+      type: [Number, String],
+      default: ''
+    },
+    modelValue: {
+      type: [Number, String],
+      default: ''
+    },
     label: {
       type: String,
       default: '当前头像'
@@ -19,11 +27,6 @@ export default {
       type: String,
       default: '请输入'
     },
-    //默认输入框
-    value: {
-      type: [Number, String],
-      default: ''
-    },
     maxlength: {
       type: [Number, String],
       default: -1
@@ -55,6 +58,9 @@ export default {
     value(newVal) {
       this.localVal = newVal;
     },
+    modelValue(newVal) {
+      this.localVal = newVal;
+    },
     src(newVal) {
       this.localSrc = newVal;
     }
@@ -96,6 +102,7 @@ export default {
           this.localVal = resData.save_url;
           this.localSrc = resData.img_cdn;
           this.$emit('input', this.localVal);
+          this.$emit('update:modelValue', this.localVal);
         }
       });
     }

package/ui-cv/cv-upload-image/cv-upload-image.vue

@@ -80,6 +80,18 @@ export default {
   name: 'cvUploadImg',
   components: {},
   props: {
+    value: {
+      type: [Array, Object, String],
+      default() {
+        return [];
+      }
+    },
+    modelValue: {
+      type: [Array, Object, String],
+      default() {
+        return [];
+      }
+    },
     uploadTitle: {
       type: [String],
       default: ''
@@ -100,12 +112,6 @@ export default {
       }
     },
     //默认输入框
-    value: {
-      type: [Array, Object, String],
-      default() {
-        return [];
-      }
-    },
     src: {
       type: [Array, Object, String],
       default(newVal) {
@@ -165,6 +171,9 @@ export default {
     value(newVal) {
       this.localVal = newVal;
     },
+    modelValue(newVal) {
+      this.localVal = newVal;
+    },
     src(newVal) {
       this.localSrc = this._dealSrc(newVal);
       this._dealNum();
@@ -309,8 +318,9 @@ export default {
             this.localSrc.push(resData.img_cdn);
             this.localVal = resData.img_time;
           }
-          this.$emit('input', this.localVal);
           // this.$forceUpdate();
+          this.$emit('input', this.localVal);
+          this.$emit('update:modelValue', this.localVal);
         })
         .catch((err) => {
           uni.hideLoading();
@@ -350,6 +360,7 @@ export default {
       return new Promise((resolve, reject) => {
         this._chooseImage();
         // this.$emit('input', this.localVal);
+        // this.$emit('update:modelValue', this.localVal);
       });
     }
   }

package/ui-cv/cv-input-btn/cv-input-btn.vue

@@ -1,124 +0,0 @@
-<template>
-  <view class="cv-code-area">
-    <view class="cv-code-input-area" v-bind:style="inputAreaStyle">
-      <input
-        class="cv-code-input-item"
-        placeholder-class="cv-code-input-item-placeholder"
-        v-model="localVal"
-        :maxlength="maxlength"
-        :placeholder="placeholder"
-        @input="funcOnInput"
-        @blur="onBlur"
-      />
-    </view>
-    <view class="cv-code-button-area" v-bind:style="buttonAreaStyle">
-      <button
-        size="mini"
-        class="cv-code-button-item"
-        :class="btnDisabled ? 'cv-code-button-wait' : ''"
-        :disabled="btnDisabled"
-        @tap="click"
-      >
-        {{ btnText }}
-      </button>
-    </view>
-  </view>
-</template>
-<script>
-export default {
-  name: 'cvInputBtn',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
-  props: {
-    placeholder: {
-      type: String,
-      default: ''
-    },
-    maxlength: {
-      type: [Number, String],
-      default: -1
-    },
-    value: {
-      type: [Number, String],
-      default: ''
-    },
-    btnText: {
-      type: String,
-      default: '发送'
-    },
-    btnWidth: {
-      type: Number,
-      default: 80
-    },
-    btnDisabled: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      localVal: '',
-      buttonAreaStyle: '',
-      inputAreaStyle: ''
-    };
-  },
-  watch: {
-    value(newVal) {
-      this.localVal = newVal;
-    }
-  },
-  created() {
-    this.localVal = this.value;
-    this._initStyle();
-  },
-  methods: {
-    click(e) {
-      if (this.btnDisabled) {
-        return;
-      }
-      this.$emit('click', e);
-    },
-    funcOnInput(e) {
-      this.$emit('input', this.localVal);
-    },
-    _initStyle() {
-      this.buttonAreaStyle = 'width:' + this.btnWidth + 'px;';
-      this.inputAreaStyle = 'width:calc(100% - ' + this.btnWidth + 'px - 10px);';
-    }
-  }
-};
-</script>
-
-<style>
-.cv-code-area {
-  height: 36px;
-  display: flex;
-  justify-content: space-evenly;
-  align-items: center;
-  flex-direction: row;
-}
-.cv-code-input-area {
-  width: calc(100% - 80px - 10px);
-}
-.cv-code-input-item {
-  height: 35px;
-  /* line-height: 35px; */
-}
-.cv-code-input-item-placeholder {
-  font-size: 12px;
-}
-.cv-code-button-area {
-  width: 80px;
-  display: flex;
-}
-.cv-code-button-item {
-  font-size: 12px;
-  background-color: #007aff;
-  color: #ffffff;
-}
-</style>

package/ui-cv/mixins/mixins-input.js

@@ -1,75 +0,0 @@
-let MixinsInput = {
-  mixins: [],
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
-  props: {
-    value: {
-      type: [Number, String],
-      default: ''
-    },
-    placeholder: {
-      type: [String],
-      default: '请输入'
-    },
-    clearable: {
-      type: [Boolean],
-      default: false
-    },
-    maxlength: {
-      type: [Number, String],
-      default: -1
-    },
-    disabled: {
-      type: [Boolean],
-      default: false
-    }
-  },
-  watch: {
-    value(newVal) {
-      this.localVal = newVal;
-    }
-  },
-  data() {
-    return {
-      localStyle: '',
-      localVal: ''
-    };
-  },
-  created() {
-    this.localVal = this.value;
-  },
-  mounted() {
-    this._itemStyle();
-  },
-  methods: {
-    _itemStyle() {
-      /* 计算输入框右侧预留空间 */
-      let paddingRight = 0;
-      if (this.$slots['append']) {
-        paddingRight += 20;
-      }
-      if (this.clearable) {
-        paddingRight += 30;
-      }
-      this.localStyle = 'margin-right:' + paddingRight + 'px;';
-    },
-    onBlur(e) {
-      this.localVal = e.detail.value;
-      this.funcOnInput();
-    },
-    funcOnInput(e) {
-      this.$emit('input', this.localVal);
-    },
-    /* 监听自己清除按钮点击事件 */
-    onEmpty() {
-      this.localVal = '';
-      this.funcOnInput();
-    }
-  }
-};
-export default MixinsInput;