@fairys/taro-tools-react 1.0.30 → 1.0.31
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -58,13 +58,12 @@ class GlobalMessageDataInstance extends ProxyInstanceObjectBase {
|
|
|
58
58
|
const f = this.onBeforetToLoginPage();
|
|
59
59
|
if (false === f) return;
|
|
60
60
|
}
|
|
61
|
-
const currentPath = taro.getCurrentInstance().router?.path || '';
|
|
62
61
|
const loginPageRoute = globalSettingDataInstance.store.loginPageRoute || '';
|
|
63
62
|
const isLoginPage = utils_navigate.isCurrentPage(loginPageRoute || '');
|
|
64
63
|
const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
|
|
65
64
|
if (isLoginPage) return;
|
|
66
|
-
|
|
67
|
-
url: `/${_loginPageRoute}
|
|
65
|
+
taro.navigateTo({
|
|
66
|
+
url: `/${_loginPageRoute}`
|
|
68
67
|
});
|
|
69
68
|
};
|
|
70
69
|
}
|
|
@@ -99,13 +99,12 @@ class GlobalMessageDataInstance extends instance_js_namespaceObject.ProxyInstanc
|
|
|
99
99
|
const f = this.onBeforetToLoginPage();
|
|
100
100
|
if (false === f) return;
|
|
101
101
|
}
|
|
102
|
-
const currentPath = taro_default().getCurrentInstance().router?.path || '';
|
|
103
102
|
const loginPageRoute = external_global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.loginPageRoute || '';
|
|
104
103
|
const isLoginPage = navigate_js_default().isCurrentPage(loginPageRoute || '');
|
|
105
104
|
const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
|
|
106
105
|
if (isLoginPage) return;
|
|
107
|
-
|
|
108
|
-
url: `/${_loginPageRoute}
|
|
106
|
+
taro_default().navigateTo({
|
|
107
|
+
url: `/${_loginPageRoute}`
|
|
109
108
|
});
|
|
110
109
|
};
|
|
111
110
|
}
|
package/lib/context/index.js
CHANGED
|
@@ -6,7 +6,7 @@ var __webpack_modules__ = {
|
|
|
6
6
|
"./global.message.data.instance": function(module) {
|
|
7
7
|
module.exports = require("./global.message.data.instance.js");
|
|
8
8
|
},
|
|
9
|
-
"
|
|
9
|
+
"./global.setting.data.instance": function(module) {
|
|
10
10
|
module.exports = require("./global.setting.data.instance.js");
|
|
11
11
|
},
|
|
12
12
|
"./page.data.instance": function(module) {
|
|
@@ -83,7 +83,7 @@ var __webpack_exports__ = {};
|
|
|
83
83
|
return _auth_data_instance__WEBPACK_IMPORTED_MODULE_3__[key];
|
|
84
84
|
}).bind(0, __WEBPACK_IMPORT_KEY__);
|
|
85
85
|
__webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
|
|
86
|
-
var _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("
|
|
86
|
+
var _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("./global.setting.data.instance");
|
|
87
87
|
var __WEBPACK_REEXPORT_OBJECT__ = {};
|
|
88
88
|
for(var __WEBPACK_IMPORT_KEY__ in _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
|
|
89
89
|
return _global_setting_data_instance__WEBPACK_IMPORTED_MODULE_4__[key];
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"author": "SunLxy <1011771396@qq.com>",
|
|
4
4
|
"description": "框架组件库",
|
|
5
5
|
"homepage": "https://github.com/autumn-fairy-tales/fairys-taro-react",
|
|
6
|
-
"version": "1.0.
|
|
6
|
+
"version": "1.0.31",
|
|
7
7
|
"main": "esm/index.js",
|
|
8
8
|
"types": "esm/index.d.ts",
|
|
9
9
|
"module": "esm/index.js",
|
|
@@ -101,9 +101,6 @@ export class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMes
|
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
|
-
// 当前路由
|
|
105
|
-
const currentPath = Taro.getCurrentInstance().router?.path || '';
|
|
106
|
-
|
|
107
104
|
const loginPageRoute = globalSettingDataInstance.store.loginPageRoute || '';
|
|
108
105
|
const isLoginPage = navigate.isCurrentPage(loginPageRoute || '');
|
|
109
106
|
const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
|
|
@@ -112,7 +109,7 @@ export class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMes
|
|
|
112
109
|
return;
|
|
113
110
|
}
|
|
114
111
|
// 跳转登录页面
|
|
115
|
-
|
|
112
|
+
Taro.navigateTo({ url: `/${_loginPageRoute}` });
|
|
116
113
|
};
|
|
117
114
|
}
|
|
118
115
|
/**
|