@kdcloudjs/kdesign 1.8.3 → 1.8.4

package/es/base-data/base-data.js

@@ -200,7 +200,7 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     var _a;
     var inputDom = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input;
     if (!inputDom) return;
-    if (inputDom.scrollWidth - inputDom.offsetWidth > 0) {
+    if (inputDom.scrollWidth - inputDom.offsetWidth > 0 && inputValue) {
       setShowTotal(true);
     } else {
       setShowTotal(false);

package/es/color-picker/color-picker-panel.js

@@ -14,8 +14,9 @@ import Color from 'color';
 import { ChromePicker } from 'react-color';
 import devWarning from '../_utils/devwarning';
 import { useOnClickOutside } from '../_utils/hooks';
+import { isIE } from '../_utils/ieUtil';
 var ColorPickerPanel = function ColorPickerPanel(props) {
-  var _classNames, _context;
+  var _classNames, _classNames2, _context;
   var setCorrectColorValue = props.setCorrectColorValue,
     setInputColorValue = props.setInputColorValue,
     setAlpha = props.setAlpha,
@@ -61,7 +62,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
   var panelContainerCls = classNames("".concat(colorPickerPrefixCls, "-panel-container"));
   var panelInputCls = classNames("".concat(colorPickerPrefixCls, "-panel-container-input"));
   var transparentCls = classNames("".concat(colorPickerPrefixCls, "-panel-container-transparent"));
-  var colorDivContainerCls = classNames("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), _defineProperty({}, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-unset-color"), (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) === 0));
+  var colorDivContainerCls = classNames("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-unset-color"), (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) === 0), _defineProperty(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-ie11"), isIE), _classNames2));
   var colorLiClick = function colorLiClick(index, colorValue) {
     var formatArr = colorFormat(colorValue, alpha);
     var formatValue = toLowerCase(formatArr[valOfCorrespondingType(currentColorType)].value);

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

@@ -314,8 +314,8 @@
 }
 .kd-color-picker-pop .kd-color-picker-panel-container-transparent {
   -webkit-box-flex: 0;
-      -ms-flex: 0 0 60px;
-          flex: 0 0 60px;
+      -ms-flex: 0 1 60px;
+          flex: 0 1 60px;
   height: 28px;
   margin-left: 8px;
   text-align: center;
@@ -328,6 +328,23 @@
   grid-row-gap: 8px;
   margin-top: 12px;
 }
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li {
+  margin-right: 8px;
+  margin-top: 8px;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(12n) {
+  margin-right: 0;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(-n+12) {
+  margin-top: 0;
+}
 .kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-unset-color {
   margin-top: 0;
 }

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

@@ -257,7 +257,7 @@
       }
 
       &-transparent {
-        flex: 0 0 60px;
+        flex: 0 1 60px;
         height: 28px;
         margin-left: 8px;
         text-align: center;
@@ -272,6 +272,24 @@
       grid-row-gap: 8px;
       margin-top: 12px;
 
+      &-ie11 {
+        display: flex;
+        flex-wrap: wrap;
+
+        li {
+          margin-right: 8px;
+          margin-top: 8px;
+
+          &:nth-child(12n) {
+            margin-right: 0;
+          }
+
+          &:nth-child(-n+12) {
+            margin-top: 0;
+          }
+        }
+      }
+
       &-unset-color {
         margin-top: 0;
       }

package/es/popper/index.d.ts

@@ -24,6 +24,7 @@ export declare type PopperProps = {
     placement?: PlacementType;
     tip?: any;
     trigger?: TriggerType | Array<TriggerType>;
+    strategy?: 'fixed' | 'absolute';
     clickToClose?: boolean;
     onTrigger?: (trigger: TriggerType) => void;
     onVisibleChange?: (visible: boolean) => void;

package/es/popper/index.js

@@ -124,6 +124,8 @@ export var Popper = /*#__PURE__*/forwardRef(function (props, ref) {
     trigger = _props$trigger === void 0 ? 'click' : _props$trigger,
     _props$placement = props.placement,
     placement = _props$placement === void 0 ? 'top' : _props$placement,
+    _props$strategy = props.strategy,
+    strategy = _props$strategy === void 0 ? 'absolute' : _props$strategy,
     visible = props.visible,
     _props$arrowSize = props.arrowSize,
     arrowSize = _props$arrowSize === void 0 ? 4.25 : _props$arrowSize,
@@ -421,7 +423,7 @@ export var Popper = /*#__PURE__*/forwardRef(function (props, ref) {
   var popperOptionsInner = {
     placement: placementInner,
     modifiers: popperModifiers,
-    strategy: 'fixed'
+    strategy: strategy
   };
   useEnhancedEffect(function () {
     var _a, _b;

package/es/popper/style/index.css

@@ -130,7 +130,7 @@
           transform: rotate(45deg);
 }
 .kd-popper[data-popper-placement^='top'] .arrow {
-  bottom: calc(0.9 * var(--arrowSize));
+  bottom: calc(1.1 * var(--arrowSize));
 }
 .kd-popper[data-popper-placement^='top'] .arrow::before {
   left: calc(-1 * var(--arrowSize));
@@ -138,7 +138,7 @@
   border-left-color: transparent;
 }
 .kd-popper[data-popper-placement^='bottom'] .arrow {
-  top: calc(-0.9 * var(--arrowSize));
+  top: calc(-0.8 * var(--arrowSize));
 }
 .kd-popper[data-popper-placement^='bottom'] .arrow::before {
   left: calc(-1 * var(--arrowSize));
@@ -146,7 +146,7 @@
   border-right-color: transparent;
 }
 .kd-popper[data-popper-placement^='left'] .arrow {
-  right: calc(0.9 * var(--arrowSize));
+  right: calc(1.1 * var(--arrowSize));
 }
 .kd-popper[data-popper-placement^='left'] .arrow::before {
   top: calc(-1 * var(--arrowSize));
@@ -154,7 +154,7 @@
   border-bottom-color: transparent;
 }
 .kd-popper[data-popper-placement^='right'] .arrow {
-  left: calc(-0.9 * var(--arrowSize));
+  left: calc(-0.8 * var(--arrowSize));
 }
 .kd-popper[data-popper-placement^='right'] .arrow::before {
   top: calc(-1 * var(--arrowSize));

package/es/popper/style/index.less

@@ -29,7 +29,7 @@
   }
 
   &[data-popper-placement^='top'] .arrow {
-    bottom: calc(0.9 * var(--arrowSize));
+    bottom: calc(1.1 * var(--arrowSize));
 
     &::before {
       left: calc(-1 * var(--arrowSize));
@@ -39,7 +39,7 @@
   }
 
   &[data-popper-placement^='bottom'] .arrow {
-    top: calc(-0.9 * var(--arrowSize));
+    top: calc(-0.8 * var(--arrowSize));
 
     &::before {
       left: calc(-1 * var(--arrowSize));
@@ -49,7 +49,7 @@
   }
 
   &[data-popper-placement^='left'] .arrow {
-    right: calc(0.9 * var(--arrowSize));
+    right: calc(1.1 * var(--arrowSize));
 
     &::before {
       top: calc(-1 * var(--arrowSize));
@@ -59,7 +59,7 @@
   }
 
   &[data-popper-placement^='right'] .arrow {
-    left: calc(-0.9 * var(--arrowSize));
+    left: calc(-0.8 * var(--arrowSize));
 
     &::before {
       top: calc(-1 * var(--arrowSize));

package/es/select/select.js

@@ -162,12 +162,12 @@ var InternalSelect = function InternalSelect(props, ref) {
               if (options && options.length) {
                 arr.push({
                   value: obj === null || obj === void 0 ? void 0 : obj.value,
-                  label: (obj === null || obj === void 0 ? void 0 : obj.label) || (obj === null || obj === void 0 ? void 0 : obj.value)
+                  label: getOptionLabel(obj) || (obj === null || obj === void 0 ? void 0 : obj.label) || (obj === null || obj === void 0 ? void 0 : obj.value)
                 });
               } else {
                 arr.push({
                   value: (_a = obj.props) === null || _a === void 0 ? void 0 : _a.value,
-                  label: (_b = obj.props) === null || _b === void 0 ? void 0 : _b.children
+                  label: getOptionLabel(obj) || ((_b = obj.props) === null || _b === void 0 ? void 0 : _b.children)
                 });
               }
             } else {

package/es/style/core/reset.less

@@ -24,8 +24,8 @@ input,
 textarea,
 select,
 button {
-  font-family: 'Microsoft YaHei', 'PingFangSC-Regular', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB',
-    'WenQuanYi Micro Hei', sans-serif;
+  font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB',
+    'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
 }
 
 body {

package/es/style/index.css

@@ -1687,7 +1687,7 @@ input,
 textarea,
 select,
 button {
-  font-family: 'Microsoft YaHei', 'PingFangSC-Regular', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+  font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB', 'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
 }
 body {
   -webkit-box-sizing: border-box;

package/lib/base-data/base-data.js

@@ -212,7 +212,7 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     var _a;
     var inputDom = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input;
     if (!inputDom) return;
-    if (inputDom.scrollWidth - inputDom.offsetWidth > 0) {
+    if (inputDom.scrollWidth - inputDom.offsetWidth > 0 && inputValue) {
       setShowTotal(true);
     } else {
       setShowTotal(false);

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

@@ -23,12 +23,13 @@ var _color = _interopRequireDefault(require("color"));
 var _reactColor = require("react-color");
 var _devwarning = _interopRequireDefault(require("../_utils/devwarning"));
 var _hooks = require("../_utils/hooks");
+var _ieUtil = require("../_utils/ieUtil");
 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; }
 /* eslint-disable */
 
 var ColorPickerPanel = function ColorPickerPanel(props) {
-  var _classNames, _context;
+  var _classNames, _classNames2, _context;
   var setCorrectColorValue = props.setCorrectColorValue,
     setInputColorValue = props.setInputColorValue,
     setAlpha = props.setAlpha,
@@ -74,7 +75,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
   var panelContainerCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-container"));
   var panelInputCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-container-input"));
   var transparentCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-container-transparent"));
-  var colorDivContainerCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), (0, _defineProperty2.default)({}, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-unset-color"), (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) === 0));
+  var colorDivContainerCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-unset-color"), (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) === 0), (0, _defineProperty2.default)(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-ie11"), _ieUtil.isIE), _classNames2));
   var colorLiClick = function colorLiClick(index, colorValue) {
     var formatArr = (0, _colorFormat.colorFormat)(colorValue, alpha);
     var formatValue = (0, _convertLetters.toLowerCase)(formatArr[(0, _colorFormat.valOfCorrespondingType)(currentColorType)].value);

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

@@ -314,8 +314,8 @@
 }
 .kd-color-picker-pop .kd-color-picker-panel-container-transparent {
   -webkit-box-flex: 0;
-      -ms-flex: 0 0 60px;
-          flex: 0 0 60px;
+      -ms-flex: 0 1 60px;
+          flex: 0 1 60px;
   height: 28px;
   margin-left: 8px;
   text-align: center;
@@ -328,6 +328,23 @@
   grid-row-gap: 8px;
   margin-top: 12px;
 }
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li {
+  margin-right: 8px;
+  margin-top: 8px;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(12n) {
+  margin-right: 0;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(-n+12) {
+  margin-top: 0;
+}
 .kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-unset-color {
   margin-top: 0;
 }

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

@@ -257,7 +257,7 @@
       }
 
       &-transparent {
-        flex: 0 0 60px;
+        flex: 0 1 60px;
         height: 28px;
         margin-left: 8px;
         text-align: center;
@@ -272,6 +272,24 @@
       grid-row-gap: 8px;
       margin-top: 12px;
 
+      &-ie11 {
+        display: flex;
+        flex-wrap: wrap;
+
+        li {
+          margin-right: 8px;
+          margin-top: 8px;
+
+          &:nth-child(12n) {
+            margin-right: 0;
+          }
+
+          &:nth-child(-n+12) {
+            margin-top: 0;
+          }
+        }
+      }
+
       &-unset-color {
         margin-top: 0;
       }

package/lib/popper/index.d.ts

@@ -24,6 +24,7 @@ export declare type PopperProps = {
     placement?: PlacementType;
     tip?: any;
     trigger?: TriggerType | Array<TriggerType>;
+    strategy?: 'fixed' | 'absolute';
     clickToClose?: boolean;
     onTrigger?: (trigger: TriggerType) => void;
     onVisibleChange?: (visible: boolean) => void;

package/lib/popper/index.js

@@ -139,6 +139,8 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     trigger = _props$trigger === void 0 ? 'click' : _props$trigger,
     _props$placement = props.placement,
     placement = _props$placement === void 0 ? 'top' : _props$placement,
+    _props$strategy = props.strategy,
+    strategy = _props$strategy === void 0 ? 'absolute' : _props$strategy,
     visible = props.visible,
     _props$arrowSize = props.arrowSize,
     arrowSize = _props$arrowSize === void 0 ? 4.25 : _props$arrowSize,
@@ -436,7 +438,7 @@ var Popper = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var popperOptionsInner = {
     placement: placementInner,
     modifiers: popperModifiers,
-    strategy: 'fixed'
+    strategy: strategy
   };
   useEnhancedEffect(function () {
     var _a, _b;

package/lib/popper/style/index.css

@@ -130,7 +130,7 @@
           transform: rotate(45deg);
 }
 .kd-popper[data-popper-placement^='top'] .arrow {
-  bottom: calc(0.9 * var(--arrowSize));
+  bottom: calc(1.1 * var(--arrowSize));
 }
 .kd-popper[data-popper-placement^='top'] .arrow::before {
   left: calc(-1 * var(--arrowSize));
@@ -138,7 +138,7 @@
   border-left-color: transparent;
 }
 .kd-popper[data-popper-placement^='bottom'] .arrow {
-  top: calc(-0.9 * var(--arrowSize));
+  top: calc(-0.8 * var(--arrowSize));
 }
 .kd-popper[data-popper-placement^='bottom'] .arrow::before {
   left: calc(-1 * var(--arrowSize));
@@ -146,7 +146,7 @@
   border-right-color: transparent;
 }
 .kd-popper[data-popper-placement^='left'] .arrow {
-  right: calc(0.9 * var(--arrowSize));
+  right: calc(1.1 * var(--arrowSize));
 }
 .kd-popper[data-popper-placement^='left'] .arrow::before {
   top: calc(-1 * var(--arrowSize));
@@ -154,7 +154,7 @@
   border-bottom-color: transparent;
 }
 .kd-popper[data-popper-placement^='right'] .arrow {
-  left: calc(-0.9 * var(--arrowSize));
+  left: calc(-0.8 * var(--arrowSize));
 }
 .kd-popper[data-popper-placement^='right'] .arrow::before {
   top: calc(-1 * var(--arrowSize));

package/lib/popper/style/index.less

@@ -29,7 +29,7 @@
   }
 
   &[data-popper-placement^='top'] .arrow {
-    bottom: calc(0.9 * var(--arrowSize));
+    bottom: calc(1.1 * var(--arrowSize));
 
     &::before {
       left: calc(-1 * var(--arrowSize));
@@ -39,7 +39,7 @@
   }
 
   &[data-popper-placement^='bottom'] .arrow {
-    top: calc(-0.9 * var(--arrowSize));
+    top: calc(-0.8 * var(--arrowSize));
 
     &::before {
       left: calc(-1 * var(--arrowSize));
@@ -49,7 +49,7 @@
   }
 
   &[data-popper-placement^='left'] .arrow {
-    right: calc(0.9 * var(--arrowSize));
+    right: calc(1.1 * var(--arrowSize));
 
     &::before {
       top: calc(-1 * var(--arrowSize));
@@ -59,7 +59,7 @@
   }
 
   &[data-popper-placement^='right'] .arrow {
-    left: calc(-0.9 * var(--arrowSize));
+    left: calc(-0.8 * var(--arrowSize));
 
     &::before {
       top: calc(-1 * var(--arrowSize));

package/lib/select/select.js

@@ -174,12 +174,12 @@ var InternalSelect = function InternalSelect(props, ref) {
               if (options && options.length) {
                 arr.push({
                   value: obj === null || obj === void 0 ? void 0 : obj.value,
-                  label: (obj === null || obj === void 0 ? void 0 : obj.label) || (obj === null || obj === void 0 ? void 0 : obj.value)
+                  label: getOptionLabel(obj) || (obj === null || obj === void 0 ? void 0 : obj.label) || (obj === null || obj === void 0 ? void 0 : obj.value)
                 });
               } else {
                 arr.push({
                   value: (_a = obj.props) === null || _a === void 0 ? void 0 : _a.value,
-                  label: (_b = obj.props) === null || _b === void 0 ? void 0 : _b.children
+                  label: getOptionLabel(obj) || ((_b = obj.props) === null || _b === void 0 ? void 0 : _b.children)
                 });
               }
             } else {

package/lib/style/core/reset.less

@@ -24,8 +24,8 @@ input,
 textarea,
 select,
 button {
-  font-family: 'Microsoft YaHei', 'PingFangSC-Regular', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB',
-    'WenQuanYi Micro Hei', sans-serif;
+  font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB',
+    'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
 }
 
 body {

package/lib/style/index.css

@@ -1687,7 +1687,7 @@ input,
 textarea,
 select,
 button {
-  font-family: 'Microsoft YaHei', 'PingFangSC-Regular', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+  font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB', 'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
 }
 body {
   -webkit-box-sizing: border-box;

package/package.json

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