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

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,
@@ -63,13 +63,18 @@ export default {
       type: String,
       default: 'text'
     },
-    free: {
+    dataTree: {
       type: String,
-      default: 'free'
+      default: 'tree'
     },
     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,40 +131,41 @@ export default {
       if (typeof original == 'string') {
         original = JSON.parse(original);
       }
-      if (!original) {
+      if (!original || original.length <= 0) {
+        console.warn('original 暂无数据', original);
         return;
       }
       //整理数据
       let items = [];
       let dataValue = this.dataValue ? this.dataValue : 'value';
       let dataText = this.dataText ? this.dataText : 'text';
-      let free = this.free;
+
+      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.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]) {
             items_index[0] = i;
           }
         }
-
         items.push({
           value: data[dataValue].toString(),
           text: data[dataText]
         });
-        if (original[i][free]) {
-          let free_data = original[i][free];
+        if (original[i][tree]) {
+          let tree_data = original[i][tree];
           let temp = [];
-          for (const ii in free_data) {
-            let data = free_data[ii];
+          for (const ii in tree_data) {
+            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]) {
@@ -155,16 +176,16 @@ export default {
               value: data[dataValue].toString(),
               text: data[dataText]
             });
-            if (free_data[ii][free] == undefined) {
-              free_data[ii][free] = [{}];
+            if (tree_data[ii][tree] == undefined) {
+              tree_data[ii][tree] = [{}];
             }
-            if (free_data[ii][free]) {
-              let free_data2 = free_data[ii][free];
+            if (tree_data[ii][tree]) {
+              let tree_data2 = tree_data[ii][tree];
               let temp2 = [];
-              for (const iii in free_data2) {
-                let data = free_data2[iii];
+              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]) {
@@ -183,10 +204,10 @@ export default {
                   text: data[dataText]
                 });
               }
-              temp[ii].free = temp2;
+              temp[ii].tree = temp2;
             }
           }
-          items[i].free = temp;
+          items[i].tree = temp;
         }
       }
       if (!items) {
@@ -194,21 +215,24 @@ export default {
       }
       //默认Value
       this.items = items;
-      this.items_sub = items[items_index[0] ?? 0].free;
-      this.items_sub2 = this.items_sub[items_index[1] ?? 0].free;
+      this.items_sub = items[items_index[0] ?? 0].tree;
+      this.items_sub2 = this.items_sub[items_index[1] ?? 0].tree;
       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;
@@ -225,15 +249,15 @@ export default {
         //滑动二级
         items_index[1] = e.detail.value;
         items_index[2] = 0;
-        range_data[2] = range_data[1][items_index[1]].free || [];
+        range_data[2] = range_data[1][items_index[1]].tree || [];
         // this.range_data = range_data;
       } else if (e.detail.column == 0) {
         //滑动一级
         items_index[0] = e.detail.value;
         items_index[1] = 0;
         items_index[2] = 0;
-        range_data[1] = range_data[0][items_index[0]].free || [];
-        range_data[2] = range_data[1][items_index[1]].free || [];
+        range_data[1] = range_data[0][items_index[0]].tree || [];
+        range_data[2] = range_data[1][items_index[1]].tree || [];
         // this.range_data = range_data;
       }
       this.$set(this, 'range_data', range_data);
@@ -242,26 +266,27 @@ 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];
       let value = [];
       let items = this.items;
       // 2022-07-22,修复三级选项为空时取值异常
-      if (!items[items_index[0]].free[items_index[1]].free || items[items_index[0]].free[items_index[1]].free.length == 0) {
-        items[items_index[0]].free[items_index[1]].free = [{ text: '', value: '' }];
+      if (!items[items_index[0]].tree[items_index[1]].tree || items[items_index[0]].tree[items_index[1]].tree.length == 0) {
+        items[items_index[0]].tree[items_index[1]].tree = [{ text: '', value: '' }];
       }
-      if (this.dataType == 'text') {
+      if (this.localDataType == 'text') {
         value[0] = items[items_index[0]].text;
-        value[1] = items[items_index[0]].free[items_index[1]].text;
-        value[2] = items[items_index[0]].free[items_index[1]].free[items_index[2]].text;
+        value[1] = items[items_index[0]].tree[items_index[1]].text;
+        value[2] = items[items_index[0]].tree[items_index[1]].tree[items_index[2]].text;
       } else {
         value[0] = items[items_index[0]].value;
-        value[1] = items[items_index[0]].free[items_index[1]].value;
-        value[2] = items[items_index[0]].free[items_index[1]].free[items_index[2]].value;
+        value[1] = items[items_index[0]].tree[items_index[1]].value;
+        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;

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() {