@10yun/cv-mobile-ui 0.5.27 → 0.5.30

package/uview-plus/{libs/config/props → components/u-upload}/upload.js

@@ -11,7 +11,8 @@ export default {
 	// upload组件
 	upload: {
 		accept: 'image',
-		capture: () => ['album', 'camera'],
+		extension: [],
+		capture: ['album', 'camera'],
 		compressed: true,
 		camera: 'back',
 		maxDuration: 60,
@@ -23,14 +24,22 @@ export default {
 		disabled: false,
 		imageMode: 'aspectFill',
 		name: '',
-		sizeType: () => ['original', 'compressed'],
+		sizeType: ['original', 'compressed'],
 		multiple: false,
 		deletable: true,
 		maxSize: Number.MAX_VALUE,
-		fileList: () => [],
+		fileList: [],
 		uploadText: '',
 		width: 80,
 		height: 80,
-		previewImage: true
+		previewImage: true,
+		autoDelete: false,
+		autoUpload: false,
+		autoUploadApi: '',
+		autoUploadAuthUrl: '',
+		autoUploadDriver: '',
+		autoUploadHeader: {},
+		getVideoThumb: false,
+		customAfterAutoUpload: false
 	}
 }

package/uview-plus/components/u-upload/utils.js

@@ -1,4 +1,5 @@
-function pickExclude(obj, keys) {
+import test from '../../libs/function/test'
+function pickExclude(obj, keys) {
 	// 某些情况下，type可能会为
     if (!['[object Object]', '[object File]'].includes(Object.prototype.toString.call(obj))) {
         return {}
@@ -12,52 +13,70 @@ function pickExclude(obj, keys) {
 }
 
 function formatImage(res) {
-    return res.tempFiles.map((item) => ({
-        ...pickExclude(item, ['path']),
+    return res.tempFiles.map((item) => ({
+        ...pickExclude(item, ['path']),
         type: 'image',
         url: item.path,
-        thumb: item.path,
-		size: item.size,
-		// #ifdef H5
-		name: item.name
-		// #endif
+        thumb: item.path,
+		size: item.size,
+		// #ifdef H5
+		name: item.name,
+		file: item
+		// #endif
+		// #ifndef H5
+		name: item.path.split('/').pop() + '.png',
+		// #endif
     }))
 }
 
 function formatVideo(res) {
+	// console.log(res)
     return [
-        {
-            ...pickExclude(res, ['tempFilePath', 'thumbTempFilePath', 'errMsg']),
+        {
+            ...pickExclude(res, ['tempFilePath', 'thumbTempFilePath', 'errMsg']),
             type: 'video',
             url: res.tempFilePath,
-            thumb: res.thumbTempFilePath,
-			size: res.size,
-			// #ifdef H5
-			name: res.name
-			// #endif
+            thumb: res.thumbTempFilePath,
+			size: res.size,
+			width: res.width || 0, // APP 2.1.0+、H5、微信小程序、京东小程序
+			height: res.height || 0, // APP 2.1.0+、H5、微信小程序、京东小程序
+			// #ifdef H5
+			name: res.name,
+			file: res
+			// #endif
+			// #ifndef H5
+			name: res.tempFilePath.split('/').pop() + '.mp4',
+			// #endif
         }
     ]
 }
 
 function formatMedia(res) {
-    return res.tempFiles.map((item) => ({
-        ...pickExclude(item, ['fileType', 'thumbTempFilePath', 'tempFilePath']),
+    return res.tempFiles.map((item) => ({
+        ...pickExclude(item, ['fileType', 'thumbTempFilePath', 'tempFilePath']),
         type: res.type,
         url: item.tempFilePath,
-        thumb: res.type === 'video' ? item.thumbTempFilePath : item.tempFilePath,
-		size: item.size
+        thumb: res.type === 'video' ? item.thumbTempFilePath : item.tempFilePath,
+		size: item.size,
+		// #ifdef H5
+		file: item
+		// #endif
+		// #ifndef H5
+		name: item.tempFilePath.split('/').pop() + (res.type === 'video' ? '.mp4': '.png'),
+		// #endif
     }))
 }
 
 function formatFile(res) {
-    return res.tempFiles.map((item) => ({ 
-		...pickExclude(item, ['path']), 
-		url: item.path, 
-		size:item.size,
+    return res.tempFiles.map((item) => ({ 
+		...pickExclude(item, ['path']), 
+		url: item.path, 
+		size:item.size,
 		// #ifdef H5
 		name: item.name,
-		type: item.type
-		// #endif 
+		type: item.type,
+		file: item
+		// #endif 
 	}))
 }
 export function chooseFile({
@@ -68,8 +87,14 @@ export function chooseFile({
     maxDuration,
     sizeType,
     camera,
-    maxCount
+    maxCount,
+    extension
 }) {
+    try {
+        capture = test.array(capture) ? capture : capture.split(',');
+    } catch(e) {
+        capture = [];
+    }
     return new Promise((resolve, reject) => {
         switch (accept) {
         case 'image':
@@ -105,8 +130,8 @@ export function chooseFile({
                 fail: reject
             })
             break
-            // #ifdef MP-WEIXIN || H5
-            // 只有微信小程序才支持chooseMessageFile接口
+        // #ifdef MP-WEIXIN || H5
+        // 只有微信小程序才支持chooseMessageFile接口
         case 'file':
             // #ifdef MP-WEIXIN
             wx.chooseMessageFile({
@@ -118,33 +143,41 @@ export function chooseFile({
             // #endif
             // #ifdef H5
             // 需要hx2.9.9以上才支持uni.chooseFile
-            uni.chooseFile({
+            let params = {
                 count: multiple ? maxCount : 1,
                 type: accept,
                 success: (res) => resolve(formatFile(res)),
                 fail: reject
-            })
+            }
+            if (extension.length && extension.length > 0) {
+                params.extension = extension
+            }
+            uni.chooseFile(params)
             // #endif
             break
-				// #endif
-		default: 
-			// 此为保底选项，在accept不为上面任意一项的时候选取全部文件
-			// #ifdef MP-WEIXIN
-			wx.chooseMessageFile({
-			    count: multiple ? maxCount : 1,
-			    type: 'all',
-			    success: (res) => resolve(formatFile(res)),
-			    fail: reject
-			})
-			// #endif
-			// #ifdef H5
-			// 需要hx2.9.9以上才支持uni.chooseFile
-			uni.chooseFile({
-				count: multiple ? maxCount : 1,
-				type: 'all',
-				success: (res) => resolve(formatFile(res)),
-				fail: reject
-			})
+		// #endif
+		default: 
+			// 此为保底选项，在accept不为上面任意一项的时候选取全部文件
+			// #ifdef MP-WEIXIN
+			wx.chooseMessageFile({
+			    count: multiple ? maxCount : 1,
+			    type: 'all',
+			    success: (res) => resolve(formatFile(res)),
+			    fail: reject
+			})
+			// #endif
+			// #ifdef H5
+			// 需要hx2.9.9以上才支持uni.chooseFile
+            let paramsFile = {
+                count: multiple ? maxCount : 1,
+				type: 'all',
+				success: (res) => resolve(formatFile(res)),
+				fail: reject
+            }
+            if (extension.length && extension.length > 0) {
+                paramsFile.extension = extension
+            }
+			uni.chooseFile(paramsFile)
 			// #endif
         }
     })

package/uview-plus/components/u-verification-code/u-verification-code.vue

@@ -0,0 +1,161 @@
+<template>
+  <view class="u-code-wrap">
+    <!-- 此组件功能由js完成，无需写html逻辑 -->
+  </view>
+</template>
+
+<script>
+/**
+ * verificationCode 验证码输入框
+ * @description 考虑到用户实际发送验证码的场景，可能是一个按钮，也可能是一段文字，提示语各有不同，所以本组件 不提供界面显示，只提供提示语，由用户将提示语嵌入到具体的场景
+ * @tutorial https://www.uviewui.com/components/verificationCode.html
+ * @property {Number String} seconds 倒计时所需的秒数（默认60）
+ * @property {String} start-text 开始前的提示语，见官网说明（默认获取验证码）
+ * @property {String} change-text 倒计时期间的提示语，必须带有字母"x"，见官网说明（默认X秒重新获取）
+ * @property {String} end-text 倒计结束的提示语，见官网说明（默认重新获取）
+ * @property {Boolean} keep-running 是否在H5刷新或各端返回再进入时继续倒计时（默认false）
+ * @event {Function} change 倒计时期间，每秒触发一次
+ * @event {Function} start 开始倒计时触发
+ * @event {Function} end 结束倒计时触发
+ * @example <up-verification-code :seconds="seconds" @end="end" @start="start" ref="uCode"
+ */
+export default {
+  name: 'up-verification-code',
+  props: {
+    // 倒计时总秒数
+    seconds: {
+      type: [String, Number],
+      default: 60
+    },
+    // 尚未开始时提示
+    startText: {
+      type: String,
+      default: '获取验证码'
+    },
+    // 正在倒计时中的提示
+    changeText: {
+      type: String,
+      default: 'X秒重新获取'
+    },
+    // 倒计时结束时的提示
+    endText: {
+      type: String,
+      default: '重新获取'
+    },
+    // 是否在H5刷新或各端返回再进入时继续倒计时
+    keepRunning: {
+      type: Boolean,
+      default: false
+    },
+    // 为了区分多个页面，或者一个页面多个倒计时组件本地存储的继续倒计时变了
+    uniqueKey: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      secNum: this.seconds,
+      timer: null,
+      canGetCode: true // 是否可以执行验证码操作
+    };
+  },
+  mounted() {
+    this.checkKeepRunning();
+  },
+  watch: {
+    seconds: {
+      immediate: true,
+      handler(n) {
+        this.secNum = n;
+      }
+    }
+  },
+  methods: {
+    checkKeepRunning() {
+      // 获取上一次退出页面(H5还包括刷新)时的时间戳，如果没有上次的保存，此值可能为空
+      let lastTimestamp = Number(uni.getStorageSync(this.uniqueKey + '_$uCountDownTimestamp'));
+      if (!lastTimestamp) return this.changeEvent(this.startText);
+      // 当前秒的时间戳
+      let nowTimestamp = Math.floor(+new Date() / 1000);
+      // 判断当前的时间戳，是否小于上一次的本该按设定结束，却提前结束的时间戳
+      if (this.keepRunning && lastTimestamp && lastTimestamp > nowTimestamp) {
+        // 剩余尚未执行完的倒计秒数
+        this.secNum = lastTimestamp - nowTimestamp;
+        // 清除本地保存的变量
+        uni.removeStorageSync(this.uniqueKey + '_$uCountDownTimestamp');
+        // 开始倒计时
+        this.start();
+      } else {
+        // 如果不存在需要继续上一次的倒计时，执行正常的逻辑
+        this.changeEvent(this.startText);
+      }
+    },
+    // 开始倒计时
+    start() {
+      // 防止快速点击获取验证码的按钮而导致内部产生多个定时器导致混乱
+      if (this.timer) {
+        clearInterval(this.timer);
+        this.timer = null;
+      }
+      this.$emit('start');
+      this.canGetCode = false;
+      // 这里放这句，是为了一开始时就提示，否则要等setInterval的1秒后才会有提示
+      this.changeEvent(this.changeText.replace(/x|X/, this.secNum));
+      this.setTimeToStorage();
+      this.timer = setInterval(() => {
+        if (--this.secNum) {
+          // 用当前倒计时的秒数替换提示字符串中的"x"字母
+          this.changeEvent(this.changeText.replace(/x|X/, this.secNum));
+        } else {
+          clearInterval(this.timer);
+          this.timer = null;
+          this.changeEvent(this.endText);
+          this.secNum = this.seconds;
+          this.$emit('end');
+          this.canGetCode = true;
+        }
+      }, 1000);
+    },
+    // 重置，可以让用户再次获取验证码
+    reset() {
+      this.canGetCode = true;
+      clearInterval(this.timer);
+      this.secNum = this.seconds;
+      this.changeEvent(this.endText);
+    },
+    changeEvent(text) {
+      this.$emit('change', text);
+    },
+    // 保存时间戳，为了防止倒计时尚未结束，H5刷新或者各端的右上角返回上一页再进来
+    setTimeToStorage() {
+      if (!this.keepRunning || !this.timer) return;
+      // 记录当前的时间戳，为了下次进入页面，如果还在倒计时内的话，继续倒计时
+      // 倒计时尚未结束，结果大于0；倒计时已经开始，就会小于初始值，如果等于初始值，说明没有开始倒计时，无需处理
+      if (this.secNum > 0 && this.secNum <= this.seconds) {
+        // 获取当前时间戳(+ new Date()为特殊写法)，除以1000变成秒，再去除小数部分
+        let nowTimestamp = Math.floor(+new Date() / 1000);
+        // 将本该结束时候的时间戳保存起来 => 当前时间戳 + 剩余的秒数
+        uni.setStorage({
+          key: this.uniqueKey + '_$uCountDownTimestamp',
+          data: nowTimestamp + Number(this.secNum)
+        });
+      }
+    }
+  },
+  // 组件销毁的时候，清除定时器，否则定时器会继续存在，系统不会自动清除
+  beforeDestroy() {
+    this.setTimeToStorage();
+    clearTimeout(this.timer);
+    this.timer = null;
+  }
+};
+</script>
+<style scoped>
+.u-code-wrap {
+  width: 0;
+  height: 0;
+  position: fixed;
+  z-index: -1;
+}
+</style>

package/uview-plus/components/u-view/style.css

@@ -0,0 +1,26 @@
+/* #ifndef APP-NVUE */
+.u-empty,
+.u-empty__wrap,
+.u-tabs,
+.u-tabs__wrapper,
+.u-tabs__wrapper__scroll-view-wrapper,
+.u-tabs__wrapper__scroll-view,
+.u-tabs__wrapper__nav,
+.u-tabs__wrapper__nav__line,
+.up-empty,
+.up-empty__wrap,
+.up-tabs,
+.up-tabs__wrapper,
+.up-tabs__wrapper__scroll-view-wrapper,
+.up-tabs__wrapper__scroll-view,
+.up-tabs__wrapper__nav,
+.up-tabs__wrapper__nav__line {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+/* #endif */

package/uview-plus/components/u-view/style.scss

@@ -0,0 +1,4 @@
+@import '../../libs/css/components.scss';
+
+.u-view {
+}

package/uview-plus/components/u-view/u-view.vue

@@ -0,0 +1,3 @@
+<template>
  <view
    class="u-view"
    :class="class"
    :style="{
      backgroundColor: backgroundColor,
      color: color,
      flexDirection: flexDirection,
      justifyContent: justifyContent,
      alignItems: alignItems,
      flex1: flex1,
      width: width,
      height: height,
      padding: padding,
      margin: margin,
      borderColor: borderColor
    }"
  ></view>
 * View 视图
 * @description 对View默认标签的封装
 * @tutorial https://ijry.github.io/uview-plus/components/view.html
 * @property {String} 					bgColor		背景颜色
 * @event {Function} click  点击触发事件
 * @example <up-view></up-view>
 */
  name: 'up-view',
  // #ifdef MP
  mixins: [mpMixin, mixin],
  // #endif
  // #ifndef MP
  mixins: [mpMixin, mixin],
  // #endif
  emits: ['click'],
  computed: {
    valueStyle() {}
  },
  props: {
    backgroundColor: '',
    color: '',
    flexDirection: '',
    justifyContent: '',
    alignItems: '',
    flex1: '',
    width: '',
    height: '',
    padding: '',
    margin: '',
    borderColor: ''
  },
  data() {
    return {};
  },
  methods: {
    addStyle,
    clickHandler() {
      this.$emit('click');
    }
  }
+@import './style.css';
+</style>

package/uview-plus/components/u-waterfall/style.css

@@ -0,0 +1,51 @@
+/* #ifndef APP-NVUE */
+.u-empty,
+.u-empty__wrap,
+.u-tabs,
+.u-tabs__wrapper,
+.u-tabs__wrapper__scroll-view-wrapper,
+.u-tabs__wrapper__scroll-view,
+.u-tabs__wrapper__nav,
+.u-tabs__wrapper__nav__line,
+.up-empty,
+.up-empty__wrap,
+.up-tabs,
+.up-tabs__wrapper,
+.up-tabs__wrapper__scroll-view-wrapper,
+.up-tabs__wrapper__scroll-view,
+.up-tabs__wrapper__nav,
+.up-tabs__wrapper__nav__line {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+/* #endif */
+.u-waterfall {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  flex-direction: row;
+  align-items: flex-start;
+}
+.u-column {
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  flex-direction: row;
+  flex: 1;
+  flex-direction: column;
+  overflow: hidden;
+  /* #ifndef APP-NVUE */
+  height: 100%;
+  /* #endif */
+}
+.u-image {
+  /* #ifndef APP-NVUE */
+  max-width: 100%;
+  /* #endif */
+}

package/uview-plus/components/u-waterfall/style.scss

@@ -0,0 +1,23 @@
+@import '../../libs/css/components.scss';
+
+.u-waterfall {
+  @include flex;
+  flex-direction: row;
+  align-items: flex-start;
+}
+
+.u-column {
+  @include flex;
+  flex: 1;
+  flex-direction: column;
+  overflow: hidden;
+  /* #ifndef APP-NVUE */
+  height: 100%;
+  /* #endif */
+}
+
+.u-image {
+  /* #ifndef APP-NVUE */
+  max-width: 100%;
+  /* #endif */
+}