uview-plus 3.4.19 → 3.4.20

package/components/u-navbar-mini/u-navbar-mini.vue

@@ -6,7 +6,6 @@
 			></u-status-bar>
 			<view
 				class="u-navbar-mini__content"
-				:class="[border && 'u-border-bottom']"
 				:style="{
 					height: addUnit(height),
 					backgroundColor: bgColor,

package/components/u-status-bar/props.js

@@ -5,6 +5,11 @@ export const props = defineMixin({
         bgColor: {
             type: String,
             default: () => defProps.statusBar.bgColor
-        }
+        },
+		// 状态栏获取得高度
+		height: {
+			type: Number,
+			default: () => defProps.statusBar.height
+		}
     }
 })

package/components/u-status-bar/statusBar.js

@@ -10,6 +10,7 @@
 export default {
     // statusBar
     statusBar: {
-        bgColor: 'transparent'
+        bgColor: 'transparent',
+		height: 0
     }
 }

package/components/u-status-bar/u-status-bar.vue

@@ -34,11 +34,13 @@
 			this.isH5 = true
 			// #endif
 		},
+		emits: ['update:height'],
 		computed: {
 			style() {
 				const style = {}
 				// 状态栏高度，由于某些安卓和微信开发工具无法识别css的顶部状态栏变量，所以使用js获取的方式
 				let sheight = getWindowInfo().statusBarHeight
+				this.$emit('update:height', sheight)
 				if (sheight == 0) {
 					this.isH5 = true
 				} else {

package/components/u-tag/u-tag.vue

@@ -32,15 +32,29 @@
 						></u-icon>
 					</view>
 				</slot>
-				<text
-					class="u-tag__text"
-					:style="[textColor]"
-					:class="[`u-tag__text--${type}`, plain && `u-tag__text--${type}--plain`, `u-tag__text--${size}`]"
-				>
-					<slot>
-						{{ text }}
+				<view class="u-tag__content">
+					<slot name="content">
 					</slot>
-				</text>
+					<template v-if="!$slots.content">
+						<text
+							v-if="!$slots.default && !$slots.$default"
+							class="u-tag__text"
+							:style="[textColor]"
+							:class="[`u-tag__text--${type}`, plain && `u-tag__text--${type}--plain`, `u-tag__text--${size}`]"
+						>
+							{{ text }}
+						</text>
+						<text
+							v-else
+							class="u-tag__text"
+							:style="[textColor]"
+							:class="[`u-tag__text--${type}`, plain && `u-tag__text--${type}--plain`, `u-tag__text--${size}`]"
+						>
+							<slot>
+							</slot>
+						</text>
+					</template>
+				</view>
 			</view>
 			<view
 				class="u-tag__close"

package/components/u-upload/props.js

@@ -163,5 +163,10 @@ export const props = defineMixin({
 		    type: Boolean,
 		    default: () => defProps.upload.getVideoThumb
 		},
+        // 自定义自动上传后处理
+        customAfterAutoUpload: {
+		    type: Boolean,
+		    default: () => defProps.upload.customAfterAutoUpload
+		},
     }
 })

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

@@ -263,7 +263,7 @@
 			}
 		},
 		// #ifdef VUE3
-		emits: ['error', 'beforeRead', 'oversize', 'afterRead', 'delete', 'clickPreview', 'update:fileList'],
+		emits: ['error', 'beforeRead', 'oversize', 'afterRead', 'delete', 'clickPreview', 'update:fileList', 'afterAutoUpload'],
 		// #endif
 		methods: {
 			addUnit,
@@ -491,12 +491,29 @@
 									// header: header,
 									formData: formData,
 									success: (uploadFileRes) => {
-										result = res0.data.params.host + '/' + res0.data.params.key;
 										let thumb = '';
-										if (this.accept === 'video' || test.video(result)) {
-											thumb = result + '?x-oss-process=video/snapshot,t_10000,m_fast';
+										let afterPromise = '';
+										if (that.customAfterAutoUpload) {
+											afterPromise = new Promise((resolve, reject) => {
+												that.$emit(
+													'afterAutoUpload',
+													Object.assign(res0, {
+														callback: (r) => {
+															r.url ? resolve(r) : reject();
+														},
+													})
+												);
+											});
+										}
+										if (test.promise(afterPromise)) {
+											afterPromise.then((data) => that.succcessUpload(len + j, data.url, data.thumb));
+										} else {
+											result = res0.data.params.host + '/' + res0.data.params.key;
+											if (that.accept === 'video' || test.video(result)) {
+												thumb = result + '?x-oss-process=video/snapshot,t_10000,m_fast';
+											}
+											that.succcessUpload(len + j, result, thumb);
 										}
-										that.succcessUpload(len + j, result, thumb);
 									}
 								});
 								uploadTask.onProgressUpdate((res) => {
@@ -517,9 +534,33 @@
 									name: 'file',
 									// fileType: 'video', // 仅支付宝小程序，且必填。
 									header: this.autoUploadHeader,
-									success: (r) => {
-										result = res0.data.params.host + '/' + res0.data.params.key;
-										that.succcessUpload(len + j, result);
+									success: (uploadFileRes) => {
+										let res0 = uploadFileRes.data;
+										let afterPromise = '';
+										if (that.customAfterAutoUpload) {
+											afterPromise = new Promise((resolve, reject) => {
+												that.$emit(
+													'afterAutoUpload',
+													Object.assign(res0, {
+														callback: (r) => {
+															r.url ? resolve(r) : reject();
+														}
+													})
+												);
+											});
+										}
+										if (test.promise(afterPromise)) {
+											afterPromise.then((data) => that.succcessUpload(len + j, data.url));
+										} else {
+											if (res0.code != 200) {
+												uni.showToast({
+													title: res0.msg
+												});
+											} else {
+												result = res0.data.url;
+												that.succcessUpload(len + j, result);
+											}
+										}
 									}
 								});
 								uploadTask.onProgressUpdate((res) => {

package/components/u-upload/upload.js

@@ -39,6 +39,7 @@ export default {
 		autoUploadAuthUrl: '',
 		autoUploadDriver: '',
 		autoUploadHeader: {},
-		getVideoThumb: false
+		getVideoThumb: false,
+		customAfterAutoUpload: false
 	}
 }

package/index.js

@@ -84,7 +84,15 @@ export const mount$u = function() {
     uni.$u = $u
 }
 
-// #ifdef H5
+function toCamelCase(str) {
+    return str.replace(/-([a-z])/g, function(match, group1) {
+      return group1.toUpperCase();
+    }).replace(/^[a-z]/, function(match) {
+      return match.toUpperCase();
+    });
+}
+
+// #ifdef APP || H5
 const importFn = import.meta.glob('./components/u-*/u-*.vue', { eager: true })
 let components = [];
 
@@ -102,18 +110,13 @@ for (const key in importFn) {
 }
 // #endif
 
-function toCamelCase(str) {
-    return str.replace(/-([a-z])/g, function(match, group1) {
-      return group1.toUpperCase();
-    }).replace(/^[a-z]/, function(match) {
-      return match.toUpperCase();
-    });
-}
-
 const install = (Vue, upuiParams = '') => {
-    // #ifdef H5
+    // #ifdef APP || H5
     components.forEach(function(component) {
         const name = component.name.replace(/u-([a-zA-Z0-9-_]+)/g, 'up-$1');
+		if (name != component.name) {
+			Vue.component(component.name, component); 
+		}
         Vue.component(name, component); 
     });
     // #endif

package/package.json

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