@teamix/pro 1.5.17 → 1.5.18-beta

package/es/table/components/ToolBar/DensityIcon.js

@@ -22,6 +22,7 @@ var DensityIcon = function DensityIcon(props) {
     size = _useState2[0],
     setSize = _useState2[1];
   // const [fullscreen, setFullscreen] = useState<boolean>(false);
+
   // tooltip 开关
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -32,18 +33,21 @@ var DensityIcon = function DensityIcon(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     dropdownVisible = _useState6[0],
     setDropdownVisible = _useState6[1];
+
   // 设置大小
   var radioOnchange = function radioOnchange(mode) {
     var _actionRef$current2, _actionRef$current2$s;
     setSize(mode);
     (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setSize) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, mode);
   };
+
   // // 销毁监听函数
   // useEffect(() => {
   //   return () => {
   //     actionRef.current?.off?.('densityIcon');
   //   };
   // }, []);
+
   // // 监听全屏变化
   // actionRef.current?.on?.(
   //   (state: boolean) => {
@@ -52,11 +56,11 @@ var DensityIcon = function DensityIcon(props) {
   //   'fullScreenState',
   //   'densityIcon',
   // );
+
   var renderDropdown = function renderDropdown() {
     return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Dropdown
     // safeNode={() => sizeMenuRef.current || document}
     , {
-      // safeNode={() => sizeMenuRef.current || document}
       trigger: /*#__PURE__*/React.createElement(Button, {
         iconSize: "small",
         className: cls()
@@ -70,8 +74,9 @@ var DensityIcon = function DensityIcon(props) {
         setTooltipVisible(false);
         setDropdownVisible(state);
       },
-      triggerType: ['click'],
+      triggerType: ['click']
       // key={index}
+      ,
       align: "tr br"
     }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Menu, null, /*#__PURE__*/React.createElement(RadioItem, {
       key: "medium",

package/es/table/components/ToolBar/FilterColumnIcon.js

@@ -58,6 +58,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     newColumns = _useState6[0],
     setNewColumns = _useState6[1];
+
   // const [fullscreen, setFullscreen] = useState<boolean>(false);
   // tooltip 开关
   var _useState7 = useState(false),
@@ -102,6 +103,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
   useEffect(function () {
     setNewColumns(processColumns(columns));
   }, [columns]);
+
   // 全选
   var onChangeAllColumns = function onChangeAllColumns(check) {
     setAllVisible(check);
@@ -113,12 +115,14 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     });
     notifyTableRender(keyNewColumns);
   };
+
   // 重置
   var restColumns = function restColumns(e) {
     e.stopPropagation();
     var keyNewColumns = processColumns(columns);
     notifyTableRender(keyNewColumns);
   };
+
   // 修改
   var onChangeColumns = function onChangeColumns(check, dataIndex) {
     var keyNewColumns = newColumns.map(function (item) {
@@ -132,11 +136,13 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     });
     notifyTableRender(keyNewColumns);
   };
+
   // 修改：dialog
   var onChangeColumnsForDialog = function onChangeColumnsForDialog() {
     notifyTableRender(newColumns);
     setDropdownVisible(false);
   };
+
   // 向上
   var moveUp = function moveUp(e, dataIndex) {
     var _newColumns$filter, _newColumns$filter2;
@@ -164,6 +170,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     }
     notifyTableRender([].concat(_toConsumableArray(headLock), _toConsumableArray(keyNewColumns), _toConsumableArray(tailLock)));
   };
+
   // 向下
   var moveDown = function moveDown(e, dataIndex) {
     var _newColumns$filter3, _newColumns$filter4;
@@ -191,6 +198,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     }
     notifyTableRender([].concat(_toConsumableArray(headLock), _toConsumableArray(keyNewColumns), _toConsumableArray(tailLock)));
   };
+
   // 通知表格渲染
   var notifyTableRender = function notifyTableRender(columns) {
     var _actionRef$current, _actionRef$current$se;
@@ -198,6 +206,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
     setNewColumns(columns);
     (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setColumn) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, columns, false);
   };
+
   // 计算全选状态
   var calculateSelectAllState = function calculateSelectAllState(columns) {
     var flag = columns.reduce(function (acc, cur) {

package/es/table/components/ToolBar/FullScreenIcon.js

@@ -10,6 +10,7 @@ var cls = usePrefixCls('teamix-pro-table-toolbar-icon');
 var FullScreenIcon = function FullScreenIcon(props) {
   var actionRef = props.actionRef,
     fullScreenState = props.fullScreenState;
+
   // 点击全屏
   var allScreenHandle = function allScreenHandle() {
     setTimeout(function () {

package/es/table/components/ToolBar/Fullscreen.js

@@ -16,6 +16,7 @@ var FullScreen = function FullScreen(props) {
       actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$f = _actionRef$current2.fullScreen) === null || _actionRef$current2$f === void 0 ? void 0 : _actionRef$current2$f.call(_actionRef$current2);
     }
   };
+
   // 监听esc按钮
   useEffect(function () {
     window.addEventListener('keydown', closeByESC);
@@ -42,6 +43,7 @@ var FullScreen = function FullScreen(props) {
       document.body.classList.remove('teamix-pro-table-fullscreen-for-body');
     }
   };
+
   // 全屏开启之后
   var afterOpen = function afterOpen() {
     var _document2;
@@ -61,6 +63,7 @@ var FullScreen = function FullScreen(props) {
     if (document && ((_document2 = document) === null || _document2 === void 0 ? void 0 : _document2.body)) {
       document.body.classList.add('teamix-pro-table-fullscreen-for-body');
     }
+
     // 消息提示
     Message.show({
       type: 'notice',

package/es/table/components/ToolBar/RefreshIcon.js

@@ -29,26 +29,31 @@ var LayoutIcon = function LayoutIcon(props) {
     label: '每 5 分钟',
     value: 300000
   }];
+
   // dropdown 开关
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     dropdownVisible = _useState2[0],
     setDropdownVisible = _useState2[1];
+
   // 自动刷新状态
   var _useState3 = useState(!!autoRefresh),
     _useState4 = _slicedToArray(_useState3, 2),
     autoRefreshVisible = _useState4[0],
     setAutoRefreshVisible = _useState4[1];
+
   // 间隔时间 ms
   var _useState5 = useState(60000),
     _useState6 = _slicedToArray(_useState5, 2),
     times = _useState6[0],
     setTimes = _useState6[1];
+
   // 展示计时器时间 s
   var _useState7 = useState(60),
     _useState8 = _slicedToArray(_useState7, 2),
     remainTime = _useState8[0],
     setRemainTime = _useState8[1];
+
   // 循环计时器
   var timerRef = useRef({
     timer: undefined,
@@ -71,10 +76,12 @@ var LayoutIcon = function LayoutIcon(props) {
       }, 1000);
     }, 'PRO_TABLE_REFRESH_TIMER_FLAG');
   }, []);
+
   // 下拉菜单显示隐藏回调
   var onDropdownVisibleChange = function onDropdownVisibleChange(state) {
     setDropdownVisible(state);
   };
+
   // 自动刷新开启关闭回调
   var onAutoRefreshChange = function onAutoRefreshChange(visible) {
     if (visible) {
@@ -92,18 +99,21 @@ var LayoutIcon = function LayoutIcon(props) {
     }
     setAutoRefreshVisible(visible);
   };
+
   // 手动刷新回调
   var onManualRefresh = function onManualRefresh() {
     var _actionRef$current3, _actionRef$current3$r;
     (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$r = _actionRef$current3.refresh) === null || _actionRef$current3$r === void 0 ? void 0 : _actionRef$current3$r.call(_actionRef$current3);
     onDropdownVisibleChange(false);
   };
+
   // 选择间隔时间回调
   var onTimeRadioChange = function onTimeRadioChange(timer) {
     var _actionRef$current4, _actionRef$current4$s;
     setTimes(timer);
     (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setAutoRefreshTimers) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, timer);
   };
+
   // 渲染刷新图标
   var renderRefreshIcon = function renderRefreshIcon() {
     if (!!autoRefresh && autoRefreshVisible && typeof autoRefresh !== 'function') {
@@ -123,6 +133,7 @@ var LayoutIcon = function LayoutIcon(props) {
       type: "refresh-line"
     });
   };
+
   // 渲染 Radio
   var renderRadio = autoRefreshRadio.map(function (item) {
     return /*#__PURE__*/React.createElement(Menu.RadioItem, {

package/es/table/components/ToolBar/index.js

@@ -1,5 +1,3 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -64,6 +62,7 @@ var ToolBar = function ToolBar(props) {
   // '.teamix-pro-form-query-filter-layout-left' 元素
   var layoutLeftDom = layoutInlineDom === null || layoutInlineDom === void 0 ? void 0 : layoutInlineDom.firstElementChild;
   var leftWidth = layoutLeftDom === null || layoutLeftDom === void 0 ? void 0 : layoutLeftDom.clientWidth;
+
   // 展示形式，是否平铺
   var _useSafeState = useSafeState(),
     _useSafeState2 = _slicedToArray(_useSafeState, 2),
@@ -73,15 +72,16 @@ var ToolBar = function ToolBar(props) {
   useEffect(debounce(function () {
     if ((layoutInlineSize === null || layoutInlineSize === void 0 ? void 0 : layoutInlineSize.width) && leftWidth && toolBarContentRef.current && toolBarAutoWidth) {
       var _toolBarContentRef$cu;
-      var width = layoutInlineSize.width,
-        height = layoutInlineSize.height;
-      if (width - leftWidth <= ((_toolBarContentRef$cu = toolBarContentRef.current) === null || _toolBarContentRef$cu === void 0 ? void 0 : _toolBarContentRef$cu.clientWidth) + 8 || height > 40) {
+      var width = layoutInlineSize.width;
+      // 60 为容错
+      if (width - leftWidth - 60 <= ((_toolBarContentRef$cu = toolBarContentRef.current) === null || _toolBarContentRef$cu === void 0 ? void 0 : _toolBarContentRef$cu.clientWidth) + 8) {
         setFlat(false);
-      } else if (height === 40) {
+      } else {
         setFlat(true);
       }
     }
   }, 300));
+
   // 初始态
   useEffect(function () {
     if (!((layoutInlineSize === null || layoutInlineSize === void 0 ? void 0 : layoutInlineSize.width) && leftWidth)) {
@@ -136,15 +136,18 @@ var ToolBar = function ToolBar(props) {
       return /*#__PURE__*/React.createElement("span", {
         className: cls('item', _defineProperty({}, name, true)),
         key: name
-      }, type === 'preset' && /*#__PURE__*/React.createElement(Component, _objectSpread({}, props)), type === 'custom' && /*#__PURE__*/React.createElement("div", {
+      }, type === 'preset' && /*#__PURE__*/React.createElement(Component, props), type === 'custom' && /*#__PURE__*/React.createElement("div", {
         className: cls({
           custom: true
         })
       }, Component));
     }));
-  }, [toolBarList]);
+  }, [toolBarList, props.columns]);
   var renderUnFlatShape = function renderUnFlatShape() {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Balloon.Tooltip, {
+    if (toolBar === false) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null);
+    }
+    return /*#__PURE__*/React.createElement(Balloon.Tooltip, {
       triggerType: ['click'],
       popupProps: {
         cache: true
@@ -156,7 +159,7 @@ var ToolBar = function ToolBar(props) {
         type: "more-line"
       })),
       align: "tr"
-    }, renderFlatShape));
+    }, renderFlatShape);
   };
   return /*#__PURE__*/React.createElement("div", {
     className: cls('', {