@kdcloudjs/kdesign 1.5.8 → 1.5.11

package/lib/alert/style/index.less

@@ -42,7 +42,6 @@
   &-container {
     z-index: @z-index-apex;
     display: none;
-    width: 100%;
     padding: @alert-padding-vertical @alert-padding-horizontal;
     align-items: center;
     transition: display 3s;

package/lib/button/style/index.css

@@ -118,6 +118,9 @@
   text-align: center;
   background-color: transparent;
   cursor: pointer;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
   -webkit-transition: color 0.3s, background-color 0.3s, border-color 0.3s;
   transition: color 0.3s, background-color 0.3s, border-color 0.3s;
 }

package/lib/button/style/mixin.less

@@ -14,6 +14,9 @@
 	text-align: center;
 	background-color: transparent;
 	cursor: pointer;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
   &,
   &:active,
   &:focus {

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/config-provider/compDefaultProps.d.ts

@@ -106,6 +106,7 @@ declare const compDefaultProps: {
         placement: string;
         width: number;
         zIndex: number;
+        disableScroll: boolean;
     };
     Empty: {};
     Filter: {

package/lib/config-provider/compDefaultProps.js

@@ -129,7 +129,8 @@ var compDefaultProps = {
     maskClosable: true,
     placement: 'right',
     width: 320,
-    zIndex: 1050
+    zIndex: 1050,
+    disableScroll: true
   },
   Empty: {},
   Filter: {

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/date-picker.js

@@ -23,8 +23,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _parse = _interopRequireDefault(require("date-fns/parse"));
-
 var _ConfigContext = _interopRequireDefault(require("../config-provider/ConfigContext"));
 
 var _hooks = require("../_utils/hooks");
@@ -211,19 +209,21 @@ function DatePicker(props) {
   var _useTextValueMapping = (0, _useTextValueMapping3.default)({
     valueText: valueText,
     onTextChange: function onTextChange(newText) {
-      // if (typeof _format !== 'function') {
-      var inputDate;
-
-      if (picker !== 'year') {
-        inputDate = (0, _dateFns.parseDate)(newText, _format);
-      } else {
-        var year = (0, _parse.default)(newText, _format, (0, _dateFns.newDate)());
-        inputDate = (0, _dateFns.isValid)(year) ? year : null;
-      }
-
-      if (inputDate && (!disabledDate || !disabledDate(inputDate))) {
-        setSelectedValue(inputDate);
-        setViewDate(inputDate);
+      if (newText === '') {
+        setSelectedValue(null);
+        setDateValue(null);
+      } else if (newText && newText.length === _format.length) {
+        var inputTempDate = (0, _dateFns.parseDate)(newText, _format);
+
+        if (inputTempDate && (!disabledDate || !disabledDate(inputTempDate))) {
+          if (picker !== 'year') {
+            setSelectedValue(inputTempDate);
+            setDateValue(inputTempDate);
+          } else if ((0, _dateFns.isValid)(inputTempDate)) {
+            setSelectedValue(inputTempDate);
+            setDateValue(inputTempDate);
+          }
+        }
       }
     }
   }),

package/lib/date-picker/hooks/use-picker-input.js

@@ -7,11 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = usePickerInput;
 
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
+
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 
 var _react = require("react");
 
-// import KeyCode from '../../_utils/KeyCode'
+var _KeyCode = _interopRequireDefault(require("../../_utils/KeyCode"));
+
 function usePickerInput(_ref) {
   var preventBlurRef = _ref.preventBlurRef,
       open = _ref.open,
@@ -40,42 +43,47 @@ function usePickerInput(_ref) {
       setTyping(true);
       triggerOpen(true);
     },
-    // onKeyDown: (e) => {
-    //   switch (e.which) {
-    //     case KeyCode.ENTER: {
-    //       if (!open) {
-    //         triggerOpen(true)
-    //       } else if (onSubmit() !== false) {
-    //         setTyping(true)
-    //       }
-    //       e.preventDefault()
-    //       return
-    //     }
-    //     case KeyCode.TAB: {
-    //       if (typing && open && !e.shiftKey) {
-    //         setTyping(false)
-    //         e.preventDefault()
-    //       } else if (!typing && open) {
-    //         if (!forwardKeyDown(e) && e.shiftKey) {
-    //           setTyping(true)
-    //           e.preventDefault()
-    //         }
-    //       }
-    //       return
-    //     }
-    //     case KeyCode.ESC: {
-    //       setTyping(true)
-    //       onCancel()
-    //       return
-    //     }
-    //   }
-    //   if (!open && ![KeyCode.SHIFT].includes(e.which)) {
-    //     triggerOpen(true)
-    //   } else if (!typing) {
-    //     // Let popup panel handle keyboard
-    //     forwardKeyDown(e)
-    //   }
-    // },
+    onKeyDown: function onKeyDown(e) {
+      var _context;
+
+      setTyping(true);
+      triggerOpen(true);
+
+      switch (e.which) {
+        case _KeyCode.default.ENTER:
+          {
+            if (!open) {
+              triggerOpen(true);
+            } else if (onSubmit() !== false) {
+              setTyping(true);
+            }
+
+            e.preventDefault();
+            return;
+          }
+
+        case _KeyCode.default.TAB:
+          {
+            if (typing && open && !e.shiftKey) {
+              setTyping(false);
+              e.preventDefault();
+            }
+
+            return;
+          }
+
+        case _KeyCode.default.ESC:
+          {
+            setTyping(true);
+            onCancel();
+            return;
+          }
+      }
+
+      if (!open && !(0, _includes.default)(_context = [_KeyCode.default.SHIFT]).call(_context, e.which)) {
+        triggerOpen(true);
+      }
+    },
     onFocus: function onFocus(e) {
       setTyping(true);
       setFocused(true);

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/range-picker.js

@@ -29,8 +29,6 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _isSameWeek = _interopRequireDefault(require("date-fns/isSameWeek"));
 
-var _parse = _interopRequireDefault(require("date-fns/parse"));
-
 var _ConfigContext = _interopRequireDefault(require("../config-provider/ConfigContext"));
 
 var _hooks = require("../_utils/hooks");
@@ -304,20 +302,32 @@ function DatePicker(props) {
   });
 
   var _onTextChange = function onTextChange(newText, index) {
-    var inputDate;
-
-    if (picker !== 'year') {
-      inputDate = (0, _dateFns.parseDate)(newText, _format);
-    } else {
-      var year = (0, _parse.default)(newText, _format, (0, _dateFns.newDate)());
-      inputDate = (0, _dateFns.isValid)(year) ? year : null;
-    }
+    var inputTempDate;
 
-    var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
+    if (newText === '') {
+      if (index === 0 && selectedValue && selectedValue.length === 2) {
+        inputTempDate = selectedValue[1];
+      } else if (index === 1 && selectedValue && selectedValue.length === 2) {
+        inputTempDate = selectedValue[0];
+      }
 
-    if (inputDate && (!disabledFunc || !disabledFunc(inputDate))) {
-      setSelectedValue((0, _utils2.updateValues)(selectedValue, inputDate, index));
-      setViewDate(inputDate, index);
+      if (inputTempDate) {
+        setSelectedValue((0, _utils2.updateValues)(selectedValue, inputTempDate, index));
+        setViewDate(inputTempDate, index);
+      }
+    } else if (newText && newText.length === _format.length) {
+      inputTempDate = (0, _dateFns.parseDate)(newText, _format);
+      var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
+
+      if (inputTempDate && (!disabledFunc || !disabledFunc(inputTempDate))) {
+        if (picker !== 'year') {
+          setSelectedValue((0, _utils2.updateValues)(selectedValue, inputTempDate, index));
+          setViewDate(inputTempDate, index);
+        } else if ((0, _dateFns.isValid)(inputTempDate)) {
+          setSelectedValue((0, _utils2.updateValues)(selectedValue, inputTempDate, index));
+          setViewDate(inputTempDate, index);
+        }
+      }
     }
   }; // input 展示
 

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/drawer/drawer.d.ts

@@ -36,6 +36,7 @@ export interface IDrawerProps {
     width?: string | number;
     height?: string | number;
     zIndex?: string | number;
+    disableScroll?: boolean;
 }
 declare const Drawer: React.ForwardRefExoticComponent<IDrawerProps & React.RefAttributes<unknown>>;
 export default Drawer;

package/lib/drawer/drawer.js

@@ -73,6 +73,8 @@ var documentBody = document.body; // function transformSize(size: string | numbe
 var InternalDrawer = function InternalDrawer(props, ref) {
   var _classNames, _context2, _context3, _classNames2;
 
+  var _a;
+
   var _useContext = (0, _react.useContext)(_ConfigContext.default),
       getPrefixCls = _useContext.getPrefixCls,
       prefixCls = _useContext.prefixCls,
@@ -106,7 +108,8 @@ var InternalDrawer = function InternalDrawer(props, ref) {
       getContainer = drawerProps.getContainer,
       forceRender = drawerProps.forceRender,
       destroyOnClose = drawerProps.destroyOnClose,
-      customPrefixcls = drawerProps.prefixCls;
+      customPrefixcls = drawerProps.prefixCls,
+      disableScroll = drawerProps.disableScroll;
   var drawerPrefixCls = getPrefixCls(prefixCls, 'drawer', customPrefixcls);
 
   var _useState = (0, _react.useState)(false),
@@ -174,7 +177,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
 
     return drawerContainer || ((_a = containerRef.current) === null || _a === void 0 ? void 0 : _a.parentNode);
   }, handleContainerResize);
-  (0, _hooks.useHideDocumentScrollBar)(!!visible, isBody, !!mask); // 为了单测
+  (0, _hooks.useOverflowHidden)(drawerContainer || ((_a = containerRef.current) === null || _a === void 0 ? void 0 : _a.parentNode), visible && mask, disableScroll); // 为了单测
 
   (0, _react.useEffect)(function () {
     setCurrentWidth(width);

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/notification-base/notification.js

@@ -84,10 +84,11 @@ var Notification = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   };
 
   var remove = function remove(key) {
-    var filter = (0, _filter.default)(notices).call(notices, function (notice) {
-      return notice.key !== key;
+    setNotices(function (preNotices) {
+      return (0, _filter.default)(preNotices).call(preNotices, function (notice) {
+        return notice.key !== key;
+      });
     });
-    setNotices(filter);
   };
 
   var _onClose = function onClose(notice) {

package/lib/pagination/style/index.css

@@ -430,9 +430,7 @@
 }
 .kd-pagination.less .kd-pagination-pages-item:hover button,
 .kd-pagination.less .kd-pagination-pages-item:active button,
-.kd-pagination.less .kd-pagination-pages-item.active button,
-.kd-pagination.less .kd-pagination-pages-item:first-child button,
-.kd-pagination.less .kd-pagination-pages-item:last-child button {
+.kd-pagination.less .kd-pagination-pages-item.active button {
   color: var(--kd-g-color-theme, #5582f3);
 }
 .kd-pagination.less .kd-pagination-pages-item:first-child button,

package/lib/pagination/style/index.less

@@ -314,9 +314,7 @@
 
         &:hover,
         &:active,
-        &.active,
-        &:first-child,
-        &:last-child {
+        &.active {
           button {
             color: @color-theme;
           }

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));