uview-plus 3.4.40 → 3.4.41

package/components/u-qrcode/qrcode.js

@@ -1036,11 +1036,10 @@ let QRCode = {};
             usingComponents: opt.usingComponents,
             showLoading: opt.showLoading,
             loadingText: opt.loadingText,
-            that: opt.that
         };
 
         let canvas = null;
-        
+
         if (typeof opt === 'string') { // 只编码ASCII字符串
             opt = {
                 text: opt
@@ -1087,11 +1086,11 @@ let QRCode = {};
             }
             return options.foreground;
         }
-        
+
         let getCanvas = async (id) => {
             return new Promise((resolve, reject)=>{
                 try {
-                    const query = uni.createSelectorQuery().in(this.options.that);
+                    const query = uni.createSelectorQuery().in(this.options.context);
                     query.select(`#${id}`)
                     .fields({ node: true, size: true })
                     .exec((res) => {
@@ -1101,7 +1100,6 @@ let QRCode = {};
                 catch (e) {
                     console.error("createCanvasContextFail",e)
                 }
-                
             })
         }
         // 创建canvas
@@ -1124,9 +1122,12 @@ let QRCode = {};
                 canvas.width = options.size;
                 canvas.height = options.size;
                 // #endif
-
                 ctx = canvas.getContext('2d');
             }
+            // 设置组件中data里面的ctx
+            options.context.ctx = ctx;
+            options.context.canvas = canvas;
+
             var count = qrCodeAlg.getModuleCount();
             var ratioSize = options.size;
             var ratioImgSize = options.imageSize;

package/components/u-qrcode/u-qrcode.vue

@@ -1,5 +1,11 @@
 <template>
-	<view class="u-qrcode" @longpress="longpress">
+	<view class="u-qrcode"
+          :id="rootId"
+          :style="{
+              width: useRootHeightAndWidth ? '100%' : 'auto',
+              height: useRootHeightAndWidth ? '100%' : 'auto',
+          }"
+          @longpress="longpress">
 		<view class="u-qrcode__content" @click="preview">
 			<!-- #ifndef APP-NVUE -->
 			<canvas
@@ -7,15 +13,15 @@
 				:id="cid"
                 :canvas-id="cid"
                 type="2d"
-                :style="{ width: size + unit, height: size + unit }" />
+                :style="{ width: sizeLocal + unit, height: sizeLocal + unit }" />
 			<!-- #endif -->
 			<!-- #ifdef APP-NVUE -->
 			<gcanvas class="u-qrcode__canvas" ref="gcanvess"
-				:style="{ width: size + unit, height: size + unit }">
+				:style="{ width: sizeLocal + unit, height: sizeLocal + unit }">
 			</gcanvas>
 			<!-- #endif -->
 			<view v-if="showLoading && loading" class="u-qrcode__loading"
-				:style="{ width: size + unit, height: size + unit }">
+				:style="{ width: sizeLocal + unit, height: sizeLocal + unit }">
 				<up-loading-icon vertical :text="loadingText" textSize="14px"></up-loading-icon>
 			</view>
 		</view>
@@ -104,8 +110,13 @@ export default {
 			type: Boolean,
 			default: false
 		},
+        // 是否使用根节点宽高
+        useRootHeightAndWidth: {
+            type: Boolean,
+            default: () => false
+        },
 	},
-	emits: ['result', 'longpress'],
+	emits: ['result', 'longpressCallback'],
 	data() {
 		return {
 			loading: false,
@@ -116,12 +127,21 @@ export default {
 					name: '保存二维码',
 				}
 			],
+            rootId: `rootId${Number(Math.random() * 100).toFixed(0)}`,
 			ganvas: null,
 			context: '',
-			canvasObj: {}
+			canvasObj: {},
+            sizeLocal: this.size,
+            ctx: null, // ctx 在new Qrcode 时js文件内部设置
+            canvas: null, // ctx 在new Qrcode 时js文件内部设置
 		}
 	},
-    mounted(){
+    async mounted(){
+        // 如果使用根节点的宽高 则 重新设置 size
+        if(this.useRootHeightAndWidth){
+            await this.setNewSize()
+        }
+
 		// #ifdef APP-NVUE
 		/*获取元素引用*/
 		this.ganvas = this.$refs["gcanvess"]
@@ -158,14 +178,13 @@ export default {
 					showLoading: false, // 是否显示loading
 					loadingText: that.loadingText, // loading文字
 					text: that.val, // 生成内容
-					size: that.size, // 二维码大小
+					size: that.sizeLocal, // 二维码大小
 					background: that.background, // 背景色
 					foreground: that.foreground, // 前景色
 					pdground: that.pdground, // 定位角点颜色
 					correctLevel: that.lv, // 容错级别
 					image: that.icon, // 二维码图标
 					imageSize: that.iconSize,// 二维码图标大小
-                    that,
 					cbResult: function (res) { // 生成二维码的回调
 						that._result(res)
 					},
@@ -223,9 +242,90 @@ export default {
 				url: this.result
 			}, e)
 		},
-		longpress() {
-			this.$emit('longpress', this.result)
+		async longpress() {
+            if (this.context) {
+                this.ctx.toTempFilePath(
+                    0,
+                    0,
+                    this.sizeLocal,
+                    this.sizeLocal,
+                    this.sizeLocal,
+                    this.sizeLocal,
+                    "",
+                    1,
+                    res => {
+                        this.$emit('longpressCallback', res.tempFilePath)
+                    }
+                );
+            }
+            else {
+                const canvas = await this.getNode(this.cId,true);
+                // #ifdef MP-TOUTIAO || H5
+                this.$emit('longpressCallback', this.ctx.canvas.toDataURL("image/png", 1));
+                // #endif
+
+                // #ifndef MP-TOUTIAO || H5
+                uni.canvasToTempFilePath(
+                    {
+                        canvas,
+                        success :res => {
+                            console.log(res.tempFilePath)
+                            this.$emit('longpressCallback', res.tempFilePath)
+                        },
+                        fail: err =>{
+                        }
+                    },
+                    this)
+                // #endif
+
+            }
+
 		},
+
+        /**
+         * 使用根节点宽高 设置新的size
+         * @return {Promise<void>}
+         */
+        async setNewSize(){
+            const rootNode = await this.getNode(this.rootId,false);
+            const { width , height } = rootNode;
+            // 将最短的设置为二维码 的size
+            if(width > height){
+                this.sizeLocal = height
+            }
+            else{
+                this.sizeLocal = width
+            }
+        },
+
+        /**
+         * 获取节点
+         * @param id 节点id
+         * @param isCanvas 是否为Canvas节点
+         * @return {Promise<unknown>}
+         */
+        async getNode(id,isCanvas){
+            return new Promise((resolve, reject)=>{
+                try {
+                    const query = uni.createSelectorQuery().in(this);
+                    query.select(`#${id}`)
+                    .fields({ node: true, size: true })
+                    .exec((res) => {
+                        if(isCanvas){
+                            resolve(res[0].node)
+                        }
+                        else{
+                            resolve(res[0])
+                        }
+
+                    })
+                }
+                catch (e) {
+                    console.error("获取节点失败",e)
+                }
+            })
+        },
+
 		selectClick(index) {
 			switch (index) {
 				case 0:

package/components/u-radio/u-radio.vue

@@ -246,7 +246,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	$u-radio-wrap-margin-right:6px !default;
 	$u-radio-wrap-font-size:20px !default;
 	$u-radio-wrap-border-width:1px !default;

package/components/u-radio-group/u-radio-group.vue

@@ -118,7 +118,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-radio-group {
 		flex: 1;

package/components/u-rate/u-rate.vue

@@ -287,7 +287,6 @@
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
 $u-rate-margin: 0 !default;
 $u-rate-padding: 0 !default;
 $u-rate-item-icon-wrap-half-top: 0 !default;

package/components/u-read-more/u-read-more.vue

@@ -140,8 +140,6 @@
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-read-more {
 
 	&__content {

package/components/u-row/u-row.vue

@@ -89,7 +89,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	
 	.u-row {
 		@include flex;

package/components/u-row-notice/u-row-notice.vue

@@ -282,7 +282,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-notice {
 		@include flex;

package/components/u-scroll-list/u-scroll-list.vue

@@ -198,8 +198,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-scroll-list {
 	padding-bottom: 10px;
 

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

@@ -233,7 +233,6 @@
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
 $u-search-content-padding: 0 10px !default;
 $u-search-label-color: $u-main-color !default;
 $u-search-label-font-size: 14px !default;

package/components/u-skeleton/u-skeleton.vue

@@ -187,7 +187,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	@mixin background {
 		/* #ifdef APP-NVUE */

package/components/u-slider/u-slider.vue

@@ -420,7 +420,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	.u-slider {
 		position: relative;
 		display: flex;

package/components/u-steps/u-steps.vue

@@ -69,7 +69,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-steps {
 		@include flex;

package/components/u-steps-item/u-steps-item.vue

@@ -228,7 +228,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-steps-item {
 		flex: 1;

package/components/u-subsection/u-subsection.vue

@@ -226,8 +226,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-subsection {
     @include flex;
     position: relative;

package/components/u-swipe-action-item/u-swipe-action-item.vue

@@ -201,7 +201,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-swipe-action-item {
 		position: relative;

package/components/u-swiper/u-swiper.vue

@@ -214,7 +214,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	
 	.u-swiper__wrapper {
 		flex: 1;

package/components/u-swiper-indicator/u-swiper-indicator.vue

@@ -79,7 +79,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-swiper-indicator {
 

package/components/u-switch/u-switch.vue

@@ -165,7 +165,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-switch {
 		@include flex(row);

package/components/u-tabbar/u-tabbar.vue

@@ -117,7 +117,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-tabbar {
 		@include flex(column);

package/components/u-tabbar-item/u-tabbar-item.vue

@@ -120,7 +120,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	.u-tabbar-item {
 		@include flex(column);
 		align-items: center;

package/components/u-table/u-table.vue

@@ -100,6 +100,5 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	
 </style>

package/components/u-tabs/u-tabs.vue

@@ -346,7 +346,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-tabs {
 

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

@@ -193,7 +193,6 @@
 	lang="scss"
 	scoped
 >
-	@import "../../libs/css/components.scss";
 
 	.u-tag-wrapper {
 		position: relative;

package/components/u-td/u-td.vue

@@ -56,7 +56,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	.u-td {
 		@include flex;
 		flex-direction: column;

package/components/u-text/u-text.vue

@@ -120,11 +120,11 @@ export default {
             }
             // 占满剩余空间
             if (this.flex1) {
-                style.flex = 1;
-				// #ifndef APP-NVUE
-				style.width = '100%';
+                style.flex = 1;
+				// #ifndef APP-NVUE
+				style.width = '100%';
 				// #endif
-            }
+            }
 			return style;
         },
         valueStyle() {
@@ -175,8 +175,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../libs/css/components.scss';
-
 .u-text {
     @include flex(row);
     align-items: center;

package/components/u-textarea/u-textarea.vue

@@ -145,15 +145,15 @@ export default {
 	    }
         // #endif
 	},
-    computed: {
-		fieldStyle() {
-			let style = {};
-			style['height'] = addUnit(this.height);
-			if (this.autoHeight) {
-				style['height'] = 'auto';
-				style['minHeight'] = addUnit(this.height);
-			}
-			return style;
+    computed: {
+		fieldStyle() {
+			let style = {};
+			style['height'] = addUnit(this.height);
+			if (this.autoHeight) {
+				style['height'] = 'auto';
+				style['minHeight'] = addUnit(this.height);
+			}
+			return style;
 		},
         // 组件的类名
         textareaClass() {
@@ -245,8 +245,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
 .u-textarea {
     border-radius: 4px;
     background-color: #fff;

package/components/u-th/u-th.vue

@@ -53,7 +53,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	.u-th {
 		@include flex;
 		flex-direction: column;

package/components/u-toast/u-toast.vue

@@ -2,7 +2,7 @@
 	<view class="u-toast">
 		<u-overlay
 			:show="isShow"
-			:zIndex="tmpConfig.overlay ? 10070 : -1"
+			:zIndex="tmpConfig.overlay ? tmpConfig.zIndex : -1"
 			:custom-style="overlayStyle"
 		>
 			<view
@@ -77,6 +77,7 @@
 				config: {
 					message: '', // 显示文本
 					type: '', // 主题类型，primary，success，error，warning，black
+					zIndex: 10090, // 层级
 					duration: 2000, // 显示的时间，毫秒
 					icon: true, // 显示的图标
 					position: 'center', // toast出现的位置
@@ -193,7 +194,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	$u-toast-color:#fff !default;
 	$u-toast-border-radius:4px !default;

package/components/u-toolbar/u-toolbar.vue

@@ -86,7 +86,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-toolbar {
 		height: 42px;

package/components/u-tooltip/u-tooltip.vue

@@ -276,7 +276,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 
 	.u-tooltip {
 		position: relative;

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

@@ -28,7 +28,6 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "../../libs/css/components.scss";
 	.u-tr {
 		@include flex;
 	}