uview-plus 3.4.39 → 3.4.41

package/components/u-qrcode/qrcode.js

@@ -1037,6 +1037,9 @@ let QRCode = {};
             showLoading: opt.showLoading,
             loadingText: opt.loadingText,
         };
+
+        let canvas = null;
+
         if (typeof opt === 'string') { // 只编码ASCII字符串
             opt = {
                 text: opt
@@ -1083,8 +1086,24 @@ let QRCode = {};
             }
             return options.foreground;
         }
+
+        let getCanvas = async (id) => {
+            return new Promise((resolve, reject)=>{
+                try {
+                    const query = uni.createSelectorQuery().in(this.options.context);
+                    query.select(`#${id}`)
+                    .fields({ node: true, size: true })
+                    .exec((res) => {
+                        resolve(res[0].node)
+                    })
+                }
+                catch (e) {
+                    console.error("createCanvasContextFail",e)
+                }
+            })
+        }
         // 创建canvas
-        let createCanvas = function (options) {
+        let createCanvas = async function (options) {
             if(options.showLoading){
                 uni.showLoading({
                     title: options.loadingText,
@@ -1094,9 +1113,21 @@ let QRCode = {};
             var ctx = '';
             if (options.nvueContext) {
                 ctx = options.nvueContext;
-            } else {
-                ctx = uni.createCanvasContext(options.canvasId, options.context);
             }
+            else {
+                // 获取canvas node节点
+                canvas = await getCanvas(options.canvasId);
+                // #ifdef MP
+                // 不清楚是小程序的bug还是什么原因，canvas的node节点宽高和设置的宽高不一致 重新设置下
+                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;
@@ -1107,14 +1138,18 @@ let QRCode = {};
             for (var row = 0; row < count; row++) {
                 for (var col = 0; col < count; col++) {
                     var w = (Math.ceil((col + 1) * tileW) - Math.floor(col * tileW));
-                    var h = (Math.ceil((row + 1) * tileW) - Math.floor(row * tileW));
+                    var h = (Math.ceil((row + 1) * tileH) - Math.floor(row * tileH));
                     var foreground = getForeGround({
                         row: row,
                         col: col,
                         count: count,
                         options: options
                     });
-                    ctx.setFillStyle(qrCodeAlg.modules[row][col] ? foreground : options.background);
+                    if (options.nvueContext) {
+                        ctx.setFillStyle(qrCodeAlg.modules[row][col] ? foreground : options.background);
+                    } else {
+                        ctx.fillStyle = qrCodeAlg.modules[row][col] ? foreground : options.background;
+                    }
                     ctx.fillRect(Math.round(col * tileW), Math.round(row * tileH), w, h);
                 }
             }
@@ -1122,12 +1157,33 @@ let QRCode = {};
                 var x = Number(((ratioSize - ratioImgSize) / 2).toFixed(2));
                 var y = Number(((ratioSize - ratioImgSize) / 2).toFixed(2));
                 drawRoundedRect(ctx, x, y, ratioImgSize, ratioImgSize, 2, 6, true, true)
-                ctx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize);
+                if (options.nvueContext) {
+                    ctx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize);
+                }
+                else {
+                    // #ifdef H5
+                    const img = new Image();
+                    // #endif
+                    // #ifndef H5
+                    const img = canvas.createImage();
+                    // #endif
+                    img.onload = () => {
+                        ctx.drawImage(img, x, y, ratioImgSize, ratioImgSize);
+                    };
+                    img.src = options.image;
+                }
                 // 画圆角矩形
                 function drawRoundedRect(ctxi, x, y, width, height, r, lineWidth, fill, stroke) {
-                    ctxi.setLineWidth(lineWidth);
-                    ctxi.setFillStyle(options.background);
-                    ctxi.setStrokeStyle(options.background);
+                    if (options.nvueContext) {
+                        ctxi.setLineWidth(lineWidth);
+                        ctxi.setFillStyle(options.background);
+                        ctxi.setStrokeStyle(options.background);
+                    }
+                    else {
+                        ctxi.lineWidth = lineWidth;
+                        ctxi.fillStyle = options.background;
+                        ctxi.strokeStyle = options.background;
+                    }
                     ctxi.beginPath(); // draw top and top right corner
                     ctxi.moveTo(x + r, y);
                     ctxi.lineTo(x + width, y); // move to top-right corner
@@ -1152,57 +1208,64 @@ let QRCode = {};
                 }
             }
             setTimeout(() => {
-                ctx.draw(true, () => {
-                    // 保存到临时区域
-                    setTimeout(() => {
-                        if (options.nvueContext) {
-                            ctx.toTempFilePath(
-                                0,
-                                0,
-                                options.width,
-                                options.height,
-                                options.width,
-                                options.height,
-                                "",
-                                1,
-                                function(res) {
-                                    if (options.cbResult) {
-                                        options.cbResult(res.tempFilePath)
-                                    }
-                                }
-                            );
-                        } else {
-                            uni.canvasToTempFilePath({
-                                width: options.width,
-                                height: options.height,
-                                destWidth: options.width,
-                                destHeight: options.height,
-                                canvasId: options.canvasId,
-                                quality: Number(1),
-                                success: function (res) {
-                                    if (options.cbResult) {
-                                        // 由于官方还没有统一此接口的输出字段，所以先判定下  支付宝为 res.apFilePath
-                                        if (!empty(res.tempFilePath)) {
-                                            options.cbResult(res.tempFilePath)
-                                        } else if (!empty(res.apFilePath)) {
-                                            options.cbResult(res.apFilePath)
-                                        } else {
+                // canvas2 绘制是自动的不需要手动绘制
+                if(options.nvueContext){
+                    ctx.draw(true, () => {
+                        // 保存到临时区域
+                        setTimeout(() => {
+                            if (options.nvueContext) {
+                                ctx.toTempFilePath(
+                                    0,
+                                    0,
+                                    options.width,
+                                    options.height,
+                                    options.width,
+                                    options.height,
+                                    "",
+                                    1,
+                                    function(res) {
+                                        if (options.cbResult) {
                                             options.cbResult(res.tempFilePath)
                                         }
                                     }
-                                },
-                                fail: function (res) {
-                                    if (options.cbResult) {
-                                        options.cbResult(res)
-                                    }
-                                },
-                                complete: function () {
-                                    uni.hideLoading();
-                                },
-                            }, options.context);
-                        }
-                    }, options.text.length + 100);
-                });
+                                );
+                            } else {
+                                uni.canvasToTempFilePath({
+                                    width: options.width,
+                                    height: options.height,
+                                    destWidth: options.width,
+                                    destHeight: options.height,
+                                    canvasId: options.canvasId,
+                                    quality: Number(1),
+                                    success: function (res) {
+                                        if (options.cbResult) {
+                                            // 由于官方还没有统一此接口的输出字段，所以先判定下  支付宝为 res.apFilePath
+                                            if (!empty(res.tempFilePath)) {
+                                                options.cbResult(res.tempFilePath)
+                                            } else if (!empty(res.apFilePath)) {
+                                                options.cbResult(res.apFilePath)
+                                            } else {
+                                                options.cbResult(res.tempFilePath)
+                                            }
+                                        }
+                                    },
+                                    fail: function (res) {
+                                        if (options.cbResult) {
+                                            options.cbResult(res)
+                                        }
+                                    },
+                                    complete: function () {
+                                        uni.hideLoading();
+                                    },
+                                }, options.context);
+                            }
+                        }, options.text.length + 100);
+                    });
+                }
+                else{
+                    options.cbResult("")
+                }
+
             }, options.usingComponents ? 0 : 150);
         }
         createCanvas(this.options);

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

@@ -1,24 +1,31 @@
 <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 class="u-qrcode__canvas"
-				:id="cid" :canvas-id="cid" :style="{ width: size + unit, height: size + unit }" />
+			<canvas
+                class="u-qrcode__canvas"
+				:id="cid"
+                :canvas-id="cid"
+                type="2d"
+                :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>
-			<!-- <image v-show="show" :src="result" :style="{ width: size + unit, height: size + unit }" /> -->
 		</view>
-		<!-- <up-action-sheet :actions="list" cancelText="取消"
-			v-model:show="popupShow" @select="selectClick">
-		</up-action-sheet> -->
+
 	</view>
 </template>
 
@@ -103,8 +110,13 @@ export default {
 			type: Boolean,
 			default: false
 		},
+        // 是否使用根节点宽高
+        useRootHeightAndWidth: {
+            type: Boolean,
+            default: () => false
+        },
 	},
-	emits: ['result', 'longpress'],
+	emits: ['result', 'longpressCallback'],
 	data() {
 		return {
 			loading: false,
@@ -115,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: function () {
+    async mounted(){
+        // 如果使用根节点的宽高 则 重新设置 size
+        if(this.useRootHeightAndWidth){
+            await this.setNewSize()
+        }
+
 		// #ifdef APP-NVUE
 		/*获取元素引用*/
 		this.ganvas = this.$refs["gcanvess"]
@@ -135,7 +156,9 @@ export default {
 		if (this.loadMake) {
 			if (!this._empty(this.val)) {
 				setTimeout(() => {
-					this._makeCode()
+                    setTimeout(()=>{
+                        this._makeCode()
+                    })
 				}, 0);
 			}
 		}
@@ -155,7 +178,7 @@ 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, // 定位角点颜色
@@ -219,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:
@@ -250,7 +354,7 @@ export default {
 				rt = false
 			}
 			return rt
-		}
+		},
 	},
 	watch: {
 		size: function (n, o) {

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;