dlt-for-react 1.0.23 → 1.1.0

package/lib/layouts/LeftMenu/index.js

@@ -5,10 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = undefined;
 
-var _getSize2 = require('xgui-for-react/lib/utils/getSize');
-
-var _getSize3 = _interopRequireDefault(_getSize2);
-
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -17,10 +13,6 @@ var _icon = require('antd/lib/icon');
 
 var _icon2 = _interopRequireDefault(_icon);
 
-var _getLoginUser2 = require('xgui-for-react/lib/utils/getLoginUser');
-
-var _getLoginUser3 = _interopRequireDefault(_getLoginUser2);
-
 var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
@@ -55,6 +47,8 @@ var _react2 = _interopRequireDefault(_react);
 
 var _router = require('dva/router');
 
+var _xguiForReact = require('xgui-for-react');
+
 var _reactCustomScrollbars = require('react-custom-scrollbars');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -71,7 +65,7 @@ var Home = function (_React$Component) {
         var _this = (0, _possibleConstructorReturn3.default)(this, (Home.__proto__ || (0, _getPrototypeOf2.default)(Home)).call(this, props));
 
         _this.loginSkip = function () {
-            var leftMenu = (0, _getLoginUser3.default)().menus ? (0, _getLoginUser3.default)().menus : [];
+            var leftMenu = (0, _xguiForReact.getLoginUser)().menus ? (0, _xguiForReact.getLoginUser)().menus : [];
             // 如果不需要登录的服务就取props的菜单
             leftMenu = _this.props.config.noNeedLogin ? _this.props.allMenu : leftMenu;
             var curUrl = window.location.href.split('#')[1] + "/";
@@ -311,7 +305,7 @@ var Home = function (_React$Component) {
     }, {
         key: 'render',
         value: function render() {
-            var leftMenu = (0, _getLoginUser3.default)().menus ? (0, _getLoginUser3.default)().menus : [];
+            var leftMenu = (0, _xguiForReact.getLoginUser)().menus ? (0, _xguiForReact.getLoginUser)().menus : [];
             // 如果不需要登录的服务就取props的菜单
             leftMenu = this.props.config.noNeedLogin ? this.props.allMenu : leftMenu;
             var menuIcons = this.props.menuIcons ? this.props.menuIcons : {};
@@ -339,7 +333,7 @@ var Home = function (_React$Component) {
                         style: { width: '100%' },
                         autoHeight: true,
                         autoHeightMin: 0,
-                        autoHeightMax: (0, _getSize3.default)().windowH - 64,
+                        autoHeightMax: (0, _xguiForReact.getSize)().windowH - 64,
                         thumbMinSize: 30,
                         universal: true
                     },

package/lib/layouts/NavigationBar/index.js

@@ -9,14 +9,6 @@ var _breadcrumb = require('antd/lib/breadcrumb');
 
 var _breadcrumb2 = _interopRequireDefault(_breadcrumb);
 
-var _createUuid2 = require('xgui-for-react/lib/utils/createUuid');
-
-var _createUuid3 = _interopRequireDefault(_createUuid2);
-
-var _getLoginUser2 = require('xgui-for-react/lib/utils/getLoginUser');
-
-var _getLoginUser3 = _interopRequireDefault(_getLoginUser2);
-
 var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
@@ -43,6 +35,8 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _xguiForReact = require('xgui-for-react');
+
 require('../../../assets/layouts/style.less');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -59,7 +53,7 @@ var Home = function (_React$Component) {
 		key: 'render',
 		value: function render() {
 			var breadcrumbList = [];
-			var leftMenu = (0, _getLoginUser3.default)().menus ? (0, _getLoginUser3.default)().menus : [];
+			var leftMenu = (0, _xguiForReact.getLoginUser)().menus ? (0, _xguiForReact.getLoginUser)().menus : [];
 			var curUrl = window.location.href.split('#')[1] + "/";
 			for (var i = 0; i < leftMenu.length; i++) {
 				if (leftMenu[i].children) {
@@ -94,7 +88,7 @@ var Home = function (_React$Component) {
 					breadcrumbList.map(function (item) {
 						return _react2.default.createElement(
 							_breadcrumb2.default.Item,
-							{ key: (0, _createUuid3.default)() },
+							{ key: (0, _xguiForReact.createUuid)() },
 							item.name
 						);
 					})

package/lib/layouts/Top/editPassWord.js

@@ -8,10 +8,6 @@ var _form = require('antd/lib/form');
 
 var _form2 = _interopRequireDefault(_form);
 
-var _NHFormItem2 = require('xgui-for-react/lib/components/NHFormItem');
-
-var _NHFormItem3 = _interopRequireDefault(_NHFormItem2);
-
 var _input = require('antd/lib/input');
 
 var _input2 = _interopRequireDefault(_input);
@@ -44,6 +40,8 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _xguiForReact = require('xgui-for-react');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var EditPassWordForm = function (_React$Component) {
@@ -65,14 +63,14 @@ var EditPassWordForm = function (_React$Component) {
                 _form2.default,
                 null,
                 _react2.default.createElement(
-                    _NHFormItem3.default,
+                    _xguiForReact.NHFormItem,
                     { id: "oldPassWord", label: "旧密码",
                         form: this.props.form,
                         showFlag: true, required: true },
                     _react2.default.createElement(_input2.default, { type: 'password', placeholder: "请输入旧密码" })
                 ),
                 _react2.default.createElement(
-                    _NHFormItem3.default,
+                    _xguiForReact.NHFormItem,
                     { id: "newPassWord", label: "新密码",
                         pattern: {
                             min: 8,
@@ -84,7 +82,7 @@ var EditPassWordForm = function (_React$Component) {
                     _react2.default.createElement(_input2.default, { type: 'password', placeholder: "请输入8-16位数字、字母或下划线" })
                 ),
                 _react2.default.createElement(
-                    _NHFormItem3.default,
+                    _xguiForReact.NHFormItem,
                     { id: "confirmPassWord", label: "确认密码",
                         pattern: {
                             min: 8,

package/lib/layouts/Top/index.js

@@ -9,10 +9,6 @@ var _row = require('antd/lib/row');
 
 var _row2 = _interopRequireDefault(_row);
 
-var _NHModal2 = require('xgui-for-react/lib/components/NHModal');
-
-var _NHModal3 = _interopRequireDefault(_NHModal2);
-
 var _dropdown = require('antd/lib/dropdown');
 
 var _dropdown2 = _interopRequireDefault(_dropdown);
@@ -25,10 +21,6 @@ var _col = require('antd/lib/col');
 
 var _col2 = _interopRequireDefault(_col);
 
-var _getLoginUser2 = require('xgui-for-react/lib/utils/getLoginUser');
-
-var _getLoginUser3 = _interopRequireDefault(_getLoginUser2);
-
 var _menu = require('antd/lib/menu');
 
 var _menu2 = _interopRequireDefault(_menu);
@@ -37,10 +29,6 @@ var _icon = require('antd/lib/icon');
 
 var _icon2 = _interopRequireDefault(_icon);
 
-var _hasAuth2 = require('xgui-for-react/lib/utils/hasAuth');
-
-var _hasAuth3 = _interopRequireDefault(_hasAuth2);
-
 var _modal = require('antd/lib/modal');
 
 var _modal2 = _interopRequireDefault(_modal);
@@ -49,10 +37,6 @@ var _message2 = require('antd/lib/message');
 
 var _message3 = _interopRequireDefault(_message2);
 
-var _NHFetch2 = require('xgui-for-react/lib/utils/NHFetch');
-
-var _NHFetch3 = _interopRequireDefault(_NHFetch2);
-
 var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
@@ -99,6 +83,8 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _xguiForReact = require('xgui-for-react');
+
 var _login = require('../Login/login');
 
 var _editPassWord = require('./editPassWord.js');
@@ -201,7 +187,7 @@ var Home = function (_React$Component) {
 
         //修改密码
         var baseUrl = window.xtglUrl || 'api/hq-xtgl';
-        (0, _NHFetch3.default)(baseUrl + '/outer/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
+        (0, _xguiForReact.NHFetch)(baseUrl + '/outer/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
           if (res && res.data.meta['success']) {
             _this.passWordForm.resetFields();
             _this.nhEditPassWordModal.close();
@@ -272,7 +258,7 @@ var Home = function (_React$Component) {
       var menu = _react2.default.createElement(
         _menu2.default,
         { className: 'menu', selectedKeys: [], onClick: this.onMenuClick },
-        (0, _hasAuth3.default)(this.props.updataPassBtnAuth) ? _react2.default.createElement(
+        (0, _xguiForReact.hasAuth)(this.props.updataPassBtnAuth) ? _react2.default.createElement(
           _menu2.default.Item,
           { key: 'editPassWord' },
           _react2.default.createElement(
@@ -303,7 +289,7 @@ var Home = function (_React$Component) {
           autoHideHeader = _props$setting.autoHideHeader;
 
       var isTop = layout === 'topmenu'; //显示顶部菜单
-      var userLogin = (0, _getLoginUser3.default)();
+      var userLogin = (0, _xguiForReact.getLoginUser)();
       var width = this.getHeadWidth();
       return _react2.default.createElement(
         _rcAnimate2.default,
@@ -415,7 +401,7 @@ var Home = function (_React$Component) {
                   )
                 ),
                 _react2.default.createElement(
-                  _NHModal3.default,
+                  _xguiForReact.NHModal,
                   {
                     ref: function ref(form) {
                       _this2.nhEditPassWordModal = form;

package/lib/layouts/TopMenu/index.js

@@ -13,10 +13,6 @@ var _icon = require('antd/lib/icon');
 
 var _icon2 = _interopRequireDefault(_icon);
 
-var _getLoginUser2 = require('xgui-for-react/lib/utils/getLoginUser');
-
-var _getLoginUser3 = _interopRequireDefault(_getLoginUser2);
-
 var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
@@ -51,17 +47,18 @@ var _react2 = _interopRequireDefault(_react);
 
 var _router = require('dva/router');
 
+var _xguiForReact = require('xgui-for-react');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 /**图标 */
-/*
- * @Description: 菜单
- * @Author: lisenlin
- * @Date: 2021-06-15 16:29:32
- * @LastEditors: lisenlin
- * @LastEditTime: 2021-11-23 18:58:33
- */
-var SubMenu = _menu2.default.SubMenu;
+var SubMenu = _menu2.default.SubMenu; /*
+                                       * @Description: 菜单
+                                       * @Author: lisenlin
+                                       * @Date: 2021-06-15 16:29:32
+                                       * @LastEditors: lisenlin
+                                       * @LastEditTime: 2021-11-23 18:58:33
+                                       */
 
 var index = function (_Component) {
   (0, _inherits3.default)(index, _Component);
@@ -72,7 +69,7 @@ var index = function (_Component) {
     var _this = (0, _possibleConstructorReturn3.default)(this, (index.__proto__ || (0, _getPrototypeOf2.default)(index)).call(this, props));
 
     _this.loginSkip = function () {
-      var leftMenu = (0, _getLoginUser3.default)().menus ? (0, _getLoginUser3.default)().menus : [];
+      var leftMenu = (0, _xguiForReact.getLoginUser)().menus ? (0, _xguiForReact.getLoginUser)().menus : [];
       // 如果不需要登录的服务就取props的菜单
       leftMenu = _this.props.config.noNeedLogin ? _this.props.allMenu : leftMenu;
       var curUrl = window.location.href.split('#')[1] + '/';
@@ -214,7 +211,7 @@ var index = function (_Component) {
     value: function render() {
       var _this2 = this;
 
-      var leftMenu = (0, _getLoginUser3.default)().menus ? (0, _getLoginUser3.default)().menus : [];
+      var leftMenu = (0, _xguiForReact.getLoginUser)().menus ? (0, _xguiForReact.getLoginUser)().menus : [];
       // 如果不需要登录的服务就取props的菜单
       leftMenu = this.props.config.noNeedLogin ? this.props.allMenu : leftMenu;
       var menuIcons = this.props.menuIcons ? this.props.menuIcons : {};

package/lib/layouts/layout/index.js

@@ -9,10 +9,6 @@ var _spin = require('antd/lib/spin');
 
 var _spin2 = _interopRequireDefault(_spin);
 
-var _getSize2 = require('xgui-for-react/lib/utils/getSize');
-
-var _getSize3 = _interopRequireDefault(_getSize2);
-
 var _icon = require('antd/lib/icon');
 
 var _icon2 = _interopRequireDefault(_icon);
@@ -29,10 +25,6 @@ var _stringify = require('babel-runtime/core-js/json/stringify');
 
 var _stringify2 = _interopRequireDefault(_stringify);
 
-var _NHFetch2 = require('xgui-for-react/lib/utils/NHFetch');
-
-var _NHFetch3 = _interopRequireDefault(_NHFetch2);
-
 var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
@@ -69,6 +61,8 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _xguiForReact = require('xgui-for-react');
+
 var _LeftMenu = require('../LeftMenu');
 
 var _LeftMenu2 = _interopRequireDefault(_LeftMenu);
@@ -129,7 +123,7 @@ var NHLayout = function (_React$Component) {
     _this.getLayoutSetting = function () {
       _this.setState({ layoutShow: false });
       var baseUrl = window.xtglUrl || 'api/hq-xtgl';
-      (0, _NHFetch3.default)(baseUrl + '/outer/getCsszByCsbz', 'GET', {
+      (0, _xguiForReact.NHFetch)(baseUrl + '/outer/getCsszByCsbz', 'GET', {
         csbz: 'XTGL_LAYOUT_SETTING'
       }).then(function (res) {
         if (res && res.code === 200 && res.data) {
@@ -262,7 +256,7 @@ var NHLayout = function (_React$Component) {
       }
       var prams = [{ csszxid: csszxid, csz: (0, _stringify2.default)(setting) }];
       var baseUrl = window.xtglUrl || 'api/hq-xtgl';
-      (0, _NHFetch3.default)(baseUrl + '/parameterSetting/updateMulti', 'POST', prams).then(function (res) {
+      (0, _xguiForReact.NHFetch)(baseUrl + '/parameterSetting/updateMulti', 'POST', prams).then(function (res) {
         if (res && res.code === 200) {
           _message3.default.success('Layout配置项保存成功！');
         }
@@ -323,7 +317,7 @@ var NHLayout = function (_React$Component) {
           fwmc = config.fwmc;
       //动态获取服务名称(优选使用fwmcUrl，如果未指定fwmcUrl则以fwmc为准)
       if (fwmcUrl && fwmcUrl.startsWith('api/')) {
-        (0, _NHFetch3.default)(fwmcUrl, 'GET').then(function (res) {
+        (0, _xguiForReact.NHFetch)(fwmcUrl, 'GET').then(function (res) {
           if (res && res.data) {
             _this2.setState({
               fwmc: res.data
@@ -468,7 +462,7 @@ var NHLayout = function (_React$Component) {
           Content,
           {
             style: (0, _extends3.default)({
-              height: layout !== 'mixmenu' ? (0, _getSize3.default)().contentH : (0, _getSize3.default)().contentH + 40
+              height: layout !== 'mixmenu' ? (0, _xguiForReact.getSize)().contentH : (0, _xguiForReact.getSize)().contentH + 40
             }, contentProps),
             className: fixedHeader ? 'xgui-layout-fixHeader-content' : ''
           },
@@ -482,7 +476,7 @@ var NHLayout = function (_React$Component) {
           _spin2.default,
           { spinning: true, size: 'large' },
           _react2.default.createElement('div', {
-            style: { width: (0, _getSize3.default)().windowW, height: (0, _getSize3.default)().windowH }
+            style: { width: (0, _xguiForReact.getSize)().windowW, height: (0, _xguiForReact.getSize)().windowH }
           })
         );
       }

package/lib/layouts/{Login → login}/index-pre.js

@@ -20,10 +20,6 @@ var _icon = require('antd/lib/icon');
 
 var _icon2 = _interopRequireDefault(_icon);
 
-var _NHFetch2 = require('xgui-for-react/lib/utils/NHFetch');
-
-var _NHFetch3 = _interopRequireDefault(_NHFetch2);
-
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -66,6 +62,8 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _xguiForReact = require('xgui-for-react');
+
 require('../../../assets/login/index.less');
 
 var _login = require('./login.js');
@@ -169,7 +167,7 @@ var LoginPage = function (_React$Component) {
 
       //获取版权信息
       if (this.props.config.copyright && this.props.config.copyright.startsWith('front/')) {
-        (0, _NHFetch3.default)(this.props.config.copyright, 'GET').then(function (res) {
+        (0, _xguiForReact.NHFetch)(this.props.config.copyright, 'GET').then(function (res) {
           if (res) {
             _this2.setState({
               copyright: res.data,

package/lib/layouts/{Login → login}/index.js

@@ -28,10 +28,6 @@ var _modal = require("antd/lib/modal");
 
 var _modal2 = _interopRequireDefault(_modal);
 
-var _NHFetch2 = require("xgui-for-react/lib/utils/NHFetch");
-
-var _NHFetch3 = _interopRequireDefault(_NHFetch2);
-
 var _extends2 = require("babel-runtime/helpers/extends");
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -80,6 +76,8 @@ var _react = require("react");
 
 var _react2 = _interopRequireDefault(_react);
 
+var _xguiForReact = require("xgui-for-react");
+
 require("../../../assets/login/index.less");
 
 var _login = require("./login.js");
@@ -96,6 +94,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // import ReactSimpleVerify from 'react-simple-verify'
 // import 'react-simple-verify/dist/react-simple-verify.css'
+var pubKey = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ8DUCb0CEFATRWU8BtBL42RvsdFBcpxYNfsg0P1f7Rd1qKLtqLSBBVGrJu148CdCAkxwKOsjvj5D4eMeDQCd18CAwEAAQ==";
+//网关密码加密
+
 /*
  * @Description: 新版设计规范学工-登录页面
  * @Author: lisenlin
@@ -103,9 +104,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @LastEditors: jiangzhongxin
  * @LastEditTime: 2023-11-03 09:44:09
  */
-var pubKey = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ8DUCb0CEFATRWU8BtBL42RvsdFBcpxYNfsg0P1f7Rd1qKLtqLSBBVGrJu148CdCAkxwKOsjvj5D4eMeDQCd18CAwEAAQ==";
-//网关密码加密
-
 var URL_PREFIX = ""; //统一前缀
 var reqGetCaptcha = URL_PREFIX + "captchaServlet?v="; //验证码下载路径
 var FormItem = _form2.default.Item;
@@ -374,7 +372,7 @@ var LoginPage = function (_React$Component) {
 
       //获取版权信息
       if (this.props.config.copyright && this.props.config.copyright.startsWith("api/")) {
-        (0, _NHFetch3.default)(this.props.config.copyright, "GET").then(function (res) {
+        (0, _xguiForReact.NHFetch)(this.props.config.copyright, "GET").then(function (res) {
           if (res) {
             _this2.setState({
               copyright: res.data,

package/lib/layouts/{Login → login}/login.js

@@ -17,18 +17,6 @@ var _extends3 = require('babel-runtime/helpers/extends');
 
 var _extends4 = _interopRequireDefault(_extends3);
 
-var _getLoginUser2 = require('xgui-for-react/lib/utils/getLoginUser');
-
-var _getLoginUser3 = _interopRequireDefault(_getLoginUser2);
-
-var _createUuid2 = require('xgui-for-react/lib/utils/createUuid');
-
-var _createUuid3 = _interopRequireDefault(_createUuid2);
-
-var _NHFetch2 = require('xgui-for-react/lib/utils/NHFetch');
-
-var _NHFetch3 = _interopRequireDefault(_NHFetch2);
-
 var _modal = require('antd/lib/modal');
 
 var _modal2 = _interopRequireDefault(_modal);
@@ -51,6 +39,8 @@ var _createHashHistory = require('history/createHashHistory');
 
 var _createHashHistory2 = _interopRequireDefault(_createHashHistory);
 
+var _xguiForReact = require('xgui-for-react');
+
 var _moment = require('moment');
 
 var _moment2 = _interopRequireDefault(_moment);
@@ -210,7 +200,8 @@ var userLogout = exports.userLogout = function userLogout() {
     if (res.meta && res.meta.statusCode === 200) {
       sessionStorage.removeItem('userLogin');
       sessionStorage.removeItem('access_token');
-      fetch('bpm/rule?wf_num=R_S005_B003'); // 清除bpm cookie，避免切换用户时无法更新
+      // 清除bpm cookie，避免切换用户时无法更新
+      fetch('bpm/rule?wf_num=R_S005_B003').catch(function (err) {});
       if (window.casStatus && window.casLogoutUrl && window.casLogoutUrl != '') {
         window.location = window.casLogoutUrl;
       } else {
@@ -481,7 +472,7 @@ var sso = function sso(func, allMenu, notConf) {
         var ticket = getHashParam('ticket');
         var originServiceUrl = window.location.origin + window.location.pathname + '#/index';
         var _service = encodeURIComponent(originServiceUrl);
-        (0, _NHFetch3.default)('cas/login', 'GET', {
+        (0, _xguiForReact.NHFetch)('cas/login', 'GET', {
           ticket: ticket,
           serviceUrl: _service
         }).then(function (res) {
@@ -600,7 +591,7 @@ var filteChildrenMenus = function filteChildrenMenus(menus) {
 var filterAuthMenus = function filterAuthMenus(menus, auths) {
   var fitlerMenus = [];
   menus.map(function (item) {
-    item.key = (0, _createUuid3.default)();
+    item.key = (0, _xguiForReact.createUuid)();
     if (item.children) {
       //存在子菜单，只需要处理子菜单即可
       item.children = filterAuthMenus(item.children, auths);
@@ -620,7 +611,7 @@ var filterAuthMenus = function filterAuthMenus(menus, auths) {
 
 // 保存登录后要跳转的页面(userid+页面地址，未登录前只取页面地址)
 var saveRouterAfterLogin = exports.saveRouterAfterLogin = function saveRouterAfterLogin(action, value) {
-  var userId = (0, _getLoginUser3.default)().userId;
+  var userId = (0, _xguiForReact.getLoginUser)().userId;
   var projectName = window.location.host + window.location.pathname; // 区分同源项目
   projectName = userId ? escape(userId + '-' + projectName) : escape(projectName); // 区分同项目不同用户
   var oldData = sessionStorage.getItem('routerAfterLogin') ? JSON.parse(sessionStorage.getItem('routerAfterLogin')) : {};
@@ -635,7 +626,7 @@ var saveRouterAfterLogin = exports.saveRouterAfterLogin = function saveRouterAft
 };
 // 获取登录后要跳转的页面
 var getRouterAfterLogin = exports.getRouterAfterLogin = function getRouterAfterLogin(field) {
-  var userId = (0, _getLoginUser3.default)().userId;
+  var userId = (0, _xguiForReact.getLoginUser)().userId;
   var projectName = window.location.host + window.location.pathname;
   var name = userId ? escape(userId + '-' + projectName) : escape(projectName);
   var routerAfterLogin = sessionStorage.getItem('routerAfterLogin') ? JSON.parse(sessionStorage.getItem('routerAfterLogin')) : {};

package/lib/layouts/mixTop/index.js

@@ -9,10 +9,6 @@ var _row = require('antd/lib/row');
 
 var _row2 = _interopRequireDefault(_row);
 
-var _NHModal2 = require('xgui-for-react/lib/components/NHModal');
-
-var _NHModal3 = _interopRequireDefault(_NHModal2);
-
 var _dropdown = require('antd/lib/dropdown');
 
 var _dropdown2 = _interopRequireDefault(_dropdown);
@@ -25,10 +21,6 @@ var _col = require('antd/lib/col');
 
 var _col2 = _interopRequireDefault(_col);
 
-var _getLoginUser2 = require('xgui-for-react/lib/utils/getLoginUser');
-
-var _getLoginUser3 = _interopRequireDefault(_getLoginUser2);
-
 var _menu = require('antd/lib/menu');
 
 var _menu2 = _interopRequireDefault(_menu);
@@ -37,10 +29,6 @@ var _icon = require('antd/lib/icon');
 
 var _icon2 = _interopRequireDefault(_icon);
 
-var _hasAuth2 = require('xgui-for-react/lib/utils/hasAuth');
-
-var _hasAuth3 = _interopRequireDefault(_hasAuth2);
-
 var _modal = require('antd/lib/modal');
 
 var _modal2 = _interopRequireDefault(_modal);
@@ -49,10 +37,6 @@ var _message2 = require('antd/lib/message');
 
 var _message3 = _interopRequireDefault(_message2);
 
-var _NHFetch2 = require('xgui-for-react/lib/utils/NHFetch');
-
-var _NHFetch3 = _interopRequireDefault(_NHFetch2);
-
 var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
@@ -99,6 +83,8 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _xguiForReact = require('xgui-for-react');
+
 var _login = require('../Login/login');
 
 var _editPassWord = require('../Top/editPassWord.js');
@@ -117,14 +103,13 @@ var _classnames2 = _interopRequireDefault(_classnames);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/*
- * @Description: 混合菜单布局
- * @Author: lisenlin
- * @Date: 2021-06-22 17:18:16
- * @LastEditors: lisenlin
- * @LastEditTime: 2021-10-27 10:58:36
- */
-var Header = _layout2.default.Header;
+var Header = _layout2.default.Header; /*
+                                       * @Description: 混合菜单布局
+                                       * @Author: lisenlin
+                                       * @Date: 2021-06-22 17:18:16
+                                       * @LastEditors: lisenlin
+                                       * @LastEditTime: 2021-10-27 10:58:36
+                                       */
 
 var touxiangman = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA0ppVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RDIzNTA5QjU0OUNDMTFFODhCMjVBMTc2Q0E2QTlCRUQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RDIzNTA5QjQ0OUNDMTFFODhCMjVBMTc2Q0E2QTlCRUQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDo2MzZjYWQxYS00OWNiLTExZTgtYjFjOS05YmZmODYwYWE3ZWIiIHN0UmVmOmRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDo2MzZjYWQxYS00OWNiLTExZTgtYjFjOS05YmZmODYwYWE3ZWIiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+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';
 var touxiangwoman = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA0ppVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6REFEMTRCQ0I0OUNDMTFFOEFDRTNGM0MyRDE2MTBDQjAiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6REFEMTRCQ0E0OUNDMTFFOEFDRTNGM0MyRDE2MTBDQjAiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDo2MzZjYWQxYS00OWNiLTExZTgtYjFjOS05YmZmODYwYWE3ZWIiIHN0UmVmOmRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDo2MzZjYWQxYS00OWNiLTExZTgtYjFjOS05YmZmODYwYWE3ZWIiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+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';
@@ -192,7 +177,7 @@ var MixTop = function (_React$Component) {
         var oldPwd = (0, _rsa.encryptedString)(key, oldPassWord);
         var baseUrl = window.xtglUrl || 'api/hq-xtgl';
         //修改密码
-        (0, _NHFetch3.default)(baseUrl + '/outer/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
+        (0, _xguiForReact.NHFetch)(baseUrl + '/outer/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
           if (res && res.data.meta['success']) {
             _this.passWordForm.resetFields();
             _this.nhEditPassWordModal.close();
@@ -263,7 +248,7 @@ var MixTop = function (_React$Component) {
       var menu = _react2.default.createElement(
         _menu2.default,
         { className: 'menu', selectedKeys: [], onClick: this.onMenuClick },
-        (0, _hasAuth3.default)(this.props.updataPassBtnAuth) ? _react2.default.createElement(
+        (0, _xguiForReact.hasAuth)(this.props.updataPassBtnAuth) ? _react2.default.createElement(
           _menu2.default.Item,
           { key: 'editPassWord' },
           _react2.default.createElement(
@@ -294,7 +279,7 @@ var MixTop = function (_React$Component) {
           autoHideHeader = _props$setting.autoHideHeader;
       // const layout === 'topmenu' = layout === 'topmenu';  //显示顶部菜单
 
-      var userLogin = (0, _getLoginUser3.default)();
+      var userLogin = (0, _xguiForReact.getLoginUser)();
       var width = this.getHeadWidth();
       return _react2.default.createElement(
         _rcAnimate2.default,
@@ -372,7 +357,7 @@ var MixTop = function (_React$Component) {
                   )
                 ),
                 _react2.default.createElement(
-                  _NHModal3.default,
+                  _xguiForReact.NHModal,
                   {
                     ref: function ref(form) {
                       _this2.nhEditPassWordModal = form;

package/lib/layouts/settingDrawer/index.js

@@ -12,10 +12,6 @@ var _button = require('antd/lib/button');
 
 var _button2 = _interopRequireDefault(_button);
 
-var _hasAuth2 = require('xgui-for-react/lib/utils/hasAuth');
-
-var _hasAuth3 = _interopRequireDefault(_hasAuth2);
-
 var _divider = require('antd/lib/divider');
 
 var _divider2 = _interopRequireDefault(_divider);
@@ -84,6 +80,8 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
+var _xguiForReact = require('xgui-for-react');
+
 var _blockCheckbox = require('./blockCheckbox');
 
 var _blockCheckbox2 = _interopRequireDefault(_blockCheckbox);
@@ -367,7 +365,7 @@ var SettingDrawer = function (_Component) {
           _react2.default.createElement(
             'div',
             { className: 'btnWarp' },
-            (0, _hasAuth3.default)('ly-hq-xtgl-svc_parameterSetting_save') && _react2.default.createElement(
+            (0, _xguiForReact.hasAuth)('ly-hq-xtgl-svc_parameterSetting_save') && _react2.default.createElement(
               _button2.default,
               { onClick: this.props.onSaveTheme, type: 'primary' },
               '\u786E\u5B9A\u4FDD\u5B58'