dlt-for-react 2.3.1 → 2.3.2
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.
- package/README.md +3 -2
- package/lib/routes/AuthorizedRoute.js +4 -6
- package/lib/utils/hashLink.js +42 -0
- package/package.json +1 -3
package/README.md
CHANGED
|
@@ -36,17 +36,15 @@ var _react = require("react");
|
|
|
36
36
|
|
|
37
37
|
var _react2 = _interopRequireDefault(_react);
|
|
38
38
|
|
|
39
|
-
var _dva = require("dva");
|
|
40
|
-
|
|
41
39
|
var _index = require("../index");
|
|
42
40
|
|
|
43
41
|
var _login = require("../layouts/Login/login");
|
|
44
42
|
|
|
45
43
|
var _history = require("history");
|
|
46
44
|
|
|
47
|
-
|
|
45
|
+
var _reactRouterDom = require("react-router-dom");
|
|
48
46
|
|
|
49
|
-
|
|
47
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
50
48
|
|
|
51
49
|
var hashHistory = (0, _history.createHashHistory)();
|
|
52
50
|
|
|
@@ -252,9 +250,9 @@ var AuthorizedRoute = function (_React$Component) {
|
|
|
252
250
|
var haveAuthPageUrl = this.getAuthPageUrl();
|
|
253
251
|
if (haveAuthPageUrl.includes(this.props.path)) {
|
|
254
252
|
if (this.props.render) {
|
|
255
|
-
return _react2.default.createElement(Route, (0, _extends3.default)({}, rest, { render: this.props.render }));
|
|
253
|
+
return _react2.default.createElement(_reactRouterDom.Route, (0, _extends3.default)({}, rest, { render: this.props.render }));
|
|
256
254
|
} else {
|
|
257
|
-
return _react2.default.createElement(Route, (0, _extends3.default)({}, rest, {
|
|
255
|
+
return _react2.default.createElement(_reactRouterDom.Route, (0, _extends3.default)({}, rest, {
|
|
258
256
|
render: function render(props) {
|
|
259
257
|
return _react2.default.createElement(Component, (0, _extends3.default)({}, props, rest));
|
|
260
258
|
}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
|
|
7
|
+
var _extends2 = require('babel-runtime/helpers/extends');
|
|
8
|
+
|
|
9
|
+
var _extends3 = _interopRequireDefault(_extends2);
|
|
10
|
+
|
|
11
|
+
var _typeof2 = require('babel-runtime/helpers/typeof');
|
|
12
|
+
|
|
13
|
+
var _typeof3 = _interopRequireDefault(_typeof2);
|
|
14
|
+
|
|
15
|
+
var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
|
|
16
|
+
|
|
17
|
+
var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
|
|
18
|
+
|
|
19
|
+
exports.Link = Link;
|
|
20
|
+
|
|
21
|
+
var _react = require('react');
|
|
22
|
+
|
|
23
|
+
var _react2 = _interopRequireDefault(_react);
|
|
24
|
+
|
|
25
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* Hash 路由下的导航链接,`to` 用法与 react-router-dom 的 Link 对齐(通常为路径字符串)。
|
|
29
|
+
* 不依赖 react-router-dom。
|
|
30
|
+
*/
|
|
31
|
+
function Link(_ref) {
|
|
32
|
+
var to = _ref.to,
|
|
33
|
+
children = _ref.children,
|
|
34
|
+
rest = (0, _objectWithoutProperties3.default)(_ref, ['to', 'children']);
|
|
35
|
+
|
|
36
|
+
var href = typeof to === 'string' ? to.startsWith('#') ? to : '#' + (to.startsWith('/') ? '' : '/') + to : to && (typeof to === 'undefined' ? 'undefined' : (0, _typeof3.default)(to)) === 'object' && typeof to.pathname === 'string' ? '#' + (to.pathname.startsWith('/') ? to.pathname : '/' + to.pathname) + (to.search || '') + (to.hash || '') : '#';
|
|
37
|
+
return _react2.default.createElement(
|
|
38
|
+
'a',
|
|
39
|
+
(0, _extends3.default)({ href: href }, rest),
|
|
40
|
+
children
|
|
41
|
+
);
|
|
42
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dlt-for-react",
|
|
3
|
-
"version": "2.3.
|
|
3
|
+
"version": "2.3.2",
|
|
4
4
|
"description": "dlt for react",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -71,7 +71,6 @@
|
|
|
71
71
|
"dependencies": {
|
|
72
72
|
"antd": "^3.6.4",
|
|
73
73
|
"babel-runtime": "^6.26.0",
|
|
74
|
-
"dva": "^2.6.0-beta.23",
|
|
75
74
|
"echarts": "^5.5.0",
|
|
76
75
|
"echarts-for-react": "^3.0.2",
|
|
77
76
|
"hex-sha1": "^1.0.2",
|
|
@@ -85,7 +84,6 @@
|
|
|
85
84
|
"react-file-viewer": "^1.2.1",
|
|
86
85
|
"react-pdf-js": "^5.1.0",
|
|
87
86
|
"react-resizable": "^3.0.5",
|
|
88
|
-
"react-router-dom": "^5.3.3",
|
|
89
87
|
"react-to-print": "^2.15.1",
|
|
90
88
|
"react-viewer": "^3.2.2",
|
|
91
89
|
"store2": "^2.14.3",
|