acud 1.0.13 → 1.0.16
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.
- package/CHANGELOG.md +119 -0
- package/dist/acud.css +19 -12
- package/dist/acud.css.map +1 -1
- package/dist/acud.js +71 -26
- package/dist/acud.js.map +1 -1
- package/dist/acud.min.css +1 -1
- package/dist/acud.min.css.map +1 -1
- package/dist/acud.min.js +3 -3
- package/dist/acud.min.js.map +1 -1
- package/es/input/Input.js +1 -1
- package/es/input/MultiSelectInput.js +2 -1
- package/es/input/TextArea.d.ts +1 -0
- package/es/input/TextArea.js +9 -3
- package/es/input/style/index.css +10 -1
- package/es/input/style/index.less +10 -1
- package/es/modal/style/index.css +2 -2
- package/es/select/style/index.css +1 -0
- package/es/select/style/multiple.less +1 -0
- package/es/style/themes/dark/components/modal.less +2 -2
- package/es/style/themes/default/components/modal.less +2 -2
- package/es/table/Space.js +13 -2
- package/es/table/style/base.less +1 -1
- package/es/table/style/index.css +5 -8
- package/es/table/style/index.less +5 -5
- package/es/tabs/src/TabNavList/TabNode.js +1 -1
- package/es/tabs/src/TabPanelList/index.js +1 -1
- package/es/toast/base.js +8 -1
- package/es/toast/index.js +32 -13
- package/lib/input/Input.js +1 -1
- package/lib/input/MultiSelectInput.js +2 -1
- package/lib/input/TextArea.d.ts +1 -0
- package/lib/input/TextArea.js +9 -3
- package/lib/input/style/index.css +10 -1
- package/lib/input/style/index.less +10 -1
- package/lib/modal/style/index.css +2 -2
- package/lib/select/style/index.css +1 -0
- package/lib/select/style/multiple.less +1 -0
- package/lib/style/themes/dark/components/modal.less +2 -2
- package/lib/style/themes/default/components/modal.less +2 -2
- package/lib/table/Space.js +14 -2
- package/lib/table/style/base.less +1 -1
- package/lib/table/style/index.css +5 -8
- package/lib/table/style/index.less +5 -5
- package/lib/tabs/src/TabNavList/TabNode.js +1 -1
- package/lib/tabs/src/TabPanelList/index.js +1 -1
- package/lib/toast/base.js +8 -1
- package/lib/toast/index.js +33 -14
- package/package.json +1 -1
package/es/input/Input.js
CHANGED
|
@@ -188,7 +188,7 @@ var Input = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
188
188
|
};
|
|
189
189
|
|
|
190
190
|
var hoverClear = function hoverClear() {
|
|
191
|
-
setClearIconColor('#
|
|
191
|
+
setClearIconColor('#84868C');
|
|
192
192
|
};
|
|
193
193
|
|
|
194
194
|
var clearMouseLeave = function clearMouseLeave() {
|
|
@@ -23,7 +23,8 @@ var MultiSelectInput = function MultiSelectInput(props) {
|
|
|
23
23
|
placeholder: placeholder,
|
|
24
24
|
defaultValue: defaultValue,
|
|
25
25
|
onChange: handleOnChange,
|
|
26
|
-
className: "acud-input-select-tags"
|
|
26
|
+
className: "acud-input-select-tags",
|
|
27
|
+
dropdownClassName: "acud-input-select-tags"
|
|
27
28
|
}, options);
|
|
28
29
|
};
|
|
29
30
|
|
package/es/input/TextArea.d.ts
CHANGED
package/es/input/TextArea.js
CHANGED
|
@@ -35,6 +35,8 @@ var TextArea = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
35
35
|
_props$placeholder = props.placeholder,
|
|
36
36
|
placeholder = _props$placeholder === void 0 ? '请输入内容' : _props$placeholder,
|
|
37
37
|
className = props.className,
|
|
38
|
+
style = props.style,
|
|
39
|
+
width = props.width,
|
|
38
40
|
limitLength = props.limitLength,
|
|
39
41
|
readonly = props.readonly,
|
|
40
42
|
autoSize = props.autoSize,
|
|
@@ -44,7 +46,7 @@ var TextArea = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
44
46
|
onBlur = props.onBlur,
|
|
45
47
|
_props$allowClear = props.allowClear,
|
|
46
48
|
allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
|
|
47
|
-
rest = __rest(props, ["prefixCls", "placeholder", "className", "limitLength", "readonly", "autoSize", "onPressEnter", "onKeyDown", "onFocus", "onBlur", "allowClear"]);
|
|
49
|
+
rest = __rest(props, ["prefixCls", "placeholder", "className", "style", "width", "limitLength", "readonly", "autoSize", "onPressEnter", "onKeyDown", "onFocus", "onBlur", "allowClear"]);
|
|
48
50
|
|
|
49
51
|
var _useMergedState = useMergedState(props.defaultValue, {
|
|
50
52
|
value: props.value
|
|
@@ -121,7 +123,7 @@ var TextArea = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
121
123
|
setClearIconColor('#D4D6D9');
|
|
122
124
|
};
|
|
123
125
|
|
|
124
|
-
var classes = classNames(prefixCls, (_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-autosize"), autoSize), _defineProperty(_classNames, "".concat(prefixCls, "-readonly"), readonly), _defineProperty(_classNames, "".concat(prefixCls, "-span-focus"), focusClass), _defineProperty(_classNames, "".concat(prefixCls, "-limit"), currentLength > limitLength), _defineProperty(_classNames, "".concat(prefixCls, "-no-limit"), !!limitLength), _defineProperty(_classNames, "".concat(prefixCls, "-no-clear"), !allowClear), _classNames)
|
|
126
|
+
var classes = classNames(prefixCls, (_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-autosize"), autoSize), _defineProperty(_classNames, "".concat(prefixCls, "-readonly"), readonly), _defineProperty(_classNames, "".concat(prefixCls, "-span-focus"), focusClass), _defineProperty(_classNames, "".concat(prefixCls, "-limit"), currentLength > limitLength), _defineProperty(_classNames, "".concat(prefixCls, "-no-limit"), !!limitLength), _defineProperty(_classNames, "".concat(prefixCls, "-no-clear"), !allowClear), _classNames));
|
|
125
127
|
var limitClassName = classNames(_defineProperty({}, "".concat(prefixCls, "-warning"), currentLength > limitLength));
|
|
126
128
|
|
|
127
129
|
var clearContent = function clearContent(e) {
|
|
@@ -131,9 +133,13 @@ var TextArea = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
131
133
|
};
|
|
132
134
|
|
|
133
135
|
return /*#__PURE__*/React.createElement("div", {
|
|
134
|
-
className: "".concat(prefixCls, "-outer")
|
|
136
|
+
className: classNames("".concat(prefixCls, "-outer"), className),
|
|
137
|
+
style: {
|
|
138
|
+
width: width
|
|
139
|
+
}
|
|
135
140
|
}, /*#__PURE__*/React.createElement(RcTextArea, _extends({}, rest, {
|
|
136
141
|
ref: ref,
|
|
142
|
+
style: style,
|
|
137
143
|
placeholder: placeholder,
|
|
138
144
|
className: classNames(classes),
|
|
139
145
|
onChange: handleOnChange,
|
package/es/input/style/index.css
CHANGED
|
@@ -655,7 +655,6 @@
|
|
|
655
655
|
}
|
|
656
656
|
.acud-input-textarea-outer {
|
|
657
657
|
width: 100%;
|
|
658
|
-
min-width: 100%;
|
|
659
658
|
max-width: 100%;
|
|
660
659
|
display: flex;
|
|
661
660
|
flex-direction: column;
|
|
@@ -682,6 +681,7 @@
|
|
|
682
681
|
padding-top: 6px;
|
|
683
682
|
padding-right: 24px;
|
|
684
683
|
padding-bottom: 24px;
|
|
684
|
+
border: 1px solid;
|
|
685
685
|
border-radius: 4px;
|
|
686
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;
|
|
687
687
|
color: #151B26;
|
|
@@ -886,6 +886,15 @@
|
|
|
886
886
|
.acud-input-select-tags .acud-select-clear {
|
|
887
887
|
right: 12px;
|
|
888
888
|
}
|
|
889
|
+
.acud-input-select-tags .acud-select-item-checkall {
|
|
890
|
+
display: none !important;
|
|
891
|
+
}
|
|
892
|
+
.acud-input-select-tags .acud-checkbox-wrapper {
|
|
893
|
+
display: none !important;
|
|
894
|
+
}
|
|
895
|
+
.acud-input-select-tags .acud-select-item-option-selected:not(.acud-select-item-option-input-disabled) {
|
|
896
|
+
color: #2468F2 !important;
|
|
897
|
+
}
|
|
889
898
|
.acud-select-auto-complete .acud-select-selector {
|
|
890
899
|
width: 100%;
|
|
891
900
|
display: flex;
|
|
@@ -228,7 +228,6 @@
|
|
|
228
228
|
|
|
229
229
|
.@{input-textarea-outer-prefix-cls}{
|
|
230
230
|
width: 100%;
|
|
231
|
-
min-width: 100%;
|
|
232
231
|
max-width: 100%;
|
|
233
232
|
display: flex;
|
|
234
233
|
flex-direction: column;
|
|
@@ -259,6 +258,7 @@
|
|
|
259
258
|
padding-right: 2*@padding-m;
|
|
260
259
|
padding-bottom: 6*@padding-xsm;
|
|
261
260
|
// min-height: 100px;
|
|
261
|
+
border: 1px solid;
|
|
262
262
|
border-radius: @input-border-lg-radius;
|
|
263
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;
|
|
264
264
|
&::-webkit-input-placeholder {
|
|
@@ -382,6 +382,15 @@
|
|
|
382
382
|
.@{acud-prefix}-select-clear{
|
|
383
383
|
right:12px;
|
|
384
384
|
}
|
|
385
|
+
.@{select-prefix-cls}-item-checkall {
|
|
386
|
+
display: none !important;
|
|
387
|
+
}
|
|
388
|
+
.acud-checkbox-wrapper {
|
|
389
|
+
display: none !important;
|
|
390
|
+
}
|
|
391
|
+
.@{select-prefix-cls}-item-option-selected:not(.acud-select-item-option-input-disabled) {
|
|
392
|
+
color: #2468F2 !important;
|
|
393
|
+
}
|
|
385
394
|
}
|
|
386
395
|
.@{acud-prefix}-select-auto-complete{
|
|
387
396
|
.@{acud-prefix}-select-selector{
|
package/es/modal/style/index.css
CHANGED
|
@@ -143,7 +143,7 @@
|
|
|
143
143
|
font-weight: 900;
|
|
144
144
|
}
|
|
145
145
|
.acud-modal-title {
|
|
146
|
-
font-size:
|
|
146
|
+
font-size: 16px;
|
|
147
147
|
line-height: 22px;
|
|
148
148
|
padding-right: 12px;
|
|
149
149
|
word-wrap: break-word;
|
|
@@ -171,7 +171,7 @@
|
|
|
171
171
|
margin: 0;
|
|
172
172
|
}
|
|
173
173
|
.acud-modal-footer .acud-btn + .acud-btn {
|
|
174
|
-
margin-left:
|
|
174
|
+
margin-left: 12px;
|
|
175
175
|
}
|
|
176
176
|
.acud-modal-dialogbox {
|
|
177
177
|
width: 400px;
|
|
@@ -114,6 +114,7 @@
|
|
|
114
114
|
// It's ok not to do this, but 24px makes bottom narrow in view should adjust
|
|
115
115
|
&-content {
|
|
116
116
|
display: inline-block;
|
|
117
|
+
max-width: 95px;
|
|
117
118
|
margin-right: (@padding-xs / 2);
|
|
118
119
|
overflow: hidden;
|
|
119
120
|
white-space: pre; // fix whitespace wrapping. custom tags display all whitespace within.
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
@modal-heading-height: 10*@P;
|
|
33
33
|
@modal-heading-bg-color: @G10;
|
|
34
34
|
@modal-heading-padding: 0 6*@P;
|
|
35
|
-
@modal-heading-font-size: @
|
|
35
|
+
@modal-heading-font-size: @T4;
|
|
36
36
|
@modal-heading-color: @G2;
|
|
37
37
|
|
|
38
38
|
// Close
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
|
|
49
49
|
// Footer
|
|
50
50
|
@modal-footer-padding: 0 8*@P 6*@P;
|
|
51
|
-
@modal-footer-btn-space:
|
|
51
|
+
@modal-footer-btn-space: 3*@P;
|
|
52
52
|
@modal-footer-bg-color: @G11;
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
@modal-heading-height: 22px;
|
|
33
33
|
@modal-heading-bg-color: @G10;
|
|
34
34
|
@modal-heading-padding: 6*@P 6*@P 0;
|
|
35
|
-
@modal-heading-font-size: @
|
|
35
|
+
@modal-heading-font-size: @T4;
|
|
36
36
|
@modal-heading-font-weight: 500;
|
|
37
37
|
@modal-heading-color: @G2;
|
|
38
38
|
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
|
|
52
52
|
// Footer
|
|
53
53
|
@modal-footer-padding: 0 6*@P 6*@P;
|
|
54
|
-
@modal-footer-btn-space:
|
|
54
|
+
@modal-footer-btn-space: 3*@P;
|
|
55
55
|
@modal-footer-bg-color: @G11;
|
package/es/table/Space.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
+
import toArray from "rc-util/es/Children/toArray";
|
|
2
3
|
import useFlexGapSupport from '../_util/hooks/useFlexGapSupport';
|
|
3
4
|
|
|
4
5
|
var Space = function Space(props) {
|
|
@@ -9,9 +10,19 @@ var Space = function Space(props) {
|
|
|
9
10
|
children = props.children;
|
|
10
11
|
var supportFlexGap = useFlexGapSupport();
|
|
11
12
|
var spaceStyle = {};
|
|
13
|
+
var childrenMap = children;
|
|
12
14
|
|
|
13
15
|
if (!supportFlexGap) {
|
|
14
|
-
|
|
16
|
+
var childNodes = toArray(children, {
|
|
17
|
+
keepEmpty: true
|
|
18
|
+
});
|
|
19
|
+
childrenMap = childNodes.map(function (child, index) {
|
|
20
|
+
return /*#__PURE__*/React.createElement("span", {
|
|
21
|
+
style: {
|
|
22
|
+
marginRight: index === childNodes.length - 1 ? 0 : space
|
|
23
|
+
}
|
|
24
|
+
}, child);
|
|
25
|
+
});
|
|
15
26
|
}
|
|
16
27
|
|
|
17
28
|
if (supportFlexGap) {
|
|
@@ -21,7 +32,7 @@ var Space = function Space(props) {
|
|
|
21
32
|
return /*#__PURE__*/React.createElement("div", {
|
|
22
33
|
className: prefixCls,
|
|
23
34
|
style: spaceStyle
|
|
24
|
-
},
|
|
35
|
+
}, childrenMap);
|
|
25
36
|
};
|
|
26
37
|
|
|
27
38
|
export default Space;
|
package/es/table/style/base.less
CHANGED
package/es/table/style/index.css
CHANGED
|
@@ -280,9 +280,6 @@ div.acud-table-summary {
|
|
|
280
280
|
cursor: pointer;
|
|
281
281
|
transition: all 0.3s;
|
|
282
282
|
}
|
|
283
|
-
.acud-table-thead th.acud-table-column-has-sorters:hover {
|
|
284
|
-
background: rgba(0, 0, 0, 0.04);
|
|
285
|
-
}
|
|
286
283
|
.acud-table-thead th.acud-table-column-has-sorters:hover::before {
|
|
287
284
|
background-color: transparent !important;
|
|
288
285
|
}
|
|
@@ -473,12 +470,12 @@ table tr th.acud-table-selection-column::after {
|
|
|
473
470
|
display: flex;
|
|
474
471
|
}
|
|
475
472
|
.acud-table-selection-extra .acudicon {
|
|
476
|
-
color: #
|
|
477
|
-
font-size:
|
|
473
|
+
color: #84868C;
|
|
474
|
+
font-size: 16px;
|
|
478
475
|
display: flex;
|
|
479
476
|
}
|
|
480
477
|
.acud-table-selection-extra .acudicon:hover {
|
|
481
|
-
color: #
|
|
478
|
+
color: #84868C;
|
|
482
479
|
}
|
|
483
480
|
.acud-table-expand-icon-col {
|
|
484
481
|
width: 28px;
|
|
@@ -494,7 +491,7 @@ table tr th.acud-table-selection-column::after {
|
|
|
494
491
|
color: #84868C;
|
|
495
492
|
cursor: pointer;
|
|
496
493
|
font-size: 16px;
|
|
497
|
-
line-height:
|
|
494
|
+
line-height: 0;
|
|
498
495
|
float: left;
|
|
499
496
|
margin: auto;
|
|
500
497
|
}
|
|
@@ -785,7 +782,7 @@ tr.acud-table-expanded-row .acud-descriptions-view table {
|
|
|
785
782
|
cursor: not-allowed;
|
|
786
783
|
}
|
|
787
784
|
.acud-table-cell-with-append .acud-table-row-expand-icon {
|
|
788
|
-
margin:
|
|
785
|
+
margin: 2px 12px 2px 0;
|
|
789
786
|
}
|
|
790
787
|
.acud-table-cell.acud-table-row-expand-icon-cell {
|
|
791
788
|
width: 16px;
|
|
@@ -303,7 +303,7 @@
|
|
|
303
303
|
transition: all 0.3s;
|
|
304
304
|
|
|
305
305
|
&:hover {
|
|
306
|
-
background: @table-header-sort-active-bg;
|
|
306
|
+
// background: @table-header-sort-active-bg;
|
|
307
307
|
|
|
308
308
|
&::before {
|
|
309
309
|
background-color: transparent !important;
|
|
@@ -565,12 +565,12 @@
|
|
|
565
565
|
}
|
|
566
566
|
|
|
567
567
|
.@{iconfont-css-prefix} {
|
|
568
|
-
color: @
|
|
569
|
-
font-size:
|
|
568
|
+
color: @G5;
|
|
569
|
+
font-size: @P * 4;
|
|
570
570
|
display: flex;
|
|
571
571
|
|
|
572
572
|
&:hover {
|
|
573
|
-
color: @
|
|
573
|
+
color: @G5;
|
|
574
574
|
}
|
|
575
575
|
}
|
|
576
576
|
}
|
|
@@ -594,7 +594,7 @@
|
|
|
594
594
|
.basic-tp-config(@table-row-expand-icon-tp);
|
|
595
595
|
cursor: pointer;
|
|
596
596
|
font-size: @P * 4;
|
|
597
|
-
line-height:
|
|
597
|
+
line-height: 0;
|
|
598
598
|
float: left;
|
|
599
599
|
margin: auto;
|
|
600
600
|
|
|
@@ -30,7 +30,7 @@ export default function TabPanelList(_ref) {
|
|
|
30
30
|
tabKey: tab.key,
|
|
31
31
|
id: id,
|
|
32
32
|
animated: tabPaneAnimated,
|
|
33
|
-
active: tab.key === activeKey && tabs.length >
|
|
33
|
+
active: tab.key === activeKey && tabs.length > 0,
|
|
34
34
|
destroyInactiveTabPane: destroyInactiveTabPane
|
|
35
35
|
});
|
|
36
36
|
})));
|
package/es/toast/base.js
CHANGED
|
@@ -252,11 +252,18 @@ function getRCNoticeProps(args, prefixCls) {
|
|
|
252
252
|
}
|
|
253
253
|
|
|
254
254
|
function notice(args) {
|
|
255
|
+
var key = args.key;
|
|
255
256
|
getNotificationInstance(args, function (_ref) {
|
|
256
257
|
var prefixCls = _ref.prefixCls,
|
|
257
258
|
instance = _ref.instance;
|
|
258
259
|
instance.notice(getRCNoticeProps(args, prefixCls));
|
|
259
|
-
});
|
|
260
|
+
}); // 增加返回的清除函数
|
|
261
|
+
|
|
262
|
+
var result = function result() {
|
|
263
|
+
api.close(key);
|
|
264
|
+
};
|
|
265
|
+
|
|
266
|
+
return result;
|
|
260
267
|
}
|
|
261
268
|
|
|
262
269
|
var api = {
|
package/es/toast/index.js
CHANGED
|
@@ -15,7 +15,7 @@ var _globalConfig = globalConfig(),
|
|
|
15
15
|
getPrefixCls = _globalConfig.getPrefixCls;
|
|
16
16
|
|
|
17
17
|
var PREFIX = 'notification-hastime';
|
|
18
|
-
var
|
|
18
|
+
var maxToastArrLength = 4; // 最多显示多少个toast
|
|
19
19
|
|
|
20
20
|
/**
|
|
21
21
|
* 代理对象
|
|
@@ -23,7 +23,8 @@ var MAXTOASTARRLENGTN = 4; // 最多显示多少个toast
|
|
|
23
23
|
*/
|
|
24
24
|
|
|
25
25
|
var target = {};
|
|
26
|
-
var toastArr = []; //
|
|
26
|
+
var toastArr = []; // const paramIgnoreFun = ['close', 'destroy'];
|
|
27
|
+
// 向数组尾部添加一个元素
|
|
27
28
|
|
|
28
29
|
function addToastKey(key) {
|
|
29
30
|
toastArr.push(key);
|
|
@@ -65,6 +66,7 @@ function ToastDom(props) {
|
|
|
65
66
|
useEffect(function () {
|
|
66
67
|
if (counter !== undefined) {
|
|
67
68
|
if (counter > 0) {
|
|
69
|
+
// clearTimeout(timerID);
|
|
68
70
|
var timer = setTimeout(function () {
|
|
69
71
|
setCounter(counter - 1);
|
|
70
72
|
}, 1000);
|
|
@@ -83,7 +85,12 @@ function ToastDom(props) {
|
|
|
83
85
|
// if (timerID) {
|
|
84
86
|
setTimerID(null); // }
|
|
85
87
|
};
|
|
86
|
-
}, [counter]);
|
|
88
|
+
}, [counter]); // useEffect(() => {
|
|
89
|
+
// return () => {
|
|
90
|
+
// clearTimeout(timerID);
|
|
91
|
+
// }
|
|
92
|
+
// }, []);
|
|
93
|
+
|
|
87
94
|
return /*#__PURE__*/React.createElement("div", {
|
|
88
95
|
className: prefixCls
|
|
89
96
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -102,15 +109,12 @@ function DescriptionDom(props) {
|
|
|
102
109
|
|
|
103
110
|
var handler = {
|
|
104
111
|
get: function get() {
|
|
105
|
-
var name = arguments.length <= 1 ? undefined : arguments[1];
|
|
106
|
-
|
|
112
|
+
var name = arguments.length <= 1 ? undefined : arguments[1]; // 关闭、删除提示可以根据用户传参直接调用,避免key错赋值
|
|
113
|
+
// if (paramIgnoreFun.includes(name)) {
|
|
114
|
+
// return props => Reflect.get(NotificationApi, name)(props);
|
|
115
|
+
// }
|
|
107
116
|
|
|
108
|
-
|
|
109
|
-
addToastKey(key);
|
|
110
|
-
} else {
|
|
111
|
-
NotificationApi.close(unshiftToast());
|
|
112
|
-
addToastKey(key);
|
|
113
|
-
}
|
|
117
|
+
var key = new Date().getTime() + ''; // 通过key来强制关闭notification
|
|
114
118
|
|
|
115
119
|
return function (props) {
|
|
116
120
|
// 定义默认图标
|
|
@@ -121,7 +125,22 @@ var handler = {
|
|
|
121
125
|
var args = _extends(_extends({
|
|
122
126
|
key: key,
|
|
123
127
|
type: 'info'
|
|
124
|
-
}, iconProps), props); //
|
|
128
|
+
}, iconProps), props); // 设置最大显示数
|
|
129
|
+
|
|
130
|
+
|
|
131
|
+
if (name === 'config' && props.maxCount) {
|
|
132
|
+
maxToastArrLength = props.maxCount;
|
|
133
|
+
} // key相同时不重新渲染
|
|
134
|
+
|
|
135
|
+
|
|
136
|
+
if (!~toastArr.indexOf(args.key)) {
|
|
137
|
+
if (toastArr.length < maxToastArrLength) {
|
|
138
|
+
addToastKey(args.key);
|
|
139
|
+
} else {
|
|
140
|
+
NotificationApi.close(unshiftToast());
|
|
141
|
+
addToastKey(args.key);
|
|
142
|
+
}
|
|
143
|
+
} // 初始化倒计时
|
|
125
144
|
// let tempDuration;
|
|
126
145
|
// if (!args.duration) {
|
|
127
146
|
// tempDuration = 0;
|
|
@@ -151,7 +170,7 @@ var handler = {
|
|
|
151
170
|
message: args.message,
|
|
152
171
|
description: args.description,
|
|
153
172
|
countdown: tempDuration,
|
|
154
|
-
notificationKey: key,
|
|
173
|
+
notificationKey: args.key,
|
|
155
174
|
onClose: props === null || props === void 0 ? void 0 : props.onClose
|
|
156
175
|
});
|
|
157
176
|
args.description = /*#__PURE__*/React.createElement(DescriptionDom, {
|
package/lib/input/Input.js
CHANGED
|
@@ -215,7 +215,7 @@ var Input = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
|
|
|
215
215
|
};
|
|
216
216
|
|
|
217
217
|
var hoverClear = function hoverClear() {
|
|
218
|
-
setClearIconColor('#
|
|
218
|
+
setClearIconColor('#84868C');
|
|
219
219
|
};
|
|
220
220
|
|
|
221
221
|
var clearMouseLeave = function clearMouseLeave() {
|
|
@@ -33,7 +33,8 @@ var MultiSelectInput = function MultiSelectInput(props) {
|
|
|
33
33
|
placeholder: placeholder,
|
|
34
34
|
defaultValue: defaultValue,
|
|
35
35
|
onChange: handleOnChange,
|
|
36
|
-
className: "acud-input-select-tags"
|
|
36
|
+
className: "acud-input-select-tags",
|
|
37
|
+
dropdownClassName: "acud-input-select-tags"
|
|
37
38
|
}, options);
|
|
38
39
|
};
|
|
39
40
|
|
package/lib/input/TextArea.d.ts
CHANGED
package/lib/input/TextArea.js
CHANGED
|
@@ -58,6 +58,8 @@ var TextArea = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
|
|
|
58
58
|
_props$placeholder = props.placeholder,
|
|
59
59
|
placeholder = _props$placeholder === void 0 ? '请输入内容' : _props$placeholder,
|
|
60
60
|
className = props.className,
|
|
61
|
+
style = props.style,
|
|
62
|
+
width = props.width,
|
|
61
63
|
limitLength = props.limitLength,
|
|
62
64
|
readonly = props.readonly,
|
|
63
65
|
autoSize = props.autoSize,
|
|
@@ -67,7 +69,7 @@ var TextArea = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
|
|
|
67
69
|
onBlur = props.onBlur,
|
|
68
70
|
_props$allowClear = props.allowClear,
|
|
69
71
|
allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
|
|
70
|
-
rest = __rest(props, ["prefixCls", "placeholder", "className", "limitLength", "readonly", "autoSize", "onPressEnter", "onKeyDown", "onFocus", "onBlur", "allowClear"]);
|
|
72
|
+
rest = __rest(props, ["prefixCls", "placeholder", "className", "style", "width", "limitLength", "readonly", "autoSize", "onPressEnter", "onKeyDown", "onFocus", "onBlur", "allowClear"]);
|
|
71
73
|
|
|
72
74
|
var _useMergedState = (0, _useMergedState3["default"])(props.defaultValue, {
|
|
73
75
|
value: props.value
|
|
@@ -144,7 +146,7 @@ var TextArea = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
|
|
|
144
146
|
setClearIconColor('#D4D6D9');
|
|
145
147
|
};
|
|
146
148
|
|
|
147
|
-
var classes = (0, _classnames["default"])(prefixCls, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-autosize"), autoSize), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-readonly"), readonly), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-span-focus"), focusClass), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-limit"), currentLength > limitLength), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-no-limit"), !!limitLength), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-no-clear"), !allowClear), _classNames)
|
|
149
|
+
var classes = (0, _classnames["default"])(prefixCls, (_classNames = {}, (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-autosize"), autoSize), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-readonly"), readonly), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-span-focus"), focusClass), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-limit"), currentLength > limitLength), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-no-limit"), !!limitLength), (0, _defineProperty2["default"])(_classNames, "".concat(prefixCls, "-no-clear"), !allowClear), _classNames));
|
|
148
150
|
var limitClassName = (0, _classnames["default"])((0, _defineProperty2["default"])({}, "".concat(prefixCls, "-warning"), currentLength > limitLength));
|
|
149
151
|
|
|
150
152
|
var clearContent = function clearContent(e) {
|
|
@@ -154,9 +156,13 @@ var TextArea = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
|
|
|
154
156
|
};
|
|
155
157
|
|
|
156
158
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
157
|
-
className: "".concat(prefixCls, "-outer")
|
|
159
|
+
className: (0, _classnames["default"])("".concat(prefixCls, "-outer"), className),
|
|
160
|
+
style: {
|
|
161
|
+
width: width
|
|
162
|
+
}
|
|
158
163
|
}, /*#__PURE__*/_react["default"].createElement(_rcTextarea["default"], (0, _extends2["default"])({}, rest, {
|
|
159
164
|
ref: ref,
|
|
165
|
+
style: style,
|
|
160
166
|
placeholder: placeholder,
|
|
161
167
|
className: (0, _classnames["default"])(classes),
|
|
162
168
|
onChange: handleOnChange,
|
|
@@ -655,7 +655,6 @@
|
|
|
655
655
|
}
|
|
656
656
|
.acud-input-textarea-outer {
|
|
657
657
|
width: 100%;
|
|
658
|
-
min-width: 100%;
|
|
659
658
|
max-width: 100%;
|
|
660
659
|
display: flex;
|
|
661
660
|
flex-direction: column;
|
|
@@ -682,6 +681,7 @@
|
|
|
682
681
|
padding-top: 6px;
|
|
683
682
|
padding-right: 24px;
|
|
684
683
|
padding-bottom: 24px;
|
|
684
|
+
border: 1px solid;
|
|
685
685
|
border-radius: 4px;
|
|
686
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;
|
|
687
687
|
color: #151B26;
|
|
@@ -886,6 +886,15 @@
|
|
|
886
886
|
.acud-input-select-tags .acud-select-clear {
|
|
887
887
|
right: 12px;
|
|
888
888
|
}
|
|
889
|
+
.acud-input-select-tags .acud-select-item-checkall {
|
|
890
|
+
display: none !important;
|
|
891
|
+
}
|
|
892
|
+
.acud-input-select-tags .acud-checkbox-wrapper {
|
|
893
|
+
display: none !important;
|
|
894
|
+
}
|
|
895
|
+
.acud-input-select-tags .acud-select-item-option-selected:not(.acud-select-item-option-input-disabled) {
|
|
896
|
+
color: #2468F2 !important;
|
|
897
|
+
}
|
|
889
898
|
.acud-select-auto-complete .acud-select-selector {
|
|
890
899
|
width: 100%;
|
|
891
900
|
display: flex;
|
|
@@ -228,7 +228,6 @@
|
|
|
228
228
|
|
|
229
229
|
.@{input-textarea-outer-prefix-cls}{
|
|
230
230
|
width: 100%;
|
|
231
|
-
min-width: 100%;
|
|
232
231
|
max-width: 100%;
|
|
233
232
|
display: flex;
|
|
234
233
|
flex-direction: column;
|
|
@@ -259,6 +258,7 @@
|
|
|
259
258
|
padding-right: 2*@padding-m;
|
|
260
259
|
padding-bottom: 6*@padding-xsm;
|
|
261
260
|
// min-height: 100px;
|
|
261
|
+
border: 1px solid;
|
|
262
262
|
border-radius: @input-border-lg-radius;
|
|
263
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;
|
|
264
264
|
&::-webkit-input-placeholder {
|
|
@@ -382,6 +382,15 @@
|
|
|
382
382
|
.@{acud-prefix}-select-clear{
|
|
383
383
|
right:12px;
|
|
384
384
|
}
|
|
385
|
+
.@{select-prefix-cls}-item-checkall {
|
|
386
|
+
display: none !important;
|
|
387
|
+
}
|
|
388
|
+
.acud-checkbox-wrapper {
|
|
389
|
+
display: none !important;
|
|
390
|
+
}
|
|
391
|
+
.@{select-prefix-cls}-item-option-selected:not(.acud-select-item-option-input-disabled) {
|
|
392
|
+
color: #2468F2 !important;
|
|
393
|
+
}
|
|
385
394
|
}
|
|
386
395
|
.@{acud-prefix}-select-auto-complete{
|
|
387
396
|
.@{acud-prefix}-select-selector{
|
|
@@ -143,7 +143,7 @@
|
|
|
143
143
|
font-weight: 900;
|
|
144
144
|
}
|
|
145
145
|
.acud-modal-title {
|
|
146
|
-
font-size:
|
|
146
|
+
font-size: 16px;
|
|
147
147
|
line-height: 22px;
|
|
148
148
|
padding-right: 12px;
|
|
149
149
|
word-wrap: break-word;
|
|
@@ -171,7 +171,7 @@
|
|
|
171
171
|
margin: 0;
|
|
172
172
|
}
|
|
173
173
|
.acud-modal-footer .acud-btn + .acud-btn {
|
|
174
|
-
margin-left:
|
|
174
|
+
margin-left: 12px;
|
|
175
175
|
}
|
|
176
176
|
.acud-modal-dialogbox {
|
|
177
177
|
width: 400px;
|
|
@@ -114,6 +114,7 @@
|
|
|
114
114
|
// It's ok not to do this, but 24px makes bottom narrow in view should adjust
|
|
115
115
|
&-content {
|
|
116
116
|
display: inline-block;
|
|
117
|
+
max-width: 95px;
|
|
117
118
|
margin-right: (@padding-xs / 2);
|
|
118
119
|
overflow: hidden;
|
|
119
120
|
white-space: pre; // fix whitespace wrapping. custom tags display all whitespace within.
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
@modal-heading-height: 10*@P;
|
|
33
33
|
@modal-heading-bg-color: @G10;
|
|
34
34
|
@modal-heading-padding: 0 6*@P;
|
|
35
|
-
@modal-heading-font-size: @
|
|
35
|
+
@modal-heading-font-size: @T4;
|
|
36
36
|
@modal-heading-color: @G2;
|
|
37
37
|
|
|
38
38
|
// Close
|
|
@@ -48,5 +48,5 @@
|
|
|
48
48
|
|
|
49
49
|
// Footer
|
|
50
50
|
@modal-footer-padding: 0 8*@P 6*@P;
|
|
51
|
-
@modal-footer-btn-space:
|
|
51
|
+
@modal-footer-btn-space: 3*@P;
|
|
52
52
|
@modal-footer-bg-color: @G11;
|