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

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) {
@@ -130,7 +136,7 @@ export default {
         return {};
       }
     },
-    upApiFunc: {
+    apiFunc: {
       type: Function,
       default: null
     },
@@ -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();
@@ -288,7 +297,7 @@ export default {
       );
 
       //将本地资源上传到开发者服务器，客户端发起一个 POST 请求，其中 content-type 为 multipart/form-data。
-      this.upApiFunc({
+      this.apiFunc({
         //要上传文件资源的路径。
         filePath: tempFilePaths,
         //文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容
@@ -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();
@@ -336,7 +346,7 @@ export default {
       });
     },
     imgChoose() {
-      if (!this.upApiFunc) {
+      if (!this.apiFunc) {
         this._currShowToast('上传方法错误');
         return;
       }
@@ -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;

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

@@ -1,34 +0,0 @@
-let MixinsPicker = {
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
-  props: {
-    // 占位符
-    placeholder: {
-      type: String,
-      default: '请选择'
-    }
-  },
-  watch: {
-    value(newVal) {
-      this.localVal = newVal;
-    }
-  },
-  data() {
-    return {};
-  },
-  created() {},
-  methods: {
-    bindPickerCancel() {
-      this.iconTop = false;
-    },
-    changeIconTop() {
-      this.iconTop = true;
-    }
-  }
-};
-export default MixinsPicker;