@kdcloudjs/kdesign 1.8.22 → 1.8.23

package/lib/color-picker/color-picker.js

@@ -26,6 +26,7 @@ var _color = _interopRequireDefault(require("color"));
 var _utils = require("../_utils");
 var _usePopper = _interopRequireDefault(require("../_utils/usePopper"));
 var _systemPresetColor = require("./constant/systemPresetColor");
+var _removeTransparency = require("./utils/removeTransparency");
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 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) {
@@ -36,7 +37,7 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   }
   return t;
 };
-var ColorPicker = function ColorPicker(props) {
+var InternalColorPicker = function InternalColorPicker(props, ref) {
   var _useContext = (0, _react.useContext)(_configProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls,
     prefixCls = _useContext.prefixCls,
@@ -63,13 +64,15 @@ var ColorPicker = function ColorPicker(props) {
     placeholder = colorPickerProps.placeholder,
     defaultValue = colorPickerProps.defaultValue,
     defaultOpen = colorPickerProps.defaultOpen,
+    disabled = colorPickerProps.disabled,
     visible = colorPickerProps.visible,
+    scrollHidden = colorPickerProps.scrollHidden,
     popperClassName = colorPickerProps.popperClassName,
     suffixIcon = colorPickerProps.suffixIcon,
     prefixIcon = colorPickerProps.prefixIcon,
     onChange = colorPickerProps.onChange,
     onVisibleChange = colorPickerProps.onVisibleChange,
-    otherProps = __rest(colorPickerProps, ["value", "className", "style", "pure", "functionalColor", "functionalColorName", "switchName", "showAlphaInput", "showClear", "showSwitch", "showColorTransfer", "showPresetColor", "showColorPickerBox", "format", "panelFormatConfig", "borderType", "presetColor", "historicalColor", "placeholder", "defaultValue", "defaultOpen", "visible", "popperClassName", "suffixIcon", "prefixIcon", "onChange", "onVisibleChange"]);
+    otherProps = __rest(colorPickerProps, ["value", "className", "style", "pure", "functionalColor", "functionalColorName", "switchName", "showAlphaInput", "showClear", "showSwitch", "showColorTransfer", "showPresetColor", "showColorPickerBox", "format", "panelFormatConfig", "borderType", "presetColor", "historicalColor", "placeholder", "defaultValue", "defaultOpen", "disabled", "visible", "scrollHidden", "popperClassName", "suffixIcon", "prefixIcon", "onChange", "onVisibleChange"]);
   var _useState = (0, _react.useState)(defaultValue || ''),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     inputColorValue = _useState2[0],
@@ -191,6 +194,7 @@ var ColorPicker = function ColorPicker(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(getCurrentOutputColor(), formatArr);
   };
   var handleClick = function handleClick() {
+    if (disabled) return;
     if (typeof visible === 'undefined') {
       setShowPanel(!showPanel);
     }
@@ -215,19 +219,27 @@ var ColorPicker = function ColorPicker(props) {
       }
     }
   }, [value, defaultValue]);
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      dom: inputRef.current
+    };
+  });
   var beforeIcon = (0, _react.useCallback)(function () {
     var _classNames2;
     var afterIconContainerCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-icon"), (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "".concat(colorPickerPrefixCls, "-icon-underline"), borderType === 'underline'), (0, _defineProperty2.default)(_classNames2, "".concat(colorPickerPrefixCls, "-icon-bordered"), borderType === 'bordered'), _classNames2));
+    var getBgc = function getBgc() {
+      return inputCorrectColorValue ? colTypeArr[2].value : (0, _removeTransparency.removeTransparency)(colTypeArr[2].value, currentColorType);
+    };
     var noneLineCls = "".concat(colorPickerPrefixCls, "-icon-no-color-line");
     return _react.default.createElement("div", {
       className: afterIconContainerCls,
       style: {
-        backgroundColor: "".concat(colTypeArr[2].value || _defaultColor.defaultSystemColor)
+        backgroundColor: getBgc() || _defaultColor.defaultSystemColor
       }
     }, !(0, _validateColor.validateColor)(value) && !inputCorrectColorValue && _react.default.createElement("div", {
       className: noneLineCls
     }));
-  }, [borderType, colTypeArr, colorPickerPrefixCls, inputCorrectColorValue, value]);
+  }, [borderType, colTypeArr, colorPickerPrefixCls, currentColorType, inputCorrectColorValue, value]);
   var colorInputEle = _react.default.createElement("div", {
     className: containerCls,
     ref: inputRef,
@@ -235,6 +247,7 @@ var ColorPicker = function ColorPicker(props) {
   }, _react.default.createElement(_index.Input, {
     borderType: pure ? 'bordered' : borderType,
     placeholder: placeholder,
+    disabled: disabled,
     value: value !== null && value !== void 0 ? value : inputColorValue,
     className: inputCls,
     onChange: handleChange,
@@ -263,6 +276,7 @@ var ColorPicker = function ColorPicker(props) {
     panelFormatConfig: panelFormatConfig,
     presetColor: presetColor,
     historicalColor: historicalColor,
+    scrollHidden: scrollHidden,
     value: value,
     visible: visible,
     showPanel: showPanel,
@@ -302,6 +316,7 @@ var ColorPicker = function ColorPicker(props) {
   });
   return (0, _usePopper.default)(colorInputEle, panel, popperProps);
 };
+var ColorPicker = (0, _react.forwardRef)(InternalColorPicker);
 ColorPicker.displayName = 'ColorPicker';
 var _default = ColorPicker;
 exports.default = _default;

package/lib/color-picker/interface.d.ts

@@ -6,6 +6,9 @@ export interface IColorTypesObj {
     type: ColorType;
     value: string;
 }
+export interface IColorPickerInputRef {
+    dom: HTMLDivElement | null;
+}
 export declare const BorderTypes: ["underline", "bordered"];
 export declare type BorderType = typeof BorderTypes[number];
 export interface IInnerFormat {
@@ -15,8 +18,10 @@ export interface IInnerFormat {
 export interface IColorPickerProps extends PopperProps {
     borderType: BorderType;
     className: string;
+    children: ReactNode;
     defaultValue: string;
     defaultOpen: boolean;
+    disabled: boolean;
     functionalColorName: string;
     functionalColor: string;
     format: Exclude<typeof ColorTypes[number], 'themeColor'>;
@@ -83,6 +88,7 @@ export interface IColorPickerPanelProps {
     value: string;
     visible: boolean;
     showPanel: boolean;
+    scrollHidden: boolean;
     setCurrentColorType: (currentColorType: IColorTypesObj['type']) => void;
     setColTypeArr: (colTypeArr: Array<IColorTypesObj>) => void;
     setClickedPresetColorIndex: (clickedColorIndex: number) => void;

package/lib/color-picker/style/index.css

@@ -136,7 +136,6 @@
   height: 100%;
   width: 100%;
   padding: 0 8px;
-  border-bottom: 1px solid #d9d9d9;
   font-size: var(--kd-c-color-picker-input-font-size, var(--kd-g-font-size-middle, 14px));
 }
 .kd-color-picker-container .kd-color-picker-icon-container {
@@ -171,15 +170,27 @@
   width: var(--kd-c-color-picker-panel-sizing-width, 304px);
 }
 .kd-color-picker-pop.topLeft.hidden,
+.kd-color-picker-pop.topRight.hidden {
+  -webkit-animation-name: kdSlideDownOut;
+          animation-name: kdSlideDownOut;
+}
+.kd-color-picker-pop.topLeft,
+.kd-color-picker-pop.topRight {
+  -webkit-animation-name: kdSlideDownIn;
+          animation-name: kdSlideDownIn;
+}
 .kd-color-picker-pop.bottomLeft.hidden,
-.kd-color-picker-pop.topRight.hidden,
 .kd-color-picker-pop.bottomRight.hidden {
-  opacity: 0;
-  visibility: hidden;
-  -webkit-transition: all calc(0.3s - 0.1s) cubic-bezier(0.4, 0, 0.6, 1);
-  transition: all calc(0.3s - 0.1s) cubic-bezier(0.4, 0, 0.6, 1);
+  -webkit-animation-name: kdSlideUpOut;
+          animation-name: kdSlideUpOut;
+}
+.kd-color-picker-pop.bottomLeft,
+.kd-color-picker-pop.bottomRight {
+  -webkit-animation-name: kdSlideUpIn;
+          animation-name: kdSlideUpIn;
 }
 .kd-color-picker-pop .kd-color-picker-panel {
+  position: relative;
   -webkit-box-sizing: border-box;
           box-sizing: border-box;
   width: var(--kd-c-color-picker-panel-sizing-width, 304px);

package/lib/color-picker/style/index.less

@@ -36,7 +36,6 @@
     height: 100%;
     width: 100%;
     padding: 0 8px;
-    border-bottom: 1px solid rgba(217, 217, 217, 1);
     font-size: @color-picker-input-font-size;
   }
 
@@ -70,15 +69,27 @@
   width: @color-picker-panel-sizing-width;
 
   &.topLeft.hidden,
+  &.topRight.hidden {
+    animation-name: kdSlideDownOut;
+  }
+
+  &.topLeft,
+  &.topRight {
+    animation-name: kdSlideDownIn;
+  }
+
   &.bottomLeft.hidden,
-  &.topRight.hidden,
   &.bottomRight.hidden {
-    opacity: 0;
-    visibility: hidden;
-    transition: all calc(@transition-duration - 0.1s) @ease;
+    animation-name: kdSlideUpOut;
+  }
+
+  &.bottomLeft,
+  &.bottomRight {
+    animation-name: kdSlideUpIn;
   }
 
   .@{color-picker-prefix-cls}-panel {
+    position: relative;
     box-sizing: border-box;
     width: @color-picker-panel-sizing-width;
     padding: 4px 12px 16px;

package/lib/color-picker/utils/removeTransparency.d.ts

@@ -0,0 +1,3 @@
+import { ColorTypes } from '../interface';
+export declare type ICurrentColorType = Exclude<typeof ColorTypes[number], 'themeColor'>;
+export declare const removeTransparency: (color: string, currentColorType: ICurrentColorType) => string;

package/lib/color-picker/utils/removeTransparency.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.removeTransparency = void 0;
+var _colorFormat = require("./colorFormat");
+var removeTransparency = function removeTransparency(color, currentColorType) {
+  return (0, _colorFormat.colorFormat)(color, 1, currentColorType, true);
+};
+exports.removeTransparency = removeTransparency;

package/lib/config-provider/compDefaultProps.d.ts

@@ -73,6 +73,7 @@ declare const compDefaultProps: {
             internationalName: string;
         };
         placeholder: string;
+        scrollHidden: boolean;
         pure: boolean;
         showAlphaInput: boolean;
         showClear: boolean;

package/lib/config-provider/compDefaultProps.js

@@ -83,6 +83,7 @@ var compDefaultProps = {
       internationalName: 'followFunctionalColor'
     },
     placeholder: '#',
+    scrollHidden: false,
     pure: false,
     showAlphaInput: true,
     showClear: true,

package/lib/icon/icon.js

@@ -11,6 +11,7 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
+var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -46,7 +47,8 @@ var InternalIcon = function InternalIcon(props, ref) {
   var innerRef = _react.default.useRef();
   var iconRef = ref || innerRef;
   var iconPrefix = getPrefixCls(prefixCls, 'icon', customPrefixcls);
-  var iconPrefixCls = iconPrefix.replace(/-/g, '');
+  var lastDashIndex = iconPrefix.lastIndexOf('-');
+  var iconPrefixCls = lastDashIndex > -1 ? (0, _slice.default)(iconPrefix).call(iconPrefix, 0, lastDashIndex) + (0, _slice.default)(iconPrefix).call(iconPrefix, lastDashIndex + 1) : iconPrefix;
   var iconClass = (0, _classnames.default)(iconPrefixCls, className, (_classNames = {}, (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context = "".concat(iconPrefixCls, "-")).call(_context, type), type), (0, _defineProperty2.default)(_classNames, "icon-spin", spin), _classNames));
   var handleClick = function handleClick(e) {
     onClick && onClick(e);

package/lib/input/style/index.css

@@ -236,7 +236,7 @@ textarea {
 .kd-input-disabled {
   background-color: var(--kd-c-input-color-background-disabled, var(--kd-g-color-background-contain-disabled, #f5f5f5));
   border-color: var(--kd-c-input-color-border-disabled, var(--kd-g-color-border-strong, #d9d9d9));
-  color: var(--kd-c-input-affix-color-text, #666);
+  color: var(--kd-g-color-text-primary, #212121);
   cursor: not-allowed;
 }
 .kd-input-underline.kd-input-disabled {
@@ -372,7 +372,7 @@ textarea {
       -ms-flex-pack: center;
           justify-content: center;
   word-break: keep-all;
-  color: var(--kd-c-input-affix-color-text, #666);
+  color: var(--kd-c-input-affix-color-text, #999);
 }
 .kd-input-wrapper-size-small {
   height: var(--kd-c-input-sizing-height-small, 20px);
@@ -571,7 +571,7 @@ textarea {
 }
 .kd-input-group-wrapper .kd-input-group .kd-input-group-addon {
   position: relative;
-  color: var(--kd-c-input-affix-color-text, #666);
+  color: var(--kd-c-input-affix-color-text, #999);
   padding: 0 9px;
   font-weight: 400;
   font-size: 14px;

package/lib/input/style/index.less

@@ -78,7 +78,7 @@ textarea {
   &-disabled {
     background-color: @input-background-color-disabled-inner;
     border-color: @input-border-color-disabled-inner;
-    color: @input-affix-color;
+    color: @color-text-primary;
     cursor: not-allowed;
   }
 

package/lib/input/style/token.less

@@ -14,7 +14,7 @@
 @input-border-color-disabled-inner: var(~'@{input-prefix}-color-border-disabled', @color-border-strong);
 @input-underline-border-color-disabled-inner: var(~'@{input-prefix}-underline-color-border-disabled', @color-border-weak);
 @input-color-disabled-inner: var(~'@{input-prefix}-color-disabled', @color-disabled);
-@input-affix-color: var(~'@{input-prefix}-affix-color-text', #666);
+@input-affix-color: var(~'@{input-prefix}-affix-color-text', #999);
 @input-error-color: var(~'@{input-prefix}-color-error', @color-error);
 
 // font

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.8.22",
+  "version": "1.8.23",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [