@teamix/pro 1.2.27 → 1.2.28

package/es/actions/index.d.ts

@@ -41,6 +41,7 @@ export interface ProActionCommonProps {
 export interface ProActionMenuButtonProps extends ProActionCommonProps, Omit<MenuButtonProps, 'visible'> {
     actions: ProActionProps[];
     icon?: string;
+    noArrow?: boolean;
 }
 export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
 export interface ProActionDividerProps extends ProActionCommonProps {
@@ -61,9 +62,7 @@ export declare type ProActionGroupProps = {
      */
     moreText?: string;
     /** 更多按钮的配置，只有在actions数量超过max时才有效 */
-    more?: string | (ProActionButtonProps & {
-        noArrow?: boolean;
-    });
+    more?: string | Omit<ProActionMenuButtonProps, 'actions'>;
     /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;

package/es/actions/index.js

@@ -1,12 +1,11 @@
 var _excluded = ["type"],
     _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "onClick"],
     _excluded3 = ["loading"],
-    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
+    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["noArrow", "className"],
-    _excluded7 = ["key", "actions"],
-    _excluded8 = ["key", "config"],
-    _excluded9 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
+    _excluded6 = ["key", "actions"],
+    _excluded7 = ["key", "config"],
+    _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -243,6 +242,8 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
       context = props.context,
       _props$type2 = props.type,
       type = _props$type2 === void 0 ? 'primary' : _props$type2,
+      className = props.className,
+      noArrow = props.noArrow,
       others = _objectWithoutProperties(props, _excluded4);
 
   return /*#__PURE__*/React.createElement(MenuButton, _objectSpread({
@@ -256,7 +257,10 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
       v2: true
     },
     type: type,
-    label: buttonContent(label || children, icon, iconSize, context)
+    label: buttonContent(label || children, icon, iconSize, context),
+    className: cls(className, {
+      'teamix-pro-actions-text-menu-btn-no-arrow': noArrow
+    })
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
@@ -316,14 +320,12 @@ function renderCommonActionButton(button, context, isTypeText) {
 }
 
 function getDefaultMoreButton(type, more) {
-  var noArrowClassName = 'teamix-pro-actions-text-menu-btn-no-arrow';
   var defaultConfig = type === 'button' ? {
     children: getMessage('more')
   } : {
     icon: 'more-line',
-    // iconSize: 'small',
     autoWidth: false,
-    className: noArrowClassName
+    noArrow: true
   };
 
   if (!more) {
@@ -338,13 +340,7 @@ function getDefaultMoreButton(type, more) {
     return Object.assign(defaultConfig, moreConfig);
   }
 
-  var noArrow = moreConfig.noArrow,
-      className = moreConfig.className,
-      others = _objectWithoutProperties(moreConfig, _excluded6);
-
-  return _objectSpread({
-    className: cls(className, _defineProperty({}, "".concat(noArrowClassName), noArrow))
-  }, others);
+  return moreConfig;
 }
 
 var MAX_ACTTIONS = 4;
@@ -361,7 +357,7 @@ function getActionConfig(action, index, context) {
   if (action.actions) {
     var _key = action.key,
         actions = action.actions,
-        _others = _objectWithoutProperties(action, _excluded7);
+        _others = _objectWithoutProperties(action, _excluded6);
 
     return _objectSpread({
       key: getKey(index, _key),
@@ -373,7 +369,7 @@ function getActionConfig(action, index, context) {
 
   var key = action.key,
       config = action.config,
-      others = _objectWithoutProperties(action, _excluded8);
+      others = _objectWithoutProperties(action, _excluded7);
 
   return _objectSpread({
     key: getKey(index, key),
@@ -394,7 +390,7 @@ export function ProActionGroup(props) {
       _props$actions = props.actions,
       actions = _props$actions === void 0 ? [] : _props$actions,
       className = props.className,
-      containerProps = _objectWithoutProperties(props, _excluded9);
+      containerProps = _objectWithoutProperties(props, _excluded8);
 
   var isTypeText = type === 'text';
   var filteredActions = actions.map(function (action, index) {

package/es/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './step';
-declare const version = "1.2.27";
+declare const version = "1.2.28";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/es/index.js

@@ -30,7 +30,7 @@ export * from './table';
 export * from './utils'; // export * from './sidebar';
 
 export * from './step';
-var version = '1.2.27';
+var version = '1.2.28';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 ProStep, hooks, nocode, templates, utils };

package/es/table/index.js

@@ -121,7 +121,7 @@ var globalFormatSort = function globalFormatSort(sort) {
 };
 
 var ProTable = function ProTable(props) {
-  var _rowSelection$selecte;
+  var _rowSelection$selecte, _dataFilterForm4;
 
   var header = props.header,
       className = props.className,
@@ -278,7 +278,7 @@ var ProTable = function ProTable(props) {
   var normalDataFilterForm = normalDataFilterFormRef.current;
   var fullscreenDataFilterForm = fullscreenDataFilterFormRef.current; // 传给 QueryFilter 的 formRef
 
-  var dataFilterFormRef = fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
+  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
   var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
 
   var _useState25 = useState(false),
@@ -450,12 +450,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current3, _actionRef$current3$s;
+      var _actionRef$current3, _actionRef$current3$s, _dataFilterForm;
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
       (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setFilterRules) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, {});
-      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
+      (_dataFilterForm = dataFilterForm) === null || _dataFilterForm === void 0 ? void 0 : _dataFilterForm.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -569,7 +569,7 @@ var ProTable = function ProTable(props) {
   }); // 请求函数
 
   function _request(params, noLoading) {
-    var _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
+    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -582,7 +582,7 @@ var ProTable = function ProTable(props) {
 
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = toJS(dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.values); // 列过滤请求参数
+    var dataFilterParams = toJS((_dataFilterForm2 = dataFilterForm) === null || _dataFilterForm2 === void 0 ? void 0 : _dataFilterForm2.values); // 列过滤请求参数
 
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getFilterRules) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
@@ -633,8 +633,11 @@ var ProTable = function ProTable(props) {
   }
 
   useEffect(function () {
+    var _dataFilterForm3;
+
     // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
-    initActionRef(); // 监听 浏览器变化 更吸底状态
+    initActionRef();
+    dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
 
     if (footerSuction) {
       getFooterSuctionState();
@@ -644,7 +647,7 @@ var ProTable = function ProTable(props) {
       };
     }
 
-    if (requestWhenMount) {
+    if (requestWhenMount && ((_dataFilterForm3 = dataFilterForm) === null || _dataFilterForm3 === void 0 ? void 0 : _dataFilterForm3.id)) {
       // 在请求发送之前 处理漏斗默认数据
       processDefaultFilter(propsColumns, actionRef, defaultFilterParams);
 
@@ -662,7 +665,7 @@ var ProTable = function ProTable(props) {
 
       actionRef.current = undefined;
     };
-  }, []);
+  }, [(_dataFilterForm4 = dataFilterForm) === null || _dataFilterForm4 === void 0 ? void 0 : _dataFilterForm4.id]);
 
   function onSort(dataIndex, order) {
     var nextSort = _defineProperty({}, dataIndex, order);
@@ -687,8 +690,10 @@ var ProTable = function ProTable(props) {
       _request(_defineProperty({}, targetPageKey, 1));
     },
     onReset: function onReset() {
+      var _dataFilterForm5;
+
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
-      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
+      (_dataFilterForm5 = dataFilterForm) === null || _dataFilterForm5 === void 0 ? void 0 : _dataFilterForm5.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));

package/lib/actions/index.d.ts

@@ -41,6 +41,7 @@ export interface ProActionCommonProps {
 export interface ProActionMenuButtonProps extends ProActionCommonProps, Omit<MenuButtonProps, 'visible'> {
     actions: ProActionProps[];
     icon?: string;
+    noArrow?: boolean;
 }
 export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
 export interface ProActionDividerProps extends ProActionCommonProps {
@@ -61,9 +62,7 @@ export declare type ProActionGroupProps = {
      */
     moreText?: string;
     /** 更多按钮的配置，只有在actions数量超过max时才有效 */
-    more?: string | (ProActionButtonProps & {
-        noArrow?: boolean;
-    });
+    more?: string | Omit<ProActionMenuButtonProps, 'actions'>;
     /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;

package/lib/actions/index.js

@@ -56,12 +56,11 @@ require("./index.scss");
 var _excluded = ["type"],
     _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "onClick"],
     _excluded3 = ["loading"],
-    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
+    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["noArrow", "className"],
-    _excluded7 = ["key", "actions"],
-    _excluded8 = ["key", "config"],
-    _excluded9 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
+    _excluded6 = ["key", "actions"],
+    _excluded7 = ["key", "config"],
+    _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -282,6 +281,8 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
       context = props.context,
       _props$type2 = props.type,
       type = _props$type2 === void 0 ? 'primary' : _props$type2,
+      className = props.className,
+      noArrow = props.noArrow,
       others = _objectWithoutProperties(props, _excluded4);
 
   return /*#__PURE__*/_react.default.createElement(_components.MenuButton, _objectSpread({
@@ -295,7 +296,10 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
       v2: true
     },
     type: type,
-    label: buttonContent(label || children, icon, iconSize, context)
+    label: buttonContent(label || children, icon, iconSize, context),
+    className: (0, _classnames.default)(className, {
+      'teamix-pro-actions-text-menu-btn-no-arrow': noArrow
+    })
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
@@ -358,14 +362,12 @@ function renderCommonActionButton(button, context, isTypeText) {
 }
 
 function getDefaultMoreButton(type, more) {
-  var noArrowClassName = 'teamix-pro-actions-text-menu-btn-no-arrow';
   var defaultConfig = type === 'button' ? {
     children: (0, _utils.getMessage)('more')
   } : {
     icon: 'more-line',
-    // iconSize: 'small',
     autoWidth: false,
-    className: noArrowClassName
+    noArrow: true
   };
 
   if (!more) {
@@ -380,13 +382,7 @@ function getDefaultMoreButton(type, more) {
     return Object.assign(defaultConfig, moreConfig);
   }
 
-  var noArrow = moreConfig.noArrow,
-      className = moreConfig.className,
-      others = _objectWithoutProperties(moreConfig, _excluded6);
-
-  return _objectSpread({
-    className: (0, _classnames.default)(className, _defineProperty({}, "".concat(noArrowClassName), noArrow))
-  }, others);
+  return moreConfig;
 }
 
 var MAX_ACTTIONS = 4;
@@ -403,7 +399,7 @@ function getActionConfig(action, index, context) {
   if (action.actions) {
     var _key = action.key,
         actions = action.actions,
-        _others = _objectWithoutProperties(action, _excluded7);
+        _others = _objectWithoutProperties(action, _excluded6);
 
     return _objectSpread({
       key: getKey(index, _key),
@@ -415,7 +411,7 @@ function getActionConfig(action, index, context) {
 
   var key = action.key,
       config = action.config,
-      others = _objectWithoutProperties(action, _excluded8);
+      others = _objectWithoutProperties(action, _excluded7);
 
   return _objectSpread({
     key: getKey(index, key),
@@ -436,7 +432,7 @@ function ProActionGroup(props) {
       _props$actions = props.actions,
       actions = _props$actions === void 0 ? [] : _props$actions,
       className = props.className,
-      containerProps = _objectWithoutProperties(props, _excluded9);
+      containerProps = _objectWithoutProperties(props, _excluded8);
 
   var isTypeText = type === 'text';
   var filteredActions = actions.map(function (action, index) {

package/lib/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './step';
-declare const version = "1.2.27";
+declare const version = "1.2.28";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -285,5 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.2.27';
+var version = '1.2.28';
 exports.version = version;

package/lib/table/index.js

@@ -165,7 +165,7 @@ var globalFormatSort = function globalFormatSort(sort) {
 };
 
 var ProTable = function ProTable(props) {
-  var _rowSelection$selecte;
+  var _rowSelection$selecte, _dataFilterForm4;
 
   var header = props.header,
       className = props.className,
@@ -322,7 +322,7 @@ var ProTable = function ProTable(props) {
   var normalDataFilterForm = normalDataFilterFormRef.current;
   var fullscreenDataFilterForm = fullscreenDataFilterFormRef.current; // 传给 QueryFilter 的 formRef
 
-  var dataFilterFormRef = fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
+  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
   var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
 
   var _useState25 = (0, _react.useState)(false),
@@ -494,12 +494,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current3, _actionRef$current3$s;
+      var _actionRef$current3, _actionRef$current3$s, _dataFilterForm;
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
       (_actionRef$current3 = actionRef.current) === null || _actionRef$current3 === void 0 ? void 0 : (_actionRef$current3$s = _actionRef$current3.setFilterRules) === null || _actionRef$current3$s === void 0 ? void 0 : _actionRef$current3$s.call(_actionRef$current3, {});
-      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
+      (_dataFilterForm = dataFilterForm) === null || _dataFilterForm === void 0 ? void 0 : _dataFilterForm.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -613,7 +613,7 @@ var ProTable = function ProTable(props) {
   }); // 请求函数
 
   function _request(params, noLoading) {
-    var _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
+    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current4, _actionRef$current4$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -626,7 +626,7 @@ var ProTable = function ProTable(props) {
 
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = toJS(dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.values); // 列过滤请求参数
+    var dataFilterParams = toJS((_dataFilterForm2 = dataFilterForm) === null || _dataFilterForm2 === void 0 ? void 0 : _dataFilterForm2.values); // 列过滤请求参数
 
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$g = _actionRef$current4.getFilterRules) === null || _actionRef$current4$g === void 0 ? void 0 : _actionRef$current4$g.call(_actionRef$current4)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
@@ -677,8 +677,11 @@ var ProTable = function ProTable(props) {
   }
 
   (0, _react.useEffect)(function () {
+    var _dataFilterForm3;
+
     // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
-    (0, _utils2.initActionRef)(); // 监听 浏览器变化 更吸底状态
+    (0, _utils2.initActionRef)();
+    dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
 
     if (footerSuction) {
       getFooterSuctionState();
@@ -688,7 +691,7 @@ var ProTable = function ProTable(props) {
       };
     }
 
-    if (requestWhenMount) {
+    if (requestWhenMount && ((_dataFilterForm3 = dataFilterForm) === null || _dataFilterForm3 === void 0 ? void 0 : _dataFilterForm3.id)) {
       // 在请求发送之前 处理漏斗默认数据
       (0, _utils2.processDefaultFilter)(propsColumns, actionRef, defaultFilterParams);
 
@@ -706,7 +709,7 @@ var ProTable = function ProTable(props) {
 
       actionRef.current = undefined;
     };
-  }, []);
+  }, [(_dataFilterForm4 = dataFilterForm) === null || _dataFilterForm4 === void 0 ? void 0 : _dataFilterForm4.id]);
 
   function onSort(dataIndex, order) {
     var nextSort = _defineProperty({}, dataIndex, order);
@@ -731,8 +734,10 @@ var ProTable = function ProTable(props) {
       _request(_defineProperty({}, targetPageKey, 1));
     },
     onReset: function onReset() {
+      var _dataFilterForm5;
+
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
-      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
+      (_dataFilterForm5 = dataFilterForm) === null || _dataFilterForm5 === void 0 ? void 0 : _dataFilterForm5.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.27",
+  "version": "1.2.28",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",