@kdcloudjs/kdesign 1.6.0 → 1.6.3
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 +49 -0
- package/dist/kdesign-complete.less +67 -33
- package/dist/kdesign.css +60 -21
- package/dist/kdesign.css.map +1 -1
- package/dist/kdesign.js +145 -120
- package/dist/kdesign.js.map +1 -1
- package/dist/kdesign.min.css +3 -3
- package/dist/kdesign.min.js +8 -8
- package/dist/kdesign.min.js.map +1 -1
- package/es/date-picker/calendar.js +5 -17
- package/es/date-picker/date-panel.js +4 -3
- package/es/date-picker/interface.d.ts +6 -0
- package/es/date-picker/locale/zh_CN.js +3 -0
- package/es/date-picker/panel/week/week.js +1 -1
- package/es/date-picker/range-picker.js +1 -0
- package/es/date-picker/style/index.css +45 -16
- package/es/date-picker/style/index.less +36 -16
- package/es/date-picker/style/mixin.less +1 -0
- package/es/date-picker/style/token.less +1 -1
- package/es/dropdown/dropdown.js +1 -1
- package/es/locale/locale.d.ts +7 -1
- package/es/locale/zh-CN.d.ts +4 -1
- package/es/locale/zh-CN.js +1 -1
- package/es/pagination/pagination.js +2 -1
- package/es/search/quick-search.js +1 -1
- package/es/search/search.js +3 -2
- package/es/transfer/list-body.js +14 -3
- package/es/transfer/list.d.ts +1 -0
- package/es/transfer/list.js +7 -14
- package/es/transfer/transfer.d.ts +1 -0
- package/es/transfer/transfer.js +6 -0
- package/es/tree/style/index.css +14 -4
- package/es/tree/style/index.less +26 -16
- package/es/tree/style/token.less +3 -0
- package/es/tree/tree.js +44 -31
- package/es/tree/treeNode.js +8 -4
- package/lib/date-picker/calendar.js +4 -16
- package/lib/date-picker/date-panel.js +4 -3
- package/lib/date-picker/interface.d.ts +6 -0
- package/lib/date-picker/locale/zh_CN.js +3 -0
- package/lib/date-picker/panel/week/week.js +1 -1
- package/lib/date-picker/range-picker.js +1 -0
- package/lib/date-picker/style/index.css +45 -16
- package/lib/date-picker/style/index.less +36 -16
- package/lib/date-picker/style/mixin.less +1 -0
- package/lib/date-picker/style/token.less +1 -1
- package/lib/dropdown/dropdown.js +1 -1
- package/lib/locale/locale.d.ts +7 -1
- package/lib/locale/zh-CN.d.ts +4 -1
- package/lib/locale/zh-CN.js +1 -1
- package/lib/pagination/pagination.js +3 -1
- package/lib/search/quick-search.js +1 -1
- package/lib/search/search.js +3 -2
- package/lib/transfer/list-body.js +13 -2
- package/lib/transfer/list.d.ts +1 -0
- package/lib/transfer/list.js +6 -14
- package/lib/transfer/transfer.d.ts +1 -0
- package/lib/transfer/transfer.js +6 -0
- package/lib/tree/style/index.css +14 -4
- package/lib/tree/style/index.less +26 -16
- package/lib/tree/style/token.less +3 -0
- package/lib/tree/tree.js +45 -32
- package/lib/tree/treeNode.js +8 -4
- package/package.json +1 -1
package/es/transfer/list.js
CHANGED
|
@@ -4,10 +4,9 @@ import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
|
|
|
4
4
|
import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
|
|
5
5
|
import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
|
|
6
6
|
import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
|
|
7
|
-
import React, { useState
|
|
7
|
+
import React, { useState } from 'react';
|
|
8
8
|
import { omit } from '../_utils/omit';
|
|
9
9
|
import Search from './search';
|
|
10
|
-
import ConfigContext from '../config-provider/ConfigContext';
|
|
11
10
|
import DefaultListBody, { OmitProps } from './list-body';
|
|
12
11
|
import classNames from 'classnames';
|
|
13
12
|
import Checkbox from '../checkbox';
|
|
@@ -23,9 +22,6 @@ function isRenderResultPlainObject(result) {
|
|
|
23
22
|
var TransferList = function TransferList(props) {
|
|
24
23
|
var _classNames;
|
|
25
24
|
|
|
26
|
-
var _useContext = useContext(ConfigContext),
|
|
27
|
-
locale = _useContext.locale;
|
|
28
|
-
|
|
29
25
|
var prefixCls = props.prefixCls,
|
|
30
26
|
dataSource = props.dataSource,
|
|
31
27
|
filterOption = props.filterOption,
|
|
@@ -44,11 +40,8 @@ var TransferList = function TransferList(props) {
|
|
|
44
40
|
showSelectAll = props.showSelectAll,
|
|
45
41
|
pagination = props.pagination,
|
|
46
42
|
footer = props.footer,
|
|
47
|
-
showRemove = props.showRemove
|
|
48
|
-
|
|
49
|
-
componentName: 'Transfer'
|
|
50
|
-
});
|
|
51
|
-
var searchPlaceholder = transferLang.searchPlaceholder;
|
|
43
|
+
showRemove = props.showRemove,
|
|
44
|
+
placeholder = props.placeholder;
|
|
52
45
|
|
|
53
46
|
var _useState = useState(''),
|
|
54
47
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -121,7 +114,7 @@ var TransferList = function TransferList(props) {
|
|
|
121
114
|
};
|
|
122
115
|
};
|
|
123
116
|
|
|
124
|
-
var getListBody = function getListBody(prefixCls,
|
|
117
|
+
var getListBody = function getListBody(prefixCls, placeholder, filterValue, filteredItems, noDataContent, filteredRenderItems, checkedKeys, renderList, showSearch, disabled) {
|
|
125
118
|
var _context;
|
|
126
119
|
|
|
127
120
|
var search = showSearch ? /*#__PURE__*/React.createElement("div", {
|
|
@@ -130,7 +123,7 @@ var TransferList = function TransferList(props) {
|
|
|
130
123
|
prefixCls: "".concat(prefixCls, "-search"),
|
|
131
124
|
onChange: onFilterChange,
|
|
132
125
|
handleClear: onClear,
|
|
133
|
-
placeholder:
|
|
126
|
+
placeholder: placeholder,
|
|
134
127
|
value: filterValue,
|
|
135
128
|
disabled: disabled
|
|
136
129
|
})) : null;
|
|
@@ -216,8 +209,8 @@ var TransferList = function TransferList(props) {
|
|
|
216
209
|
filteredItems = _getFilteredItems.filteredItems,
|
|
217
210
|
filteredRenderItems = _getFilteredItems.filteredRenderItems;
|
|
218
211
|
|
|
219
|
-
var checkAllCheckbox = !showRemove &&
|
|
220
|
-
var listBody = getListBody(prefixCls,
|
|
212
|
+
var checkAllCheckbox = !showRemove && getCheckBox(filteredItems, onItemSelectAll, showSelectAll, disabled);
|
|
213
|
+
var listBody = getListBody(prefixCls, placeholder, filterValue, filteredItems, noDataContent, filteredRenderItems, checkedKeys, renderList, showSearch, disabled);
|
|
221
214
|
var listCls = classNames(prefixCls, (_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-with-pagination"), pagination), _defineProperty(_classNames, "".concat(prefixCls, "-with-footer"), footerDom), _classNames));
|
|
222
215
|
return /*#__PURE__*/React.createElement("div", {
|
|
223
216
|
className: listCls,
|
|
@@ -18,6 +18,7 @@ export interface TransferProps {
|
|
|
18
18
|
noDataContent?: ((param: TransferRenderParam) => React.ReactNode) | React.ReactNode;
|
|
19
19
|
titles?: string[];
|
|
20
20
|
operations?: string[];
|
|
21
|
+
searchPlaceholder?: string[];
|
|
21
22
|
showSearch?: boolean;
|
|
22
23
|
filterOption?: (inputValue: string, item: TransferItem) => boolean;
|
|
23
24
|
rowKey?: (record: TransferItem) => string;
|
package/es/transfer/transfer.js
CHANGED
|
@@ -43,6 +43,8 @@ var Transfer = function Transfer(props) {
|
|
|
43
43
|
titles = _transferProps$titles === void 0 ? [] : _transferProps$titles,
|
|
44
44
|
_transferProps$operat = transferProps.operations,
|
|
45
45
|
operations = _transferProps$operat === void 0 ? [] : _transferProps$operat,
|
|
46
|
+
_transferProps$search = transferProps.searchPlaceholder,
|
|
47
|
+
searchPlaceholder = _transferProps$search === void 0 ? [] : _transferProps$search,
|
|
46
48
|
showSearch = transferProps.showSearch,
|
|
47
49
|
filterOption = transferProps.filterOption,
|
|
48
50
|
rowKey = transferProps.rowKey,
|
|
@@ -78,6 +80,8 @@ var Transfer = function Transfer(props) {
|
|
|
78
80
|
var mergedPagination = !children && pagination;
|
|
79
81
|
var leftTitle = titles[0] || transferLang.leftTitle;
|
|
80
82
|
var rightTitle = titles[1] || transferLang.rightTitle;
|
|
83
|
+
var leftPlaceholder = searchPlaceholder[0] || transferLang.searchPlaceholder[0];
|
|
84
|
+
var rightPlaceholder = searchPlaceholder[1] || transferLang.searchPlaceholder[1];
|
|
81
85
|
|
|
82
86
|
var setStateKeys = function setStateKeys(direction, keys) {
|
|
83
87
|
if (direction === 'left') {
|
|
@@ -279,6 +283,7 @@ var Transfer = function Transfer(props) {
|
|
|
279
283
|
style: style
|
|
280
284
|
}, /*#__PURE__*/React.createElement(List, {
|
|
281
285
|
prefixCls: "".concat(transferPrefixCls, "-list"),
|
|
286
|
+
placeholder: leftPlaceholder,
|
|
282
287
|
titleText: leftTitle,
|
|
283
288
|
dataSource: leftDataSource,
|
|
284
289
|
filterOption: filterOption,
|
|
@@ -310,6 +315,7 @@ var Transfer = function Transfer(props) {
|
|
|
310
315
|
oneWay: oneWay
|
|
311
316
|
}), /*#__PURE__*/React.createElement(List, {
|
|
312
317
|
prefixCls: "".concat(transferPrefixCls, "-list"),
|
|
318
|
+
placeholder: rightPlaceholder,
|
|
313
319
|
titleText: rightTitle,
|
|
314
320
|
dataSource: rightDataSource,
|
|
315
321
|
filterOption: filterOption,
|
package/es/tree/style/index.css
CHANGED
|
@@ -132,6 +132,7 @@
|
|
|
132
132
|
font-size: var(--kd-c-tree-font-size, var(--kd-g-font-size-small, 12px));
|
|
133
133
|
color: var(--kd-c-tree-color-text, var(--kd-g-color-text-primary, #212121));
|
|
134
134
|
margin-left: var(--kd-c-tree-spacing-margin-left, 0px);
|
|
135
|
+
padding: var(--kd-c-tree-spacing-padding-vertical, 3px) 0;
|
|
135
136
|
}
|
|
136
137
|
.kd-tree-root {
|
|
137
138
|
min-width: 100%;
|
|
@@ -313,16 +314,19 @@
|
|
|
313
314
|
}
|
|
314
315
|
.kd-tree-node-drag-over {
|
|
315
316
|
background-color: var(--kd-c-tree-node-drag-over-color-background, #E3EBFF);
|
|
316
|
-
|
|
317
|
+
-webkit-box-shadow: inset 0 0 0 2px var(--kd-c-tree-node-drag-over-color-border, #5582f3);
|
|
318
|
+
box-shadow: inset 0 0 0 2px var(--kd-c-tree-node-drag-over-color-border, #5582f3);
|
|
317
319
|
}
|
|
318
|
-
.kd-tree-node-drag-line
|
|
320
|
+
.kd-tree-node-drag-line-top,
|
|
321
|
+
.kd-tree-node-drag-line-bottom {
|
|
319
322
|
position: absolute;
|
|
320
323
|
left: 0;
|
|
321
|
-
top:
|
|
324
|
+
top: 0;
|
|
322
325
|
width: 100%;
|
|
323
326
|
border-top: 2px solid var(--kd-c-tree-node-drag-line-color-background, #276FF5);
|
|
324
327
|
}
|
|
325
|
-
.kd-tree-node-drag-line::before
|
|
328
|
+
.kd-tree-node-drag-line-top::before,
|
|
329
|
+
.kd-tree-node-drag-line-bottom::before {
|
|
326
330
|
content: '';
|
|
327
331
|
width: 4px;
|
|
328
332
|
height: 4px;
|
|
@@ -334,6 +338,12 @@
|
|
|
334
338
|
-webkit-transform: translateY(-50%);
|
|
335
339
|
transform: translateY(-50%);
|
|
336
340
|
}
|
|
341
|
+
.kd-tree-node-drag-line-top {
|
|
342
|
+
top: 0;
|
|
343
|
+
}
|
|
344
|
+
.kd-tree-node-drag-line-bottom {
|
|
345
|
+
top: 100%;
|
|
346
|
+
}
|
|
337
347
|
.kd-tree-node-leaf-icon {
|
|
338
348
|
height: var(--kd-c-tree-node-icon-sizing-height, 16px);
|
|
339
349
|
width: var(--kd-c-tree-node-icon-sizing-width, 16px);
|
package/es/tree/style/index.less
CHANGED
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
font-size: @tree-font-size;
|
|
13
13
|
color: @tree-color-text;
|
|
14
14
|
margin-left: @tree-margin-left;
|
|
15
|
+
padding: @tree-padding-vertical 0;
|
|
15
16
|
&-root {
|
|
16
17
|
min-width: 100%;
|
|
17
18
|
flex-shrink: 0;
|
|
@@ -136,26 +137,35 @@
|
|
|
136
137
|
|
|
137
138
|
&-drag-over {
|
|
138
139
|
background-color: @tree-node-drag-over-color-background;
|
|
139
|
-
|
|
140
|
+
box-shadow: inset 0 0 0 2px @tree-node-drag-over-border-color;
|
|
140
141
|
}
|
|
141
142
|
|
|
142
143
|
&-drag-line {
|
|
143
|
-
|
|
144
|
-
left: 0;
|
|
145
|
-
top: 100%;
|
|
146
|
-
width: 100%;
|
|
147
|
-
border-top: 2px solid @tree-node-drag-line-border-color;
|
|
148
|
-
|
|
149
|
-
&::before {
|
|
150
|
-
content: '';
|
|
151
|
-
width: 4px;
|
|
152
|
-
height: 4px;
|
|
153
|
-
background-color: #fff;
|
|
154
|
-
border-radius: 50%;
|
|
155
|
-
border: 2px solid @tree-node-drag-line-border-color;
|
|
144
|
+
&-top, &-bottom {
|
|
156
145
|
position: absolute;
|
|
157
|
-
|
|
158
|
-
|
|
146
|
+
left: 0;
|
|
147
|
+
top: 0;
|
|
148
|
+
width: 100%;
|
|
149
|
+
border-top: 2px solid @tree-node-drag-line-border-color;
|
|
150
|
+
|
|
151
|
+
&::before {
|
|
152
|
+
content: '';
|
|
153
|
+
width: 4px;
|
|
154
|
+
height: 4px;
|
|
155
|
+
background-color: #fff;
|
|
156
|
+
border-radius: 50%;
|
|
157
|
+
border: 2px solid @tree-node-drag-line-border-color;
|
|
158
|
+
position: absolute;
|
|
159
|
+
top: -1px;
|
|
160
|
+
transform: translateY(-50%);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
&-top {
|
|
164
|
+
top: 0;
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
&-bottom {
|
|
168
|
+
top: 100%;
|
|
159
169
|
}
|
|
160
170
|
}
|
|
161
171
|
&-leaf-icon {
|
package/es/tree/style/token.less
CHANGED
|
@@ -22,7 +22,10 @@
|
|
|
22
22
|
@tree-expand-icon-loading-width: var(~'@{tree-prefix}-expand-icon-loading-sizing-width', 16px);
|
|
23
23
|
@tree-node-icon-height: var(~'@{tree-prefix}-node-icon-sizing-height', 16px);
|
|
24
24
|
@tree-node-icon-width: var(~'@{tree-prefix}-node-icon-sizing-width', 16px);
|
|
25
|
+
|
|
26
|
+
// spacing
|
|
25
27
|
@tree-margin-left: var(~'@{tree-prefix}-spacing-margin-left', 0px);
|
|
28
|
+
@tree-padding-vertical: var(~'@{tree-prefix}-spacing-padding-vertical', 3px);
|
|
26
29
|
|
|
27
30
|
// font
|
|
28
31
|
@tree-font-size: var(~'@{tree-prefix}-font-size', @font-size-small);
|
package/es/tree/tree.js
CHANGED
|
@@ -250,45 +250,32 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
250
250
|
}, [onDragStart]);
|
|
251
251
|
var handleDragOver = React.useCallback(function (event, node, dropTarget) {
|
|
252
252
|
var dropPos = calcDropPosition(event, dropTarget);
|
|
253
|
-
setDropPosition(dropPos);
|
|
254
|
-
var dragNode = getDragNode();
|
|
255
253
|
|
|
256
|
-
if (
|
|
257
|
-
|
|
254
|
+
if (!delayedDragEnterRef.current) {
|
|
255
|
+
delayedDragEnterRef.current = {};
|
|
258
256
|
}
|
|
259
257
|
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
node: node
|
|
269
|
-
});
|
|
270
|
-
}, [onDragLeave]);
|
|
271
|
-
var handleDragEnter = React.useCallback(function (event, node, dropTarget) {
|
|
258
|
+
if (dropPos !== 0 && dropPos !== dropPosition) {
|
|
259
|
+
_Object$keys(delayedDragEnterRef.current).forEach(function (key) {
|
|
260
|
+
clearTimeout(delayedDragEnterRef.current[key]);
|
|
261
|
+
delayedDragEnterRef.current[key] = null;
|
|
262
|
+
});
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
setDropPosition(dropPos);
|
|
272
266
|
var key = node.key,
|
|
273
267
|
pos = node.pos;
|
|
274
268
|
var dragNode = getDragNode();
|
|
275
269
|
|
|
276
|
-
if (
|
|
277
|
-
|
|
278
|
-
}
|
|
279
|
-
|
|
280
|
-
if (!delayedDragEnterRef.current) {
|
|
281
|
-
delayedDragEnterRef.current = {};
|
|
270
|
+
if (dragNode.key === node.key) {
|
|
271
|
+
setDropPosition(null);
|
|
282
272
|
}
|
|
283
273
|
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
274
|
+
if ((dragNode === null || dragNode === void 0 ? void 0 : dragNode.key) !== key && dropPos === 0) {
|
|
275
|
+
if (dragNode.key === node.key || delayedDragEnterRef.current[pos]) {
|
|
276
|
+
return;
|
|
277
|
+
}
|
|
287
278
|
|
|
288
|
-
if ((dragNode === null || dragNode === void 0 ? void 0 : dragNode.key) !== key) {
|
|
289
|
-
var dragPos = calcDropPosition(event, dropTarget);
|
|
290
|
-
setDragOverNodeKey(key);
|
|
291
|
-
setDropPosition(dragPos);
|
|
292
279
|
delayedDragEnterRef.current[pos] = setTimeout(function () {
|
|
293
280
|
var newExpandedKeys = _toConsumableArray(expandedKeys);
|
|
294
281
|
|
|
@@ -307,13 +294,36 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
307
294
|
}, 800);
|
|
308
295
|
}
|
|
309
296
|
|
|
297
|
+
onDragOver && onDragOver({
|
|
298
|
+
event: event,
|
|
299
|
+
node: node
|
|
300
|
+
});
|
|
301
|
+
}, [TreeProps, dropPosition, expandedKeys, onDragOver, onExpand, setExpandedKeys]);
|
|
302
|
+
var handleDragLeave = React.useCallback(function (event, node) {
|
|
303
|
+
onDragLeave && onDragLeave({
|
|
304
|
+
event: event,
|
|
305
|
+
node: node
|
|
306
|
+
});
|
|
307
|
+
}, [onDragLeave]);
|
|
308
|
+
var handleDragEnter = React.useCallback(function (event, node, _dropTarget) {
|
|
309
|
+
var key = node.key;
|
|
310
|
+
var dragNode = getDragNode();
|
|
311
|
+
|
|
312
|
+
if (!dragNode) {
|
|
313
|
+
return;
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
if ((dragNode === null || dragNode === void 0 ? void 0 : dragNode.key) !== key) {
|
|
317
|
+
setDragOverNodeKey(key);
|
|
318
|
+
}
|
|
319
|
+
|
|
310
320
|
onDragEnter && onDragEnter({
|
|
311
321
|
event: event,
|
|
312
322
|
node: node
|
|
313
323
|
});
|
|
314
|
-
}, [
|
|
324
|
+
}, [onDragEnter]);
|
|
315
325
|
var handleDragEnd = React.useCallback(function (event, node) {
|
|
316
|
-
setDragOverNodeKey(
|
|
326
|
+
setDragOverNodeKey(null);
|
|
317
327
|
onDragEnd && onDragEnd({
|
|
318
328
|
event: event,
|
|
319
329
|
node: node
|
|
@@ -322,6 +332,8 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
322
332
|
var handleDrop = React.useCallback(function (event, node, dragNode, dragNodesKeys) {
|
|
323
333
|
var _context3;
|
|
324
334
|
|
|
335
|
+
setDragOverNodeKey(null);
|
|
336
|
+
setDropPosition(null);
|
|
325
337
|
var pos = getPos(flattenAllData, dragNodesKeys);
|
|
326
338
|
|
|
327
339
|
var keys = _concatInstanceProperty(_context3 = getAllChildKeys(flattenAllData, pos)).call(_context3, dragNodesKeys);
|
|
@@ -419,6 +431,7 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
419
431
|
item.getDragNode = getDragNode;
|
|
420
432
|
item.setDragNode = setDragNode;
|
|
421
433
|
item.dragOver = dragOverNodeKey === item.key && dropPosition === 0;
|
|
434
|
+
item.dropPosition = dropPosition;
|
|
422
435
|
item.expandOnClickNode = expandOnClickNode;
|
|
423
436
|
item.loading = loadingKeys.has(item.key) && !loadedKeys.has(item.key);
|
|
424
437
|
item.loadData = loadData;
|
package/es/tree/treeNode.js
CHANGED
|
@@ -58,6 +58,7 @@ var TreeNode = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
58
58
|
indeterminate = TreeNodeProps.indeterminate,
|
|
59
59
|
estimatedItemSize = TreeNodeProps.estimatedItemSize,
|
|
60
60
|
dragOver = TreeNodeProps.dragOver,
|
|
61
|
+
dropPosition = TreeNodeProps.dropPosition,
|
|
61
62
|
expandOnClickNode = TreeNodeProps.expandOnClickNode,
|
|
62
63
|
loading = TreeNodeProps.loading,
|
|
63
64
|
onExpand = TreeNodeProps.onExpand,
|
|
@@ -69,7 +70,7 @@ var TreeNode = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
69
70
|
onDragEnd = TreeNodeProps.onDragEnd,
|
|
70
71
|
onDrop = TreeNodeProps.onDrop,
|
|
71
72
|
onSelect = TreeNodeProps.onSelect,
|
|
72
|
-
others = __rest(TreeNodeProps, ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "expandOnClickNode", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"]);
|
|
73
|
+
others = __rest(TreeNodeProps, ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "dropPosition", "expandOnClickNode", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"]);
|
|
73
74
|
|
|
74
75
|
var nodeData = React.useMemo(function () {
|
|
75
76
|
return _extends({
|
|
@@ -237,7 +238,9 @@ var TreeNode = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
237
238
|
}, indent(), renderExpandIcon(), showIcon && renderNodeIcon(), /*#__PURE__*/React.createElement("div", {
|
|
238
239
|
className: classNames((_classNames5 = {}, _defineProperty(_classNames5, "".concat(treeNodePrefixCls, "-title-wrap"), true), _defineProperty(_classNames5, "".concat(treeNodePrefixCls, "-title-wrap-hover"), !expandOnClickNode && !disabled), _defineProperty(_classNames5, "".concat(treeNodePrefixCls, "-title-wrap-selected"), selected && selectable && !disabled && !expandOnClickNode), _classNames5)),
|
|
239
240
|
onClick: expandOnClickNode ? undefined : handleClick
|
|
240
|
-
},
|
|
241
|
+
}, showDragLine && dropPosition === -1 && /*#__PURE__*/React.createElement("span", {
|
|
242
|
+
className: classNames("".concat(treeNodePrefixCls, "-drag-line-top"))
|
|
243
|
+
}), checkable ? /*#__PURE__*/React.createElement(Checkbox, {
|
|
241
244
|
onChange: handleOnchange,
|
|
242
245
|
checked: checked,
|
|
243
246
|
indeterminate: !disabled && indeterminate,
|
|
@@ -249,8 +252,8 @@ var TreeNode = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
249
252
|
className: classNames("".concat(treeNodePrefixCls, "-title"), _defineProperty({}, "".concat(treeNodePrefixCls, "-title-disabled"), disabled))
|
|
250
253
|
}, title)) : /*#__PURE__*/React.createElement("span", {
|
|
251
254
|
className: classNames("".concat(treeNodePrefixCls, "-title"), _defineProperty({}, "".concat(treeNodePrefixCls, "-title-disabled"), disabled))
|
|
252
|
-
}, title), showDragLine &&
|
|
253
|
-
className: classNames("".concat(treeNodePrefixCls, "-drag-line"))
|
|
255
|
+
}, title), showDragLine && dropPosition === 1 && /*#__PURE__*/React.createElement("span", {
|
|
256
|
+
className: classNames("".concat(treeNodePrefixCls, "-drag-line-bottom"))
|
|
254
257
|
}))));
|
|
255
258
|
};
|
|
256
259
|
|
|
@@ -312,6 +315,7 @@ var TreeNode = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
312
315
|
var handleDrop = React.useCallback(function (e) {
|
|
313
316
|
if (!draggable) return;
|
|
314
317
|
setShowDragLine(false);
|
|
318
|
+
setForbiddenChildrenPointerEvents(false);
|
|
315
319
|
var data = getDragNode();
|
|
316
320
|
var sourceKey = data === null || data === void 0 ? void 0 : data.key;
|
|
317
321
|
|
|
@@ -36,28 +36,17 @@ var DATE_ROW_COUNT = 6;
|
|
|
36
36
|
function Calendar(props) {
|
|
37
37
|
var context = (0, _react.useContext)(_context2.default);
|
|
38
38
|
var prefixCls = context.prefixCls,
|
|
39
|
-
viewDate = context.viewDate
|
|
39
|
+
viewDate = context.viewDate,
|
|
40
|
+
locale = context.locale;
|
|
40
41
|
var picker = props.picker,
|
|
41
|
-
useWeekdaysShort = props.useWeekdaysShort,
|
|
42
42
|
showWeekNumber = props.showWeekNumber,
|
|
43
43
|
showWeeksTitle = props.showWeeksTitle,
|
|
44
44
|
showTime = props.showTime,
|
|
45
|
-
disabledDate = props.disabledDate;
|
|
46
|
-
// const endOfWeek = addDays(startOfWeek, 6)
|
|
47
|
-
// return isSameMonth(startOfWeek, viewDate) || isSameMonth(endOfWeek, viewDate)
|
|
48
|
-
// }
|
|
49
|
-
// 获取title部分 周的格式
|
|
50
|
-
|
|
51
|
-
var formatWeekday = function formatWeekday(day) {
|
|
52
|
-
return useWeekdaysShort ? (0, _dateFns.getWeekdayShortInLocale)(day) : (0, _dateFns.getWeekdayMinInLocale)(day);
|
|
53
|
-
}; // const getEffectTime = () => {
|
|
54
|
-
// }
|
|
55
|
-
|
|
45
|
+
disabledDate = props.disabledDate;
|
|
56
46
|
|
|
57
47
|
var renderWeeksTitle = function renderWeeksTitle() {
|
|
58
48
|
var _context;
|
|
59
49
|
|
|
60
|
-
var startOfWeek = (0, _dateFns.getStartOfWeek)(viewDate);
|
|
61
50
|
var dayNames = [];
|
|
62
51
|
var weekTitleCls = (0, _classnames.default)("".concat(prefixCls, "-weektitle"));
|
|
63
52
|
var weekTitleItemCls = (0, _classnames.default)("".concat(prefixCls, "-weektitle-item"));
|
|
@@ -73,8 +62,7 @@ function Calendar(props) {
|
|
|
73
62
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
74
63
|
className: weekTitleCls
|
|
75
64
|
}, (0, _concat.default)(dayNames).call(dayNames, (0, _map.default)(_context = [0, 1, 2, 3, 4, 5, 6]).call(_context, function (offset) {
|
|
76
|
-
var
|
|
77
|
-
var weekDayName = formatWeekday(day);
|
|
65
|
+
var weekDayName = locale.weekTitle[offset];
|
|
78
66
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
79
67
|
key: offset,
|
|
80
68
|
className: weekTitleItemCls
|
|
@@ -51,7 +51,8 @@ function Panel(props) {
|
|
|
51
51
|
var prefixCls = context.prefixCls,
|
|
52
52
|
viewDate = context.viewDate,
|
|
53
53
|
setViewDate = context.setViewDate,
|
|
54
|
-
panelPosition = context.panelPosition
|
|
54
|
+
panelPosition = context.panelPosition,
|
|
55
|
+
locale = context.locale;
|
|
55
56
|
var _props$picker = props.picker,
|
|
56
57
|
picker = _props$picker === void 0 ? 'date' : _props$picker,
|
|
57
58
|
format = props.format,
|
|
@@ -149,7 +150,7 @@ function Panel(props) {
|
|
|
149
150
|
var year = (0, _dateFns.getYear)(viewDate);
|
|
150
151
|
var headerCls = (0, _classnames.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-month"));
|
|
151
152
|
return {
|
|
152
|
-
children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, year
|
|
153
|
+
children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, year + locale.year),
|
|
153
154
|
className: headerCls
|
|
154
155
|
};
|
|
155
156
|
};
|
|
@@ -159,7 +160,7 @@ function Panel(props) {
|
|
|
159
160
|
var month = (0, _dateFns.getMonth)(viewDate) + 1;
|
|
160
161
|
var headerCls = (0, _classnames.default)("".concat(prefixCls, "-header"), "".concat(prefixCls, "-header-date"));
|
|
161
162
|
return {
|
|
162
|
-
children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", null, year
|
|
163
|
+
children: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", null, year + locale.year), /*#__PURE__*/_react.default.createElement("span", null, month + locale.month)),
|
|
163
164
|
className: headerCls
|
|
164
165
|
};
|
|
165
166
|
};
|
|
@@ -10,6 +10,9 @@ export interface Locale {
|
|
|
10
10
|
'DatePicker.now': string;
|
|
11
11
|
'DatePicker.confrim': string;
|
|
12
12
|
'DatePicker.today': string;
|
|
13
|
+
'DatePicker.year': string;
|
|
14
|
+
'DatePicker.month': string;
|
|
15
|
+
'DatePicker.weekTitle': [string, string, string, string, string, string, string];
|
|
13
16
|
'DatePicker.rangePlaceholder': [string, string];
|
|
14
17
|
'DatePicker.rangeYearPlaceholder': [string, string];
|
|
15
18
|
'DatePicker.rangeMonthPlaceholder': [string, string];
|
|
@@ -28,6 +31,9 @@ export interface InnerLocale {
|
|
|
28
31
|
now: string;
|
|
29
32
|
confrim: string;
|
|
30
33
|
today: string;
|
|
34
|
+
year: string;
|
|
35
|
+
month: string;
|
|
36
|
+
weekTitle: [string, string, string, string, string, string, string];
|
|
31
37
|
rangePlaceholder: [string, string];
|
|
32
38
|
rangeYearPlaceholder: [string, string];
|
|
33
39
|
rangeMonthPlaceholder: [string, string];
|
|
@@ -15,6 +15,9 @@ var locale = {
|
|
|
15
15
|
'DatePicker.now': '此刻',
|
|
16
16
|
'DatePicker.confrim': '确定',
|
|
17
17
|
'DatePicker.today': '今天',
|
|
18
|
+
'DatePicker.month': '月',
|
|
19
|
+
'DatePicker.year': '年',
|
|
20
|
+
'DatePicker.weekTitle': ['日', '一', '二', '三', '四', '五', '六'],
|
|
18
21
|
// 'DatePicker.backToToday': '返回今天',
|
|
19
22
|
// 'DatePicker.timeSelect': '选择时间',
|
|
20
23
|
// 'DatePicker.dateSelect': '选择日期',
|
|
@@ -147,7 +147,7 @@ function Week(props) {
|
|
|
147
147
|
prefixCls: prefixCls,
|
|
148
148
|
rangeValue: rangeValue,
|
|
149
149
|
hoverRangedValue: hoverRangedValue,
|
|
150
|
-
isRange:
|
|
150
|
+
isRange: picker !== 'time',
|
|
151
151
|
isCurrentMonth: function isCurrentMonth(date) {
|
|
152
152
|
return (0, _dateFns.isSameMonth)(date, viewDate);
|
|
153
153
|
},
|
|
@@ -673,6 +673,7 @@ function DatePicker(props) {
|
|
|
673
673
|
minute: minute,
|
|
674
674
|
second: second,
|
|
675
675
|
disabledTimePanel: disabledTimePanel,
|
|
676
|
+
rangeValue: selectedValue,
|
|
676
677
|
prefixCls: datePickerPrefixCls,
|
|
677
678
|
dateValue: selectedValue ? selectedValue[mergedActivePickerIndex] : null,
|
|
678
679
|
viewDate: viewDate,
|