dlt-for-react 1.1.15 → 1.1.17

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

@@ -1,90 +1,90 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _checkbox = require('antd/lib/checkbox');
+var _checkbox = require("antd/lib/checkbox");
 
 var _checkbox2 = _interopRequireDefault(_checkbox);
 
-var _button = require('antd/lib/button');
+var _button = require("antd/lib/button");
 
 var _button2 = _interopRequireDefault(_button);
 
-var _input = require('antd/lib/input');
+var _input = require("antd/lib/input");
 
 var _input2 = _interopRequireDefault(_input);
 
-var _icon = require('antd/lib/icon');
+var _icon = require("antd/lib/icon");
 
 var _icon2 = _interopRequireDefault(_icon);
 
-var _extends2 = require('babel-runtime/helpers/extends');
+var _extends2 = require("babel-runtime/helpers/extends");
 
 var _extends3 = _interopRequireDefault(_extends2);
 
-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 _form = require('antd/lib/form');
+var _form = require("antd/lib/form");
 
 var _form2 = _interopRequireDefault(_form);
 
-require('antd/lib/checkbox/style');
+require("antd/lib/checkbox/style");
 
-require('antd/lib/button/style');
+require("antd/lib/button/style");
 
-require('antd/lib/input/style');
+require("antd/lib/input/style");
 
-require('antd/lib/icon/style');
+require("antd/lib/icon/style");
 
-require('antd/lib/form/style');
+require("antd/lib/form/style");
 
-var _react = require('react');
+var _react = require("react");
 
 var _react2 = _interopRequireDefault(_react);
 
-var _xguiForReact = require('xgui-for-react');
+var _index = require("../../index.js");
 
-require('../../../assets/login/index.less');
+require("../../../assets/login/index.less");
 
-var _login = require('./login.js');
+var _login = require("./login.js");
 
-var _hexSha = require('hex-sha1');
+var _hexSha = require("hex-sha1");
 
 var _hexSha2 = _interopRequireDefault(_hexSha);
 
-var _jsencrypt = require('jsencrypt');
+var _jsencrypt = require("jsencrypt");
 
-var _lyPassword = require('./lyPassword.js');
+var _lyPassword = require("./lyPassword.js");
 
 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) {
@@ -97,16 +97,16 @@ var LoginPage = function (_React$Component) {
 
     _this.handleAccountSubmit = function (e) {
       e.preventDefault();
-      if (_this.state.type === 'tab1') {
-        _this.props.form.validateFields(['username', 'password', 'captcha'], { force: true }, function (err, values) {
+      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(','));
+            arr.push("username=" + values.username, "password=" + encryptPassword, "timestamp=" + timestamp);
+            var digest = (0, _hexSha2.default)(arr.join(","));
 
             var params = {
               username: values.username,
@@ -114,12 +114,13 @@ var LoginPage = function (_React$Component) {
               encryptTransfer: true,
               timestamp: timestamp,
               digest: digest
+            };
 
-              //验证码开启
-            };if (_this.state.captchaVisible) {
+            //验证码开启
+            if (_this.state.captchaVisible) {
               params = (0, _extends3.default)({}, params, {
                 captcha: values.captcha,
-                systemId: 'ly-hq'
+                systemId: "ly-hq"
               });
             }
             _this.setState({
@@ -140,34 +141,34 @@ var LoginPage = function (_React$Component) {
 
     _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;
+      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',
+      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: '',
+      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',
+    key: "UNSAFE_componentWillMount",
     value: function UNSAFE_componentWillMount() {
       var _this2 = this;
 
       //获取版权信息
-      if (this.props.config.copyright && this.props.config.copyright.startsWith('front/')) {
-        (0, _xguiForReact.NHFetch)(this.props.config.copyright, 'GET').then(function (res) {
+      if (this.props.config.copyright && this.props.config.copyright.startsWith("front/")) {
+        (0, _index.NHFetch)(this.props.config.copyright, "GET").then(function (res) {
           if (res) {
             _this2.setState({
               copyright: res.data,
@@ -187,17 +188,17 @@ var LoginPage = function (_React$Component) {
     //获取配置，是否开启验证码
 
   }, {
-    key: 'getSetting',
+    key: "getSetting",
     value: function getSetting() {
       var _this3 = this;
 
-      fetch(URL_PREFIX + 'ng/captcha/status', {
-        method: 'GET',
-        credentials: 'include',
+      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'
+          "Content-Type": "application/x-www-form-urlencoded",
+          "X-Requested-With": "XMLHttpRequest",
+          appId: "ly-hq"
         }
       }).then(function (response) {
         return response.json();
@@ -218,19 +219,22 @@ var LoginPage = function (_React$Component) {
         return res;
       }).catch(function (error) {
         // 网络请求失败返回执行该回调函数，得到错误信息
-        Modal.error({ title: '错误提示', content: '网络请求异常,请联系管理员' });
+        Modal.error({
+          title: "错误提示",
+          content: "网络请求异常,请联系管理员"
+        });
         return error;
       });
     }
   }, {
-    key: 'changeCaptcha',
+    key: "changeCaptcha",
     value: function changeCaptcha() {
       this.setState({
         validateUrl: reqGetCaptcha + new Date().getMilliseconds()
       });
     }
   }, {
-    key: 'render',
+    key: "render",
     value: function render() {
       var _this4 = this;
 
@@ -238,19 +242,19 @@ var LoginPage = function (_React$Component) {
 
       var isNotIE = this.isNotIE();
       return _react2.default.createElement(
-        'div',
-        { className: 'xgui-login-container' },
+        "div",
+        { className: "xgui-login-container" },
         _react2.default.createElement(
-          'div',
-          { className: 'xgui-login-content' },
+          "div",
+          { className: "xgui-login-content" },
           _react2.default.createElement(
-            'header',
-            { style: { textAlign: 'center', height: '100px' } },
+            "header",
+            { style: { textAlign: "center", height: "100px" } },
             _react2.default.createElement(
-              'a',
+              "a",
               null,
-              _react2.default.createElement('img', {
-                alt: 'logo',
+              _react2.default.createElement("img", {
+                alt: "logo",
                 style: { maxWidth: 500, maxHeight: 100 },
                 src: this.props.config.loginLogoUrl,
                 onError: function onError(e) {
@@ -260,32 +264,32 @@ var LoginPage = function (_React$Component) {
             )
           ),
           _react2.default.createElement(
-            'div',
-            { className: 'xgui-login-main' },
+            "div",
+            { className: "xgui-login-main" },
             _react2.default.createElement(
               _form2.default,
               { onSubmit: this.handleAccountSubmit },
               _react2.default.createElement(
                 FormItem,
                 null,
-                getFieldDecorator('username', {
-                  rules: [{ required: true, message: '请输入您的账号！' }]
+                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'
+                  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: '请输入密码！' }]
+                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',
+                  encryptMark: "*",
+                  placeholder: "\u8BF7\u8F93\u5165\u5BC6\u7801",
                   onChange: function onChange(password) {
                     _this4.props.form.setFieldsValue({ password: password });
                   }
@@ -294,26 +298,26 @@ var LoginPage = function (_React$Component) {
               this.state.captchaVisible ? _react2.default.createElement(
                 FormItem,
                 null,
-                getFieldDecorator('captcha', {
-                  rules: [{ required: true, message: '请输入验证码！' }]
+                getFieldDecorator("captcha", {
+                  rules: [{ required: true, message: "请输入验证码！" }]
                 })(_react2.default.createElement(
-                  'div',
+                  "div",
                   null,
                   _react2.default.createElement(_input2.default, {
-                    size: 'large',
-                    type: 'text',
-                    placeholder: '\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801',
-                    style: { width: '58%', float: 'left' }
+                    size: "large",
+                    type: "text",
+                    placeholder: "\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801",
+                    style: { width: "58%", float: "left" }
                   }),
                   _react2.default.createElement(
-                    'div',
+                    "div",
                     null,
                     _react2.default.createElement(
-                      'span',
+                      "span",
                       { onClick: function onClick() {
                           return _this4.changeCaptcha();
                         } },
-                      _react2.default.createElement('img', { src: this.state.validateUrl })
+                      _react2.default.createElement("img", { src: this.state.validateUrl })
                     )
                   )
                 ))
@@ -324,50 +328,50 @@ var LoginPage = function (_React$Component) {
                 _react2.default.createElement(
                   _button2.default,
                   {
-                    className: 'xgui-login-submit',
-                    type: 'primary',
-                    size: 'large',
-                    htmlType: 'submit',
+                    className: "xgui-login-submit",
+                    type: "primary",
+                    size: "large",
+                    htmlType: "submit",
                     loading: this.state.loading
                   },
-                  '\u767B\u5F55'
+                  "\u767B\u5F55"
                 )
               ),
               _react2.default.createElement(
                 FormItem,
                 null,
-                getFieldDecorator('remember', {
-                  valuePropName: 'checked',
+                getFieldDecorator("remember", {
+                  valuePropName: "checked",
                   initialValue: true
                 })(_react2.default.createElement(
                   _checkbox2.default,
-                  { style: { float: 'right' } },
-                  '\u8BB0\u4F4F\u767B\u5F55'
+                  { style: { float: "right" } },
+                  "\u8BB0\u4F4F\u767B\u5F55"
                 ))
               )
             )
           )
         ),
         _react2.default.createElement(
-          'div',
-          { style: { margin: '48px 0 24px', minHeight: '50px' } },
+          "div",
+          { style: { margin: "48px 0 24px", minHeight: "50px" } },
           _react2.default.createElement(
-            'div',
+            "div",
             {
               style: {
-                fontSize: '12px',
-                color: '#7d7d7d',
-                textAlign: 'center',
-                lineHeight: '40px'
+                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            '
+          "style",
+          { jsx: "true", global: "true" },
+          "\n              .xgui-login-content {\n                flex: 1;\n              }\n            "
         ) : null
       );
     }

package/lib/layouts/Login/index.js

@@ -76,7 +76,7 @@ var _react = require("react");
 
 var _react2 = _interopRequireDefault(_react);
 
-var _xguiForReact = require("xgui-for-react");
+var _index = require("../../index.js");
 
 require("../../../assets/login/index.less");
 
@@ -372,7 +372,7 @@ var LoginPage = function (_React$Component) {
 
       //获取版权信息
       if (this.props.config.copyright && this.props.config.copyright.startsWith("api/")) {
-        (0, _xguiForReact.NHFetch)(this.props.config.copyright, "GET").then(function (res) {
+        (0, _index.NHFetch)(this.props.config.copyright, "GET").then(function (res) {
           if (res) {
             _this2.setState({
               copyright: res.data,