@aloudata/aloudata-design 0.4.8-beta.9 → 0.4.9

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.
@@ -70,15 +70,15 @@
70
70
  border-color: @button-dangerous-bg-color;
71
71
  box-shadow: unset;
72
72
 
73
- &:focus {
73
+ &:focus:not(:disabled) {
74
74
  color: @button-dangerous-color;
75
75
  background-color: @button-dangerous-bg-color;
76
76
  border-color: @button-dangerous-bg-color;
77
77
  box-shadow: unset;
78
78
  }
79
79
 
80
- &:hover,
81
- &:active {
80
+ &:hover:not(:disabled),
81
+ &:active:not(:disabled) {
82
82
  color: @button-dangerous-color-active;
83
83
  background-color: @button-dangerous-bg-color-active;
84
84
  border-color: @button-dangerous-bg-color-active;
@@ -7,19 +7,19 @@
7
7
  @button-height-large: 36px;
8
8
  @button-text-size-large: 16px;
9
9
  @button-border-radius-large: 6px;
10
- @button-border-padding-large: 6px 24px;
10
+ @button-border-padding-large: 5px 23px;
11
11
  @button-left-icon-margin-right-large: 8px;
12
12
 
13
13
  @button-height-middle: 32px;
14
14
  @button-text-size-middle: 13px;
15
15
  @button-border-radius-middle: 4px;
16
- @button-border-padding-middle: 6px 20px;
16
+ @button-border-padding-middle: 5px 19px;
17
17
  @button-left-icon-margin-right-middle: 4px;
18
18
 
19
19
  @button-height-small: 28px;
20
20
  @button-text-size-small: 12px;
21
21
  @button-border-radius-small: 4px;
22
- @button-border-padding-small: 6px 16px;
22
+ @button-border-padding-small: 5px 15px;
23
23
  @button-left-icon-margin-right-small: 4px;
24
24
 
25
25
  // @button-height-mini: 24px;
@@ -3,23 +3,31 @@
3
3
  .ald-checkbox {
4
4
  height: 20px;
5
5
  color: @NL0;
6
- font-size: 14px;
6
+ font-size: 13px;
7
7
  line-height: 20px;
8
8
 
9
- .ant-checkbox-wrapper {
9
+ &.ant-checkbox-checked {
10
+ border: 1px solid @B40;
11
+ }
12
+
13
+ &.ant-checkbox-wrapper {
10
14
  height: 20px;
11
15
  color: @NL0;
12
16
  font-weight: 400;
13
- font-size: 14px;
17
+ font-size: 13px;
14
18
  line-height: 20px;
19
+
20
+ .ant-checkbox-input {
21
+ margin: 0;
22
+ }
15
23
  }
16
24
 
17
25
  .ant-checkbox-inner {
18
26
  width: 16px;
19
27
  height: 16px;
20
- background-color: @BG97;
28
+ background-color: @BG100;
21
29
  border-color: @NL60;
22
- border-radius: 4px;
30
+ border-radius: 2px;
23
31
  }
24
32
 
25
33
  .ant-checkbox-checked {
@@ -27,7 +35,7 @@
27
35
  .ant-checkbox-inner {
28
36
  background-color: @B95;
29
37
  border-color: @B40;
30
- border-radius: 4px;
38
+ border-radius: 2px;
31
39
  }
32
40
 
33
41
  .ant-checkbox-inner {
@@ -59,9 +67,6 @@
59
67
  }
60
68
 
61
69
  .ant-checkbox-inner {
62
- background-color: @B95;
63
- border-color: @B40;
64
-
65
70
  &::after {
66
71
  top: 3px;
67
72
  left: 2px;
@@ -93,16 +98,18 @@
93
98
  .ant-checkbox + span {
94
99
  display: flex;
95
100
  align-items: center;
96
- padding-right: 10px;
97
- padding-left: 10px;
101
+ padding-right: 8px;
102
+ padding-left: 8px;
98
103
  }
99
104
 
100
105
  &:hover .ant-checkbox-inner {
101
106
  border-color: @B40;
102
107
  }
103
108
 
104
- .ant-checkbox-disabled .ant-checkbox-inner:hover {
105
- box-shadow: unset;
109
+ &.ant-checkbox-checked.ant-checkbox-disabled .ant-checkbox-inner {
110
+ background: @B95;
111
+ border: 1px solid @B60;
112
+ border-radius: 2px;
106
113
  }
107
114
 
108
115
  .ant-checkbox:hover .ant-checkbox-inner {
@@ -111,6 +118,20 @@
111
118
  }
112
119
  }
113
120
 
121
+ .ant-checkbox-wrapper
122
+ .ald-checkbox.ant-checkbox-disabled[class]
123
+ .ant-checkbox-inner:hover {
124
+ box-shadow: unset;
125
+ border-radius: 2px;
126
+ }
127
+
128
+ .ant-checkbox-wrapper.ald-checkbox
129
+ .ant-checkbox-disabled.ant-checkbox:hover
130
+ .ant-checkbox-inner {
131
+ box-shadow: unset;
132
+ border: 1px solid @BG60;
133
+ }
134
+
114
135
  .ant-checkbox-group.ald-checkbox,
115
136
  .ant-checkbox-wrapper.ald-checkbox {
116
137
  .ant-checkbox-input:focus + .ant-checkbox-inner {
@@ -5,5 +5,6 @@ declare const DoubleCircleIcon: (props: {
5
5
  size?: number | undefined;
6
6
  innerColor?: string | undefined;
7
7
  children: React.ReactNode;
8
+ type?: "warning" | "error" | "success" | "info" | undefined;
8
9
  }) => JSX.Element;
9
10
  export default DoubleCircleIcon;
@@ -1,3 +1,4 @@
1
+ import classnames from 'classnames';
1
2
  import React from 'react';
2
3
  import "./style/index.less";
3
4
  var INNER_SIZE_RATIO = 0.75; // 外面有两个圆,中间是个图标
@@ -6,7 +7,9 @@ var DoubleCircleIcon = function DoubleCircleIcon(props) {
6
7
  var outColor = props.outColor,
7
8
  size = props.size,
8
9
  innerColor = props.innerColor,
9
- children = props.children;
10
+ children = props.children,
11
+ _props$type = props.type,
12
+ type = _props$type === void 0 ? 'info' : _props$type;
10
13
  var innerSize;
11
14
 
12
15
  if (size) {
@@ -19,7 +22,7 @@ var DoubleCircleIcon = function DoubleCircleIcon(props) {
19
22
  width: size,
20
23
  height: size
21
24
  },
22
- className: 'icon'
25
+ className: classnames('ald-double-circle-icon', "ald-double-circle-icon-".concat(type))
23
26
  }, /*#__PURE__*/React.createElement("div", {
24
27
  style: {
25
28
  background: innerColor,
@@ -1,6 +1,6 @@
1
1
  @import '../../style/index.less';
2
2
 
3
- .icon {
3
+ .ald-double-circle-icon {
4
4
  font-family: 'PingFang SC';
5
5
  display: inline-flex;
6
6
  align-items: center;
@@ -21,3 +21,35 @@
21
21
  background-color: @B90;
22
22
  }
23
23
  }
24
+
25
+ .ald-double-circle-icon-info {
26
+ background-color: @B95;
27
+
28
+ .inner {
29
+ background-color: @B90;
30
+ }
31
+ }
32
+
33
+ .ald-double-circle-icon-success{
34
+ background-color: @SA95;
35
+
36
+ .inner {
37
+ background-color: @SA90;
38
+ }
39
+ }
40
+
41
+ .ald-double-circle-icon-error {
42
+ background-color: @SC95;
43
+
44
+ .inner {
45
+ background-color: @SC90;
46
+ }
47
+ }
48
+
49
+ .ald-double-circle-icon-warning {
50
+ background-color: @SB95;
51
+
52
+ .inner {
53
+ background-color: @SB90;
54
+ }
55
+ }
@@ -12,6 +12,10 @@
12
12
  padding: 4px;
13
13
  color: @NL0;
14
14
  box-shadow: @shadow-L;
15
+
16
+ .ant-dropdown-menu-submenu-title{
17
+ font-size: 13px;
18
+ }
15
19
  }
16
20
 
17
21
  .ant-dropdown-menu-submenu > .ant-dropdown-menu {
@@ -26,20 +30,11 @@
26
30
  background-color: @NL97;
27
31
  }
28
32
 
29
- .ant-dropdown-menu-submenu-title {
30
- padding: 8px 24px 8px 12px;
31
- line-height: 20px;
32
- border-radius: 6px;
33
-
34
- .ant-dropdown-menu-submenu-expand-icon {
35
- right: 12px;
36
- }
37
- }
38
33
 
39
34
  .ant-dropdown-menu-item {
40
35
  padding: 8px 12px;
41
36
  line-height: 20px;
42
- border-radius: 6px;
37
+ border-radius: 0;
43
38
  }
44
39
 
45
40
  .ant-dropdown-menu-item,
@@ -59,6 +54,16 @@
59
54
  }
60
55
  }
61
56
 
57
+ .ant-dropdown-menu-submenu-title {
58
+ padding: 8px 24px 8px 12px;
59
+ line-height: 20px;
60
+ border-radius: 0 !important;
61
+
62
+ .ant-dropdown-menu-submenu-expand-icon {
63
+ right: 12px;
64
+ }
65
+ }
66
+
62
67
  .ald-submenu.ant-dropdown-menu-submenu-popup {
63
68
  padding: 0;
64
69
  border: none;
@@ -9,21 +9,21 @@
9
9
  @input-height-large: 36px;
10
10
  @input-padding-large: 5px 13px;
11
11
  @input-font-size-large: 16px;
12
- @input-border-radius-large: 8px;
12
+ @input-border-radius-large: 6px;
13
13
  @input-prefix-margin-right-large: 8px;
14
14
  @input-clear-icon-large: 20px;
15
15
  // size===middle
16
16
  @input-height-middle: 32px;
17
17
  @input-padding-middle: 5px 11px;
18
18
  @input-font-size-middle: 14px;
19
- @input-border-radius-middle: 6px;
19
+ @input-border-radius-middle: 4px;
20
20
  @input-prefix-margin-right-middle: 8px;
21
21
  @input-clear-icon-middle: 16px;
22
22
  // size===small
23
23
  @input-height-small: 28px;
24
24
  @input-padding-small: 5px 9px;
25
25
  @input-font-size-small: 12px;
26
- @input-border-radius-small: 6px;
26
+ @input-border-radius-small: 4px;
27
27
  @input-prefix-margin-right-small: 4px;
28
28
  @input-clear-icon-small: 14px;
29
29
  //custom status
@@ -34,20 +34,21 @@
34
34
  @input-bg-color: @BG100;
35
35
  // active status
36
36
  @input-active-border-color: @B40;
37
- @input-box-shadow-active: @shadow-xs;
37
+ // @input-box-shadow-active: @shadow-xs;
38
38
  // disabled status
39
39
  @input-disabled-border-color: @BG60;
40
40
  @input-disabled-bg-color: @BG90;
41
41
  @input-disabled-font-color: @NL40;
42
42
 
43
43
  .ant-input.ald-input,
44
+ .ant-input-affix-wrapper.ald-input,
44
45
  .ald-input .ant-input {
45
46
  color: @NL0;
46
47
  font-weight: 400;
47
48
  background-color: @input-bg-color;
48
49
  border-color: @input-border-color;
49
50
  border-radius: @input-border-radius-middle;
50
- box-shadow: @shadow-xs;
51
+ // box-shadow: @shadow-xs;
51
52
  caret-color: @B60;
52
53
 
53
54
  &::placeholder {
@@ -67,7 +68,7 @@
67
68
  &:hover,
68
69
  &-focused {
69
70
  border-color: @input-active-border-color;
70
- box-shadow: @input-box-shadow-active;
71
+ // box-shadow: @input-box-shadow-active;
71
72
  }
72
73
 
73
74
  &[disabled].ald-input {
@@ -112,7 +113,7 @@
112
113
  &:focus,
113
114
  &-focused {
114
115
  border-color: @input-active-border-color;
115
- box-shadow: @input-box-shadow-active;
116
+ // box-shadow: @input-box-shadow-active;
116
117
  }
117
118
 
118
119
  .ant-input {
@@ -137,7 +138,7 @@
137
138
  }
138
139
 
139
140
  .ant-input-prefix {
140
- color: @NL50;
141
+ color: @NL40;
141
142
  }
142
143
 
143
144
  .ant-input-suffix {
@@ -155,12 +156,12 @@
155
156
  .ant-input-affix-wrapper-focused {
156
157
  &.ant-input-password {
157
158
  border-color: @input-active-border-color;
158
- box-shadow: @input-box-shadow-active;
159
+ // box-shadow: @input-box-shadow-active;
159
160
  }
160
161
 
161
162
  &:hover {
162
163
  border-color: @input-active-border-color;
163
- box-shadow: @input-box-shadow-active;
164
+ // box-shadow: @input-box-shadow-active;
164
165
  }
165
166
 
166
167
  .ant-input:hover {
@@ -361,13 +362,14 @@ textarea.ald-input-textarea-small,
361
362
  textarea.ald-input-textarea,
362
363
  .ald-input-textarea .ant-input {
363
364
  color: @NL0;
364
- background: @BG97;
365
+ background: @input-bg-color;
365
366
  caret-color: @B60;
367
+ border-color: @input-border-color;
366
368
 
367
369
  &:hover,
368
370
  &:active,
369
371
  &:focus {
370
- border-color: @B60;
372
+ border-color: @B40;
371
373
  box-shadow: none;
372
374
  }
373
375
 
@@ -396,6 +398,11 @@ textarea.ald-input-textarea,
396
398
  }
397
399
 
398
400
  .ant-input-group-wrapper {
401
+ .ant-input-group-addon{
402
+ color:@NL40;
403
+ border-color: @input-border-color;
404
+ }
405
+
399
406
  &.ald-input-large {
400
407
  .ant-input-group-addon {
401
408
  padding: 4px 14px;
@@ -3,17 +3,17 @@
3
3
 
4
4
  @inputNumber-height-large: 36px;
5
5
  @inputNumber-font-size-large: 16px;
6
- @inputNumber-border-radius-large: 8px;
6
+ @inputNumber-border-radius-large: 6px;
7
7
  @inputNumber-padding-large: 0 14px;
8
8
 
9
9
  @inputNumber-height-middle: 32px;
10
10
  @inputNumber-font-size-middle: 14px;
11
- @inputNumber-border-radius-middle: 8px;
11
+ @inputNumber-border-radius-middle: 4px;
12
12
  @inputNumber-padding-middle: 0 12px;
13
13
 
14
14
  @inputNumber-height-small: 28px;
15
15
  @inputNumber-font-size-small: 12px;
16
- @inputNumber-border-radius-small: 6px;
16
+ @inputNumber-border-radius-small: 4px;
17
17
  @inputNumber-padding-small: 0 10px;
18
18
 
19
19
  //默认
@@ -102,6 +102,7 @@
102
102
  &.ald-inputNumber-large {
103
103
  height: @inputNumber-height-large;
104
104
  font-size: @inputNumber-font-size-large;
105
+ border-radius: @inputNumber-border-radius-large ;
105
106
 
106
107
  .ant-input-number-input {
107
108
  padding: @inputNumber-padding-large;
@@ -115,6 +116,7 @@
115
116
  &.ald-inputNumber-middle {
116
117
  height: @inputNumber-height-middle;
117
118
  font-size: @inputNumber-font-size-middle;
119
+ border-radius: @inputNumber-border-radius-middle ;
118
120
 
119
121
  .ant-input-number-input {
120
122
  padding: @inputNumber-padding-middle;
@@ -128,6 +130,7 @@
128
130
  &.ald-inputNumber-small {
129
131
  height: @inputNumber-height-small;
130
132
  font-size: @inputNumber-font-size-small;
133
+ border-radius: @inputNumber-border-radius-small;
131
134
 
132
135
  .ant-input-number-input {
133
136
  padding: @inputNumber-padding-small;
@@ -143,9 +146,11 @@
143
146
  background-color: @inputNumber-disabled-bg-color;
144
147
  border-color: @inputNumber-disabled-border-color;
145
148
  cursor: initial;
146
-
149
+
147
150
  .ant-input-number-input-wrap .ant-input-number-input {
148
151
  cursor: initial;
152
+ color: @inputNumber-disabled-color;
153
+ background-color: @inputNumber-disabled-bg-color;
149
154
  }
150
155
  }
151
156
 
@@ -52,6 +52,11 @@
52
52
  &:hover{
53
53
  background: none;
54
54
  }
55
+
56
+ .ant-menu-submenu-expand-icon{
57
+ inset-inline-end:0;
58
+ width:initial;
59
+ }
55
60
  }
56
61
  }
57
62
 
@@ -16,11 +16,14 @@ export interface ModalProps extends Omit<AntdModalProps, 'okButtonProps' | 'canc
16
16
  cancelButtonProps?: IButtonProps;
17
17
  okButtonProps?: IButtonProps;
18
18
  okType?: ButtonType;
19
+ paddingLess?: boolean;
19
20
  }
20
- export interface ModalFuncProps extends Omit<AntdModalFuncProps, 'okButtonProps' | 'cancelButtonProps' | 'okType'> {
21
+ export interface ModalFuncProps extends Omit<AntdModalFuncProps, 'okButtonProps' | 'cancelButtonProps' | 'okType' | 'icon'> {
21
22
  cancelButtonProps?: IButtonProps;
22
23
  okButtonProps?: IButtonProps;
23
24
  okType?: ButtonType;
25
+ subTitle?: React.ReactNode;
26
+ icon?: React.ReactElement;
24
27
  }
25
28
  declare const OriginModal: IModalInterface;
26
29
  export declare type ModalFunc = (props: ModalFuncProps) => {