Merge branch 'fix/visual-board-app-url' into 'main_dev'

fix: 修复打包app时跳转看板详情会出现网址情况

See merge request yunteng/thingskit-app!126

@@ -74,7 +74,7 @@
 				const values = deviceIdKeys.reduce((acc, curr) => {
 					const items = details[curr]?.triggerData
 					if(items?.key && items?.logicValue && items.realValue){
-						acc.push(`触发属性:${items.key ||'暂无数据'} 触发条件:${findLogin(items)+items.logicValue || '暂无数据'} 触发值:${items?.realValue || '暂无数据'} `)
+						acc.push(`触发属性:${items.key ||'暂无数据'}, 触发条件:${findLogin(items)+items.logicValue || '暂无数据'}, 触发值:${items?.realValue || '暂无数据'} `)
 					}
 					return acc
 				}, [])

@@ -35,7 +35,7 @@
 	import api from '@/api/index.js'
 	import {
 		createScadaPageLink
-	} from './help';
+	} from '../config/help.js';
 
 	export default {
 		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)

@@ -15,8 +15,9 @@
 			}
 		},
 		async onLoad(e){
+			// 隐藏原生的tabbar
+			uni.hideTabBar();
 			const url = await this.createShareUrl({id:e.id})
-			console.log(url,'url')
 			this.visualBoardUrl = url
 		},
 		methods:{

-import config from '../../../../config/baseUrl.js'
-import {
-	atob,
-	btoa
-} from './weapp.atob.js'
-const getRandomString = () => Number(Math.random().toString().substring(2)).toString(36);
-
-export const ScadaModeEnum = {
-	PRIVATE_VIEW: 'PRIVATE_VIEW',
-	PUBLIC_VIEW: 'PUBLIC_VIEW',
-}
-
-export const encode = (record) => {
-	let hash = JSON.stringify(record);
-	const mixinString = getRandomString()
-		.slice(0, 10)
-		.padEnd(10, getRandomString())
-		.split('')
-		.map((item) => (Math.random() > 0.5 ? item.toUpperCase() : item))
-		.join('');
-	hash = btoa(hash);
-	hash = hash.substring(0, 6) + mixinString + hash.substring(6);
-	hash = btoa(hash);
-	return hash;
-};
-
-
-export const createScadaPageLink = (
-	record,
-	mode = ScadaModeEnum.PRIVATE_VIEW,
-	open = false
-) => {
-	const userInfo = uni.getStorageSync('userInfo')
-	const params = {
-		configurationId: record?.id,
-		organizationId: record?.organizationId,
-		mode: record?.viewType === ScadaModeEnum.PRIVATE_VIEW ? 'lightbox' : 'share',
-		platform: record?.platform,
-		userId: userInfo.userId
-	};
-
-	if (record?.viewType === ScadaModeEnum.PUBLIC_VIEW) {
-		params.publicId = record.publicId;
-	}
-
-	const hash = encode(params);
-
-	const href = `${config.baseDrawioUrl}#${hash}`
-
-	return href
-};
\ No newline at end of file

@@ -35,7 +35,7 @@
 	import api from '@/api/index.js'
 	import {
 		createScadaPageLink
-	} from './help';
+	} from '../config/help.js';
 
 	export default {
 		mixins: [MescrollMixin], // 使用mixin (在main.js注册全局组件)

-var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-var b64re = /^(?:[A-Za-z\d+\/]{4})*?(?:[A-Za-z\d+\/]{2}(?:==)?|[A-Za-z\d+\/]{3}=?)?$/;
-export const btoa = function(string) {
-	string = String(string);
-	var bitmap, a, b, c, result = "",
-		i = 0,
-		rest = string.length % 3;
-	for (; i < string.length;) {
-		if ((a = string.charCodeAt(i++)) > 255 ||
-			(b = string.charCodeAt(i++)) > 255 ||
-			(c = string.charCodeAt(i++)) > 255)
-			throw new TypeError(
-				"Failed to execute 'btoa' on 'Window': The string to be encoded contains characters outside of the Latin1 range."
-			);
-		bitmap = (a << 16) | (b << 8) | c;
-		result += b64.charAt(bitmap >> 18 & 63) + b64.charAt(bitmap >> 12 & 63) +
-			b64.charAt(bitmap >> 6 & 63) + b64.charAt(bitmap & 63);
-	}
-	return rest ? result.slice(0, rest - 3) + "===".substring(rest) : result;
-};
-
-export const atob = function(string) {
-	string = String(string).replace(/[\t\n\f\r ]+/g, "");
-	if (!b64re.test(string))
-		throw new TypeError(
-			"Failed to execute 'atob' on 'Window': The string to be decoded is not correctly encoded.");
-	string += "==".slice(2 - (string.length & 3));
-	var bitmap, result = "",
-		r1, r2, i = 0;
-	for (; i < string.length;) {
-		bitmap = b64.indexOf(string.charAt(i++)) << 18 | b64.indexOf(string.charAt(i++)) << 12 |
-			(r1 = b64.indexOf(string.charAt(i++))) << 6 | (r2 = b64.indexOf(string.charAt(i++)));
-		result += r1 === 64 ? String.fromCharCode(bitmap >> 16 & 255) :
-			r2 === 64 ? String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255) :
-			String.fromCharCode(bitmap >> 16 & 255, bitmap >> 8 & 255, bitmap & 255);
-	}
-	return result;
-};
-
-function b64DecodeUnicode(str) {
-	return decodeURIComponent(exports.weAtob(str).replace(/(.)/g, function(p) {
-		var code = p.charCodeAt(0).toString(16).toUpperCase();
-		if (code.length < 2) {
-			code = "0" + code;
-		}
-		return "%" + code;
-	}));
-}
-
-function base64_url_decode(str) {
-	var output = str.replace(/-/g, "+").replace(/_/g, "/");
-	switch (output.length % 4) {
-		case 0:
-			break;
-		case 2:
-			output += "==";
-			break;
-		case 3:
-			output += "=";
-			break;
-		default:
-			throw "Illegal base64url string!";
-	}
-	try {
-		return b64DecodeUnicode(output);
-	} catch (err) {
-		return exports.weAtob(output);
-	}
-}
-
-function weappJwtDecode(token, options) {
-	if (typeof token !== "string") {
-		throw ("Invalid token specified");
-	}
-	options = options || {};
-	var pos = options.header === true ? 0 : 1;
-	try {
-		return JSON.parse(base64_url_decode(token.split(".")[pos]));
-	} catch (e) {
-		throw ("Invalid token specified: " + e.message);
-	}
-}
\ No newline at end of file