@kdcloudjs/kdesign 1.8.2 → 1.8.4

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/signature/drawingBoard.js

@@ -160,13 +160,13 @@ var DrawingBoard = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     d: "M9.16767025,16.9762781 C9.5300869,17.3386948 9.5300869,17.9262881 9.16767025,18.2887049 C8.84552213,18.6108529 8.34545651,18.6466472 7.98377112,18.3960875 L7.85524348,18.2887049 L0.815437446,11.2488988 C-0.203859357,10.229602 -0.267565411,8.61657722 0.624319283,7.52306442 L0.815437446,7.31161852 L7.85524348,0.271812484 C8.21766013,-0.0906041612 8.80525361,-0.0906041612 9.16767025,0.271812484 C9.48981838,0.593960608 9.5256126,1.09402626 9.27505297,1.45571158 L9.16767025,1.58423925 L2.39801882,8.35223283 L18.7197413,8.35223283 C24.8235066,8.35223283 28,11.88167 28,18.5605173 C28,25.0286774 25.0409921,28.8154573 19.1996764,29.6367412 L18.7197413,29.6968277 L3.87132753,29.6968277 C3.358793,29.6968277 2.94330165,29.2813365 2.94330165,28.7688019 C2.94330165,28.3132156 3.27159111,27.9343054 3.70451369,27.8557278 L3.87132753,27.840776 L18.6172581,27.846452 C23.6969089,27.2820464 26.1439483,24.2912204 26.1439483,18.5605173 C26.1439483,13.0283959 23.8870007,10.3626156 19.1446408,10.2148013 L18.7197413,10.2082845 L2.39987488,10.2082845 L9.16767025,16.9762781 Z",
     id: "\u8DEF\u5F84",
     fill: "currentColor"
-  }))))) : null, onClear ? /*#__PURE__*/_react.default.createElement(_icon.default, {
+  }))))) : null, /*#__PURE__*/_react.default.createElement(_icon.default, {
     type: "delete",
     className: "".concat(prefixCls, "-drawing-board-clear"),
     onClick: function onClick() {
       return handleOnClear();
     }
-  }) : null), /*#__PURE__*/_react.default.createElement("span", {
+  })), /*#__PURE__*/_react.default.createElement("span", {
     className: "".concat(prefixCls, "-drawing-board-tip")
   }, isEmpty ? signatureLangMsg === null || signatureLangMsg === void 0 ? void 0 : signatureLangMsg.pleaseWriteHere : ''), /*#__PURE__*/_react.default.createElement("canvas", {
     ref: canvasRef

package/lib/signature/signature.js

@@ -242,7 +242,12 @@ var Signature = function Signature(props) {
     id: "\u5F62\u72B6",
     fill: "#666666"
   }))))));
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, dataUrl ? /*#__PURE__*/_react.default.createElement(_image.default, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
+    className: signatureClass,
+    ref: triggerRef,
+    style: style
+  }, dataUrl ? /*#__PURE__*/_react.default.createElement(_image.default, {
+    className: "".concat(signaturePrefixCls, "-image"),
     preview: preview,
     src: dataUrl,
     title: "\u5220\u9664",
@@ -254,13 +259,11 @@ var Signature = function Signature(props) {
       }
     })] : undefined
   }) : /*#__PURE__*/_react.default.createElement("div", {
-    className: signatureClass,
-    ref: triggerRef,
-    onClick: handleOnClick,
-    style: style
+    className: "".concat(signaturePrefixCls, "-empty"),
+    onClick: handleOnClick
   }, /*#__PURE__*/_react.default.createElement(_icon.default, {
     type: "edit"
-  }), /*#__PURE__*/_react.default.createElement("span", null, signatureLangMsg === null || signatureLangMsg === void 0 ? void 0 : signatureLangMsg.clickToSign)), /*#__PURE__*/_react.default.createElement(_modal.default, (0, _extends2.default)({
+  }), /*#__PURE__*/_react.default.createElement("span", null, signatureLangMsg === null || signatureLangMsg === void 0 ? void 0 : signatureLangMsg.clickToSign))), /*#__PURE__*/_react.default.createElement(_modal.default, (0, _extends2.default)({
     width: containerWidth,
     height: containerHeight,
     ref: modalRef,

package/lib/signature/style/index.css

@@ -106,9 +106,25 @@
 .kd-signature {
   -webkit-box-sizing: border-box;
           box-sizing: border-box;
-  border: 1px dashed #e5e5e5;
   width: 100%;
   height: 100%;
+}
+.kd-signature-image {
+  width: 100%;
+  height: 100%;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+}
+.kd-signature-image img {
+  width: 100%;
+  height: 100%;
+}
+.kd-signature-empty {
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  border: 1px dashed #e5e5e5;
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
@@ -130,7 +146,7 @@
   -webkit-transition: border-color var(--kd-c-signature-motion-duration, var(--kd-g-duration, 0.3s)), background-color var(--kd-c-signature-motion-duration, var(--kd-g-duration, 0.3s));
   transition: border-color var(--kd-c-signature-motion-duration, var(--kd-g-duration, 0.3s)), background-color var(--kd-c-signature-motion-duration, var(--kd-g-duration, 0.3s));
 }
-.kd-signature:hover {
+.kd-signature-empty:hover {
   border-color: var(--kd-c-signature-border-color-hover, var(--kd-g-color-theme-5, #87adff));
   background-color: var(--kd-c-signature-bg-color-hover, var(--kd-g-color-theme-1, #f2f8ff));
 }

package/lib/signature/style/index.less

@@ -5,22 +5,36 @@
 
 .@{signature-prefix-cls} {
   box-sizing: border-box;
-  border: 1px dashed #e5e5e5;
   width: 100%;
   height: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  background: @signature-bg-color;
-  color: @signature-color-text;
-  font-size: @signature-font-size;
-  cursor: pointer;
-  border-radius: @signature-border-radius;
-  transition: border-color @signature-transition-duration, background-color @signature-transition-duration;
-  &:hover {
-    border-color: @signature-border-color-hover;
-    background-color: @signature-bg-color-hover;
+  &-image {
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  &-empty {
+    box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+    border: 1px dashed #e5e5e5;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    background: @signature-bg-color;
+    color: @signature-color-text;
+    font-size: @signature-font-size;
+    cursor: pointer;
+    border-radius: @signature-border-radius;
+    transition: border-color @signature-transition-duration, background-color @signature-transition-duration;
+    &:hover {
+      border-color: @signature-border-color-hover;
+      background-color: @signature-bg-color-hover;
+    }
   }
 }
 .@{signature-prefix-cls}.@{signature-prefix-cls}-disabled {

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.2",
+  "version": "1.8.4",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [