@kdcloudjs/kdesign 1.5.6 → 1.5.9

package/es/tree/style/token.less

@@ -22,10 +22,11 @@
 @tree-expand-icon-loading-width: var(~'@{tree-prefix}-expand-icon-loading-sizing-width', 16px);
 @tree-node-icon-height: var(~'@{tree-prefix}-node-icon-sizing-height', 16px);
 @tree-node-icon-width: var(~'@{tree-prefix}-node-icon-sizing-width', 16px);
+@tree-margin-left: var(~'@{tree-prefix}-spacing-margin-left', 16px);
 
 // font
 @tree-font-size: var(~'@{tree-prefix}-font-size', @font-size-small);
 @tree-node-icon-size: var(~'@{tree-prefix}-node-icon-font-size', 16px);
 
 // motion
-@tree-transition-duration: var(~'@{tree-prefix}-motion-duration', @duration-promptly);
+@tree-transition-duration: var(~'@{tree-prefix}-motion-duration', @duration-promptly);

package/es/tree/treeNode.js

@@ -241,7 +241,10 @@ var TreeNode = /*#__PURE__*/React.forwardRef(function (props, ref) {
       onChange: handleOnchange,
       checked: checked,
       indeterminate: !disabled && indeterminate,
-      disabled: disabled
+      disabled: disabled,
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
     }, /*#__PURE__*/React.createElement("span", {
       className: classNames("".concat(treeNodePrefixCls, "-title"), _defineProperty({}, "".concat(treeNodePrefixCls, "-title-disabled"), disabled))
     }, title)) : /*#__PURE__*/React.createElement("span", {

package/es/upload/style/index.css

@@ -180,13 +180,14 @@
   list-style: none;
   -webkit-font-feature-settings: 'tnum';
           font-feature-settings: 'tnum';
-  margin-top: 16px;
+  margin-top: var(--kd-c-upload-text-list-margin-top, 16px);
   font-size: var(--kd-c-upload-font-size, var(--kd-g-font-size-middle, 14px));
   border-top: 1px dashed var(--kd-c-upload-division-color, var(--kd-g-color-border-strong, #d9d9d9));
 }
 .kd-upload .kd-upload-text-list-item {
   position: relative;
-  padding: 12px 20px;
+  padding: 0 var(--kd-c-upload-text-list-item-padding-horizontal, 20px);
+  height: var(--kd-c-upload-list-item-height, 44px);
   overflow: hidden;
   white-space: nowrap;
   display: -webkit-box;
@@ -212,9 +213,12 @@
 .kd-upload .kd-upload-text-list-item.error .kd-upload-text-list-item-name {
   color: var(--kd-c-upload-error-color, var(--kd-g-color-error, #fb2323));
 }
+.kd-upload .kd-upload-text-list-item-icon > i {
+  font-size: var(--kd-c-upload-font-size, var(--kd-g-font-size-middle, 14px));
+}
 .kd-upload .kd-upload-text-list-item-name {
   display: inline-block;
-  margin: 0 5px;
+  margin: 0 var(--kd-c-upload-text-list-item-name-padding-right, 8px) 0 var(--kd-c-upload-text-list-item-name-padding-left, 4px);
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -227,7 +231,9 @@
   position: absolute;
   top: 0;
   right: 0;
-  padding: 12px 20px;
+  padding: 0 var(--kd-c-upload-text-list-item-padding-horizontal, 20px);
+  height: var(--kd-c-upload-list-item-height, 44px);
+  line-height: var(--kd-c-upload-list-item-height, 44px);
   background-color: transparent;
   opacity: 0;
   visibility: hidden;
@@ -321,7 +327,8 @@
   max-height: 100%;
 }
 .kd-upload .kd-upload-picture-list-item.error {
-  border-color: var(--kd-c-upload-color-border-error, var(--kd-g-color-border-error, #ff8088));
+  border-color: var(--kd-c-upload-color-border-error, var(--kd-g-color-border-error, #fc808B));
+  background-color: var(--kd-c-upload-color-background-error, var(--kd-g-color-background-error, #fff2f4));
 }
 .kd-upload .kd-upload-picture-list-item-loading {
   width: 100%;
@@ -361,7 +368,7 @@
           justify-content: center;
 }
 .kd-upload .kd-upload-picture-list-item-error-text {
-  margin-bottom: 5px;
+  margin-bottom: 4px;
   color: var(--kd-c-upload-error-color, var(--kd-g-color-error, #fb2323));
 }
 .kd-upload .kd-upload-picture-list-item-error a {
@@ -370,3 +377,7 @@
 .kd-upload .kd-upload-picture-list-item-error a:not(:first-child) {
   margin-left: 10px;
 }
+.kd-upload .kd-upload-picture-list-item-action > a {
+  color: var(--kd-c-upload-panel-button-color, #0E5FD8);
+  font-size: var(--kd-c-upload-picture-action-font-size, var(--kd-g-font-size-small, 12px));
+}

package/es/upload/style/index.less

@@ -59,13 +59,14 @@
 
   .@{upload-prefix-text-list-cls} {
     .reset-component;
-    margin-top: 16px;
+    margin-top: @upload-text-list-margin-top;
     font-size: @upload-font-size;
     border-top: 1px dashed @upload-border-color-strong;
 
     &-item {
       position: relative;
-      padding: 12px 20px;
+      padding: 0 @upload-text-list-item-padding-horizontal;
+      height: @upload-list-item-height;
       overflow: hidden;
       white-space: nowrap;
       display: flex;
@@ -90,9 +91,13 @@
         }
       }
 
+      &-icon > i {
+        font-size: @upload-font-size;
+      }
+
       &-name {
         display: inline-block;
-        margin: 0 5px;
+        margin: 0 @upload-text-list-item-name-padding-right 0 @upload-text-list-item-name-padding-left;
         .ellipsis;
         color: @upload-panel-color;
       }
@@ -105,7 +110,9 @@
         position: absolute;
         top: 0;
         right: 0;
-        padding: 12px 20px;
+        padding: 0 @upload-text-list-item-padding-horizontal;
+        height: @upload-list-item-height;
+        line-height: @upload-list-item-height;
         background-color: transparent;
         opacity: 0;
         visibility: hidden;
@@ -185,6 +192,7 @@
 
       &.error {
         border-color: @upload-border-error-color;
+        background-color: @upload-background-error-color;
       }
 
       &-loading {
@@ -209,7 +217,7 @@
         justify-content: center;
 
         &-text {
-          margin-bottom: 5px;
+          margin-bottom: 4px;
           color: @upload-text-error-color;
         }
 
@@ -220,6 +228,11 @@
           }
         }
       }
+
+      &-action > a {
+        color: @upload-panel-button-color;
+        font-size: @upload-picture-action-font-size;
+      }
     }
   }
 }

package/es/upload/style/token.less

@@ -6,6 +6,7 @@
 @upload-text-color: var(~'@{upload-prefix}-color', @color-text-third);
 
 @upload-text-error-color: var(~'@{upload-prefix}-error-color', @color-error);
+@upload-background-error-color: var(~'@{upload-prefix}-color-background-error', @color-background-error);
 @upload-border-error-color: var(~'@{upload-prefix}-color-border-error', @color-border-error);
 @upload-border-color: var(~'@{upload-prefix}-color-border', @color-border-weak);
 @upload-border-color-strong: var(~'@{upload-prefix}-division-color', @color-border-strong);
@@ -22,7 +23,17 @@
 
 // font
 @upload-font-size: var(~'@{upload-prefix}-font-size', @font-size-middle);
+@upload-picture-action-font-size: var(~'@{upload-prefix}-picture-action-font-size', @font-size-small);
 
 // radius
 @upload-border-radius: var(~'@{upload-prefix}-radius-border', @radius-border);
 
+// sizing
+@upload-list-item-height: var(~'@{upload-prefix}-list-item-height', 44px);
+
+//spacing
+@upload-text-list-margin-top: var(~'@{upload-prefix}-text-list-margin-top', 16px);
+@upload-text-list-item-padding-horizontal: var(~'@{upload-prefix}-text-list-item-padding-horizontal', 20px);
+@upload-text-list-item-name-padding-left: var(~'@{upload-prefix}-text-list-item-name-padding-left', 4px);
+@upload-text-list-item-name-padding-right: var(~'@{upload-prefix}-text-list-item-name-padding-right', 8px);
+

package/es/upload/upload.js

@@ -461,7 +461,7 @@ var InternalUpload = function InternalUpload(props, ref) {
   }, inputFileProps, {
     ref: mergedRef
   }))))), showUploadList && _mapInstanceProperty(fileList).call(fileList, function (file) {
-    var _context8, _context9, _context10, _context11, _context12, _context13, _context14, _context15, _context16, _context17, _context18, _context19;
+    var _context8, _context9, _context10, _context11, _context12, _context13, _context14, _context15, _context16, _context17, _context18, _context19, _context20;
 
     return /*#__PURE__*/React.createElement("li", {
       key: file.uid,
@@ -503,13 +503,15 @@ var InternalUpload = function InternalUpload(props, ref) {
       style: {
         verticalAlign: 'top'
       }
-    }), "\u4E0A\u4F20\u5931\u8D25"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("a", {
+    }), "\u4E0A\u4F20\u5931\u8D25"), /*#__PURE__*/React.createElement("div", {
+      className: _concatInstanceProperty(_context18 = "".concat(prefixCls, "-")).call(_context18, listType, "-list-item-action")
+    }, /*#__PURE__*/React.createElement("a", {
       href: "true",
-      className: _concatInstanceProperty(_context18 = "".concat(prefixCls, "-")).call(_context18, listType, "-list-item-reupload"),
+      className: _concatInstanceProperty(_context19 = "".concat(prefixCls, "-")).call(_context19, listType, "-list-item-reupload"),
       onClick: handleReUpload.bind(_this, file)
     }, "\u91CD\u65B0\u4E0A\u4F20"), /*#__PURE__*/React.createElement("a", {
       href: "true",
-      className: _concatInstanceProperty(_context19 = "".concat(prefixCls, "-")).call(_context19, listType, "-list-item-delete"),
+      className: _concatInstanceProperty(_context20 = "".concat(prefixCls, "-")).call(_context20, listType, "-list-item-delete"),
       onClick: handleRemove.bind(_this, file)
     }, "\u5220\u9664"))) : /*#__PURE__*/React.createElement(Image, {
       previewType: "upload",

package/lib/_utils/usePopper.js

@@ -331,6 +331,8 @@ function usePopper(locatorElement, popperElement, props) {
       var currentPlacement = nextPlacement;
 
       if (autoPlacement) {
+        var _context5;
+
         if (top - gap - popperHeight <= 5 && bottom + gap + popperHeight < document.body.clientHeight - 5) {
           currentPlacement = currentPlacement.replace('top', 'bottom');
         }
@@ -363,12 +365,14 @@ function usePopper(locatorElement, popperElement, props) {
           currentPlacement = currentPlacement.replace('right', 'left');
         }
 
-        if (right - width / 2 + popperWidth / 2 >= document.body.clientWidth - 5 && right - popperWidth > 5) {
-          currentPlacement += 'Right';
-        }
+        if ((0, _includes.default)(_context5 = ['top', 'bottom']).call(_context5, currentPlacement)) {
+          if (right - width / 2 + popperWidth / 2 >= document.body.clientWidth - 5 && right - popperWidth > 5) {
+            currentPlacement += 'Right';
+          }
 
-        if (left - width / 2 - popperWidth / 2 <= 5 && left + popperWidth < document.body.clientWidth - 5) {
-          currentPlacement += 'Left';
+          if (left - width / 2 - popperWidth / 2 <= 5 && left + popperWidth < document.body.clientWidth - 5) {
+            currentPlacement += 'Left';
+          }
         }
       }
 
@@ -479,8 +483,8 @@ function usePopper(locatorElement, popperElement, props) {
           alignPos.left = locatorPos.left;
           _arrowPos.left = arrowOffset;
         } else if (right >= document.body.clientWidth) {
-          alignPos.left = locatorPos.right - popperWidth;
-          alignPos.right = -360;
+          delete alignPos.left;
+          alignPos.right = -1 * (right - document.body.clientWidth);
           _arrowPos.left = popperWidth - arrowOffset - 2 * arrowSize;
         }
       }

package/lib/carousel/slidebar.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface slideProps {
     currentIndex: number;
     dotPosition?: string;

package/lib/checkbox/checkbox.d.ts

@@ -16,6 +16,7 @@ export interface CheckboxProps {
     disabled?: boolean;
     children?: React.ReactNode;
     name?: string;
+    onClick?: (e: React.MouseEvent) => void;
     onChange?: (e: React.ChangeEvent<HTMLInputElement>) => void;
 }
 declare const Checkbox: React.ForwardRefExoticComponent<CheckboxProps & React.RefAttributes<unknown>>;

package/lib/checkbox/checkbox.js

@@ -13,12 +13,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.CheckboxTypes = exports.CheckboxSizes = void 0;
 
-var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 
+var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
+
+var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -39,6 +43,19 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof _getOwnPropertySymbols.default === "function") for (var i = 0, p = (0, _getOwnPropertySymbols.default)(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
 var CheckboxTypes = (0, _type.tuple)('default', 'square');
 exports.CheckboxTypes = CheckboxTypes;
 var CheckboxSizes = (0, _type.tuple)('large', 'middle', 'small');
@@ -53,6 +70,7 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
       userDefaultProps = _useContext.compDefaultProps;
 
   var CheckboxProps = (0, _utils.getCompProps)('Checkbox', userDefaultProps, props);
+
   var checkboxType = CheckboxProps.checkboxType,
       className = CheckboxProps.className,
       customPrefixcls = CheckboxProps.prefixCls,
@@ -65,7 +83,8 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
       style = CheckboxProps.style,
       value = CheckboxProps.value,
       indeterminate = CheckboxProps.indeterminate,
-      name = CheckboxProps.name;
+      name = CheckboxProps.name,
+      rest = __rest(CheckboxProps, ["checkboxType", "className", "prefixCls", "defaultChecked", "checked", "size", "onChange", "disabled", "children", "style", "value", "indeterminate", "name"]);
 
   var getChecked = function getChecked() {
     return (0, _isBoolean.default)(checked) ? checked : defaultChecked;
@@ -129,11 +148,11 @@ var InternalCheckbox = function InternalCheckbox(props, ref) {
     return (
       /*#__PURE__*/
       // eslint-disable-next-line
-      _react.default.createElement("label", {
+      _react.default.createElement("label", (0, _extends2.default)({
         className: getRootClassName,
         style: style,
         ref: labelRef
-      }, /*#__PURE__*/_react.default.createElement("span", {
+      }, rest), /*#__PURE__*/_react.default.createElement("span", {
         className: checkedWrapperClassName
       }, selected && /*#__PURE__*/_react.default.createElement("span", {
         className: innerIconClassName

package/lib/city-picker/no-data.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const NoData: () => JSX.Element;
 export default NoData;

package/lib/date-picker/calendar.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DateType, PickerMode, SharedTimeProps } from './interface';
 import { RangeShowTimeObject } from './range-picker';
 export interface CalendarProps {

package/lib/date-picker/panel/month/month.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DateType } from '../../interface';
 export declare const monthsNumToText: string[];
 export interface MonthProps {

package/lib/date-picker/panel/quarter/quarter.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DateType } from '../../interface';
 interface QuarterProps {
     disabledDate?: (date: DateType) => boolean;

package/lib/date-picker/panel/time/time.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DateType, DisabledTimes, PanelSharedProps, PickerMode } from '../../interface';
 export interface SharedTimeProps extends DisabledTimes {
     format?: string;

package/lib/date-picker/panel/week/week.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DateType, PickerMode } from '../../interface';
 export interface WeekProps {
     day: DateType;

package/lib/date-picker/panel/year/year.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { DateType } from '../../interface';
 export interface YearProps {
     yearItemNumber: number;

package/lib/date-picker/utils/get-ranges.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Components, RangeList, InnerLocale } from '../interface';
 export interface RangesProps {
     prefixCls: string;

package/lib/dropdown/dropdown.js

@@ -36,7 +36,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var findItem = function findItem(element) {
-  var isItem = element.className === 'kd-dropdown-menu-item';
+  var isItem = /kd-dropdown-menu-item/.test(element.className);
 
   if (isItem) {
     return element;

package/lib/empty/defaultEmptyImg.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare function DefaultEmptyImg(): JSX.Element;
 export default DefaultEmptyImg;

package/lib/empty/illustrationEmptyImg.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare function IllustrationEmptyImg(): JSX.Element;
 export default IllustrationEmptyImg;

package/lib/modal/style/index.css

@@ -236,14 +236,8 @@
   font-size: var(--kd-c-modal-footer-font-size, 14px);
   color: var(--kd-c-modal-footer-text-color, var(--kd-g-color-text-secondary, #666));
 }
-.kd-modal-ok-btn,
-.kd-modal-cancel-btn {
-  min-width: 88px;
-  min-height: 32px;
-  font-size: var(--kd-c-modal-footer-font-size, 14px);
-}
 .kd-modal-margin-btn {
-  margin-right: 20px;
+  margin-right: var(--kd-c-modal-footer-button-spacing, 12px);
 }
 .kd-modal-showline .kd-modal-header {
   border-bottom: var(--kd-c-modal-sizing-border, 1px) solid var(--kd-c-modal-color-border, var(--kd-g-color-border-strong-2, #d9d9d9));

package/lib/modal/style/index.less

@@ -113,14 +113,8 @@
     // });
   }
 
-  &-ok-btn,
-  &-cancel-btn {
-    min-width: 88px;
-    min-height: 32px;
-    font-size: @modal-footer-font-size;
-  }
   &-margin-btn {
-    margin-right: 20px;
+    margin-right: @modal-footer-button-spacing;
   }
 }
 

package/lib/modal/style/token.less

@@ -38,9 +38,12 @@
 @icon-circle-radiu: var(~'@{modal-prefix}-icon-circle-sizing', 6px);
 @modal-border-width: var(~'@{modal-prefix}-sizing-border', 1px);
 @modal-close-icon-size: var(~'@{modal-prefix}-close-icon-font-size', 16px);
-@modal-header-sizing-padding-horizontal: var(~'@{modal-prefix}-header-sizing-padding-horizontal', 20px);
-@modal-header-sizing-padding-vertical: var(~'@{modal-prefix}-header-sizing-padding-vertical', 0px);
 @modal-header-sizing-height: var(~'@{modal-prefix}-header-sizing-height', 50px);
-@modal-body-sizing-padding: var(~'@{modal-prefix}-body-sizing-padding', 20px);
 @modal-footer-sizing-height: var(~'@{modal-prefix}-footer-sizing-height', 50px);
-@modal-title-icon-sizing-margin-right: var(~'@{modal-prefix}-title-icon-sizing-margin-right', 8px);
+
+// spacing
+@modal-footer-button-spacing: var(~'@{modal-prefix}-footer-button-spacing', 12px);
+@modal-title-icon-sizing-margin-right: var(~'@{modal-prefix}-title-icon-sizing-margin-right', 8px);
+@modal-header-sizing-padding-horizontal: var(~'@{modal-prefix}-header-sizing-padding-horizontal', 20px);
+@modal-header-sizing-padding-vertical: var(~'@{modal-prefix}-header-sizing-padding-vertical', 0px);
+@modal-body-sizing-padding: var(~'@{modal-prefix}-body-sizing-padding', 20px);

package/lib/progress/progress.js

@@ -93,7 +93,7 @@ var Progress = function Progress(props) {
 
   var progressStatus = getProgressStatus(progressProps);
   var progressPrefixCls = getPrefixCls(prefixCls, 'progress', customPrefixcls);
-  var progressClasses = (0, _classnames.default)(progressPrefixCls, className, (_classNames = {}, (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context = "".concat(progressPrefixCls, "-type-")).call(_context, type), type), (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context2 = "".concat(progressPrefixCls, "-status-")).call(_context2, progressStatus), true), (0, _defineProperty2.default)(_classNames, "".concat(progressPrefixCls, "-show-info"), showInfo), _classNames));
+  var progressClasses = (0, _classnames.default)(progressPrefixCls, className, (_classNames = {}, (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context = "".concat(progressPrefixCls, "-type-")).call(_context, type), type), (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context2 = "".concat(progressPrefixCls, "-status-")).call(_context2, progressStatus), true), (0, _defineProperty2.default)(_classNames, "".concat(progressPrefixCls, "-show-info"), showInfo), (0, _defineProperty2.default)(_classNames, "".concat(progressPrefixCls, "-position-bottom"), progressProps.infoPosition !== 'right' && progressStatus === 'normal'), _classNames));
 
   var renderProgressInfo = function renderProgressInfo(prefixCls, progressStatus, props) {
     var _props$type = props.type,

package/lib/progress/style/index.css

@@ -115,9 +115,19 @@
 }
 .kd-progress-type-line {
   width: 100%;
+  color: var(--kd-c-progress-line-color-font, #212121);
+}
+.kd-progress-type-line .kd-progress-special-text {
+  margin-top: var(--kd-c-progress-line-text-spacing-margin-top, 12px);
+  line-height: 24px;
+}
+.kd-progress-type-circle {
+  color: var(--kd-c-progress-circle-color-font, #666);
 }
 .kd-progress-type-circle .kd-progress-special-text {
+  margin-top: var(--kd-c-progress-circle-text-spacing-margin-top, 8px);
   padding: 0;
+  line-height: 24px;
 }
 .kd-progress-outer {
   display: inline-block;
@@ -129,9 +139,9 @@
   padding-right: 0;
   font-size: 0;
 }
-.kd-progress-show-info .kd-progress-outer {
-  margin-right: calc(-1 * var(--kd-c-progress-line-text-font-size, 16px) * 3 - 8px);
-  padding-right: calc(var(--kd-c-progress-line-text-font-size, 16px) * 3 + 8px);
+.kd-progress-show-info:not(.kd-progress-position-bottom) .kd-progress-outer {
+  margin-right: calc(-1 * var(--kd-c-progress-line-text-font-size, 16px) * 2 - 8px);
+  padding-right: calc(var(--kd-c-progress-line-text-font-size, 16px) * 2 + 8px);
 }
 .kd-progress-inner {
   position: relative;
@@ -165,7 +175,7 @@
   display: inline-block;
   -webkit-box-sizing: border-box;
           box-sizing: border-box;
-  width: calc(var(--kd-c-progress-line-text-font-size, 16px)*3);
+  width: calc(var(--kd-c-progress-line-text-font-size, 16px)*2);
   margin-left: var(--kd-c-progress-line-text-spacing-margin-left, 8px);
   white-space: nowrap;
   text-align: left;
@@ -176,7 +186,10 @@
   font-size: var(--kd-c-progress-line-special-text-font-size, 16px);
   text-align: center;
   overflow: hidden;
-  padding-right: calc(var(--kd-c-progress-line-text-font-size, 16px)*3 + 8px);
+  padding-right: calc(var(--kd-c-progress-line-text-font-size, 16px)*2 + 8px);
+}
+.kd-progress-position-bottom .kd-progress-special-text {
+  padding-right: 0;
 }
 .kd-progress-status-success .kd-progress-bg {
   background-color: var(--kd-c-progress-color-success, var(--kd-g-color-success, #1ba854));

package/lib/progress/style/index.less

@@ -14,11 +14,21 @@
 
   &-type-line {
     width: 100%;
+    color: @progress-line-font-color;
+
+    .@{progress-prefix-cls}-special-text {
+      margin-top: @progress-line-text-margin-top;
+      line-height: 24px;
+    }
   }
 
   &-type-circle {
+    color: @progress-circle-font-color;
+
     .@{progress-prefix-cls}-special-text {
+      margin-top: @progress-circle-text-margin-top;
       padding: 0;
+      line-height: 24px;
     }
   }
 
@@ -31,9 +41,9 @@
     padding-right: 0;
     font-size: 0;
 
-    .@{progress-prefix-cls}-show-info & {
-      margin-right: calc(-1 * @progress-line-text-font-size * 3 - 8px);
-      padding-right: calc(@progress-line-text-font-size * 3 + 8px);
+    .@{progress-prefix-cls}-show-info:not(.@{progress-prefix-cls}-position-bottom) & {
+      margin-right: calc(-1 * @progress-line-text-font-size * 2 - 8px);
+      padding-right: calc(@progress-line-text-font-size * 2 + 8px);
     }
   }
 
@@ -71,7 +81,7 @@
   &-text {
     display: inline-block;
     box-sizing: border-box;
-    width: calc(@progress-line-text-font-size*3);
+    width: calc(@progress-line-text-font-size*2);
     margin-left: @progress-line-text-margin-left;
     // font-size: @progress-line-text-font-size;
     // line-height: 1;
@@ -85,7 +95,11 @@
     font-size: @progress-line-special-text-font-size;
     text-align: center;
     overflow: hidden;
-    padding-right: calc(@progress-line-text-font-size*3 + 8px);
+    padding-right: calc(@progress-line-text-font-size*2 + 8px);
+
+    .@{progress-prefix-cls}-position-bottom & {
+      padding-right: 0;
+    }
   }
 
   &-status-success {

package/lib/progress/style/token.less

@@ -4,6 +4,8 @@
 
 // color
 @progress-remaining-color: var(~'@{progress-prefix}-color-remaining', #e5e5e5);//背景色
+@progress-line-font-color: var(~'@{progress-prefix}-line-color-font', #212121);
+@progress-circle-font-color: var(~'@{progress-prefix}-circle-color-font', #666);
 @progress-default-color: var(~'@{progress-prefix}-color-default', #5582f3);//进度条 默认色
 @progress-success-color: var(~'@{progress-prefix}-color-success', @color-success);//进度条 成功
 @progress-failure-color: var(~'@{progress-prefix}-color-failure', @color-error);//进度条 失败
@@ -27,6 +29,8 @@
 
 
 // spacing
-@progress-circle-unit-margin-top: var(~'@{progress-prefix}-circle-unit-spacing-margin-top', 18px);
+@progress-circle-unit-margin-top: var(~'@{progress-prefix}-circle-unit-spacing-margin-top', 18px); // 百分比符号距离顶部的距离
 @progress-line-text-margin-left: var(~'@{progress-prefix}-line-text-spacing-margin-left', 8px); //进度与文字或者图标的间距
+@progress-line-text-margin-top: var(~'@{progress-prefix}-line-text-spacing-margin-top', 12px);
+@progress-circle-text-margin-top: var(~'@{progress-prefix}-circle-text-spacing-margin-top', 8px);
 

package/lib/slider/track.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface trackProps {
     prefixCls: string;
     vertical: boolean;

package/lib/style/themes/default.less

@@ -31,7 +31,7 @@
 @warning-border-color: #ffcb78; // 警示反馈浮层的容器边框色
 @error-color: #fb2323; // 失败色(深)
 @error-bg-color: #fff2f4; // 失败反馈浮层的底色
-@error-border-color: #ff8088; // 失败反馈浮层的容器边框色
+@error-border-color: #fc808B; // 失败反馈浮层的容器边框色
 @ongoing-color: #276ff5; // 进行中(深)
 @ongoing-bg-color: #f2f9ff; // 进行中反馈浮层的底色
 @ongoing-border-color: #85b8ff; // 进行中反馈浮层的容器边框色

package/lib/table/table.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { TableProps } from './interface';
 declare function Table(props: TableProps): JSX.Element;
 export default Table;