@teamix/pro 1.3.5 → 1.3.8

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 (78) hide show
  1. package/dist/pro.css +1 -1
  2. package/dist/pro.js +2962 -9964
  3. package/dist/pro.min.css +1 -1
  4. package/dist/pro.min.js +1 -1
  5. package/dist/pro.min.js.LICENSE.txt +0 -9
  6. package/es/actions/dialog-form.d.ts +2 -0
  7. package/es/actions/dialog-form.js +5 -2
  8. package/es/actions/index.d.ts +5 -1
  9. package/es/actions/index.js +30 -9
  10. package/es/card/index.d.ts +1 -1
  11. package/es/card/index.js +9 -1
  12. package/es/card/index.scss +4 -0
  13. package/es/form/Filter/LightFilter.js +12 -2
  14. package/es/form/Filter/useSpecialProps.js +2 -2
  15. package/es/form/ProForm/index.js +5 -3
  16. package/es/form/ProForm/index.scss +16 -8
  17. package/es/form/SchemaForm/reactions.js +2 -2
  18. package/es/form/typing.d.ts +1 -0
  19. package/es/index.d.ts +1 -1
  20. package/es/index.js +1 -1
  21. package/es/info/components/ProInfoItem/index.js +2 -6
  22. package/es/info/components/ProInfoItem/index.scss +0 -4
  23. package/es/info/components/baseInfo/index.js +1 -2
  24. package/es/info/typing.d.ts +0 -2
  25. package/es/info/utils/index.d.ts +0 -8
  26. package/es/info/utils/index.js +1 -28
  27. package/es/sidebar/components/tree/index.js +6 -2
  28. package/es/sidebar/components/tree-node/{componnets → components}/HoverTooltip/index.d.ts +0 -0
  29. package/es/sidebar/components/tree-node/{componnets → components}/HoverTooltip/index.js +1 -1
  30. package/es/sidebar/components/tree-node/{componnets → components}/HoverTooltip/index.scss +0 -0
  31. package/es/sidebar/components/tree-node/{componnets → components}/IconAction/index.d.ts +0 -0
  32. package/es/sidebar/components/tree-node/{componnets → components}/IconAction/index.js +0 -0
  33. package/es/sidebar/components/tree-node/{componnets → components}/IconAction/index.scss +0 -0
  34. package/es/sidebar/components/tree-node/{componnets → components}/IconSwitch/index.d.ts +0 -0
  35. package/es/sidebar/components/tree-node/{componnets → components}/IconSwitch/index.js +1 -1
  36. package/es/sidebar/components/tree-node/{componnets → components}/IconSwitch/index.scss +0 -0
  37. package/es/sidebar/components/tree-node/index.js +3 -3
  38. package/es/table/components/Pagination/index.js +4 -4
  39. package/es/table/components/ToolBar/FilterColumnIcon.js +5 -1
  40. package/es/table/index.js +9 -4
  41. package/es/table/typing.d.ts +3 -1
  42. package/lib/actions/dialog-form.d.ts +2 -0
  43. package/lib/actions/dialog-form.js +5 -2
  44. package/lib/actions/index.d.ts +5 -1
  45. package/lib/actions/index.js +29 -7
  46. package/lib/card/index.d.ts +1 -1
  47. package/lib/card/index.js +10 -1
  48. package/lib/card/index.scss +4 -0
  49. package/lib/form/Filter/LightFilter.js +14 -2
  50. package/lib/form/Filter/useSpecialProps.js +1 -1
  51. package/lib/form/ProForm/index.js +5 -3
  52. package/lib/form/ProForm/index.scss +16 -8
  53. package/lib/form/SchemaForm/reactions.js +1 -1
  54. package/lib/form/typing.d.ts +1 -0
  55. package/lib/index.d.ts +1 -1
  56. package/lib/index.js +1 -1
  57. package/lib/info/components/ProInfoItem/index.js +2 -6
  58. package/lib/info/components/ProInfoItem/index.scss +0 -4
  59. package/lib/info/components/baseInfo/index.js +0 -1
  60. package/lib/info/typing.d.ts +0 -2
  61. package/lib/info/utils/index.d.ts +0 -8
  62. package/lib/info/utils/index.js +1 -32
  63. package/lib/sidebar/components/tree/index.js +7 -3
  64. package/lib/sidebar/components/tree-node/{componnets → components}/HoverTooltip/index.d.ts +0 -0
  65. package/lib/sidebar/components/tree-node/{componnets → components}/HoverTooltip/index.js +2 -2
  66. package/lib/sidebar/components/tree-node/{componnets → components}/HoverTooltip/index.scss +0 -0
  67. package/lib/sidebar/components/tree-node/{componnets → components}/IconAction/index.d.ts +0 -0
  68. package/lib/sidebar/components/tree-node/{componnets → components}/IconAction/index.js +0 -0
  69. package/lib/sidebar/components/tree-node/{componnets → components}/IconAction/index.scss +0 -0
  70. package/lib/sidebar/components/tree-node/{componnets → components}/IconSwitch/index.d.ts +0 -0
  71. package/lib/sidebar/components/tree-node/{componnets → components}/IconSwitch/index.js +1 -1
  72. package/lib/sidebar/components/tree-node/{componnets → components}/IconSwitch/index.scss +0 -0
  73. package/lib/sidebar/components/tree-node/index.js +3 -3
  74. package/lib/table/components/Pagination/index.js +3 -3
  75. package/lib/table/components/ToolBar/FilterColumnIcon.js +5 -1
  76. package/lib/table/index.js +8 -3
  77. package/lib/table/typing.d.ts +3 -1
  78. package/package.json +18 -4
@@ -33,7 +33,9 @@ export declare type ProTableColumnProps = {
33
33
  tooltipIcon?: React.ReactNode;
34
34
  /** 对应 ProField 里面的 type */
35
35
  valueType?: ProFieldType;
36
- /** 【列配置】是否默认隐藏列 */
36
+ /** 是否隐藏表格列,列配置也不显示 */
37
+ hidden?: boolean;
38
+ /** 【列配置】是否默认隐藏表格列,但列配置显示 */
37
39
  columnFilters?: boolean;
38
40
  /** 【列配置】是否禁用隐藏列 */
39
41
  columnFiltersDisabled?: boolean;
@@ -20,6 +20,8 @@ export interface DialogFormAction extends DialogAction {
20
20
  schema: ProFormSchema | Omit<ProFormProps, 'form'>;
21
21
  /** 外部传来的 formRef,用于获取内置 form 实例 */
22
22
  formRef?: React.MutableRefObject<ProFormType | undefined>;
23
+ /** 是否开启懒惰校验,只校验第一个非法规则,默认开启 */
24
+ validateFirst?: boolean;
23
25
  }
24
26
  export declare function useDialogFormAction(action: DialogFormAction, context?: any): {
25
27
  [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
@@ -111,14 +111,17 @@ var DialogForm = function DialogForm(props) {
111
111
  formProps = props.formProps,
112
112
  context = props.context,
113
113
  formRef = props.formRef,
114
- innerFormRef = props.innerFormRef;
114
+ innerFormRef = props.innerFormRef,
115
+ _props$validateFirst = props.validateFirst,
116
+ validateFirst = _props$validateFirst === void 0 ? true : _props$validateFirst;
115
117
 
116
118
  var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
117
119
  formSchema = _getSchemaAndFormProp.schema,
118
120
  others = _objectWithoutProperties(_getSchemaAndFormProp, _excluded);
119
121
 
120
122
  var form = (0, _form.createForm)({
121
- initialValues: (0, _utils.getTargetValue)(initialValues, context)
123
+ initialValues: (0, _utils.getTargetValue)(initialValues, context),
124
+ validateFirst: validateFirst
122
125
  });
123
126
 
124
127
  var _useState = (0, _react.useState)(false),
@@ -1,6 +1,7 @@
1
- import React from 'react';
1
+ import React, { ReactNode } from 'react';
2
2
  import { ButtonProps } from '@alicloudfe/components/types/button';
3
3
  import { MenuButtonProps } from '@alicloudfe/components/types/menu-button';
4
+ import { TooltipProps } from '@alicloudfe/components/types/balloon';
4
5
  import { LinkAction } from './link';
5
6
  import { RequestAction } from './request';
6
7
  import { DialogAction } from './dialog';
@@ -29,7 +30,10 @@ export declare function useAction(config?: ProActionConfig, context?: any): any;
29
30
  export interface ProActionButtonProps extends ProActionCommonProps, ButtonProps {
30
31
  config?: ProActionConfig;
31
32
  disabled?: any;
33
+ tooltip?: ReactNode;
34
+ disabledTooltip?: ReactNode;
32
35
  icon?: string;
36
+ tooltipProps?: TooltipProps;
33
37
  onClick?: (event: React.MouseEvent<Element, MouseEvent>, context?: any) => void;
34
38
  }
35
39
  export declare const ProActionButton: (props: ProActionButtonProps) => JSX.Element;
@@ -54,7 +54,7 @@ var _dangerPopConfirm = require("./danger-pop-confirm");
54
54
  require("./index.scss");
55
55
 
56
56
  var _excluded = ["type"],
57
- _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "onClick"],
57
+ _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "disabled", "onClick", "tooltip", "disabledTooltip", "tooltipProps"],
58
58
  _excluded3 = ["loading"],
59
59
  _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
60
60
  _excluded5 = ["context", "text"],
@@ -202,18 +202,40 @@ var ProActionButton = function ProActionButton(props) {
202
202
  context = props.context,
203
203
  children = props.children,
204
204
  visible = props.visible,
205
+ disabled = props.disabled,
205
206
  _onClick = props.onClick,
207
+ tooltip = props.tooltip,
208
+ disabledTooltip = props.disabledTooltip,
209
+ tooltipProps = props.tooltipProps,
206
210
  others = _objectWithoutProperties(props, _excluded2);
207
211
 
208
212
  var actionProps = useAction(config, context);
209
- var buttonProps = _onClick ? _objectSpread(_objectSpread(_objectSpread({}, actionProps), others), {}, {
213
+ var buttonProps = _onClick ? _objectSpread(_objectSpread(_objectSpread({
214
+ disabled: disabled
215
+ }, actionProps), others), {}, {
210
216
  onClick: function onClick(e) {
211
217
  return _onClick(e, context);
212
218
  }
213
- }) : _objectSpread(_objectSpread({}, actionProps), others);
214
- return /*#__PURE__*/_react.default.createElement(_components.Button, _objectSpread({
219
+ }) : _objectSpread(_objectSpread({
220
+ disabled: disabled
221
+ }, actionProps), others);
222
+
223
+ var content = /*#__PURE__*/_react.default.createElement(_components.Button, _objectSpread({
215
224
  type: type
216
225
  }, buttonProps), buttonContent(children, icon, iconSize, context));
226
+
227
+ var baseToolTipProps = _objectSpread({
228
+ triggerType: 'hover',
229
+ align: 't',
230
+ trigger: content
231
+ }, tooltipProps);
232
+
233
+ if (tooltip || disabledTooltip) {
234
+ var showToolTip = disabled ? disabledTooltip : tooltip;
235
+ content = /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
236
+ }
237
+
238
+ return content;
217
239
  };
218
240
 
219
241
  exports.ProActionButton = ProActionButton;
@@ -241,9 +263,7 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
241
263
  }
242
264
  }) : _objectSpread({}, menuItemProps);
243
265
  return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
244
- className: (0, _classnames.default)('teamix-pro-action-menu-item', 'next-menu-item', {
245
- 'next-disabled': disabled
246
- })
266
+ className: (0, _classnames.default)('teamix-pro-action-menu-item', "".concat((0, _utils.usePrefixCls)(), "menu-item"), _defineProperty({}, "".concat((0, _utils.usePrefixCls)(), "disabled"), disabled))
247
267
  }, buttonProps), buttonContent(children, icon, undefined, context));
248
268
  };
249
269
 
@@ -405,6 +425,8 @@ function getActionConfig(action, index, context) {
405
425
  key: getKey(index, _key),
406
426
  actions: actions.map(function (a, j) {
407
427
  return getActionConfig(a, j, context);
428
+ }).filter(function (action) {
429
+ return action.visible !== false;
408
430
  })
409
431
  }, (0, _utils.getTargetValue)(_others, context));
410
432
  }
@@ -90,7 +90,7 @@ export declare const ProCard: {
90
90
  Selectable: {
91
91
  (props: import("./selectable").ProCardSelectableProps): JSX.Element;
92
92
  defaultProps: {
93
- hoveredShadow: boolean; /** 标签组 */
93
+ hoveredShadow: boolean;
94
94
  };
95
95
  isProCard: boolean;
96
96
  };
package/lib/card/index.js CHANGED
@@ -36,6 +36,8 @@ var _tab = _interopRequireDefault(require("./tab"));
36
36
 
37
37
  require("./index.scss");
38
38
 
39
+ var _proField = _interopRequireDefault(require("@teamix/pro-field"));
40
+
39
41
  var _cardContainer = require("./card-container");
40
42
 
41
43
  Object.keys(_cardContainer).forEach(function (key) {
@@ -258,7 +260,14 @@ var ProCard = function ProCard(props) {
258
260
  trigger: tooltipTrigger
259
261
  }, tooltip)), tags && (0, _utils.renderTags)(tags, 'small'), description && /*#__PURE__*/_react.default.createElement("div", {
260
262
  className: cls('title-description')
261
- }, description));
263
+ }, /*#__PURE__*/_react.default.createElement(_proField.default, {
264
+ value: description,
265
+ type: "text",
266
+ render: {
267
+ ellipsis: true,
268
+ tooltip: description
269
+ }
270
+ })));
262
271
  };
263
272
 
264
273
  return /*#__PURE__*/_react.default.createElement(_components.Card, _objectSpread({
@@ -52,6 +52,10 @@
52
52
  }
53
53
  }
54
54
 
55
+ &-name{
56
+ flex-shrink: 0;
57
+ }
58
+
55
59
  &-collapse {
56
60
  cursor: pointer;
57
61
 
@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _classnames = _interopRequireDefault(require("classnames"));
13
13
 
14
+ var _reactive = require("@formily/reactive");
15
+
14
16
  var _utils = require("@teamix/utils");
15
17
 
16
18
  var _ProForm = _interopRequireDefault(require("../ProForm"));
@@ -33,9 +35,13 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
33
35
 
34
36
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
35
37
 
38
+ var lightFilterObs = (0, _reactive.observable)({
39
+ onFilter: function onFilter() {}
40
+ });
36
41
  /**
37
42
  * 轻量筛选
38
43
  */
44
+
39
45
  var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
40
46
  var _schema$;
41
47
 
@@ -87,7 +93,7 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
87
93
  filterValues: filterValues,
88
94
  onFilterChange: onFilterChange,
89
95
  buttonProps: {
90
- onClick: onFilter
96
+ onClick: "{{lightFilterObs.onFilter}}"
91
97
  }
92
98
  },
93
99
  children: schema
@@ -99,8 +105,14 @@ var LightFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
99
105
  }
100
106
  }
101
107
  }];
102
- }, [schema, onFilter, onFilterChange, defaultFilterValue]);
108
+ }, [schema, onFilterChange, defaultFilterValue]);
109
+ (0, _react.useEffect)(function () {
110
+ lightFilterObs.onFilter = onFilter;
111
+ }, [onChange]);
103
112
  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread({}, otherProps), {}, {
113
+ scope: _objectSpread(_objectSpread({}, otherProps === null || otherProps === void 0 ? void 0 : otherProps.scope), {}, {
114
+ lightFilterObs: lightFilterObs
115
+ }),
104
116
  form: form,
105
117
  className: (0, _classnames.default)(prefixCls, props.className),
106
118
  schema: LightSchema,
@@ -24,7 +24,7 @@ var useSpecialProps = function useSpecialProps(props) {
24
24
  dataSource = item.dataSource,
25
25
  children = item.children; // 字符串变量配置default值会触发onChange
26
26
 
27
- hasChangeDefault = hasChangeDefault || !!((0, _utils.isPureObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
27
+ hasChangeDefault = hasChangeDefault || !!((0, _utils.isPlainObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
28
28
  hasDefault = hasDefault || (0, _utils.isUsable)(value);
29
29
  hasRequired = hasRequired || required || !!rules;
30
30
 
@@ -31,7 +31,7 @@ var _validate = _interopRequireDefault(require("../locales/validate"));
31
31
 
32
32
  require("./index.scss");
33
33
 
34
- var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className"];
34
+ var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
35
35
 
36
36
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
37
37
 
@@ -70,11 +70,12 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
70
70
  onSubmitFailed = _ref.onSubmitFailed,
71
71
  onInitialComplete = _ref.onInitialComplete,
72
72
  className = _ref.className,
73
+ validateFirst = _ref.validateFirst,
73
74
  otherProps = _objectWithoutProperties(_ref, _excluded);
74
75
 
75
76
  var form = (0, _react.useMemo)(function () {
76
77
  return outerForm || (0, _core.createForm)({
77
- validateFirst: true
78
+ validateFirst: validateFirst
78
79
  });
79
80
  }, []);
80
81
  var prefixCls = (0, _utils.usePrefixCls)('', {
@@ -146,7 +147,8 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
146
147
  });
147
148
  ProForm.defaultProps = {
148
149
  colon: false,
149
- labelAlign: 'left'
150
+ labelAlign: 'left',
151
+ validateFirst: true
150
152
  };
151
153
  var _default = ProForm;
152
154
  exports.default = _default;
@@ -197,14 +197,15 @@
197
197
  margin-right: 4px;
198
198
  }
199
199
  }
200
- // 数组类ArrayItem Icon 居中(移除,通过align:center配置)
201
- // .#{$form-array}-items-item-inner {
202
- // .#{$css-prefix}space-item {
203
- // > .#{$css-prefix}formily-icon {
204
- // margin-top: 9px;
205
- // }
206
- // }
207
- // }
200
+ // 数组类ArrayItem Icon text 居中
201
+ .#{$form-array}-items-item-inner {
202
+ .#{$css-prefix}space-item {
203
+ > .#{$css-prefix}formily-icon.#{$css-prefix}btn-text {
204
+ line-height: inherit !important;
205
+ margin-right: 0;
206
+ }
207
+ }
208
+ }
208
209
 
209
210
  // Editable预览态行高
210
211
  .#{$css-prefix}formily-editable-content {
@@ -212,6 +213,13 @@
212
213
  }
213
214
 
214
215
  // 折叠面板
216
+ .#{$css-prefix}formily-collapse {
217
+ .#{$css-prefix}collapse-panel-title {
218
+ .#{$css-prefix}badge-count {
219
+ transform: translateX(4px);
220
+ }
221
+ }
222
+ }
215
223
  .#{$css-prefix}formily-collapse,
216
224
  .#{$form-array}-collapse-item {
217
225
  .#{$css-prefix}collapse-panel-hidden {
@@ -37,7 +37,7 @@ var $request = function $request(field, _ref, context, type) {
37
37
  // 触发所有配置的请求
38
38
 
39
39
  var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
40
- var refreshResult = (0, _utils.isPureObj)(refresh) ? refresh : {};
40
+ var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {};
41
41
  return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
42
42
  params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
43
43
  beforeRequest: function beforeRequest() {
@@ -66,6 +66,7 @@ export interface ProFormProps extends IFormLayoutProps {
66
66
  initialValues?: AnyObject;
67
67
  initialRequest?: ProFormRequestConfig;
68
68
  previewTextPlaceholder?: ReactNode;
69
+ validateFirst?: boolean;
69
70
  onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
70
71
  onSubmit?: ((values: any) => any) | CommonRequestConfig;
71
72
  onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
package/lib/index.d.ts CHANGED
@@ -26,5 +26,5 @@ export * from './table';
26
26
  export * from './sidebar';
27
27
  export * from './utils';
28
28
  export * from './timeline';
29
- declare const version = "1.3.5";
29
+ declare const version = "1.3.8";
30
30
  export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };
package/lib/index.js CHANGED
@@ -305,5 +305,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
305
305
  // 设置图标源
306
306
  _icon.default.setConfig(_utils.default.getTeamixIconConfig());
307
307
 
308
- var version = '1.3.5';
308
+ var version = '1.3.8';
309
309
  exports.version = version;
@@ -28,17 +28,13 @@ var ProInfoItem = function ProInfoItem(prop) {
28
28
  headerInfoLayout = prop.headerInfoLayout,
29
29
  loading = prop.loading,
30
30
  tooltip = prop.tooltip,
31
- tooltipIcon = prop.tooltipIcon,
32
- _isLastRow = prop._isLastRow;
31
+ tooltipIcon = prop.tooltipIcon;
33
32
 
34
33
  if (baseInfoLayout) {
35
34
  var labelCol = baseInfoLayout.labelCol,
36
35
  wrapperCol = baseInfoLayout.wrapperCol;
37
36
  return /*#__PURE__*/_react.default.createElement("div", {
38
- className: cls({
39
- '': true,
40
- isLastRow: _isLastRow
41
- })
37
+ className: cls('')
42
38
  }, /*#__PURE__*/_react.default.createElement(Row, {
43
39
  gutter: 10,
44
40
  className: cls('base-row')
@@ -17,10 +17,6 @@ $item-padding-bottom: 8px;
17
17
  .teamix-pro-field-info-form-item {
18
18
  width: 100%;
19
19
  padding-bottom: $item-padding-bottom;
20
- &-isLastRow{
21
- padding-bottom: unset;
22
- }
23
-
24
20
  &-header-row {
25
21
  display: flex;
26
22
  align-items: center;
@@ -84,7 +84,6 @@ var ProBaseInfo = function ProBaseInfo(props) {
84
84
  }, /*#__PURE__*/_react.default.createElement(_ProInfoItem.default, {
85
85
  label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
86
86
  loading: loading,
87
- _isLastRow: !!(0, _utils2.isLastRow)(columns.length, layoutSpan, index),
88
87
  value: /*#__PURE__*/_react.default.createElement(_InfoValueItem.default, {
89
88
  type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
90
89
  value: (0, _utils2.getDataIndexValue)(item.dataIndex, (_ref = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref !== void 0 ? _ref : {}),
@@ -113,8 +113,6 @@ export declare type IProProInfoItem = {
113
113
  headerInfoLayout?: ProHeaderInfoLayoutProps;
114
114
  /** loading 状态 */
115
115
  loading?: boolean;
116
- /** isLastRow 是否是最后一行的元素 */
117
- _isLastRow?: boolean;
118
116
  } & Pick<ProInfoColumnsProps, 'tooltip' | 'tooltipIcon'>;
119
117
  /** header info 定义 */
120
118
  export declare type IProHeaderInfo = {
@@ -10,11 +10,3 @@ export declare const ProInfoGroupContext: React.Context<ProInfoGroupContextProps
10
10
  * @returns
11
11
  */
12
12
  export declare function getDataIndexValue(dataIndex: ProInfoColumnsProps['dataIndex'], dataSource: object): any;
13
- /**
14
- * 是否是最后一样的元素
15
- * @param columnsLength
16
- * @param layoutSpan
17
- * @params itemIndex
18
- * @returns
19
- */
20
- export declare const isLastRow: (columnsLength: number, layoutSpan: number, itemIndex: number) => boolean | undefined;
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.ProInfoGroupContext = void 0;
7
7
  exports.getDataIndexValue = getDataIndexValue;
8
- exports.isLastRow = void 0;
9
8
  exports.useActionType = useActionType;
10
9
 
11
10
  var _utils = require("@teamix/utils");
@@ -48,34 +47,4 @@ function getDataIndexValue(dataIndex, dataSource) {
48
47
  }
49
48
 
50
49
  return (0, _utils.getDeepValue)(dataIndex !== null && dataIndex !== void 0 ? dataIndex : '', dataSource);
51
- }
52
- /**
53
- * 是否是最后一样的元素
54
- * @param columnsLength
55
- * @param layoutSpan
56
- * @params itemIndex
57
- * @returns
58
- */
59
-
60
-
61
- var isLastRow = function isLastRow(columnsLength, layoutSpan, itemIndex) {
62
- if (!columnsLength || !layoutSpan) return;
63
- var lastRowColumnsIndexList = [];
64
- var rowCount = 24 / layoutSpan;
65
-
66
- if (columnsLength % rowCount === 0) {
67
- while (rowCount--) {
68
- lastRowColumnsIndexList.push(columnsLength--);
69
- }
70
- } else {
71
- var lastRowCount = columnsLength % rowCount;
72
-
73
- while (lastRowCount--) {
74
- lastRowColumnsIndexList.push(columnsLength--);
75
- }
76
- }
77
-
78
- return lastRowColumnsIndexList.includes(itemIndex + 1);
79
- };
80
-
81
- exports.isLastRow = isLastRow;
50
+ }
@@ -13,7 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
13
13
 
14
14
  var _treeNode = require("../tree-node");
15
15
 
16
- var _lodash = require("lodash");
16
+ var _lodash = _interopRequireDefault(require("lodash.debounce"));
17
17
 
18
18
  require("./index.scss");
19
19
 
@@ -145,7 +145,11 @@ var ProSidebarTree = function ProSidebarTree(props) {
145
145
 
146
146
  (0, _react.useEffect)(function () {
147
147
  setDefaultExpandedKeys();
148
- }, []); // 更新外部传入的 dataSource
148
+ }, []); // 监听 selectedKeys,用于受控
149
+
150
+ (0, _react.useEffect)(function () {
151
+ setSelectedKeys(selectedKeysProp);
152
+ }, [selectedKeysProp]); // 更新外部传入的 dataSource
149
153
 
150
154
  (0, _hooks.useUpdateEffect)(function () {
151
155
  setDataSource(processDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []));
@@ -235,7 +239,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
235
239
  }; // 过滤
236
240
 
237
241
 
238
- var filterDataSource = (0, _lodash.debounce)(function (value) {
242
+ var filterDataSource = (0, _lodash.default)(function (value) {
239
243
  var searchDataSource = processDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
240
244
  var expandedKeys = [];
241
245
 
@@ -9,7 +9,7 @@ exports.default = void 0;
9
9
 
10
10
  var _components = require("@alicloudfe/components");
11
11
 
12
- var _src = require("../../../../../../../utils/src");
12
+ var _utils = require("@teamix/utils");
13
13
 
14
14
  var _react = _interopRequireWildcard(require("react"));
15
15
 
@@ -37,7 +37,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
37
37
 
38
38
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
39
39
 
40
- var cls = (0, _src.baseClass)('teamix-pro-hover-tooltip');
40
+ var cls = (0, _utils.baseClass)('teamix-pro-hover-tooltip');
41
41
 
42
42
  var ProHoverTooltip = function ProHoverTooltip(props) {
43
43
  var trigger = props.trigger,
@@ -53,7 +53,7 @@ var ProIconSwitch = function ProIconSwitch(props) {
53
53
  setVisible = _useState2[1];
54
54
 
55
55
  (0, _react.useEffect)(function () {
56
- setVisible(visibleProp !== null && visibleProp !== void 0 ? visibleProp : false);
56
+ setVisible(visibleProp !== null && visibleProp !== void 0 ? visibleProp : true);
57
57
  }, [visibleProp]); // 点击操作
58
58
 
59
59
  var clickHandle = function clickHandle(e, state) {
@@ -17,11 +17,11 @@ var _react = _interopRequireWildcard(require("react"));
17
17
 
18
18
  var _proField = _interopRequireDefault(require("@teamix/pro-field"));
19
19
 
20
- var _IconAction = _interopRequireDefault(require("./componnets/IconAction"));
20
+ var _IconAction = _interopRequireDefault(require("./components/IconAction"));
21
21
 
22
- var _IconSwitch = _interopRequireDefault(require("./componnets/IconSwitch"));
22
+ var _IconSwitch = _interopRequireDefault(require("./components/IconSwitch"));
23
23
 
24
- var _HoverTooltip = _interopRequireDefault(require("./componnets/HoverTooltip"));
24
+ var _HoverTooltip = _interopRequireDefault(require("./components/HoverTooltip"));
25
25
 
26
26
  var _excluded = ["type", "action", "props"];
27
27
 
@@ -178,7 +178,7 @@ var _default = function _default(props) {
178
178
  return /*#__PURE__*/_react.default.createElement("div", {
179
179
  className: cls('custom-jumper')
180
180
  }, /*#__PURE__*/_react.default.createElement(_components.Button, {
181
- className: "next-prev next-pagination-item",
181
+ className: "".concat((0, _utils.usePrefixCls)(), "prev ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
182
182
  onClick: handlePrevClick,
183
183
  disabled: Number(currentPage) <= 1
184
184
  }, /*#__PURE__*/_react.default.createElement(_components.Icon, {
@@ -200,7 +200,7 @@ var _default = function _default(props) {
200
200
  marginRight: 4
201
201
  }
202
202
  }, "/"), getTotalPage(total, pageSize)), /*#__PURE__*/_react.default.createElement(_components.Button, {
203
- className: "next-next next-pagination-item",
203
+ className: "".concat((0, _utils.usePrefixCls)(), "next ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
204
204
  onClick: handleNextClick,
205
205
  //@ts-ignore
206
206
  disabled: total && Number(currentPage) >= getTotalPage(total, pageSize)
@@ -218,7 +218,7 @@ var _default = function _default(props) {
218
218
  }, otherProps));
219
219
  } else {
220
220
  return /*#__PURE__*/_react.default.createElement("div", {
221
- className: "".concat(cls('custom-mini-pagination'), " next-pagination")
221
+ className: "".concat(cls('custom-mini-pagination'), " ").concat((0, _utils.usePrefixCls)(), "pagination")
222
222
  }, customTotalRender(total), customJumpRender());
223
223
  }
224
224
  }
@@ -64,8 +64,12 @@ var processColumns = function processColumns(columns) {
64
64
  columns = columns.filter(function (item) {
65
65
  return item.valueType !== 'selectGroup';
66
66
  });
67
- }
67
+ } // hidden 为 true 时不展示
68
+
68
69
 
70
+ columns = columns.filter(function (item) {
71
+ return (item === null || item === void 0 ? void 0 : item.hidden) !== true;
72
+ });
69
73
  return columns.map(function (item) {
70
74
  if (item.columnFilters === false) {
71
75
  return item;
@@ -109,7 +109,7 @@ var processColumns = function processColumns(columns, initialColumns) {
109
109
  var _filterColumns;
110
110
 
111
111
  var filterColumns = columns.filter(function (item) {
112
- return item.columnFilters !== false;
112
+ return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true;
113
113
  });
114
114
 
115
115
  if (isRoot) {
@@ -313,7 +313,7 @@ var ProTable = function ProTable(props) {
313
313
 
314
314
  var tableDom = tableRef.current;
315
315
  var headerDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements = tableDom.getElementsByClassName('teamix-pro-table-layout')) === null || _tableDom$getElements === void 0 ? void 0 : _tableDom$getElements[0];
316
- var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName('next-table-header-inner')) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
316
+ var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName("".concat((0, _utils.usePrefixCls)(), "table-header-inner"))) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
317
317
  return new Promise(function (resolve) {
318
318
  setTimeout(function () {
319
319
  var _headerDom$offsetHeig, _tableHeaderDom$offse;
@@ -736,6 +736,11 @@ var ProTable = function ProTable(props) {
736
736
  setTotal(total || (data === null || data === void 0 ? void 0 : data.length));
737
737
  setShowSkeleton(false);
738
738
  setCustomTableLoading(false);
739
+ } // 重新计算是否需要吸底
740
+
741
+
742
+ if (footerSuction) {
743
+ getFooterSuctionState();
739
744
  }
740
745
  });
741
746
  } else {
@@ -794,7 +799,7 @@ var ProTable = function ProTable(props) {
794
799
  onInit: function onInit(values) {
795
800
  // 表单初始化请求处理
796
801
  (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit(values));
797
- !fullscreenState && _request({}, false, values);
802
+ !fullscreenState && requestWhenMount && _request({}, false, values);
798
803
  return true;
799
804
  },
800
805
  onFilter: function onFilter(values) {
@@ -33,7 +33,9 @@ export declare type ProTableColumnProps = {
33
33
  tooltipIcon?: React.ReactNode;
34
34
  /** 对应 ProField 里面的 type */
35
35
  valueType?: ProFieldType;
36
- /** 【列配置】是否默认隐藏列 */
36
+ /** 是否隐藏表格列,列配置也不显示 */
37
+ hidden?: boolean;
38
+ /** 【列配置】是否默认隐藏表格列,但列配置显示 */
37
39
  columnFilters?: boolean;
38
40
  /** 【列配置】是否禁用隐藏列 */
39
41
  columnFiltersDisabled?: boolean;