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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@10yun/cv-mobile-ui",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "十云cvjs移动端ui，适用uniapp",
   "author": "",
   "license": "Apache-2.0",

package/ui-cv/cv-code-sms/cv-code-sms.vue

@@ -13,6 +13,7 @@
     </view>
     <view class="cv-code-button-area">
       <button
+        size="mini"
         class="cv-code-button-item"
         :class="btnDisabled ? 'cv-code-button-wait' : ''"
         :disabled="btnDisabled"
@@ -26,19 +27,15 @@
 <script>
 export default {
   name: 'cvCodeSms',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
   props: {
     value: {
       type: [Number, String],
       default: ''
     },
-    modelValue: {},
+    modelValue: {
+      type: [Number, String],
+      default: ''
+    },
     maxlength: {
       type: [Number, String],
       default: -1
@@ -51,15 +48,11 @@ export default {
       type: String,
       default: 'mobile'
     },
-    codeUrl: {
-      type: String,
-      default: ''
-    },
     codeSign: {
       type: Boolean,
       default: false
     },
-    codeApiFunc: {
+    apiFunc: {
       type: Function,
       default: null
     },
@@ -75,12 +68,15 @@ export default {
     },
     value(newVal) {
       this.localVal = newVal;
+    },
+    modelValue(newVal) {
+      this.localVal = newVal;
     }
   },
   data() {
     return {
       // 验证码
-      localVal: this.value,
+      localVal: '',
       localMobile: '',
       nextTime: 0,
       diyPlaceholder: '短信验证码',
@@ -93,9 +89,16 @@ export default {
     };
   },
   created() {
+    this.localVal = this.doValueGet();
     this.localMobile = this.mobile;
+    console.log(this.apiFunc);
   },
   methods: {
+    doValueGet() {
+      if (this.value === '') return this.modelValue;
+      if (this.modelValue === '') return this.value;
+      return this.value;
+    },
     showDiyMsg(msg) {
       uni.showToast({
         title: msg,
@@ -115,8 +118,8 @@ export default {
         return;
       }
 
-      if (!this.codeUrl && !this.codeApiFunc) {
-        this.showDiyMsg('短信接口地址不能为空');
+      if (!this.apiFunc) {
+        this.showDiyMsg('短信接口方法不能为空');
         return;
       }
 
@@ -130,9 +133,8 @@ export default {
 
       if (this.btnDisabled) {
         this.btnText = '请稍后...';
-        if (this.codeApiFunc) {
-          this.codeApiFunc({
-            postType: 'sendSms',
+        if (this.apiFunc) {
+          this.apiFunc({
             cto_sms_type: 'alterMobile',
             sendCode: '发送验证码',
             [this.mobileParam]: this.localMobile
@@ -159,7 +161,7 @@ export default {
               this.btnText = '获取验证码';
             });
         } else {
-          console.warn('url请求未完善，请使用：codeApiFunc');
+          console.warn('url请求未完善，请使用：apiFunc');
           this.btnDisabled = false;
           this.btnText = '重新获取验证码';
         }
@@ -193,6 +195,14 @@ export default {
   height: 35px;
   line-height: 35px;
   font-size: 14px;
+  width: 100%;
+  padding-right: 10px;
+
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  width: 100%;
+  padding-right: 10px;
 }
 .cv-code-input-area {
   width: calc(100% - 120px - 10px);
@@ -206,14 +216,12 @@ export default {
   font-size: 14px;
 }
 .cv-code-button-area {
-  width: 120px;
   float: right;
   height: 35px;
 }
 .cv-code-button-item {
   height: 35px;
   line-height: 35px;
-  font-size: 14px;
   background-color: #007aff;
   color: #ffffff;
 }

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

@@ -25,7 +25,7 @@
       @cancel="bindPickerCancel"
     >
       <view class="cv-time-base-text" v-if="localVal_time != ''">{{ localVal_time }}</view>
-      <view class="cv-picker-item-placeholder" v-else>{{ placeholder }}</view>
+      <view class="cv-picker-item-placeholder" v-else>{{ placeholder2 }}</view>
     </picker>
   </view>
 </template>
@@ -38,6 +38,10 @@ export default {
       type: String,
       default: ''
     },
+    modelValue: {
+      type: String,
+      default: ''
+    },
     startDate: {
       type: String,
       default: ''
@@ -61,7 +65,12 @@ export default {
     // 占位符
     placeholder: {
       type: String,
-      default: '请选择'
+      default: '请选择日期'
+    },
+    // 占位符
+    placeholder2: {
+      type: String,
+      default: '请选择时间'
     }
   },
   watch: {
@@ -81,11 +90,16 @@ export default {
     };
   },
   created() {
-    this.localVal = this.value;
+    this.localVal = this.doValueGet();
     this.localVal_date = this.localVal.split(' ')[0] || '';
     this.localVal_time = this.localVal.split(' ')[1] || '';
   },
   methods: {
+    doValueGet() {
+      if (this.value === '') return this.modelValue;
+      if (this.modelValue === '') return this.value;
+      return this.value;
+    },
     bindTimeChange: function (e) {
       let value = e.detail.value;
       this.localVal_time = value;

package/ui-cv/cv-editor-quill/cv-editor-quill.vue

@@ -149,28 +149,19 @@ export default {
   components: {
     helangCompress
   },
-  name: 'cvEditor',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
+  name: 'cvEditorQuill',
   props: {
     value: {
       type: String,
       default: ''
     },
-    tip: {
+    modelValue: {
       type: String,
       default: ''
     },
     placeholder: {
       type: String,
-      default() {
-        return '开始输入...';
-      }
+      default: '开始输入...'
     },
     upload: {
       type: Object,
@@ -196,10 +187,14 @@ export default {
     value(newVal) {
       this.localVal = newVal;
       this.setContents();
+    },
+    modelValue(newVal) {
+      this.localVal = newVal;
+      this.setContents();
     }
   },
   created() {
-    this.localVal = this.value;
+    this.localVal = this.doValueGet();
     /* uni.loadFontFace({
       family: 'Pacifico',
       source: 'url("https://sungd.github.io/Pacifico.ttf")'
@@ -207,6 +202,11 @@ export default {
     // console.log(this.upload)
   },
   methods: {
+    doValueGet() {
+      if (this.value === '') return this.modelValue;
+      if (this.modelValue === '') return this.value;
+      return this.value;
+    },
     onBlur(e) {
       this.getContents();
     },

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

@@ -26,13 +26,6 @@
 <script>
 export default {
   name: 'cvInputDigit',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
   props: {
     value: {
       type: [Number, String],

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

@@ -22,13 +22,6 @@
 <script>
 export default {
   name: 'cvInputIdcard',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
   props: {
     value: {
       type: [Number, String],

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

@@ -25,13 +25,6 @@
 <script>
 export default {
   name: 'cvInputNumber',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
   props: {
     value: {
       type: [Number, String],

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

@@ -32,13 +32,6 @@
 <script>
 export default {
   name: 'cvInputPassword',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
   props: {
     value: {
       type: [Number, String],

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,22 +17,15 @@
 <script>
 export default {
   name: 'cvRate',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
   props: {
     // 当前评分
     value: {
       type: [Number, String],
-      default: 1
+      default: 0
     },
     modelValue: {
       type: [Number, String],
-      default: 1
+      default: 0
     },
     isFill: {
       // 星星的类型，是否镂空
@@ -78,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;';

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,13 +5,6 @@
 <script>
 export default {
   name: 'cvSwitch',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
   props: {
     value: {
       type: [Number, String, Boolean],

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

@@ -24,13 +24,6 @@
 <script>
 export default {
   name: 'cvTextArea',
-  inject: {
-    cvFormGroup: {
-      default() {
-        return null;
-      }
-    }
-  },
   props: {
     value: {
       type: [Number, String],

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

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