@teamix/pro 1.5.0-beta.1 → 1.5.0

package/dist/pro.min.js.LICENSE.txt

@@ -30,6 +30,17 @@ object-assign
 * (c) Sindre Sorhus; MIT License
 */
 
+/*! js-cookie v3.0.1 | MIT */
+
+/**
+ * @license
+ * Lodash <https://lodash.com/>
+ * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ */
+
 /** @license React v16.13.1
  * react-is.production.min.js
  *

package/es/card/index.js

@@ -221,9 +221,9 @@ export var ProCard = function ProCard(props) {
       });
       var width = widthList.reduce(function (acc, cur) {
         return acc + cur;
-      }, 0) + widthList.length * 8; // 无法取出精准宽度，减去1作为阈值
+      }, 0) + widthList.length * 8; // 无法取出精准宽度，减去1作为阈值 10为右padding
 
-      setHeaderWithoutTitleWidth(width - 1);
+      setHeaderWithoutTitleWidth(width - 1 + 10);
     }
   };
 

package/es/form/Filter/layout.scss

@@ -26,7 +26,7 @@ $query-filter-layout: #{$teamix-pro-form}-query-filter-layout;
     margin-bottom: 8px;
   }
   .#{$query-filter-layout}-addonAfter {
-    flex: 0 1 auto;
+    flex: 0 0 auto;
     margin-left: 8px;
   }
   .#{$query-filter-layout}-panel {

package/es/form/ProForm/addCascadeEffect.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (form: any, schema: any, scope: any) => void;
+export default _default;

package/es/form/ProForm/addCascadeEffect.js

@@ -0,0 +1,225 @@
+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; }
+
+import { onFieldReact, onFieldValueChange } from '@formily/core';
+var OP_MAPS = {
+  '*': function _() {
+    return true;
+  },
+  '=': function _(l, r) {
+    return l === r;
+  },
+  '==': function _(l, r) {
+    return l === r;
+  },
+  '!': function _(l, r) {
+    return l !== r;
+  },
+  '!=': function _(l, r) {
+    return l != r;
+  },
+  '>': function _(l, r) {
+    return l > r;
+  },
+  '<': function _(l, r) {
+    return l < r;
+  },
+  '>=': function _(l, r) {
+    return l >= r;
+  },
+  '<=': function _(l, r) {
+    return l <= r;
+  },
+  ied: function ied(l, r) {
+    if (Array.isArray(l) || typeof l === 'string' && r) {
+      return l.includes(r);
+    } else {
+      return false;
+    }
+  },
+  eed: function eed(l, r) {
+    if (Array.isArray(l) || typeof l === 'string' && r) {
+      return !l.includes(r);
+    } else {
+      return true;
+    }
+  },
+  i: function i(l, r) {
+    if (Array.isArray(r) || typeof r === 'string' && l) {
+      return r.includes(l);
+    } else {
+      return false;
+    }
+  },
+  e: function e(l, r) {
+    if (Array.isArray(r) || typeof r === 'string' && l) {
+      return !r.includes(l);
+    } else {
+      return true;
+    }
+  },
+  isEmpty: function isEmpty(l, r) {
+    return l === null || l === undefined || l === '' || Array.isArray(l) && l.length === 0;
+  },
+  notEmpty: function notEmpty(l, r) {
+    return l !== null && l !== undefined && l !== '' && (!Array.isArray(l) || l.length !== 0);
+  }
+};
+
+var getParsedValue = function getParsedValue(value, scope) {
+  if (typeof value === 'string' && value.startsWith('${') && value.endsWith('}')) {
+    return scope.$form.getValuesIn(value.slice(2, value.length - 1));
+  } else if (typeof value === 'string' && value.startsWith('{{') && value.endsWith('}}')) {
+    var code = value.slice(2, value.length - 2);
+
+    try {
+      return new Function("with(this){ return ".concat(code, " }")).call(scope);
+    } catch (e) {
+      return undefined;
+    }
+  } else {
+    return value;
+  }
+};
+
+var bingo = function bingo(bingoItem, scope) {
+  var _bingoItem$when = bingoItem.when,
+      when = _bingoItem$when === void 0 ? [] : _bingoItem$when,
+      _bingoItem$logic = bingoItem.logic,
+      logic = _bingoItem$logic === void 0 ? '&&' : _bingoItem$logic;
+  var result = logic === '&&';
+  when.forEach(function (_ref) {
+    var left = _ref.left,
+        op = _ref.op,
+        right = _ref.right;
+    var leftValue = scope.$form.getValuesIn(left);
+    var rightValue = getParsedValue(right, scope);
+    var itemResult = OP_MAPS[op](leftValue, rightValue);
+
+    if (logic === '&&') {
+      result = result && itemResult;
+    } else {
+      result = result || itemResult;
+    }
+  });
+  return result;
+};
+
+var loopAddFieldEffect = function loopAddFieldEffect(schema, form, scope) {
+  if (Array.isArray(schema)) {
+    schema === null || schema === void 0 ? void 0 : schema.forEach(function (item) {
+      if (item.name) {
+        var _item$cascade, _item$onChange;
+
+        (_item$cascade = item.cascade) === null || _item$cascade === void 0 ? void 0 : _item$cascade.forEach(function (cascade) {
+          onFieldReact(item.name, function (field) {
+            var contextScope = _objectSpread(_objectSpread({}, scope), {}, {
+              $form: form,
+              $self: field,
+              $values: form.values
+            });
+
+            var _cascade$state = cascade.state,
+                state = _cascade$state === void 0 ? {} : _cascade$state,
+                _cascade$props = cascade.props,
+                props = _cascade$props === void 0 ? {} : _cascade$props,
+                dataSourceFilter = cascade.dataSourceFilter,
+                dataSourceHide = cascade.dataSourceHide;
+
+            if (bingo(cascade, contextScope)) {
+              if (dataSourceFilter || dataSourceHide) {
+                var sourceDataSource = field.getState()._sourceDataSource;
+
+                if (!sourceDataSource) {
+                  var dataSource = field.getState().dataSource;
+                  field.setState({
+                    _sourceDataSource: dataSource
+                  });
+                  sourceDataSource = dataSource;
+                }
+
+                if (sourceDataSource) {
+                  var nextDataSource = sourceDataSource.filter(function (item) {
+                    if (Array.isArray(dataSourceFilter)) {
+                      return dataSourceFilter.includes(item.value);
+                    }
+
+                    if (Array.isArray(dataSourceHide)) {
+                      return !dataSourceFilter.includes(item.value);
+                    }
+                  });
+                  field.setDataSource(nextDataSource);
+                  var value = field.getState().value;
+
+                  if (!nextDataSource.some(function (item) {
+                    return item.value === value;
+                  })) {
+                    field.setValue(undefined);
+                  }
+                }
+              }
+
+              var nextState = {};
+              Object.keys(state).forEach(function (stateKey) {
+                nextState[stateKey] = getParsedValue(state[stateKey], contextScope);
+              });
+              field.setState(nextState);
+              var nextProps = {};
+              Object.keys(props).forEach(function (propsKey) {
+                nextProps[propsKey] = getParsedValue(props[propsKey], contextScope);
+              });
+              field.setComponentProps(nextProps);
+            } else {
+              var formState = form.getState();
+
+              if (dataSourceFilter || dataSourceHide) {
+                var _sourceDataSource = field.getState()._sourceDataSource;
+
+                _sourceDataSource && field.setDataSource(_sourceDataSource);
+              }
+
+              var _nextState = {};
+              Object.keys(state).forEach(function (stateKey) {
+                _nextState[stateKey] = stateKey in item ? item[stateKey] : formState[stateKey];
+              });
+              field.setState(_nextState);
+              var _nextProps = {};
+              Object.keys(props).forEach(function (propsKey) {
+                _nextProps[propsKey] = item.props ? item.props[propsKey] : undefined;
+              });
+              field.setComponentProps(_nextProps);
+            }
+          });
+        });
+        (_item$onChange = item.onChange) === null || _item$onChange === void 0 ? void 0 : _item$onChange.forEach(function (onChange) {
+          onFieldValueChange(item.name, function (field) {
+            var contextScope = _objectSpread(_objectSpread({}, scope), {}, {
+              $form: form,
+              $self: field,
+              $values: form.values
+            });
+
+            var values = onChange.values;
+
+            if (bingo(onChange, contextScope)) {
+              Object.keys(values).forEach(function (valuesKey) {
+                form.setValuesIn(valuesKey, getParsedValue(values[valuesKey], contextScope));
+              });
+            }
+          });
+        });
+      } else if (item.children) {
+        loopAddFieldEffect(item.children, form, scope);
+      }
+    });
+  }
+};
+
+export default (function (form, schema, scope) {
+  form.addEffects('cascade', function () {
+    loopAddFieldEffect(schema, form, scope);
+  });
+});

package/es/form/ProForm/index.js

@@ -17,6 +17,7 @@ import { toJS } from '@formily/reactive';
 import { Form, Upload, SelectTable, FormLayout, FormItem, ArrayCollapse, ArrayCards, ArrayItems, ArrayTable, Space, FormGrid, FormTab, FormCollapse, FormStep, Editable, FormDialog, FormDrawer, FormButtonGroup, Submit, Reset } from '@teamix/formily';
 import { Affix } from '@alicloudfe/components';
 import ProFieldComponents from '../Components/ProField';
+import addCascadeEffect from './addCascadeEffect';
 import { EditableDialog, EditableDrawer, EditablePopover } from '../Components/Editable';
 import FormGroup from '../Components/FormGroup';
 import LightFilter from '../Components/LightFilter';
@@ -80,17 +81,19 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       globalComponents = _ref2.components,
       globalScope = _ref2.scope;
 
+  var mergedScope = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context), globalScope), scope), {}, {
+    context: context
+  });
+
   var form = useMemo(function () {
-    return outerForm || createForm({
+    var nextForm = outerForm || createForm({
       validateFirst: validateFirst
     });
+    addCascadeEffect(nextForm, schema, mergedScope);
+    return nextForm;
   }, [outerForm]);
   var prefixCls = usePrefixCls('teamix-pro-form'); // 由于Actions需要，解构context供使用。原context键名的上下文继续保留。
 
-  var mergedScope = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, context), globalScope), scope), {}, {
-    context: context
-  });
-
   var mergedComponents = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, globalComponents), components), formilyComponents), ProFieldComponents);
 
   var onAutoSubmit = useAutoSubmit(onSubmit, context);

package/es/form/typing.d.ts

@@ -34,6 +34,24 @@ export interface ProFormRequestConfig extends Omit<ProFormCommonRequestConfig, '
     extraConfig?: AnyObject;
     onComplete?: (res?: any, field?: any, context?: any) => any;
 }
+export interface CascadeWhen {
+    left: string;
+    op: string;
+    right: any;
+}
+export interface Cascade {
+    when: CascadeWhen[];
+    logic?: '||' | '&&';
+    props?: any;
+    state?: any;
+    dataSourceFilter?: any[];
+    dataSourceHide?: any[];
+}
+export interface OnChange {
+    when: CascadeWhen[];
+    logic?: '||' | '&&';
+    values: any;
+}
 export interface ProFormSchemaItem {
     type?: string;
     name?: string;
@@ -61,6 +79,8 @@ export interface ProFormSchemaItem {
     default?: any;
     request?: ProFormRequestConfig | ProFormRequestConfig[];
     data?: AnyObject;
+    cascade?: Cascade[];
+    onChange?: OnChange[];
 }
 export declare type ProFormSchema = ProFormSchemaItem[];
 interface AutoLayout {

package/es/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.5.0-beta.1";
+declare const version = "1.5.0";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/es/index.js

@@ -18,6 +18,7 @@ import * as nocode from './nocode';
 import * as templates from './templates';
 import TeamixIcon from '@teamix/icon';
 import './global.scss'; // 设置图标源
+// @ts-ignore
 
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   TeamixIcon.setConfig(utils.getTeamixIconConfig());
@@ -36,6 +37,6 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-var version = '1.5.0-beta.1';
+var version = '1.5.0';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils };

package/es/sidebar/components/sidebar-container/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["children", "searchPlaceholder", "showSearch", "searchProps", "customSearch", "searchOnChange", "message", "messageProps", "customMessage", "scrollArea", "showExpandAll", "showExpandLevel", "onExpandAllChange", "onExpandLevelChange", "expandLevel", "isTree"];
+var _excluded = ["children", "searchPlaceholder", "showSearch", "searchProps", "customSearch", "searchOnChange", "message", "messageProps", "customMessage", "scrollArea", "showExpandAll", "showExpandLevel", "onExpandAllChange", "onExpandLevelChange", "expandLevel", "expandLevelState", "expandAllState", "isTree"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -59,6 +59,10 @@ var ProSidebarContainer = function ProSidebarContainer(props) {
       onExpandLevelChange = props.onExpandLevelChange,
       _props$expandLevel = props.expandLevel,
       expandLevel = _props$expandLevel === void 0 ? 1 : _props$expandLevel,
+      _props$expandLevelSta = props.expandLevelState,
+      expandLevelStateProp = _props$expandLevelSta === void 0 ? 1 : _props$expandLevelSta,
+      _props$expandAllState = props.expandAllState,
+      expandAllStateProp = _props$expandAllState === void 0 ? false : _props$expandAllState,
       isTree = props.isTree,
       others = _objectWithoutProperties(props, _excluded);
 
@@ -92,7 +96,19 @@ var ProSidebarContainer = function ProSidebarContainer(props) {
         setTreeHeight("calc(100% - ".concat(remainHeight, "px + 16px)"));
       }
     }
-  }, []); // 渲染搜索区域
+  }, []);
+  useEffect(function () {
+    setExpandLevelState(expandLevelStateProp);
+    setTimeout(function () {
+      onExpandLevelChange === null || onExpandLevelChange === void 0 ? void 0 : onExpandLevelChange(expandLevelStateProp);
+    });
+  }, [expandLevelStateProp]);
+  useEffect(function () {
+    setExpandAllState(expandAllStateProp);
+    setTimeout(function () {
+      onExpandAllChange === null || onExpandAllChange === void 0 ? void 0 : onExpandAllChange(expandAllStateProp);
+    });
+  }, [expandAllStateProp]); // 渲染搜索区域
 
   var renderSearch = function renderSearch() {
     if (customSearch || showSearch) {

package/es/sidebar/components/sidebar-container/index.scss

@@ -1,12 +1,13 @@
 .teamix-pro-sidebar-container {
   min-width: 180px;
-  .teamix-pro-card.compacted >.next-card-header{
+
+  .teamix-pro-card.compacted > .next-card-header {
     padding: 16px 0px;
     margin: 0;
-    
+
   }
 
-  .next-card .next-card-header-extra{
+  .next-card .next-card-header-extra {
     margin-top: 2px;
   }
 
@@ -27,38 +28,44 @@
   }
 
 
-  &.teamix-pro-sidebar-container &-context{
-    overflow-y: hidden;
-    
-    &:hover{
+  &.teamix-pro-sidebar-container &-context {
+    //overflow-y: hidden;
+
+    &:hover {
       overflow-y: auto;
     }
+
+    .next-tree-switcher.next-noop-line.next-noop-line-noroot {
+      flex-shrink: 0;
+    }
+
   }
 
 
-  &-not-is-tree{
+  &-not-is-tree {
 
-    .teamix-pro-card.compacted >.next-card-header{
+    .teamix-pro-card.compacted > .next-card-header {
       padding: 16px 8px;
       margin: 0;
     }
-    .teamix-pro-sidebar-container-context{
+
+    .teamix-pro-sidebar-container-context {
       padding: 0;
     }
 
-    .teamix-pro-sidebar-container-search{
+    .teamix-pro-sidebar-container-search {
       padding: 0 8px;
     }
 
-    .teamix-pro-sidebar-container-search-has-message{
+    .teamix-pro-sidebar-container-search-has-message {
       padding: 0 8px;
     }
 
-    .teamix-pro-sidebar-container-notice{
+    .teamix-pro-sidebar-container-notice {
       padding: 0 8px;
     }
 
-    .teamix-pro-sidebar-container-fold{
+    .teamix-pro-sidebar-container-fold {
       padding: 0 8px;
     }
 

package/es/sidebar/components/tree/index.js

@@ -131,21 +131,39 @@ var ProSidebarTree = function ProSidebarTree(props) {
   }, [dataSourceProp]); // 监听展开全部事件
 
   useUpdateEffect(function () {
+    onChangeExpandAll();
+  }, [expandAll]); // 监听展开层级事件
+
+  useUpdateEffect(function () {
+    onChangeExpandLevel();
+  }, [expandLevel]); // 监听 DataSource 变化事件
+
+  useEffect(function () {
+    onDataSourceChange === null || onDataSourceChange === void 0 ? void 0 : onDataSourceChange(dataSource); // 更新层级状态
+
+    if (expandAll) {
+      onChangeExpandAll();
+    }
+
+    if (expandLevel > 1) {
+      onChangeExpandLevel();
+    }
+  }, [dataSource]); // 展开全部事件
+
+  var onChangeExpandAll = function onChangeExpandAll() {
     if (expandAll) {
       setExpandedKeys(getAllNodeKey(dataSource));
     } else {
       setExpandedKeys([]);
     }
-  }, [expandAll]); // 监听展开层级事件
+  }; // 展开层级事件
 
-  useUpdateEffect(function () {
+
+  var onChangeExpandLevel = function onChangeExpandLevel() {
     var keys = getTreeLevelKey(dataSource, expandLevel - 1);
     setExpandedKeys(keys);
-  }, [expandLevel]); // 监听 DataSource 变化事件
+  }; // 绑定actionRef
 
-  useEffect(function () {
-    onDataSourceChange === null || onDataSourceChange === void 0 ? void 0 : onDataSourceChange(dataSource);
-  }, [dataSource]); // 绑定actionRef
 
   useActionType(actionRef, {
     setTreeNode: function setTreeNode(treeNode) {

package/es/sidebar/components/tree-node/index.js

@@ -221,7 +221,7 @@ export function renderTreeNodeDependenceValue(data, onBeforeRenderNodeEvent, che
       newProps = onBeforeRenderNodeEvent(item, checkedKeys, selectedKeys, allData !== null && allData !== void 0 ? allData : data);
     }
 
-    var _getTreeNodeProps2 = getTreeNodeProps(item),
+    var _getTreeNodeProps2 = getTreeNodeProps(newProps),
         nodeProps = _getTreeNodeProps2.nodeProps,
         labelProps = _getTreeNodeProps2.labelProps;
 

package/es/sidebar/typing.d.ts

@@ -88,6 +88,8 @@ export declare type ProSidebarContainerProps = {
     scrollArea?: 'all' | 'tree';
     /** 是否显示展开全部 */
     showExpandAll?: boolean;
+    /** 展开全部 状态 */
+    expandAllState?: boolean;
     /** 是否显示展开层级 */
     showExpandLevel?: boolean;
     /** 展开全部变化回调 */
@@ -96,6 +98,8 @@ export declare type ProSidebarContainerProps = {
     onExpandLevelChange?: (state: number) => void;
     /** 展开层级 层级 */
     expandLevel?: number;
+    /** 展开层级 当前所展示层级 */
+    expandLevelState?: number;
     /** 列表 or tree */
     isTree?: boolean;
 } & ProCardProps;

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

@@ -77,6 +77,7 @@ var DensityIcon = function DensityIcon(props) {
         size: "small",
         type: "space-line"
       })),
+      followTrigger: true,
       visible: dropdownVisible,
       onVisibleChange: function onVisibleChange(state) {
         setTooltipVisible(false);

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

@@ -265,6 +265,8 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
         setTooltipVisible(false);
         setDropdownVisible(state);
       },
+      followTrigger: true,
+      cache: true,
       triggerType: ['click'],
       align: "tr br"
     }, /*#__PURE__*/React.createElement("div", {

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

@@ -1,35 +1,16 @@
-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."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 /**
  * 全屏展示 Icon
  */
 import { Button } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
 import { usePrefixCls } from '@teamix/utils';
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import './index.scss';
 var cls = usePrefixCls('teamix-pro-table-toolbar-icon');
 
 var FullScreenIcon = function FullScreenIcon(props) {
-  var _actionRef$current3, _actionRef$current3$o;
-
-  var actionRef = props.actionRef;
-
-  var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      fullscreen = _useState2[0],
-      setFullscreen = _useState2[1]; // 点击全屏
-
+  var actionRef = props.actionRef,
+      fullScreenState = props.fullScreenState; // 点击全屏
 
   var allScreenHandle = function allScreenHandle() {
     setTimeout(function () {
@@ -37,48 +18,16 @@ var FullScreenIcon = function FullScreenIcon(props) {
 
       (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$fu = _actionRef$current.fullScreen) === null || _actionRef$current$fu === void 0 ? void 0 : _actionRef$current$fu.call(_actionRef$current);
     }, 0);
-  }; // 销毁监听函数
-
-
-  useEffect(function () {
-    return function () {
-      var _actionRef$current2, _actionRef$current2$o;
-
-      (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$o = _actionRef$current2.off) === null || _actionRef$current2$o === void 0 ? void 0 : _actionRef$current2$o.call(_actionRef$current2, 'fullscreenIcon');
-    };
-  }, []); // 监听全屏变化
+  };
 
-  (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$o = _actionRef$current3.on) === null || _actionRef$current3$o === void 0 ? void 0 : _actionRef$current3$o.call(_actionRef$current3, function (state) {
-    // console.log('dataFilterForm', actionRef.current?.dataFilterForm);
-    setFullscreen(state); // actionRef.current?.dataFilterForm?.setValues(formValues);
-  }, 'fullScreenState', 'fullscreenIcon');
   return /*#__PURE__*/React.createElement(Button, {
     iconSize: "small",
     className: cls(),
     onClick: allScreenHandle
   }, /*#__PURE__*/React.createElement(TeamixIcon, {
     size: "small",
-    type: fullscreen ? 'close-line' : 'full-screen-line'
-  })) // <Balloon.Tooltip
-  //   trigger={
-  //     <Button iconSize="small" className={cls()} onClick={allScreenHandle}>
-  //       <TeamixIcon
-  //         size="small"
-  //         type={fullscreen ? 'close-line' : 'full-screen-line'}
-  //       />
-  //     </Button>
-  //   }
-  //   align={fullscreen ? 'b' : 't'}
-  //   popupProps={{
-  //     visible: visible,
-  //     onVisibleChange: (state) => {
-  //       setVisible(state);
-  //     },
-  //   }}
-  // >
-  //   {getMessage('fullScreen')}
-  // </Balloon.Tooltip>
-  ;
+    type: fullScreenState ? 'close-line' : 'full-screen-line'
+  }));
 };
 
 export default FullScreenIcon;

package/es/table/components/ToolBar/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import './index.scss';
 import { ProTableLayoutProps } from '../../typing';
+import './index.scss';
 declare const ToolBar: React.FC<ProTableLayoutProps>;
 export default ToolBar;