nvue3 1.1.19 → 1.1.21

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "nvue3",
-	"version": "1.1.19",
+	"version": "1.1.21",
 	"description": "for uniapp & vue3",
 	"main": "src/kernel.js",
 	"scripts": {
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
-	"author": "",
+	"author": "fazo@qq.com",
 	"license": "ISC",
 	"dependencies": {
 		"nodejs_patch": "^1.0.17"

package/src/http.js

@@ -136,7 +136,7 @@ function apiAlias(api) {
 function failMessage(REQ, resolve, reject) {
 
 	if (!REQ.message) REQ.message = '';
-	if (REQ.message.indexOf('cert.CertPathValidator') > 0) {
+	if (REQ.message.includes('cert.CertPathValidator')) {
 		//证书路径错误，基本上发生在被抓包的时候
 		REQ.loading = false;
 		uni.hideLoading();
@@ -288,7 +288,7 @@ function doSuccess(REQ, res, resolve, reject) {
 
 function doFail(request, res, resolve, reject) {
 
-	if (res.errMsg.indexOf('Failed to connect') > 0) {
+	if (res.errMsg.includes('Failed to connect')) {
 		let info = res.errMsg.match(/([\w\.]+)\/([\d\.]+)\:(\d+)/);
 		if (info) res.info = {
 			domain: info[1],
@@ -297,12 +297,18 @@ function doFail(request, res, resolve, reject) {
 		}
 		res.errMsg = "服务器连接失败:" + info[2];
 	}
-	else if (res.errMsg.indexOf('timeout') > 0) {
+	else if (res.errMsg.includes('timeout')) {
 		res.errMsg = '连接服务器超时，请检查网络';
 	}
-	else if (res.errMsg.indexOf('Unable to resolve host') > 0) {
+	else if (res.errMsg.includes('Unable to resolve host')) {
 		res.errMsg = '域名解析失败';
 	}
+	else if (res.errMsg.includes('NAME_NOT_RESOLVED')) {
+		res.errMsg = '域名解析失败';
+	}
+
+	let mer = res.errMsg.match(/<title>(.+)<\/title>/);
+	if (mer) res.errMsg = mer[1];
 
 	res.message = res.errMsg;
 	request.response = res;

package/src/kernel.js

@@ -24,15 +24,15 @@ export default {
 
 		for (let k in librarys) {
 			const key = `\$${k}`;
-			const obj = new librarys[k](app);
+			const obj = new librarys[k](app, config);
 			app.config.globalProperties[key] = obj;
 			app.provide(key, obj);
 		}
 
-		const page = new pageClass(config.maps);
+		const page = new pageClass(config.maps || {});
 		app.config.globalProperties.$pages = page;
 
-		const soft = new softClass(config.soft);
+		const soft = new softClass();
 		app.config.globalProperties.$soft = soft;
 		app.provide('$soft', soft);
 		app.provide('$size', soft.size);

package/src/page.js

@@ -191,7 +191,7 @@ export default class {
 
 		if (!icon) icon = 'success';
 		if (!time) time = 1500;
-		
+
 		uni.navigateBack({
 			delta: 1,
 			animationType: outType[animation.type || 'pop'],
@@ -261,14 +261,16 @@ export default class {
 
 	realUrl(uri, params, getAnimation) {
 		if (uri.slice(-1) === '/') uri += 'index';
-		
+
 		if (undefined === params) params = {};
 		let animation = {
 			type: 'pop-in',
 			time: 300
 		};
 		if (maps[uri]) uri = maps[uri]; //URI映射
-		let lab = uri[0];
+
+		//第2个字符是/，则lab是第1个字符
+		let lab = uri.slice(1, 2) === '/' ? uri[0] : '/';
 
 		if (lab === '.') { //当前位置的同级目录或上一级目录
 			const level = uri.indexOf('/');
@@ -299,8 +301,8 @@ export default class {
 		if (lab !== '/') { //当前目录的同级文件
 			let path = getLevelPath(1);
 			path.push(uri) //目标path纳入最后
-			path = path.join('/').build_query(params);
-			return { path, animation, tabbar };
+
+			return { path: path.join('/').build_query(params), animation, tabbar };
 		}
 
 		return { path: uri.build_query(params), animation, tabbar };

package/src/soft.js

@@ -10,6 +10,8 @@ export default class {
 	singlePage = false; //是否从朋友圈进入的单页模式
 
 	// #ifdef APP-PLUS
+	os = '';
+	ua = '';
 	packName = ''; //APP包名
 	appid = ''; //小程序的APPID，H5和APP为在manifest中设置的appid
 	name = ''; //应用名称，即在manifest中设置的应用名称
@@ -34,13 +36,13 @@ export default class {
 		navbar: 0,
 	};
 
-	constructor(conf) {
+	constructor() {
 		try {
 
 			// #ifdef MP-WEIXIN
 			const { scene } = uni.getLaunchOptionsSync();
 			this.singlePage = (scene === 1154);
-			console.log('weixin.singlePage=', this.singlePage, scene);
+			// console.log('weixin.singlePage=', this.singlePage, scene);
 			// #endif
 
 			// console.log('soft start')
@@ -76,7 +78,7 @@ export default class {
 				this.size.top = windows.statusBarHeight || 25; //顶部状态栏高度，css中直接用var(--status-bar-height)
 				this.size.ratio = windows.pixelRatio; //设备像素比
 
-				this.size.navigation = conf.navHeight || 44; //导航栏高度 var(--status-bar-height)
+				this.size.navigation = 44; //导航栏高度
 				this.size.bodyHeight = windows.screenHeight - this.size.top - this.size.navigation; //除去顶部和菜单的高度
 			}
 			else {
@@ -90,7 +92,7 @@ export default class {
 				this.size.screenHeight = system.screenHeight;
 				this.size.width = system.windowWidth; //屏幕尺寸
 				this.size.height = system.windowHeight;
-				this.size.navigation = conf.navHeight || 44; //导航栏高度
+				this.size.navigation = 44; //导航栏高度
 				this.size.bodyHeight = system.screenHeight - this.size.top - this.size.navigation; //除去顶部和菜单的高度
 			}
 			// #endif
@@ -117,7 +119,7 @@ export default class {
 			this.size.screenHeight = system.screenHeight;
 			this.size.width = system.windowWidth; //屏幕尺寸
 			this.size.height = system.windowHeight;
-			this.size.navigation = conf.navHeight || 44; //导航栏高度
+			this.size.navigation = 44; //导航栏高度
 			this.size.bodyHeight = system.screenHeight - this.size.top - this.size.navigation; //除去顶部和菜单的高度
 
 			// #endif
@@ -164,7 +166,8 @@ export default class {
 			// console.log('plus.runtime', plus.runtime)
 			this.os = plus.os.name.toLowerCase(); //操作系统，android或ios
 			this.osver = plus.os.version; //操作系统版本号
-			this.version = import.meta.env.VITE_VERSION || conf.version; //热更包版本号
+			this.version = import.meta.env.VITE_VERSION; //热更包版本号
+			this.ua = (import.meta.env.VITE_UA || 'Mozilla/5.0 ({os}/{osver} {brand}/{model})').re(this);
 
 			this.packName = plus.weex.config.env.appName; //包名
 			this.appid = plus.runtime.appid; //如：__UNI__123456
@@ -180,7 +183,7 @@ export default class {
 						// console.log('plus.device.getOAID', res)
 						this.oaid = res.oaid;
 					},
-					fail: err => {
+					fail: (err) => {
 						// console.error('plus.device.getOAID', this.os, err);
 						this.simulator++;
 					}
@@ -190,7 +193,7 @@ export default class {
 						// console.log('plus.device.getAAID', res)
 						this.aaid = res.aaid;
 					},
-					fail: err => {
+					fail: (err) => {
 						// console.error('plus.device.getAAID', err);
 						this.simulator++;
 					}
@@ -212,18 +215,6 @@ export default class {
 			});
 			// #endif
 
-
-			for (let k in conf) {
-				if (k === 'ua') {
-					//#ifndef H5 || MP
-					//h5和小程序不可以自定义
-					this.ua = (conf.ua || 'Mozilla/5.0 ({os}/{osver} {brand}/{model})').re(this);
-					//#endif
-				}
-				else {
-					this[k] = conf[k];
-				}
-			}
 		}
 		catch (e) {
 			console.error(e);
@@ -261,6 +252,7 @@ export default class {
 			theme: this.theme,
 
 			//#ifdef APP-PLUS
+			os: this.os,
 			packName: this.packName,
 			simulator: this.simulator, //模拟器可能性判断，oaid,aaid,uuid其中任一个读取出错各加1
 			oaid: this.oaid,