@kdcloudjs/kdesign 1.7.58 → 1.7.60
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/dist/kdesign-complete.less +126 -1
- package/dist/kdesign.css +212 -1
- package/dist/kdesign.css.map +1 -1
- package/dist/kdesign.js +2217 -181
- package/dist/kdesign.js.map +1 -1
- package/dist/kdesign.min.css +2 -2
- package/dist/kdesign.min.js +16 -12
- package/dist/kdesign.min.js.map +1 -1
- package/es/_utils/domUtil.d.ts +2 -0
- package/es/_utils/domUtil.js +15 -0
- package/es/cascader/cascader.js +41 -10
- package/es/config-provider/compDefaultProps.d.ts +7 -0
- package/es/config-provider/compDefaultProps.js +7 -0
- package/es/date-picker/date-picker.js +19 -17
- package/es/date-picker/hooks/use-range-view-dates.js +8 -2
- package/es/date-picker/panel/time/time.js +18 -3
- package/es/date-picker/range-picker.js +18 -28
- package/es/index.d.ts +1 -0
- package/es/index.js +2 -1
- package/es/locale/locale.d.ts +5 -0
- package/es/locale/zh-CN.d.ts +5 -0
- package/es/locale/zh-CN.js +6 -1
- package/es/signature/drawingBoard.d.ts +15 -0
- package/es/signature/drawingBoard.js +163 -0
- package/es/signature/index.d.ts +3 -0
- package/es/signature/index.js +3 -0
- package/es/signature/signature.d.ts +32 -0
- package/es/signature/signature.js +268 -0
- package/es/signature/style/css.js +2 -0
- package/es/signature/style/index.css +210 -0
- package/es/signature/style/index.d.ts +2 -0
- package/es/signature/style/index.js +2 -0
- package/es/signature/style/index.less +95 -0
- package/es/signature/style/mixin.less +6 -0
- package/es/signature/style/token.less +22 -0
- package/es/signature/utils/signature_pad.d.ts +106 -0
- package/es/signature/utils/signature_pad.js +690 -0
- package/es/style/themes/default.less +1 -1
- package/es/tree-select/tree-select.js +1 -1
- package/lib/_utils/domUtil.d.ts +2 -0
- package/lib/_utils/domUtil.js +23 -0
- package/lib/cascader/cascader.js +41 -10
- package/lib/config-provider/compDefaultProps.d.ts +7 -0
- package/lib/config-provider/compDefaultProps.js +7 -0
- package/lib/date-picker/date-picker.js +18 -16
- package/lib/date-picker/hooks/use-range-view-dates.js +7 -1
- package/lib/date-picker/panel/time/time.js +17 -2
- package/lib/date-picker/range-picker.js +18 -28
- package/lib/index.d.ts +1 -0
- package/lib/index.js +7 -0
- package/lib/locale/locale.d.ts +5 -0
- package/lib/locale/zh-CN.d.ts +5 -0
- package/lib/locale/zh-CN.js +6 -1
- package/lib/signature/drawingBoard.d.ts +15 -0
- package/lib/signature/drawingBoard.js +176 -0
- package/lib/signature/index.d.ts +3 -0
- package/lib/signature/index.js +27 -0
- package/lib/signature/signature.d.ts +32 -0
- package/lib/signature/signature.js +282 -0
- package/lib/signature/style/css.js +4 -0
- package/lib/signature/style/index.css +210 -0
- package/lib/signature/style/index.d.ts +2 -0
- package/lib/signature/style/index.js +4 -0
- package/lib/signature/style/index.less +95 -0
- package/lib/signature/style/mixin.less +6 -0
- package/lib/signature/style/token.less +22 -0
- package/lib/signature/utils/signature_pad.d.ts +106 -0
- package/lib/signature/utils/signature_pad.js +697 -0
- package/lib/style/components.less +1 -0
- package/lib/style/themes/default.less +1 -1
- package/lib/tree-select/tree-select.js +1 -1
- package/package.json +3 -2
|
@@ -236,7 +236,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
|
|
|
236
236
|
}
|
|
237
237
|
onClear === null || onClear === void 0 ? void 0 : onClear('');
|
|
238
238
|
setSearchValue('');
|
|
239
|
-
onChange === null || onChange === void 0 ? void 0 : onChange(undefined, undefined);
|
|
239
|
+
isMultiple ? onChange === null || onChange === void 0 ? void 0 : onChange('', '') : onChange === null || onChange === void 0 ? void 0 : onChange(undefined, undefined);
|
|
240
240
|
};
|
|
241
241
|
// 多选模式下清除某一项
|
|
242
242
|
var handleRemove = function handleRemove(e, key) {
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
|
|
4
|
+
Object.defineProperty(exports, "__esModule", {
|
|
5
|
+
value: true
|
|
6
|
+
});
|
|
7
|
+
exports.scrollToDirectory = void 0;
|
|
8
|
+
var _domScrollIntoView = _interopRequireDefault(require("dom-scroll-into-view"));
|
|
9
|
+
var scrollToDirectory = function scrollToDirectory(ref) {
|
|
10
|
+
var directoryElement = ref.current;
|
|
11
|
+
if (directoryElement) {
|
|
12
|
+
var rect = ref.current.getBoundingClientRect();
|
|
13
|
+
var parent = ref.current.parentElement;
|
|
14
|
+
var parentRect = parent.getBoundingClientRect();
|
|
15
|
+
var relativeTop = rect.top - parentRect.top;
|
|
16
|
+
var relativeBottom = rect.bottom - parentRect.top;
|
|
17
|
+
var isHide = relativeTop < 0 || relativeBottom > parent.clientHeight;
|
|
18
|
+
if (isHide) {
|
|
19
|
+
(0, _domScrollIntoView.default)(ref.current, ref.current.parentElement);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
};
|
|
23
|
+
exports.scrollToDirectory = scrollToDirectory;
|
package/lib/cascader/cascader.js
CHANGED
|
@@ -8,10 +8,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
value: true
|
|
9
9
|
});
|
|
10
10
|
exports.default = exports.CascaderPlacement = void 0;
|
|
11
|
-
var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
|
|
12
11
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
|
|
13
12
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
|
|
14
13
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
|
|
14
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
|
|
15
15
|
var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
|
|
16
16
|
var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
|
|
17
17
|
var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
|
|
@@ -24,6 +24,7 @@ var _type = require("../_utils/type");
|
|
|
24
24
|
var _utils = require("../_utils");
|
|
25
25
|
var _configProvider = require("../config-provider");
|
|
26
26
|
var _usePopper = _interopRequireDefault(require("../_utils/usePopper"));
|
|
27
|
+
var _domUtil = require("../_utils/domUtil");
|
|
27
28
|
var _input = _interopRequireDefault(require("../input"));
|
|
28
29
|
var _icon = _interopRequireDefault(require("../icon"));
|
|
29
30
|
var _empty = _interopRequireDefault(require("../empty"));
|
|
@@ -42,6 +43,28 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
|
|
|
42
43
|
};
|
|
43
44
|
var CascaderPlacement = (0, _type.tuple)('topLeft', 'topRight', 'bottomLeft', 'bottomRight');
|
|
44
45
|
exports.CascaderPlacement = CascaderPlacement;
|
|
46
|
+
var CascaderMenuSubmenu = function CascaderMenuSubmenu(props) {
|
|
47
|
+
var optionProps = props.optionProps,
|
|
48
|
+
label = props.label,
|
|
49
|
+
children = props.children,
|
|
50
|
+
selected = props.selected,
|
|
51
|
+
isMultiple = props.isMultiple;
|
|
52
|
+
var ref = (0, _react.useRef)(null);
|
|
53
|
+
var isFirst = (0, _react.useRef)(!isMultiple);
|
|
54
|
+
(0, _react.useEffect)(function () {
|
|
55
|
+
if (typeof selected === 'boolean' && isFirst.current && ref.current) {
|
|
56
|
+
isFirst.current = false;
|
|
57
|
+
if (selected && !isMultiple) {
|
|
58
|
+
(0, _domUtil.scrollToDirectory)(ref);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}, [selected]);
|
|
62
|
+
return /*#__PURE__*/_react.default.createElement("li", (0, _extends2.default)({
|
|
63
|
+
ref: ref
|
|
64
|
+
}, optionProps, {
|
|
65
|
+
title: label
|
|
66
|
+
}), children);
|
|
67
|
+
};
|
|
45
68
|
var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
46
69
|
var _React$useContext = _react.default.useContext(_configProvider.ConfigContext),
|
|
47
70
|
getPrefixCls = _React$useContext.getPrefixCls,
|
|
@@ -85,13 +108,18 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
85
108
|
var inputRef = (0, _react.useRef)();
|
|
86
109
|
var suffixRef = (0, _react.useRef)(null);
|
|
87
110
|
var wrapperRef = (0, _react.useRef)();
|
|
88
|
-
var _useState = (0, _react.useState)(
|
|
111
|
+
var _useState = (0, _react.useState)(false),
|
|
89
112
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
90
113
|
visible = _useState2[0],
|
|
91
114
|
setVisible = _useState2[1];
|
|
92
115
|
_react.default.useEffect(function () {
|
|
93
116
|
setVisible(!!props.popperVisible || !!props.popupVisible);
|
|
94
117
|
}, [props.popperVisible, props.popupVisible]);
|
|
118
|
+
_react.default.useEffect(function () {
|
|
119
|
+
if (!!props.popperVisible || !!props.popupVisible || defaultPopupVisible) {
|
|
120
|
+
setVisible(true);
|
|
121
|
+
}
|
|
122
|
+
}, []);
|
|
95
123
|
var _useState3 = (0, _react.useState)([options]),
|
|
96
124
|
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
97
125
|
menus = _useState4[0],
|
|
@@ -412,11 +440,11 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
412
440
|
}
|
|
413
441
|
props.onChange && props.onChange(selectedValue, selectedOptions);
|
|
414
442
|
};
|
|
415
|
-
var onVisibleChange = function onVisibleChange(
|
|
416
|
-
setVisible(
|
|
417
|
-
onPopupVisibleChange && onPopupVisibleChange(
|
|
418
|
-
onPopperVisibleChange && onPopperVisibleChange(
|
|
419
|
-
|
|
443
|
+
var onVisibleChange = function onVisibleChange(v) {
|
|
444
|
+
setVisible(v);
|
|
445
|
+
onPopupVisibleChange && onPopupVisibleChange(v);
|
|
446
|
+
onPopperVisibleChange && onPopperVisibleChange(v);
|
|
447
|
+
v && setSelectedOptions((0, _slice.default)(currentOptions).call(currentOptions, 0));
|
|
420
448
|
};
|
|
421
449
|
var cascaderMenus = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (options === null || options === void 0 ? void 0 : options.length) ? (menus === null || menus === void 0 ? void 0 : menus.length) && (0, _map.default)(menus).call(menus, function (opts, index) {
|
|
422
450
|
return /*#__PURE__*/_react.default.createElement("ul", {
|
|
@@ -449,10 +477,13 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
449
477
|
}) : ((children === null || children === void 0 ? void 0 : children.length) || isLeaf === false) && (props.expandIcon || /*#__PURE__*/_react.default.createElement(_icon.default, {
|
|
450
478
|
type: "arrow-right"
|
|
451
479
|
})));
|
|
452
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
480
|
+
return /*#__PURE__*/_react.default.createElement(CascaderMenuSubmenu, (0, _extends2.default)({
|
|
453
481
|
key: value
|
|
454
|
-
},
|
|
455
|
-
|
|
482
|
+
}, {
|
|
483
|
+
isMultiple: isMultiple,
|
|
484
|
+
optionProps: optionProps,
|
|
485
|
+
label: label,
|
|
486
|
+
selected: selected
|
|
456
487
|
}), isMultiple ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_checkbox.default, {
|
|
457
488
|
checked: (0, _util.getChecked)(checkedKeys, value),
|
|
458
489
|
indeterminate: (0, _util.getHalfChecked)(halfCheckedKeys, value),
|
|
@@ -488,5 +488,12 @@ declare const compDefaultProps: {
|
|
|
488
488
|
errorLevel: string;
|
|
489
489
|
color: string;
|
|
490
490
|
};
|
|
491
|
+
Signature: {
|
|
492
|
+
penColor: string;
|
|
493
|
+
backgroundColor: string;
|
|
494
|
+
containerWidth: number;
|
|
495
|
+
containerHeight: number;
|
|
496
|
+
canFullScreen: boolean;
|
|
497
|
+
};
|
|
491
498
|
};
|
|
492
499
|
export default compDefaultProps;
|
|
@@ -516,6 +516,13 @@ var compDefaultProps = {
|
|
|
516
516
|
type: 'canvas',
|
|
517
517
|
errorLevel: 'H',
|
|
518
518
|
color: '#000000'
|
|
519
|
+
},
|
|
520
|
+
Signature: {
|
|
521
|
+
penColor: 'black',
|
|
522
|
+
backgroundColor: 'white',
|
|
523
|
+
containerWidth: 610,
|
|
524
|
+
containerHeight: 500,
|
|
525
|
+
canFullScreen: true
|
|
519
526
|
}
|
|
520
527
|
};
|
|
521
528
|
var _default = compDefaultProps;
|
|
@@ -114,10 +114,15 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
114
114
|
_useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
|
|
115
115
|
dateValue = _useMergedState2[0],
|
|
116
116
|
setDateValue = _useMergedState2[1];
|
|
117
|
-
var
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
117
|
+
var _useMergedState3 = (0, _hooks.useMergedState)(null, {
|
|
118
|
+
value: dateValue,
|
|
119
|
+
postState: function postState(v) {
|
|
120
|
+
return v && !(0, _dateFns.isValid)(v) ? null : v;
|
|
121
|
+
}
|
|
122
|
+
}),
|
|
123
|
+
_useMergedState4 = (0, _slicedToArray2.default)(_useMergedState3, 2),
|
|
124
|
+
selectedValue = _useMergedState4[0],
|
|
125
|
+
setSelectedValue = _useMergedState4[1];
|
|
121
126
|
var hours;
|
|
122
127
|
var minutes;
|
|
123
128
|
var seconds;
|
|
@@ -148,7 +153,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
148
153
|
viewDate = _useState2[0],
|
|
149
154
|
setInnerViewDate = _useState2[1];
|
|
150
155
|
var setViewDate = function setViewDate(date) {
|
|
151
|
-
setInnerViewDate((0, _dateFns.
|
|
156
|
+
setInnerViewDate((0, _dateFns.isValid)(date) ? date : new Date());
|
|
152
157
|
};
|
|
153
158
|
(0, _react.useEffect)(function () {
|
|
154
159
|
setViewDate(dateValue);
|
|
@@ -187,7 +192,7 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
187
192
|
hoverValue = _useHoverValue2[0],
|
|
188
193
|
onEnter = _useHoverValue2[1],
|
|
189
194
|
onLeave = _useHoverValue2[2];
|
|
190
|
-
var
|
|
195
|
+
var _useMergedState5 = (0, _hooks.useMergedState)(false, {
|
|
191
196
|
value: open,
|
|
192
197
|
defaultValue: defaultOpen,
|
|
193
198
|
postState: function postState(postOpen) {
|
|
@@ -202,10 +207,10 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
202
207
|
// }
|
|
203
208
|
}
|
|
204
209
|
}),
|
|
205
|
-
|
|
206
|
-
openValue =
|
|
207
|
-
triggerInnerOpen =
|
|
208
|
-
var
|
|
210
|
+
_useMergedState6 = (0, _slicedToArray2.default)(_useMergedState5, 2),
|
|
211
|
+
openValue = _useMergedState6[0],
|
|
212
|
+
triggerInnerOpen = _useMergedState6[1];
|
|
213
|
+
var _useMergedState7 = (0, _hooks.useMergedState)(function () {
|
|
209
214
|
if (picker === 'time') {
|
|
210
215
|
return 'time';
|
|
211
216
|
}
|
|
@@ -213,9 +218,9 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
213
218
|
}, {
|
|
214
219
|
value: mode
|
|
215
220
|
}),
|
|
216
|
-
|
|
217
|
-
mergedMode =
|
|
218
|
-
setInnerMode =
|
|
221
|
+
_useMergedState8 = (0, _slicedToArray2.default)(_useMergedState7, 2),
|
|
222
|
+
mergedMode = _useMergedState8[0],
|
|
223
|
+
setInnerMode = _useMergedState8[1];
|
|
219
224
|
var _useState3 = (0, _react.useState)(undefined),
|
|
220
225
|
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
221
226
|
innerPicker = _useState4[0],
|
|
@@ -243,9 +248,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
|
|
|
243
248
|
}
|
|
244
249
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
245
250
|
}, [picker]);
|
|
246
|
-
(0, _react.useEffect)(function () {
|
|
247
|
-
setSelectedValue(dateValue);
|
|
248
|
-
}, [dateValue]);
|
|
249
251
|
(0, _hooks.useOnClickOutside)([popperRef, inputDivRef], function () {
|
|
250
252
|
setViewDate(selectedValue || (0, _dateFns.newDate)());
|
|
251
253
|
triggerOpen(false);
|
|
@@ -60,6 +60,12 @@ function getRangeViewDate(values, index, picker) {
|
|
|
60
60
|
}
|
|
61
61
|
return startDate;
|
|
62
62
|
}
|
|
63
|
+
function checkViewDate(value) {
|
|
64
|
+
if (value && !(0, _dateFns.isValid)(value)) {
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
return value;
|
|
68
|
+
}
|
|
63
69
|
function useRangeViewDates(_ref) {
|
|
64
70
|
var values = (0, _values.default)(_ref),
|
|
65
71
|
picker = _ref.picker,
|
|
@@ -80,7 +86,7 @@ function useRangeViewDates(_ref) {
|
|
|
80
86
|
if (defaultViewDates[index]) {
|
|
81
87
|
return defaultViewDates[index];
|
|
82
88
|
}
|
|
83
|
-
return (0, _utils.getValue)(viewDates, index) || getRangeViewDate(values, index, picker) || startDate || endDate || (0, _dateFns.newDate)();
|
|
89
|
+
return checkViewDate((0, _utils.getValue)(viewDates, index)) || checkViewDate(getRangeViewDate(values, index, picker)) || checkViewDate(startDate) || checkViewDate(endDate) || (0, _dateFns.newDate)();
|
|
84
90
|
}
|
|
85
91
|
function setViewDate(viewDate, index) {
|
|
86
92
|
if (viewDate) {
|
|
@@ -51,7 +51,9 @@ function TimePanel(props) {
|
|
|
51
51
|
minutes = _context$minutes === void 0 ? [] : _context$minutes,
|
|
52
52
|
_context$seconds = context.seconds,
|
|
53
53
|
seconds = _context$seconds === void 0 ? [] : _context$seconds,
|
|
54
|
-
disabledTimePanel = context.disabledTimePanel
|
|
54
|
+
disabledTimePanel = context.disabledTimePanel,
|
|
55
|
+
rangeValue = context.rangeValue,
|
|
56
|
+
panelPosition = context.panelPosition;
|
|
55
57
|
var picker = props.picker,
|
|
56
58
|
_props$format = props.format,
|
|
57
59
|
format = _props$format === void 0 ? 'HH:mm:ss' : _props$format,
|
|
@@ -84,9 +86,22 @@ function TimePanel(props) {
|
|
|
84
86
|
var hour = originHour;
|
|
85
87
|
// const minute = value ? getMinutes(value) : -1
|
|
86
88
|
// const second = value ? getSeconds(value) : -1
|
|
89
|
+
var getDefaultDate = function getDefaultDate() {
|
|
90
|
+
if (panelPosition) {
|
|
91
|
+
if (rangeValue && rangeValue[0] && (0, _dateFns.isValid)(rangeValue[0])) {
|
|
92
|
+
return rangeValue[0];
|
|
93
|
+
}
|
|
94
|
+
if (rangeValue && rangeValue[1] && (0, _dateFns.isValid)(rangeValue[1])) {
|
|
95
|
+
return rangeValue[1];
|
|
96
|
+
}
|
|
97
|
+
} else if (value && (0, _dateFns.isValid)(value)) {
|
|
98
|
+
return value;
|
|
99
|
+
}
|
|
100
|
+
return (0, _dateFns.newDate)();
|
|
101
|
+
};
|
|
87
102
|
var setTime = function setTime(isPM, newHour, newMinute, newSecond) {
|
|
88
103
|
var _a, _b, _c;
|
|
89
|
-
var date =
|
|
104
|
+
var date = getDefaultDate();
|
|
90
105
|
var _hour = newHour > -1 ? newHour : (_a = (0, _find.default)(rawHours).call(rawHours, function (n) {
|
|
91
106
|
return !n.disabled;
|
|
92
107
|
})) === null || _a === void 0 ? void 0 : _a.value;
|
|
@@ -42,14 +42,6 @@ function reorderValues(values) {
|
|
|
42
42
|
}
|
|
43
43
|
return values;
|
|
44
44
|
}
|
|
45
|
-
// 范围时间顺序错误时报错
|
|
46
|
-
function isErrorValues(values) {
|
|
47
|
-
if (values && values[0] && values[1] && (0, _dateFns.isAfter)(values[0], values[1])) {
|
|
48
|
-
console.error('开始日期在结束日期之后');
|
|
49
|
-
return true;
|
|
50
|
-
}
|
|
51
|
-
return false;
|
|
52
|
-
}
|
|
53
45
|
// 是否可以切换选择器
|
|
54
46
|
function canValueTrigger(value, index, disabled, allowEmpty) {
|
|
55
47
|
if (value) {
|
|
@@ -157,17 +149,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
157
149
|
// 原始数据
|
|
158
150
|
var _useMergedState3 = (0, _hooks.useMergedState)(null, {
|
|
159
151
|
value: value,
|
|
160
|
-
defaultValue: defaultValue
|
|
161
|
-
postState: function postState(values) {
|
|
162
|
-
if (picker === 'time' || picker === 'date' && showTime) {
|
|
163
|
-
return order ? reorderValues(values) : values;
|
|
164
|
-
} else {
|
|
165
|
-
if (isErrorValues(values)) {
|
|
166
|
-
return [values[0], null];
|
|
167
|
-
}
|
|
168
|
-
return values;
|
|
169
|
-
}
|
|
170
|
-
}
|
|
152
|
+
defaultValue: defaultValue
|
|
171
153
|
}),
|
|
172
154
|
_useMergedState4 = (0, _slicedToArray2.default)(_useMergedState3, 2),
|
|
173
155
|
dateValue = _useMergedState4[0],
|
|
@@ -182,8 +164,11 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
182
164
|
}
|
|
183
165
|
// Fill disabled unit
|
|
184
166
|
for (var i = 0; i < 2; i++) {
|
|
185
|
-
|
|
167
|
+
var v = (0, _utils2.getValue)(postValues, i);
|
|
168
|
+
if (mergedDisabled[i] && !v && !(0, _utils2.getValue)(allowEmpty, i)) {
|
|
186
169
|
postValues = (0, _utils2.updateValues)(postValues, (0, _dateFns.newDate)(), i);
|
|
170
|
+
} else if (v && !(0, _dateFns.isValid)(v)) {
|
|
171
|
+
postValues = (0, _utils2.updateValues)(postValues, null, i);
|
|
187
172
|
}
|
|
188
173
|
}
|
|
189
174
|
return postValues;
|
|
@@ -364,12 +349,20 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
364
349
|
}
|
|
365
350
|
}, 0);
|
|
366
351
|
};
|
|
352
|
+
var triggerChangeInner = function triggerChangeInner(values) {
|
|
353
|
+
if (typeof value === 'undefined') {
|
|
354
|
+
setInnerValue(values);
|
|
355
|
+
}
|
|
356
|
+
if (onChange && (!(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 0), (0, _utils2.getValue)(values, 0)) || !(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 1), (0, _utils2.getValue)(values, 1)))) {
|
|
357
|
+
onChange(values, [values && values[0] ? (0, _dateFns.formatDate)(values[0], _format) : '', values && values[1] ? (0, _dateFns.formatDate)(values[1], _format) : '']);
|
|
358
|
+
}
|
|
359
|
+
};
|
|
367
360
|
var triggerChange = function triggerChange(newValue, sourceIndex) {
|
|
368
361
|
var values = newValue;
|
|
369
362
|
var startValue = (0, _utils2.getValue)(values, 0);
|
|
370
363
|
var endValue = (0, _utils2.getValue)(values, 1);
|
|
371
364
|
if (startValue && endValue && (0, _dateFns.isAfter)(startValue, endValue)) {
|
|
372
|
-
if (picker === 'week' && !(0, _isSameWeek.default)(startValue, endValue) || picker === 'quarter' && !(0, _dateFns.isSameQuarter)(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !(0, _dateFns.isSameDay)(startValue, endValue)) {
|
|
365
|
+
if (picker === 'week' && !(0, _isSameWeek.default)(startValue, endValue) || picker === 'quarter' && !(0, _dateFns.isSameQuarter)(startValue, endValue) || picker === 'time' && !(0, _dateFns.isEqual)(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !(0, _dateFns.isSameDay)(startValue, endValue)) {
|
|
373
366
|
if (sourceIndex === 0) {
|
|
374
367
|
values = [startValue, null];
|
|
375
368
|
endValue = null;
|
|
@@ -378,8 +371,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
378
371
|
values = [null, endValue];
|
|
379
372
|
}
|
|
380
373
|
openRecordsRef.current = (0, _defineProperty2.default)({}, sourceIndex, true);
|
|
381
|
-
} else if (picker === 'time' && order === true) {
|
|
382
|
-
values = reorderValues(values);
|
|
383
374
|
}
|
|
384
375
|
}
|
|
385
376
|
setSelectedValue(values);
|
|
@@ -395,11 +386,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
395
386
|
var canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);
|
|
396
387
|
var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
|
|
397
388
|
if (canTrigger) {
|
|
398
|
-
if (
|
|
399
|
-
|
|
400
|
-
}
|
|
401
|
-
|
|
402
|
-
onChange(values, [startStr, endStr]);
|
|
389
|
+
if (order) {
|
|
390
|
+
triggerChangeInner(reorderValues(values));
|
|
391
|
+
} else {
|
|
392
|
+
triggerChangeInner(values);
|
|
403
393
|
}
|
|
404
394
|
}
|
|
405
395
|
var curValue = (0, _utils2.getValue)(values, sourceIndex);
|
package/lib/index.d.ts
CHANGED
package/lib/index.js
CHANGED
|
@@ -277,6 +277,12 @@ Object.defineProperty(exports, "Select", {
|
|
|
277
277
|
return _select.default;
|
|
278
278
|
}
|
|
279
279
|
});
|
|
280
|
+
Object.defineProperty(exports, "Signature", {
|
|
281
|
+
enumerable: true,
|
|
282
|
+
get: function get() {
|
|
283
|
+
return _signature.default;
|
|
284
|
+
}
|
|
285
|
+
});
|
|
280
286
|
Object.defineProperty(exports, "Slider", {
|
|
281
287
|
enumerable: true,
|
|
282
288
|
get: function get() {
|
|
@@ -458,6 +464,7 @@ var _colorPicker = _interopRequireDefault(require("./color-picker"));
|
|
|
458
464
|
var _clipboard = _interopRequireDefault(require("./clipboard"));
|
|
459
465
|
var _qrCode = _interopRequireDefault(require("./qr-code"));
|
|
460
466
|
var _divider = _interopRequireDefault(require("./divider"));
|
|
467
|
+
var _signature = _interopRequireDefault(require("./signature"));
|
|
461
468
|
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); }
|
|
462
469
|
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; }
|
|
463
470
|
/* @remove-on-es-build-begin */
|
package/lib/locale/locale.d.ts
CHANGED
|
@@ -100,6 +100,11 @@ declare class LocaleCache {
|
|
|
100
100
|
'Table.confirmFilter': string;
|
|
101
101
|
'Select.selectAll': string;
|
|
102
102
|
'Select.seleted': string;
|
|
103
|
+
'Signature.clickToSign': string;
|
|
104
|
+
'Signature.pleaseWriteHere': string;
|
|
105
|
+
'Signature.okText': string;
|
|
106
|
+
'Signature.cancelText': string;
|
|
107
|
+
'Signature.handwrittenSignature': string;
|
|
103
108
|
'DatePicker.placeholder': string;
|
|
104
109
|
'DatePicker.yearPlaceholder': string;
|
|
105
110
|
'DatePicker.quarterPlaceholder': string;
|
package/lib/locale/zh-CN.d.ts
CHANGED
|
@@ -74,6 +74,11 @@ declare const locale: {
|
|
|
74
74
|
'Table.confirmFilter': string;
|
|
75
75
|
'Select.selectAll': string;
|
|
76
76
|
'Select.seleted': string;
|
|
77
|
+
'Signature.clickToSign': string;
|
|
78
|
+
'Signature.pleaseWriteHere': string;
|
|
79
|
+
'Signature.okText': string;
|
|
80
|
+
'Signature.cancelText': string;
|
|
81
|
+
'Signature.handwrittenSignature': string;
|
|
77
82
|
'DatePicker.placeholder': string;
|
|
78
83
|
'DatePicker.yearPlaceholder': string;
|
|
79
84
|
'DatePicker.quarterPlaceholder': string;
|
package/lib/locale/zh-CN.js
CHANGED
|
@@ -84,7 +84,12 @@ var locale = (0, _extends2.default)((0, _extends2.default)({
|
|
|
84
84
|
'Table.resetFilter': '重置',
|
|
85
85
|
'Table.confirmFilter': '确定',
|
|
86
86
|
'Select.selectAll': '全选',
|
|
87
|
-
'Select.seleted': '已选{size}项'
|
|
87
|
+
'Select.seleted': '已选{size}项',
|
|
88
|
+
'Signature.clickToSign': '点击签名',
|
|
89
|
+
'Signature.pleaseWriteHere': '请在此处横向书写签名',
|
|
90
|
+
'Signature.okText': '确定',
|
|
91
|
+
'Signature.cancelText': '取消',
|
|
92
|
+
'Signature.handwrittenSignature': '手写签名'
|
|
88
93
|
});
|
|
89
94
|
var _default = locale;
|
|
90
95
|
exports.default = _default;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import SignaturePad from './utils/signature_pad';
|
|
3
|
+
export interface DrawingBoardProps {
|
|
4
|
+
prefixCls: string;
|
|
5
|
+
signatureLangMsg: any;
|
|
6
|
+
isEmpty: boolean;
|
|
7
|
+
setDataUrl: (dataUrl: string) => void;
|
|
8
|
+
setIsEmpty: (value: boolean) => void;
|
|
9
|
+
signaturePad: () => SignaturePad | null | undefined;
|
|
10
|
+
undo?: () => void;
|
|
11
|
+
redo?: () => void;
|
|
12
|
+
onClear?: () => void;
|
|
13
|
+
}
|
|
14
|
+
declare const DrawingBoard: React.ForwardRefExoticComponent<DrawingBoardProps & React.RefAttributes<unknown>>;
|
|
15
|
+
export default DrawingBoard;
|