@aloudata/aloudata-design 0.4.8-beta.1 → 0.4.8-beta.11

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 (39) hide show
  1. package/dist/Button/index.js +5 -5
  2. package/dist/Button/style/index.less +48 -44
  3. package/dist/Button/style/variables.less +13 -13
  4. package/dist/Checkbox/style/index.less +7 -3
  5. package/dist/DoubleCircleIcon/index.d.ts +1 -0
  6. package/dist/DoubleCircleIcon/index.js +5 -2
  7. package/dist/DoubleCircleIcon/style/index.less +33 -1
  8. package/dist/Dropdown/style/index.less +11 -10
  9. package/dist/Empty/image/SearchSmall.js +5 -0
  10. package/dist/Empty/style/index.less +11 -0
  11. package/dist/Icon/icons.js +32 -0
  12. package/dist/Input/style/index.less +54 -39
  13. package/dist/Menu/style/index.less +73 -2
  14. package/dist/Modal/index.d.ts +4 -1
  15. package/dist/Modal/index.js +178 -67
  16. package/dist/Modal/style/index.less +46 -6
  17. package/dist/Radio/components/Group/index.js +7 -4
  18. package/dist/Radio/components/Radio/index.js +9 -6
  19. package/dist/Radio/interface/radioGroup.d.ts +6 -1
  20. package/dist/Radio/style/index.less +152 -46
  21. package/dist/Select/components/MultipleOption.d.ts +1 -0
  22. package/dist/Select/components/MultipleOption.js +7 -3
  23. package/dist/Select/components/SingleOption.d.ts +1 -0
  24. package/dist/Select/components/SingleOption.js +6 -2
  25. package/dist/Select/index.js +70 -9
  26. package/dist/Select/style/index.less +7 -3
  27. package/dist/Select/style/multiple.less +13 -2
  28. package/dist/Select/style/single.less +12 -1
  29. package/dist/Select/style/status.less +1 -1
  30. package/dist/Table/style/index.less +9 -7
  31. package/dist/Tabs/index.d.ts +15 -0
  32. package/dist/Tabs/index.js +37 -6
  33. package/dist/Tabs/style/index.less +38 -1
  34. package/dist/notification/demo/index.js +24 -7
  35. package/dist/notification/index.d.ts +9 -1
  36. package/dist/notification/index.js +148 -1
  37. package/dist/notification/style/index.less +28 -0
  38. package/dist/style/themes/default/index.less +25 -25
  39. package/package.json +3 -3
@@ -17,9 +17,9 @@ import { Button as AntdButton } from 'antd';
17
17
  import classNames from 'classnames';
18
18
  import React from 'react';
19
19
  var iconPrefixCls = 'aldicon';
20
- var ICON_LARGE = 24;
21
- var ICON_MIDDLE = 20;
22
- var ICON_SMALL = 16;
20
+ var ICON_LARGE = 20;
21
+ var ICON_MIDDLE = 16;
22
+ var ICON_SMALL = 14;
23
23
  export var btnPrefix = 'ald-btn';
24
24
  export function getButtonType(buttonType) {
25
25
  if (!['primary', 'secondary', 'dangerous', 'text', 'link'].includes(buttonType)) {
@@ -44,7 +44,7 @@ export function getDangerStatus(buttonType) {
44
44
  return false;
45
45
  }
46
46
  export function getButtonSizeClass(ButtonSize) {
47
- return ButtonSize === 'middle' || undefined ? "".concat(btnPrefix, "-middle") : "".concat(btnPrefix, "-").concat(ButtonSize);
47
+ return ['small', 'large'].includes(ButtonSize) ? "".concat(btnPrefix, "-").concat(ButtonSize) : "".concat(btnPrefix, "-middle");
48
48
  }
49
49
  export function getIconSize(ButtonSize) {
50
50
  if (ButtonSize === 'large') {
@@ -80,7 +80,7 @@ export var setIcon = function setIcon(iconNode, size, loading) {
80
80
  if (loading) {
81
81
  return /*#__PURE__*/React.createElement(LoadingLine, {
82
82
  spin: true,
83
- size: ICON_LARGE,
83
+ size: getIconSize(size),
84
84
  className: classNames("".concat(iconPrefixCls, "-icon-left"), iconPrefixCls),
85
85
  fill: "currentColor"
86
86
  });
@@ -1,7 +1,7 @@
1
1
  @import '../../style/index.less';
2
2
  @import './variables.less';
3
3
 
4
- .ant-btn.ald-btn {
4
+ .ald-btn {
5
5
  &.ald-btn {
6
6
  // &-loading::before{
7
7
  // // display: none !important;
@@ -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;
@@ -254,13 +254,14 @@
254
254
 
255
255
  .aldicon-icon-left {
256
256
  svg {
257
- vertical-align: -2px;
257
+ vertical-align: -4px;
258
258
  }
259
259
  }
260
260
 
261
- .aldicon-icon-left + span {
262
- margin-left: @button-left-icon-margin-right-large;
263
- }
261
+ gap:@button-left-icon-margin-right-large;
262
+ // .aldicon-icon-left + span {
263
+ // margin-left: @button-left-icon-margin-right-large;
264
+ // }
264
265
  }
265
266
 
266
267
  &-middle {
@@ -284,13 +285,14 @@
284
285
 
285
286
  .aldicon-icon-left {
286
287
  svg {
287
- vertical-align: -2px;
288
+ vertical-align: -3px;
288
289
  }
289
290
  }
290
291
 
291
- .aldicon-icon-left + span {
292
- margin-left: @button-left-icon-margin-right-middle;
293
- }
292
+ gap:@button-left-icon-margin-right-middle;
293
+ // .aldicon-icon-left + span {
294
+ // margin-left: @button-left-icon-margin-right-middle;
295
+ // }
294
296
  }
295
297
 
296
298
  &-small {
@@ -318,39 +320,41 @@
318
320
  }
319
321
  }
320
322
 
321
- .aldicon-icon-left + span {
322
- margin-left: @button-left-icon-margin-right-small;
323
- }
323
+ gap:@button-left-icon-margin-right-small;
324
+ // .aldicon-icon-left + span {
325
+ // margin-left: @button-left-icon-margin-right-small;
326
+ // }
324
327
  }
325
328
 
326
- &-mini {
327
- height: @button-height-mini;
328
- padding: @button-border-padding-mini;
329
- font-size: @button-text-size-mini;
330
- line-height: 22px;
331
- border-radius: @button-border-radius-mini;
332
-
333
- &.ant-btn-icon-only {
334
- min-width: @button-height-mini;
335
- height: @button-height-mini;
336
- border-radius: @button-border-radius-mini;
337
- }
338
-
339
- &.ant-btn-circle {
340
- min-width: @button-height-mini;
341
- height: @button-height-mini;
342
- border-radius: 50%;
343
- }
344
-
345
- .aldicon-icon-left {
346
- svg {
347
- vertical-align: -2px;
348
- }
349
- }
350
-
351
- .aldicon-icon-left + span {
352
- margin-left: @button-left-icon-margin-right-mini;
353
- }
354
- }
329
+ // &-mini {
330
+ // height: @button-height-mini;
331
+ // padding: @button-border-padding-mini;
332
+ // font-size: @button-text-size-mini;
333
+ // line-height: 22px;
334
+ // border-radius: @button-border-radius-mini;
335
+
336
+ // &.ant-btn-icon-only {
337
+ // min-width: @button-height-mini;
338
+ // height: @button-height-mini;
339
+ // border-radius: @button-border-radius-mini;
340
+ // }
341
+
342
+ // &.ant-btn-circle {
343
+ // min-width: @button-height-mini;
344
+ // height: @button-height-mini;
345
+ // border-radius: 50%;
346
+ // }
347
+
348
+ // .aldicon-icon-left {
349
+ // svg {
350
+ // vertical-align: -2px;
351
+ // }
352
+ // }
353
+
354
+ // gap:@button-left-icon-margin-right-mini;
355
+ // // .aldicon-icon-left + span {
356
+ // // margin-left: @button-left-icon-margin-right-mini;
357
+ // // }
358
+ // }
355
359
  }
356
360
  }
@@ -6,27 +6,27 @@
6
6
  /** size控制 **/
7
7
  @button-height-large: 36px;
8
8
  @button-text-size-large: 16px;
9
- @button-border-radius-large: 8px;
10
- @button-border-padding-large: 6px 14px;
9
+ @button-border-radius-large: 6px;
10
+ @button-border-padding-large: 6px 24px;
11
11
  @button-left-icon-margin-right-large: 8px;
12
12
 
13
13
  @button-height-middle: 32px;
14
- @button-text-size-middle: 14px;
15
- @button-border-radius-middle: 8px;
16
- @button-border-padding-middle: 6px 12px;
17
- @button-left-icon-margin-right-middle: 8px;
14
+ @button-text-size-middle: 13px;
15
+ @button-border-radius-middle: 4px;
16
+ @button-border-padding-middle: 6px 20px;
17
+ @button-left-icon-margin-right-middle: 4px;
18
18
 
19
19
  @button-height-small: 28px;
20
20
  @button-text-size-small: 12px;
21
- @button-border-radius-small: 6px;
22
- @button-border-padding-small: 6px 10px;
21
+ @button-border-radius-small: 4px;
22
+ @button-border-padding-small: 6px 16px;
23
23
  @button-left-icon-margin-right-small: 4px;
24
24
 
25
- @button-height-mini: 24px;
26
- @button-text-size-mini: 12px;
27
- @button-border-radius-mini: 4px;
28
- @button-border-padding-mini: 0 7px;
29
- @button-left-icon-margin-right-mini: 4px;
25
+ // @button-height-mini: 24px;
26
+ // @button-text-size-mini: 12px;
27
+ // @button-border-radius-mini: 4px;
28
+ // @button-border-padding-mini: 0 7px;
29
+ // @button-left-icon-margin-right-mini: 4px;
30
30
 
31
31
  /**** type控制 ****/
32
32
  @button-primary-bg-color: @B40;
@@ -3,15 +3,19 @@
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-wrapper {
10
10
  height: 20px;
11
11
  color: @NL0;
12
12
  font-weight: 400;
13
- font-size: 14px;
13
+ font-size: 13px;
14
14
  line-height: 20px;
15
+
16
+ .ant-checkbox-input{
17
+ margin:0;
18
+ }
15
19
  }
16
20
 
17
21
  .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?: "error" | "success" | "warning" | "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
+ }
@@ -26,20 +26,11 @@
26
26
  background-color: @NL97;
27
27
  }
28
28
 
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
29
 
39
30
  .ant-dropdown-menu-item {
40
31
  padding: 8px 12px;
41
32
  line-height: 20px;
42
- border-radius: 6px;
33
+ border-radius: 0;
43
34
  }
44
35
 
45
36
  .ant-dropdown-menu-item,
@@ -59,6 +50,16 @@
59
50
  }
60
51
  }
61
52
 
53
+ .ant-dropdown-menu-submenu-title {
54
+ padding: 8px 24px 8px 12px;
55
+ line-height: 20px;
56
+ border-radius: 0 !important;
57
+
58
+ .ant-dropdown-menu-submenu-expand-icon {
59
+ right: 12px;
60
+ }
61
+ }
62
+
62
63
  .ald-submenu.ant-dropdown-menu-submenu-popup {
63
64
  padding: 0;
64
65
  border: none;
@@ -14,6 +14,11 @@ var SearchSmall = function SearchSmall() {
14
14
  fill: "#EFF2F5",
15
15
  stroke: "#F9FAFB",
16
16
  strokeWidth: "5"
17
+ }), /*#__PURE__*/React.createElement("path", {
18
+ fillRule: "evenodd",
19
+ clipRule: "evenodd",
20
+ d: "M19.4074 15.3333C17.1574 15.3333 15.3333 17.1574 15.3333 19.4074C15.3333 21.6575 17.1574 23.4815 19.4074 23.4815C20.5031 23.4815 21.4978 23.0489 22.23 22.3453C22.2466 22.3241 22.2646 22.3037 22.2842 22.2842C22.3037 22.2646 22.3241 22.2466 22.3453 22.23C23.0489 21.4978 23.4815 20.5031 23.4815 19.4074C23.4815 17.1574 21.6575 15.3333 19.4074 15.3333ZM23.6734 22.7306C24.3887 21.8138 24.8148 20.6603 24.8148 19.4074C24.8148 16.421 22.3938 14 19.4074 14C16.421 14 14 16.421 14 19.4074C14 22.3938 16.421 24.8148 19.4074 24.8148C20.6603 24.8148 21.8138 24.3887 22.7306 23.6734L24.8619 25.8047C25.1223 26.0651 25.5444 26.0651 25.8047 25.8047C26.0651 25.5444 26.0651 25.1223 25.8047 24.8619L23.6734 22.7306Z",
21
+ fill: "#667085"
17
22
  }));
18
23
  };
19
24
 
@@ -46,12 +46,23 @@
46
46
  width:160px;
47
47
  height: 160px;
48
48
  }
49
+
50
+ .ald-empty-title{
51
+ margin-top: 20px;
52
+ }
49
53
  }
50
54
 
51
55
  &.ald-empty-small{
56
+ padding:24px;
57
+
52
58
  .ald-empty-image-wrap{
53
59
  width:40px;
54
60
  height: 40px;
61
+
62
+ }
63
+
64
+ .ald-empty-title{
65
+ margin-top: 12px;
55
66
  }
56
67
  }
57
68
  }
@@ -1670,4 +1670,36 @@ export default [{
1670
1670
  "categoryCN": "线性",
1671
1671
  "author": "阿广",
1672
1672
  "svg": "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" width=\"1em\" height=\"1em\"><path fill=\"#000\" d=\"M3.75 2.25h16.5a1.5 1.5 0 0 1 1.5 1.5v16.5a1.5 1.5 0 0 1-1.5 1.5H3.75a1.5 1.5 0 0 1-1.5-1.5V3.75a1.5 1.5 0 0 1 1.5-1.5Zm3.75 4.5v-3H3.75v3H7.5Zm12.75 1.5H9v5.25h11.25V8.25ZM3.75 13.5H7.5V8.25H3.75v5.25ZM7.5 15H3.75v5.25H7.5V15ZM9 15v5.25h11.25V15H9ZM20.25 3.75H9v3h11.25v-3Z\" clip-rule=\"evenodd\" fill-rule=\"evenodd\" data-follow-fill=\"#000\"></path></svg>"
1673
+ }, {
1674
+ "id": 209,
1675
+ "title": "圆点-小号-填充",
1676
+ "name": "dot-s-fill",
1677
+ "category": "Fill",
1678
+ "categoryCN": "填充",
1679
+ "author": "阿广",
1680
+ "svg": "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" width=\"1em\" height=\"1em\"><path fill=\"#000\" d=\"M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z\" data-follow-fill=\"#000\"></path></svg>"
1681
+ }, {
1682
+ "id": 210,
1683
+ "title": "定时-线性",
1684
+ "name": "timing-line",
1685
+ "category": "Line",
1686
+ "categoryCN": "线性",
1687
+ "author": "阿广",
1688
+ "svg": "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" width=\"1em\" height=\"1em\"><path stroke-width=\"1.5\" stroke=\"#000\" d=\"M12 5.25v7.5h5.25\" data-follow-stroke=\"#000\"></path><path fill=\"#000\" d=\"M5.085 7.5H9V9H3V3h1.5v2.76A9.75 9.75 0 0 1 21.75 12h-1.5A8.25 8.25 0 0 0 5.085 7.5Zm13.83 9H15V15h6v6h-1.5v-2.76A9.75 9.75 0 0 1 2.25 12h1.5a8.25 8.25 0 0 0 15.165 4.5Z\" clip-rule=\"evenodd\" fill-rule=\"evenodd\" data-follow-fill=\"#000\"></path></svg>"
1689
+ }, {
1690
+ "id": 211,
1691
+ "title": "明细加速-线性",
1692
+ "name": "details-accelerate-line",
1693
+ "category": "Line",
1694
+ "categoryCN": "线性",
1695
+ "author": "阿广",
1696
+ "svg": "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" width=\"1em\" height=\"1em\"><path fill=\"#000\" d=\"M6.75 4.5H1.5V6h5.25V4.5ZM6.75 18H1.5v1.5h5.25V18ZM6.75 11.25H1.5v1.5h5.25v-1.5ZM11.707 22.44a.75.75 0 0 1-.45-.802l1.366-8.887H9a.75.75 0 0 1-.75-.923l2.25-9.75a.75.75 0 0 1 .75-.577h7.5a.75.75 0 0 1 .735.915L18.188 8.25h3.562a.75.75 0 0 1 .675.42.75.75 0 0 1-.082.75l-9.75 12.75a.75.75 0 0 1-.593.33.818.818 0 0 1-.293-.06Zm4.605-12.69 1.5-6.75H11.85l-1.905 8.25h4.432l-1.192 7.71 7.065-9.21h-3.938Z\" data-follow-fill=\"#000\"></path></svg>"
1697
+ }, {
1698
+ "id": 212,
1699
+ "title": "聚合加速-线性",
1700
+ "name": "polymerization-accelerate-line",
1701
+ "category": "Line",
1702
+ "categoryCN": "线性",
1703
+ "author": "阿广",
1704
+ "svg": "<svg xmlns=\"http://www.w3.org/2000/svg\" fill=\"none\" viewBox=\"0 0 24 24\" width=\"1em\" height=\"1em\"><path stroke-linejoin=\"round\" stroke-width=\"1.5\" stroke=\"#000\" d=\"M6.75 5.25h-4.5v13.5h4.5\" data-follow-stroke=\"#000\"></path><path fill=\"#000\" d=\"M11.707 22.44a.75.75 0 0 1-.45-.802l1.366-8.888H9a.75.75 0 0 1-.75-.922l2.25-9.75a.75.75 0 0 1 .75-.578h7.5a.75.75 0 0 1 .735.915L18.188 8.25h3.562a.75.75 0 0 1 .675.42.75.75 0 0 1-.082.75l-9.75 12.75a.75.75 0 0 1-.593.33.82.82 0 0 1-.293-.06Zm4.605-12.69 1.5-6.75H11.85l-1.905 8.25h4.432l-1.192 7.71 7.065-9.21h-3.938Z\" data-follow-fill=\"#000\"></path></svg>"
1673
1705
  }];
@@ -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,7 +34,7 @@
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;
@@ -47,7 +47,7 @@
47
47
  background-color: @input-bg-color;
48
48
  border-color: @input-border-color;
49
49
  border-radius: @input-border-radius-middle;
50
- box-shadow: @shadow-xs;
50
+ // box-shadow: @shadow-xs;
51
51
  caret-color: @B60;
52
52
 
53
53
  &::placeholder {
@@ -67,7 +67,7 @@
67
67
  &:hover,
68
68
  &-focused {
69
69
  border-color: @input-active-border-color;
70
- box-shadow: @input-box-shadow-active;
70
+ // box-shadow: @input-box-shadow-active;
71
71
  }
72
72
 
73
73
  &[disabled].ald-input {
@@ -112,7 +112,7 @@
112
112
  &:focus,
113
113
  &-focused {
114
114
  border-color: @input-active-border-color;
115
- box-shadow: @input-box-shadow-active;
115
+ // box-shadow: @input-box-shadow-active;
116
116
  }
117
117
 
118
118
  .ant-input {
@@ -155,12 +155,12 @@
155
155
  .ant-input-affix-wrapper-focused {
156
156
  &.ant-input-password {
157
157
  border-color: @input-active-border-color;
158
- box-shadow: @input-box-shadow-active;
158
+ // box-shadow: @input-box-shadow-active;
159
159
  }
160
160
 
161
161
  &:hover {
162
162
  border-color: @input-active-border-color;
163
- box-shadow: @input-box-shadow-active;
163
+ // box-shadow: @input-box-shadow-active;
164
164
  }
165
165
 
166
166
  .ant-input:hover {
@@ -222,7 +222,7 @@
222
222
  }
223
223
 
224
224
  .ald-input-group-large {
225
- .ald-input {
225
+ &:not(.ant-input-group-compact) .ald-input {
226
226
  height: @input-height-large;
227
227
  padding: @input-padding-large;
228
228
  font-size: @input-font-size-large;
@@ -236,21 +236,26 @@
236
236
  }
237
237
  }
238
238
 
239
- &.ant-input-group-compact {
240
- .ald-input {
241
- &:first-of-type {
242
- border-radius: @input-border-radius-large 0 0 @input-border-radius-large;
243
- }
244
-
245
- &:last-of-type {
246
- border-radius: 0 @input-border-radius-large @input-border-radius-large 0;
247
- }
239
+ &.ant-input-group-compact{
240
+ .ald-input,.ald-select,.ald-btn.ant-btn{
241
+ border-radius: 0;
248
242
  }
249
243
  }
244
+
245
+ &.ant-input-group-compact>*:first-child{
246
+ border-start-start-radius: @input-border-radius-large !important;
247
+ border-end-start-radius: @input-border-radius-large !important;
248
+ }
249
+
250
+ &.ant-input-group-compact>*:last-child{
251
+ border-inline-end-width: 1px;
252
+ border-start-end-radius: @input-border-radius-large !important;
253
+ border-end-end-radius: @input-border-radius-large !important;
254
+ }
250
255
  }
251
256
 
252
257
  .ald-input-group-middle {
253
- .ald-input {
258
+ &:not(.ant-input-group-compact) .ald-input {
254
259
  height: @input-height-middle;
255
260
  padding: @input-padding-middle;
256
261
  font-size: @input-font-size-middle;
@@ -265,21 +270,26 @@
265
270
  }
266
271
  }
267
272
 
268
- &.ant-input-group-compact {
269
- .ald-input {
270
- &:first-of-type {
271
- border-radius: @input-border-radius-middle 0 0 @input-border-radius-middle;
272
- }
273
-
274
- &:last-of-type {
275
- border-radius: 0 @input-border-radius-middle @input-border-radius-middle 0;
276
- }
273
+ &.ant-input-group-compact{
274
+ .ald-input,.ald-select,.ald-btn.ant-btn{
275
+ border-radius: 0;
277
276
  }
278
277
  }
278
+
279
+ &.ant-input-group-compact>*:first-child{
280
+ border-start-start-radius: @input-border-radius-middle !important;
281
+ border-end-start-radius: @input-border-radius-middle !important;
282
+ }
283
+
284
+ &.ant-input-group-compact>*:last-child{
285
+ border-inline-end-width: 1px;
286
+ border-start-end-radius: @input-border-radius-middle !important;
287
+ border-end-end-radius: @input-border-radius-middle !important;
288
+ }
279
289
  }
280
290
 
281
291
  .ald-input-group-small {
282
- .ald-input {
292
+ &:not(.ant-input-group-compact) .ald-input {
283
293
  height: @input-height-small;
284
294
  padding: @input-padding-small;
285
295
  font-size: @input-font-size-small;
@@ -294,17 +304,22 @@
294
304
  }
295
305
  }
296
306
 
297
- &.ant-input-group-compact {
298
- .ald-input {
299
- &:first-of-type {
300
- border-radius: @input-border-radius-small 0 0 @input-border-radius-small;
301
- }
302
-
303
- &:last-of-type {
304
- border-radius: 0 @input-border-radius-small @input-border-radius-small 0;
305
- }
307
+ &.ant-input-group-compact{
308
+ .ald-input,.ald-select,.ald-btn.ant-btn{
309
+ border-radius: 0;
306
310
  }
307
311
  }
312
+
313
+ &.ant-input-group-compact>*:first-child{
314
+ border-start-start-radius: @input-border-radius-small !important;
315
+ border-end-start-radius: @input-border-radius-small !important;
316
+ }
317
+
318
+ &.ant-input-group-compact>*:last-child{
319
+ border-inline-end-width: 1px;
320
+ border-start-end-radius: @input-border-radius-small !important;
321
+ border-end-end-radius: @input-border-radius-small !important;
322
+ }
308
323
  }
309
324
 
310
325
  .ald-textarea-large {