@hw-component/form 0.0.3-beta-v8 → 0.0.3-beta-v9
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/es/TDPicker/RangePicker.js +6 -2
- package/es/TDPicker/TimePicker.d.ts +1 -1
- package/es/TDPicker/TimePicker.js +6 -2
- package/es/TDPicker/index.js +6 -2
- package/es/TDPicker/modal.d.ts +10 -3
- package/lib/TDPicker/RangePicker.js +6 -2
- package/lib/TDPicker/TimePicker.d.ts +1 -1
- package/lib/TDPicker/TimePicker.js +6 -2
- package/lib/TDPicker/index.js +6 -2
- package/lib/TDPicker/modal.d.ts +10 -3
- package/package.json +1 -1
- package/src/components/Submit/index.tsx +13 -13
- package/src/components/TDPicker/RangePicker.tsx +4 -0
- package/src/components/TDPicker/TimePicker.tsx +11 -1
- package/src/components/TDPicker/index.tsx +10 -1
- package/src/components/TDPicker/modal.ts +19 -3
|
@@ -18,7 +18,7 @@ import { useMemo } from 'react';
|
|
|
18
18
|
import { useMatchConfigProps } from '../hooks/index.js';
|
|
19
19
|
import HFormConnect from '../Form/HFormConnect.js';
|
|
20
20
|
|
|
21
|
-
var _excluded = ["value", "onChange", "showTime", "format", "valueMap", "ranges", "name", "addFormat"];
|
|
21
|
+
var _excluded = ["value", "onChange", "showTime", "format", "valueMap", "ranges", "name", "addFormat", "disabledDate"];
|
|
22
22
|
function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
23
23
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
24
24
|
var RangePicker = DatePicker.RangePicker;
|
|
@@ -34,6 +34,7 @@ var HRangePicker = function HRangePicker(_ref) {
|
|
|
34
34
|
ranges = _ref$ranges === void 0 ? true : _ref$ranges,
|
|
35
35
|
name = _ref.name,
|
|
36
36
|
addFormat = _ref.addFormat,
|
|
37
|
+
_disabledDate = _ref.disabledDate,
|
|
37
38
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
38
39
|
var _useMatchConfigProps = useMatchConfigProps({
|
|
39
40
|
valueRangePickerValueMap: valueMap,
|
|
@@ -101,7 +102,10 @@ var HRangePicker = function HRangePicker(_ref) {
|
|
|
101
102
|
value: timeVal,
|
|
102
103
|
onChange: change,
|
|
103
104
|
showTime: showTime,
|
|
104
|
-
ranges: defaultRanges
|
|
105
|
+
ranges: defaultRanges,
|
|
106
|
+
disabledDate: function disabledDate(currentDate) {
|
|
107
|
+
return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, timeVal));
|
|
108
|
+
}
|
|
105
109
|
}, props));
|
|
106
110
|
};
|
|
107
111
|
var Index = HFormConnect(HRangePicker);
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { HTimePickerProps } from "./modal";
|
|
2
|
-
declare const _default: ({ value, format, onChange, ...props }: HTimePickerProps) => JSX.Element;
|
|
2
|
+
declare const _default: ({ value, format, onChange, disabledDate, ...props }: HTimePickerProps) => JSX.Element;
|
|
3
3
|
export default _default;
|
|
@@ -13,7 +13,7 @@ import { jsx } from 'react/jsx-runtime';
|
|
|
13
13
|
import { TimePicker } from 'antd';
|
|
14
14
|
import { useTimePickerValue, useTimePickerChange } from './hooks.js';
|
|
15
15
|
|
|
16
|
-
var _excluded = ["value", "format", "onChange"];
|
|
16
|
+
var _excluded = ["value", "format", "onChange", "disabledDate"];
|
|
17
17
|
function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
18
18
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
19
19
|
var HTimePicker = (function (_ref) {
|
|
@@ -21,6 +21,7 @@ var HTimePicker = (function (_ref) {
|
|
|
21
21
|
_ref$format = _ref.format,
|
|
22
22
|
format = _ref$format === void 0 ? "X" : _ref$format,
|
|
23
23
|
onChange = _ref.onChange,
|
|
24
|
+
_disabledDate = _ref.disabledDate,
|
|
24
25
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
25
26
|
var timeVal = useTimePickerValue({
|
|
26
27
|
value: value,
|
|
@@ -33,7 +34,10 @@ var HTimePicker = (function (_ref) {
|
|
|
33
34
|
});
|
|
34
35
|
return jsx(TimePicker, _objectSpread({
|
|
35
36
|
value: timeVal,
|
|
36
|
-
onChange: change
|
|
37
|
+
onChange: change,
|
|
38
|
+
disabledDate: function disabledDate(currentDate) {
|
|
39
|
+
return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, timeVal));
|
|
40
|
+
}
|
|
37
41
|
}, props));
|
|
38
42
|
});
|
|
39
43
|
|
package/es/TDPicker/index.js
CHANGED
|
@@ -13,7 +13,7 @@ import { jsx } from 'react/jsx-runtime';
|
|
|
13
13
|
import { DatePicker } from 'antd';
|
|
14
14
|
import { useTimeVal, useTimeChange } from './hooks.js';
|
|
15
15
|
|
|
16
|
-
var _excluded = ["value", "onChange", "showTime", "format"];
|
|
16
|
+
var _excluded = ["value", "onChange", "showTime", "format", "disabledDate"];
|
|
17
17
|
function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
18
18
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
19
19
|
var Picker = DatePicker;
|
|
@@ -24,6 +24,7 @@ var Index = function Index(_ref) {
|
|
|
24
24
|
showTime = _ref$showTime === void 0 ? true : _ref$showTime,
|
|
25
25
|
_ref$format = _ref.format,
|
|
26
26
|
format = _ref$format === void 0 ? "X" : _ref$format,
|
|
27
|
+
_disabledDate = _ref.disabledDate,
|
|
27
28
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
28
29
|
var timeVal = useTimeVal({
|
|
29
30
|
value: value,
|
|
@@ -36,7 +37,10 @@ var Index = function Index(_ref) {
|
|
|
36
37
|
return jsx(Picker, _objectSpread({
|
|
37
38
|
value: timeVal,
|
|
38
39
|
onChange: change,
|
|
39
|
-
showTime: showTime
|
|
40
|
+
showTime: showTime,
|
|
41
|
+
disabledDate: function disabledDate(currentDate) {
|
|
42
|
+
return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, timeVal));
|
|
43
|
+
}
|
|
40
44
|
}, props));
|
|
41
45
|
};
|
|
42
46
|
|
package/es/TDPicker/modal.d.ts
CHANGED
|
@@ -6,12 +6,16 @@ import type { TimePickerProps } from "antd";
|
|
|
6
6
|
import type { DurationInputArg2 } from "moment";
|
|
7
7
|
import type { DateRangePickerValueMapModal } from "../modal";
|
|
8
8
|
import type { addFormatItemModal } from "@/components/Form/modal";
|
|
9
|
-
|
|
9
|
+
interface DisabledDateFnModal<T = Moment | undefined> {
|
|
10
|
+
(currentDate: Moment, value: T): boolean;
|
|
11
|
+
}
|
|
12
|
+
export interface HDatePickerProps extends Omit<DatePickerProps, "onChange" | "format" | "ranges" | "disabledDate"> {
|
|
10
13
|
onChange?: (time?: Moment | string | number) => void;
|
|
11
14
|
format?: string;
|
|
12
15
|
showTime?: boolean | SharedTimeProps<Moment>;
|
|
16
|
+
disabledDate?: DisabledDateFnModal;
|
|
13
17
|
}
|
|
14
|
-
export interface HRangePickerProps extends Omit<RangePickerProps, "onChange" | "format" | "ranges" | "value"> {
|
|
18
|
+
export interface HRangePickerProps extends Omit<RangePickerProps, "onChange" | "format" | "ranges" | "value" | "disabledDate"> {
|
|
15
19
|
value?: [any, any] | Record<string, any>;
|
|
16
20
|
onChange?: (val: any) => void;
|
|
17
21
|
showTime?: boolean | {
|
|
@@ -21,8 +25,11 @@ export interface HRangePickerProps extends Omit<RangePickerProps, "onChange" | "
|
|
|
21
25
|
valueMap?: DateRangePickerValueMapModal;
|
|
22
26
|
ranges?: RangePickerProps["ranges"] | boolean;
|
|
23
27
|
addFormat?: (config: Record<string, addFormatItemModal>) => void;
|
|
28
|
+
disabledDate?: DisabledDateFnModal<Moment[] | undefined>;
|
|
24
29
|
}
|
|
25
|
-
export interface HTimePickerProps extends Omit<TimePickerProps, "onChange" | "format" | "ranges"> {
|
|
30
|
+
export interface HTimePickerProps extends Omit<TimePickerProps, "onChange" | "format" | "ranges" | "disabledDate"> {
|
|
26
31
|
onChange?: (time?: Moment | string | number) => void;
|
|
27
32
|
format?: DurationInputArg2 | string;
|
|
33
|
+
disabledDate?: DisabledDateFnModal;
|
|
28
34
|
}
|
|
35
|
+
export {};
|
|
@@ -21,7 +21,7 @@ var React = require('react');
|
|
|
21
21
|
var index = require('../hooks/index.js');
|
|
22
22
|
var HFormConnect = require('../Form/HFormConnect.js');
|
|
23
23
|
|
|
24
|
-
var _excluded = ["value", "onChange", "showTime", "format", "valueMap", "ranges", "name", "addFormat"];
|
|
24
|
+
var _excluded = ["value", "onChange", "showTime", "format", "valueMap", "ranges", "name", "addFormat", "disabledDate"];
|
|
25
25
|
function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
26
26
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
27
27
|
var RangePicker = antd.DatePicker.RangePicker;
|
|
@@ -37,6 +37,7 @@ var HRangePicker = function HRangePicker(_ref) {
|
|
|
37
37
|
ranges = _ref$ranges === void 0 ? true : _ref$ranges,
|
|
38
38
|
name = _ref.name,
|
|
39
39
|
addFormat = _ref.addFormat,
|
|
40
|
+
_disabledDate = _ref.disabledDate,
|
|
40
41
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
41
42
|
var _useMatchConfigProps = index.useMatchConfigProps({
|
|
42
43
|
valueRangePickerValueMap: valueMap,
|
|
@@ -104,7 +105,10 @@ var HRangePicker = function HRangePicker(_ref) {
|
|
|
104
105
|
value: timeVal,
|
|
105
106
|
onChange: change,
|
|
106
107
|
showTime: showTime,
|
|
107
|
-
ranges: defaultRanges
|
|
108
|
+
ranges: defaultRanges,
|
|
109
|
+
disabledDate: function disabledDate(currentDate) {
|
|
110
|
+
return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, timeVal));
|
|
111
|
+
}
|
|
108
112
|
}, props));
|
|
109
113
|
};
|
|
110
114
|
var Index = HFormConnect.default(HRangePicker);
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { HTimePickerProps } from "./modal";
|
|
2
|
-
declare const _default: ({ value, format, onChange, ...props }: HTimePickerProps) => JSX.Element;
|
|
2
|
+
declare const _default: ({ value, format, onChange, disabledDate, ...props }: HTimePickerProps) => JSX.Element;
|
|
3
3
|
export default _default;
|
|
@@ -16,7 +16,7 @@ var jsxRuntime = require('react/jsx-runtime');
|
|
|
16
16
|
var antd = require('antd');
|
|
17
17
|
var hooks = require('./hooks.js');
|
|
18
18
|
|
|
19
|
-
var _excluded = ["value", "format", "onChange"];
|
|
19
|
+
var _excluded = ["value", "format", "onChange", "disabledDate"];
|
|
20
20
|
function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
21
21
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
22
22
|
var HTimePicker = (function (_ref) {
|
|
@@ -24,6 +24,7 @@ var HTimePicker = (function (_ref) {
|
|
|
24
24
|
_ref$format = _ref.format,
|
|
25
25
|
format = _ref$format === void 0 ? "X" : _ref$format,
|
|
26
26
|
onChange = _ref.onChange,
|
|
27
|
+
_disabledDate = _ref.disabledDate,
|
|
27
28
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
28
29
|
var timeVal = hooks.useTimePickerValue({
|
|
29
30
|
value: value,
|
|
@@ -36,7 +37,10 @@ var HTimePicker = (function (_ref) {
|
|
|
36
37
|
});
|
|
37
38
|
return jsxRuntime.jsx(antd.TimePicker, _objectSpread({
|
|
38
39
|
value: timeVal,
|
|
39
|
-
onChange: change
|
|
40
|
+
onChange: change,
|
|
41
|
+
disabledDate: function disabledDate(currentDate) {
|
|
42
|
+
return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, timeVal));
|
|
43
|
+
}
|
|
40
44
|
}, props));
|
|
41
45
|
});
|
|
42
46
|
|
package/lib/TDPicker/index.js
CHANGED
|
@@ -16,7 +16,7 @@ var jsxRuntime = require('react/jsx-runtime');
|
|
|
16
16
|
var antd = require('antd');
|
|
17
17
|
var hooks = require('./hooks.js');
|
|
18
18
|
|
|
19
|
-
var _excluded = ["value", "onChange", "showTime", "format"];
|
|
19
|
+
var _excluded = ["value", "onChange", "showTime", "format", "disabledDate"];
|
|
20
20
|
function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
21
21
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
22
22
|
var Picker = antd.DatePicker;
|
|
@@ -27,6 +27,7 @@ var Index = function Index(_ref) {
|
|
|
27
27
|
showTime = _ref$showTime === void 0 ? true : _ref$showTime,
|
|
28
28
|
_ref$format = _ref.format,
|
|
29
29
|
format = _ref$format === void 0 ? "X" : _ref$format,
|
|
30
|
+
_disabledDate = _ref.disabledDate,
|
|
30
31
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
31
32
|
var timeVal = hooks.useTimeVal({
|
|
32
33
|
value: value,
|
|
@@ -39,7 +40,10 @@ var Index = function Index(_ref) {
|
|
|
39
40
|
return jsxRuntime.jsx(Picker, _objectSpread({
|
|
40
41
|
value: timeVal,
|
|
41
42
|
onChange: change,
|
|
42
|
-
showTime: showTime
|
|
43
|
+
showTime: showTime,
|
|
44
|
+
disabledDate: function disabledDate(currentDate) {
|
|
45
|
+
return !!(_disabledDate !== null && _disabledDate !== void 0 && _disabledDate(currentDate, timeVal));
|
|
46
|
+
}
|
|
43
47
|
}, props));
|
|
44
48
|
};
|
|
45
49
|
|
package/lib/TDPicker/modal.d.ts
CHANGED
|
@@ -6,12 +6,16 @@ import type { TimePickerProps } from "antd";
|
|
|
6
6
|
import type { DurationInputArg2 } from "moment";
|
|
7
7
|
import type { DateRangePickerValueMapModal } from "../modal";
|
|
8
8
|
import type { addFormatItemModal } from "@/components/Form/modal";
|
|
9
|
-
|
|
9
|
+
interface DisabledDateFnModal<T = Moment | undefined> {
|
|
10
|
+
(currentDate: Moment, value: T): boolean;
|
|
11
|
+
}
|
|
12
|
+
export interface HDatePickerProps extends Omit<DatePickerProps, "onChange" | "format" | "ranges" | "disabledDate"> {
|
|
10
13
|
onChange?: (time?: Moment | string | number) => void;
|
|
11
14
|
format?: string;
|
|
12
15
|
showTime?: boolean | SharedTimeProps<Moment>;
|
|
16
|
+
disabledDate?: DisabledDateFnModal;
|
|
13
17
|
}
|
|
14
|
-
export interface HRangePickerProps extends Omit<RangePickerProps, "onChange" | "format" | "ranges" | "value"> {
|
|
18
|
+
export interface HRangePickerProps extends Omit<RangePickerProps, "onChange" | "format" | "ranges" | "value" | "disabledDate"> {
|
|
15
19
|
value?: [any, any] | Record<string, any>;
|
|
16
20
|
onChange?: (val: any) => void;
|
|
17
21
|
showTime?: boolean | {
|
|
@@ -21,8 +25,11 @@ export interface HRangePickerProps extends Omit<RangePickerProps, "onChange" | "
|
|
|
21
25
|
valueMap?: DateRangePickerValueMapModal;
|
|
22
26
|
ranges?: RangePickerProps["ranges"] | boolean;
|
|
23
27
|
addFormat?: (config: Record<string, addFormatItemModal>) => void;
|
|
28
|
+
disabledDate?: DisabledDateFnModal<Moment[] | undefined>;
|
|
24
29
|
}
|
|
25
|
-
export interface HTimePickerProps extends Omit<TimePickerProps, "onChange" | "format" | "ranges"> {
|
|
30
|
+
export interface HTimePickerProps extends Omit<TimePickerProps, "onChange" | "format" | "ranges" | "disabledDate"> {
|
|
26
31
|
onChange?: (time?: Moment | string | number) => void;
|
|
27
32
|
format?: DurationInputArg2 | string;
|
|
33
|
+
disabledDate?: DisabledDateFnModal;
|
|
28
34
|
}
|
|
35
|
+
export {};
|
package/package.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Button, Row,Space } from "antd";
|
|
1
|
+
import { Button, Row, Space } from "antd";
|
|
2
2
|
import React from "react";
|
|
3
3
|
import { useFormContext } from "../Form/Context";
|
|
4
4
|
import type { ButtonProps, FormInstance } from "antd/es";
|
|
@@ -23,20 +23,20 @@ export default ({
|
|
|
23
23
|
<Row justify={position} style={{ width: "100%" }}>
|
|
24
24
|
<Space>
|
|
25
25
|
{reset && (
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
26
|
+
<Button
|
|
27
|
+
{...props}
|
|
28
|
+
onClick={() => {
|
|
29
|
+
form.resetFields();
|
|
30
|
+
}}
|
|
31
|
+
>
|
|
32
|
+
重制
|
|
33
|
+
</Button>
|
|
34
34
|
)}
|
|
35
35
|
<Button
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
36
|
+
{...props}
|
|
37
|
+
type={type}
|
|
38
|
+
onClick={form.submit}
|
|
39
|
+
loading={formSubLoading}
|
|
40
40
|
>
|
|
41
41
|
{text}
|
|
42
42
|
</Button>
|
|
@@ -22,6 +22,7 @@ const HRangePicker: React.FC<HRangePickerProps> = ({
|
|
|
22
22
|
ranges = true,
|
|
23
23
|
name,
|
|
24
24
|
addFormat,
|
|
25
|
+
disabledDate,
|
|
25
26
|
...props
|
|
26
27
|
}) => {
|
|
27
28
|
const { valueRangePickerValueMap = {}, dateRanges } = useMatchConfigProps({
|
|
@@ -89,6 +90,9 @@ const HRangePicker: React.FC<HRangePickerProps> = ({
|
|
|
89
90
|
onChange={change}
|
|
90
91
|
showTime={showTime}
|
|
91
92
|
ranges={defaultRanges as RangePickerProps["ranges"]}
|
|
93
|
+
disabledDate={(currentDate) => {
|
|
94
|
+
return !!disabledDate?.(currentDate, timeVal);
|
|
95
|
+
}}
|
|
92
96
|
{...props}
|
|
93
97
|
/>
|
|
94
98
|
);
|
|
@@ -6,10 +6,20 @@ export default ({
|
|
|
6
6
|
value,
|
|
7
7
|
format = "X",
|
|
8
8
|
onChange,
|
|
9
|
+
disabledDate,
|
|
9
10
|
...props
|
|
10
11
|
}: HTimePickerProps) => {
|
|
11
12
|
const timeVal = useTimePickerValue({ value, format });
|
|
12
13
|
const change = useTimePickerChange({ value, format, onChange });
|
|
13
14
|
|
|
14
|
-
return
|
|
15
|
+
return (
|
|
16
|
+
<TimePicker
|
|
17
|
+
value={timeVal}
|
|
18
|
+
onChange={change}
|
|
19
|
+
disabledDate={(currentDate) => {
|
|
20
|
+
return !!disabledDate?.(currentDate, timeVal);
|
|
21
|
+
}}
|
|
22
|
+
{...props}
|
|
23
|
+
/>
|
|
24
|
+
);
|
|
15
25
|
};
|
|
@@ -8,12 +8,21 @@ const Index: React.FC<HDatePickerProps> = ({
|
|
|
8
8
|
onChange,
|
|
9
9
|
showTime = true,
|
|
10
10
|
format = "X",
|
|
11
|
+
disabledDate,
|
|
11
12
|
...props
|
|
12
13
|
}) => {
|
|
13
14
|
const timeVal = useTimeVal({ value, format });
|
|
14
15
|
const change = useTimeChange({ format, onChange });
|
|
15
16
|
return (
|
|
16
|
-
<Picker
|
|
17
|
+
<Picker
|
|
18
|
+
value={timeVal}
|
|
19
|
+
onChange={change}
|
|
20
|
+
showTime={showTime}
|
|
21
|
+
disabledDate={(currentDate) => {
|
|
22
|
+
return !!disabledDate?.(currentDate, timeVal);
|
|
23
|
+
}}
|
|
24
|
+
{...props}
|
|
25
|
+
/>
|
|
17
26
|
);
|
|
18
27
|
};
|
|
19
28
|
export default Index;
|
|
@@ -6,14 +6,25 @@ import type { TimePickerProps } from "antd";
|
|
|
6
6
|
import type { DurationInputArg2 } from "moment";
|
|
7
7
|
import type { DateRangePickerValueMapModal } from "../modal";
|
|
8
8
|
import type { addFormatItemModal } from "@/components/Form/modal";
|
|
9
|
+
interface DisabledDateFnModal<T = Moment | undefined> {
|
|
10
|
+
(currentDate: Moment, value: T): boolean;
|
|
11
|
+
}
|
|
12
|
+
|
|
9
13
|
export interface HDatePickerProps
|
|
10
|
-
extends Omit<
|
|
14
|
+
extends Omit<
|
|
15
|
+
DatePickerProps,
|
|
16
|
+
"onChange" | "format" | "ranges" | "disabledDate"
|
|
17
|
+
> {
|
|
11
18
|
onChange?: (time?: Moment | string | number) => void;
|
|
12
19
|
format?: string;
|
|
13
20
|
showTime?: boolean | SharedTimeProps<Moment>;
|
|
21
|
+
disabledDate?: DisabledDateFnModal;
|
|
14
22
|
}
|
|
15
23
|
export interface HRangePickerProps
|
|
16
|
-
extends Omit<
|
|
24
|
+
extends Omit<
|
|
25
|
+
RangePickerProps,
|
|
26
|
+
"onChange" | "format" | "ranges" | "value" | "disabledDate"
|
|
27
|
+
> {
|
|
17
28
|
value?: [any, any] | Record<string, any>;
|
|
18
29
|
onChange?: (val: any) => void;
|
|
19
30
|
showTime?: boolean | { defaultValue?: Moment[] };
|
|
@@ -21,10 +32,15 @@ export interface HRangePickerProps
|
|
|
21
32
|
valueMap?: DateRangePickerValueMapModal;
|
|
22
33
|
ranges?: RangePickerProps["ranges"] | boolean;
|
|
23
34
|
addFormat?: (config: Record<string, addFormatItemModal>) => void;
|
|
35
|
+
disabledDate?: DisabledDateFnModal<Moment[] | undefined>;
|
|
24
36
|
}
|
|
25
37
|
|
|
26
38
|
export interface HTimePickerProps
|
|
27
|
-
extends Omit<
|
|
39
|
+
extends Omit<
|
|
40
|
+
TimePickerProps,
|
|
41
|
+
"onChange" | "format" | "ranges" | "disabledDate"
|
|
42
|
+
> {
|
|
28
43
|
onChange?: (time?: Moment | string | number) => void;
|
|
29
44
|
format?: DurationInputArg2 | string;
|
|
45
|
+
disabledDate?: DisabledDateFnModal;
|
|
30
46
|
}
|