@kdcloudjs/kdesign 1.8.15 → 1.8.16

package/lib/popper/style/index.css

@@ -130,7 +130,7 @@
           transform: rotate(45deg);
 }
 .kd-popper[data-popper-placement^='top'] .arrow {
-  bottom: calc(1.1 * var(--arrowSize));
+  bottom: calc(1.05 * 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.8 * var(--arrowSize));
+  top: calc(-0.85 * 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(1.1 * var(--arrowSize));
+  right: calc(1.05 * 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.8 * var(--arrowSize));
+  left: calc(-0.85 * 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(1.1 * var(--arrowSize));
+    bottom: calc(1.05 * var(--arrowSize));
 
     &::before {
       left: calc(-1 * var(--arrowSize));
@@ -39,7 +39,7 @@
   }
 
   &[data-popper-placement^='bottom'] .arrow {
-    top: calc(-0.8 * var(--arrowSize));
+    top: calc(-0.85 * var(--arrowSize));
 
     &::before {
       left: calc(-1 * var(--arrowSize));
@@ -49,7 +49,7 @@
   }
 
   &[data-popper-placement^='left'] .arrow {
-    right: calc(1.1 * var(--arrowSize));
+    right: calc(1.05 * var(--arrowSize));
 
     &::before {
       top: calc(-1 * var(--arrowSize));
@@ -59,7 +59,7 @@
   }
 
   &[data-popper-placement^='right'] .arrow {
-    left: calc(-0.8 * var(--arrowSize));
+    left: calc(-0.85 * var(--arrowSize));
 
     &::before {
       top: calc(-1 * var(--arrowSize));
@@ -97,5 +97,3 @@
 .popper-motion(~'@{popper-prefix-cls}-bottom-end', kdZoomTopRight);
 .popper-motion(~'@{popper-prefix-cls}-right-start', kdZoomTopLeft);
 .popper-motion(~'@{popper-prefix-cls}-bottom-start', kdZoomTopLeft);
-
-

package/lib/signature/signature.d.ts

@@ -16,6 +16,7 @@ export interface ISignatureProps {
     title?: React.ReactNode;
     preview?: boolean;
     canFullScreen?: boolean;
+    resizable?: boolean;
     getContainer?: HTMLElement | (() => HTMLElement | CSSSelector | null | false) | null | false;
     undo?: () => void;
     redo?: () => void;

package/lib/signature/signature.js

@@ -12,6 +12,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/e
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
 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 _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _signature_pad = _interopRequireDefault(require("./utils/signature_pad"));
@@ -68,11 +69,12 @@ var Signature = function Signature(props) {
     _signatureProps$dataU = signatureProps.dataUrlType,
     dataUrlType = _signatureProps$dataU === void 0 ? 'png' : _signatureProps$dataU,
     title = signatureProps.title,
+    resizable = signatureProps.resizable,
     onClose = signatureProps.onClose,
     disabled = signatureProps.disabled,
     preview = signatureProps.preview,
     canFullScreen = signatureProps.canFullScreen,
-    restProps = __rest(signatureProps, ["className", "style", "prefixCls", "containerWidth", "containerHeight", "getSignatureData", "onStart", "onEnd", "onClear", "undo", "redo", "penColor", "backgroundColor", "dataUrlType", "title", "onClose", "disabled", "preview", "canFullScreen"]);
+    restProps = __rest(signatureProps, ["className", "style", "prefixCls", "containerWidth", "containerHeight", "getSignatureData", "onStart", "onEnd", "onClear", "undo", "redo", "penColor", "backgroundColor", "dataUrlType", "title", "resizable", "onClose", "disabled", "preview", "canFullScreen"]);
   var signaturePrefixCls = getPrefixCls(prefixCls, 'signature', customPrefixcls);
   var signatureClass = (0, _classnames.default)(signaturePrefixCls, className, (0, _defineProperty2.default)({}, "".concat(signaturePrefixCls, "-disabled"), disabled));
   var _useState = (0, _react.useState)(false),
@@ -91,6 +93,7 @@ var Signature = function Signature(props) {
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     isFullScreen = _useState8[0],
     setIsFullScreen = _useState8[1];
+  var isFirstSignatureRef = (0, _react.useRef)(true);
   var modalRef = (0, _react.useRef)();
   var modalBodyRef = (0, _react.useRef)();
   var triggerRef = (0, _react.useRef)();
@@ -128,13 +131,41 @@ var Signature = function Signature(props) {
     setIsFullScreen(true);
     type === 'open' ? setIsFullScreen(true) : setIsFullScreen(false);
   };
-  (0, _hooks.useResizeObserver)(modalRef.current, function (rect) {
+  var handleResize = function handleResize(rect) {
+    var _a, _b;
     var width = rect.width,
       height = rect.height;
     var canvas = modalBodyRef.current.getCanvasRef();
-    canvas.width = width - 40;
-    canvas.height = height - 142;
-  });
+    var originalWidth = canvas.width;
+    var originalHeight = canvas.height;
+    var newWidth = width - 40;
+    var newHeight = height - 142;
+    canvas.width = newWidth;
+    canvas.height = newHeight;
+    if (isFirstSignatureRef.current) return;
+    var tempData = (_a = signaturePadRef.current) === null || _a === void 0 ? void 0 : _a.toData();
+    var scaleX = newWidth / originalWidth;
+    var scaleY = newHeight / originalHeight;
+    if (tempData && tempData.length > 0) {
+      var scaledData = (0, _map.default)(tempData).call(tempData, function (group) {
+        var _context;
+        return (0, _extends2.default)((0, _extends2.default)({}, group), {
+          points: (0, _map.default)(_context = group.points).call(_context, function (point) {
+            return (0, _extends2.default)((0, _extends2.default)({}, point), {
+              x: point.x * scaleX,
+              y: point.y * scaleY
+            });
+          })
+        });
+      });
+      (_b = signaturePadRef.current) === null || _b === void 0 ? void 0 : _b.fromData(scaledData);
+    }
+  };
+  (0, _hooks.useResizeObserver)(modalRef.current, handleResize);
+  var handleClear = function handleClear() {
+    onClear === null || onClear === void 0 ? void 0 : onClear();
+    isFirstSignatureRef.current = true;
+  };
   (0, _react.useEffect)(function () {
     if (modalBodyRef.current) {
       var canvas = modalBodyRef.current.getCanvasRef();
@@ -146,6 +177,7 @@ var Signature = function Signature(props) {
         onStart && onStart();
       });
       signaturePadRef.current.addEventListener('endStroke', function () {
+        isFirstSignatureRef.current = false;
         modalBodyRef.current.saveSignatureToHistory();
         onEnd && onEnd();
       });
@@ -157,14 +189,16 @@ var Signature = function Signature(props) {
     };
   }, []);
   (0, _react.useEffect)(function () {
-    var _a, _b;
+    var _a, _b, _c;
     if (modalVisible) {
       (_a = signaturePadRef.current) === null || _a === void 0 ? void 0 : _a.on();
       modalBodyRef.current.saveSignatureToHistory();
     } else {
       (_b = signaturePadRef.current) === null || _b === void 0 ? void 0 : _b.off();
+      (_c = signaturePadRef.current) === null || _c === void 0 ? void 0 : _c.clear();
       modalBodyRef.current.setSignatureHistory([]);
       modalBodyRef.current.setCurrentHistoryIndex(-1);
+      isFirstSignatureRef.current = true;
     }
   }, [modalVisible]);
   (0, _react.useEffect)(function () {
@@ -176,7 +210,7 @@ var Signature = function Signature(props) {
     undo: undo,
     redo: redo,
     isEmpty: isEmpty,
-    onClear: onClear,
+    onClear: handleClear,
     setDataUrl: setDataUrl,
     setIsEmpty: setIsEmpty,
     signaturePad: function signaturePad() {
@@ -271,7 +305,7 @@ var Signature = function Signature(props) {
     visible: modalVisible,
     onOk: handleModalOk,
     onCancel: handleModalCancel,
-    resizable: true,
+    resizable: resizable,
     title: title || (signatureLangMsg === null || signatureLangMsg === void 0 ? void 0 : signatureLangMsg.handwrittenSignature),
     titleIcon: canFullScreen && titleIcon,
     body: _react.default.createElement(_drawingBoard.default, (0, _extends2.default)({}, DrawingBoardProps, {

package/lib/tree/tree.d.ts

@@ -44,6 +44,7 @@ export interface TreeProps {
     style?: React.CSSProperties;
     className?: string;
     expandOnFilterNode?: boolean;
+    renderExtra?: (node: any) => ReactNode;
 }
 export declare type TreeNodeData = {
     checkable?: boolean;

package/lib/tree/tree.js

@@ -95,7 +95,8 @@ var InternalTree = _react.default.forwardRef(function (props, ref) {
     notFoundContent = TreeProps.notFoundContent,
     showLine = TreeProps.showLine,
     expandOnFilterNode = TreeProps.expandOnFilterNode,
-    others = __rest(TreeProps, ["prefixCls", "treeData", "virtual", "showIcon", "switcherIcon", "icon", "checkable", "checkStrictly", "disabled", "draggable", "scrollToKey", "expandedKeys", "checkedKeys", "defaultExpandRoot", "defaultExpandAll", "defaultExpandParent", "defaultExpandedKeys", "defaultCheckedKeys", "defaultSelectedKeys", "height", "onCheck", "onExpand", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect", "selectedKeys", "setTreeNodeStyle", "setTreeNodeClassName", "estimatedItemSize", "style", "className", "filterTreeNode", "filterValue", "expandOnClickNode", "onlyExpandOnClickIcon", "loadData", "notFoundContent", "showLine", "expandOnFilterNode"]);
+    renderExtra = TreeProps.renderExtra,
+    others = __rest(TreeProps, ["prefixCls", "treeData", "virtual", "showIcon", "switcherIcon", "icon", "checkable", "checkStrictly", "disabled", "draggable", "scrollToKey", "expandedKeys", "checkedKeys", "defaultExpandRoot", "defaultExpandAll", "defaultExpandParent", "defaultExpandedKeys", "defaultCheckedKeys", "defaultSelectedKeys", "height", "onCheck", "onExpand", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect", "selectedKeys", "setTreeNodeStyle", "setTreeNodeClassName", "estimatedItemSize", "style", "className", "filterTreeNode", "filterValue", "expandOnClickNode", "onlyExpandOnClickIcon", "loadData", "notFoundContent", "showLine", "expandOnFilterNode", "renderExtra"]);
   var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls);
   var treeNodeClassName = (0, _classnames.default)(className, (_classNames = {}, (0, _defineProperty2.default)(_classNames, "".concat(treePrefixCls), true), (0, _defineProperty2.default)(_classNames, "".concat(treePrefixCls, "-show-line"), showLine), _classNames));
   var treeRootClassName = "".concat(treePrefixCls, "-root");
@@ -445,6 +446,7 @@ var InternalTree = _react.default.forwardRef(function (props, ref) {
     item.isActiveLine = showLine && isSelectedNodeChildrenKey(item.pathParentKeys);
     return _react.default.createElement(_treeNode.default, (0, _extends2.default)({}, item, {
       key: item.key,
+      renderExtra: renderExtra,
       ref: treeNodeRef,
       activeLevel: seletedKeyLevel
     }));

package/lib/tree/treeNode.d.ts

@@ -27,6 +27,7 @@ export interface TreeNodeProps {
     isLeaf?: boolean;
     expandOnClickNode?: boolean;
     onlyExpandOnClickIcon?: boolean;
+    renderExtra?: (node: any) => React.ReactNode;
     onCheck?: (key: string, value: boolean, node: React.ReactNode, event: React.MouseEvent<MouseEvent>, pos: string) => void;
     onSelect?: (event: React.MouseEvent<MouseEvent>, node: React.ReactNode, key: string) => void;
     onExpand?: (value: boolean, node: React.ReactNode) => void;

package/lib/tree/treeNode.js

@@ -75,7 +75,8 @@ var TreeNode = _react.default.forwardRef(function (props) {
     onDragEnd = TreeNodeProps.onDragEnd,
     onDrop = TreeNodeProps.onDrop,
     onSelect = TreeNodeProps.onSelect,
-    others = __rest(TreeNodeProps, ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "isActiveLine", "activeLevel", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "dropPosition", "expandOnClickNode", "onlyExpandOnClickIcon", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"]);
+    renderExtra = TreeNodeProps.renderExtra,
+    others = __rest(TreeNodeProps, ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "isActiveLine", "activeLevel", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "dropPosition", "expandOnClickNode", "onlyExpandOnClickIcon", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect", "renderExtra"]);
   var nodeData = _react.default.useMemo(function () {
     return (0, _extends2.default)({
       selectable: selectable,
@@ -229,7 +230,7 @@ var TreeNode = _react.default.forwardRef(function (props) {
       className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-title"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-title-disabled"), disabled))
     }, title)) : _react.default.createElement("span", {
       className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-title"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-title-disabled"), disabled))
-    }, title), showDragLine && dropPosition === 1 && _react.default.createElement("span", {
+    }, title), renderExtra === null || renderExtra === void 0 ? void 0 : renderExtra(nodeData), showDragLine && dropPosition === 1 && _react.default.createElement("span", {
       className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-drag-line-bottom"))
     }))));
   };

package/package.json

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