acud 0.0.71 → 0.0.74

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 (63) hide show
  1. package/dist/acud.css +2062 -2008
  2. package/dist/acud.css.map +1 -1
  3. package/dist/acud.js +502 -296
  4. package/dist/acud.js.map +1 -1
  5. package/dist/acud.min.css +1 -1
  6. package/dist/acud.min.css.map +1 -1
  7. package/dist/acud.min.js +6 -6
  8. package/dist/acud.min.js.map +1 -1
  9. package/es/card/Card.js +4 -2
  10. package/es/cascader/index.js +3 -2
  11. package/es/cascader/style/css.js +5 -1
  12. package/es/cascader/style/index.d.ts +4 -0
  13. package/es/cascader/style/index.js +5 -1
  14. package/es/input/AutoComplete.d.ts +12 -0
  15. package/es/input/AutoComplete.js +53 -0
  16. package/es/input/TextArea.d.ts +1 -1
  17. package/es/input/TextArea.js +4 -4
  18. package/es/input/index.d.ts +2 -0
  19. package/es/input/index.js +2 -0
  20. package/es/input/style/index.css +53 -1
  21. package/es/input/style/index.less +63 -1
  22. package/es/modal/style/css.js +3 -1
  23. package/es/modal/style/index.d.ts +1 -0
  24. package/es/modal/style/index.js +3 -1
  25. package/es/progress/CircleProgress.js +3 -2
  26. package/es/progress/LineProgress.js +3 -2
  27. package/es/progress/index.js +3 -1
  28. package/es/progress/interface.d.ts +1 -0
  29. package/es/select/index.d.ts +1 -1
  30. package/es/select/style/css.js +2 -1
  31. package/es/select/style/index.d.ts +1 -0
  32. package/es/select/style/index.js +2 -1
  33. package/es/tree/tree.js +6 -2
  34. package/es/upload/style/index.css +4 -2
  35. package/es/upload/style/index.less +7 -5
  36. package/lib/card/Card.js +4 -2
  37. package/lib/cascader/index.js +4 -2
  38. package/lib/cascader/style/css.js +9 -1
  39. package/lib/cascader/style/index.d.ts +4 -0
  40. package/lib/cascader/style/index.js +9 -1
  41. package/lib/input/AutoComplete.d.ts +12 -0
  42. package/lib/input/AutoComplete.js +72 -0
  43. package/lib/input/TextArea.d.ts +1 -1
  44. package/lib/input/TextArea.js +4 -2
  45. package/lib/input/index.d.ts +2 -0
  46. package/lib/input/index.js +3 -0
  47. package/lib/input/style/index.css +53 -1
  48. package/lib/input/style/index.less +63 -1
  49. package/lib/modal/style/css.js +3 -1
  50. package/lib/modal/style/index.d.ts +1 -0
  51. package/lib/modal/style/index.js +3 -1
  52. package/lib/progress/CircleProgress.js +3 -2
  53. package/lib/progress/LineProgress.js +3 -2
  54. package/lib/progress/index.js +3 -1
  55. package/lib/progress/interface.d.ts +1 -0
  56. package/lib/select/index.d.ts +1 -1
  57. package/lib/select/style/css.js +3 -1
  58. package/lib/select/style/index.d.ts +1 -0
  59. package/lib/select/style/index.js +3 -1
  60. package/lib/tree/tree.js +6 -2
  61. package/lib/upload/style/index.css +4 -2
  62. package/lib/upload/style/index.less +7 -5
  63. package/package.json +1 -1
package/es/card/Card.js CHANGED
@@ -78,7 +78,9 @@ var Card = function Card(_a) {
78
78
  hoverable = _a.hoverable,
79
79
  _a$tabProps = _a.tabProps,
80
80
  tabProps = _a$tabProps === void 0 ? {} : _a$tabProps,
81
- restProps = __rest(_a, ["prefixCls", "simple", "description", "disabled", "footerExtra", "footerStyle", "children", "loading", "headStyle", "bodyStyle", "style", "bordered", "type", "title", "extra", "cover", "actions", "actionsExtra", "multiMedia", "multiMediaPosition", "tabList", "activeTabKey", "defaultActiveTabKey", "tabBarExtraContent", "hoverable", "tabProps"]);
81
+ _a$className = _a.className,
82
+ className = _a$className === void 0 ? '' : _a$className,
83
+ restProps = __rest(_a, ["prefixCls", "simple", "description", "disabled", "footerExtra", "footerStyle", "children", "loading", "headStyle", "bodyStyle", "style", "bordered", "type", "title", "extra", "cover", "actions", "actionsExtra", "multiMedia", "multiMediaPosition", "tabList", "activeTabKey", "defaultActiveTabKey", "tabBarExtraContent", "hoverable", "tabProps", "className"]);
82
84
 
83
85
  var _React$useContext = React.useContext(ConfigContext),
84
86
  getPrefixCls = _React$useContext.getPrefixCls,
@@ -226,7 +228,7 @@ var Card = function Card(_a) {
226
228
  }, multiMedia), /*#__PURE__*/React.createElement("div", {
227
229
  className: "".concat(cardPrefixCls, "-con-wrap ").concat(multiMedia ? "".concat(multiMediaPosition === 'left' ? 'right' : 'left') : '')
228
230
  }, head, coverDom, body, footer, actionRender));
229
- var classString = classNames(cardPrefixCls, (_classNames3 = {}, _defineProperty(_classNames3, "".concat(cardPrefixCls, "-loading"), loading), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-bordered"), bordered), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-hoverable"), hoverable), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-contain-grid"), isContainGrid()), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-contain-tabs"), tabList && tabList.length), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-type-").concat(type), !!type), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-rtl"), direction === 'rtl'), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-simple"), simple), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-selected"), isSelected), _classNames3));
231
+ var classString = classNames(cardPrefixCls, (_classNames3 = {}, _defineProperty(_classNames3, "".concat(cardPrefixCls, "-loading"), loading), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-bordered"), bordered), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-hoverable"), hoverable), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-contain-grid"), isContainGrid()), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-contain-tabs"), tabList && tabList.length), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-type-").concat(type), !!type), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-rtl"), direction === 'rtl'), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-simple"), simple), _defineProperty(_classNames3, "".concat(cardPrefixCls, "-selected"), isSelected), _defineProperty(_classNames3, className, !!className), _classNames3));
230
232
  return /*#__PURE__*/React.createElement("div", {
231
233
  className: classString,
232
234
  disabled: simple && disabled,
@@ -21,6 +21,7 @@ var __rest = this && this.__rest || function (s, e) {
21
21
  };
22
22
 
23
23
  import get from 'lodash/get';
24
+ import map from 'lodash/map';
24
25
  import first from 'lodash/first';
25
26
  import isEqual from 'lodash/isEqual';
26
27
  import React, { useImperativeHandle, forwardRef, useRef, useCallback, useMemo, useState, useEffect, useLayoutEffect, Fragment } from 'react';
@@ -400,7 +401,7 @@ var Cascader = function Cascader(props, ref) {
400
401
  var names = getFilledFieldNames(props);
401
402
 
402
403
  if (isMulti) {
403
- var _selectedOptions = value.map(function (valueItem) {
404
+ var _selectedOptions = map(value, function (valueItem) {
404
405
  return arrayTreeFilter(options, function (o, level) {
405
406
  return o[names.value] === valueItem[level];
406
407
  }, {
@@ -414,7 +415,7 @@ var Cascader = function Cascader(props, ref) {
414
415
  });
415
416
  }) : value;
416
417
 
417
- return _label.map(function (labelItem) {
418
+ return map(_label, function (labelItem) {
418
419
  return displayRender(labelItem, _selectedOptions);
419
420
  });
420
421
  }
@@ -2,4 +2,8 @@ import '../../style/index.css';
2
2
  import './index.css'; // style dependencies
3
3
 
4
4
  import '../../empty/style/css';
5
- import '../../input/style/css';
5
+ import '../../input/style/css';
6
+ import '../../tag/style/css';
7
+ import '../../tooltip/style/css';
8
+ import '../../clear/style/css';
9
+ import '../../checkbox/style/css';
@@ -2,3 +2,7 @@ import '../../style/index.less';
2
2
  import './index.less';
3
3
  import '../../empty/style';
4
4
  import '../../input/style';
5
+ import '../../tag/style';
6
+ import '../../tooltip/style';
7
+ import '../../clear/style';
8
+ import '../../checkbox/style';
@@ -2,4 +2,8 @@ import '../../style/index.less';
2
2
  import './index.less'; // style dependencies
3
3
 
4
4
  import '../../empty/style';
5
- import '../../input/style';
5
+ import '../../input/style';
6
+ import '../../tag/style';
7
+ import '../../tooltip/style';
8
+ import '../../clear/style';
9
+ import '../../checkbox/style';
@@ -0,0 +1,12 @@
1
+ import React from 'react';
2
+ import { InternalSelectProps, SelectInterface } from '../select';
3
+ export interface AutoCompleteProps<ValueType = any> extends Omit<InternalSelectProps<ValueType>, 'inputIcon' | 'loading' | 'mode' | 'optionLabelProp' | 'labelInValue'> {
4
+ }
5
+ declare const RefAutoComplete: (<ValueType = any>(props: AutoCompleteProps<ValueType> & {
6
+ children?: React.ReactNode;
7
+ } & {
8
+ ref?: React.Ref<SelectInterface>;
9
+ }) => React.ReactElement) & {
10
+ Option: import("../select/src/Option").OptionFC;
11
+ };
12
+ export default RefAutoComplete;
@@ -0,0 +1,53 @@
1
+ import _extends from "@babel/runtime/helpers/esm/extends";
2
+ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
3
+ import React from 'react';
4
+ import classNames from 'classnames';
5
+ import Select from '../select';
6
+ import { isValidElement } from '../_util/reactNode';
7
+ import toArray from "rc-util/es/Children/toArray";
8
+ var Option = Select.Option;
9
+
10
+ function isSelectOptionOrSelectOptGroup(child) {
11
+ return child && child.type && (child.type.isSelectOption || child.type.isSelectOptGroup);
12
+ }
13
+
14
+ var AutoComplete = function AutoComplete(props, ref) {
15
+ var _props$prefixCls = props.prefixCls,
16
+ prefixCls = _props$prefixCls === void 0 ? 'acud-select' : _props$prefixCls,
17
+ className = props.className,
18
+ children = props.children;
19
+ var childNodes = toArray(children); // ============================= Input =============================
20
+
21
+ var customizeInput;
22
+
23
+ if (childNodes.length === 1 && isValidElement(childNodes[0]) && !isSelectOptionOrSelectOptGroup(childNodes[0])) {
24
+ var _childNodes = _slicedToArray(childNodes, 1);
25
+
26
+ customizeInput = _childNodes[0];
27
+ }
28
+
29
+ var getInputElement = customizeInput ? function () {
30
+ return customizeInput;
31
+ } : undefined; // ============================ Options ============================
32
+
33
+ var optionChildren;
34
+
35
+ if (childNodes.length && isSelectOptionOrSelectOptGroup(childNodes[0])) {
36
+ optionChildren = children;
37
+ } else {
38
+ optionChildren = [];
39
+ }
40
+
41
+ return /*#__PURE__*/React.createElement(Select, _extends({
42
+ ref: ref
43
+ }, props, {
44
+ prefixCls: prefixCls,
45
+ className: classNames("".concat(prefixCls, "-auto-complete"), className),
46
+ mode: Select.SECRET_COMBOBOX_MODE_DO_NOT_USE,
47
+ getInputElement: getInputElement
48
+ }), optionChildren);
49
+ };
50
+
51
+ var RefAutoComplete = /*#__PURE__*/React.forwardRef(AutoComplete);
52
+ RefAutoComplete.Option = Option;
53
+ export default RefAutoComplete; // export default AutoComplete;
@@ -17,5 +17,5 @@ export interface TextAreaProps {
17
17
  readonly?: boolean;
18
18
  allowClear?: boolean;
19
19
  }
20
- declare const TextArea: React.FC<TextAreaProps>;
20
+ declare const TextArea: React.ForwardRefExoticComponent<TextAreaProps & React.RefAttributes<unknown>>;
21
21
  export default TextArea;
@@ -25,9 +25,9 @@ import classNames from 'classnames';
25
25
  import { MultiToneClear } from 'acud-icon';
26
26
  import React, { useState, useMemo } from 'react';
27
27
  import useMergedState from '../_util/hooks/useMergedState';
28
- import { resolveTargetValue } from './Input';
28
+ import { resolveTargetValue } from './Input'; // const TextArea:React.FC<TextAreaProps> = props => {
29
29
 
30
- var TextArea = function TextArea(props) {
30
+ var TextArea = /*#__PURE__*/React.forwardRef(function (props, ref) {
31
31
  var _classNames;
32
32
 
33
33
  var _props$prefixCls = props.prefixCls,
@@ -135,6 +135,7 @@ var TextArea = function TextArea(props) {
135
135
  className: "".concat(prefixCls, "-outer"),
136
136
  style: style
137
137
  }, /*#__PURE__*/React.createElement(RcTextArea, _extends({}, rest, {
138
+ ref: ref,
138
139
  placeholder: placeholder,
139
140
  className: classNames(classes),
140
141
  onChange: handleOnChange,
@@ -156,6 +157,5 @@ var TextArea = function TextArea(props) {
156
157
  }, /*#__PURE__*/React.createElement("span", {
157
158
  className: classNames(limitClassName, 'limit')
158
159
  }, currentLength, "/", limitLength)));
159
- };
160
-
160
+ });
161
161
  export default TextArea;
@@ -4,11 +4,13 @@ import Label from './Label';
4
4
  import TextArea from './TextArea';
5
5
  import Password from './Password';
6
6
  import MultiSelectInput from './MultiSelectInput';
7
+ import AutoComplete from './AutoComplete';
7
8
  interface CompoundedComponent extends React.ForwardRefExoticComponent<BaseInputProps & React.RefAttributes<HTMLInputElement>> {
8
9
  Label: typeof Label;
9
10
  TextArea: typeof TextArea;
10
11
  Password: typeof Password;
11
12
  MultiSelectInput: typeof MultiSelectInput;
13
+ AutoComplete: typeof AutoComplete;
12
14
  __ACUD_CHECKBOX: boolean;
13
15
  }
14
16
  declare const Input: CompoundedComponent;
package/es/input/index.js CHANGED
@@ -3,9 +3,11 @@ import Label from './Label';
3
3
  import TextArea from './TextArea';
4
4
  import Password from './Password';
5
5
  import MultiSelectInput from './MultiSelectInput';
6
+ import AutoComplete from './AutoComplete';
6
7
  var Input = InputComponent;
7
8
  Input.Label = Label;
8
9
  Input.TextArea = TextArea;
9
10
  Input.Password = Password;
10
11
  Input.MultiSelectInput = MultiSelectInput;
12
+ Input.AutoComplete = AutoComplete;
11
13
  export default Input;
@@ -682,7 +682,6 @@
682
682
  padding-top: 6px;
683
683
  padding-right: 24px;
684
684
  padding-bottom: 24px;
685
- min-height: 100px;
686
685
  border-radius: 4px;
687
686
  font-family: -apple-system, BlinkMacSystemFont, "SF Pro SC", "SF Pro Text", "Helvetica Neue", Helvetica, "PingFang SC", Roboto, 'Arial', 'microsoft yahei ui', "Microsoft YaHei", SimSun, sans-serif;
688
687
  color: #151B26;
@@ -887,3 +886,56 @@
887
886
  .acud-input-select-tags .acud-select-clear {
888
887
  right: 12px;
889
888
  }
889
+ .acud-select-auto-complete .acud-select-selector {
890
+ width: 100%;
891
+ display: flex;
892
+ cursor: text;
893
+ position: relative;
894
+ }
895
+ .acud-select-auto-complete {
896
+ width: 100%;
897
+ display: block;
898
+ }
899
+ .acud-select-auto-complete:not(.acud-select-customize-input) .acud-select-selector {
900
+ position: relative;
901
+ background-color: #fff;
902
+ border-radius: 2px;
903
+ transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
904
+ }
905
+ .acud-select-auto-complete:not(.acud-select-customize-input) .acud-select-selector .acud-select-selection-search .acud-select-selection-search-input {
906
+ cursor: auto;
907
+ margin: 0;
908
+ padding: 0;
909
+ background: 0 0;
910
+ border: none;
911
+ outline: none;
912
+ -webkit-appearance: none;
913
+ -moz-appearance: none;
914
+ appearance: none;
915
+ }
916
+ .acud-select-auto-complete .acud-select-selector {
917
+ width: 100%;
918
+ display: flex;
919
+ cursor: text;
920
+ position: relative;
921
+ }
922
+ .acud-select-auto-complete .acud-select-selector .acud-select-selection-search {
923
+ position: absolute;
924
+ inset: 0 12px;
925
+ z-index: 2;
926
+ }
927
+ .acud-select-auto-complete .acud-select-selector .acud-select-selection-search .acud-select-selection-search-input {
928
+ width: 100%;
929
+ }
930
+ .acud-select-auto-complete .acud-select-selector .acud-select-selection-placeholder {
931
+ flex: 1;
932
+ transition: none;
933
+ pointer-events: none;
934
+ overflow: hidden;
935
+ color: #bfbfbf;
936
+ white-space: nowrap;
937
+ text-overflow: ellipsis;
938
+ padding-left: 12px;
939
+ padding-right: 12px;
940
+ z-index: 1;
941
+ }
@@ -8,6 +8,10 @@
8
8
 
9
9
  @input-password-outer-prefix-cls: ~'@{acud-prefix}-input-password-outer';
10
10
  @input-password-prefix-cls: ~'@{acud-prefix}-input-password';
11
+ @select-auto-complete-prefix-cls: ~'@{acud-prefix}-select-auto-complete';
12
+
13
+ @select-prefix-cls: ~'@{acud-prefix}-select';
14
+
11
15
  // basic logic - line hight, font size
12
16
  // content layer - 只处理文字 Icon, 没有开关config,对应四种交互状态配置
13
17
  // background layer - 背景层 填色、描边、阴影,可以通过开关config配置, 对应四种交互状态
@@ -254,7 +258,7 @@
254
258
  padding-top: 1.5*@padding-xsm;
255
259
  padding-right: 2*@padding-m;
256
260
  padding-bottom: 6*@padding-xsm;
257
- min-height: 100px;
261
+ // min-height: 100px;
258
262
  border-radius: @input-border-lg-radius;
259
263
  font-family: -apple-system, BlinkMacSystemFont, "SF Pro SC", "SF Pro Text", "Helvetica Neue", Helvetica, "PingFang SC", Roboto, 'Arial', 'microsoft yahei ui', "Microsoft YaHei", SimSun, sans-serif;
260
264
  &::-webkit-input-placeholder {
@@ -379,4 +383,62 @@
379
383
  right:12px;
380
384
  }
381
385
  }
386
+ .acud-select-auto-complete{
387
+ .acud-select-selector{
388
+ width:100%;
389
+ display: flex;
390
+ cursor: text;
391
+ position: relative;
392
+ }
393
+ }
394
+ .@{select-auto-complete-prefix-cls}{
395
+ width:100%;
396
+ display: block;
397
+ &:not(.acud-select-customize-input) {
398
+ .acud-select-selector{
399
+ position: relative;
400
+ background-color: #fff;
401
+ border-radius: 2px;
402
+ transition: all .3s cubic-bezier(.645,.045,.355,1);
403
+ .acud-select-selection-search{
404
+ .acud-select-selection-search-input{
405
+ cursor: auto;
406
+ margin: 0;
407
+ padding: 0;
408
+ background: 0 0;
409
+ border: none;
410
+ outline: none;
411
+ appearance: none;
412
+ }
413
+ }
414
+ }
415
+
416
+ }
417
+ .@{select-prefix-cls}-selector{
418
+ width:100%;
419
+ display: flex;
420
+ cursor: text;
421
+ position: relative;
422
+ .@{select-prefix-cls}-selection-search{
423
+ position: absolute;
424
+ inset: 0 12px;
425
+ z-index: 2;
426
+ .@{select-prefix-cls}-selection-search-input{
427
+ width:100%;
428
+ }
429
+ }
430
+ .@{select-prefix-cls}-selection-placeholder{
431
+ flex:1;
432
+ transition: none;
433
+ pointer-events: none;
434
+ overflow: hidden;
435
+ color: #bfbfbf;
436
+ white-space: nowrap;
437
+ text-overflow: ellipsis;
438
+ padding-left: 12px;
439
+ padding-right: 12px;
440
+ z-index: 1;
441
+ }
382
442
 
443
+ }
444
+ }
@@ -1,2 +1,4 @@
1
1
  import '../../style/index.css';
2
- import './index.css';
2
+ import './index.css'; // style dependencies
3
+
4
+ import '../../button/style/css';
@@ -1,2 +1,3 @@
1
1
  import '../../style/index.less';
2
2
  import './index.less';
3
+ import '../../button/style';
@@ -1,2 +1,4 @@
1
1
  import '../../style/index.less';
2
- import './index.less';
2
+ import './index.less'; // style dependencies
3
+
4
+ import '../../button/style';
@@ -18,6 +18,7 @@ var CircleProgress = function CircleProgress(_ref) {
18
18
  status = _ref.status,
19
19
  size = _ref.size,
20
20
  strokeColor = _ref.strokeColor,
21
+ iconStrokeColor = _ref.iconStrokeColor,
21
22
  _ref$infoType = _ref.infoType,
22
23
  infoType = _ref$infoType === void 0 ? 'text' : _ref$infoType,
23
24
  trailColor = _ref.trailColor,
@@ -82,13 +83,13 @@ var CircleProgress = function CircleProgress(_ref) {
82
83
  ProgressLabel = /*#__PURE__*/React.createElement(OutlinedCheck, {
83
84
  className: labelClassNames,
84
85
  width: iconWidth,
85
- fill: strokeColor
86
+ fill: iconStrokeColor
86
87
  });
87
88
  } else if (status === 'error') {
88
89
  ProgressLabel = /*#__PURE__*/React.createElement(OutlinedClose, {
89
90
  className: labelClassNames,
90
91
  width: iconWidth,
91
- fill: strokeColor
92
+ fill: iconStrokeColor
92
93
  });
93
94
  }
94
95
  }
@@ -19,6 +19,7 @@ var LineProgress = function LineProgress(_ref) {
19
19
  status = _ref.status,
20
20
  size = _ref.size,
21
21
  strokeColor = _ref.strokeColor,
22
+ iconStrokeColor = _ref.iconStrokeColor,
22
23
  _ref$infoType = _ref.infoType,
23
24
  infoType = _ref$infoType === void 0 ? 'text' : _ref$infoType,
24
25
  trailColor = _ref.trailColor,
@@ -70,13 +71,13 @@ var LineProgress = function LineProgress(_ref) {
70
71
  if (status === 'success') {
71
72
  ProgressLabel = /*#__PURE__*/React.createElement(MultiToneSuccess, {
72
73
  className: labelClassNames,
73
- color: strokeColor,
74
+ color: iconStrokeColor,
74
75
  width: "16px"
75
76
  });
76
77
  } else if (status === 'error') {
77
78
  ProgressLabel = /*#__PURE__*/React.createElement(MultiToneError, {
78
79
  className: labelClassNames,
79
- color: strokeColor,
80
+ color: iconStrokeColor,
80
81
  width: "16px"
81
82
  });
82
83
  }
@@ -54,7 +54,8 @@ var Progress = function Progress(_a) {
54
54
 
55
55
  var status = customizeStatus in statusColorMap ? customizeStatus : 'active'; // strokeColor取值异常时,将使用status对应的颜色
56
56
 
57
- var strokeColor = isHexColor(customizeStrokeColor) ? customizeStrokeColor : statusColorMap[status]; // 解构进度100时的样式
57
+ var strokeColor = isHexColor(customizeStrokeColor) ? customizeStrokeColor : '';
58
+ var iconStrokeColor = strokeColor || statusColorMap[status]; // 解构进度100时的样式
58
59
 
59
60
  var successStrokeColor = successStyle.strokeColor,
60
61
  successTextColor = successStyle.textColor,
@@ -75,6 +76,7 @@ var Progress = function Progress(_a) {
75
76
  size: size,
76
77
  status: status,
77
78
  strokeColor: strokeColor,
79
+ iconStrokeColor: iconStrokeColor,
78
80
  textColor: textColor,
79
81
  textSize: textSize,
80
82
  labelText: labelText,
@@ -25,6 +25,7 @@ export interface ProgressProps {
25
25
  strokeWidth?: number;
26
26
  strokeRatio?: number;
27
27
  strokeColor?: string;
28
+ iconStrokeColor?: string;
28
29
  strokeLinecap?: ProgressStrokeLinecap;
29
30
  trailColor?: string;
30
31
  textColor?: string;
@@ -29,7 +29,7 @@ declare const SelectRef: <VT extends SelectValue = SelectValue>(props: SelectPro
29
29
  ref?: React.Ref<RefSelectProps>;
30
30
  }) => React.ReactElement;
31
31
  declare type InternalSelectType = typeof SelectRef;
32
- interface SelectInterface extends InternalSelectType {
32
+ export interface SelectInterface extends InternalSelectType {
33
33
  SECRET_COMBOBOX_MODE_DO_NOT_USE: string;
34
34
  Option: typeof Option;
35
35
  OptGroup: typeof OptGroup;
@@ -1,4 +1,5 @@
1
1
  import '../../style/index.css';
2
2
  import './index.css'; // style dependencies
3
3
 
4
- import '../../empty/style/css';
4
+ import '../../empty/style/css';
5
+ import '../../checkbox/style/css';
@@ -1,3 +1,4 @@
1
1
  import '../../style/index.less';
2
2
  import './index.less';
3
3
  import '../../empty/style';
4
+ import '../../checkbox/style';
@@ -1,4 +1,5 @@
1
1
  import '../../style/index.less';
2
2
  import './index.less'; // style dependencies
3
3
 
4
- import '../../empty/style';
4
+ import '../../empty/style';
5
+ import '../../checkbox/style';
package/es/tree/tree.js CHANGED
@@ -352,6 +352,11 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
352
352
 
353
353
  if (treeDataOrigin) {
354
354
  newProps.treeData = formatedTreeData;
355
+ } // expandedKeys和defaultExpandAll冲突需动态赋值
356
+
357
+
358
+ if (expandedKeys.length) {
359
+ newProps.expandedKeys = expandedKeys;
355
360
  }
356
361
 
357
362
  useEffect(function () {
@@ -362,7 +367,7 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
362
367
  return /*#__PURE__*/React.createElement(React.Fragment, null, searchable && /*#__PURE__*/React.createElement(Input, {
363
368
  className: "".concat(prefixCls, "-search-input"),
364
369
  onChange: onSearchInputChange
365
- }), !expandedKeys.length && searchText ? "\u672A\u627E\u5230\u4E0E".concat(searchText, "\u76F8\u5173\u7684\u7ED3\u679C") : /*#__PURE__*/React.createElement(RcTree, _extends({
370
+ }), !expandedKeys.length && searchText ? "\u672A\u627E\u5230\u4E0E".concat(searchText, "\u76F8\u5173\u7684\u7ED3\u679C") : (!treeDataOrigin || !!formatedTreeData.length) && /*#__PURE__*/React.createElement(RcTree, _extends({
366
371
  ref: treeRef
367
372
  }, newProps, {
368
373
  className: classes,
@@ -373,7 +378,6 @@ var Tree = /*#__PURE__*/React.forwardRef(function (props, ref) {
373
378
  checkable: checkable ? /*#__PURE__*/React.createElement("span", {
374
379
  className: "".concat(prefixCls, "-checkbox-inner")
375
380
  }) : checkable,
376
- expandedKeys: expandedKeys,
377
381
  autoExpandParent: autoExpandParent,
378
382
  switcherIcon: function switcherIcon(nodeProps) {
379
383
  return renderSwitcherIcon(prefixCls, nodeProps);
@@ -130,7 +130,7 @@
130
130
  border-color: #144BCC;
131
131
  }
132
132
  .acud-upload.acud-upload-drag.acud-upload-disabled {
133
- background: #fafafa;
133
+ background: #F7F7F9;
134
134
  cursor: not-allowed;
135
135
  }
136
136
  .acud-upload.acud-upload-drag .acud-upload-btn {
@@ -546,9 +546,11 @@
546
546
  .acud-upload-list-picture-card .acud-upload-list-item-progress {
547
547
  position: absolute;
548
548
  top: 44px;
549
+ left: 50%;
549
550
  padding-left: 8px;
550
551
  padding-right: 8px;
551
- width: 100%;
552
+ width: 96px;
553
+ transform: translateX(-50%);
552
554
  }
553
555
  .acud-upload-list-text-container,
554
556
  .acud-upload-list-picture-container {
@@ -104,7 +104,7 @@
104
104
  }
105
105
  }
106
106
  &.@{upload-prefix-cls}-disabled {
107
- background: @background-color-light;
107
+ background: @G10;
108
108
  cursor: not-allowed;
109
109
  }
110
110
 
@@ -540,10 +540,12 @@
540
540
 
541
541
  .@{upload-item}-progress {
542
542
  position: absolute;
543
- top: 44px;
544
- padding-left: 8px;
545
- padding-right: 8px;
546
- width: 100%;
543
+ top: 11 * @P;
544
+ left: 50%;
545
+ padding-left: 2 * @P;
546
+ padding-right: 2 * @P;
547
+ width: 24 * @P;
548
+ transform: translateX(-50%);
547
549
  }
548
550
  }
549
551
 
package/lib/card/Card.js CHANGED
@@ -105,7 +105,9 @@ var Card = function Card(_a) {
105
105
  hoverable = _a.hoverable,
106
106
  _a$tabProps = _a.tabProps,
107
107
  tabProps = _a$tabProps === void 0 ? {} : _a$tabProps,
108
- restProps = __rest(_a, ["prefixCls", "simple", "description", "disabled", "footerExtra", "footerStyle", "children", "loading", "headStyle", "bodyStyle", "style", "bordered", "type", "title", "extra", "cover", "actions", "actionsExtra", "multiMedia", "multiMediaPosition", "tabList", "activeTabKey", "defaultActiveTabKey", "tabBarExtraContent", "hoverable", "tabProps"]);
108
+ _a$className = _a.className,
109
+ className = _a$className === void 0 ? '' : _a$className,
110
+ restProps = __rest(_a, ["prefixCls", "simple", "description", "disabled", "footerExtra", "footerStyle", "children", "loading", "headStyle", "bodyStyle", "style", "bordered", "type", "title", "extra", "cover", "actions", "actionsExtra", "multiMedia", "multiMediaPosition", "tabList", "activeTabKey", "defaultActiveTabKey", "tabBarExtraContent", "hoverable", "tabProps", "className"]);
109
111
 
110
112
  var _React$useContext = _react["default"].useContext(_configProvider.ConfigContext),
111
113
  getPrefixCls = _React$useContext.getPrefixCls,
@@ -258,7 +260,7 @@ var Card = function Card(_a) {
258
260
  className: "".concat(cardPrefixCls, "-con-wrap ").concat(multiMedia ? "".concat(multiMediaPosition === 'left' ? 'right' : 'left') : '')
259
261
  }, head, coverDom, body, footer, actionRender));
260
262
 
261
- var classString = (0, _classnames["default"])(cardPrefixCls, (_classNames3 = {}, (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-loading"), loading), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-bordered"), bordered), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-hoverable"), hoverable), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-contain-grid"), isContainGrid()), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-contain-tabs"), tabList && tabList.length), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-type-").concat(type), !!type), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-rtl"), direction === 'rtl'), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-simple"), simple), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-selected"), isSelected), _classNames3));
263
+ var classString = (0, _classnames["default"])(cardPrefixCls, (_classNames3 = {}, (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-loading"), loading), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-bordered"), bordered), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-hoverable"), hoverable), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-contain-grid"), isContainGrid()), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-contain-tabs"), tabList && tabList.length), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-type-").concat(type), !!type), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-rtl"), direction === 'rtl'), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-simple"), simple), (0, _defineProperty2["default"])(_classNames3, "".concat(cardPrefixCls, "-selected"), isSelected), (0, _defineProperty2["default"])(_classNames3, className, !!className), _classNames3));
262
264
  return /*#__PURE__*/_react["default"].createElement("div", {
263
265
  className: classString,
264
266
  disabled: simple && disabled,
@@ -19,6 +19,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
19
19
 
20
20
  var _get = _interopRequireDefault(require("lodash/get"));
21
21
 
22
+ var _map = _interopRequireDefault(require("lodash/map"));
23
+
22
24
  var _first = _interopRequireDefault(require("lodash/first"));
23
25
 
24
26
  var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
@@ -444,7 +446,7 @@ var Cascader = function Cascader(props, ref) {
444
446
  var names = getFilledFieldNames(props);
445
447
 
446
448
  if (isMulti) {
447
- var _selectedOptions = value.map(function (valueItem) {
449
+ var _selectedOptions = (0, _map["default"])(value, function (valueItem) {
448
450
  return (0, _arrayTreeFilter["default"])(options, function (o, level) {
449
451
  return o[names.value] === valueItem[level];
450
452
  }, {
@@ -458,7 +460,7 @@ var Cascader = function Cascader(props, ref) {
458
460
  });
459
461
  }) : value;
460
462
 
461
- return _label.map(function (labelItem) {
463
+ return (0, _map["default"])(_label, function (labelItem) {
462
464
  return displayRender(labelItem, _selectedOptions);
463
465
  });
464
466
  }
@@ -6,4 +6,12 @@ require("./index.css");
6
6
 
7
7
  require("../../empty/style/css");
8
8
 
9
- require("../../input/style/css");
9
+ require("../../input/style/css");
10
+
11
+ require("../../tag/style/css");
12
+
13
+ require("../../tooltip/style/css");
14
+
15
+ require("../../clear/style/css");
16
+
17
+ require("../../checkbox/style/css");
@@ -2,3 +2,7 @@ import '../../style/index.less';
2
2
  import './index.less';
3
3
  import '../../empty/style';
4
4
  import '../../input/style';
5
+ import '../../tag/style';
6
+ import '../../tooltip/style';
7
+ import '../../clear/style';
8
+ import '../../checkbox/style';