@kdcloudjs/kdesign 1.6.37 → 1.6.39

package/lib/date-picker/range-picker.js

@@ -127,16 +127,18 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     componentName: 'DatePicker'
   }), locale || {});
   // ref
-  var panelDivRef = _react.default.useRef(null);
-  var inputDivRef = ref || /*#__PURE__*/_react.default.createRef();
-  var startInputDivRef = _react.default.useRef(null);
-  var endInputDivRef = _react.default.useRef(null);
-  var separatorRef = _react.default.useRef(null);
-  var startInputRef = _react.default.useRef(null);
-  var endInputRef = _react.default.useRef(null);
-  var popperRef = popupRef || /*#__PURE__*/_react.default.createRef();
-  var openRecordsRef = _react.default.useRef({});
-  var mergedDisabled = _react.default.useMemo(function () {
+  var panelDivRef = (0, _react.useRef)(null);
+  var defaultRef = (0, _react.useRef)(null);
+  var inputDivRef = ref || defaultRef;
+  var startInputDivRef = (0, _react.useRef)(null);
+  var endInputDivRef = (0, _react.useRef)(null);
+  var separatorRef = (0, _react.useRef)(null);
+  var startInputRef = (0, _react.useRef)(null);
+  var endInputRef = (0, _react.useRef)(null);
+  var defaultPopupRef = (0, _react.useRef)(null);
+  var popperRef = popupRef || defaultPopupRef;
+  var openRecordsRef = (0, _react.useRef)({});
+  var mergedDisabled = (0, _react.useMemo)(function () {
     if (Array.isArray(disabled)) {
       return disabled;
     }
@@ -280,10 +282,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     endText = _useTextValueMapping4[0],
     triggerEndTextChange = _useTextValueMapping4[1],
     resetEndText = _useTextValueMapping4[2];
-  var _React$useState = _react.default.useState([null, null]),
-    _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
-    hoverRangedValue = _React$useState2[0],
-    setHoverRangedValue = _React$useState2[1];
+  var _useState = (0, _react.useState)([null, null]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    hoverRangedValue = _useState2[0],
+    setHoverRangedValue = _useState2[1];
   var _useHoverValue = (0, _useHoverValue5.default)(startText, {
       format: _format
     }),
@@ -321,20 +323,13 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     _useMergedState10 = (0, _slicedToArray2.default)(_useMergedState9, 2),
     mergedModes = _useMergedState10[0],
     setInnerModes = _useMergedState10[1];
-  var _useState = (0, _react.useState)(undefined),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    innerPicker = _useState2[0],
-    setInnerPicker = _useState2[1];
+  var _useState3 = (0, _react.useState)(undefined),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    innerPicker = _useState4[0],
+    setInnerPicker = _useState4[1];
   (0, _react.useEffect)(function () {
     setInnerModes([picker, picker]);
   }, [picker]);
-  // const triggerModesChange = (modes: [PanelMode, PanelMode], values: RangeValue) => {
-  //   setInnerModes(modes)
-  //   if (onPanelChange) {
-  //     onPanelChange(values, modes)
-  //   }
-  // }
-  // ========================= Disable Date ==========================
   var _useRangeDisabled = (0, _useRangeDisabled3.default)({
       picker: picker,
       selectedValue: selectedValue,
@@ -344,11 +339,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     _useRangeDisabled2 = (0, _slicedToArray2.default)(_useRangeDisabled, 2),
     disabledStartDate = _useRangeDisabled2[0],
     disabledEndDate = _useRangeDisabled2[1];
-  // const onResetText = () => {
-  //   resetEndText()
-  //   resetStartText()
-  // }
-  var triggerRef = _react.default.useRef();
+  var triggerRef = (0, _react.useRef)();
   var triggerOpen = function triggerOpen(newOpen, index) {
     if (newOpen) {
       clearTimeout(triggerRef.current);
@@ -427,22 +418,28 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       triggerOpen(false, sourceIndex);
     }
   };
-  (0, _hooks.useOnClickOutside)([popperRef, inputDivRef], function () {
-    setViewDate(null, 0);
-    setViewDate(null, 1);
-    setHoverRangedValue([null, null]);
-  });
+  // useOnClickOutside([popperRef, inputDivRef], () => {
+  //   setViewDate(null, 0)
+  //   setViewDate(null, 1)
+  //   setHoverRangedValue([null, null])
+  // })
   var onSelect = function onSelect(date, type) {
     var values = (0, _utils2.updateValues)(selectedValue, date, mergedActivePickerIndex);
-    if (type === 'submit' || type !== 'key' && !needConfirmButton) {
-      triggerChange(values, mergedActivePickerIndex);
-      if (mergedActivePickerIndex === 0) {
-        onStartLeave();
-      } else {
-        onEndLeave();
+    if (type === 'inner') {
+      if (values && values[mergedActivePickerIndex]) {
+        setViewDate(values[mergedActivePickerIndex], mergedActivePickerIndex);
       }
     } else {
-      setSelectedValue(values);
+      if (type === 'submit' || type !== 'key' && !needConfirmButton) {
+        triggerChange(values, mergedActivePickerIndex);
+        if (mergedActivePickerIndex === 0) {
+          onStartLeave();
+        } else {
+          onEndLeave();
+        }
+      } else {
+        setSelectedValue(values);
+      }
     }
   };
   var onDateMouseEnter = function onDateMouseEnter(date) {
@@ -472,6 +469,11 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       if (!endValueTexts.length || endValueTexts[0] === '') {
         triggerEndTextChange('');
       }
+      setViewDate(null, 0);
+      setViewDate(null, 1);
+      setHoverRangedValue([null, null]);
+    } else {
+      setInnerPicker(undefined);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [mergedOpen, startValueTexts, endValueTexts]);
@@ -551,7 +553,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
       }, renderPanel());
       panels = /*#__PURE__*/_react.default.createElement("div", {
         className: (0, _classnames.default)("".concat(datePickerPrefixCls, "-container-date"))
-      }, leftPanel, rightPanel);
+      }, leftPanel, innerPicker === undefined ? rightPanel : null);
     } else {
       panels = /*#__PURE__*/_react.default.createElement(_context.default.Provider, {
         value: {
@@ -706,7 +708,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     getPopupContainer: getPopupContainer
   });
 };
-var RangePicker = /*#__PURE__*/_react.default.forwardRef(InternalRangePicker);
+var RangePicker = /*#__PURE__*/(0, _react.forwardRef)(InternalRangePicker);
 RangePicker.displayName = 'RangePicker';
 var _default = RangePicker;
 exports.default = _default;

package/lib/image-cropper/cropper.d.ts

@@ -19,7 +19,8 @@ export interface CropperProps {
     modal?: boolean;
     zoomOnWheel?: boolean;
     cropBoxMovable?: boolean;
+    autoCropArea?: number;
     onCropSuccess?: () => void;
 }
-declare const Cropper: React.ForwardRefExoticComponent<Pick<CropperProps, "className" | "modal" | "imgSrc" | "dragMode" | "viewMode" | "aspectRatio" | "zoomOnWheel" | "cropBoxMovable" | "onCropSuccess"> & React.RefAttributes<CropperInstance | null>>;
+declare const Cropper: React.ForwardRefExoticComponent<Pick<CropperProps, "className" | "modal" | "imgSrc" | "dragMode" | "viewMode" | "aspectRatio" | "zoomOnWheel" | "cropBoxMovable" | "autoCropArea" | "onCropSuccess"> & React.RefAttributes<CropperInstance | null>>;
 export default Cropper;

package/lib/image-cropper/cropper.js

@@ -40,6 +40,7 @@ var Cropper = /*#__PURE__*/(0, _react.forwardRef)(function (props, forwardedRef)
     dragMode = props.dragMode,
     viewMode = props.viewMode,
     aspectRatio = props.aspectRatio,
+    autoCropArea = props.autoCropArea,
     _props$modal = props.modal,
     modal = _props$modal === void 0 ? true : _props$modal,
     _props$zoomOnWheel = props.zoomOnWheel,
@@ -56,9 +57,9 @@ var Cropper = /*#__PURE__*/(0, _react.forwardRef)(function (props, forwardedRef)
       dragMode: dragMode,
       cropBoxMovable: cropBoxMovable,
       modal: modal,
-      autoCropArea: 0.5
+      autoCropArea: autoCropArea
     };
-  }, [aspectRatio, viewMode, zoomOnWheel, dragMode, modal, cropBoxMovable]);
+  }, [aspectRatio, viewMode, zoomOnWheel, dragMode, cropBoxMovable, modal, autoCropArea]);
   (0, _react.useEffect)(function () {
     if (!imgRef.current) return;
     if (!imgSrc) return;

package/lib/image-cropper/image-cropper.d.ts

@@ -24,6 +24,7 @@ export interface ImageCropperProps {
     customComponents?: customComponentsProps;
     showDeaultToolbar?: boolean;
     cropBoxMovable?: boolean;
+    autoCropArea?: number;
     onClose?: () => void;
     onCropSuccess?: (file: File) => void;
     onCropFailed?: () => void;

package/lib/image-cropper/image-cropper.js

@@ -90,7 +90,8 @@ var InternalImageCropper = function InternalImageCropper(props, forwardedRef) {
     cropBoxMovable = _a.cropBoxMovable,
     customComponents = _a.customComponents,
     showDeaultToolbar = _a.showDeaultToolbar,
-    restProps = __rest(_a, ["prefixCls", "containerWidth", "containerHeight", "title", "visible", "onClose", "onCropSuccess", "onCropFailed", "dragMode", "viewMode", "aspectRatio", "modal", "okText", "okBtn", "image", "zoomOnWheel", "imageMaxSize", "cropBoxMovable", "customComponents", "showDeaultToolbar"]);
+    autoCropArea = _a.autoCropArea,
+    restProps = __rest(_a, ["prefixCls", "containerWidth", "containerHeight", "title", "visible", "onClose", "onCropSuccess", "onCropFailed", "dragMode", "viewMode", "aspectRatio", "modal", "okText", "okBtn", "image", "zoomOnWheel", "imageMaxSize", "cropBoxMovable", "customComponents", "showDeaultToolbar", "autoCropArea"]);
   var prefixCls = getPrefixCls(pkgPrefixCls, 'image-cropper', customPrefixcls);
   var handleOkClick = function handleOkClick() {
     return __awaiter(void 0, void 0, void 0, /*#__PURE__*/_regenerator.default.mark(function _callee() {
@@ -137,6 +138,7 @@ var InternalImageCropper = function InternalImageCropper(props, forwardedRef) {
     zoomOnWheel: zoomOnWheel,
     cropBoxMovable: cropBoxMovable,
     imgSrc: cropperSrc,
+    autoCropArea: autoCropArea,
     ref: cropperRef
   });
   var OperationBarNode = /*#__PURE__*/_react.default.createElement(_operationBar.default, {

package/lib/radio/group.js

@@ -24,14 +24,14 @@ var RadioGroup = /*#__PURE__*/React.forwardRef(function (props, ref) {
     getPrefixCls = _React$useContext.getPrefixCls,
     prefixCls = _React$useContext.prefixCls,
     userDefaultProps = _React$useContext.compDefaultProps;
-  var initValue = props.value === undefined ? props.defaultValue : props.value;
+  var initValue = typeof props.value === 'undefined' ? props.defaultValue : props.value;
   var _React$useState = React.useState(initValue),
     _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
     value = _React$useState2[0],
     setValue = _React$useState2[1];
   // 从props更新value值
   React.useEffect(function () {
-    if (props.value !== undefined) {
+    if (typeof props.value !== 'undefined') {
       setValue(props.value);
     }
   }, [props.value]);

package/lib/radio/radio.js

@@ -69,7 +69,9 @@ var InternalRadio = function InternalRadio(props, ref) {
   }, [checked, defaultChecked, context === null || context === void 0 ? void 0 : context.value]);
   var onChange = function onChange(e) {
     if (disabled) return;
-    setIsChecked(e.target.checked);
+    if (typeof (context === null || context === void 0 ? void 0 : context.value) === 'undefined') {
+      setIsChecked(e.target.checked);
+    }
     if (props.onChange) {
       props.onChange(e);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.6.37",
+  "version": "1.6.39",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -77,7 +77,7 @@
     "@babel/runtime": "^7.10.4",
     "@babel/runtime-corejs3": "^7.11.2",
     "@babel/standalone": "^7.14.3",
-    "@kdcloudjs/table": "canary",
+    "@kdcloudjs/table": "1.1.5-canary.3",
     "@popperjs/core": "^2.5.4",
     "async-validator": "^3.5.1",
     "axios": "^0.21.1",
@@ -241,7 +241,8 @@
   },
   "resolutions": {
     "@types/babel__traverse": "7.17.1",
-    "@types/node": "17.0.41"
+    "@types/node": "17.0.41",
+    "prettier": "2.8.0"
   },
   "license": "Apache-2.0"
 }