fan-standard-comp 4.0.5 → 4.0.7

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 (69) hide show
  1. package/dist/fan-standard-comp.min.css +1 -1
  2. package/dist/fan-standard-comp.min.js +1 -1
  3. package/es/ButtonGroup/index.d.ts +2 -0
  4. package/es/ButtonGroup/index.js +31 -18
  5. package/es/ButtonGroup/styles/index.js +9 -1
  6. package/es/DragContent/index.js +1 -1
  7. package/es/DragContent/index.less +2 -3
  8. package/es/FormComp/RenderItemGroup/index.d.ts +1 -0
  9. package/es/FormComp/RenderItemGroup/index.js +11 -9
  10. package/es/StandardContent/ContentHeader.d.ts +9 -0
  11. package/es/StandardContent/ContentHeader.js +79 -0
  12. package/es/StandardContent/SubfieldContent.d.ts +2 -0
  13. package/es/StandardContent/SubfieldContent.js +47 -20
  14. package/es/StandardContent/WrapperContent.d.ts +2 -0
  15. package/es/StandardContent/WrapperContent.js +52 -17
  16. package/es/StandardContent/styles/Header.d.ts +6 -0
  17. package/es/StandardContent/styles/Header.js +33 -0
  18. package/es/StandardContent/styles/Subfield.js +22 -4
  19. package/es/StandardContent/styles/Wrapper.js +7 -3
  20. package/es/StandardContent/styles/index.less +11 -11
  21. package/es/StandardFilter/index.js +43 -8
  22. package/es/StandardForm/StepForm.js +7 -1
  23. package/es/StandardForm/style/index.less +1 -1
  24. package/es/StandardModal/style/index.js +5 -4
  25. package/es/StandardModal/style/index.less +5 -5
  26. package/es/StandardTable/index.js +9 -9
  27. package/es/StandardTable/style/index.js +1 -1
  28. package/es/components/IconNode/index.d.ts +1 -0
  29. package/es/components/IconNode/index.js +6 -3
  30. package/es/data/general.config.d.ts +64 -0
  31. package/es/data/general.config.js +64 -0
  32. package/es/theme/index.js +4 -4
  33. package/es/utils/index.d.ts +1 -0
  34. package/es/utils/index.js +3 -1
  35. package/es/utils/regExp.js +111 -0
  36. package/lib/ButtonGroup/index.d.ts +2 -0
  37. package/lib/ButtonGroup/index.js +31 -18
  38. package/lib/ButtonGroup/styles/index.js +9 -1
  39. package/lib/DragContent/index.js +1 -1
  40. package/lib/DragContent/index.less +2 -3
  41. package/lib/FormComp/RenderItemGroup/index.d.ts +1 -0
  42. package/lib/FormComp/RenderItemGroup/index.js +11 -9
  43. package/lib/StandardContent/ContentHeader.d.ts +9 -0
  44. package/lib/StandardContent/ContentHeader.js +89 -0
  45. package/lib/StandardContent/SubfieldContent.d.ts +2 -0
  46. package/lib/StandardContent/SubfieldContent.js +49 -20
  47. package/lib/StandardContent/WrapperContent.d.ts +2 -0
  48. package/lib/StandardContent/WrapperContent.js +54 -17
  49. package/lib/StandardContent/styles/Header.d.ts +6 -0
  50. package/lib/StandardContent/styles/Header.js +39 -0
  51. package/lib/StandardContent/styles/Subfield.js +22 -4
  52. package/lib/StandardContent/styles/Wrapper.js +7 -3
  53. package/lib/StandardContent/styles/index.less +11 -11
  54. package/lib/StandardFilter/index.js +43 -8
  55. package/lib/StandardForm/StepForm.js +7 -1
  56. package/lib/StandardForm/style/index.less +1 -1
  57. package/lib/StandardModal/style/index.js +5 -4
  58. package/lib/StandardModal/style/index.less +5 -5
  59. package/lib/StandardTable/index.js +9 -9
  60. package/lib/StandardTable/style/index.js +1 -1
  61. package/lib/components/IconNode/index.d.ts +1 -0
  62. package/lib/components/IconNode/index.js +6 -3
  63. package/lib/data/general.config.d.ts +64 -0
  64. package/lib/data/general.config.js +64 -0
  65. package/lib/theme/index.js +4 -4
  66. package/lib/utils/index.d.ts +1 -0
  67. package/lib/utils/index.js +11 -0
  68. package/lib/utils/regExp.js +116 -0
  69. package/package.json +1 -1
@@ -15,15 +15,33 @@ var SubfieldContentStyleFunc = function SubfieldContentStyleFunc(prefix) {
15
15
  return createStyleHook(prefix, function (token) {
16
16
  var prefixCls = ".".concat(prefix);
17
17
  // console.log(' new TinyColor(token.colorPrimary).setAlpha(0.1)' ,new TinyColor(token.colorPrimary).setAlpha(0.1).toRgbString(), )
18
- return [_defineProperty({}, prefixCls, {
18
+ return [_defineProperty({}, prefixCls, _objectSpread(_objectSpread({}, scrollBar(token)), {}, {
19
+ '.spec-grid-content-header + .spec-grid-content-body': {
20
+ // height: `calc(100% - 60px)`
21
+ },
22
+ '.spec-grid-content-body': {
23
+ display: 'flex',
24
+ position: 'relative',
25
+ height: '100%'
26
+ },
27
+ '.spec-grid-left-cont': _objectSpread({
28
+ width: '100%',
29
+ height: '100%',
30
+ overflow: 'auto'
31
+ }, scrollBar(token)),
19
32
  '& .spec-grid-left': _objectSpread({
33
+ height: '100%',
34
+ // overflow: 'hidden',
35
+ overflow: 'auto',
20
36
  padding: token.paddingMD,
21
- background: token.colorBgBase
37
+ background: token.colorBgBase,
38
+ boxSizing: 'border-box'
22
39
  }, scrollBar(token)),
23
40
  '& .spec-grid-right': _objectSpread({
24
- padding: token.paddingMD
41
+ padding: 0,
42
+ marginLeft: token.marginMD
25
43
  }, scrollBar(token))
26
- })];
44
+ }))];
27
45
  }, prepareComponentToken // 当前组件扩展的变量
28
46
  );
29
47
  };
@@ -1,8 +1,11 @@
1
1
  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
2
4
  function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
3
5
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
4
6
  function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
5
7
  import { createStyleHook } from "../../theme/utils/genStyleHook";
8
+ import { scrollBar } from "../../theme/index";
6
9
  var WrapperContentStyleFunc = function WrapperContentStyleFunc(prefix) {
7
10
  var prepareComponentToken = function prepareComponentToken(token) {
8
11
  return {
@@ -11,17 +14,18 @@ var WrapperContentStyleFunc = function WrapperContentStyleFunc(prefix) {
11
14
  };
12
15
  return createStyleHook(prefix, function (token) {
13
16
  var prefixCls = ".".concat(prefix);
14
- return [_defineProperty({}, prefixCls, {
17
+ return [_defineProperty(_defineProperty(_defineProperty({}, prefixCls, _objectSpread(_objectSpread({
15
18
  position: 'relative',
16
19
  padding: token.paddingMD,
17
20
  background: token.colorBgLayout,
18
21
  height: '100%',
19
- overflow: 'auto',
22
+ overflow: 'auto'
23
+ }, scrollBar(token)), {}, {
20
24
  '& .light-block': {
21
25
  padding: token.paddingMD,
22
26
  background: token.colorBgBase
23
27
  }
24
- })];
28
+ })), '.spec-wrapper-content-header', {}), '.spec-wrapper-content-body', {})];
25
29
  }, prepareComponentToken // 当前组件扩展的变量
26
30
  );
27
31
  };
@@ -19,10 +19,10 @@
19
19
  //background: @background-color-base;
20
20
  height: 100%;
21
21
  overflow: auto;
22
- box-sizing: border-box;
22
+ //box-sizing: border-box;
23
23
 
24
24
  & * {
25
- box-sizing: border-box;
25
+ //box-sizing: border-box;
26
26
  }
27
27
 
28
28
  & .light-block {
@@ -34,21 +34,21 @@
34
34
 
35
35
  .spec-grid-content {
36
36
  position: relative;
37
- display: flex;
37
+ // display: flex;
38
38
  //height: calc(100vh - @layout-header-height);
39
- height: 100%;
39
+ //height: 100%;
40
40
  background: transparent; // @background-color-base;
41
- box-sizing: border-box;
42
-
43
- & * {
44
- box-sizing: border-box;
45
- }
41
+ //box-sizing: border-box;
42
+ //
43
+ //& * {
44
+ // box-sizing: border-box;
45
+ //}
46
46
  .spec-grid-left {
47
47
  //height: calc(100vh - @layout-header-height);
48
- height: 100%;
48
+ //height: 100%;
49
49
  //padding: @padding-md @padding-sm;
50
50
  //background: @layout-body-background;
51
- overflow-y: auto;
51
+ //overflow-y: auto;
52
52
  //.scroll-bar();
53
53
  .ant-tree-list,
54
54
  .ant-tree {
@@ -74,10 +74,14 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
74
74
  _useState4 = _slicedToArray(_useState3, 2),
75
75
  isHideCount = _useState4[0],
76
76
  setIsHideCount = _useState4[1]; // 表单隐藏项数量值
77
- var _useState5 = useState(false),
77
+ var _useState5 = useState(0),
78
78
  _useState6 = _slicedToArray(_useState5, 2),
79
- collapsed = _useState6[0],
80
- setCollapsed = _useState6[1];
79
+ additionalCount = _useState6[0],
80
+ setAdditionalCount = _useState6[1]; // 根据表单项配置dipslay或者colSpan,额外需要计算在内的栅格占用
81
+ var _useState7 = useState(false),
82
+ _useState8 = _slicedToArray(_useState7, 2),
83
+ collapsed = _useState8[0],
84
+ setCollapsed = _useState8[1];
81
85
  var componentName = 'spec-standard-filter';
82
86
  var _useStyle = useStyle(componentName),
83
87
  _useStyle2 = _slicedToArray(_useStyle, 2),
@@ -117,10 +121,40 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
117
121
  // 计算表单隐藏项(开启展开与收缩)
118
122
  var calculateHideCount = function calculateHideCount(filterFormRef, groups) {
119
123
  var _filterFormRef$curren;
124
+ var itemGroupSize = columnNumberAndSize.itemGroupSize,
125
+ columnNumber = columnNumberAndSize.columnNumber;
120
126
  var formValues = filterFormRef === null || filterFormRef === void 0 || (_filterFormRef$curren = filterFormRef.current) === null || _filterFormRef$curren === void 0 ? void 0 : _filterFormRef$curren.getFieldValue();
121
- setIsHideCount((groups || []).filter(function (item) {
127
+ // Rule1: 不包括isHidden跟isHide的数据
128
+ // Rule2:剩余的表单项中,查找是否有自定义配置 display='block' 或者colSpan的表单项
129
+ var notShowGroupItem = (groups || []).filter(function (item) {
122
130
  return (item === null || item === void 0 ? void 0 : item.isHidden) || (item.hasOwnProperty('isHide') ? item.isHide(_objectSpread({}, formValues), filterFormRef) : false);
123
- }).length);
131
+ });
132
+ // 可显示的表单值
133
+ var showGroupItem = (groups || []).filter(function (item) {
134
+ return !(item !== null && item !== void 0 && item.isHidden || (item.hasOwnProperty('isHide') ? item.isHide(_objectSpread({}, formValues), filterFormRef) : false));
135
+ });
136
+ var showGroupWithSetting = showGroupItem.filter(function (item) {
137
+ return item.hasOwnProperty('colSpan');
138
+ });
139
+ var resultCount = notShowGroupItem.length;
140
+ var aCount = 0; // 需要再次额外新增的数量
141
+ if (showGroupWithSetting.length > 0) {
142
+ showGroupWithSetting.forEach(function (gItem) {
143
+ // colSpan 优先级更高
144
+ if (gItem.hasOwnProperty('colSpan')) {
145
+ // console.log('有配置了colSpan, 占用栅格数量', gItem.colSpan / (24 / columnNumber), '需要再额外减1', gItem.colSpan / (24 / columnNumber) - 1, Math.ceil(gItem.colSpan / (24 / columnNumber) - 1))
146
+ aCount += Math.ceil(gItem.colSpan / (24 / columnNumber) - 1); // 额外占用了
147
+ return;
148
+ }
149
+ // if (gItem.hasOwnProperty('display') && gItem.display === 'block' ) {
150
+ // // TODO.计算会有问题
151
+ // console.log('有配置了display=block', Math.ceil(24 / (24 / columnNumber) - 1))
152
+ // aCount += columnNumber -1 // Math.ceil(24 / (24 / columnNumber) - 1) // 额外占用了
153
+ // }
154
+ });
155
+ }
156
+ setAdditionalCount(aCount);
157
+ setIsHideCount(resultCount - aCount);
124
158
  };
125
159
 
126
160
  // 配置筛选按钮(确认与取消)
@@ -145,8 +179,8 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
145
179
  filedName: 'filterAction',
146
180
  display: {
147
181
  wrapperCol: {
148
- // 占用的格子数按对应size配置的formItem(未配置折叠展开时,在md情况下需要额外再新增1)
149
- span: general.modalSize[itemGroupSize].formLayout.labelCol.span + general.modalSize[itemGroupSize].formLayout.wrapperCol.span + (!collapseable && itemGroupSize === 'md' ? 1 : 0)
182
+ // 占用的格子数按对应size配置的formItem,如果是md则单独使用筛选的栅格配置
183
+ span: itemGroupSize === 'md' || itemGroupSize === 'lg' || itemGroupSize === 'xlg' ? general.modalSize[itemGroupSize].filterFormLayout.labelCol.span + general.modalSize[itemGroupSize].filterFormLayout.wrapperCol.span : general.modalSize[itemGroupSize].formLayout.labelCol.span + general.modalSize[itemGroupSize].formLayout.wrapperCol.span
150
184
  }
151
185
  },
152
186
  style: {
@@ -337,7 +371,8 @@ var StandardFilter = /*#__PURE__*/React.forwardRef(function (props, ref) {
337
371
  layout: filterFormLayout,
338
372
  form: filterFormRef,
339
373
  collapseable: collapseable,
340
- collapsed: collapsed
374
+ collapsed: collapsed,
375
+ parentNode: 'standardFilter'
341
376
  // displayLayout={{labelCol: { span: 8 }, wrapperCol: { span: 16 },}}
342
377
  ,
343
378
  doUpdateFormFields: function doUpdateFormFields() {
@@ -1,4 +1,5 @@
1
1
  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
2
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
2
3
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
3
4
  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."); }
4
5
  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); }
@@ -215,7 +216,12 @@ var StepForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
215
216
  onFinishFailed: function onFinishFailed() {
216
217
  // setFieldFailed(true)
217
218
  }
218
- }, /*#__PURE__*/React.createElement(Steps, stepsConfig, formItemGroup.filter(function (fItem) {
219
+ }, /*#__PURE__*/React.createElement(Steps, _extends({
220
+ style: {
221
+ width: '80%',
222
+ margin: '0 auto'
223
+ }
224
+ }, stepsConfig), formItemGroup.filter(function (fItem) {
219
225
  return !fItem.hideStep;
220
226
  }).map(function (item, index) {
221
227
  return /*#__PURE__*/React.createElement(Step, {
@@ -32,7 +32,7 @@
32
32
 
33
33
  > label {
34
34
  //min-height: @input-height-base;
35
- height: auto;
35
+ //height: auto;
36
36
 
37
37
  &.ant-form-item-required {
38
38
  padding-left: 8px;
@@ -14,15 +14,14 @@ var StandardPanelStyleFunc = function StandardPanelStyleFunc(prefix) {
14
14
  };
15
15
  return createStyleHook(prefix, function (token) {
16
16
  var prefixCls = ".".concat(prefix);
17
- console.log('token', token);
18
- return [_defineProperty(_defineProperty(_defineProperty({}, prefixCls, {
17
+ return [_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, prefixCls, {
19
18
  '.ant-modal-body ': _objectSpread(_objectSpread({}, scrollBar(token)), {}, {
20
19
  padding: "".concat(token.paddingXS, "px 0")
21
20
  }),
22
21
  '&.ant-modal .ant-modal-footer .ant-btn + .ant-btn': {
23
22
  marginInlineStart: token.marginXS
24
23
  },
25
- '.modalForm': {
24
+ '.spec-standard-form': {
26
25
  '&.ant-form-horizontal .ant-form-item-label': {
27
26
  '> label': {
28
27
  minHeight: token.controlHeight + 'px'
@@ -41,7 +40,9 @@ var StandardPanelStyleFunc = function StandardPanelStyleFunc(prefix) {
41
40
  '&:before': {
42
41
  borderLeft: " 4px solid ".concat(token.colorPrimary)
43
42
  }
44
- }), '.modalPanelTitle, .modal-grid-title', {
43
+ }), '.modalPanelTitle', {}), '.modalPanelTitle, .modal-grid-title', {
44
+ height: token.controlHeight + 'px',
45
+ lineHeight: token.controlHeight + 'px',
45
46
  margin: "0 0 ".concat(token.margin, "px 0"),
46
47
  paddingBottom: token.paddingXS,
47
48
  borderBottom: "1px solid ".concat(token.colorBorder)
@@ -20,7 +20,7 @@
20
20
  white-space: inherit;
21
21
  > label {
22
22
  //min-height: @input-height-base;
23
- height: auto;
23
+ //height: auto;
24
24
  &.ant-form-item-required::before {
25
25
  margin-right: 2px;
26
26
  }
@@ -30,13 +30,13 @@
30
30
  }
31
31
 
32
32
  .modalPanelTitle {
33
- height: 32px;
33
+ //height: 32px;
34
34
  //margin: 0 0 @padding-md 0;
35
35
  //padding-bottom: @padding-xs;
36
36
  //color: @text-color;
37
37
  //font-size: @font-size-base + 1;
38
38
  font-weight: bold;
39
- line-height: 32px;
39
+ //line-height: 32px;
40
40
  //border-bottom: 1px solid @border-color-base;
41
41
  }
42
42
  .ant-form-item.form-item-view-only {
@@ -50,14 +50,14 @@
50
50
  }
51
51
  .modalGridTitle,
52
52
  .modal-grid-title{
53
- height: 32px;
53
+ //height: 32px;
54
54
  //margin: 0 0 @padding-md 0;
55
55
  //padding-bottom: @padding-xs;
56
56
  //padding-left: @padding-xs;
57
57
  //color: @text-color;
58
58
  //font-size: @font-size-base + 1;
59
59
  //font-weight: bold;
60
- line-height: 32px;
60
+ //line-height: 32px;
61
61
  position: relative;
62
62
  &.modalPanelTitle {
63
63
  border-bottom: 0;
@@ -102,9 +102,9 @@ var StandardTable = function StandardTable(props) {
102
102
  if (typeof buttonGroup === 'function') recombinationGroup = buttonGroup(text, record, rowIndex); // 方法返回数组结构
103
103
  // 判断是否是数组且长度大于0时 ?{如下结构渲染} : {按buttonGroup返回的node渲染}
104
104
  if (Array.isArray(buttonGroup) || typeof buttonGroup === 'function') {
105
- var _colItem4, _colItem5;
105
+ var _colItem4, _colItem5, _colItem6;
106
106
  if (recombinationGroup.length === 0) return '-';
107
- return /*#__PURE__*/React.createElement(ButtonGroup, {
107
+ return /*#__PURE__*/React.createElement(ButtonGroup, _extends({
108
108
  type: "text",
109
109
  min: colItem.min || 2 // 配置按钮展示最少数量,其他的将会被折叠
110
110
  ,
@@ -115,11 +115,12 @@ var StandardTable = function StandardTable(props) {
115
115
  text: text,
116
116
  record: record,
117
117
  rowIndex: rowIndex
118
- },
119
- dropdownConfig: colItem.buttonGroupConfig || {},
118
+ }
119
+ // dropdownConfig={colItem.buttonGroupConfig || {}}
120
+ ,
120
121
  moreText: (_colItem4 = colItem) === null || _colItem4 === void 0 ? void 0 : _colItem4.moreText,
121
122
  moreIcon: (_colItem5 = colItem) === null || _colItem5 === void 0 ? void 0 : _colItem5.moreIcon
122
- });
123
+ }, ((_colItem6 = colItem) === null || _colItem6 === void 0 ? void 0 : _colItem6.buttonGroupConfig) || {}));
123
124
  } else {
124
125
  return buttonGroup;
125
126
  }
@@ -148,13 +149,12 @@ var StandardTable = function StandardTable(props) {
148
149
  batchButtonGroup = exProps.batchButtonGroup;
149
150
  // 只有配置rowSelection才显示对应的批量按钮组
150
151
  var list = _.unionBy(rowSelection && (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.type) !== 'radio' && (batchButtonGroup || []), buttonGroup || []);
151
- return /*#__PURE__*/React.createElement(ButtonGroup, {
152
+ return /*#__PURE__*/React.createElement(ButtonGroup, _extends({
152
153
  options: list,
153
154
  min: min,
154
155
  codes: codes,
155
- permissionCodes: permissionCodes,
156
- dropdownConfig: buttonGroupConfig
157
- });
156
+ permissionCodes: permissionCodes
157
+ }, buttonGroupConfig));
158
158
  };
159
159
  return wrapSSR( /*#__PURE__*/React.createElement(Card, {
160
160
  className: classNames(componentName, 'standard-table', className, hashId),
@@ -78,7 +78,7 @@ var StandardTableStyleFunc = function StandardTableStyleFunc(prefix) {
78
78
  'table': {
79
79
  fontSize: token.fontSize,
80
80
  '> .ant-table-thead > tr > th': {
81
- fontSize: token.fontSizeLG
81
+ fontSize: token.fontSize
82
82
  },
83
83
  '.ant-table-thead > tr > th': {
84
84
  padding: "12px ".concat(token.paddingMD, "px"),
@@ -11,6 +11,7 @@ import React from "react";
11
11
  */
12
12
  interface IconNodeProps {
13
13
  icon?: string | string[] | React.ReactNode;
14
+ style?: any;
14
15
  }
15
16
  declare const IconNode: (props: IconNodeProps) => React.JSX.Element | null;
16
17
  export default IconNode;
@@ -13,21 +13,24 @@ import React from "react";
13
13
  */
14
14
 
15
15
  var IconNode = function IconNode(props) {
16
- var icon = props.icon;
16
+ var icon = props.icon,
17
+ style = props.style;
17
18
  if (!icon) return null;
18
19
  if (typeof icon === 'string') {
19
20
  var iconArr = icon.split(',');
20
21
  return /*#__PURE__*/React.createElement(SpecIcon, {
21
22
  prefix: iconArr.length > 1 ? iconArr[0] : 'speci',
22
23
  noPrefix: !iconArr[0] || iconArr[0] === 'noPrefix',
23
- name: iconArr.length > 1 ? iconArr[1] : icon
24
+ name: iconArr.length > 1 ? iconArr[1] : icon,
25
+ style: style
24
26
  });
25
27
  }
26
28
  if (Array.isArray(icon) && icon.length > 1) {
27
29
  // @ts-ignore
28
30
  return /*#__PURE__*/React.createElement(SpecIcon, {
29
31
  prefix: icon[0],
30
- name: icon[1]
32
+ name: icon[1],
33
+ style: style
31
34
  }); // 预留 Array ['speci','plus']
32
35
  }
33
36
  return /*#__PURE__*/React.createElement(React.Fragment, null, icon);
@@ -105,6 +105,22 @@ declare const _default: {
105
105
  span: number;
106
106
  };
107
107
  };
108
+ filterFormLayout: {
109
+ labelCol: {
110
+ span: number;
111
+ };
112
+ wrapperCol: {
113
+ span: number;
114
+ };
115
+ };
116
+ filterFormBlockLayout: {
117
+ labelCol: {
118
+ span: number;
119
+ };
120
+ wrapperCol: {
121
+ span: number;
122
+ };
123
+ };
108
124
  };
109
125
  md: {
110
126
  columnNumber: number;
@@ -125,6 +141,22 @@ declare const _default: {
125
141
  span: number;
126
142
  };
127
143
  };
144
+ filterFormLayout: {
145
+ labelCol: {
146
+ span: number;
147
+ };
148
+ wrapperCol: {
149
+ span: number;
150
+ };
151
+ };
152
+ filterFormBlockLayout: {
153
+ labelCol: {
154
+ span: number;
155
+ };
156
+ wrapperCol: {
157
+ span: number;
158
+ };
159
+ };
128
160
  };
129
161
  lg: {
130
162
  columnNumber: number;
@@ -145,6 +177,22 @@ declare const _default: {
145
177
  span: number;
146
178
  };
147
179
  };
180
+ filterFormLayout: {
181
+ labelCol: {
182
+ span: number;
183
+ };
184
+ wrapperCol: {
185
+ span: number;
186
+ };
187
+ };
188
+ filterFormBlockLayout: {
189
+ labelCol: {
190
+ span: number;
191
+ };
192
+ wrapperCol: {
193
+ span: number;
194
+ };
195
+ };
148
196
  };
149
197
  xlg: {
150
198
  columnNumber: number;
@@ -165,6 +213,22 @@ declare const _default: {
165
213
  span: number;
166
214
  };
167
215
  };
216
+ filterFormLayout: {
217
+ labelCol: {
218
+ span: number;
219
+ };
220
+ wrapperCol: {
221
+ span: number;
222
+ };
223
+ };
224
+ filterFormBlockLayout: {
225
+ labelCol: {
226
+ span: number;
227
+ };
228
+ wrapperCol: {
229
+ span: number;
230
+ };
231
+ };
168
232
  };
169
233
  xxlg: {
170
234
  columnNumber: number;
@@ -111,6 +111,22 @@ export default {
111
111
  wrapperCol: {
112
112
  span: 15
113
113
  }
114
+ },
115
+ filterFormLayout: {
116
+ labelCol: {
117
+ span: 7
118
+ },
119
+ wrapperCol: {
120
+ span: 15
121
+ }
122
+ },
123
+ filterFormBlockLayout: {
124
+ labelCol: {
125
+ span: 7
126
+ },
127
+ wrapperCol: {
128
+ span: 15
129
+ }
114
130
  }
115
131
  },
116
132
  md: {
@@ -132,6 +148,22 @@ export default {
132
148
  wrapperCol: {
133
149
  span: 19
134
150
  }
151
+ },
152
+ filterFormLayout: {
153
+ labelCol: {
154
+ span: 8
155
+ },
156
+ wrapperCol: {
157
+ span: 16
158
+ }
159
+ },
160
+ filterFormBlockLayout: {
161
+ labelCol: {
162
+ span: 4
163
+ },
164
+ wrapperCol: {
165
+ span: 20
166
+ }
135
167
  }
136
168
  },
137
169
  // 宽度大,1000px下
@@ -154,6 +186,22 @@ export default {
154
186
  wrapperCol: {
155
187
  span: 21
156
188
  }
189
+ },
190
+ filterFormLayout: {
191
+ labelCol: {
192
+ span: 8
193
+ },
194
+ wrapperCol: {
195
+ span: 16
196
+ }
197
+ },
198
+ filterFormBlockLayout: {
199
+ labelCol: {
200
+ span: 4
201
+ },
202
+ wrapperCol: {
203
+ span: 20
204
+ }
157
205
  }
158
206
  },
159
207
  // 超级宽度大,1200px下
@@ -176,6 +224,22 @@ export default {
176
224
  wrapperCol: {
177
225
  span: 21
178
226
  }
227
+ },
228
+ filterFormLayout: {
229
+ labelCol: {
230
+ span: 8
231
+ },
232
+ wrapperCol: {
233
+ span: 16
234
+ }
235
+ },
236
+ filterFormBlockLayout: {
237
+ labelCol: {
238
+ span: 4
239
+ },
240
+ wrapperCol: {
241
+ span: 20
242
+ }
179
243
  }
180
244
  },
181
245
  xxlg: {
package/es/theme/index.js CHANGED
@@ -7,8 +7,8 @@ export var scrollBar = function scrollBar(token) {
7
7
  return _defineProperty(_defineProperty(_defineProperty({}, '&::-webkit-scrollbar-track-piece', {
8
8
  background: new TinyColor('#c1c1c1').setAlpha(0.02).toRgbString() // new TinyColor(token.colorPrimary).setAlpha(0.1)
9
9
  }), '&::-webkit-scrollbar', {
10
- width: '6px',
11
- height: '6px'
10
+ width: '8px',
11
+ height: '8px'
12
12
  }), '&::-webkit-scrollbar-thumb', {
13
13
  background: new TinyColor('#c1c1c1').setAlpha(0.5).toRgbString(),
14
14
  // new TinyColor(token.colorPrimary).setAlpha(0.5),
@@ -19,8 +19,8 @@ export var scrollBarPrimary = function scrollBarPrimary(token) {
19
19
  return _defineProperty(_defineProperty(_defineProperty({}, '&::-webkit-scrollbar-track-piece', {
20
20
  background: new TinyColor(token.colorPrimary).setAlpha(0.1).toRgbString() // new TinyColor(token.colorPrimary).setAlpha(0.1)
21
21
  }), '&::-webkit-scrollbar', {
22
- width: '6px',
23
- height: '6px'
22
+ width: '8px',
23
+ height: '8px'
24
24
  }), '&::-webkit-scrollbar-thumb', {
25
25
  background: new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString(),
26
26
  // new TinyColor(token.colorPrimary).setAlpha(0.5),
@@ -3,3 +3,4 @@ export * from './ValueFormat';
3
3
  export * from './dictSelectUtil';
4
4
  export * from './transferFile';
5
5
  export * from './urlUtils';
6
+ export * from './regExp';
package/es/utils/index.js CHANGED
@@ -2,4 +2,6 @@ export * from "./getParentNodes";
2
2
  export * from "./ValueFormat";
3
3
  export * from "./dictSelectUtil";
4
4
  export * from "./transferFile";
5
- export * from "./urlUtils";
5
+ export * from "./urlUtils";
6
+ // @ts-ignore
7
+ export * from "./regExp";