uview-plus 3.4.22 → 3.4.23

package/components/u-search/props.js

@@ -129,6 +129,10 @@ export const props = defineMixin({
         autoBlur: {
             type: Boolean,
             default: () => false
+        },
+        iconPosition: {
+            type: String,
+            default: () => defProps.search.iconPosition
         }
     }
 })

package/components/u-search/search.js

@@ -27,6 +27,7 @@ export default {
         color: '#606266',
         placeholderColor: '#909399',
         searchIcon: 'search',
+        iconPosition: 'left',
         margin: '0',
         animation: false,
         value: '',

package/components/u-search/u-search.vue

@@ -1,6 +1,7 @@
 <template>
 	<view
 	    class="u-search"
+		:class="[iconPosition === 'right' && 'u-search__reverse']"
 	    @tap="clickHandler"
 	    :style="[{
 			margin: margin,
@@ -100,6 +101,7 @@
 	 * @property {String}			color				输入框字体颜色（默认 '#606266' ）
 	 * @property {String}			placeholderColor	placeholder的颜色（默认 '#909399' ）
 	 * @property {String}			searchIcon			输入框左边的图标，可以为uView图标名称或图片路径  (默认 'search' )
+	 * @property {String}			iconPosition		输入框图标位置，left-左边, right-右边  (默认 'left' )
 	 * @property {String}			margin				组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30px"   (默认 '0' )
 	 * @property {Boolean} 			animation			是否开启动画，见上方说明（默认 false ）
 	 * @property {String}			value				输入框初始值
@@ -328,5 +330,13 @@ $u-search-action-margin-left: 5px !default;
 			margin-left: $u-search-action-margin-left;
 		}
 	}
+
+	&__reverse &__content__icon {
+		order: 3;
+	}
+
+	&__reverse &__content__close {
+		order: 2;
+	}
 }
 </style>

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

@@ -200,6 +200,7 @@
 	 * @tutorial https://uview-plus.jiangruyi.com/components/upload.html
 	 * @property {String}			accept				接受的文件类型, 可选值为all media image file video （默认 'image' ）
 	 * @property {String | Array}	capture				图片或视频拾取模式，当accept为image类型时设置capture可选额外camera可以直接调起摄像头（默认 ['album', 'camera'] ）
+	 * @property {Array}			extension			选择文件的后缀名，暂只支持.zip、.png等，不支持application/msword等值
 	 * @property {Boolean}			compressed			当accept为video时生效，是否压缩视频，默认为true（默认 true ）
 	 * @property {String}			camera				当accept为video时生效，可选值为back或front（默认 'back' ）
 	 * @property {Number}			maxDuration			当accept为video时生效，拍摄视频最长拍摄时间，单位秒（默认 60 ）
@@ -334,8 +335,8 @@
 					const name = item.name || item.url || item.thumb
 					return Object.assign(Object.assign({}, item), {
 						// 如果item.url为本地选择的blob文件的话，无法判断其为video还是image，此处优先通过accept做判断处理
-						isImage: name ? test.image(name) : (this.accept === 'image' || test.image(name)),
-						isVideo: name ? test.video(name) : (this.accept === 'video' || test.video(name)),
+						isImage: item.name ? test.image(item.name) : (this.accept === 'image' || test.image(name)),
+						isVideo: item.name ? test.video(item.name) : (this.accept === 'video' || test.video(name)),
 						deletable: typeof item.deletable === 'boolean' ? item.deletable : this.deletable,
 					})
 				});
@@ -349,31 +350,25 @@
 					lists,
 					disabled
 				} = this;
-				if (disabled) return;
-				// 如果用户传入的是字符串，需要格式化成数组
-				let capture;
-				try {
-					capture = test.array(this.capture) ? this.capture : this.capture.split(',');
-				}catch(e) {
-					capture = [];
-				}
-				chooseFile(
-						Object.assign({
-							accept: this.accept,
-							extension: this.extension,
-							multiple: this.multiple,
-							capture: this.capture,
-							compressed: this.compressed,
-							maxDuration: this.maxDuration,
-							sizeType: this.sizeType,
-							camera: this.camera,
-						}, {
-							maxCount: maxCount - lists.length,
-							...params
-						})
-					)
+				if (disabled) return Promise.reject();
+				const chooseParams = Object.assign({
+					accept: this.accept,
+					extension: this.extension,
+					multiple: this.multiple,
+					capture: this.capture,
+					compressed: this.compressed,
+					maxDuration: this.maxDuration,
+					sizeType: this.sizeType,
+					camera: this.camera,
+				}, {
+					maxCount: maxCount - lists.length,
+					...params
+				})
+				return chooseFile(chooseParams)
 					.then((res) => {
-						this.onBeforeRead(multiple ? res : res[0]);
+						const result = chooseParams.multiple ? res : res[0]
+						this.onBeforeRead(result);
+						return result
 					})
 					.catch((error) => {
 						this.$emit('error', error);
@@ -411,7 +406,7 @@
 				if (test.promise(res)) {
 					res.then((data) => this.onAfterRead(data || file));
 				} else {
-					this.onAfterRead(res);
+					this.onAfterRead(file);
 				}
 			},
 			getDetail(index) {

package/package.json

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

package/types/comps/search.d.ts

@@ -89,6 +89,11 @@ declare interface SearchProps {
    * @default "search"
    */
   searchIcon?: string
+  /**
+   * 输入框图标位置，left-左边，right-右边
+   * @default "left"
+   */
+  iconPosition?: 'left' | 'right'
   /**
    * 组件与其他上下左右元素之间的距离，带单位的字符串形式，如"30rpx"、"30rpx 20rpx"等写法
    * @default "0"

package/types/comps/upload.d.ts

@@ -1,6 +1,33 @@
 import { AllowedComponentProps, VNodeProps } from './_common'
 import { ImageMode } from './image';
 
+type BaseFileInfo = {
+    type: string
+    url: string
+    name: string
+    size: number
+    file: File
+    [key: string]: any
+}
+
+type ImageFileInfo = BaseFileInfo & {
+    type: 'image'
+    thumb: string
+}
+
+type VideoFileInfo = BaseFileInfo & {
+    type: 'video'
+    thumb: string
+    width: number
+    height: number
+}
+
+type MediaFileInfo = BaseFileInfo & {
+    thumb: string
+}
+
+type FileInfo = BaseFileInfo | ImageFileInfo | VideoFileInfo | MediaFileInfo
+
 declare interface UploadProps {
   /**
    * 接受的文件类型，file只支持H5（只有微信小程序才支持把accept配置为all、media）
@@ -12,6 +39,10 @@ declare interface UploadProps {
    * @default ["album", "camera"]
    */
   capture?: 'album' | 'camera' | ('album' | 'camera')[]
+  /**
+   * 选择文件的后缀名，暂只支持.zip、.png等，不支持application/msword等值
+   */
+  extension?: string [];
   /**
    * 当accept为video时生效，是否压缩视频，默认为true
    * @default true
@@ -131,6 +162,11 @@ declare interface UploadProps {
   onDelete?: (index, file, name) => any
 }
 
+type ChooseFileParams = Pick<
+  UploadProps,
+  'accept' | 'multiple' | 'capture' | 'compressed' | 'maxDuration' | 'sizeType' | 'camera' | 'maxCount' | 'extension'
+>;
+
 declare interface UploadSlots {
   /**
    * 自定义上传样式
@@ -147,6 +183,11 @@ declare interface _UploadRef {
    * 读取前的处理函数
    */
   beforeRead: (file, lists, name) => any
+  /**
+   * 触发文件选择器
+   */
+  chooseFile(params: ChooseFileParams & { multiple: true }): Promise<FileInfo[]>;
+  chooseFile(params?: ChooseFileParams & { multiple?: false }): Promise<FileInfo>;
 }
 
 declare interface _Upload {