dlt-for-react 1.0.9 → 1.0.11

package/lib/layouts/Login/index-pre.js

@@ -1,7 +1,7 @@
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
-    value: true
+  value: true
 });
 
 var _checkbox = require('antd/lib/checkbox');
@@ -82,274 +82,299 @@ var _lyPassword2 = _interopRequireDefault(_lyPassword);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var pubKey = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ8DUCb0CEFATRWU8BtBL42RvsdFBcpxYNfsg0P1f7Rd1qKLtqLSBBVGrJu148CdCAkxwKOsjvj5D4eMeDQCd18CAwEAAQ==";
+var pubKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJ8DUCb0CEFATRWU8BtBL42RvsdFBcpxYNfsg0P1f7Rd1qKLtqLSBBVGrJu148CdCAkxwKOsjvj5D4eMeDQCd18CAwEAAQ==';
 //网关密码加密
 
-var URL_PREFIX = ''; //统一前缀    
-var reqGetCaptcha = URL_PREFIX + 'captchaServlet?v='; //验证码下载路径  
+var URL_PREFIX = ''; //统一前缀
+var reqGetCaptcha = URL_PREFIX + 'captchaServlet?v='; //验证码下载路径
 var FormItem = _form2.default.Item;
 
 var LoginPage = function (_React$Component) {
-    (0, _inherits3.default)(LoginPage, _React$Component);
-
-    function LoginPage(props) {
-        (0, _classCallCheck3.default)(this, LoginPage);
-
-        var _this = (0, _possibleConstructorReturn3.default)(this, (LoginPage.__proto__ || (0, _getPrototypeOf2.default)(LoginPage)).call(this, props));
-
-        _this.handleAccountSubmit = function (e) {
-            e.preventDefault();
-            if (_this.state.type === 'tab1') {
-                _this.props.form.validateFields(['username', 'password', 'captcha'], { force: true }, function (err, values) {
-                    if (!err) {
-                        var encrypt = new _jsencrypt.JSEncrypt();
-                        encrypt.setPublicKey(pubKey);
-                        var encryptPassword = encrypt.encrypt(values.password); //password为需要加密的字段
-                        var timestamp = new Date().getTime();
-                        var arr = [];
-                        arr.push("username=" + values.username, "password=" + encryptPassword, "timestamp=" + timestamp);
-                        var digest = (0, _hexSha2.default)(arr.join(","));
-
-                        var params = {
-                            username: values.username,
-                            password: encryptPassword,
-                            encryptTransfer: true,
-                            timestamp: timestamp,
-                            digest: digest
-                        };
-
-                        //验证码开启
-                        if (_this.state.captchaVisible) {
-                            params = (0, _extends3.default)({}, params, {
-                                captcha: values.captcha,
-                                systemId: 'ly-zhxg'
-                            });
-                        }
-                        _this.setState({
-                            loading: true
-                        });
-
-                        (0, _login.userLogin)(_this.props.allMenu, params, function () {
-                            _this.setState({
-                                loading: false
-                            }, function () {
-                                _this.getSetting();
-                            });
-                        });
-                    } else {}
-                });
-            } else {}
-        };
-
-        _this.isNotIE = function () {
-            var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串  
-            var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器  
-            var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
-            if (isIE || isIE11) {
-                return false;
-            } else return true;
-        };
-
-        _this.state = {
-            type: 'tab1',
-            count: 0,
-            loading: false,
-            copyright: '', //'Copyright © 2014-2018 LIANYI TECHNOLOGY CO.,LTD. All Rights Reserved. 联奕科技有限公司（V2.0.20170512-31058）',
-            loginLogoUrl: 'front/zhxg-unauth/xtglSchoolMng/downloadSchoolPictureByType?type=dlylogo',
-            defaultLoginLogo: 'zhxg',
-            validateUrl: '',
-            captchaVisible: false //验证码是否可见
-        };
-        return _this;
-    }
-
-    (0, _createClass3.default)(LoginPage, [{
-        key: 'UNSAFE_componentWillMount',
-        value: function UNSAFE_componentWillMount() {
-            var _this2 = this;
-
-            //获取版权信息
-            if (this.props.config.copyright && this.props.config.copyright.startsWith("front/")) {
-                (0, _NHFetch3.default)(this.props.config.copyright, "GET").then(function (res) {
-                    if (res) {
-                        _this2.setState({
-                            copyright: res.data,
-                            validateUrl: reqGetCaptcha + new Date().getMilliseconds()
-                        });
-                    }
-                });
-            } else if (this.props.config.copyright) {
-                this.setState({
-                    copyright: this.props.config.copyright,
-                    validateUrl: reqGetCaptcha + new Date().getMilliseconds()
-                });
+  (0, _inherits3.default)(LoginPage, _React$Component);
+
+  function LoginPage(props) {
+    (0, _classCallCheck3.default)(this, LoginPage);
+
+    var _this = (0, _possibleConstructorReturn3.default)(this, (LoginPage.__proto__ || (0, _getPrototypeOf2.default)(LoginPage)).call(this, props));
+
+    _this.handleAccountSubmit = function (e) {
+      e.preventDefault();
+      if (_this.state.type === 'tab1') {
+        _this.props.form.validateFields(['username', 'password', 'captcha'], { force: true }, function (err, values) {
+          if (!err) {
+            var encrypt = new _jsencrypt.JSEncrypt();
+            encrypt.setPublicKey(pubKey);
+            var encryptPassword = encrypt.encrypt(values.password); //password为需要加密的字段
+            var timestamp = new Date().getTime();
+            var arr = [];
+            arr.push('username=' + values.username, 'password=' + encryptPassword, 'timestamp=' + timestamp);
+            var digest = (0, _hexSha2.default)(arr.join(','));
+
+            var params = {
+              username: values.username,
+              password: encryptPassword,
+              encryptTransfer: true,
+              timestamp: timestamp,
+              digest: digest
+
+              //验证码开启
+            };if (_this.state.captchaVisible) {
+              params = (0, _extends3.default)({}, params, {
+                captcha: values.captcha,
+                systemId: 'ly-hq'
+              });
             }
-            this.getSetting(); //获取配置，是否开启验证码
-        }
-
-        //获取配置，是否开启验证码
-
-    }, {
-        key: 'getSetting',
-        value: function getSetting() {
-            var _this3 = this;
+            _this.setState({
+              loading: true
+            });
 
-            fetch(URL_PREFIX + 'ng/captcha/status', {
-                method: "GET",
-                credentials: "include",
-                headers: {
-                    "Content-Type": "application/x-www-form-urlencoded",
-                    "X-Requested-With": "XMLHttpRequest",
-                    "appId": "ly-zhxg"
-                }
-            }).then(function (response) {
-                return response.json();
-            }).then(function (res) {
-                if (res.meta && res.meta.statusCode === 200) {
-                    _this3.setState({
-                        captchaVisible: res.data
-                    }, function () {
-                        if (res.data) {
-                            _this3.changeCaptcha();
-                        }
-                    });
-                } else {
-                    _this3.setState({
-                        captchaVisible: false
-                    });
-                }
-                return res;
-            }).catch(function (error) {
-                // 网络请求失败返回执行该回调函数，得到错误信息
-                Modal.error({ title: '错误提示', content: '网络请求异常,请联系管理员' });
-                return error;
+            (0, _login.userLogin)(_this.props.allMenu, params, function () {
+              _this.setState({
+                loading: false
+              }, function () {
+                _this.getSetting();
+              });
             });
-        }
-    }, {
-        key: 'changeCaptcha',
-        value: function changeCaptcha() {
-            this.setState({
-                validateUrl: reqGetCaptcha + new Date().getMilliseconds()
+          } else {}
+        });
+      } else {}
+    };
+
+    _this.isNotIE = function () {
+      var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
+      var isIE = userAgent.indexOf('compatible') > -1 && userAgent.indexOf('MSIE') > -1; //判断是否IE<11浏览器
+      var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf('rv:11.0') > -1;
+      if (isIE || isIE11) {
+        return false;
+      } else return true;
+    };
+
+    _this.state = {
+      type: 'tab1',
+      count: 0,
+      loading: false,
+      copyright: '', //'Copyright © 2014-2018 LIANYI TECHNOLOGY CO.,LTD. All Rights Reserved. 联奕科技有限公司（V2.0.20170512-31058）',
+      loginLogoUrl: 'front/zhxg-unauth/xtglSchoolMng/downloadSchoolPictureByType?type=dlylogo',
+      defaultLoginLogo: 'zhxg',
+      validateUrl: '',
+      captchaVisible: false //验证码是否可见
+    };
+    return _this;
+  }
+
+  (0, _createClass3.default)(LoginPage, [{
+    key: 'UNSAFE_componentWillMount',
+    value: function UNSAFE_componentWillMount() {
+      var _this2 = this;
+
+      //获取版权信息
+      if (this.props.config.copyright && this.props.config.copyright.startsWith('front/')) {
+        (0, _NHFetch3.default)(this.props.config.copyright, 'GET').then(function (res) {
+          if (res) {
+            _this2.setState({
+              copyright: res.data,
+              validateUrl: reqGetCaptcha + new Date().getMilliseconds()
             });
-        }
-    }, {
-        key: 'render',
-        value: function render() {
-            var _this4 = this;
+          }
+        });
+      } else if (this.props.config.copyright) {
+        this.setState({
+          copyright: this.props.config.copyright,
+          validateUrl: reqGetCaptcha + new Date().getMilliseconds()
+        });
+      }
+      this.getSetting(); //获取配置，是否开启验证码
+    }
 
-            var getFieldDecorator = this.props.form.getFieldDecorator;
+    //获取配置，是否开启验证码
 
-            var isNotIE = this.isNotIE();
-            return _react2.default.createElement(
-                'div',
-                { className: 'xgui-login-container' },
-                _react2.default.createElement(
+  }, {
+    key: 'getSetting',
+    value: function getSetting() {
+      var _this3 = this;
+
+      fetch(URL_PREFIX + 'ng/captcha/status', {
+        method: 'GET',
+        credentials: 'include',
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          'X-Requested-With': 'XMLHttpRequest',
+          appId: 'ly-hq'
+        }
+      }).then(function (response) {
+        return response.json();
+      }).then(function (res) {
+        if (res.meta && res.meta.statusCode === 200) {
+          _this3.setState({
+            captchaVisible: res.data
+          }, function () {
+            if (res.data) {
+              _this3.changeCaptcha();
+            }
+          });
+        } else {
+          _this3.setState({
+            captchaVisible: false
+          });
+        }
+        return res;
+      }).catch(function (error) {
+        // 网络请求失败返回执行该回调函数，得到错误信息
+        Modal.error({ title: '错误提示', content: '网络请求异常,请联系管理员' });
+        return error;
+      });
+    }
+  }, {
+    key: 'changeCaptcha',
+    value: function changeCaptcha() {
+      this.setState({
+        validateUrl: reqGetCaptcha + new Date().getMilliseconds()
+      });
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _this4 = this;
+
+      var getFieldDecorator = this.props.form.getFieldDecorator;
+
+      var isNotIE = this.isNotIE();
+      return _react2.default.createElement(
+        'div',
+        { className: 'xgui-login-container' },
+        _react2.default.createElement(
+          'div',
+          { className: 'xgui-login-content' },
+          _react2.default.createElement(
+            'header',
+            { style: { textAlign: 'center', height: '100px' } },
+            _react2.default.createElement(
+              'a',
+              null,
+              _react2.default.createElement('img', {
+                alt: 'logo',
+                style: { maxWidth: 500, maxHeight: 100 },
+                src: this.props.config.loginLogoUrl,
+                onError: function onError(e) {
+                  e.target.src = _this4.props.config.defaultLoginLogo;
+                }
+              })
+            )
+          ),
+          _react2.default.createElement(
+            'div',
+            { className: 'xgui-login-main' },
+            _react2.default.createElement(
+              _form2.default,
+              { onSubmit: this.handleAccountSubmit },
+              _react2.default.createElement(
+                FormItem,
+                null,
+                getFieldDecorator('username', {
+                  rules: [{ required: true, message: '请输入您的账号！' }]
+                })(_react2.default.createElement(_input2.default, {
+                  size: 'large',
+                  prefix: _react2.default.createElement(_icon2.default, { type: 'user', style: { color: 'rgba(0,0,0,.25)' } }),
+                  placeholder: '\u8BF7\u8F93\u5165\u7528\u6237\u540D'
+                }))
+              ),
+              _react2.default.createElement(
+                FormItem,
+                null,
+                getFieldDecorator('password', {
+                  rules: [{ required: true, message: '请输入密码！' }]
+                })(
+                // <Input size="large" prefix={<Icon type="lock" style={{ color: 'rgba(0,0,0,.25)' }} />} type="password" placeholder="请输入密码" />
+                _react2.default.createElement(_lyPassword2.default, {
+                  encryptMark: '*',
+                  placeholder: '\u8BF7\u8F93\u5165\u5BC6\u7801',
+                  onChange: function onChange(password) {
+                    _this4.props.form.setFieldsValue({ password: password });
+                  }
+                }))
+              ),
+              this.state.captchaVisible ? _react2.default.createElement(
+                FormItem,
+                null,
+                getFieldDecorator('captcha', {
+                  rules: [{ required: true, message: '请输入验证码！' }]
+                })(_react2.default.createElement(
+                  'div',
+                  null,
+                  _react2.default.createElement(_input2.default, {
+                    size: 'large',
+                    type: 'text',
+                    placeholder: '\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801',
+                    style: { width: '58%', float: 'left' }
+                  }),
+                  _react2.default.createElement(
                     'div',
-                    { className: 'xgui-login-content' },
+                    null,
                     _react2.default.createElement(
-                        'header',
-                        { style: { textAlign: 'center', height: '100px' } },
-                        _react2.default.createElement(
-                            'a',
-                            null,
-                            _react2.default.createElement('img', { alt: 'logo', style: { maxWidth: 500, maxHeight: 100 },
-                                src: this.props.config.loginLogoUrl, onError: function onError(e) {
-                                    e.target.src = _this4.props.config.defaultLoginLogo;
-                                } })
-                        )
-                    ),
-                    _react2.default.createElement(
-                        'div',
-                        { className: 'xgui-login-main' },
-                        _react2.default.createElement(
-                            _form2.default,
-                            { onSubmit: this.handleAccountSubmit },
-                            _react2.default.createElement(
-                                FormItem,
-                                null,
-                                getFieldDecorator('username', {
-                                    rules: [{ required: true, message: '请输入您的账号！' }]
-                                })(_react2.default.createElement(_input2.default, { size: 'large', prefix: _react2.default.createElement(_icon2.default, { type: 'user', style: { color: 'rgba(0,0,0,.25)' } }), placeholder: '\u8BF7\u8F93\u5165\u7528\u6237\u540D' }))
-                            ),
-                            _react2.default.createElement(
-                                FormItem,
-                                null,
-                                getFieldDecorator('password', {
-                                    rules: [{ required: true, message: '请输入密码！' }]
-                                })(
-                                // <Input size="large" prefix={<Icon type="lock" style={{ color: 'rgba(0,0,0,.25)' }} />} type="password" placeholder="请输入密码" />
-                                _react2.default.createElement(_lyPassword2.default, {
-                                    encryptMark: '*',
-                                    placeholder: '\u8BF7\u8F93\u5165\u5BC6\u7801',
-                                    onChange: function onChange(password) {
-                                        _this4.props.form.setFieldsValue({ password: password });
-                                    }
-                                }))
-                            ),
-                            this.state.captchaVisible ? _react2.default.createElement(
-                                FormItem,
-                                null,
-                                getFieldDecorator('captcha', {
-                                    rules: [{ required: true, message: '请输入验证码！' }]
-                                })(_react2.default.createElement(
-                                    'div',
-                                    null,
-                                    _react2.default.createElement(_input2.default, { size: 'large', type: 'text', placeholder: '\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801', style: { width: '58%', float: 'left' } }),
-                                    _react2.default.createElement(
-                                        'div',
-                                        null,
-                                        _react2.default.createElement(
-                                            'span',
-                                            { onClick: function onClick() {
-                                                    return _this4.changeCaptcha();
-                                                } },
-                                            _react2.default.createElement('img', { src: this.state.validateUrl })
-                                        )
-                                    )
-                                ))
-                            ) : null,
-                            _react2.default.createElement(
-                                FormItem,
-                                null,
-                                _react2.default.createElement(
-                                    _button2.default,
-                                    { className: 'xgui-login-submit', type: 'primary', size: 'large', htmlType: 'submit', loading: this.state.loading },
-                                    '\u767B\u5F55'
-                                )
-                            ),
-                            _react2.default.createElement(
-                                FormItem,
-                                null,
-                                getFieldDecorator('remember', {
-                                    valuePropName: 'checked',
-                                    initialValue: true
-                                })(_react2.default.createElement(
-                                    _checkbox2.default,
-                                    { style: { float: 'right' } },
-                                    '\u8BB0\u4F4F\u767B\u5F55'
-                                ))
-                            )
-                        )
+                      'span',
+                      { onClick: function onClick() {
+                          return _this4.changeCaptcha();
+                        } },
+                      _react2.default.createElement('img', { src: this.state.validateUrl })
                     )
-                ),
+                  )
+                ))
+              ) : null,
+              _react2.default.createElement(
+                FormItem,
+                null,
                 _react2.default.createElement(
-                    'div',
-                    { style: { margin: '48px 0 24px', minHeight: '50px' } },
-                    _react2.default.createElement(
-                        'div',
-                        { style: { fontSize: '12px', color: '#7d7d7d', textAlign: 'center', lineHeight: '40px' } },
-                        this.state.copyright
-                    )
-                ),
-                isNotIE ? _react2.default.createElement(
-                    'style',
-                    { jsx: 'true', global: 'true' },
-                    '\n                       .xgui-login-content{\n                            flex: 1;\n                        }\n                    '
-                ) : null
-            );
-        }
-    }]);
-    return LoginPage;
+                  _button2.default,
+                  {
+                    className: 'xgui-login-submit',
+                    type: 'primary',
+                    size: 'large',
+                    htmlType: 'submit',
+                    loading: this.state.loading
+                  },
+                  '\u767B\u5F55'
+                )
+              ),
+              _react2.default.createElement(
+                FormItem,
+                null,
+                getFieldDecorator('remember', {
+                  valuePropName: 'checked',
+                  initialValue: true
+                })(_react2.default.createElement(
+                  _checkbox2.default,
+                  { style: { float: 'right' } },
+                  '\u8BB0\u4F4F\u767B\u5F55'
+                ))
+              )
+            )
+          )
+        ),
+        _react2.default.createElement(
+          'div',
+          { style: { margin: '48px 0 24px', minHeight: '50px' } },
+          _react2.default.createElement(
+            'div',
+            {
+              style: {
+                fontSize: '12px',
+                color: '#7d7d7d',
+                textAlign: 'center',
+                lineHeight: '40px'
+              }
+            },
+            this.state.copyright
+          )
+        ),
+        isNotIE ? _react2.default.createElement(
+          'style',
+          { jsx: 'true', global: 'true' },
+          '\n              .xgui-login-content {\n                flex: 1;\n              }\n            '
+        ) : null
+      );
+    }
+  }]);
+  return LoginPage;
 }(_react2.default.Component);
 
 var Login = _form2.default.create()(LoginPage);

package/lib/layouts/Login/index.js

@@ -121,7 +121,7 @@ var GetCsz = function GetCsz(csbz, callback) {
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded',
       'X-Requested-With': 'XMLHttpRequest',
-      appId: 'ly-zhxg'
+      appId: 'ly-hq'
     }
   }).then(function (response) {
     return response.json();
@@ -401,7 +401,7 @@ var LoginPage = function (_React$Component) {
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded',
           'X-Requested-With': 'XMLHttpRequest',
-          appId: 'ly-zhxg'
+          appId: 'ly-hq'
         }
       }).then(function (response) {
         return response.json();