@teamix/pro 1.4.24 → 1.4.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (70) hide show
  1. package/dist/pro.css +1 -1
  2. package/dist/pro.js +46014 -34835
  3. package/dist/pro.min.css +1 -1
  4. package/dist/pro.min.js +1 -1
  5. package/dist/pro.min.js.LICENSE.txt +11 -0
  6. package/es/actions/dialog.d.ts +2 -0
  7. package/es/actions/dialog.js +3 -2
  8. package/es/card/index.js +2 -2
  9. package/es/form/Filter/AdvancedFilter.js +8 -2
  10. package/es/form/Filter/layout.scss +1 -1
  11. package/es/form/ProForm/addCascadeEffect.d.ts +2 -0
  12. package/es/form/ProForm/addCascadeEffect.js +225 -0
  13. package/es/form/ProForm/index.js +8 -5
  14. package/es/form/ProForm/index.scss +33 -0
  15. package/es/form/index.d.ts +3 -0
  16. package/es/form/typing.d.ts +20 -0
  17. package/es/index.d.ts +1 -1
  18. package/es/index.js +2 -1
  19. package/es/info/components/InfoValueItem/index.js +15 -4
  20. package/es/info/typing.d.ts +4 -1
  21. package/es/sidebar/components/sidebar-container/index.js +18 -2
  22. package/es/sidebar/components/sidebar-container/index.scss +21 -14
  23. package/es/sidebar/components/tree/index.js +24 -6
  24. package/es/sidebar/components/tree-node/index.js +1 -1
  25. package/es/sidebar/components/tree-node/index.scss +6 -0
  26. package/es/sidebar/typing.d.ts +4 -0
  27. package/es/table/components/Layout/index.scss +1 -1
  28. package/es/table/components/Pagination/index.js +1 -2
  29. package/es/table/components/ToolBar/DensityIcon.js +1 -0
  30. package/es/table/components/ToolBar/FilterColumnIcon.js +2 -0
  31. package/es/table/components/ToolBar/FullScreenIcon.js +6 -57
  32. package/es/table/components/ToolBar/index.d.ts +1 -1
  33. package/es/table/components/ToolBar/index.js +99 -16
  34. package/es/table/components/ToolBar/index.scss +22 -2
  35. package/es/table/index.js +20 -4
  36. package/es/table/index.scss +1 -1
  37. package/es/table/typing.d.ts +4 -1
  38. package/lib/actions/dialog.d.ts +2 -0
  39. package/lib/actions/dialog.js +3 -2
  40. package/lib/card/index.js +2 -2
  41. package/lib/form/Filter/AdvancedFilter.js +7 -1
  42. package/lib/form/Filter/layout.scss +1 -1
  43. package/lib/form/ProForm/addCascadeEffect.d.ts +2 -0
  44. package/lib/form/ProForm/addCascadeEffect.js +235 -0
  45. package/lib/form/ProForm/index.js +9 -5
  46. package/lib/form/ProForm/index.scss +33 -0
  47. package/lib/form/index.d.ts +3 -0
  48. package/lib/form/typing.d.ts +20 -0
  49. package/lib/index.d.ts +1 -1
  50. package/lib/index.js +2 -1
  51. package/lib/info/components/InfoValueItem/index.js +15 -4
  52. package/lib/info/typing.d.ts +4 -1
  53. package/lib/sidebar/components/sidebar-container/index.js +18 -2
  54. package/lib/sidebar/components/sidebar-container/index.scss +21 -14
  55. package/lib/sidebar/components/tree/index.js +24 -6
  56. package/lib/sidebar/components/tree-node/index.js +1 -1
  57. package/lib/sidebar/components/tree-node/index.scss +6 -0
  58. package/lib/sidebar/typing.d.ts +4 -0
  59. package/lib/table/components/Layout/index.scss +1 -1
  60. package/lib/table/components/Pagination/index.js +1 -2
  61. package/lib/table/components/ToolBar/DensityIcon.js +1 -0
  62. package/lib/table/components/ToolBar/FilterColumnIcon.js +2 -0
  63. package/lib/table/components/ToolBar/FullScreenIcon.js +9 -63
  64. package/lib/table/components/ToolBar/index.d.ts +1 -1
  65. package/lib/table/components/ToolBar/index.js +109 -16
  66. package/lib/table/components/ToolBar/index.scss +22 -2
  67. package/lib/table/index.js +20 -4
  68. package/lib/table/index.scss +1 -1
  69. package/lib/table/typing.d.ts +4 -1
  70. package/package.json +2 -2
@@ -17,7 +17,7 @@ var _hooks = require("@teamix/hooks");
17
17
 
18
18
  require("./index.scss");
19
19
 
20
- var _excluded = ["className", "onChange", "total", "totalRender", "pageSize", "current", "pageSizeList", "pageSizeSelector", "onPageSizeChange", "responsivePaginationType"];
20
+ var _excluded = ["className", "onChange", "total", "pageSize", "current", "pageSizeList", "pageSizeSelector", "onPageSizeChange", "responsivePaginationType"];
21
21
 
22
22
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
23
23
 
@@ -49,7 +49,6 @@ var _default = function _default(props) {
49
49
  var className = props.className,
50
50
  propsOnChange = props.onChange,
51
51
  total = props.total,
52
- totalRender = props.totalRender,
53
52
  pageSize = props.pageSize,
54
53
  current = props.current,
55
54
  pageSizeList = props.pageSizeList,
@@ -94,6 +94,7 @@ var DensityIcon = function DensityIcon(props) {
94
94
  size: "small",
95
95
  type: "space-line"
96
96
  })),
97
+ followTrigger: true,
97
98
  visible: dropdownVisible,
98
99
  onVisibleChange: function onVisibleChange(state) {
99
100
  setTooltipVisible(false);
@@ -284,6 +284,8 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
284
284
  setTooltipVisible(false);
285
285
  setDropdownVisible(state);
286
286
  },
287
+ followTrigger: true,
288
+ cache: true,
287
289
  triggerType: ['click'],
288
290
  align: "tr br"
289
291
  }, /*#__PURE__*/_react.default.createElement("div", {
@@ -1,7 +1,5 @@
1
1
  "use strict";
2
2
 
3
- function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
-
5
3
  Object.defineProperty(exports, "__esModule", {
6
4
  value: true
7
5
  });
@@ -13,40 +11,20 @@ var _icon = _interopRequireDefault(require("@teamix/icon"));
13
11
 
14
12
  var _utils = require("@teamix/utils");
15
13
 
16
- var _react = _interopRequireWildcard(require("react"));
14
+ var _react = _interopRequireDefault(require("react"));
17
15
 
18
16
  require("./index.scss");
19
17
 
20
- function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
21
-
22
- function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
23
-
24
18
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
25
19
 
26
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
27
-
28
- 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."); }
29
-
30
- 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); }
31
-
32
- 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; }
33
-
34
- 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; }
35
-
36
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
37
-
20
+ /**
21
+ * 全屏展示 Icon
22
+ */
38
23
  var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar-icon');
39
24
 
40
25
  var FullScreenIcon = function FullScreenIcon(props) {
41
- var _actionRef$current3, _actionRef$current3$o;
42
-
43
- var actionRef = props.actionRef;
44
-
45
- var _useState = (0, _react.useState)(false),
46
- _useState2 = _slicedToArray(_useState, 2),
47
- fullscreen = _useState2[0],
48
- setFullscreen = _useState2[1]; // 点击全屏
49
-
26
+ var actionRef = props.actionRef,
27
+ fullScreenState = props.fullScreenState; // 点击全屏
50
28
 
51
29
  var allScreenHandle = function allScreenHandle() {
52
30
  setTimeout(function () {
@@ -54,48 +32,16 @@ var FullScreenIcon = function FullScreenIcon(props) {
54
32
 
55
33
  (_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);
56
34
  }, 0);
57
- }; // 销毁监听函数
58
-
59
-
60
- (0, _react.useEffect)(function () {
61
- return function () {
62
- var _actionRef$current2, _actionRef$current2$o;
63
-
64
- (_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');
65
- };
66
- }, []); // 监听全屏变化
35
+ };
67
36
 
68
- (_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) {
69
- // console.log('dataFilterForm', actionRef.current?.dataFilterForm);
70
- setFullscreen(state); // actionRef.current?.dataFilterForm?.setValues(formValues);
71
- }, 'fullScreenState', 'fullscreenIcon');
72
37
  return /*#__PURE__*/_react.default.createElement(_components.Button, {
73
38
  iconSize: "small",
74
39
  className: cls(),
75
40
  onClick: allScreenHandle
76
41
  }, /*#__PURE__*/_react.default.createElement(_icon.default, {
77
42
  size: "small",
78
- type: fullscreen ? 'close-line' : 'full-screen-line'
79
- })) // <Balloon.Tooltip
80
- // trigger={
81
- // <Button iconSize="small" className={cls()} onClick={allScreenHandle}>
82
- // <TeamixIcon
83
- // size="small"
84
- // type={fullscreen ? 'close-line' : 'full-screen-line'}
85
- // />
86
- // </Button>
87
- // }
88
- // align={fullscreen ? 'b' : 't'}
89
- // popupProps={{
90
- // visible: visible,
91
- // onVisibleChange: (state) => {
92
- // setVisible(state);
93
- // },
94
- // }}
95
- // >
96
- // {getMessage('fullScreen')}
97
- // </Balloon.Tooltip>
98
- ;
43
+ type: fullScreenState ? 'close-line' : 'full-screen-line'
44
+ }));
99
45
  };
100
46
 
101
47
  var _default = FullScreenIcon;
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import './index.scss';
3
2
  import { ProTableLayoutProps } from '../../typing';
3
+ import './index.scss';
4
4
  declare const ToolBar: React.FC<ProTableLayoutProps>;
5
5
  export default ToolBar;
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
@@ -7,7 +9,11 @@ exports.default = void 0;
7
9
 
8
10
  var _utils = require("@teamix/utils");
9
11
 
10
- var _react = _interopRequireDefault(require("react"));
12
+ var _react = _interopRequireWildcard(require("react"));
13
+
14
+ var _components = require("@alicloudfe/components");
15
+
16
+ var _icon = _interopRequireDefault(require("@teamix/icon"));
11
17
 
12
18
  var _FullScreenIcon = _interopRequireDefault(require("./FullScreenIcon"));
13
19
 
@@ -17,16 +23,36 @@ var _DensityIcon = _interopRequireDefault(require("./DensityIcon"));
17
23
 
18
24
  var _RefreshIcon = _interopRequireDefault(require("./RefreshIcon"));
19
25
 
26
+ var _hooks = require("@teamix/hooks");
27
+
28
+ var _lodash = _interopRequireDefault(require("lodash.debounce"));
29
+
20
30
  require("./index.scss");
21
31
 
22
32
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
23
33
 
34
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
35
+
36
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
37
+
24
38
  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; }
25
39
 
26
40
  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; }
27
41
 
28
42
  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; }
29
43
 
44
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
45
+
46
+ 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."); }
47
+
48
+ 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); }
49
+
50
+ 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; }
51
+
52
+ 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; }
53
+
54
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
55
+
30
56
  var cls = (0, _utils.usePrefixCls)('teamix-pro-table-toolbar');
31
57
  var presetToolBarMap = {
32
58
  refresh: _RefreshIcon.default,
@@ -54,7 +80,46 @@ var presetToolBar = [{
54
80
  }];
55
81
 
56
82
  var ToolBar = function ToolBar(props) {
57
- var toolBar = props.toolBar;
83
+ var _toolBarRef$current, _toolBarRef$current$p, _toolBarRef$current$p2;
84
+
85
+ var toolBar = props.toolBar,
86
+ fullScreenState = props.fullScreenState;
87
+ var toolBarRef = (0, _react.useRef)(null); // const toolBarSize = useSize(toolBarRef);
88
+ // 用于获取内容宽度
89
+
90
+ var toolBarContentRef = (0, _react.useRef)(null); // '.teamix-pro-form-query-filter-layout-inline' 元素
91
+
92
+ var layoutInlineDom = (_toolBarRef$current = toolBarRef.current) === null || _toolBarRef$current === void 0 ? void 0 : (_toolBarRef$current$p = _toolBarRef$current.parentElement) === null || _toolBarRef$current$p === void 0 ? void 0 : (_toolBarRef$current$p2 = _toolBarRef$current$p.parentElement) === null || _toolBarRef$current$p2 === void 0 ? void 0 : _toolBarRef$current$p2.parentElement; // 监听它的尺寸变化
93
+
94
+ var layoutInlineSize = (0, _hooks.useSize)(layoutInlineDom); // '.teamix-pro-form-query-filter-layout-left' 元素
95
+
96
+ var layoutLeftDom = layoutInlineDom === null || layoutInlineDom === void 0 ? void 0 : layoutInlineDom.firstElementChild;
97
+ var leftWidth = layoutLeftDom === null || layoutLeftDom === void 0 ? void 0 : layoutLeftDom.clientWidth; // 展示形式,是否平铺
98
+
99
+ var _useSafeState = (0, _hooks.useSafeState)(),
100
+ _useSafeState2 = _slicedToArray(_useSafeState, 2),
101
+ flat = _useSafeState2[0],
102
+ setFlat = _useSafeState2[1]; // 监听高度,> 32px则切换形态
103
+
104
+
105
+ (0, _react.useEffect)((0, _lodash.default)(function () {
106
+ // console.log(
107
+ // layoutInlineSize?.width,
108
+ // leftWidth,
109
+ // toolBarContentRef.current?.clientWidth,
110
+ // );
111
+ if ((layoutInlineSize === null || layoutInlineSize === void 0 ? void 0 : layoutInlineSize.width) && leftWidth && toolBarContentRef.current) {
112
+ var _toolBarContentRef$cu;
113
+
114
+ var width = layoutInlineSize.width; // console.log('layoutInlineSize-width', width);
115
+
116
+ if (width - leftWidth <= ((_toolBarContentRef$cu = toolBarContentRef.current) === null || _toolBarContentRef$cu === void 0 ? void 0 : _toolBarContentRef$cu.clientWidth) + 8) {
117
+ setFlat(false);
118
+ } else {
119
+ setFlat(true);
120
+ }
121
+ }
122
+ }, 300));
58
123
  var toolBarList = toolBar !== false ? presetToolBar : [];
59
124
 
60
125
  if (Array.isArray(toolBar)) {
@@ -75,21 +140,49 @@ var ToolBar = function ToolBar(props) {
75
140
  });
76
141
  }
77
142
 
143
+ var renderFlatShape = function renderFlatShape() {
144
+ return /*#__PURE__*/_react.default.createElement("div", {
145
+ className: cls('content')
146
+ }, toolBarList.map(function (_ref) {
147
+ var type = _ref.type,
148
+ name = _ref.name,
149
+ Component = _ref.component;
150
+ return /*#__PURE__*/_react.default.createElement("span", {
151
+ className: cls('item', _defineProperty({}, name, true)),
152
+ key: name
153
+ }, type === 'preset' && /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, props)), type === 'custom' && /*#__PURE__*/_react.default.createElement("div", {
154
+ className: cls({
155
+ custom: true
156
+ })
157
+ }, Component));
158
+ }));
159
+ };
160
+
161
+ var renderUnFlatShape = function renderUnFlatShape() {
162
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, {
163
+ triggerType: ['click'],
164
+ popupProps: {
165
+ cache: true
166
+ },
167
+ style: {
168
+ padding: 8
169
+ },
170
+ trigger: /*#__PURE__*/_react.default.createElement(_components.Button, null, /*#__PURE__*/_react.default.createElement(_icon.default, {
171
+ type: "more-line"
172
+ })),
173
+ align: "tr"
174
+ }, renderFlatShape()));
175
+ };
176
+
78
177
  return /*#__PURE__*/_react.default.createElement("div", {
79
- className: cls()
80
- }, toolBarList.map(function (_ref) {
81
- var type = _ref.type,
82
- name = _ref.name,
83
- Component = _ref.component;
84
- return /*#__PURE__*/_react.default.createElement("span", {
85
- className: cls(_defineProperty({}, name, true)),
86
- key: name
87
- }, type === 'preset' && /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, props)), type === 'custom' && /*#__PURE__*/_react.default.createElement("div", {
88
- className: cls({
89
- custom: true
90
- })
91
- }, Component));
92
- }));
178
+ className: cls('', {
179
+ flat: flat
180
+ }),
181
+ ref: toolBarRef
182
+ }, !flat && !fullScreenState ? renderUnFlatShape() : renderFlatShape(), /*#__PURE__*/_react.default.createElement("div", {
183
+ className: cls('shadow'),
184
+ ref: toolBarContentRef
185
+ }, renderFlatShape()));
93
186
  };
94
187
 
95
188
  var _default = ToolBar;
@@ -2,20 +2,40 @@
2
2
  width: 100%;
3
3
  text-align: right;
4
4
  margin-bottom: 8px;
5
+ &-flat {
6
+ margin-left: 8px;
7
+ }
8
+ &-item {
9
+ display: inline-block;
10
+ &:not(:first-child) {
11
+ margin-left: 8px;
12
+ }
13
+ }
14
+ &-content {
15
+ display: flex;
16
+ }
17
+ &-shadow {
18
+ visibility: hidden;
19
+ pointer-events: none;
20
+ opacity: 0;
21
+ height: 0px;
22
+ position: absolute;
23
+ z-index: -1;
24
+ overflow: hidden;
25
+ }
5
26
  }
6
27
  .teamix-pro-table-toolbar-custom {
7
28
  display: inline-block;
8
- margin-left: 8px;
9
29
  }
10
30
 
11
31
  // FullScreen
12
32
  .teamix-pro-table-toolbar-icon {
13
- margin-left: 8px;
14
33
  i {
15
34
  color: var(--color-fill1-6, #848484);
16
35
  }
17
36
  }
18
37
 
38
+
19
39
  // FilterColumn
20
40
  .teamix-pro-table-toolbar-filter-column {
21
41
  min-width: 180px;
@@ -55,7 +55,7 @@ Object.keys(_typing).forEach(function (key) {
55
55
  }
56
56
  });
57
57
  });
58
- var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree"];
58
+ var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree"];
59
59
 
60
60
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
61
61
 
@@ -186,6 +186,7 @@ var ProTable = function ProTable(props) {
186
186
  return params;
187
187
  } : _props$formatParams,
188
188
  formatResult = props.formatResult,
189
+ requestConfig = props.requestConfig,
189
190
  _props$requestWhenMou = props.requestWhenMount,
190
191
  requestWhenMount = _props$requestWhenMou === void 0 ? true : _props$requestWhenMou,
191
192
  _props$showPagination = props.showPagination,
@@ -726,7 +727,8 @@ var ProTable = function ProTable(props) {
726
727
  }, {
727
728
  // 使用 request 方法代替 fetch
728
729
  requestMethod: function requestMethod(params) {
729
- return (0, _utils.request)(params);
730
+ // 支持使用 requestConfig 自定义请求配置
731
+ return (0, _utils.request)(_objectSpread(_objectSpread({}, params), requestConfig));
730
732
  },
731
733
  manual: true,
732
734
  onSuccess: function onSuccess(result) {
@@ -906,6 +908,7 @@ var ProTable = function ProTable(props) {
906
908
 
907
909
  (_actionRef$current6 = actionRef.current) === null || _actionRef$current6 === void 0 ? void 0 : (_actionRef$current6$c = _actionRef$current6.clearRowSelection) === null || _actionRef$current6$c === void 0 ? void 0 : _actionRef$current6$c.call(_actionRef$current6);
908
910
  setCurrentPage(1);
911
+ console.log('currentPageSize1', pageSize);
909
912
 
910
913
  _request(_defineProperty({}, targetPageKey, 1), false, values);
911
914
  },
@@ -915,6 +918,7 @@ var ProTable = function ProTable(props) {
915
918
  (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
916
919
  (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
917
920
  setCurrentPage(1);
921
+ console.log('currentPageSize2', pageSize);
918
922
 
919
923
  _request(_defineProperty({}, targetPageKey, 1), false, values);
920
924
  }
@@ -946,7 +950,8 @@ var ProTable = function ProTable(props) {
946
950
  afterDataFilter: afterDataFilter,
947
951
  dataFilterFormRef: isFullScreen ? fullscreenDataFilterFormRef : normalDataFilterFormRef,
948
952
  rowSelection: rowSelection,
949
- filterColumnType: filterColumnType
953
+ filterColumnType: filterColumnType,
954
+ fullScreenState: isFullScreen
950
955
  }), /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, _objectSpread({
951
956
  hasBorder: false,
952
957
  dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
@@ -1052,13 +1057,24 @@ var ProTable = function ProTable(props) {
1052
1057
  count: selectedCount
1053
1058
  })));
1054
1059
  }
1060
+ } else if (footerAction) {
1061
+ if (showSkeleton) {
1062
+ return /*#__PURE__*/_react.default.createElement("div", {
1063
+ className: cls('footer-left-wrapper')
1064
+ }, /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Footer.Operation, null));
1065
+ } else {
1066
+ return /*#__PURE__*/_react.default.createElement("div", {
1067
+ className: cls('footer-left-wrapper')
1068
+ }, footerAction && renderFooterAction());
1069
+ }
1055
1070
  }
1056
1071
  }
1057
1072
 
1058
1073
  if (showPagination) {
1059
1074
  return /*#__PURE__*/_react.default.createElement("div", {
1060
1075
  className: cls('footer', {
1061
- 'footer-has-rowSelection': rowSelection
1076
+ 'footer-has-rowSelection': rowSelection,
1077
+ 'footer-has-action': footerAction
1062
1078
  })
1063
1079
  }, renderRowSelection(), /*#__PURE__*/_react.default.createElement("div", {
1064
1080
  className: cls('footer-right-wrapper')
@@ -16,7 +16,7 @@ $fullscreenPadding: 24px;
16
16
  box-shadow: var(--shadow-1-up);
17
17
  background: var(--color-fill1-1);
18
18
  }
19
- &-footer-has-rowSelection {
19
+ &-footer-has-rowSelection, &-footer-has-action {
20
20
  display: flex;
21
21
  align-items: center;
22
22
  padding: 8px 0;
@@ -7,7 +7,7 @@ import { QueryFilterProps, ProFormType } from '../form';
7
7
  import { ProActionGroupProps, ProActionButtonProps } from '../actions';
8
8
  import { PaginationProps } from '@alicloudfe/components/types/pagination';
9
9
  import { HeaderProps as ProTableHeaderProps } from '../field';
10
- import { Method } from 'axios';
10
+ import { Method, AxiosRequestConfig } from 'axios';
11
11
  import React from 'react';
12
12
  declare type IFieldRenderProps = keyof ProFieldRenderProps;
13
13
  /** 列record函数 */
@@ -86,6 +86,8 @@ export declare type ProTableProps = {
86
86
  onSuccess?: (res: any) => void;
87
87
  /** 内部请求失败时的回调 */
88
88
  onError?: (error: Error) => void;
89
+ /** 自定义的请求配置 */
90
+ requestConfig?: AxiosRequestConfig;
89
91
  /** 翻页页数的请求参数名 */
90
92
  pageKey?: string;
91
93
  /** 翻页器页数对应字段 */
@@ -274,6 +276,7 @@ export declare type ProTableLayoutProps = {
274
276
  actionRef: React.MutableRefObject<ProTableActionType | undefined>;
275
277
  columns?: ProTableColumnProps[];
276
278
  rowSelection?: innerRowSelectionType | rowSelectionType;
279
+ fullScreenState?: boolean;
277
280
  } & ProTableTopAreaProps;
278
281
  /** columns 列过滤 */
279
282
  export declare type ProTableColumnsFilterItemProps = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@teamix/pro",
3
- "version": "1.4.24",
3
+ "version": "1.4.27",
4
4
  "description": "TeamixPro大包",
5
5
  "keywords": [
6
6
  "aliyun",
@@ -36,7 +36,7 @@
36
36
  ],
37
37
  "private": false,
38
38
  "dependencies": {
39
- "@teamix/formily": "2.1.4",
39
+ "@teamix/formily": "2.2.4",
40
40
  "@teamix/hooks": "^0.1.0",
41
41
  "@teamix/pop-confirm": "^1.2.4",
42
42
  "@teamix/pro-field": "^1.0.0",