@pinnacle0/web-ui 0.5.58 → 0.5.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/core/Cascader/index.d.ts +1 -1
- package/core/Cascader/index.js.map +1 -1
- package/core/DateRangePicker.d.ts +8 -1
- package/core/DateRangePicker.js +17 -32
- package/core/DateRangePicker.js.map +1 -1
- package/core/DateTimeRangePicker/index.d.ts +8 -1
- package/core/DateTimeRangePicker/index.js +17 -32
- package/core/DateTimeRangePicker/index.js.map +1 -1
- package/core/MultipleCascader/index.d.ts +1 -1
- package/core/MultipleCascader/index.js.map +1 -1
- package/core/NumberInput/util.d.ts +1 -1
- package/core/TimeRangePicker.d.ts +8 -1
- package/core/TimeRangePicker.js +17 -32
- package/core/TimeRangePicker.js.map +1 -1
- package/package.json +15 -15
package/core/Cascader/index.d.ts
CHANGED
|
@@ -32,6 +32,6 @@ export declare class Cascader<T extends string | number> extends React.PureCompo
|
|
|
32
32
|
getAntValue: () => Array<string | number>;
|
|
33
33
|
getAntDataSource: () => DefaultOptionType[];
|
|
34
34
|
displayRender: (labels: React.ReactNode[]) => string | React.JSX.Element;
|
|
35
|
-
onChange: (antValue: Array<string | number>) => void;
|
|
35
|
+
onChange: (antValue: Array<string | number | null>) => void;
|
|
36
36
|
render(): React.JSX.Element;
|
|
37
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/Cascader/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,cAAc,CAAC;AA0BtB;IAAyD,4BAA6B;IAAtF;;QAKI,iBAAW,GAAG;YACV,IAAM,IAAI,GAAG,KAAI,CAAC,gBAAgB,EAAE,CAAC;YACrC,IAAM,iBAAiB,GAAG,UAAC,IAAyB;;gBACzC,IAAA,KAAK,GAAI,KAAI,CAAC,KAAK,MAAd,CAAe;;oBAC3B,KAAmB,IAAA,SAAA,SAAA,IAAI,CAAA,0BAAA,4CAAE,CAAC;wBAArB,IAAM,IAAI,iBAAA;wBACX,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;4BACvB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;wBACxB,CAAC;6BAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;4BACvB,IAAM,MAAM,kBAAI,IAAI,CAAC,KAAM,UAAK,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAC,CAAC;4BAClE,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gCACzB,OAAO,MAAM,CAAC;4BAClB,CAAC;wBACL,CAAC;oBACL,CAAC;;;;;;;;;gBACD,OAAO,EAAE,CAAC;YACd,CAAC,CAAC;YACF,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC,CAAC;QAEF,sBAAgB,GAAG;YACf,IAAM,cAAc,GAAG,UAAC,IAAgC;gBACpD,OAAO,IAAI,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,CAAC;oBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK;oBAC/B,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;iBAClG,CAAC,EALsB,CAKtB,CAAC,CAAC;YACR,CAAC,CAAC;YACF,OAAO,cAAc,CAAC,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC,CAAC;QAEF,mBAAa,GAAG,UAAC,MAAyB;YACtC,OAAA,KAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAChB,6BAAK,SAAS,EAAC,wBAAwB;gBAClC,KAAI,CAAC,KAAK,CAAC,MAAM;gBACjB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CACf,CACT,CAAC,CAAC,CAAC,CACA,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CACnB;QAPD,CAOC,CAAC;QAEN,cAAQ,GAAG,UAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/Cascader/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,10 +12,17 @@ export interface Props<T extends boolean> extends ControlledFormValue<T extends
|
|
|
12
12
|
}>;
|
|
13
13
|
preserveInvalidOnBlur?: boolean;
|
|
14
14
|
}
|
|
15
|
-
|
|
15
|
+
interface State {
|
|
16
|
+
shouldCheckDateRangeValid: boolean;
|
|
17
|
+
}
|
|
18
|
+
export declare class DateRangePicker<T extends boolean> extends React.PureComponent<Props<T>, State> {
|
|
16
19
|
static displayName: string;
|
|
17
20
|
private readonly dateFormatter;
|
|
21
|
+
constructor(props: Props<T>);
|
|
18
22
|
isDateDisabled: (current: Dayjs) => boolean;
|
|
19
23
|
onChange: (dates: [Dayjs | null, Dayjs | null] | null) => void;
|
|
24
|
+
onOpenChange: (open: boolean) => void;
|
|
25
|
+
componentDidUpdate(): void;
|
|
20
26
|
render(): React.JSX.Element;
|
|
21
27
|
}
|
|
28
|
+
export {};
|
package/core/DateRangePicker.js
CHANGED
|
@@ -13,38 +13,13 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
13
13
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
14
14
|
};
|
|
15
15
|
})();
|
|
16
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
17
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
18
|
-
if (!m) return o;
|
|
19
|
-
var i = m.call(o), r, ar = [], e;
|
|
20
|
-
try {
|
|
21
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
22
|
-
}
|
|
23
|
-
catch (error) { e = { error: error }; }
|
|
24
|
-
finally {
|
|
25
|
-
try {
|
|
26
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
27
|
-
}
|
|
28
|
-
finally { if (e) throw e.error; }
|
|
29
|
-
}
|
|
30
|
-
return ar;
|
|
31
|
-
};
|
|
32
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
33
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
34
|
-
if (ar || !(i in from)) {
|
|
35
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
36
|
-
ar[i] = from[i];
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
40
|
-
};
|
|
41
16
|
import React from "react";
|
|
42
17
|
import dayjs from "dayjs";
|
|
43
18
|
import DatePicker from "antd/es/date-picker";
|
|
44
19
|
var DateRangePicker = /** @class */ (function (_super) {
|
|
45
20
|
__extends(DateRangePicker, _super);
|
|
46
|
-
function DateRangePicker() {
|
|
47
|
-
var _this = _super.
|
|
21
|
+
function DateRangePicker(props) {
|
|
22
|
+
var _this = _super.call(this, props) || this;
|
|
48
23
|
_this.dateFormatter = "YYYY-MM-DD";
|
|
49
24
|
_this.isDateDisabled = function (current) {
|
|
50
25
|
var _a, _b;
|
|
@@ -67,22 +42,32 @@ var DateRangePicker = /** @class */ (function (_super) {
|
|
|
67
42
|
if (dates) {
|
|
68
43
|
var start = dates[0];
|
|
69
44
|
var end = dates[1];
|
|
70
|
-
if (start && end && start.isAfter(end)) {
|
|
71
|
-
start = dates[1];
|
|
72
|
-
end = dates[0];
|
|
73
|
-
}
|
|
74
45
|
typedOnChange([start ? start.format(_this.dateFormatter) : null, end ? end.format(_this.dateFormatter) : null]);
|
|
75
46
|
}
|
|
76
47
|
else {
|
|
77
48
|
typedOnChange([null, null]);
|
|
78
49
|
}
|
|
79
50
|
};
|
|
51
|
+
_this.onOpenChange = function (open) {
|
|
52
|
+
_this.setState({ shouldCheckDateRangeValid: !open });
|
|
53
|
+
};
|
|
54
|
+
_this.state = { shouldCheckDateRangeValid: false };
|
|
80
55
|
return _this;
|
|
81
56
|
}
|
|
57
|
+
DateRangePicker.prototype.componentDidUpdate = function () {
|
|
58
|
+
if (this.state.shouldCheckDateRangeValid && this.props.value[0] && this.props.value[1]) {
|
|
59
|
+
var dates = this.props.value;
|
|
60
|
+
var typedOnChange = this.props.onChange;
|
|
61
|
+
if (dayjs(dates[0]).isAfter(dayjs(dates[1]))) {
|
|
62
|
+
typedOnChange([dates[1], dates[0]]);
|
|
63
|
+
}
|
|
64
|
+
this.setState({ shouldCheckDateRangeValid: false });
|
|
65
|
+
}
|
|
66
|
+
};
|
|
82
67
|
DateRangePicker.prototype.render = function () {
|
|
83
68
|
var _a = this.props, value = _a.value, allowNull = _a.allowNull, disabled = _a.disabled, className = _a.className, presets = _a.presets, _b = _a.preserveInvalidOnBlur, preserveInvalidOnBlur = _b === void 0 ? true : _b;
|
|
84
69
|
var parsedValue = [value[0] ? dayjs(value[0]) : null, value[1] ? dayjs(value[1]) : null];
|
|
85
|
-
return (React.createElement(DatePicker.RangePicker, { disabledDate: this.isDateDisabled, className: className, showTime: false, value: parsedValue, onCalendarChange: this.onChange, allowClear: allowNull, disabled: disabled, presets: presets, preserveInvalidOnBlur: preserveInvalidOnBlur }));
|
|
70
|
+
return (React.createElement(DatePicker.RangePicker, { disabledDate: this.isDateDisabled, className: className, showTime: false, value: parsedValue, onCalendarChange: this.onChange, allowClear: allowNull, disabled: disabled, presets: presets, preserveInvalidOnBlur: preserveInvalidOnBlur, onOpenChange: this.onOpenChange }));
|
|
86
71
|
};
|
|
87
72
|
DateRangePicker.displayName = "DateRangePicker";
|
|
88
73
|
return DateRangePicker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateRangePicker.js","sourceRoot":"","sources":["../../src/core/DateRangePicker.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DateRangePicker.js","sourceRoot":"","sources":["../../src/core/DateRangePicker.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,UAAU,MAAM,qBAAqB,CAAC;AAe7C;IAAwD,mCAAoC;IAKxF,yBAAY,KAAe;QACvB,YAAA,MAAK,YAAC,KAAK,CAAC,SAAC;QAHA,mBAAa,GAAG,YAAY,CAAC;QAO9C,oBAAc,GAAG,UAAC,OAAc;;YAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,OAAO,KAAK,CAAC;YACjB,CAAC;YAED;;;;eAIG;YACH,IAAI,OAAO,CAAC,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;gBACnD,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,IAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;YAClF,OAAO,CAAA,MAAA,MAAA,KAAI,CAAC,KAAK,EAAC,aAAa,mDAAG,WAAW,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,KAAI,KAAK,CAAC;QAC9E,CAAC,CAAC;QAEF,cAAQ,GAAG,UAAC,KAA0C;YAClD,IAAM,aAAa,GAAG,KAAI,CAAC,KAAK,CAAC,QAA2D,CAAC;YAC7F,IAAI,KAAK,EAAE,CAAC;gBACR,IAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACvB,IAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAClH,CAAC;iBAAM,CAAC;gBACJ,aAAa,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;YAChC,CAAC;QACL,CAAC,CAAC;QAEF,kBAAY,GAAG,UAAC,IAAa;YACzB,KAAI,CAAC,QAAQ,CAAC,EAAC,yBAAyB,EAAE,CAAC,IAAI,EAAC,CAAC,CAAC;QACtD,CAAC,CAAC;QAlCE,KAAI,CAAC,KAAK,GAAG,EAAC,yBAAyB,EAAE,KAAK,EAAC,CAAC;;IACpD,CAAC;IAmCD,4CAAkB,GAAlB;QACI,IAAI,IAAI,CAAC,KAAK,CAAC,yBAAyB,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACrF,IAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YAC/B,IAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,QAA2D,CAAC;YAC7F,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3C,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACxC,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,EAAC,yBAAyB,EAAE,KAAK,EAAC,CAAC,CAAC;QACtD,CAAC;IACL,CAAC;IAED,gCAAM,GAAN;QACU,IAAA,KAAiF,IAAI,CAAC,KAAK,EAA1F,KAAK,WAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAE,SAAS,eAAA,EAAE,OAAO,aAAA,EAAE,6BAA4B,EAA5B,qBAAqB,mBAAG,IAAI,KAAc,CAAC;QAClG,IAAM,WAAW,GAAiC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACzH,OAAO,CACH,oBAAC,UAAU,CAAC,WAAW,IACnB,YAAY,EAAE,IAAI,CAAC,cAAc,EACjC,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,KAAK,EACf,KAAK,EAAE,WAAW,EAClB,gBAAgB,EAAE,IAAI,CAAC,QAAQ,EAC/B,UAAU,EAAE,SAAS,EACrB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,EAChB,qBAAqB,EAAE,qBAAqB,EAC5C,YAAY,EAAE,IAAI,CAAC,YAAY,GACjC,CACL,CAAC;IACN,CAAC;IAtEM,2BAAW,GAAG,iBAAiB,AAApB,CAAqB;IAuE3C,sBAAC;CAAA,AAxED,CAAwD,KAAK,CAAC,aAAa,GAwE1E;SAxEY,eAAe"}
|
|
@@ -14,12 +14,19 @@ export interface Props<T extends boolean> extends ControlledFormValue<T extends
|
|
|
14
14
|
}>;
|
|
15
15
|
preserveInvalidOnBlur?: boolean;
|
|
16
16
|
}
|
|
17
|
-
|
|
17
|
+
interface State {
|
|
18
|
+
shouldCheckDateRangeValid: boolean;
|
|
19
|
+
}
|
|
20
|
+
export declare class DateTimeRangePicker<T extends boolean> extends React.PureComponent<Props<T>, State> {
|
|
18
21
|
static displayName: string;
|
|
19
22
|
static showTime: {
|
|
20
23
|
defaultValue: dayjs.Dayjs[];
|
|
21
24
|
};
|
|
25
|
+
constructor(props: Props<T>);
|
|
22
26
|
isDateDisabled: (current: Dayjs) => boolean;
|
|
23
27
|
onChange: (dates: [Dayjs | null, Dayjs | null] | null) => void;
|
|
28
|
+
onOpenChange: (open: boolean) => void;
|
|
29
|
+
componentDidUpdate(): void;
|
|
24
30
|
render(): React.JSX.Element;
|
|
25
31
|
}
|
|
32
|
+
export {};
|
|
@@ -13,39 +13,14 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
13
13
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
14
14
|
};
|
|
15
15
|
})();
|
|
16
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
17
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
18
|
-
if (!m) return o;
|
|
19
|
-
var i = m.call(o), r, ar = [], e;
|
|
20
|
-
try {
|
|
21
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
22
|
-
}
|
|
23
|
-
catch (error) { e = { error: error }; }
|
|
24
|
-
finally {
|
|
25
|
-
try {
|
|
26
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
27
|
-
}
|
|
28
|
-
finally { if (e) throw e.error; }
|
|
29
|
-
}
|
|
30
|
-
return ar;
|
|
31
|
-
};
|
|
32
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
33
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
34
|
-
if (ar || !(i in from)) {
|
|
35
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
36
|
-
ar[i] = from[i];
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
40
|
-
};
|
|
41
16
|
import React from "react";
|
|
42
17
|
import dayjs from "dayjs";
|
|
43
18
|
import DatePicker from "antd/es/date-picker";
|
|
44
19
|
import "./index.less";
|
|
45
20
|
var DateTimeRangePicker = /** @class */ (function (_super) {
|
|
46
21
|
__extends(DateTimeRangePicker, _super);
|
|
47
|
-
function DateTimeRangePicker() {
|
|
48
|
-
var _this = _super.
|
|
22
|
+
function DateTimeRangePicker(props) {
|
|
23
|
+
var _this = _super.call(this, props) || this;
|
|
49
24
|
_this.isDateDisabled = function (current) {
|
|
50
25
|
var _a, _b;
|
|
51
26
|
if (!current)
|
|
@@ -67,10 +42,6 @@ var DateTimeRangePicker = /** @class */ (function (_super) {
|
|
|
67
42
|
// otherwise, from/to will use now's millisecond value, which is inaccurate
|
|
68
43
|
var start = dates[0];
|
|
69
44
|
var end = dates[1];
|
|
70
|
-
if (start && end && start.isAfter(end)) {
|
|
71
|
-
start = dates[1];
|
|
72
|
-
end = dates[0];
|
|
73
|
-
}
|
|
74
45
|
var from = start ? start.millisecond(0).toDate() : null;
|
|
75
46
|
var to = end ? end.millisecond(999).toDate() : null;
|
|
76
47
|
typedOnChange([from, to]);
|
|
@@ -79,12 +50,26 @@ var DateTimeRangePicker = /** @class */ (function (_super) {
|
|
|
79
50
|
typedOnChange([null, null]);
|
|
80
51
|
}
|
|
81
52
|
};
|
|
53
|
+
_this.onOpenChange = function (open) {
|
|
54
|
+
_this.setState({ shouldCheckDateRangeValid: !open });
|
|
55
|
+
};
|
|
56
|
+
_this.state = { shouldCheckDateRangeValid: false };
|
|
82
57
|
return _this;
|
|
83
58
|
}
|
|
59
|
+
DateTimeRangePicker.prototype.componentDidUpdate = function () {
|
|
60
|
+
if (this.state.shouldCheckDateRangeValid && this.props.value[0] && this.props.value[1]) {
|
|
61
|
+
var dates = this.props.value;
|
|
62
|
+
var typedOnChange = this.props.onChange;
|
|
63
|
+
if (dayjs(dates[0]).isAfter(dayjs(dates[1]))) {
|
|
64
|
+
typedOnChange([dates[1], dates[0]]);
|
|
65
|
+
}
|
|
66
|
+
this.setState({ shouldCheckDateRangeValid: false });
|
|
67
|
+
}
|
|
68
|
+
};
|
|
84
69
|
DateTimeRangePicker.prototype.render = function () {
|
|
85
70
|
var _a = this.props, value = _a.value, allowNull = _a.allowNull, disabled = _a.disabled, className = _a.className, presets = _a.presets, _b = _a.preserveInvalidOnBlur, preserveInvalidOnBlur = _b === void 0 ? true : _b;
|
|
86
71
|
var parsedValue = [value[0] ? dayjs(value[0]) : null, value[1] ? dayjs(value[1]) : null];
|
|
87
|
-
return (React.createElement(DatePicker.RangePicker, { className: className, value: parsedValue, onCalendarChange: this.onChange, disabledDate: this.isDateDisabled, allowClear: allowNull, disabled: disabled, presets: presets, showTime: DateTimeRangePicker.showTime, preserveInvalidOnBlur: preserveInvalidOnBlur }));
|
|
72
|
+
return (React.createElement(DatePicker.RangePicker, { className: className, value: parsedValue, onCalendarChange: this.onChange, disabledDate: this.isDateDisabled, allowClear: allowNull, disabled: disabled, presets: presets, showTime: DateTimeRangePicker.showTime, preserveInvalidOnBlur: preserveInvalidOnBlur, onOpenChange: this.onOpenChange }));
|
|
88
73
|
};
|
|
89
74
|
DateTimeRangePicker.displayName = "DateTimeRangePicker";
|
|
90
75
|
DateTimeRangePicker.showTime = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/DateTimeRangePicker/index.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/DateTimeRangePicker/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,6 @@ export declare class MultipleCascader<T extends string | number> extends React.P
|
|
|
25
25
|
static nonLeafPrefix: string;
|
|
26
26
|
getAntValue: () => (string | number)[][];
|
|
27
27
|
getAntDataSource: () => DefaultOptionType[];
|
|
28
|
-
onChange: (antValue: (string | number)[][]) => void;
|
|
28
|
+
onChange: (antValue: (string | number | null)[][]) => void;
|
|
29
29
|
render(): React.JSX.Element;
|
|
30
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/MultipleCascader/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,cAAc,CAAC;AAuBtB;IAAiE,oCAA6B;IAA9F;;QAII,iBAAW,GAAG;YACV,IAAM,IAAI,GAAG,KAAI,CAAC,gBAAgB,EAAE,CAAC;YACrC,IAAM,KAAK,GAAG,KAAI,CAAC,KAAK,CAAC,KAAK,CAAC;YAC/B,IAAM,iBAAiB,GAAG,UAAC,IAAyB,EAAE,KAAQ;;;oBAC1D,KAAmB,IAAA,SAAA,SAAA,IAAI,CAAA,0BAAA,4CAAE,CAAC;wBAArB,IAAM,IAAI,iBAAA;wBACX,IAAI,IAAI,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;4BACvB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;wBACxB,CAAC;6BAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;4BACvB,IAAM,MAAM,kBAAI,IAAI,CAAC,KAAM,UAAK,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAC,CAAC;4BACzE,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gCACzB,OAAO,MAAM,CAAC;4BAClB,CAAC;wBACL,CAAC;oBACL,CAAC;;;;;;;;;gBACD,OAAO,EAAE,CAAC;YACd,CAAC,CAAC;YAEF,OAAO,KAAK,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,EAA1B,CAA0B,CAAC,CAAC;QACtD,CAAC,CAAC;QAEF,sBAAgB,GAAG;YACf,IAAM,cAAc,GAAG,UAAC,IAAgC;gBACpD,OAAO,IAAI,CAAC,GAAG,CAAC,UAAC,IAAI,EAAE,KAAK,IAAK,OAAA,CAAC;oBAC9B,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,aAAa,GAAG,UAAG,KAAK,MAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK;oBACzG,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;iBACxG,CAAC,EAL+B,CAK/B,CAAC,CAAC;YACR,CAAC,CAAC;YACF,OAAO,cAAc,CAAC,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC3C,CAAC,CAAC;QAEF,cAAQ,GAAG,UAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/core/MultipleCascader/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ export declare const canMinus: (_: {
|
|
|
19
19
|
export declare const getDisplayValue: (_: {
|
|
20
20
|
value: number | null;
|
|
21
21
|
scale: number;
|
|
22
|
-
displayRenderer?: (
|
|
22
|
+
displayRenderer?: (value: number) => string;
|
|
23
23
|
}) => string;
|
|
24
24
|
/**
|
|
25
25
|
* @param userInput Raw text from the input field, may or may not be convertible to `null` or a valid number
|
|
@@ -8,9 +8,16 @@ export interface Props<T extends boolean> extends ControlledFormValue<T extends
|
|
|
8
8
|
order?: boolean;
|
|
9
9
|
preserveInvalidOnBlur?: boolean;
|
|
10
10
|
}
|
|
11
|
-
|
|
11
|
+
interface State {
|
|
12
|
+
shouldCheckDateRangeValid: boolean;
|
|
13
|
+
}
|
|
14
|
+
export declare class TimeRangePicker<T extends boolean> extends React.PureComponent<Props<T>, State> {
|
|
12
15
|
static displayName: string;
|
|
13
16
|
private readonly timeFormatter;
|
|
17
|
+
constructor(props: Props<T>);
|
|
14
18
|
onChange: (dates: [Dayjs | null, Dayjs | null] | null) => void;
|
|
19
|
+
onOpenChange: (open: boolean) => void;
|
|
20
|
+
componentDidUpdate(): void;
|
|
15
21
|
render(): React.JSX.Element;
|
|
16
22
|
}
|
|
23
|
+
export {};
|
package/core/TimeRangePicker.js
CHANGED
|
@@ -13,59 +13,44 @@ var __extends = (this && this.__extends) || (function () {
|
|
|
13
13
|
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
|
|
14
14
|
};
|
|
15
15
|
})();
|
|
16
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
17
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
18
|
-
if (!m) return o;
|
|
19
|
-
var i = m.call(o), r, ar = [], e;
|
|
20
|
-
try {
|
|
21
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
22
|
-
}
|
|
23
|
-
catch (error) { e = { error: error }; }
|
|
24
|
-
finally {
|
|
25
|
-
try {
|
|
26
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
27
|
-
}
|
|
28
|
-
finally { if (e) throw e.error; }
|
|
29
|
-
}
|
|
30
|
-
return ar;
|
|
31
|
-
};
|
|
32
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
33
|
-
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
34
|
-
if (ar || !(i in from)) {
|
|
35
|
-
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
36
|
-
ar[i] = from[i];
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
return to.concat(ar || Array.prototype.slice.call(from));
|
|
40
|
-
};
|
|
41
16
|
import React from "react";
|
|
42
17
|
import dayjs from "dayjs";
|
|
43
18
|
import DatePicker from "antd/es/date-picker";
|
|
44
19
|
var TimeRangePicker = /** @class */ (function (_super) {
|
|
45
20
|
__extends(TimeRangePicker, _super);
|
|
46
|
-
function TimeRangePicker() {
|
|
47
|
-
var _this = _super.
|
|
21
|
+
function TimeRangePicker(props) {
|
|
22
|
+
var _this = _super.call(this, props) || this;
|
|
48
23
|
_this.timeFormatter = "HH:mm:ss";
|
|
49
24
|
_this.onChange = function (dates) {
|
|
50
25
|
var typedOnChange = _this.props.onChange;
|
|
51
26
|
if (dates) {
|
|
52
27
|
var start = dates[0];
|
|
53
28
|
var end = dates[1];
|
|
54
|
-
if (start && end && start.isAfter(end)) {
|
|
55
|
-
start = dates[1];
|
|
56
|
-
end = dates[0];
|
|
57
|
-
}
|
|
58
29
|
typedOnChange([start ? start.format(_this.timeFormatter) : null, end ? end.format(_this.timeFormatter) : null]);
|
|
59
30
|
}
|
|
60
31
|
else {
|
|
61
32
|
typedOnChange([null, null]);
|
|
62
33
|
}
|
|
63
34
|
};
|
|
35
|
+
_this.onOpenChange = function (open) {
|
|
36
|
+
_this.setState({ shouldCheckDateRangeValid: !open });
|
|
37
|
+
};
|
|
38
|
+
_this.state = { shouldCheckDateRangeValid: false };
|
|
64
39
|
return _this;
|
|
65
40
|
}
|
|
41
|
+
TimeRangePicker.prototype.componentDidUpdate = function () {
|
|
42
|
+
var dates = this.props.value;
|
|
43
|
+
if (this.state.shouldCheckDateRangeValid && dates[0] && dates[1]) {
|
|
44
|
+
var typedOnChange = this.props.onChange;
|
|
45
|
+
if (dates[0] > dates[1]) {
|
|
46
|
+
typedOnChange([dates[1], dates[0]]);
|
|
47
|
+
}
|
|
48
|
+
this.setState({ shouldCheckDateRangeValid: false });
|
|
49
|
+
}
|
|
50
|
+
};
|
|
66
51
|
TimeRangePicker.prototype.render = function () {
|
|
67
52
|
var _a = this.props, value = _a.value, disabled = _a.disabled, className = _a.className, allowNull = _a.allowNull, order = _a.order, _b = _a.preserveInvalidOnBlur, preserveInvalidOnBlur = _b === void 0 ? true : _b;
|
|
68
|
-
return (React.createElement(DatePicker.RangePicker, { picker: "time", mode: undefined, className: className, value: [value[0] ? dayjs(value[0], this.timeFormatter) : null, value[1] ? dayjs(value[1], this.timeFormatter) : null], onCalendarChange: this.onChange, disabled: disabled, allowClear: allowNull, order: order, preserveInvalidOnBlur: preserveInvalidOnBlur }));
|
|
53
|
+
return (React.createElement(DatePicker.RangePicker, { picker: "time", mode: undefined, className: className, value: [value[0] ? dayjs(value[0], this.timeFormatter) : null, value[1] ? dayjs(value[1], this.timeFormatter) : null], onCalendarChange: this.onChange, disabled: disabled, allowClear: allowNull, order: order, preserveInvalidOnBlur: preserveInvalidOnBlur, onOpenChange: this.onOpenChange }));
|
|
69
54
|
};
|
|
70
55
|
TimeRangePicker.displayName = "TimeRangePicker";
|
|
71
56
|
return TimeRangePicker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimeRangePicker.js","sourceRoot":"","sources":["../../src/core/TimeRangePicker.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TimeRangePicker.js","sourceRoot":"","sources":["../../src/core/TimeRangePicker.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pinnacle0/web-ui",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.60",
|
|
4
4
|
"author": "Pinnacle",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"sideEffects": [
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
20
|
"@ant-design/cssinjs": "1.20.0",
|
|
21
|
-
"@ant-design/icons": "5.3.
|
|
21
|
+
"@ant-design/icons": "5.3.7",
|
|
22
22
|
"@juggle/resize-observer": "3.4.0",
|
|
23
|
-
"@tanstack/react-virtual": "3.
|
|
24
|
-
"antd": "5.
|
|
23
|
+
"@tanstack/react-virtual": "3.5.0",
|
|
24
|
+
"antd": "5.17.3",
|
|
25
25
|
"classnames": "2.5.1",
|
|
26
|
-
"dayjs": "1.11.
|
|
26
|
+
"dayjs": "1.11.11",
|
|
27
27
|
"intersection-observer": "0.12.2",
|
|
28
|
-
"rc-picker": "4.
|
|
28
|
+
"rc-picker": "4.5.0",
|
|
29
29
|
"rc-resize-observer": "1.4.0"
|
|
30
30
|
},
|
|
31
31
|
"peerDependencies": {
|
|
@@ -34,23 +34,23 @@
|
|
|
34
34
|
"react-router-dom": ">=5.2.0 <6.0.0"
|
|
35
35
|
},
|
|
36
36
|
"devDependencies": {
|
|
37
|
-
"@testing-library/dom": "
|
|
38
|
-
"@testing-library/jest-dom": "6.4.
|
|
39
|
-
"@testing-library/react": "
|
|
37
|
+
"@testing-library/dom": "10.1.0",
|
|
38
|
+
"@testing-library/jest-dom": "6.4.5",
|
|
39
|
+
"@testing-library/react": "15.0.7",
|
|
40
40
|
"@testing-library/user-event": "14.5.2",
|
|
41
41
|
"@types/fs-extra": "11.0.4",
|
|
42
|
-
"@types/react": "18.2
|
|
43
|
-
"@types/react-dom": "18.
|
|
42
|
+
"@types/react": "18.3.2",
|
|
43
|
+
"@types/react-dom": "18.3.0",
|
|
44
44
|
"@types/react-router": "5.1.20",
|
|
45
45
|
"@types/react-router-dom": "5.3.3",
|
|
46
46
|
"fs-extra": "11.2.0",
|
|
47
47
|
"history": "5.3.0",
|
|
48
48
|
"less": "4.2.0",
|
|
49
|
-
"react": "18.
|
|
50
|
-
"react-dom": "18.
|
|
49
|
+
"react": "18.3.1",
|
|
50
|
+
"react-dom": "18.3.1",
|
|
51
51
|
"react-router-dom": "5.3.0",
|
|
52
|
-
"@pinnacle0/
|
|
53
|
-
"@pinnacle0/
|
|
52
|
+
"@pinnacle0/webpack-util": "0.6.3",
|
|
53
|
+
"@pinnacle0/devtool-util": "1.2.13"
|
|
54
54
|
},
|
|
55
55
|
"publishConfig": {
|
|
56
56
|
"directory": "build",
|