dlt-for-react 1.1.3 → 1.1.5

package/README.md

@@ -8,7 +8,7 @@ npm publish
 
 ## 前端 dlt-for-react 依赖包版本更新记录
 
-##### 当前最新版本：1.1.2
+##### 当前最新版本：1.1.5
 
 ##### 安装依赖
 
@@ -16,6 +16,14 @@ npm publish
 
 ##### 版本修改记录
 
+#### V1.1.5—2023 年 11 月 22 日
+
+1. 修改getSizebug
+
+#### V1.1.4—2023 年 11 月 21 日
+
+1. 优化接口获取服务名称配置
+
 #### V1.1.1~1.1.3—2023 年 11 月 20 日
 
 1. 优化配置菜单 icon

package/lib/components/KyContainerFrame/index.js

@@ -1,76 +1,78 @@
-'use strict';
+"use strict";
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
+var _defineProperty2 = require("babel-runtime/helpers/defineProperty");
 
 var _defineProperty3 = _interopRequireDefault(_defineProperty2);
 
-var _row = require('antd/lib/row');
+var _row = require("antd/lib/row");
 
 var _row2 = _interopRequireDefault(_row);
 
-var _pageHeader = require('antd/lib/page-header');
+var _pageHeader = require("antd/lib/page-header");
 
 var _pageHeader2 = _interopRequireDefault(_pageHeader);
 
-var _button = require('antd/lib/button');
+var _button = require("antd/lib/button");
 
 var _button2 = _interopRequireDefault(_button);
 
-var _col = require('antd/lib/col');
+var _col = require("antd/lib/col");
 
 var _col2 = _interopRequireDefault(_col);
 
-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 _KyContainerFrame$pro;
 
-require('antd/lib/row/style');
+require("antd/lib/row/style");
 
-require('antd/lib/page-header/style');
+require("antd/lib/page-header/style");
 
-require('antd/lib/button/style');
+require("antd/lib/button/style");
 
-require('antd/lib/col/style');
+require("antd/lib/col/style");
 
-var _react = require('react');
+var _react = require("react");
 
 var _react2 = _interopRequireDefault(_react);
 
-var _classnames = require('classnames');
+var _classnames = require("classnames");
 
 var _classnames2 = _interopRequireDefault(_classnames);
 
-var _propTypes = require('prop-types');
+var _propTypes = require("prop-types");
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
-var _reactCustomScrollbarsPatched = require('react-custom-scrollbars-patched');
+var _reactCustomScrollbarsPatched = require("react-custom-scrollbars-patched");
 
-var _utils = require('../../utils');
+var _utils = require("../../utils");
 
-require('../../../assets/components/KyContainerFrame/index.less');
+var _NHCore = require("../../utils/NHCore");
+
+require("../../../assets/components/KyContainerFrame/index.less");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -133,8 +135,13 @@ var KyContainerFrame = function (_React$Component) {
       if (onCancel) {
         list.push(_react2.default.createElement(
           _button2.default,
-          { type: clType, style: { marginLeft: '16px' }, key: (0, _utils.createUuid)(), onClick: onCancel },
-          '\u8FD4\u56DE'
+          {
+            type: clType,
+            style: { marginLeft: "16px" },
+            key: (0, _utils.createUuid)(),
+            onClick: onCancel
+          },
+          "\u8FD4\u56DE"
         ));
       }
       return list;
@@ -147,9 +154,9 @@ var KyContainerFrame = function (_React$Component) {
       if (scroll) {
         return _react2.default.createElement(
           _reactCustomScrollbarsPatched.Scrollbars,
-          { autoHide: true, style: { width: '100%', height: contentHeight } },
+          { autoHide: true, style: { width: "100%", height: contentHeight } },
           _react2.default.createElement(
-            'div',
+            "div",
             null,
             component
           )
@@ -166,7 +173,7 @@ var KyContainerFrame = function (_React$Component) {
   }
 
   (0, _createClass3.default)(KyContainerFrame, [{
-    key: 'render',
+    key: "render",
     value: function render() {
       var _props = this.props,
           onCancel = _props.onCancel,
@@ -179,25 +186,25 @@ var KyContainerFrame = function (_React$Component) {
           pageHeaderHidden = _props.pageHeaderHidden,
           className = _props.className;
 
-      var contentHeight = height ? parseInt(height) : (0, _utils.getSize)().windowH - 207 - (hideHeader ? 0 : 50);
+      var contentHeight = height ? parseInt(height) : (0, _NHCore.getSize)().windowH - 207 - (hideHeader ? 0 : 50);
       if (!visible) return null;
       return _react2.default.createElement(
-        'div',
-        { className: (0, _classnames2.default)('KyContainerFrame', className) },
+        "div",
+        { className: (0, _classnames2.default)("KyContainerFrame", className) },
         !hideHeader && (pageHeader ? !pageHeaderHidden && _react2.default.createElement(_pageHeader2.default, { onBack: onCancel, title: title }) : _react2.default.createElement(
-          'div',
-          { className: 'header' },
+          "div",
+          { className: "header" },
           _react2.default.createElement(
             _row2.default,
             null,
             _react2.default.createElement(
               _col2.default,
-              { span: 16, className: 'title' },
+              { span: 16, className: "title" },
               title
             ),
             _react2.default.createElement(
               _col2.default,
-              { span: 8, className: 'button' },
+              { span: 8, className: "button" },
               this.getButtons()
             )
           )
@@ -216,13 +223,13 @@ var KyContainerFrame = function (_React$Component) {
 
 KyContainerFrame.defaultProps = {
   hideHeader: false,
-  title: '标题', //页面标题
+  title: "标题", //页面标题
   visible: true, //默认可见
   buttons: [], //自定义按钮组
-  okText: '保存', //保存按钮标题
-  okType: 'primary', //保存按钮样式
-  cancelText: '返回', //返回按钮标题
-  clType: 'default', //返回按钮样式
+  okText: "保存", //保存按钮标题
+  okType: "primary", //保存按钮样式
+  cancelText: "返回", //返回按钮标题
+  clType: "default", //返回按钮样式
   pageHeader: false, //使用页头组件
   pageHeaderHidden: false //使用页头组件,默认显示
 };
@@ -234,6 +241,6 @@ KyContainerFrame.propTypes = (_KyContainerFrame$pro = {
   hideHeader: _propTypes2.default.bool, //隐藏头部
   pageHeader: _propTypes2.default.bool, //使用页头
   title: _propTypes2.default.string.isRequired, //页面标题
-  pageHeaderHidden: _propTypes2.default.bool }, (0, _defineProperty3.default)(_KyContainerFrame$pro, 'title', _propTypes2.default.string.isRequired), (0, _defineProperty3.default)(_KyContainerFrame$pro, 'visible', _propTypes2.default.bool), (0, _defineProperty3.default)(_KyContainerFrame$pro, 'buttons', _propTypes2.default.arrayOf(_propTypes2.default.object)), (0, _defineProperty3.default)(_KyContainerFrame$pro, 'onOk', _propTypes2.default.func), (0, _defineProperty3.default)(_KyContainerFrame$pro, 'onCancel', _propTypes2.default.func.isRequired), (0, _defineProperty3.default)(_KyContainerFrame$pro, 'height', _propTypes2.default.number), (0, _defineProperty3.default)(_KyContainerFrame$pro, 'okText', _propTypes2.default.string), (0, _defineProperty3.default)(_KyContainerFrame$pro, 'cancelText', _propTypes2.default.string), _KyContainerFrame$pro);
+  pageHeaderHidden: _propTypes2.default.bool }, (0, _defineProperty3.default)(_KyContainerFrame$pro, "title", _propTypes2.default.string.isRequired), (0, _defineProperty3.default)(_KyContainerFrame$pro, "visible", _propTypes2.default.bool), (0, _defineProperty3.default)(_KyContainerFrame$pro, "buttons", _propTypes2.default.arrayOf(_propTypes2.default.object)), (0, _defineProperty3.default)(_KyContainerFrame$pro, "onOk", _propTypes2.default.func), (0, _defineProperty3.default)(_KyContainerFrame$pro, "onCancel", _propTypes2.default.func.isRequired), (0, _defineProperty3.default)(_KyContainerFrame$pro, "height", _propTypes2.default.number), (0, _defineProperty3.default)(_KyContainerFrame$pro, "okText", _propTypes2.default.string), (0, _defineProperty3.default)(_KyContainerFrame$pro, "cancelText", _propTypes2.default.string), _KyContainerFrame$pro);
 
 exports.default = KyContainerFrame;

package/lib/index.js

@@ -513,6 +513,12 @@ Object.defineProperty(exports, 'keyToLower', {
     return _index4.keyToLower;
   }
 });
+Object.defineProperty(exports, 'getTitleConfig', {
+  enumerable: true,
+  get: function get() {
+    return _index4.getTitleConfig;
+  }
+});
 
 var _common = require('./utils/common.js');
 
@@ -824,7 +830,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @Description:
  * @Author: jiangzhongxin
  * @LastEditors: jiangzhongxin
- * @LastEditTime: 2023-11-09 17:52:36
+ * @LastEditTime: 2023-11-21 14:30:14
  * @Copyright: 2023 LIANYI TECHNOLOGY CO.,LTD. All Rights Reserved. 联奕科技有限公司
  */
 var ENV = process.env.NODE_ENV;

package/lib/layouts/Top/index.js

@@ -342,7 +342,7 @@ var Home = function (_React$Component) {
                       _react2.default.createElement(
                         'b',
                         null,
-                        this.props.config.fwmc
+                        this.props.fwmc
                       )
                     )
                   ),

package/lib/layouts/layout/index.js

@@ -25,6 +25,18 @@ var _stringify = require('babel-runtime/core-js/json/stringify');
 
 var _stringify2 = _interopRequireDefault(_stringify);
 
+var _promise = require('babel-runtime/core-js/promise');
+
+var _promise2 = _interopRequireDefault(_promise);
+
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
+var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
+
+var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
+
 var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
@@ -63,6 +75,10 @@ var _react2 = _interopRequireDefault(_react);
 
 var _xguiForReact = require('xgui-for-react');
 
+var _NHFetch = require('../../utils/NHFetch');
+
+var _NHFetch2 = _interopRequireDefault(_NHFetch);
+
 var _LeftMenu = require('../LeftMenu');
 
 var _LeftMenu2 = _interopRequireDefault(_LeftMenu);
@@ -116,14 +132,70 @@ var NHLayout = function (_React$Component) {
   (0, _inherits3.default)(NHLayout, _React$Component);
 
   function NHLayout(props) {
+    var _this2 = this;
+
     (0, _classCallCheck3.default)(this, NHLayout);
 
     var _this = (0, _possibleConstructorReturn3.default)(this, (NHLayout.__proto__ || (0, _getPrototypeOf2.default)(NHLayout)).call(this, props));
 
+    _this.UNSAFE_componentWillMount = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
+      var config, fwmcUrl, fwmc, data;
+      return _regenerator2.default.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              config = _this.props.config;
+              fwmcUrl = config.fwmcUrl, fwmc = config.fwmc;
+              //动态获取服务名称(优选使用fwmcUrl，如果未指定fwmcUrl则以fwmc为准)
+
+              if (!fwmcUrl) {
+                _context.next = 8;
+                break;
+              }
+
+              _context.next = 5;
+              return _this.getFwmc(fwmcUrl);
+
+            case 5:
+              _context.t0 = _context.sent;
+              _context.next = 9;
+              break;
+
+            case 8:
+              _context.t0 = undefined;
+
+            case 9:
+              data = _context.t0;
+
+              if (data) {
+                fwmc = data;
+              }
+              _this.setState({
+                fwmc: fwmc
+              });
+
+            case 12:
+            case 'end':
+              return _context.stop();
+          }
+        }
+      }, _callee, _this2);
+    }));
+
+    _this.getFwmc = function (fwmcUrl) {
+      return new _promise2.default(function (resolve, reject) {
+        (0, _NHFetch2.default)(fwmcUrl, 'GET').then(function (res) {
+          if (res && res.code === 200) {
+            resolve(res.data);
+          }
+        });
+      });
+    };
+
     _this.getLayoutSetting = function () {
       _this.setState({ layoutShow: false });
       var baseUrl = window.xtglUrl || 'api/hq-xtgl';
-      (0, _xguiForReact.NHFetch)(baseUrl + '/outer/getCsszByCsbz', 'GET', {
+      (0, _NHFetch2.default)(baseUrl + '/outer/getCsszByCsbz', 'GET', {
         csbz: 'XTGL_LAYOUT_SETTING'
       }).then(function (res) {
         if (res && res.code === 200 && res.data) {
@@ -256,7 +328,7 @@ var NHLayout = function (_React$Component) {
       }
       var prams = [{ csszxid: csszxid, csz: (0, _stringify2.default)(setting) }];
       var baseUrl = window.xtglUrl || 'api/hq-xtgl';
-      (0, _xguiForReact.NHFetch)(baseUrl + '/parameterSetting/updateMulti', 'POST', prams).then(function (res) {
+      (0, _NHFetch2.default)(baseUrl + '/parameterSetting/updateMulti', 'POST', prams).then(function (res) {
         if (res && res.code === 200) {
           _message3.default.success('Layout配置项保存成功！');
         }
@@ -295,7 +367,7 @@ var NHLayout = function (_React$Component) {
 
     _this.state = {
       collapsed: false, //是否关闭菜单
-      fwmc: _this.props.config.fwmc, //服务名称
+      fwmc: "", //服务名称
       visible: true, //是否显示header
       setting: sessionStorage.getItem('setting') ? JSON.parse(sessionStorage.getItem('setting')) : defaultSetting, // 配置
       layoutShow: false, //展示layout
@@ -307,34 +379,6 @@ var NHLayout = function (_React$Component) {
   }
 
   (0, _createClass3.default)(NHLayout, [{
-    key: 'UNSAFE_componentWillMount',
-    value: function UNSAFE_componentWillMount() {
-      var _this2 = this;
-
-      var config = this.props.config;
-
-      var fwmcUrl = config.fwmcUrl,
-          fwmc = config.fwmc;
-      //动态获取服务名称(优选使用fwmcUrl，如果未指定fwmcUrl则以fwmc为准)
-      if (fwmcUrl && fwmcUrl.startsWith('api/')) {
-        (0, _xguiForReact.NHFetch)(fwmcUrl, 'GET').then(function (res) {
-          if (res && res.data) {
-            _this2.setState({
-              fwmc: res.data
-            });
-          } else {
-            _this2.setState({
-              fwmc: fwmc
-            });
-          }
-        });
-      } else if (fwmc) {
-        this.setState({
-          fwmc: fwmc
-        });
-      }
-    }
-  }, {
     key: 'componentDidMount',
     value: function componentDidMount() {
       document.addEventListener('scroll', this.handScroll, { passive: true });
@@ -454,6 +498,7 @@ var NHLayout = function (_React$Component) {
           collapsed: this.state.collapsed,
           toggle: this.toggle,
           config: this.props.config,
+          fwmc: this.state.fwmc,
           menuIcons: menuIcons,
           updataPassBtnAuth: this.props.config.updataPassBtnAuth,
           setting: setting
@@ -490,6 +535,7 @@ var NHLayout = function (_React$Component) {
             collapsed: this.state.collapsed,
             toggle: this.toggle,
             config: this.props.config,
+            fwmc: this.state.fwmc,
             updataPassBtnAuth: this.props.config.updataPassBtnAuth,
             setting: setting
           }),

package/lib/layouts/mixTop/index.js

@@ -107,8 +107,8 @@ var Header = _layout2.default.Header; /*
                                        * @Description: 混合菜单布局
                                        * @Author: lisenlin
                                        * @Date: 2021-06-22 17:18:16
-                                       * @LastEditors: lisenlin
-                                       * @LastEditTime: 2021-10-27 10:58:36
+                                       * @LastEditors: jiangzhongxin
+                                       * @LastEditTime: 2023-11-21 13:52:05
                                        */
 
 var touxiangman = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA0ppVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RDIzNTA5QjU0OUNDMTFFODhCMjVBMTc2Q0E2QTlCRUQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RDIzNTA5QjQ0OUNDMTFFODhCMjVBMTc2Q0E2QTlCRUQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDo2MzZjYWQxYS00OWNiLTExZTgtYjFjOS05YmZmODYwYWE3ZWIiIHN0UmVmOmRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDo2MzZjYWQxYS00OWNiLTExZTgtYjFjOS05YmZmODYwYWE3ZWIiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+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';
@@ -326,7 +326,7 @@ var MixTop = function (_React$Component) {
                     _react2.default.createElement(
                       'span',
                       { className: 'xgui-layout-topHeader-logoSpan' },
-                      this.props.config.fwmc
+                      this.props.fwmc
                     )
                   )
                 )

package/lib/utils/createUuid.js

@@ -1,20 +1,40 @@
-"use strict";
+'use strict';
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 //获取UUID
 var createUuid = function createUuid() {
-  var s = [];
-  var hexDigits = "0123456789abcdef";
-  for (var i = 0; i < 36; i++) {
-    s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
-  }
-  s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
-  s[19] = hexDigits.substr(s[19] & 0x3 | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
-  s[8] = s[13] = s[18] = s[23] = "-";
+  var len = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 32;
+  var radix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 16;
+
+  var chars = '0123456789abcdefghijklmnopqrstuvwxyz'.split('');
+  var uuid = [],
+      i;
+  radix = radix || chars.length;
+
+  if (len) {
+    // Compact form
+    for (i = 0; i < len; i++) {
+      uuid[i] = chars[0 | Math.random() * radix];
+    }
+  } else {
+    // rfc4122, version 4 form
+    var r;
 
-  var uuid = s.join("");
-  return uuid;
+    // rfc4122 requires these characters
+    uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+    uuid[14] = '4';
+
+    // Fill in random data.  At i==19 set the high bits of clock sequence as
+    // per rfc4122, sec. 4.1.5
+    for (i = 0; i < 36; i++) {
+      if (!uuid[i]) {
+        r = 0 | Math.random() * 16;
+        uuid[i] = chars[i == 19 ? r & 0x3 | 0x8 : r];
+      }
+    }
+  }
+  return uuid.join('');
 };
 exports.default = createUuid;

package/lib/utils/getLoginUser.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var getLoginUser = function getLoginUser(auth) {
-  var loginUser = sessionStorage.getItem('currentUser') ? JSON.parse(sessionStorage.getItem('currentUser')) : { authorization: {}, menus: [] };
+  var loginUser = sessionStorage.getItem('userLogin') ? JSON.parse(sessionStorage.getItem('userLogin')) : { authorization: {}, menus: [] };
   return loginUser;
 };
 exports.default = getLoginUser;

package/lib/utils/getSize.js

@@ -1,9 +1,18 @@
-"use strict";
+'use strict';
 
 Object.defineProperty(exports, "__esModule", {
 	value: true
 });
 var getSize = function getSize() {
+	var setting = sessionStorage.getItem('setting');
+	var breadcrumbHeight = 0; //面包屑高度
+	if (setting) {
+		// 存在布局配置
+		var _JSON$parse = JSON.parse(setting),
+		    layout = _JSON$parse.layout;
+
+		breadcrumbHeight = layout === 'mixmenu' ? 40 : 0; //若是混合布局 contentH高度需要减去面包屑高度
+	}
 	var windowW = void 0,
 	    windowH = void 0,
 	    contentH = void 0,
@@ -11,7 +20,7 @@ var getSize = function getSize() {
 	windowH = window.innerHeight;
 	windowW = window.innerWidth;
 	scrollT = document.documentElement.scrollTop || document.body.scrollTop;
-	contentH = windowH - 65;
+	contentH = windowH - 65 - breadcrumbHeight;
 	return { windowW: windowW, windowH: windowH, contentH: contentH, scrollT: scrollT };
 };
 

package/lib/utils/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.keyToLower = exports.randomNumEnum = exports.getValueFromArray = exports.getLabelValueTree = exports.cutArray = exports.arrayMove = exports.arrayMoveMutate = exports.checkPassword = exports.matchParamsPath = exports.urlToList = exports.getHashParam = exports.isUrl = exports.getRouterAuthority = exports.transformDate = exports.getStrLength = exports.DateUtil = exports._utf8_encode = exports.encode = exports.decode = undefined;
+exports.getTitleConfig = exports.keyToLower = exports.randomNumEnum = exports.getValueFromArray = exports.getLabelValueTree = exports.cutArray = exports.arrayMove = exports.arrayMoveMutate = exports.checkPassword = exports.matchParamsPath = exports.urlToList = exports.getHashParam = exports.isUrl = exports.getRouterAuthority = exports.transformDate = exports.getStrLength = exports.DateUtil = exports._utf8_encode = exports.encode = exports.decode = undefined;
 
 var _promise = require('babel-runtime/core-js/promise');
 
@@ -68,7 +68,7 @@ var decode = exports.decode = function decode(input) {
     * @Author: admin
     * @Date: 2020-03-06 09:45:52
     * @LastEditors: jiangzhongxin
-    * @LastEditTime: 2023-10-17 09:46:26
+    * @LastEditTime: 2023-11-21 15:09:28
     */
 var encode = exports.encode = function encode(input) {
   var _keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -596,4 +596,37 @@ var keyToLower = exports.keyToLower = function keyToLower(arr) {
     });
     return newObj;
   });
+};
+
+var getTitleConfig = exports.getTitleConfig = function getTitleConfig(document) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+  var bool = !config.fwmc && !config.fwmcUrl;
+  if (config.title) {
+    document.title = config.title;
+    if (bool) {
+      config.fwmc = document.title;
+    }
+    return false;
+  } else if (config.titleUrl) {
+    fetch('' + config.titleUrl, {
+      method: "GET",
+      credentials: "include",
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        "X-Requested-With": "XMLHttpRequest",
+        appId: config && config.appId ? config.appId : "ly-hq"
+      }
+    }).then(function (response) {
+      return response.json();
+    }).then(function (res) {
+      if (res && res.code === 200 && res.data) {
+        document.title = res.data;
+        if (bool) {
+          config.fwmc = res.data;
+        }
+      }
+      return res;
+    }).catch(function (error) {});
+  }
 };

package/package.json

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