@kdcloudjs/kdesign 1.7.33 → 1.7.34

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.
@@ -0,0 +1,2 @@
1
+ export declare const isIE: any;
2
+ export declare const getFileUtil: (file: any, name?: string) => any;
@@ -0,0 +1,20 @@
1
+ var _a;
2
+ export var isIE = ((_a = window) === null || _a === void 0 ? void 0 : _a.ActiveXObject) || 'ActiveXObject' in window;
3
+ export var getFileUtil = function getFileUtil(file) {
4
+ var name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
5
+ if (file) {
6
+ if (isIE) {
7
+ var blob = new Blob([file], {
8
+ type: file.type
9
+ });
10
+ blob.fileName = name || file.name;
11
+ blob.lastModifiedDate = (file === null || file === void 0 ? void 0 : file.lastModifiedDate) || Date.now();
12
+ return blob;
13
+ } else {
14
+ return new File([file], name || file.name, {
15
+ type: file.type
16
+ });
17
+ }
18
+ }
19
+ return file;
20
+ };
@@ -37,6 +37,7 @@ export interface PickerSharedProps extends React.AriaAttributes {
37
37
  onMouseLeave?: React.MouseEventHandler<HTMLDivElement>;
38
38
  onClick?: React.MouseEventHandler<HTMLDivElement>;
39
39
  onContextMenu?: React.MouseEventHandler<HTMLDivElement>;
40
+ status?: 'error';
40
41
  }
41
42
  declare type OmitPanelProps<Props> = Omit<Props, 'onChange' | 'hideHeader' | 'pickerValue' | 'onPickerValueChange'>;
42
43
  export interface PickerBaseProps extends PickerSharedProps, OmitPanelProps<PickerPanelBaseProps> {
@@ -12,7 +12,7 @@ import InputDate from './single/input-date';
12
12
  import { getDefaultFormat, getDataOrAriaProps, getInternalNextMode, generateUnits } from './utils';
13
13
  import useValueTexts from './hooks/use-value-texts';
14
14
  import useHoverValue from './hooks/use-hover-value';
15
- import { formatDate, getHours, getLowerBoundTime, getMinutes, getSeconds, isEqual, isValid, newDate, parseDate, setTime } from './utils/date-fns';
15
+ import { formatDate, getHours, getLowerBoundTime, getMinutes, getSeconds, isEqual, isValid, newDate, parseDate, setTime, isDate } from './utils/date-fns';
16
16
  import useTextValueMapping from './hooks/use-text-value-mapping';
17
17
  import getExtraFooter from './utils/get-extra-footer';
18
18
  import getRanges from './utils/get-ranges';
@@ -80,8 +80,8 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
80
80
  onMouseLeave = datePickerProps.onMouseLeave,
81
81
  onContextMenu = datePickerProps.onContextMenu,
82
82
  onClick = datePickerProps.onClick,
83
- _onOk = datePickerProps.onOk;
84
- // ref
83
+ _onOk = datePickerProps.onOk,
84
+ status = datePickerProps.status;
85
85
  var inputDivRefDefault = React.useRef(null);
86
86
  var inputDivRef = ref || inputDivRefDefault;
87
87
  var popperRefDefault = React.useRef(null);
@@ -90,14 +90,10 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
90
90
  var isHourStepValid = 24 % hourStep === 0;
91
91
  var isMinuteStepValid = 60 % minuteStep === 0;
92
92
  var isSecondStepValid = 60 % secondStep === 0;
93
- // const hours = generateUnits(0, 23, hourStep, disabledHours && disabledHours())
94
- // const minutes = generateUnits(0, 59, minuteStep, disabledMinutes && disabledMinutes(originHour))
95
- // const seconds = generateUnits(0, 59, secondStep, disabledSeconds && disabledSeconds(originHour, minute))
96
93
  var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
97
94
  var datePickerLang = _extends({}, globalLocale.getCompLangMsg({
98
95
  componentName: 'DatePicker'
99
96
  }), locale || {});
100
- // 原始数据
101
97
  var _useMergedState = useMergedState(null, {
102
98
  value: value,
103
99
  defaultValue: defaultValue
@@ -105,7 +101,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
105
101
  _useMergedState2 = _slicedToArray(_useMergedState, 2),
106
102
  dateValue = _useMergedState2[0],
107
103
  setDateValue = _useMergedState2[1];
108
- // 选中的数据
109
104
  var _React$useState = React.useState(dateValue),
110
105
  _React$useState2 = _slicedToArray(_React$useState, 2),
111
106
  selectedValue = _React$useState2[0],
@@ -135,22 +130,19 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
135
130
  }
136
131
  }
137
132
  var _format = getDefaultFormat(format, picker, showTime && !disabledTimePanel, use12Hours);
138
- // 面板展示日期
139
133
  var _useState = useState(defaultPickerValue || dateValue || new Date()),
140
134
  _useState2 = _slicedToArray(_useState, 2),
141
135
  viewDate = _useState2[0],
142
136
  setInnerViewDate = _useState2[1];
143
137
  var setViewDate = function setViewDate(date) {
144
- setInnerViewDate(date || new Date());
138
+ setInnerViewDate(isDate(date) ? date : new Date());
145
139
  };
146
140
  useEffect(function () {
147
141
  setViewDate(dateValue);
148
142
  }, [dateValue]);
149
- // text
150
143
  var valueText = useValueTexts(selectedValue, {
151
144
  format: _format
152
145
  });
153
- // input 展示
154
146
  var _useTextValueMapping = useTextValueMapping({
155
147
  valueText: valueText,
156
148
  onTextChange: function onTextChange(newText) {
@@ -200,7 +192,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
200
192
  _useMergedState4 = _slicedToArray(_useMergedState3, 2),
201
193
  openValue = _useMergedState4[0],
202
194
  triggerInnerOpen = _useMergedState4[1];
203
- // Save panel is changed from which panel
204
195
  var _useMergedState5 = useMergedState(function () {
205
196
  if (picker === 'time') {
206
197
  return 'time';
@@ -323,7 +314,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
323
314
  format: _format,
324
315
  onChange: setSelectedValue
325
316
  });
326
- // 渲染日期选择表盘
327
317
  var renderPanel = function renderPanel() {
328
318
  var panelNode = /*#__PURE__*/React.createElement(Panel, _extends({}, panelProps));
329
319
  if (panelRender) {
@@ -393,7 +383,8 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
393
383
  triggerTextChange: triggerTextChange,
394
384
  triggerOpen: triggerOpen,
395
385
  triggerChange: triggerChange,
396
- resetText: resetText
386
+ resetText: resetText,
387
+ status: status
397
388
  };
398
389
  return usePopper( /*#__PURE__*/React.createElement(InputDate, _extends({
399
390
  ref: inputDivRef
@@ -128,6 +128,7 @@ export interface InputCommonProps {
128
128
  prefixCls: string;
129
129
  locale: InnerLocale;
130
130
  dataOrAriaProps?: Record<string, any>;
131
+ status?: 'error';
131
132
  }
132
133
  export interface OutPopperProps {
133
134
  dropdownClassName?: string;
@@ -63,7 +63,8 @@ function InputDate(props, ref) {
63
63
  triggerChange = props.triggerChange,
64
64
  triggerOpenAndFocus = props.triggerOpenAndFocus,
65
65
  setMergedActivePickerIndex = props.setMergedActivePickerIndex,
66
- setHoverRangedValue = props.setHoverRangedValue;
66
+ setHoverRangedValue = props.setHoverRangedValue,
67
+ status = props.status;
67
68
  var preventBlurRef = useRef(false);
68
69
  var _useState = useState(false),
69
70
  _useState2 = _slicedToArray(_useState, 2),
@@ -187,7 +188,7 @@ function InputDate(props, ref) {
187
188
  };
188
189
  return /*#__PURE__*/React.createElement("div", _extends({
189
190
  ref: ref,
190
- className: classnames(prefixCls, "".concat(prefixCls, "-range"), className, borderClass, (_classnames2 = {}, _defineProperty(_classnames2, _concatInstanceProperty(_context = "".concat(prefixCls, "-")).call(_context, size), size), _defineProperty(_classnames2, "".concat(prefixCls, "-disabled"), mergedDisabled[0] && mergedDisabled[1]), _defineProperty(_classnames2, "".concat(prefixCls, "-focused"), mergedActivePickerIndex === 0 ? startFocused : endFocused), _classnames2)),
191
+ className: classnames(prefixCls, "".concat(prefixCls, "-range"), className, borderClass, (_classnames2 = {}, _defineProperty(_classnames2, _concatInstanceProperty(_context = "".concat(prefixCls, "-")).call(_context, size), size), _defineProperty(_classnames2, "".concat(prefixCls, "-disabled"), mergedDisabled[0] && mergedDisabled[1]), _defineProperty(_classnames2, "".concat(prefixCls, "-focused"), mergedActivePickerIndex === 0 ? startFocused : endFocused), _defineProperty(_classnames2, "".concat(prefixCls, "-error"), status === 'error'), _classnames2)),
191
192
  style: style,
192
193
  onMouseDown: onInternalonMouseDown,
193
194
  onMouseUp: onMouseUp,
@@ -15,7 +15,7 @@ import InputDate from './range/input-range';
15
15
  import { generateUnits, getClosingViewDate, getDataOrAriaProps, getDefaultFormat, getValue, updateValues } from './utils';
16
16
  import useValueTexts from './hooks/use-value-texts';
17
17
  import useHoverValue from './hooks/use-hover-value';
18
- import { formatDate, isAfter, newDate, parseDate, isEqual, isSameQuarter, isSameDay, isValid, getHours, getMinutes, getSeconds } from './utils/date-fns';
18
+ import { formatDate, isAfter, newDate, parseDate, isEqual, isSameQuarter, isSameDay, isValid, getHours, getMinutes, getSeconds, isDate } from './utils/date-fns';
19
19
  import useTextValueMapping from './hooks/use-text-value-mapping';
20
20
  import useRangeViewDates from './hooks/use-range-view-dates';
21
21
  import useRangeDisabled from './hooks/use-range-disabled';
@@ -109,7 +109,8 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
109
109
  onFocus = datePickerProps.onFocus,
110
110
  onBlur = datePickerProps.onBlur,
111
111
  _onOk = datePickerProps.onOk,
112
- getPopupContainer = datePickerProps.getPopupContainer;
112
+ getPopupContainer = datePickerProps.getPopupContainer,
113
+ status = datePickerProps.status;
113
114
  var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
114
115
  var datePickerLang = _extends({}, globalLocale.getCompLangMsg({
115
116
  componentName: 'DatePicker'
@@ -414,7 +415,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
414
415
  var onSelect = function onSelect(date, type) {
415
416
  var values = updateValues(selectedValue, date, mergedActivePickerIndex);
416
417
  if (type === 'inner') {
417
- if (values && values[mergedActivePickerIndex]) {
418
+ if (values && values[mergedActivePickerIndex] && isDate(values[mergedActivePickerIndex])) {
418
419
  setViewDate(values[mergedActivePickerIndex], mergedActivePickerIndex);
419
420
  }
420
421
  } else {
@@ -636,7 +637,8 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
636
637
  triggerOpenAndFocus: triggerOpenAndFocus,
637
638
  triggerChange: triggerChange,
638
639
  onFocus: onFocus,
639
- onBlur: onBlur
640
+ onBlur: onBlur,
641
+ status: status
640
642
  };
641
643
  var renderConfig = function renderConfig() {
642
644
  if (ranges) {
@@ -47,7 +47,8 @@ function InputDate(props, ref) {
47
47
  setSelectedValue = props.setSelectedValue,
48
48
  triggerTextChange = props.triggerTextChange,
49
49
  triggerOpen = props.triggerOpen,
50
- triggerChange = props.triggerChange;
50
+ triggerChange = props.triggerChange,
51
+ status = props.status;
51
52
  var preventBlurRef = useRef(false);
52
53
  var _useState = useState(false),
53
54
  _useState2 = _slicedToArray(_useState, 2),
@@ -143,7 +144,7 @@ function InputDate(props, ref) {
143
144
  var borderClass = classnames((_classnames = {}, _defineProperty(_classnames, "".concat(prefixCls, "-underline"), borderType === 'underline'), _defineProperty(_classnames, "".concat(prefixCls, "-borderless"), borderType === 'none'), _classnames));
144
145
  return /*#__PURE__*/React.createElement("div", _extends({
145
146
  ref: ref,
146
- className: classnames(prefixCls, className, borderClass, (_classnames2 = {}, _defineProperty(_classnames2, "".concat(prefixCls, "-disabled"), disabled), _defineProperty(_classnames2, "".concat(prefixCls, "-focused"), focused), _defineProperty(_classnames2, _concatInstanceProperty(_context = "".concat(prefixCls, "-")).call(_context, size), size), _classnames2)),
147
+ className: classnames(prefixCls, className, borderClass, (_classnames2 = {}, _defineProperty(_classnames2, "".concat(prefixCls, "-disabled"), disabled), _defineProperty(_classnames2, "".concat(prefixCls, "-focused"), focused), _defineProperty(_classnames2, _concatInstanceProperty(_context = "".concat(prefixCls, "-")).call(_context, size), size), _defineProperty(_classnames2, "".concat(prefixCls, "-error"), status === 'error'), _classnames2)),
147
148
  style: style,
148
149
  onMouseDown: onInternalonMouseDown,
149
150
  onMouseUp: onInternalMouseUp,
@@ -330,6 +330,9 @@
330
330
  .kd-date-picker-focused .kd-date-picker-suffix {
331
331
  color: var(--kd-c-date-picker-clear-color-background-focused, var(--kd-g-color-theme, #5582f3));
332
332
  }
333
+ .kd-date-picker-error {
334
+ border-color: var(--kd-g-color-error, #fb2323);
335
+ }
333
336
  .kd-date-picker-panel {
334
337
  -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
335
338
  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
@@ -160,6 +160,10 @@
160
160
  color: @date-clear-background-color-focused;
161
161
  }
162
162
  }
163
+
164
+ &-error {
165
+ border-color: @color-error;
166
+ }
163
167
  }
164
168
 
165
169
  .@{datePicker-prefix-cls-panel} {
@@ -1,6 +1,5 @@
1
1
  import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
2
2
  import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
3
- import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
4
3
  import isDate from 'date-fns/isDate';
5
4
  import isValidDate from 'date-fns/isValid';
6
5
  import format from 'date-fns/format';
@@ -271,19 +270,14 @@ export function getLowerBoundTime(hour, minute, second, hourStep, minuteStep, se
271
270
  return [lowerBoundHour, lowerBoundMinute, lowerBoundSecond];
272
271
  }
273
272
  export var setYearOrMonthOfDate = function setYearOrMonthOfDate(date1, date2) {
274
- var _context, _context2, _context3, _context4, _context5;
275
273
  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'year';
276
- var y = new Date(date1).getFullYear();
274
+ var d1 = new Date(date1 || 0);
275
+ var d2 = new Date(date2 || 0);
277
276
  if (type === 'year') {
278
- y = new Date(date2).getFullYear();
277
+ d1.setFullYear(d2.getFullYear());
279
278
  }
280
- var m = new Date(date1 || date2).getMonth() + 1;
281
279
  if (type === 'month') {
282
- m = new Date(date2).getMonth() + 1;
280
+ d1.setMonth(d2.getMonth());
283
281
  }
284
- var d = new Date(date1 || date2).getDate();
285
- var h = new Date(date1 || date2).getHours();
286
- var mi = new Date(date1 || date2).getMinutes();
287
- var s = new Date(date1 || date2).getSeconds();
288
- return new Date(_concatInstanceProperty(_context = _concatInstanceProperty(_context2 = _concatInstanceProperty(_context3 = _concatInstanceProperty(_context4 = _concatInstanceProperty(_context5 = "".concat(y, "-")).call(_context5, m, "-")).call(_context4, d, " ")).call(_context3, h, ":")).call(_context2, mi, ":")).call(_context, s));
282
+ return d1;
289
283
  };
@@ -41,6 +41,7 @@ import React, { Children, forwardRef, useContext, useEffect, useImperativeHandle
41
41
  import classNames from 'classnames';
42
42
  import ConfigContext from '../config-provider/ConfigContext';
43
43
  import { getCompProps } from '../_utils';
44
+ import { getFileUtil } from '../_utils/ieUtil';
44
45
  import Icon from '../icon';
45
46
  import request from './request';
46
47
  import verifyFile from './verify-file';
@@ -124,9 +125,7 @@ var InternalUpload = function InternalUpload(props, ref) {
124
125
  if (Array.isArray(files) && files.length) {
125
126
  var _context2;
126
127
  files.forEach(function (file) {
127
- file.originFileObj = new File([file], file.name, {
128
- type: file.type
129
- });
128
+ file.originFileObj = getFileUtil(file, allProps === null || allProps === void 0 ? void 0 : allProps.name);
130
129
  file.uid = getUid();
131
130
  file.status = 'notStart';
132
131
  file.fileName = allProps.name || file.name;
@@ -336,7 +335,7 @@ var InternalUpload = function InternalUpload(props, ref) {
336
335
  scanFiles(_sliceInstanceProperty(Array.prototype).call(e.dataTransfer.items), function (file) {
337
336
  return verifyFile(file, accept);
338
337
  }, function (file) {
339
- file.originFileObj = new File([file], file.type);
338
+ file.originFileObj = getFileUtil(file, allProps === null || allProps === void 0 ? void 0 : allProps.name);
340
339
  file.uid = getUid();
341
340
  file.status = 'notStart';
342
341
  file.fileName = allProps.name || file.name;
@@ -0,0 +1,2 @@
1
+ export declare const isIE: any;
2
+ export declare const getFileUtil: (file: any, name?: string) => any;
@@ -0,0 +1,28 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.isIE = exports.getFileUtil = void 0;
7
+ var _a;
8
+ var isIE = ((_a = window) === null || _a === void 0 ? void 0 : _a.ActiveXObject) || 'ActiveXObject' in window;
9
+ exports.isIE = isIE;
10
+ var getFileUtil = function getFileUtil(file) {
11
+ var name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
12
+ if (file) {
13
+ if (isIE) {
14
+ var blob = new Blob([file], {
15
+ type: file.type
16
+ });
17
+ blob.fileName = name || file.name;
18
+ blob.lastModifiedDate = (file === null || file === void 0 ? void 0 : file.lastModifiedDate) || Date.now();
19
+ return blob;
20
+ } else {
21
+ return new File([file], name || file.name, {
22
+ type: file.type
23
+ });
24
+ }
25
+ }
26
+ return file;
27
+ };
28
+ exports.getFileUtil = getFileUtil;
@@ -37,6 +37,7 @@ export interface PickerSharedProps extends React.AriaAttributes {
37
37
  onMouseLeave?: React.MouseEventHandler<HTMLDivElement>;
38
38
  onClick?: React.MouseEventHandler<HTMLDivElement>;
39
39
  onContextMenu?: React.MouseEventHandler<HTMLDivElement>;
40
+ status?: 'error';
40
41
  }
41
42
  declare type OmitPanelProps<Props> = Omit<Props, 'onChange' | 'hideHeader' | 'pickerValue' | 'onPickerValueChange'>;
42
43
  export interface PickerBaseProps extends PickerSharedProps, OmitPanelProps<PickerPanelBaseProps> {
@@ -92,8 +92,8 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
92
92
  onMouseLeave = datePickerProps.onMouseLeave,
93
93
  onContextMenu = datePickerProps.onContextMenu,
94
94
  onClick = datePickerProps.onClick,
95
- _onOk = datePickerProps.onOk;
96
- // ref
95
+ _onOk = datePickerProps.onOk,
96
+ status = datePickerProps.status;
97
97
  var inputDivRefDefault = _react.default.useRef(null);
98
98
  var inputDivRef = ref || inputDivRefDefault;
99
99
  var popperRefDefault = _react.default.useRef(null);
@@ -102,14 +102,10 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
102
102
  var isHourStepValid = 24 % hourStep === 0;
103
103
  var isMinuteStepValid = 60 % minuteStep === 0;
104
104
  var isSecondStepValid = 60 % secondStep === 0;
105
- // const hours = generateUnits(0, 23, hourStep, disabledHours && disabledHours())
106
- // const minutes = generateUnits(0, 59, minuteStep, disabledMinutes && disabledMinutes(originHour))
107
- // const seconds = generateUnits(0, 59, secondStep, disabledSeconds && disabledSeconds(originHour, minute))
108
105
  var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
109
106
  var datePickerLang = (0, _extends2.default)({}, globalLocale.getCompLangMsg({
110
107
  componentName: 'DatePicker'
111
108
  }), locale || {});
112
- // 原始数据
113
109
  var _useMergedState = (0, _hooks.useMergedState)(null, {
114
110
  value: value,
115
111
  defaultValue: defaultValue
@@ -117,7 +113,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
117
113
  _useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
118
114
  dateValue = _useMergedState2[0],
119
115
  setDateValue = _useMergedState2[1];
120
- // 选中的数据
121
116
  var _React$useState = _react.default.useState(dateValue),
122
117
  _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
123
118
  selectedValue = _React$useState2[0],
@@ -147,22 +142,19 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
147
142
  }
148
143
  }
149
144
  var _format = (0, _utils2.getDefaultFormat)(format, picker, showTime && !disabledTimePanel, use12Hours);
150
- // 面板展示日期
151
145
  var _useState = (0, _react.useState)(defaultPickerValue || dateValue || new Date()),
152
146
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
153
147
  viewDate = _useState2[0],
154
148
  setInnerViewDate = _useState2[1];
155
149
  var setViewDate = function setViewDate(date) {
156
- setInnerViewDate(date || new Date());
150
+ setInnerViewDate((0, _dateFns.isDate)(date) ? date : new Date());
157
151
  };
158
152
  (0, _react.useEffect)(function () {
159
153
  setViewDate(dateValue);
160
154
  }, [dateValue]);
161
- // text
162
155
  var valueText = (0, _useValueTexts.default)(selectedValue, {
163
156
  format: _format
164
157
  });
165
- // input 展示
166
158
  var _useTextValueMapping = (0, _useTextValueMapping3.default)({
167
159
  valueText: valueText,
168
160
  onTextChange: function onTextChange(newText) {
@@ -212,7 +204,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
212
204
  _useMergedState4 = (0, _slicedToArray2.default)(_useMergedState3, 2),
213
205
  openValue = _useMergedState4[0],
214
206
  triggerInnerOpen = _useMergedState4[1];
215
- // Save panel is changed from which panel
216
207
  var _useMergedState5 = (0, _hooks.useMergedState)(function () {
217
208
  if (picker === 'time') {
218
209
  return 'time';
@@ -335,7 +326,6 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
335
326
  format: _format,
336
327
  onChange: setSelectedValue
337
328
  });
338
- // 渲染日期选择表盘
339
329
  var renderPanel = function renderPanel() {
340
330
  var panelNode = /*#__PURE__*/_react.default.createElement(_datePanel.default, (0, _extends2.default)({}, panelProps));
341
331
  if (panelRender) {
@@ -405,7 +395,8 @@ var InternalDatePicker = function InternalDatePicker(props, ref) {
405
395
  triggerTextChange: triggerTextChange,
406
396
  triggerOpen: triggerOpen,
407
397
  triggerChange: triggerChange,
408
- resetText: resetText
398
+ resetText: resetText,
399
+ status: status
409
400
  };
410
401
  return (0, _usePopper.default)( /*#__PURE__*/_react.default.createElement(_inputDate.default, (0, _extends2.default)({
411
402
  ref: inputDivRef
@@ -128,6 +128,7 @@ export interface InputCommonProps {
128
128
  prefixCls: string;
129
129
  locale: InnerLocale;
130
130
  dataOrAriaProps?: Record<string, any>;
131
+ status?: 'error';
131
132
  }
132
133
  export interface OutPopperProps {
133
134
  dropdownClassName?: string;
@@ -75,7 +75,8 @@ function InputDate(props, ref) {
75
75
  triggerChange = props.triggerChange,
76
76
  triggerOpenAndFocus = props.triggerOpenAndFocus,
77
77
  setMergedActivePickerIndex = props.setMergedActivePickerIndex,
78
- setHoverRangedValue = props.setHoverRangedValue;
78
+ setHoverRangedValue = props.setHoverRangedValue,
79
+ status = props.status;
79
80
  var preventBlurRef = (0, _react.useRef)(false);
80
81
  var _useState = (0, _react.useState)(false),
81
82
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -199,7 +200,7 @@ function InputDate(props, ref) {
199
200
  };
200
201
  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
201
202
  ref: ref,
202
- className: (0, _classnames5.default)(prefixCls, "".concat(prefixCls, "-range"), className, borderClass, (_classnames2 = {}, (0, _defineProperty2.default)(_classnames2, (0, _concat.default)(_context = "".concat(prefixCls, "-")).call(_context, size), size), (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-disabled"), mergedDisabled[0] && mergedDisabled[1]), (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-focused"), mergedActivePickerIndex === 0 ? startFocused : endFocused), _classnames2)),
203
+ className: (0, _classnames5.default)(prefixCls, "".concat(prefixCls, "-range"), className, borderClass, (_classnames2 = {}, (0, _defineProperty2.default)(_classnames2, (0, _concat.default)(_context = "".concat(prefixCls, "-")).call(_context, size), size), (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-disabled"), mergedDisabled[0] && mergedDisabled[1]), (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-focused"), mergedActivePickerIndex === 0 ? startFocused : endFocused), (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-error"), status === 'error'), _classnames2)),
203
204
  style: style,
204
205
  onMouseDown: onInternalonMouseDown,
205
206
  onMouseUp: onMouseUp,
@@ -121,7 +121,8 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
121
121
  onFocus = datePickerProps.onFocus,
122
122
  onBlur = datePickerProps.onBlur,
123
123
  _onOk = datePickerProps.onOk,
124
- getPopupContainer = datePickerProps.getPopupContainer;
124
+ getPopupContainer = datePickerProps.getPopupContainer,
125
+ status = datePickerProps.status;
125
126
  var needConfirmButton = picker === 'date' && !!showTime || picker === 'time';
126
127
  var datePickerLang = (0, _extends2.default)({}, globalLocale.getCompLangMsg({
127
128
  componentName: 'DatePicker'
@@ -426,7 +427,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
426
427
  var onSelect = function onSelect(date, type) {
427
428
  var values = (0, _utils2.updateValues)(selectedValue, date, mergedActivePickerIndex);
428
429
  if (type === 'inner') {
429
- if (values && values[mergedActivePickerIndex]) {
430
+ if (values && values[mergedActivePickerIndex] && (0, _dateFns.isDate)(values[mergedActivePickerIndex])) {
430
431
  setViewDate(values[mergedActivePickerIndex], mergedActivePickerIndex);
431
432
  }
432
433
  } else {
@@ -648,7 +649,8 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
648
649
  triggerOpenAndFocus: triggerOpenAndFocus,
649
650
  triggerChange: triggerChange,
650
651
  onFocus: onFocus,
651
- onBlur: onBlur
652
+ onBlur: onBlur,
653
+ status: status
652
654
  };
653
655
  var renderConfig = function renderConfig() {
654
656
  if (ranges) {
@@ -59,7 +59,8 @@ function InputDate(props, ref) {
59
59
  setSelectedValue = props.setSelectedValue,
60
60
  triggerTextChange = props.triggerTextChange,
61
61
  triggerOpen = props.triggerOpen,
62
- triggerChange = props.triggerChange;
62
+ triggerChange = props.triggerChange,
63
+ status = props.status;
63
64
  var preventBlurRef = (0, _react.useRef)(false);
64
65
  var _useState = (0, _react.useState)(false),
65
66
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -155,7 +156,7 @@ function InputDate(props, ref) {
155
156
  var borderClass = (0, _classnames4.default)((_classnames = {}, (0, _defineProperty2.default)(_classnames, "".concat(prefixCls, "-underline"), borderType === 'underline'), (0, _defineProperty2.default)(_classnames, "".concat(prefixCls, "-borderless"), borderType === 'none'), _classnames));
156
157
  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
157
158
  ref: ref,
158
- className: (0, _classnames4.default)(prefixCls, className, borderClass, (_classnames2 = {}, (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-focused"), focused), (0, _defineProperty2.default)(_classnames2, (0, _concat.default)(_context = "".concat(prefixCls, "-")).call(_context, size), size), _classnames2)),
159
+ className: (0, _classnames4.default)(prefixCls, className, borderClass, (_classnames2 = {}, (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-focused"), focused), (0, _defineProperty2.default)(_classnames2, (0, _concat.default)(_context = "".concat(prefixCls, "-")).call(_context, size), size), (0, _defineProperty2.default)(_classnames2, "".concat(prefixCls, "-error"), status === 'error'), _classnames2)),
159
160
  style: style,
160
161
  onMouseDown: onInternalonMouseDown,
161
162
  onMouseUp: onInternalMouseUp,
@@ -330,6 +330,9 @@
330
330
  .kd-date-picker-focused .kd-date-picker-suffix {
331
331
  color: var(--kd-c-date-picker-clear-color-background-focused, var(--kd-g-color-theme, #5582f3));
332
332
  }
333
+ .kd-date-picker-error {
334
+ border-color: var(--kd-g-color-error, #fb2323);
335
+ }
333
336
  .kd-date-picker-panel {
334
337
  -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
335
338
  box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
@@ -160,6 +160,10 @@
160
160
  color: @date-clear-background-color-focused;
161
161
  }
162
162
  }
163
+
164
+ &-error {
165
+ border-color: @color-error;
166
+ }
163
167
  }
164
168
 
165
169
  .@{datePicker-prefix-cls-panel} {
@@ -209,7 +209,6 @@ Object.defineProperty(exports, "subYears", {
209
209
  });
210
210
  var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
211
211
  var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
212
- var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
213
212
  var _isDate = _interopRequireDefault(require("date-fns/isDate"));
214
213
  var _isValid = _interopRequireDefault(require("date-fns/isValid"));
215
214
  var _format2 = _interopRequireDefault(require("date-fns/format"));
@@ -475,20 +474,15 @@ function getLowerBoundTime(hour, minute, second, hourStep, minuteStep, secondSte
475
474
  return [lowerBoundHour, lowerBoundMinute, lowerBoundSecond];
476
475
  }
477
476
  var setYearOrMonthOfDate = function setYearOrMonthOfDate(date1, date2) {
478
- var _context, _context2, _context3, _context4, _context5;
479
477
  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'year';
480
- var y = new Date(date1).getFullYear();
478
+ var d1 = new Date(date1 || 0);
479
+ var d2 = new Date(date2 || 0);
481
480
  if (type === 'year') {
482
- y = new Date(date2).getFullYear();
481
+ d1.setFullYear(d2.getFullYear());
483
482
  }
484
- var m = new Date(date1 || date2).getMonth() + 1;
485
483
  if (type === 'month') {
486
- m = new Date(date2).getMonth() + 1;
484
+ d1.setMonth(d2.getMonth());
487
485
  }
488
- var d = new Date(date1 || date2).getDate();
489
- var h = new Date(date1 || date2).getHours();
490
- var mi = new Date(date1 || date2).getMinutes();
491
- var s = new Date(date1 || date2).getSeconds();
492
- return new Date((0, _concat.default)(_context = (0, _concat.default)(_context2 = (0, _concat.default)(_context3 = (0, _concat.default)(_context4 = (0, _concat.default)(_context5 = "".concat(y, "-")).call(_context5, m, "-")).call(_context4, d, " ")).call(_context3, h, ":")).call(_context2, mi, ":")).call(_context, s));
486
+ return d1;
493
487
  };
494
488
  exports.setYearOrMonthOfDate = setYearOrMonthOfDate;
@@ -23,6 +23,7 @@ var _react = _interopRequireWildcard(require("react"));
23
23
  var _classnames = _interopRequireDefault(require("classnames"));
24
24
  var _ConfigContext = _interopRequireDefault(require("../config-provider/ConfigContext"));
25
25
  var _utils = require("../_utils");
26
+ var _ieUtil = require("../_utils/ieUtil");
26
27
  var _icon = _interopRequireDefault(require("../icon"));
27
28
  var _request = _interopRequireDefault(require("./request"));
28
29
  var _verifyFile = _interopRequireDefault(require("./verify-file"));
@@ -136,9 +137,7 @@ var InternalUpload = function InternalUpload(props, ref) {
136
137
  if (Array.isArray(files) && files.length) {
137
138
  var _context2;
138
139
  files.forEach(function (file) {
139
- file.originFileObj = new File([file], file.name, {
140
- type: file.type
141
- });
140
+ file.originFileObj = (0, _ieUtil.getFileUtil)(file, allProps === null || allProps === void 0 ? void 0 : allProps.name);
142
141
  file.uid = getUid();
143
142
  file.status = 'notStart';
144
143
  file.fileName = allProps.name || file.name;
@@ -348,7 +347,7 @@ var InternalUpload = function InternalUpload(props, ref) {
348
347
  (0, _scanFiles.default)((0, _slice.default)(Array.prototype).call(e.dataTransfer.items), function (file) {
349
348
  return (0, _verifyFile.default)(file, accept);
350
349
  }, function (file) {
351
- file.originFileObj = new File([file], file.type);
350
+ file.originFileObj = (0, _ieUtil.getFileUtil)(file, allProps === null || allProps === void 0 ? void 0 : allProps.name);
352
351
  file.uid = getUid();
353
352
  file.status = 'notStart';
354
353
  file.fileName = allProps.name || file.name;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kdcloudjs/kdesign",
3
- "version": "1.7.33",
3
+ "version": "1.7.34",
4
4
  "description": "KDesign 金蝶前端react 组件库",
5
5
  "title": "kdesign",
6
6
  "keywords": [