@10yun/cv-mobile-ui 0.3.25 → 0.4.1

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

@@ -1,38 +1,28 @@
 <template>
-  <cv-form-item
-    :tip="tip"
-    :label="label"
-    :must="must"
-    :message="message"
-    :messageDisplay="messageDisplay"
-    :labelWidth="localLabelWidth"
-    :layout="localLayout"
-    :onQClear="onQClear"
-    :input-value="localVal"
-  >
-    <view class="cv-textarea">
+  <view class="cv-textarea-wrap" :class="{ 'cv-textarea__border': border }">
+    <view class="cv-textarea__box">
       <textarea
-        class="cv-textarea-item"
+        class="cv-textarea__content"
         v-model="localVal"
         :maxlength="maxlength"
         :placeholder="placeholder"
-        placeholder-class="cv-textarea-placeholder"
-        @input="updateInput"
+        placeholder-class="cv-textarea__placeholder"
+        @input="funcOnInput"
         auto-height
+        border
       />
-      <view class="cv-textarea-maxlength" v-if="maxlength >= 1">
-        <text>{{ tempLength }}</text>
-        /
-        <text>{{ maxlength }}</text>
-      </view>
     </view>
-  </cv-form-item>
+
+    <view class="cv-textarea__maxlength" v-if="maxlength >= 1">
+      <text>{{ tempLength }}</text>
+      /
+      <text>{{ maxlength }}</text>
+    </view>
+  </view>
 </template>
 
 <script>
-import MixinsCommon from '../mixins/mixins-common.js';
 export default {
-  mixins: [MixinsCommon],
   name: 'cvTextArea',
   inject: {
     cvFormGroup: {
@@ -50,21 +40,17 @@ export default {
       type: [Number, String],
       default: -1
     },
-    tip: {
-      type: String,
-      default: ''
+    placeholder: {
+      type: [String],
+      default: '请输入文本'
     },
-    onQClear: {
+    clearable: {
       type: Boolean,
       default: false
     },
-    message: {
-      type: String,
-      default: ''
-    },
-    messageDisplay: {
+    border: {
       type: Boolean,
-      default: false
+      default: true
     }
   },
 
@@ -80,38 +66,67 @@ export default {
       this.tempLength = this.localVal.length;
     }
   },
-  created: function () {
+  created() {
     this.localVal = this.value;
   },
   methods: {
-    updateInput(e) {
+    funcOnInput(e) {
       this.tempLength = this.localVal.length;
       this.$emit('input', this.localVal);
     },
     /* 监听自己清除按钮点击事件 */
     onEmpty() {
       this.localVal = '';
-      this.updateInput();
+      this.funcOnInput();
     }
   }
 };
 </script>
 
 <style>
-.cv-textarea-item {
+.cv-textarea-wrap {
+  border-radius: 4px;
+  background-color: #fff;
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  flex: 1;
+  padding: 9px;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.cv-textarea__box {
+  flex: 1;
+  font-size: 15px;
+  color: #606266;
+  width: 100%;
+}
+.cv-textarea__content {
   min-height: 65px;
   line-height: 1.5em;
-  padding-top: 7px;
   font-size: 14px;
   width: auto;
-  margin-right: 20px;
 }
-.cv-textarea-maxlength {
+.cv-textarea__border {
+  border-width: 0.5px !important;
+  border-color: #dadbde !important;
+  border-style: solid;
+  padding-left: 10px;
+}
+
+.cv-textarea__maxlength {
   font-size: 14px;
   color: rgba(0, 0, 0, 0.4);
   text-align: right;
+  position: absolute;
+  right: 5px;
+  bottom: 2px;
+  font-size: 12px;
+  color: #909193;
+  background-color: #fff;
+  padding: 1px 4px;
 }
-.cv-textarea-placeholder {
+.cv-textarea__placeholder {
   font-size: 14px;
 }
 </style>

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

@@ -39,6 +39,10 @@ export default {
     src: {
       type: String,
       default: ''
+    },
+    upFunc: {
+      type: [Function],
+      default: () => {}
     }
   },
   data() {
@@ -74,28 +78,26 @@ export default {
         }
       });
     },
-    uploadAvatar: function (tempFilePaths) {
-      this.$request
-        .flagUpImg('UC_PERSONAL_AVATAR', {
-          filePath: tempFilePaths,
-          name: 'xcx_pper_avatar',
-          formData: {
-            postType: 'update',
-            file_name: 'xcx_pper_avatar'
-          }
-        })
-        .then((resData) => {
-          if (resData.status == 200) {
-            uni.showToast({
-              title: '修改成功',
-              icon: 'success,',
-              duration: 1500
-            });
-            this.localVal = resData.save_url;
-            this.localSrc = resData.img_cdn;
-            this.$emit('input', this.localVal);
-          }
-        });
+    uploadAvatar(tempFilePaths) {
+      this.upFunc('UC_PERSONAL_AVATAR', {
+        filePath: tempFilePaths,
+        name: 'xcx_pper_avatar',
+        formData: {
+          postType: 'update',
+          file_name: 'xcx_pper_avatar'
+        }
+      }).then((resData) => {
+        if (resData.status == 200) {
+          uni.showToast({
+            title: '修改成功',
+            icon: 'success,',
+            duration: 1500
+          });
+          this.localVal = resData.save_url;
+          this.localSrc = resData.img_cdn;
+          this.$emit('input', this.localVal);
+        }
+      });
     }
   }
 };

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

@@ -171,7 +171,7 @@ export default {
       this._dealNum();
     }
   },
-  created: function () {
+  created() {
     this.localVal = this.value;
     this.localSrc = this._dealSrc(this.src);
     this.allowUploadNum = parseInt(this.maxlength);

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

@@ -1,40 +1,31 @@
-import MixinsCommon from './mixins-common.js';
 let MixinsInput = {
-  mixins: [MixinsCommon],
+  mixins: [],
   inject: {
-    ccFormGroup: {
+    cvFormGroup: {
       default() {
         return null;
       }
     }
   },
   props: {
-    onQClear: {
-      type: Boolean,
-      default: false
-    },
     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
-    },
-    rtip: {
-      type: String,
-      default: ''
-    },
-    message: {
-      type: String,
-      default: ''
-    },
-    messageDisplay: {
-      type: Boolean,
+      type: [Boolean],
       default: false
     }
   },
@@ -45,40 +36,40 @@ let MixinsInput = {
   },
   data() {
     return {
-      localItemStyle: '',
+      localStyle: '',
       localVal: ''
     };
   },
   created() {
     this.localVal = this.value;
+  },
+  mounted() {
     this._itemStyle();
   },
   methods: {
     _itemStyle() {
       /* 计算输入框右侧预留空间 */
       let paddingRight = 0;
-      if (this.rtip) {
+      if (this.$slots['append']) {
         paddingRight += 20;
       }
-      if (this.onQClear) {
+      if (this.clearable) {
         paddingRight += 30;
       }
-      this.localItemStyle = 'margin-right:' + paddingRight + 'px;';
+      this.localStyle = 'margin-right:' + paddingRight + 'px;';
     },
     onBlur(e) {
       this.localVal = e.detail.value;
-      this.updateInput();
+      this.funcOnInput();
     },
-    updateInput(e) {
+    funcOnInput(e) {
       this.$emit('input', this.localVal);
     },
     /* 监听自己清除按钮点击事件 */
     onEmpty() {
       this.localVal = '';
-      this.updateInput();
+      this.funcOnInput();
     }
   }
 };
-
 export default MixinsInput;
-// export default Object.assign({}, MixinsCommon, CcInputMixins);

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

@@ -1,8 +1,6 @@
-import MixinsCommon from './mixins-common.js';
 let MixinsPicker = {
-  mixins: [MixinsCommon],
   inject: {
-    ccFormGroup: {
+    cvFormGroup: {
       default() {
         return null;
       }
@@ -13,14 +11,6 @@ let MixinsPicker = {
     placeholder: {
       type: String,
       default: '请选择'
-    },
-    message: {
-      type: String,
-      default: ''
-    },
-    messageDisplay: {
-      type: Boolean,
-      default: false
     }
   },
   watch: {
@@ -41,6 +31,4 @@ let MixinsPicker = {
     }
   }
 };
-
 export default MixinsPicker;
-// export default Object.assign({}, MixinsCommon, CcInputMixins);