@teamix/pro 1.2.6 → 1.2.10

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 (62) hide show
  1. package/dist/212.js +1 -1
  2. package/dist/pro.css +1 -1
  3. package/dist/pro.js +683 -380
  4. package/dist/pro.min.css +1 -1
  5. package/dist/pro.min.js +1 -1
  6. package/es/actions/dialog-form.js +2 -2
  7. package/es/actions/dialog.js +16 -21
  8. package/es/actions/index.js +25 -21
  9. package/es/actions/index.scss +14 -7
  10. package/es/card/index.d.ts +12 -3
  11. package/es/card/index.js +11 -9
  12. package/es/card/index.scss +52 -2
  13. package/es/card/selectable.d.ts +13 -0
  14. package/es/card/selectable.js +45 -0
  15. package/es/form/Filter/index.js +5 -5
  16. package/es/form/ProForm/index.scss +9 -0
  17. package/es/index.d.ts +1 -1
  18. package/es/index.js +7 -4
  19. package/es/info/components/tableInfo/index.js +10 -6
  20. package/es/nocode/configurators/Card.js +31 -8
  21. package/es/sidebar/components/sidebar-container/index.d.ts +5 -0
  22. package/es/sidebar/components/sidebar-container/index.js +77 -0
  23. package/es/sidebar/components/sidebar-container/index.scss +18 -0
  24. package/es/sidebar/components/tree/index.d.ts +4 -0
  25. package/es/sidebar/components/tree/index.js +162 -0
  26. package/es/sidebar/index.d.ts +5 -0
  27. package/es/sidebar/index.js +70 -0
  28. package/es/sidebar/index.scss +3 -0
  29. package/es/sidebar/typing.d.ts +64 -0
  30. package/es/sidebar/typing.js +1 -0
  31. package/es/table/index.js +11 -2
  32. package/es/table/index.scss +1 -0
  33. package/es/table/typing.d.ts +2 -0
  34. package/lib/actions/dialog-form.js +1 -1
  35. package/lib/actions/dialog.js +15 -20
  36. package/lib/actions/index.js +25 -21
  37. package/lib/actions/index.scss +14 -7
  38. package/lib/card/index.d.ts +12 -3
  39. package/lib/card/index.js +15 -12
  40. package/lib/card/index.scss +52 -2
  41. package/lib/card/selectable.d.ts +13 -0
  42. package/lib/card/selectable.js +60 -0
  43. package/lib/form/Filter/index.js +5 -6
  44. package/lib/form/ProForm/index.scss +9 -0
  45. package/lib/index.d.ts +1 -1
  46. package/lib/index.js +3 -1
  47. package/lib/info/components/tableInfo/index.js +10 -6
  48. package/lib/nocode/configurators/Card.js +31 -8
  49. package/lib/sidebar/components/sidebar-container/index.d.ts +5 -0
  50. package/lib/sidebar/components/sidebar-container/index.js +93 -0
  51. package/lib/sidebar/components/sidebar-container/index.scss +18 -0
  52. package/lib/sidebar/components/tree/index.d.ts +4 -0
  53. package/lib/sidebar/components/tree/index.js +179 -0
  54. package/lib/sidebar/index.d.ts +5 -0
  55. package/lib/sidebar/index.js +91 -0
  56. package/lib/sidebar/index.scss +3 -0
  57. package/lib/sidebar/typing.d.ts +64 -0
  58. package/lib/sidebar/typing.js +5 -0
  59. package/lib/table/index.js +11 -2
  60. package/lib/table/index.scss +1 -0
  61. package/lib/table/typing.d.ts +2 -0
  62. package/package.json +1 -1
@@ -206,13 +206,15 @@ var ProActionButton = function ProActionButton(props) {
206
206
 
207
207
  exports.ProActionButton = ProActionButton;
208
208
 
209
- function renderMenuButtonItem(item, key, context) {
210
- var config = item.config,
211
- btnContext = item.context,
212
- _onClick2 = item.onClick,
213
- children = item.children,
214
- icon = item.icon,
215
- disabled = item.disabled;
209
+ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
210
+ var action = props.action,
211
+ context = props.context;
212
+ var config = action.config,
213
+ btnContext = action.context,
214
+ _onClick2 = action.onClick,
215
+ children = action.children,
216
+ icon = action.icon,
217
+ disabled = action.disabled;
216
218
  var menuItemActionConfig = Object.assign({}, config, {
217
219
  trigger: 'onClick'
218
220
  });
@@ -221,30 +223,33 @@ function renderMenuButtonItem(item, key, context) {
221
223
  loading = _useAction.loading,
222
224
  menuItemProps = _objectWithoutProperties(_useAction, _excluded3);
223
225
 
224
- var buttonProps = _onClick2 ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
226
+ var buttonProps = disabled ? {} : _onClick2 ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
225
227
  onClick: function onClick(e) {
226
228
  return _onClick2(e, context);
227
229
  }
228
230
  }) : _objectSpread({}, menuItemProps);
229
- return /*#__PURE__*/_react.default.createElement(_components.MenuButton.Item, _objectSpread({
230
- key: key,
231
- disabled: disabled
231
+ return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
232
+ className: (0, _classnames.default)('teamix-pro-action-menu-item', 'next-menu-item', {
233
+ 'next-disabled': disabled
234
+ })
232
235
  }, buttonProps), buttonContent(children, icon, undefined, context));
233
- }
236
+ };
234
237
 
235
- function renderCommonActionButtonMenuItem(action, key, context) {
238
+ function renderCommonActionButtonMenuItem(action, context) {
236
239
  var menuBtn = action;
237
240
 
238
241
  if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
239
242
  return /*#__PURE__*/_react.default.createElement(_components.Menu.SubMenu, {
240
- key: key,
241
243
  label: menuBtn.label || menuBtn.children
242
244
  }, menuBtn.actions.map(function (a, j) {
243
- return renderCommonActionButtonMenuItem(a, j, context);
245
+ return renderCommonActionButtonMenuItem(a, context);
244
246
  }));
245
247
  }
246
248
 
247
- return renderMenuButtonItem(action, key, context);
249
+ return /*#__PURE__*/_react.default.createElement(ProActionMenuButtonItem, {
250
+ action: action,
251
+ context: context
252
+ });
248
253
  }
249
254
 
250
255
  var ProActionMenuButton = function ProActionMenuButton(props) {
@@ -260,6 +265,7 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
260
265
 
261
266
  return /*#__PURE__*/_react.default.createElement(_components.MenuButton, _objectSpread({
262
267
  popupTriggerType: "hover",
268
+ autoWidth: false,
263
269
  menuProps: {
264
270
  mode: 'popup',
265
271
  triggerType: 'hover'
@@ -269,8 +275,8 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
269
275
  },
270
276
  type: type,
271
277
  label: buttonContent(label || children, icon, iconSize, context)
272
- }, others), actions.map(function (action, i) {
273
- return renderCommonActionButtonMenuItem(action, i, context);
278
+ }, others), actions.map(function (action) {
279
+ return renderCommonActionButtonMenuItem(action, context);
274
280
  }));
275
281
  }; // 如果 actions 数量超过了 max,则把第 max 个和剩余超出部分折叠起来成为一个 menu
276
282
 
@@ -377,9 +383,7 @@ function ProActionGroup(props) {
377
383
  })
378
384
  }, containerProps), formatedActions.map(function (actionBtn, i) {
379
385
  var isLastOne = i === formatedActions.length - 1;
380
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
381
- key: i
382
- }, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/_react.default.createElement(_components.Divider, {
386
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/_react.default.createElement(_components.Divider, {
383
387
  direction: "ver"
384
388
  }));
385
389
  }));
@@ -28,6 +28,19 @@
28
28
  flex-shrink: 0;
29
29
  }
30
30
  }
31
+ .next-dialog.teamix-pro-action-dialog {
32
+ &.has-footer-description {
33
+ .next-message {
34
+ position: static;
35
+ }
36
+ }
37
+
38
+ &.quick-show-confirm-or-alert {
39
+ .teamix-pro-dialog-footer-description {
40
+ bottom: var(--dialog-footer-padding-bottom, 20px);
41
+ }
42
+ }
43
+ }
31
44
 
32
45
  .teamix-pro-dialog-footer-description {
33
46
  position: absolute;
@@ -48,12 +61,6 @@
48
61
  }
49
62
  }
50
63
 
51
- .teamix-pro-action-dialog.has-footer-description {
52
- .next-message {
53
- position: static;
54
- }
55
- }
56
-
57
64
  .teamix-pro-dialog-before-content {
58
65
  margin-bottom: var(--s-2);
59
66
  }
@@ -61,7 +68,7 @@
61
68
  .teamix-pro-dialog-message {
62
69
  margin-bottom: var(--s-2);
63
70
 
64
- &+.next-loading {
71
+ & + .next-loading {
65
72
  .teamix-pro-form {
66
73
  margin-top: 20px;
67
74
  }
@@ -23,11 +23,11 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
23
23
  image?: string;
24
24
  /** 卡片标题下方是否有分割线 */
25
25
  divider?: boolean;
26
- /** 卡片是否有边框 */
27
- bordered?: boolean;
28
26
  /**
29
- * @deprecated 已经没有这个效果了,将在下一个 minor 版本移除
27
+ * @deprecated 建议使用 borderColor = 'none' 代替
30
28
  */
29
+ bordered?: boolean;
30
+ /** 卡片在 hover 时拥有阴影效果 */
31
31
  hoveredShadow?: boolean;
32
32
  /** 卡片是否为紧凑模式,紧凑模式下卡片没有内边距和边框 */
33
33
  compacted?: boolean;
@@ -35,6 +35,8 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
35
35
  centered?: boolean;
36
36
  /** 加载中状态 */
37
37
  loading?: boolean;
38
+ /** 边框颜色 */
39
+ borderColor?: 'blue' | 'green' | 'red' | 'orange' | 'yellow' | 'grey' | 'transparent' | 'none';
38
40
  /** 背景色 */
39
41
  backgroundColor?: 'blue' | 'green' | 'red' | 'orange' | 'yellow' | 'grey' | 'transparent';
40
42
  /** 内容区栅格排列 flex 方向,仅仅在卡片嵌套模式下生效 */
@@ -77,6 +79,13 @@ export declare const ProCard: {
77
79
  (props: React.HTMLAttributes<HTMLElement>): JSX.Element;
78
80
  isProCardDivider: boolean;
79
81
  };
82
+ Selectable: {
83
+ (props: import("./selectable").ProCardSelectableProps): JSX.Element;
84
+ defaultProps: {
85
+ hoveredShadow: boolean;
86
+ };
87
+ isProCard: boolean;
88
+ };
80
89
  isProCard: boolean;
81
90
  };
82
91
  export default ProCard;
package/lib/card/index.js CHANGED
@@ -10,7 +10,7 @@ exports.default = exports.ProCard = void 0;
10
10
 
11
11
  var _react = _interopRequireDefault(require("react"));
12
12
 
13
- var _classnames2 = _interopRequireDefault(require("classnames"));
13
+ var _classnames3 = _interopRequireDefault(require("classnames"));
14
14
 
15
15
  var _components = require("@alicloudfe/components");
16
16
 
@@ -26,6 +26,8 @@ var _utils2 = require("./utils");
26
26
 
27
27
  var _divider = _interopRequireDefault(require("./divider"));
28
28
 
29
+ var _selectable = _interopRequireDefault(require("./selectable"));
30
+
29
31
  require("./index.scss");
30
32
 
31
33
  var _cardContainer = require("./card-container");
@@ -42,7 +44,7 @@ Object.keys(_cardContainer).forEach(function (key) {
42
44
  });
43
45
  });
44
46
  var _excluded = ["context"],
45
- _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "description", "extra", "actions", "style", "className", "image", "divider", "bordered", "compacted", "centered", "loading", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
47
+ _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "description", "extra", "actions", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
46
48
 
47
49
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
48
50
 
@@ -100,7 +102,7 @@ var getFlexDirectionClassName = function getFlexDirectionClassName(direction, sp
100
102
  };
101
103
 
102
104
  var ProCard = function ProCard(props) {
103
- var _classnames;
105
+ var _classnames, _classnames2;
104
106
 
105
107
  var children = props.children,
106
108
  title = props.title,
@@ -113,11 +115,13 @@ var ProCard = function ProCard(props) {
113
115
  style = props.style,
114
116
  className = props.className,
115
117
  image = props.image,
118
+ hoveredShadow = props.hoveredShadow,
116
119
  divider = props.divider,
117
120
  bordered = props.bordered,
118
121
  compacted = props.compacted,
119
122
  centered = props.centered,
120
123
  loading = props.loading,
124
+ borderColor = props.borderColor,
121
125
  backgroundColor = props.backgroundColor,
122
126
  contentClassName = props.contentClassName,
123
127
  contentStyle = props.contentStyle,
@@ -189,13 +193,12 @@ var ProCard = function ProCard(props) {
189
193
 
190
194
  return /*#__PURE__*/_react.default.createElement("div", {
191
195
  style: _objectSpread(_objectSpread({}, childCardStyle), colStyle),
192
- className: (0, _classnames2.default)(cls('col'), colClassName),
196
+ className: (0, _classnames3.default)(cls('col'), colClassName),
193
197
  key: "pro-card-col-".concat(index)
194
198
  }, /*#__PURE__*/_react.default.cloneElement(element));
195
199
  }
196
200
 
197
201
  if (element === null || element === void 0 ? void 0 : (_element$type2 = element.type) === null || _element$type2 === void 0 ? void 0 : _element$type2.isProCardDivider) {
198
- console.log('isProCardDivider');
199
202
  return /*#__PURE__*/_react.default.cloneElement(element, {
200
203
  style: dividerStyle
201
204
  });
@@ -204,13 +207,12 @@ var ProCard = function ProCard(props) {
204
207
  return element;
205
208
  });
206
209
 
207
- var cardClassName = (0, _classnames2.default)(cls(), className, backgroundColor, {
208
- noBorder: !bordered,
209
- compacted: compacted
210
- });
211
- var cardContentClassName = (0, _classnames2.default)(cls('content'), contentClassName, getFlexDirectionClassName(direction, split), (_classnames = {
210
+ var cardClassName = (0, _classnames3.default)(cls(), className, backgroundColor, (_classnames = {
211
+ 'border-none': !bordered
212
+ }, _defineProperty(_classnames, "border-".concat(borderColor), borderColor), _defineProperty(_classnames, "compacted", compacted), _defineProperty(_classnames, "hoverable", hoveredShadow), _classnames));
213
+ var cardContentClassName = (0, _classnames3.default)(cls('content'), contentClassName, getFlexDirectionClassName(direction, split), (_classnames2 = {
212
214
  'contain-pro-card': containProCard
213
- }, _defineProperty(_classnames, "split-".concat(split), split), _defineProperty(_classnames, 'flex-wrap', wrap), _defineProperty(_classnames, "centered", centered), _classnames));
215
+ }, _defineProperty(_classnames2, "split-".concat(split), split), _defineProperty(_classnames2, 'flex-wrap', wrap), _defineProperty(_classnames2, "centered", centered), _classnames2));
214
216
  var cardContentMargin = containProCard && !split ? {
215
217
  marginRight: -horizonal,
216
218
  marginLeft: -horizonal,
@@ -229,7 +231,7 @@ var ProCard = function ProCard(props) {
229
231
  return /*#__PURE__*/_react.default.createElement("div", {
230
232
  className: cls('title')
231
233
  }, hasCollapse && /*#__PURE__*/_react.default.createElement("div", {
232
- className: (0, _classnames2.default)(cls('title-collapse'), {
234
+ className: (0, _classnames3.default)(cls('title-collapse'), {
233
235
  collapsed: collapseState
234
236
  }),
235
237
  onClick: onCollapseChanged
@@ -280,6 +282,7 @@ ProCard.defaultProps = {
280
282
  direction: 'row'
281
283
  };
282
284
  ProCard.Divider = _divider.default;
285
+ ProCard.Selectable = _selectable.default;
283
286
  ProCard.isProCard = true;
284
287
  var _default = ProCard;
285
288
  exports.default = _default;
@@ -166,8 +166,10 @@
166
166
  }
167
167
  }
168
168
 
169
- &.noBorder {
170
- border: none;
169
+ &.hoverable {
170
+ &:hover {
171
+ box-shadow: var(--shadow-3, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));
172
+ }
171
173
  }
172
174
 
173
175
  &.compacted {
@@ -183,6 +185,54 @@
183
185
  }
184
186
  }
185
187
 
188
+ &.border {
189
+ &-blue {
190
+ border-color: var(--color-notice-5);
191
+ }
192
+
193
+ &-orange {
194
+ border-color: var(--color-warning-5);
195
+ }
196
+
197
+ &-yellow {
198
+ border-color: var(--color-help-5);
199
+ }
200
+
201
+ &-red {
202
+ border-color: var(--color-error-5);
203
+ }
204
+
205
+ &-green {
206
+ border-color: var(--color-success-5);
207
+ }
208
+
209
+ &-grey {
210
+ border-color: var(--color-line1-1);
211
+ }
212
+
213
+ &-transparent {
214
+ border-color: transparent;
215
+ }
216
+
217
+ &-none {
218
+ border: none;
219
+ }
220
+ }
221
+
222
+ &-selectable {
223
+ cursor: pointer;
224
+
225
+ &-icon {
226
+ &-selected {
227
+ color: var(--color-notice-5);
228
+ }
229
+
230
+ &-unselected {
231
+ color: var(--color-line1-1);
232
+ }
233
+ }
234
+ }
235
+
186
236
  &.blue {
187
237
  background-color: var(--color-notice-1);
188
238
  }
@@ -0,0 +1,13 @@
1
+ import { ProCardProps } from './index';
2
+ export interface ProCardSelectableProps extends Omit<ProCardProps, 'onSelect'> {
3
+ selected?: boolean;
4
+ onSelect?: (selected: boolean) => void;
5
+ }
6
+ declare const ProCardSelectable: {
7
+ (props: ProCardSelectableProps): JSX.Element;
8
+ defaultProps: {
9
+ hoveredShadow: boolean;
10
+ };
11
+ isProCard: boolean;
12
+ };
13
+ export default ProCardSelectable;
@@ -0,0 +1,60 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+
8
+ var _react = _interopRequireDefault(require("react"));
9
+
10
+ var _classnames = _interopRequireDefault(require("classnames"));
11
+
12
+ var _icon = _interopRequireDefault(require("@teamix/icon"));
13
+
14
+ var _utils = require("@teamix/utils");
15
+
16
+ var _index = require("./index");
17
+
18
+ var _excluded = ["selected", "onSelect", "className", "onClick"];
19
+
20
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
21
+
22
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
23
+
24
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
25
+
26
+ 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; }
27
+
28
+ function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
29
+
30
+ 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; }
31
+
32
+ var cls = (0, _utils.baseClass)('teamix-pro-card-selectable');
33
+
34
+ var ProCardSelectable = function ProCardSelectable(props) {
35
+ var selected = props.selected,
36
+ onSelect = props.onSelect,
37
+ className = props.className,
38
+ _onClick = props.onClick,
39
+ others = _objectWithoutProperties(props, _excluded);
40
+
41
+ return /*#__PURE__*/_react.default.createElement(_index.ProCard, _objectSpread({
42
+ className: (0, _classnames.default)(cls(), className),
43
+ borderColor: selected ? 'blue' : 'grey',
44
+ extra: /*#__PURE__*/_react.default.createElement(_icon.default, {
45
+ className: cls('icon', selected ? 'icon-selected' : 'icon-unselected'),
46
+ type: selected ? 'success-fill' : 'circle-line'
47
+ }),
48
+ onClick: function onClick(e) {
49
+ _onClick && _onClick(e);
50
+ onSelect && onSelect(!selected);
51
+ }
52
+ }, others));
53
+ };
54
+
55
+ ProCardSelectable.defaultProps = {
56
+ hoveredShadow: true
57
+ };
58
+ ProCardSelectable.isProCard = true;
59
+ var _default = ProCardSelectable;
60
+ exports.default = _default;
@@ -50,8 +50,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
50
50
 
51
51
  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; }
52
52
 
53
- var searchText = (0, _utils.getMessage)('search');
54
-
55
53
  var getEventProps = function getEventProps(triggerType, onFilter) {
56
54
  var keydownEvent = {
57
55
  onSubmit: onFilter
@@ -200,7 +198,8 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
200
198
  onResetValidateSuccess: onReset,
201
199
  style: _objectSpread({}, triggerType === 'submit' ? {} : {
202
200
  marginRight: -16
203
- })
201
+ }),
202
+ children: (0, _utils.getMessage)('reset')
204
203
  }
205
204
  }, {
206
205
  component: 'Submit',
@@ -209,9 +208,9 @@ var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
209
208
  marginRight: -8
210
209
  } : {
211
210
  display: 'none'
212
- })
213
- },
214
- content: searchText
211
+ }),
212
+ children: (0, _utils.getMessage)('search')
213
+ }
215
214
  }]
216
215
  }]
217
216
  }])
@@ -288,3 +288,12 @@
288
288
  cursor: pointer;
289
289
  }
290
290
  }
291
+
292
+ /* hack todo remove */
293
+ .#{$form-item-cls}-control-content-component {
294
+ .teamix-pro-field-tooltip.teamix-pro-field-checkbox {
295
+ .teamix-pro-lable-icon-tip-icon {
296
+ transform: translate(0px, 4px);
297
+ }
298
+ }
299
+ }
package/lib/index.d.ts CHANGED
@@ -21,5 +21,5 @@ export * from './page-container';
21
21
  export * from './page-header';
22
22
  export * from './skeleton';
23
23
  export * from './table';
24
- declare const version = "1.2.5";
24
+ declare const version = "1.2.9";
25
25
  export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };
package/lib/index.js CHANGED
@@ -248,8 +248,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
248
248
  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; }
249
249
 
250
250
  // import ProLayout from './layout';
251
+ // import ProSidebar from './sidebar'
251
252
  // 设置图标源
252
253
  _icon.default.setConfig(_utils.default.getTeamixIconConfig());
253
254
 
254
- var version = '1.2.5';
255
+ // export * from './sidebar';
256
+ var version = '1.2.9';
255
257
  exports.version = version;
@@ -58,8 +58,9 @@ var ProTableInfo = function ProTableInfo(props) {
58
58
  _layout$labelGutter = layout.labelGutter,
59
59
  labelGutter = _layout$labelGutter === void 0 ? '80px' : _layout$labelGutter;
60
60
 
61
- var newColumns = function newColumns() {
62
- return _toConsumableArray(new Array(colNum)).map(function (_, index) {
61
+ var getNewColumns = function getNewColumns() {
62
+ // 需要 fill 填充 否则有可能不执行
63
+ return _toConsumableArray(new Array(colNum)).fill(1).map(function (_, index) {
63
64
  return [{
64
65
  dataIndex: "label_".concat(index),
65
66
  align: 'left',
@@ -104,9 +105,7 @@ var ProTableInfo = function ProTableInfo(props) {
104
105
  var needCol = 1 + ((_columnsItem$colSpan = columnsItem === null || columnsItem === void 0 ? void 0 : columnsItem.colSpan) !== null && _columnsItem$colSpan !== void 0 ? _columnsItem$colSpan : 1); // 如果剩余的col能满足下一组数据那么就放在这一组
105
106
 
106
107
  if (needCol <= col) {
107
- var _columnsItem$colSpan2;
108
-
109
- col = col - 1 - ((_columnsItem$colSpan2 = columnsItem === null || columnsItem === void 0 ? void 0 : columnsItem.colSpan) !== null && _columnsItem$colSpan2 !== void 0 ? _columnsItem$colSpan2 : 1);
108
+ col = col - needCol;
110
109
  filterColumns.push(columnsItem);
111
110
  } else {
112
111
  var _filterColumns$0$colS;
@@ -119,6 +118,11 @@ var ProTableInfo = function ProTableInfo(props) {
119
118
  col = 0;
120
119
  }
121
120
  }
121
+
122
+ if (columnsCopy.length === 0) {
123
+ // 如果剩余仍有列数并且已经没有columns分配了
124
+ col = 0;
125
+ }
122
126
  }
123
127
 
124
128
  var itemData = filterColumns.map(function (item, index) {
@@ -185,7 +189,7 @@ var ProTableInfo = function ProTableInfo(props) {
185
189
  return /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, {
186
190
  className: "teamix-pro-info-table",
187
191
  cellProps: setCellProps,
188
- columns: newColumns(),
192
+ columns: getNewColumns(),
189
193
  hasHeader: false,
190
194
  hasBorder: true,
191
195
  dataSource: newDataSource
@@ -7,9 +7,7 @@ exports.default = void 0;
7
7
  var initialValues = {
8
8
  title: '卡片标题',
9
9
  children: '卡片内容卡片内容卡片内容',
10
- extra: '操作',
11
- bordered: true,
12
- hoveredShadow: true
10
+ extra: '操作'
13
11
  };
14
12
  var schema = [{
15
13
  component: 'FormTab',
@@ -60,10 +58,6 @@ var schema = [{
60
58
  children: [{
61
59
  title: '整体样式',
62
60
  children: [{
63
- name: 'bordered',
64
- title: '边框',
65
- component: 'Switch'
66
- }, {
67
61
  name: 'divider',
68
62
  title: '头部分割线',
69
63
  component: 'Switch'
@@ -78,7 +72,36 @@ var schema = [{
78
72
  label: '蓝色',
79
73
  value: 'blue'
80
74
  }, {
81
- label: '绿生',
75
+ label: '绿色',
76
+ value: 'green'
77
+ }, {
78
+ label: '红色',
79
+ value: 'red'
80
+ }, {
81
+ label: '橙色',
82
+ value: 'orange'
83
+ }, {
84
+ label: '黄色',
85
+ value: 'yellow'
86
+ }, {
87
+ label: '灰色',
88
+ value: 'grey'
89
+ }, {
90
+ label: '透明',
91
+ value: 'transparent'
92
+ }]
93
+ }, {
94
+ name: 'borderColor',
95
+ title: '边框色',
96
+ component: 'Select',
97
+ dataSource: [{
98
+ label: '无边框',
99
+ value: 'none'
100
+ }, {
101
+ label: '蓝色',
102
+ value: 'blue'
103
+ }, {
104
+ label: '绿色',
82
105
  value: 'green'
83
106
  }, {
84
107
  label: '红色',
@@ -0,0 +1,5 @@
1
+ import React from 'react';
2
+ import { ProSidebarContainerProps } from '../../typing';
3
+ import './index.scss';
4
+ declare const ProSidebarContainer: React.FC<ProSidebarContainerProps>;
5
+ export default ProSidebarContainer;