dlt-for-react 1.0.10 → 1.0.12

package/lib/layouts/Top/index.js

@@ -200,7 +200,8 @@ var Home = function (_React$Component) {
         var oldPwd = (0, _rsa.encryptedString)(key, oldPassWord);
 
         //修改密码
-        (0, _NHFetch3.default)('api/zhxg-xtgl/openapi/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
+        var baseUrl = window.xtglUrl || 'api/hq-xtgl';
+        (0, _NHFetch3.default)(baseUrl + '/openapi/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
           if (res && res.data.meta['success']) {
             _this.passWordForm.resetFields();
             _this.nhEditPassWordModal.close();
@@ -248,25 +249,6 @@ var Home = function (_React$Component) {
   (0, _createClass3.default)(Home, [{
     key: 'componentDidMount',
     value: function componentDidMount() {}
-    // let userLogin = getLoginUser();
-    // //获取用户信息
-    // NHFetch(`api/zhxg-fwgl/fwgl/fwgl/${userLogin.userId}/getUserMsgByUserId`, 'get').then(res => {
-    //     let userSex = '1';
-    //     if (res && res.data) {
-    //         userSex = res.data.XBM;
-    //     }
-    //     this.setState({ userSex, username: userLogin.userName });
-    // })
-    // //获取用户功能
-    // NHFetch(`api/zhxg-fwgl/fwgl/fwgl/${userLogin.userId}/getFwlbMsgByUserId`, 'get').then(res => {
-    //     let searchData = [];
-    //     if (res && res.data) {
-    //         searchData = res.data;
-    //         searchData = searchData.filter(item => hasAuth(`zhxg_fwgl_home:${item.wfwbz.toLowerCase()}`));
-    //     }
-    //     this.setState({ searchData });
-    // })
-
 
     /**
      * 打开密码修改面板

package/lib/layouts/layout/index.js

@@ -261,7 +261,8 @@ var NHLayout = function (_React$Component) {
         return;
       }
       var prams = [{ csszxid: csszxid, csz: (0, _stringify2.default)(setting) }];
-      (0, _NHFetch3.default)('api/zhxg-xtgl/parameterSetting/updateMulti', 'POST', prams).then(function (res) {
+      var baseUrl = window.xtglUrl || 'api/hq-xtgl';
+      (0, _NHFetch3.default)(baseUrl + '/parameterSetting/updateMulti', 'POST', prams).then(function (res) {
         if (res && res.code === 200) {
           _message3.default.success('Layout配置项保存成功！');
         }
@@ -549,7 +550,7 @@ var NHLayout = function (_React$Component) {
         ),
 
         // 只有系统管理服务内容可开启主题设置
-        this.props.config.baseUrl === 'api/zhxg-xtgl' && _react2.default.createElement(_settingDrawer2.default, {
+        this.props.config.baseUrl === 'api/hq-xtgl' && _react2.default.createElement(_settingDrawer2.default, {
           setting: setting,
           changeSetting: this.changeSetting,
           onSaveTheme: this.saveSettingToDataBase

package/lib/layouts/mixTop/index.js

@@ -158,12 +158,6 @@ var MixTop = function (_React$Component) {
         var newPassWord = values['newPassWord'];
         var confirmPassWord = values['confirmPassWord'];
 
-        // if (!en_characters_pattern.test(oldPassWord)) {
-        //     this.passWordForm.setFields({oldPassWord: {errors: [new Error('密码格式：8-16位由数字、字母或下划线组成')]}});
-        //     stopLoading();
-        //     return;
-        // }
-
         if (!en_characters_pattern.test(newPassWord)) {
           _this.passWordForm.setFields({
             newPassWord: {
@@ -196,9 +190,9 @@ var MixTop = function (_React$Component) {
         var key = (0, _rsa.getKeyPair)(AUTH.public_exponent, '', AUTH.modulus);
         var newPwd = (0, _rsa.encryptedString)(key, newPassWord);
         var oldPwd = (0, _rsa.encryptedString)(key, oldPassWord);
-
+        var baseUrl = window.xtglUrl || 'api/hq-xtgl';
         //修改密码
-        (0, _NHFetch3.default)('api/zhxg-xtgl/openapi/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
+        (0, _NHFetch3.default)(baseUrl + '/openapi/users/password/update?oldPassword=' + oldPwd + '&newPassword=' + newPwd, 'post', {}).then(function (res) {
           if (res && res.data.meta['success']) {
             _this.passWordForm.resetFields();
             _this.nhEditPassWordModal.close();
@@ -246,25 +240,6 @@ var MixTop = function (_React$Component) {
   (0, _createClass3.default)(MixTop, [{
     key: 'componentDidMount',
     value: function componentDidMount() {}
-    // let userLogin = getLoginUser();
-    // //获取用户信息
-    // NHFetch(`api/zhxg-fwgl/fwgl/fwgl/${userLogin.userId}/getUserMsgByUserId`, 'get').then(res => {
-    //     let userSex = '1';
-    //     if (res && res.data) {
-    //         userSex = res.data.XBM;
-    //     }
-    //     this.setState({ userSex, username: userLogin.userName });
-    // })
-    // //获取用户功能
-    // NHFetch(`api/zhxg-fwgl/fwgl/fwgl/${userLogin.userId}/getFwlbMsgByUserId`, 'get').then(res => {
-    //     let searchData = [];
-    //     if (res && res.data) {
-    //         searchData = res.data;
-    //         searchData = searchData.filter(item => hasAuth(`zhxg_fwgl_home:${item.wfwbz.toLowerCase()}`));
-    //     }
-    //     this.setState({ searchData });
-    // })
-
 
     /**
      * 打开密码修改面板

package/lib/layouts/settingDrawer/fontChange.js

@@ -37,17 +37,17 @@ function FontChange(props) {
     var baseNumberFontSize = 75; //默认号75
     switch (size) {
       case 'default':
-        Dom.style.fontSize = baseNumberFontSize + 'Px';
+        Dom.style.fontSize = baseNumberFontSize + 'px';
         setFontSize(size);
         updateFontSize(size);
         break;
       case 'big':
-        Dom.style.fontSize = +baseNumberFontSize + 5 + 'Px';
+        Dom.style.fontSize = +baseNumberFontSize + 5 + 'px';
         setFontSize(size);
         updateFontSize(size);
         break;
       case 'huge':
-        Dom.style.fontSize = +baseNumberFontSize + 15 + 'Px';
+        Dom.style.fontSize = +baseNumberFontSize + 15 + 'px';
         setFontSize(size);
         updateFontSize(size);
         break;

package/lib/layouts/settingDrawer/index.js

@@ -1,106 +1,106 @@
-"use strict";
+'use strict';
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _drawer = require("antd/lib/drawer");
+var _drawer = require('antd/lib/drawer');
 
 var _drawer2 = _interopRequireDefault(_drawer);
 
-var _button = require("antd/lib/button");
+var _button = require('antd/lib/button');
 
 var _button2 = _interopRequireDefault(_button);
 
-var _hasAuth2 = require("xgui-for-react/lib/utils/hasAuth");
+var _hasAuth2 = require('xgui-for-react/lib/utils/hasAuth');
 
 var _hasAuth3 = _interopRequireDefault(_hasAuth2);
 
-var _divider = require("antd/lib/divider");
+var _divider = require('antd/lib/divider');
 
 var _divider2 = _interopRequireDefault(_divider);
 
-var _icon = require("antd/lib/icon");
+var _icon = require('antd/lib/icon');
 
 var _icon2 = _interopRequireDefault(_icon);
 
-var _tooltip = require("antd/lib/tooltip");
+var _tooltip = require('antd/lib/tooltip');
 
 var _tooltip2 = _interopRequireDefault(_tooltip);
 
-var _list = require("antd/lib/list");
+var _list = require('antd/lib/list');
 
 var _list2 = _interopRequireDefault(_list);
 
-var _switch = require("antd/lib/switch");
+var _switch = require('antd/lib/switch');
 
 var _switch2 = _interopRequireDefault(_switch);
 
-var _getPrototypeOf = require("babel-runtime/core-js/object/get-prototype-of");
+var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
 
-var _classCallCheck2 = require("babel-runtime/helpers/classCallCheck");
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
 
-var _createClass2 = require("babel-runtime/helpers/createClass");
+var _createClass2 = require('babel-runtime/helpers/createClass');
 
 var _createClass3 = _interopRequireDefault(_createClass2);
 
-var _possibleConstructorReturn2 = require("babel-runtime/helpers/possibleConstructorReturn");
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
 
 var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
 
-var _inherits2 = require("babel-runtime/helpers/inherits");
+var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-var _extends2 = require("babel-runtime/helpers/extends");
+var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
 
-var _select = require("antd/lib/select");
+var _select = require('antd/lib/select');
 
 var _select2 = _interopRequireDefault(_select);
 
-require("antd/lib/drawer/style");
+require('antd/lib/drawer/style');
 
-require("antd/lib/button/style");
+require('antd/lib/button/style');
 
-require("antd/lib/divider/style");
+require('antd/lib/divider/style');
 
-require("antd/lib/icon/style");
+require('antd/lib/icon/style');
 
-require("antd/lib/tooltip/style");
+require('antd/lib/tooltip/style');
 
-require("antd/lib/list/style");
+require('antd/lib/list/style');
 
-require("antd/lib/switch/style");
+require('antd/lib/switch/style');
 
-require("antd/lib/select/style");
+require('antd/lib/select/style');
 
-var _react = require("react");
+var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _blockCheckbox = require("./blockCheckbox");
+var _blockCheckbox = require('./blockCheckbox');
 
 var _blockCheckbox2 = _interopRequireDefault(_blockCheckbox);
 
-var _colorPicker = require("./colorPicker");
+var _colorPicker = require('./colorPicker');
 
 var _colorPicker2 = _interopRequireDefault(_colorPicker);
 
-var _colorChange = require("./colorChange");
+var _colorChange = require('./colorChange');
 
 var _colorChange2 = _interopRequireDefault(_colorChange);
 
-var _fontChange = require("./fontChange");
+var _fontChange = require('./fontChange');
 
 var _fontChange2 = _interopRequireDefault(_fontChange);
 
-require("../../../assets/layouts/settingDrawer/style.less");
+require('../../../assets/layouts/settingDrawer/style.less');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -111,14 +111,14 @@ var Body = function Body(_ref) {
       children = _ref.children,
       style = _ref.style;
   return _react2.default.createElement(
-    "div",
+    'div',
     {
       style: (0, _extends3.default)({}, style, {
         marginBottom: 24
       })
     },
     _react2.default.createElement(
-      "h3",
+      'h3',
       { className: 'title' },
       title
     ),
@@ -169,57 +169,57 @@ var SettingDrawer = function (_Component) {
           fixSiderbar = _this$props$setting.fixSiderbar;
 
       return [{
-        title: "内容区域宽度",
+        title: '内容区域宽度',
         action: _react2.default.createElement(
           _select2.default,
           {
             value: contentWidth,
-            size: "small",
+            size: 'small',
             onSelect: function onSelect(value) {
-              return _this.changeSetting("contentWidth", value);
+              return _this.changeSetting('contentWidth', value);
             },
             style: { width: 80 }
           },
-          layout === "topmenu" && _react2.default.createElement(
+          layout === 'topmenu' && _react2.default.createElement(
             Option,
-            { value: "Fixed" },
-            "\u5B9A\u5BBD"
+            { value: 'Fixed' },
+            '\u5B9A\u5BBD'
           ),
           _react2.default.createElement(
             Option,
-            { value: "Fluid" },
-            "\u6D41\u5F0F"
+            { value: 'Fluid' },
+            '\u6D41\u5F0F'
           )
         )
       }, {
-        title: "固定Header",
+        title: '固定Header',
         action: _react2.default.createElement(_switch2.default, {
-          size: "small",
+          size: 'small',
           checked: !!fixedHeader,
           onChange: function onChange(checked) {
-            return _this.changeSetting("fixedHeader", checked);
+            return _this.changeSetting('fixedHeader', checked);
           }
         })
       }, {
-        title: "下滑时隐藏Header",
+        title: '下滑时隐藏Header',
         disabled: !fixedHeader,
-        disabledReason: "固定Header时可配置",
+        disabledReason: '固定Header时可配置',
         action: _react2.default.createElement(_switch2.default, {
-          size: "small",
+          size: 'small',
           checked: !!autoHideHeader,
           onChange: function onChange(checked) {
-            return _this.changeSetting("autoHideHeader", checked);
+            return _this.changeSetting('autoHideHeader', checked);
           }
         })
       }, {
-        title: "固定侧边菜单",
-        disabled: layout === "topmenu",
-        disabledReason: "侧边菜单布局时可配置",
+        title: '固定侧边菜单',
+        disabled: layout === 'topmenu',
+        disabledReason: '侧边菜单布局时可配置',
         action: _react2.default.createElement(_switch2.default, {
-          size: "small",
+          size: 'small',
           checked: !!fixSiderbar,
           onChange: function onChange(checked) {
-            return _this.changeSetting("fixSiderbar", checked);
+            return _this.changeSetting('fixSiderbar', checked);
           }
         })
       }];
@@ -228,15 +228,15 @@ var SettingDrawer = function (_Component) {
       return _react2.default.createElement(
         _tooltip2.default,
         {
-          title: item.disabled ? item.disabledReason : "",
-          placement: "left"
+          title: item.disabled ? item.disabledReason : '',
+          placement: 'left'
         },
         _react2.default.createElement(
           _list2.default.Item,
           { actions: [action] },
           _react2.default.createElement(
-            "span",
-            { style: { opacity: item.disabled ? "0.5" : "" } },
+            'span',
+            { style: { opacity: item.disabled ? '0.5' : '' } },
             item.title
           )
         )
@@ -245,7 +245,7 @@ var SettingDrawer = function (_Component) {
   }
 
   (0, _createClass3.default)(SettingDrawer, [{
-    key: "render",
+    key: 'render',
     value: function render() {
       var _this2 = this;
 
@@ -262,89 +262,89 @@ var SettingDrawer = function (_Component) {
         _drawer2.default,
         {
           visible: collapse,
-          placement: "right",
+          placement: 'right',
           width: 425,
           onClose: this.togglerContent,
           handler: _react2.default.createElement(
-            "div",
+            'div',
             { className: 'handler', onClick: this.togglerContent },
             _react2.default.createElement(_icon2.default, {
-              type: collapse ? "close" : "setting",
+              type: collapse ? 'close' : 'setting',
               style: {
-                color: "#fff",
+                color: '#fff',
                 fontSize: 20
               }
             })
           )
         },
         _react2.default.createElement(
-          "style",
+          'style',
           null,
-          "\n              .ant-drawer-body{\n                padding-right:12px;\n              }\n            "
+          '\n              .ant-drawer-body{\n                padding-right:12px;\n              }\n            '
         ),
         _react2.default.createElement(
-          "div",
+          'div',
           { className: 'content' },
           _react2.default.createElement(
             Body,
-            { title: "\u6574\u4F53\u98CE\u683C\u8BBE\u7F6E" },
+            { title: '\u6574\u4F53\u98CE\u683C\u8BBE\u7F6E' },
             _react2.default.createElement(_blockCheckbox2.default, {
               list: [{
-                key: "dark",
-                type: "dark",
+                key: 'dark',
+                type: 'dark',
                 // url:
                 //   "https://gw.alipayobjects.com/zos/rmsportal/LCkqqYNmvBEbokSDscrm.svg",
-                title: "暗色菜单风格"
+                title: '暗色菜单风格'
               }, {
-                key: "light",
-                type: "light",
+                key: 'light',
+                type: 'light',
                 // url:
                 //   "https://gw.alipayobjects.com/zos/rmsportal/jpRkZQMyYRryryPNtyIC.svg",
-                title: "亮色菜单风格"
+                title: '亮色菜单风格'
               }],
               value: navTheme,
               onChange: function onChange(value) {
-                return _this2.changeSetting("navTheme", value);
+                return _this2.changeSetting('navTheme', value);
               }
             })
           ),
           _react2.default.createElement(
             Body,
-            { title: "\u5BFC\u822A\u6A21\u5F0F" },
+            { title: '\u5BFC\u822A\u6A21\u5F0F' },
             _react2.default.createElement(_blockCheckbox2.default, {
               list: [{
-                key: "sidemenu",
-                type: "sidemenu",
+                key: 'sidemenu',
+                type: 'sidemenu',
                 // url:
                 //   "https://gw.alipayobjects.com/zos/rmsportal/JopDzEhOqwOjeNTXkoje.svg",
-                title: "侧边菜单布局"
+                title: '侧边菜单布局'
               }, {
-                key: "topmenu",
-                type: "topmenu",
+                key: 'topmenu',
+                type: 'topmenu',
                 // url:
                 //   "https://gw.alipayobjects.com/zos/rmsportal/KDNDBbriJhLwuqMoxcAr.svg",
-                title: "顶部菜单布局"
+                title: '顶部菜单布局'
               }, {
-                key: "mixmenu",
-                type: "mixmenu",
+                key: 'mixmenu',
+                type: 'mixmenu',
                 // url:
                 //   "https://gw.alipayobjects.com/zos/rmsportal/KDNDBbriJhLwuqMoxcAr.svg",
-                title: "混合菜单布局"
+                title: '混合菜单布局'
               }],
               value: layout,
               onChange: function onChange(value) {
-                return _this2.changeSetting("layout", value);
+                return _this2.changeSetting('layout', value);
               }
             })
           ),
           _react2.default.createElement(
             Body,
-            { title: "\u4E3B\u9898\u8272" },
+            { title: '\u4E3B\u9898\u8272' },
             _react2.default.createElement(_colorChange2.default, {
-              type: "circle",
+              type: 'circle',
               color: primaryColor,
               onChangeComplete: function onChangeComplete(value) {
-                return _this2.changeSetting("primaryColor", value);
+                return _this2.changeSetting('primaryColor', value);
               }
             })
           ),
@@ -355,22 +355,22 @@ var SettingDrawer = function (_Component) {
           }),
           _react2.default.createElement(
             Body,
-            { title: "\u5B57\u53F7", style: { marginTop: 25 } },
+            { title: '\u5B57\u53F7', style: { marginTop: 25 } },
             _react2.default.createElement(_fontChange2.default, {
               initFontSize: fontSize,
               updateFontSize: function updateFontSize(value) {
-                _this2.changeSetting("fontSize", value);
+                _this2.changeSetting('fontSize', value);
               }
             })
           ),
           _react2.default.createElement(_divider2.default, null),
           _react2.default.createElement(
-            "div",
+            'div',
             { className: 'btnWarp' },
-            (0, _hasAuth3.default)('ly-zhxg-xtgl-svc_parameterSetting_save') && _react2.default.createElement(
+            (0, _hasAuth3.default)('ly-hq-xtgl-svc_parameterSetting_save') && _react2.default.createElement(
               _button2.default,
-              { onClick: this.props.onSaveTheme, type: "primary" },
-              "\u786E\u5B9A\u4FDD\u5B58"
+              { onClick: this.props.onSaveTheme, type: 'primary' },
+              '\u786E\u5B9A\u4FDD\u5B58'
             )
           )
         )

package/lib/utils/NHCore.js

@@ -208,7 +208,7 @@ var getOffset = exports.getOffset = function getOffset(ele) {
 
 var validateCode = exports.validateCode = function () {
   var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(rule, value, callback) {
-    var specialCharPattern, res, data, text, reg;
+    var specialCharPattern, baseUrl, res, data, text, reg;
     return _regenerator2.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -218,14 +218,17 @@ var validateCode = exports.validateCode = function () {
             // 第一次为调用接口，之后有缓存则使用缓存
 
             if (specialCharPattern.apiUsed) {
-              _context.next = 7;
+              _context.next = 8;
               break;
             }
 
-            _context.next = 5;
-            return NHFetch('api/zhxg-xtgl/openapi/getCsszByCsbz', 'GET', { csbz: 'XTGL_TSZF' });
+            baseUrl = window.xtglUrl || 'api/hq-xtgl';
+            _context.next = 6;
+            return NHFetch(baseUrl + '/openapi/getCsszByCsbz', 'GET', {
+              csbz: 'XTGL_TSZF'
+            });
 
-          case 5:
+          case 6:
             res = _context.sent;
 
             if (res && res.data) {
@@ -233,10 +236,14 @@ var validateCode = exports.validateCode = function () {
 
               specialCharPattern.pattern = data.pattern;
               specialCharPattern.open = data.open;
-              sessionStorage.setItem('specialCharPattern', (0, _stringify2.default)({ pattern: data.pattern, open: data.open, apiUsed: true }));
+              sessionStorage.setItem('specialCharPattern', (0, _stringify2.default)({
+                pattern: data.pattern,
+                open: data.open,
+                apiUsed: true
+              }));
             }
 
-          case 7:
+          case 8:
 
             // // 不开启,直接通过
             // if(!specialCharPattern.open ) {
@@ -252,22 +259,22 @@ var validateCode = exports.validateCode = function () {
             } else {
               callback();
             }
-            _context.next = 16;
+            _context.next = 17;
             break;
 
-          case 12:
-            _context.prev = 12;
+          case 13:
+            _context.prev = 13;
             _context.t0 = _context['catch'](0);
 
             console.log('配置的正则表达式有误，请联系管理员！');
             callback();
 
-          case 16:
+          case 17:
           case 'end':
             return _context.stop();
         }
       }
-    }, _callee, undefined, [[0, 12]]);
+    }, _callee, undefined, [[0, 13]]);
   }));
 
   return function validateCode(_x3, _x4, _x5) {

package/lib/utils/NHFetch.js

@@ -154,7 +154,7 @@ var refreshToken = exports.refreshToken = function refreshToken(_refreshToken, c
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
       'X-Requested-With': 'XMLHttpRequest',
-      appId: 'ly-zhxg'
+      appId: 'ly-hq'
     }
   }).then(function (response) {
     return response.json();
@@ -268,12 +268,19 @@ var NHFetch = function NHFetch(pUrl, pMethod, params, errorFunc) {
     method = 'POST';
     tmpHeader = 'application/json;charset=UTF-8';
     if (params !== undefined && params !== '') {
-      opts.body = (0, _stringify2.default)(params);
+      if (params.constructor === FormData) {
+        opts.body = params;
+      } else {
+        opts.body = (0, _stringify2.default)(params);
+      }
     }
   }
   opts.method = method;
   //  credentials: 'include',
   opts.headers = { 'Content-Type': tmpHeader };
+  if (params && params.constructor === FormData) {
+    opts.headers = {};
+  }
 
   //设置网关加密串
   var timestemp = new Date().valueOf();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlt-for-react",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "dlt for react",
   "main": "lib/index.js",
   "scripts": {