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

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;

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

@@ -4,7 +4,7 @@
       class="cv-rate-item"
       v-for="i in parseInt(max)"
       :key="i"
-      v-bind:style="i <= locaValue ? starSelected : starStyle"
+      :style="i <= locaValue ? starSelected : starStyle"
       :data-value="i"
       @tap="click_star"
     >
@@ -17,14 +17,16 @@
 <script>
 export default {
   name: 'cvRate',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
   props: {
+    // 当前评分
+    value: {
+      type: [Number, String],
+      default: 0
+    },
+    modelValue: {
+      type: [Number, String],
+      default: 0
+    },
     isFill: {
       // 星星的类型，是否镂空
       type: [Boolean, String],
@@ -45,11 +47,6 @@ export default {
       type: [Number, String],
       default: 24
     },
-    value: {
-      // 当前评分
-      type: [Number, String],
-      default: 1
-    },
     max: {
       // 最大评分
       type: [Number, String],
@@ -74,13 +71,24 @@ export default {
     };
   },
   watch: {
-    value(newVal) {}
+    value(newVal) {
+      this.locaValue = newVal;
+    },
+    modelValue(newVal) {
+      this.locaValue = newVal;
+    }
   },
   created() {
-    this.locaValue = this.value || 1;
+    this.locaValue = this.doValueGet();
+    console.log(this.locaValue);
     this._dealStyle();
   },
   methods: {
+    doValueGet() {
+      if (this.value === 0) return this.modelValue;
+      if (this.modelValue === 0) return this.value;
+      return this.value;
+    },
     _dealStyle() {
       if (this.color) {
         let starStyle = 'font-size:' + this.size + 'px;';
@@ -97,6 +105,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-specs/cv-specs.vue

@@ -2,7 +2,7 @@
   <view class="cv-specs">
     <!-- 规格 -->
     <view class="cv-specs-area">
-      <view class="cv-specs-sort-area" v-for="(item, index1) in spu" :key="index1">
+      <view class="cv-specs-sort-area" v-for="(item, index1) in localSpu" :key="index1">
         <!-- 规格类别名称 -->
         <view class="cv-specs-sort-name">
           <text>{{ item.name }}</text>
@@ -83,8 +83,8 @@ export default {
   },
   data() {
     return {
-      spu: [], //spu规格列表
-      sku: [], //sku列表
+      localSpu: [], //spu规格列表
+      localSku: [], //sku列表
       shopItemInfo: {}, //存放要和选中的值进行匹配的数据
       selectArr: [], //存放被选中的值
       subIndex: [], //是否选中 因为不确定是多规格还是但规格，所以这里定义数组来判断
@@ -101,14 +101,14 @@ export default {
   methods: {
     //初始化数据
     _dealData() {
-      this.spu = this.specList.items; //spu规格列表
-      this.sku = this.skuList.items; //sku列表
+      this.localSpu = this.specList.items; // spu规格列表
+      this.localSku = this.skuList.items; // sku列表
       this.shopItemInfo = {}; //存放要和选中的值进行匹配的数据
       this.selectArr = []; //存放被选中的值
       this.subIndex = []; //是否选中 因为不确定是多规格还是但规格，所以这里定义数组来判断
       this.selectshop = {}; //存放最后选中的商品
-      if (this.spu && this.sku && this.spu.length > 0 && this.sku.length > 0) {
-        this.spu.map((item) => {
+      if (this.localSpu && this.localSku && this.localSpu.length > 0 && this.localSku.length > 0) {
+        this.localSpu.map((item) => {
           this.selectArr.push('');
           this.subIndex.push(-1);
         });
@@ -141,29 +141,29 @@ export default {
       //循环所有属性判断哪些属性可选
       //当前选中的兄弟节点和已选中属性不需要循环
 
-      for (let i = 0, len = this.spu.length; i < len; i++) {
+      for (let i = 0, len = this.localSpu.length; i < len; i++) {
         if (i == clickIndex) {
           continue;
         }
-        let len2 = this.spu[i].items.length;
+        let len2 = this.localSpu[i].items.length;
         for (let j = 0; j < len2; j++) {
           if (this.subIndex[i] != -1 && j == this.subIndex[i]) {
             continue;
           }
           let choosed_copy = [...this.selectArr];
-          this.$set(choosed_copy, i, this.spu[i].items[j].name);
+          this.$set(choosed_copy, i, this.localSpu[i].items[j].name);
           let choosed_copy2 = choosed_copy.filter((item) => item !== '' && typeof item !== 'undefined');
           if (this.shopItemInfo.hasOwnProperty(choosed_copy2)) {
-            this.$set(this.spu[i].items[j], 'ishow', true);
+            this.$set(this.localSpu[i].items[j], 'ishow', true);
           } else {
-            this.$set(this.spu[i].items[j], 'ishow', false);
+            this.$set(this.localSpu[i].items[j], 'ishow', false);
           }
         }
       }
     },
     checkItem() {
       //计算可选路径
-      let result = this.sku.reduce(
+      let result = this.localSku.reduce(
         (arrs, items) => {
           return arrs.concat(
             items.sku.reduce(

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

@@ -5,22 +5,18 @@
 <script>
 export default {
   name: 'cvSwitch',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
   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 +29,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 +95,7 @@ export default {
           break;
       }
       this.$emit('input', this.localVal);
+      this.$emit('update:modelValue', this.localVal);
     }
   }
 };

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

@@ -24,26 +24,23 @@
 <script>
 export default {
   name: 'cvTextArea',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
   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 +50,6 @@ export default {
       default: true
     }
   },
-
   data() {
     return {
       localVal: '',
@@ -64,15 +60,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() {