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

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-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 */
+}

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

@@ -0,0 +1,3 @@
+<template>
  <view class="u-waterfall">
    <view ref="u-left-column" id="u-left-column" class="u-column">
      <slot name="left" :leftList="leftList"></slot>
    </view>
    <view ref="u-right-column" id="u-right-column" class="u-column">
      <slot name="right" :rightList="rightList"></slot>
    </view>
  </view>
 * waterfall 瀑布流
 * @description 这是一个瀑布流形式的组件，内容分为左右两列，结合uview的懒加载组件效果更佳。相较于某些只是奇偶数左右分别，或者没有利用vue作用域插槽的做法，uview的瀑布流实现了真正的 组件化，搭配LazyLoad 懒加载和loadMore 加载更多组件，让您开箱即用，眼前一亮。
 * @tutorial https://uview-plus.jiangruyi.com/components/waterfall.html
 * @property {Array} flow-list 用于渲染的数据
 * @property {String Number} add-time 单条数据添加到队列的时间间隔，单位ms，见上方注意事项说明（默认200）
 * @example <u-waterfall :flowList="flowList"></u-waterfall>
 */
  name: 'u-waterfall',
  props: {
    // #ifdef VUE2
    value: {
      // 瀑布流数据
      type: Array,
      required: true,
      default: function () {
        return [];
      }
    },
    // #endif
    // #ifdef VUE3
    modelValue: {
      // 瀑布流数据
      type: Array,
      required: true,
      default: function () {
        return [];
      }
    },
    // #endif
    // 每次向结构插入数据的时间间隔，间隔越长，越能保证两列高度相近，但是对用户体验越不好
    // 单位ms
    addTime: {
      type: [Number, String],
      default: 200
    },
    // id值，用于清除某一条数据时，根据此idKey名称找到并移除，如数据为{idx: 22, name: 'lisa'}
    // 那么该把idKey设置为idx
    idKey: {
      type: String,
      default: 'id'
    }
  },
  mixins: [mpMixin, mixin],
  data() {
    return {
      leftList: [],
      rightList: [],
      tempList: [],
      children: []
    };
  },
  watch: {
    copyFlowList(nVal, oVal) {
      if (!nVal || nVal.length == 0) {
        this.clear(false);
        // console.log('clear');
      } else {
        // 取差值，即这一次数组变化新增的部分
        let startIndex = Array.isArray(oVal) && oVal.length > 0 ? oVal.length : 0;
        // 拼接上原有数据
        this.tempList = this.tempList.concat(this.cloneData(nVal.slice(startIndex)));
        this.splitData();
      }
    }
  },
  mounted() {
    this.tempList = this.cloneData(this.copyFlowList);
    this.splitData();
  },
  computed: {
    // 破坏flowList变量的引用，否则watch的结果新旧值是一样的
    copyFlowList() {
      // #ifdef VUE3
      if (!this.modelValue || this.modelValue.length == 0) {
        this.clear(false);
        // console.log('clear');
        return [];
      } else {
        return this.cloneData(this.modelValue);
      }
      // #endif
      // #ifdef VUE2
      return this.cloneData(this.value);
      // #endif
    }
  },
  emits: ['update:modelValue'],
  methods: {
    async splitData() {
      if (!this.tempList.length) return;
      let leftRect = await this.$uGetRect('#u-left-column');
      let rightRect = await this.$uGetRect('#u-right-column');
      // 如果左边小于或等于右边，就添加到左边，否则添加到右边
      let item = this.tempList[0];
      // 解决多次快速上拉后，可能数据会乱的问题，因为经过上面的两个await节点查询阻塞一定时间，加上后面的定时器干扰
      // 数组可能变成[]，导致此item值可能为undefined
      if (!item) return;
      if (leftRect.height < rightRect.height) {
        this.leftList.push(item);
      } else if (leftRect.height > rightRect.height) {
        this.rightList.push(item);
      } else {
        // 这里是为了保证第一和第二张添加时，左右都能有内容
        // 因为添加第一张，实际队列的高度可能还是0，这时需要根据队列元素长度判断下一个该放哪边
        if (this.leftList.length <= this.rightList.length) {
          this.leftList.push(item);
        } else {
          this.rightList.push(item);
        }
      }
      // 移除临时列表的第一项
      this.tempList.splice(0, 1);
      // 如果临时数组还有数据，继续循环
      if (this.tempList.length) {
        setTimeout(() => {
          this.splitData();
        }, this.addTime);
      }
    },
    // 复制而不是引用对象和数组
    cloneData(data) {
      return JSON.parse(JSON.stringify(data));
    },
    // 清空数据列表
    clear(bak = true) {
      this.leftList = [];
      this.rightList = [];
      // 同时清除父组件列表中的数据
      if (bak) {
        // #ifdef VUE2
        this.$emit('input', []);
        // #endif
        // #ifdef VUE3
        this.$emit('update:modelValue', []);
        // #endif
      }
      this.tempList = [];
    },
    // 清除某一条指定的数据，根据id实现
    remove(id) {
      // 如果findIndex找不到合适的条件，就会返回-1
      let index = -1;
      index = this.leftList.findIndex((val) => val[this.idKey] == id);
      if (index != -1) {
        // 如果index不等于-1，说明已经找到了要找的id，根据index索引删除这一条数据
        this.leftList.splice(index, 1);
      } else {
        // 同理于上方面的方法
        index = this.rightList.findIndex((val) => val[this.idKey] == id);
        if (index != -1) this.rightList.splice(index, 1);
      }
      // 同时清除父组件的数据中的对应id的条目
      // #ifdef VUE2
      index = this.value.findIndex((val) => val[this.idKey] == id);
      if (index != -1) this.$emit('input', this.value.splice(index, 1));
      // #endif
      // #ifdef VUE3
      index = this.modelValue.findIndex((val) => val[this.idKey] == id);
      if (index != -1) this.$emit('update:modelValue', this.modelValue.splice(index, 1));
      // #endif
    },
    // 修改某条数据的某个属性
    modify(id, key, value) {
      // 如果findIndex找不到合适的条件，就会返回-1
      let index = -1;
      index = this.leftList.findIndex((val) => val[this.idKey] == id);
      if (index != -1) {
        // 如果index不等于-1，说明已经找到了要找的id，修改对应key的值
        this.leftList[index][key] = value;
      } else {
        // 同理于上方面的方法
        index = this.rightList.findIndex((val) => val[this.idKey] == id);
        if (index != -1) this.rightList[index][key] = value;
      }
      // 修改父组件的数据中的对应id的条目
      // #ifdef VUE2
      index = this.value.findIndex((val) => val[this.idKey] == id);
      // #endif
      // #ifdef VUE3
      index = this.modelValue.findIndex((val) => val[this.idKey] == id);
      // #endif
      if (index != -1) {
        // 首先复制一份value的数据
        // #ifdef VUE2
        let data = this.cloneData(this.value);
        // #endif
        // #ifdef VUE3
        let data = this.cloneData(this.modelValue);
        // #endif
        // 修改对应索引的key属性的值为value
        data[index][key] = value;
        // 修改父组件通过v-model绑定的变量的值
        // #ifdef VUE2
        this.$emit('input', data);
        // #endif
        // #ifdef VUE3
        this.$emit('update:modelValue', data);
        // #endif
      }
    }
  }
+@import './style.css';
+</style>