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

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

@@ -30,9 +30,7 @@
 </template>
 
 <script>
-import MixinsInput from '../mixins/mixins-input.js';
 export default {
-  mixins: [MixinsInput],
   name: 'cvInputPassword',
   inject: {
     cvFormGroup: {
@@ -42,23 +40,86 @@ export default {
     }
   },
   props: {
+    value: {
+      type: [Number, String],
+      default: ''
+    },
+    modelValue: {
+      type: [Number, String],
+      default: ''
+    },
     placeholder: {
       type: [String],
       default: '请输入密码'
     },
+    disabled: {
+      type: [Boolean],
+      default: false
+    },
+    clearable: {
+      type: [Boolean],
+      default: false
+    },
+    maxlength: {
+      type: [Number, String],
+      default: -1
+    },
     passwordIcon: {
       type: Boolean,
       default: true
     }
   },
-  watch: {},
+  watch: {
+    value(newVal) {
+      this.localVal = newVal;
+    },
+    modelValue(newVal) {
+      this.localVal = newVal;
+    }
+  },
   data() {
     return {
+      localStyle: '',
+      localVal: '',
       showPassword: false
     };
   },
-  created() {},
+  created() {
+    this.localVal = this.doValueGet();
+  },
+  mounted() {
+    this._itemStyle();
+  },
   methods: {
+    doValueGet() {
+      if (this.value === '') return this.modelValue;
+      if (this.modelValue === '') return this.value;
+      return this.value;
+    },
+    _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);
+      this.$emit('update:modelValue', this.localVal);
+    },
+    /* 监听自己清除按钮点击事件 */
+    onEmpty() {
+      this.localVal = '';
+      this.funcOnInput();
+    },
     onEyes() {
       this.showPassword = !this.showPassword;
     }
@@ -67,7 +128,7 @@ export default {
 </script>
 <style>
 .cv-input__content {
-  height: 36px;
+  min-height: 36px;
   line-height: 36px;
   font-size: 14px;
 }

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

@@ -23,31 +23,98 @@
     </view>
   </view>
 </template>
-
 <script>
-import MixinsInput from '../mixins/mixins-input.js';
 export default {
-  mixins: [MixinsInput],
   name: 'cvInputText',
   options: {
     addGlobalClass: true
   },
   props: {
+    value: {
+      type: [Number, String],
+      default: ''
+    },
+    modelValue: {
+      type: [Number, String],
+      default: ''
+    },
+    placeholder: {
+      type: [String],
+      default: '请输入'
+    },
+    clearable: {
+      type: [Boolean],
+      default: false
+    },
+    maxlength: {
+      type: [Number, String],
+      default: -1
+    },
+    disabled: {
+      type: [Boolean],
+      default: false
+    },
     placeholder: {
       type: [String],
       default: '请输入文本'
     }
   },
+  watch: {
+    value(newVal) {
+      this.localVal = newVal;
+    },
+    modelValue(newVal) {
+      this.localVal = newVal;
+    }
+  },
   data() {
-    return {};
+    return {
+      localStyle: '',
+      localVal: ''
+    };
   },
-  created() {},
-  methods: {}
+  created() {
+    // this.localVal = this.doValueGet();
+  },
+  mounted() {
+    this._itemStyle();
+  },
+  methods: {
+    doValueGet() {
+      if (this.value === '') return this.modelValue;
+      if (this.modelValue === '') return this.value;
+      return this.value;
+    },
+    _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);
+      this.$emit('update:modelValue', this.localVal);
+    },
+    /* 监听自己清除按钮点击事件 */
+    onEmpty() {
+      this.localVal = '';
+      this.funcOnInput();
+    }
+  }
 };
 </script>
 <style>
 .cv-input__content {
-  height: 36px;
+  min-height: 36px;
   line-height: 36px;
   font-size: 14px;
 }

package/ui-cv/cv-picker1/cv-picker1.vue

@@ -16,16 +16,17 @@
 </template>
 
 <script>
-import MixinsPicker from '../mixins/mixins-picker.js';
 export default {
-  mixins: [MixinsPicker],
   name: 'cvPicker1',
   props: {
-    //默认输入框内容
     value: {
       type: [Number, String],
       default: ''
     },
+    modelValue: {
+      type: [Number, String],
+      default: ''
+    },
     dataType: {
       type: String,
       default: 'value'
@@ -44,6 +45,11 @@ export default {
     dataText: {
       type: String,
       default: 'text'
+    },
+    // 占位符
+    placeholder: {
+      type: String,
+      default: '请选择'
     }
   },
   data() {
@@ -71,14 +77,24 @@ export default {
     value(newVal) {
       this.localVal = newVal;
       this._dealValue();
+    },
+    modelValue(newVal) {
+      this.localVal = newVal;
+      this._dealValue();
     }
   },
   created() {
-    this.localVal = this.value;
+    this.localVal = this.doValueGet();
+    console.log(this.localVal);
     this.localArr = this.itemsSortOut();
     this._dealValue();
   },
   methods: {
+    doValueGet() {
+      if (this.value === '') return this.modelValue;
+      if (this.modelValue === '') return this.value;
+      return this.value;
+    },
     /**
      * 处理-循环数组数据
      */
@@ -153,8 +169,16 @@ export default {
       } else {
         this.localVal = rowData.value;
       }
+      this.iconTop = false;
+      console.log(this.localVal);
       this.$emit('input', this.localVal);
+      this.$emit('update:modelValue', this.localVal);
+    },
+    bindPickerCancel() {
       this.iconTop = false;
+    },
+    changeIconTop() {
+      this.iconTop = true;
     }
   }
 };

package/ui-cv/cv-picker2/cv-picker2.vue

@@ -21,17 +21,17 @@
     </picker>
   </view>
 </template>
-
 <script>
-import MixinsPicker from '../mixins/mixins-picker.js';
 export default {
-  mixins: [MixinsPicker],
   name: 'cvPicker2',
   props: {
-    //默认输入框内容
     value: {
-      type: Array,
-      default: []
+      type: [Array],
+      default: () => []
+    },
+    modelValue: {
+      type: [Array],
+      default: () => []
     },
     dataType: {
       type: String,
@@ -59,6 +59,11 @@ export default {
     joint: {
       type: String,
       default: ''
+    },
+    // 占位符
+    placeholder: {
+      type: String,
+      default: '请选择'
     }
   },
   watch: {
@@ -71,6 +76,10 @@ export default {
     value(newVal) {
       this.localVal = newVal;
       this.itemsSortOut();
+    },
+    modelValue(newVal) {
+      this.localVal = newVal;
+      this.itemsSortOut();
     }
   },
   data() {
@@ -83,17 +92,26 @@ export default {
       items_sub: [],
       items_index: [0, 0], //当前下标
       lastRetDataIndex: [0, 0], // 最终确定选中的下标
-      localDataType: '',
+      localDataType: 'value',
       localDataValue: 'value',
       localDataText: 'label'
     };
   },
   created() {
-    this.localVal = this.value.length != 2 ? [0, 0] : this.value;
+    this.localVal = this.doValueGet();
     this.localDataType = this.dataType != 'text' ? 'value' : 'text';
     this.itemsSortOut();
   },
   methods: {
+    doValueGet() {
+      if (this.value === '' || (Array.prototype.isPrototypeOf(this.value) && this.value.length === 0)) {
+        return this.modelValue.length != 2 ? [0, 0] : this.modelValue;
+      }
+      if (this.modelValue === '' || (Array.prototype.isPrototypeOf(this.modelValue) && this.modelValue.length === 0)) {
+        return this.value.length != 2 ? [0, 0] : this.value;
+      }
+      return this.value.length != 2 ? [0, 0] : this.value;
+    },
     itemsSortOut() {
       let original = [];
       original = this.dataLists || [];
@@ -109,13 +127,14 @@ export default {
       let items = [];
       let dataValue = this.dataValue ? this.dataValue : 'value';
       let dataText = this.dataText ? this.dataText : 'text';
+
       let tree = this.dataTree;
       let items_index = this.items_index;
       let dataType = this.localDataType;
       for (let i in original) {
         let data = original[i];
         //查找一级绑定参数
-        if (this.localVal[0]) {
+        if (this.localVal && this.localVal.length >= 1) {
           if (dataType == 'text' && this.localVal[0] == data[dataText]) {
             items_index[0] = i;
           } else if (dataType == 'value' && this.localVal[0] == data[dataValue]) {
@@ -134,7 +153,7 @@ export default {
             let data = tree_data[ii];
 
             //查找二级绑定参数
-            if (this.localVal[1]) {
+            if (this.localVal && this.localVal.length >= 2) {
               if (dataType == 'text' && this.localVal[1] == data[dataText]) {
                 items_index[1] = ii;
               } else if (dataType == 'value' && this.localVal[1] == data[dataValue]) {
@@ -158,7 +177,7 @@ export default {
       this.range_data = [items, this.items_sub];
       this.last_range_data = [...this.range_data];
       this.items_index = items_index;
-      if (this.value.length == 2) {
+      if (this.localVal && this.localVal.length == 2) {
         this.lastRetDataIndex = [...this.items_index];
       }
     },
@@ -168,6 +187,9 @@ export default {
       this.updateLocalVal();
       this.iconTop = false;
     },
+    changeIconTop() {
+      this.iconTop = true;
+    },
     /* 取消选择 */
     onCancel(e) {
       this.iconTop = false;
@@ -203,6 +225,7 @@ export default {
       }
       this.localVal = value;
       this.$emit('input', value);
+      this.$emit('update:modelValue', value);
     }
   }
 };

package/ui-cv/cv-picker3/cv-picker3.vue

@@ -32,17 +32,17 @@
     </picker>
   </view>
 </template>
-
 <script>
-import MixinsPicker from '../mixins/mixins-picker.js';
 export default {
-  mixins: [MixinsPicker],
   name: 'cvPicker3',
   props: {
-    //默认输入框内容
     value: {
-      type: Array,
-      default: () => {}
+      type: [Array],
+      default: () => []
+    },
+    modelValue: {
+      type: [Array],
+      default: () => []
     },
     dataType: {
       type: String,
@@ -70,6 +70,11 @@ export default {
     joint: {
       type: String,
       default: ''
+    },
+    // 占位符
+    placeholder: {
+      type: String,
+      default: '请选择'
     }
   },
   watch: {
@@ -82,12 +87,16 @@ export default {
     value(newVal) {
       this.localVal = newVal;
       this.itemsSortOut();
+    },
+    modelValue(newVal) {
+      this.localVal = newVal;
+      this.itemsSortOut();
     }
   },
   data() {
     return {
       iconTop: false,
-      localVal: '',
+      localVal: [],
       items: [], //全部数据
       range_data: [], //弹窗临时数组
       last_range_data: [], //最终显示页面数组
@@ -95,15 +104,26 @@ export default {
       items_sub2: [],
       items_index: [0, 0, 0], //当前下标
       lastRetDataIndex: [0, 0, 0], // 最终确定选中的下标
-      localDataType: ''
+      localDataType: 'value',
+      localDataValue: 'value',
+      localDataText: 'label'
     };
   },
   created() {
-    this.localVal = this.value;
+    this.localVal = this.doValueGet();
     this.localDataType = this.dataType != 'text' ? 'value' : 'text';
     this.itemsSortOut();
   },
   methods: {
+    doValueGet() {
+      if (this.value === '' || (Array.prototype.isPrototypeOf(this.value) && this.value.length === 0)) {
+        return this.modelValue;
+      }
+      if (this.modelValue === '' || (Array.prototype.isPrototypeOf(this.modelValue) && this.modelValue.length === 0)) {
+        return this.value;
+      }
+      return this.value;
+    },
     itemsSortOut() {
       let original = [];
       original = this.dataLists || [];
@@ -111,7 +131,8 @@ export default {
       if (typeof original == 'string') {
         original = JSON.parse(original);
       }
-      if (!original) {
+      if (!original || original.length <= 0) {
+        console.warn('original 暂无数据', original);
         return;
       }
       //整理数据
@@ -126,7 +147,7 @@ export default {
         let data = original[i];
         //查找一级绑定参数
 
-        if (this.localVal.length >= 1) {
+        if (this.localVal && this.localVal.length >= 1) {
           if (dataType == 'text' && this.localVal[0] == data[dataText]) {
             items_index[0] = i;
           } else if (dataType == 'value' && this.localVal[0] == data[dataValue]) {
@@ -144,7 +165,7 @@ export default {
             let data = tree_data[ii];
 
             //查找二级绑定参数
-            if (this.localVal.length >= 2) {
+            if (this.localVal && this.localVal.length >= 2) {
               if (dataType == 'text' && this.localVal[1] == data[dataText]) {
                 items_index[1] = ii;
               } else if (dataType == 'value' && this.localVal[1] == data[dataValue]) {
@@ -164,7 +185,7 @@ export default {
               for (const iii in tree_data2) {
                 let data = tree_data2[iii];
                 //查找三级绑定参数
-                if (this.localVal.length >= 3) {
+                if (this.localVal && this.localVal.length >= 3) {
                   if (dataType == 'text' && this.localVal[2] == data[dataText]) {
                     items_index[2] = iii;
                   } else if (dataType == 'value' && this.localVal[2] == data[dataValue]) {
@@ -199,16 +220,19 @@ export default {
       this.range_data = [items, this.items_sub, this.items_sub2];
       this.items_index = items_index;
       this.last_range_data = [...this.range_data];
-      if (this.value.length == 3) {
+      if (this.localVal && this.localVal.length == 3) {
         this.lastRetDataIndex = [...this.items_index];
       }
     },
     bindPickerChange: function (e) {
       let items_index = e.detail.value;
       this.items_index = items_index;
-      this.updatelocalVal();
+      this.updateLocalVal();
       this.iconTop = false;
     },
+    changeIconTop() {
+      this.iconTop = true;
+    },
     /* 取消选择 */
     onCancel(e) {
       this.iconTop = false;
@@ -242,7 +266,7 @@ export default {
       this.$forceUpdate();
       // this.funcOnInput();
     },
-    updatelocalVal() {
+    updateLocalVal() {
       let items_index = this.items_index;
       this.last_range_data = [...this.range_data];
       this.lastRetDataIndex = [...items_index];
@@ -262,6 +286,7 @@ export default {
         value[2] = items[items_index[0]].tree[items_index[1]].tree[items_index[2]].value;
       }
       this.$emit('input', value);
+      this.$emit('update:modelValue', value);
     }
   }
 };

package/ui-cv/cv-radio-group/cv-radio-group.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="cv-radio-group-wrap">
-    <radio-group @change="radioChange" class="cv-radio-group__box">
+    <radio-group @change="radioChange" class="cv-radio-group__box" :style="localStyle">
       <slot>
         <cv-radio-opt-base
           v-if="type == 'base'"
@@ -41,14 +41,21 @@ export default {
     cvRadioOptTag
   },
   props: {
+    value: {
+      type: [Number, String],
+      default: ''
+    },
+    modelValue: {
+      type: [Number, String],
+      default: ''
+    },
     type: {
       type: [String],
       default: 'base'
     },
-    //默认内容
-    value: {
-      type: [String, Number],
-      default: ''
+    align: {
+      type: [String],
+      default: 'left'
     },
     dataType: {
       type: String,
@@ -56,7 +63,7 @@ export default {
     },
     //选项数组
     dataLists: {
-      type: [Array, String],
+      type: [Array, String, Object],
       default: () => {
         return [];
       }
@@ -75,6 +82,8 @@ export default {
   data() {
     return {
       localVal: '',
+      localList: [],
+      localStyle: '',
       items: [],
       itemsValue: ''
     };
@@ -84,21 +93,36 @@ export default {
       this.localVal = newVal;
       this._dealValue();
     },
+    modelValue(newVal) {
+      this.localVal = newVal;
+      this._dealValue();
+    },
     dataLists(newVal) {
-      this.dataLists = newVal;
+      this.localList = newVal || [];
       this.items = this.itemsSortOut();
       this._dealValue();
     }
   },
   created() {
-    this.localVal = this.value;
+    this.localVal = this.doValueGet();
     if (this.dataLists) {
+      this.localList = this.dataLists || [];
       this.items = this.itemsSortOut();
     }
-    //默认Value
+    // 默认Value
     this._dealValue();
+    this._dealStyle();
   },
   methods: {
+    doValueGet() {
+      if (this.value === '') return this.modelValue;
+      if (this.modelValue === '') return this.value;
+      return this.value;
+    },
+    _dealStyle() {
+      let alignStyle = this.align == 'right' ? 'flex-end' : 'flex-start';
+      this.localStyle = `justify-content:${alignStyle};`;
+    },
     _dealValue() {
       //默认Value
       let items = this.items;
@@ -114,12 +138,10 @@ export default {
     },
     itemsSortOut() {
       let original = [];
-      original = this.dataLists || [];
-
+      original = this.localList || [];
       if (typeof original == 'string') {
         original = JSON.parse(original);
       }
-
       //整理数据
       let items = [];
       let dataValue = this.dataValue ? this.dataValue : 'value';
@@ -147,6 +169,7 @@ export default {
       }
       this.localVal = localVal;
       this.$emit('input', this.localVal);
+      this.$emit('update:modelValue', this.localVal);
     }
   }
 };
@@ -155,7 +178,6 @@ export default {
 <style>
 .cv-radio-group-wrap {
   min-height: 35px;
-  float: left;
 }
 .cv-radio-group__box {
   display: flex;