dlt-for-react 1.1.4 → 1.1.6

package/README.md

@@ -8,7 +8,7 @@ npm publish
 
 ## 前端 dlt-for-react 依赖包版本更新记录
 
-##### 当前最新版本：1.1.2
+##### 当前最新版本：1.1.6
 
 ##### 安装依赖
 
@@ -16,6 +16,14 @@ npm publish
 
 ##### 版本修改记录
 
+#### V1.1.6—2023 年 11 月 22 日
+
+1. 解决KyTable存在二级表头时，无法固定操作列的问题
+
+#### V1.1.5—2023 年 11 月 22 日
+
+1. 修改getSizebug
+
 #### V1.1.4—2023 年 11 月 21 日
 
 1. 优化接口获取服务名称配置

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/components/KyTable/data.js

@@ -418,7 +418,9 @@ var getColumns = exports.getColumns = function getColumns(columns, actionColumns
           }
         }
         if (item.fixed && !item.closeOverflow) {
-          var styleObj = { width: item.width ? parseInt(item.width, 10) - 16 : null };
+          var styleObj = {
+            width: item.width ? parseInt(item.width, 10) - 16 : null
+          };
           item.render = handelPopoverDom(item, closeAdjustColumnWidth, styleObj);
         }
         return item;
@@ -431,11 +433,15 @@ var getColumns = exports.getColumns = function getColumns(columns, actionColumns
         if (item.minWidth) {
           item.width = parseInt(item.minWidth, 10);
         }
-        if (!item.render || !item.closeOverflow) {
+        if (item.cacheFixed) {
+          item.fixed = item.cacheFixed;
+        } else if (!item.render || !item.closeOverflow) {
           item.render = handelPopoverDom(item, closeAdjustColumnWidth);
         }
         if (item.fixed && !item.closeOverflow) {
-          var styleObj = { width: item.width ? parseInt(item.width, 10) - 16 : null };
+          var styleObj = {
+            width: item.width ? parseInt(item.width, 10) - 16 : null
+          };
           item.render = handelPopoverDom(item, closeAdjustColumnWidth, styleObj);
         }
         return item;
@@ -457,11 +463,15 @@ var getColumns = exports.getColumns = function getColumns(columns, actionColumns
           if (item.dataIndex && item.dataIndex !== 'rowId' && item.title !== '序号' && item.dataIndex !== 'ACTION' && !item.resizeWidth) {
             item.width = parseInt(item.width, 10) + parseInt(elseWidth * parseInt(item.minWidth, 10) / fieldAllWidth, 10);
           }
-          if (!item.render || !item.closeOverflow) {
+          if (item.cacheFixed) {
+            item.fixed = item.cacheFixed;
+          } else if (!item.render || !item.closeOverflow) {
             item.render = handelPopoverDom(item, closeAdjustColumnWidth);
           }
           if (item.fixed && !item.closeOverflow) {
-            var styleObj = { width: item.width ? parseInt(item.width, 10) - 16 : null };
+            var styleObj = {
+              width: item.width ? parseInt(item.width, 10) - 16 : null
+            };
             item.render = handelPopoverDom(item, closeAdjustColumnWidth, styleObj);
           }
           return item;
@@ -475,11 +485,15 @@ var getColumns = exports.getColumns = function getColumns(columns, actionColumns
             //   parseInt((elseWidth * parseInt(item.minWidth, 10)) / minAllWidth, 10);
             item.width = parseInt(elseWidth * parseInt(item.minWidth, 10) / minAllWidth, 10);
           }
-          if (!item.render || !item.closeOverflow) {
+          if (item.cacheFixed) {
+            item.fixed = item.cacheFixed;
+          } else if (!item.render || !item.closeOverflow) {
             item.render = handelPopoverDom(item, closeAdjustColumnWidth);
           }
           if (item.fixed && !item.closeOverflow) {
-            var styleObj = { width: item.width ? parseInt(item.width, 10) - 16 : null };
+            var styleObj = {
+              width: item.width ? parseInt(item.width, 10) - 16 : null
+            };
             item.render = handelPopoverDom(item, closeAdjustColumnWidth, styleObj);
           }
           return item;
@@ -616,7 +630,12 @@ var getActions = exports.getActions = function getActions(actions, data, actionL
     key: 'ACTION',
     closeOverflow: true,
     render: function render(text, record, index) {
-      return _react2.default.createElement(_action2.default, { action: newActions, record: record, key: index, actionLength: actionLength });
+      return _react2.default.createElement(_action2.default, {
+        action: newActions,
+        record: record,
+        key: index,
+        actionLength: actionLength
+      });
     }
   };
 };

package/lib/components/KyTable/index.js

@@ -45,10 +45,6 @@ var _button = require('antd/lib/button');
 
 var _button2 = _interopRequireDefault(_button);
 
-var _select = require('antd/lib/select');
-
-var _select2 = _interopRequireDefault(_select);
-
 var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
 
 var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
@@ -85,6 +81,10 @@ var _input = require('antd/lib/input');
 
 var _input2 = _interopRequireDefault(_input);
 
+var _select = require('antd/lib/select');
+
+var _select2 = _interopRequireDefault(_select);
+
 require('antd/lib/message/style');
 
 require('antd/lib/table/style');
@@ -99,10 +99,10 @@ require('antd/lib/radio/style');
 
 require('antd/lib/button/style');
 
-require('antd/lib/select/style');
-
 require('antd/lib/input/style');
 
+require('antd/lib/select/style');
+
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -111,10 +111,6 @@ var _reactCustomScrollbars = require('react-custom-scrollbars');
 
 var _NHCore = require('../../utils/NHCore');
 
-var _action = require('./action.js');
-
-var _action2 = _interopRequireDefault(_action);
-
 var _expexcel = require('./expexcel.js');
 
 var _expexcel2 = _interopRequireDefault(_expexcel);
@@ -151,12 +147,13 @@ var _marqueenText2 = _interopRequireDefault(_marqueenText);
 
 var _reactResizable = require('react-resizable');
 
-var _virtuallistAntd = require('virtuallist-antd');
-
 var _data = require('./data.js');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var Option = _select2.default.Option;
+// import { VList } from 'virtuallist-antd';
+
 var Search = _input2.default.Search;
 var loadCount = 0;
 /*
@@ -243,7 +240,11 @@ var KyTable = function (_React$Component) {
         columns = this.state.params.columns;
       }
 
-      var commonSearchParams = this.getCommonSearch({ columns: columns, searchDivFlag: searchDivFlag, searchDefaultField: searchDefaultField });
+      var commonSearchParams = this.getCommonSearch({
+        columns: columns,
+        searchDivFlag: searchDivFlag,
+        searchDefaultField: searchDefaultField
+      });
 
       if ((0, _keys2.default)(commonSearchParams).length > 0) {
         updateState['tySearchAllField'] = commonSearchParams.tySearchAllField;
@@ -798,12 +799,20 @@ var KyTable = function (_React$Component) {
             }),
             _react2.default.createElement(
               _button2.default,
-              { type: 'primary', style: { margin: '0 8px 0 12px' }, onClick: this.onSearch },
+              {
+                type: 'primary',
+                style: { margin: '0 8px 0 12px' },
+                onClick: this.onSearch
+              },
               '\u67E5\u8BE2'
             ),
             _react2.default.createElement(
               _button2.default,
-              { type: 'Default', style: { paddingLeft: 15 }, onClick: this.onRest },
+              {
+                type: 'Default',
+                style: { paddingLeft: 15 },
+                onClick: this.onRest
+              },
               '\u91CD\u7F6E'
             ),
             _react2.default.createElement(
@@ -812,7 +821,10 @@ var KyTable = function (_React$Component) {
                 onClick: function onClick() {
                   return _this3.setState({ highSearch: true, searchParams: {} });
                 },
-                style: { marginLeft: 10, display: showAdvancBtn ? 'inline' : 'none' }
+                style: {
+                  marginLeft: 10,
+                  display: showAdvancBtn ? 'inline' : 'none'
+                }
               },
               '[\u9AD8\u7EA7\u641C\u7D22]'
             )
@@ -855,6 +867,7 @@ var KyTable = function (_React$Component) {
             )
           )
         ),
+
         // 多行配置
         searchList && searchList.length > 1 && _react2.default.createElement(
           'div',
@@ -895,6 +908,7 @@ var KyTable = function (_React$Component) {
             );
           })
         ),
+
         // 只有一行的配置
         this.props.children || searchList && searchList.length === 1 ? _react2.default.createElement(
           'div',
@@ -940,7 +954,10 @@ var KyTable = function (_React$Component) {
                     searchList[0].list.map(function (row, index) {
                       return _react2.default.createElement(
                         _radio2.default.Button,
-                        { value: row.value, key: row.value },
+                        {
+                          value: row.value,
+                          key: row.value
+                        },
                         row.text
                       );
                     })
@@ -1337,7 +1354,7 @@ var _initialiseProps = function _initialiseProps() {
         });
       }
 
-      var colSpanDom = document.getElementsByClassName(_this4.state.className)[0] ? document.getElementsByClassName(_this4.state.className)[0].querySelectorAll('.ant-table-scroll > .ant-table-header > table > .ant-table-thead > tr > th[colspan]') : "";
+      var colSpanDom = document.getElementsByClassName(_this4.state.className)[0] ? document.getElementsByClassName(_this4.state.className)[0].querySelectorAll('.ant-table-scroll > .ant-table-header > table > .ant-table-thead > tr > th[colspan]') : '';
       if (colSpanDom && colSpanDom.length > 0 && !_this4.props.bordered) {
         // 存在二级表头的内容
         for (var i = 0; i < colSpanDom.length; i++) {
@@ -1669,10 +1686,9 @@ var _initialiseProps = function _initialiseProps() {
       sqlParams: sqlParams,
       initParams: initParams,
       sign: _this4.props.sign
-    };
 
-    //如果启用职位范围过滤
-    if (rangeFilter) {
+      //如果启用职位范围过滤
+    };if (rangeFilter) {
       var userId = (0, _NHCore.getLoginUser)() ? (0, _NHCore.getLoginUser)().userId : '';
       params.rangeFilter = { id: userId };
     }

package/package.json

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