uview-plus 3.2.24 → 3.3.1

package/components/u-tr/props.js

@@ -1,5 +1,6 @@
-// import defProps from '../../libs/config/props.js';
-export default {
+// import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
 
     }

package/components/u-tr/u-tr.vue

@@ -5,9 +5,9 @@
 </template>
 
 <script>
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	/**
 	 * Tr  
 	 * @description 

package/components/u-transition/props.js

@@ -1,5 +1,6 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 是否展示组件
         show: {
@@ -22,4 +23,4 @@ export default {
             default: () => defProps.transition.timingFunction
         }
     }
-}
+})

package/components/u-transition/u-transition.vue

@@ -13,9 +13,9 @@
 </template>
 
 <script>
-import props from './props';
-import mpMixin from '../../libs/mixin/mpMixin';
-import mixin from '../../libs/mixin/mixin';
+import { props } from './props';
+import { mpMixin } from '../../libs/mixin/mpMixin';
+import { mixin } from '../../libs/mixin/mixin';
 import { addStyle } from '../../libs/function/index';
 // 组件的methods方法，由于内容较长，写在外部文件中通过mixin引入
 import transition from "./transition.js";

package/components/u-upload/mixin.js

@@ -1,5 +1,6 @@
-import { error } from '../../libs/function/index';
-export default {
+import { error } from '../../libs/function/index'
+
+export const mixinUpload = {
     watch: {
         // 监听accept的变化，判断是否符合个平台要求
         // 只有微信小程序才支持选择媒体，文件类型，所以这里做一个判断提示

package/components/u-upload/props.js

@@ -1,11 +1,16 @@
-import defProps from '../../libs/config/props.js';
-export default {
+import { defineMixin } from '../../libs/vue'
+import defProps from '../../libs/config/props.js'
+export const props = defineMixin({
     props: {
         // 接受的文件类型, 可选值为all media image file video
         accept: {
             type: String,
             default: () => defProps.upload.accept
         },
+        extension: {
+            type: Array,
+            default: () => defProps.upload.extension
+        },
         // 	图片或视频拾取模式，当accept为image类型时设置capture可选额外camera可以直接调起摄像头
         capture: {
             type: [String, Array],
@@ -122,4 +127,4 @@ export default {
             default: () => defProps.upload.previewImage
         }
     }
-}
+})

package/components/u-upload/u-upload.vue

@@ -131,10 +131,10 @@
 	import {
 		chooseFile
 	} from './utils';
-	import mixinUp from './mixin.js';
-	import props from './props';
-	import mpMixin from '../../libs/mixin/mpMixin';
-	import mixin from '../../libs/mixin/mixin';
+	import { mixinUpload } from './mixin';
+	import { props } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
 	import { addStyle, addUnit, toast } from '../../libs/function/index';
 	import test from '../../libs/function/test';
 	/**
@@ -172,7 +172,7 @@
 	 */
 	export default {
 		name: "u-upload",
-		mixins: [mpMixin, mixin, mixinUp, props],
+		mixins: [mpMixin, mixin, mixinUpload, props],
 		data() {
 			return {
 				// #ifdef APP-NVUE
@@ -231,6 +231,7 @@
 				chooseFile(
 						Object.assign({
 							accept: this.accept,
+							extension: this.extension,
 							multiple: this.multiple,
 							capture: capture,
 							compressed: this.compressed,

package/components/u-upload/utils.js

@@ -1,4 +1,4 @@
-function pickExclude(obj, keys) {
+function pickExclude(obj, keys) {
 	// 某些情况下，type可能会为
     if (!['[object Object]', '[object File]'].includes(Object.prototype.toString.call(obj))) {
         return {}
@@ -12,52 +12,52 @@ 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
+		// #endif
     }))
 }
 
 function formatVideo(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,
+			// #ifdef H5
+			name: res.name
+			// #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
     }))
 }
 
 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 
+		// #endif 
 	}))
 }
 export function chooseFile({
@@ -68,7 +68,8 @@ export function chooseFile({
     maxDuration,
     sizeType,
     camera,
-    maxCount
+    maxCount,
+    extension
 }) {
     return new Promise((resolve, reject) => {
         switch (accept) {
@@ -118,33 +119,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/index.js

@@ -2,9 +2,9 @@
 // const pleaseSetTranspileDependencies = {}, babelTest = pleaseSetTranspileDependencies?.test
 
 // 引入全局mixin
-import mixin from './libs/mixin/mixin.js'
+import { mixin } from './libs/mixin/mixin.js'
 // 小程序特有的mixin
-import mpMixin from './libs/mixin/mpMixin.js'
+import { mpMixin } from './libs/mixin/mpMixin.js'
 // 全局挂载引入http相关请求拦截插件
 import Request from './libs/luch-request'
 

package/libs/config/props/upload.js

@@ -11,6 +11,7 @@ export default {
 	// upload组件
 	upload: {
 		accept: 'image',
+		extension: [],
 		capture: ['album', 'camera'],
 		compressed: true,
 		camera: 'back',

package/libs/mixin/button.js

@@ -1,4 +1,6 @@
-export default {
+import { defineMixin } from '../vue'
+
+export const buttonMixin = defineMixin({
     props: {
         lang: String,
         sessionFrom: String,
@@ -10,4 +12,4 @@ export default {
         formType: String,
         openType: String
     }
-}
+})

package/libs/mixin/mixin.js

@@ -1,7 +1,9 @@
-import { deepMerge, $parent } from '../function/index';
-import test from '../function/test';
-import route from '../util/route';
-export default {
+import { defineMixin } from '../vue'
+import { deepMerge, $parent } from '../function/index'
+import test from '../function/test'
+import route from '../util/route'
+
+export const mixin = defineMixin({
     // 定义每个组件都可能需要用到的外部样式以及类名
     props: {
         // 每个组件都有的父组件传递的样式，可以为字符串或者对象形式
@@ -169,4 +171,6 @@ export default {
             })
         }
     }
-}
+})
+
+export default mixin

package/libs/mixin/mpMixin.js

@@ -1,8 +1,10 @@
-export default {
+import { defineMixin } from '../vue'
+
+export const mpMixin = defineMixin({
     // #ifdef MP-WEIXIN
     // 将自定义节点设置成虚拟的，更加接近Vue组件的表现，能更好的使用flex属性
     options: {
         virtualHost: true
     }
     // #endif
-}
+})

package/libs/mixin/mpShare.js

@@ -1,5 +1,6 @@
+import { defineMixin } from '../vue'
 
-export default {
+export const mpShare = defineMixin({
     data() {
         return {
             mpShare: {
@@ -12,4 +13,6 @@ export default {
     onShareAppMessage() {
         return this.mpShare;
     }
-}
+})
+
+export default mpShare

package/libs/mixin/openType.js

@@ -1,4 +1,6 @@
-export default {
+import { defineMixin } from '../vue'
+
+export const openType = defineMixin({
     props: {
         openType: String
     },
@@ -22,4 +24,4 @@ export default {
             this.$emit('opensetting', event.detail)
         }
     }
-}
+})

package/libs/mixin/style.js

@@ -1,5 +1,7 @@
-import { addStyle, deepMerge, addUnit, trim } from '../function/index';
-export default {
+import { defineMixin } from '../vue'
+import { addStyle, deepMerge, addUnit, trim } from '../function/index'
+
+export const style = defineMixin({
     props: {
         // flex排列方式
         flexDirection: {
@@ -244,4 +246,4 @@ export default {
             return trim(unit).split(' ').map((item) => addUnit(item)).join(' ')
         }
     }
-}
+})

package/libs/mixin/touch.js

@@ -1,3 +1,5 @@
+import { defineMixin } from '../vue'
+
 const MIN_DISTANCE = 10
 
 function getDirection(x, y) {
@@ -10,7 +12,7 @@ function getDirection(x, y) {
     return ''
 }
 
-export default {
+export const touchMixin = defineMixin({
     methods: {
         getTouchPoint(e) {
             if (!e) {
@@ -56,4 +58,4 @@ export default {
             this.direction =				this.direction || getDirection(this.offsetX, this.offsetY)
         }
     }
-}
+})

package/libs/vue.js

@@ -0,0 +1,3 @@
+export const defineMixin = (options) => {
+  return options
+}

package/package.json

@@ -2,7 +2,7 @@
 	"id": "uview-plus",
 	"name": "uview-plus",
 	"displayName": "uview-plus3.0重磅发布，全面的Vue3移动组件库。",
-	"version": "3.2.24",
+	"version": "3.3.1",
 	"description": "uview-plus已兼容vue3，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
 	"keywords": [
         "uview",

package/types/comps/popup.d.ts

@@ -15,7 +15,7 @@ declare interface PopupProps {
    * 弹出方向
    * @default 'bottom'
    */
-  mode?: 'top' | 'right' | 'bottom' | 'center'
+  mode?: 'top' | 'right' | 'left'| 'bottom' | 'center'
   /**
    * 遮罩打开或收起的动画过渡时间，单位ms
    * @default 300