@gisce/react-ooui 2.0.0-alpha.32 → 2.0.0-alpha.33
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/dist/common/DatePicker.d.ts +9 -0
- package/dist/common/DatePicker.d.ts.map +1 -1
- package/dist/react-ooui.es.js +3846 -3758
- package/dist/react-ooui.es.js.map +1 -1
- package/dist/widgets/base/Time.d.ts.map +1 -1
- package/dist/widgets/custom/Comments.d.ts.map +1 -1
- package/dist/widgets/views/Graph/GraphDefaults.d.ts.map +1 -1
- package/dist/widgets/views/Tree.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/common/DatePicker.tsx +5 -2
- package/src/stories/DatePickerInput.stories.tsx +20 -0
- package/src/widgets/base/Time.tsx +3 -1
- package/src/widgets/custom/Comments.tsx +3 -1
- package/src/widgets/views/Graph/GraphDefaults.ts +6 -3
- package/src/widgets/views/Tree.tsx +6 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Time.d.ts","sourceRoot":"","sources":["../../../src/widgets/base/Time.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"Time.d.ts","sourceRoot":"","sources":["../../../src/widgets/base/Time.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAQtC,QAAA,MAAM,IAAI,UAAW,WAAW,4CAQ/B,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CACrC,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,cAAc,4CAa9C,CAAC;AAEF,eAAe,IAAI,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Comments.d.ts","sourceRoot":"","sources":["../../../src/widgets/custom/Comments.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"Comments.d.ts","sourceRoot":"","sources":["../../../src/widgets/custom/Comments.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AA6BtC,KAAK,eAAe,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,CAAC,EAAE,GAAG,CAAC;CACb,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,eAAe,EAAE,CAAC;CACzB,CAAC;AAEF,KAAK,qBAAqB,GAAG;IAC3B,KAAK,CAAC,EAAE,UAAU,EAAE,CAAC;CACtB,CAAC;AAEF,KAAK,eAAe,GAAG;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,KAAK,EAAE,eAAe,GAAG,eAAe,CAAC;CAC1C,CAAC;AA0BF,eAAO,MAAM,OAAO,UAAW,YAAY,4CAqB1C,CAAC;AAEF,eAAO,MAAM,QAAQ,UAAW,iBAAiB,4CAahD,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,qBAAqB,4CAiB5D,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAAW,WAAW,4CAMvD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GraphDefaults.d.ts","sourceRoot":"","sources":["../../../../src/widgets/views/Graph/GraphDefaults.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GraphDefaults.d.ts","sourceRoot":"","sources":["../../../../src/widgets/views/Graph/GraphDefaults.ts"],"names":[],"mappings":"AA8CA,QAAA,MAAM,mBAAmB;;;;;;mCA/BK,GAAG;;;;;mCAAH,GAAG;;;;;;;;gCATf,GAAG;;;;;;;;;;;;mCAoEQ,GAAG;;;;;;;;;;;gCApEd,GAAG;;;;;;;;;;;;;;;;gCAAH,GAAG;;;;;;;mCASS,GAAG;;;;;mCAAH,GAAG;;;;;;;;;;CAgHhC,CAAC;AA6CF,eAAe,mBAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tree.d.ts","sourceRoot":"","sources":["../../../src/widgets/views/Tree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAUvE,OAAO,EAAE,QAAQ,EAAU,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"Tree.d.ts","sourceRoot":"","sources":["../../../src/widgets/views/Tree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAUvE,OAAO,EAAE,QAAQ,EAAU,MAAM,SAAS,CAAC;AA4B3C,KAAK,KAAK,GAAG;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAChE,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,gBAAgB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IACtC,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,wBAAwB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1C,CAAC;AAkHF,iBAAS,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,YAAY,CA6O9C;AAED,eAAe,IAAI,CAAC"}
|
package/package.json
CHANGED
|
@@ -7,9 +7,12 @@ import { Date as DateOoui } from "@gisce/ooui";
|
|
|
7
7
|
import dayjs from "dayjs";
|
|
8
8
|
import weekday from "dayjs/plugin/weekday";
|
|
9
9
|
import localeData from "dayjs/plugin/localeData";
|
|
10
|
+
import utc from "dayjs/plugin/utc";
|
|
11
|
+
|
|
10
12
|
const { useToken } = theme;
|
|
11
13
|
dayjs.extend(weekday);
|
|
12
14
|
dayjs.extend(localeData);
|
|
15
|
+
dayjs.extend(utc);
|
|
13
16
|
|
|
14
17
|
type DatePickerProps = WidgetProps & {
|
|
15
18
|
showTime?: boolean;
|
|
@@ -46,7 +49,7 @@ interface DatePickerInputProps {
|
|
|
46
49
|
showTime?: boolean;
|
|
47
50
|
}
|
|
48
51
|
|
|
49
|
-
const DatePickerInput: React.FC<DatePickerInputProps> = (
|
|
52
|
+
export const DatePickerInput: React.FC<DatePickerInputProps> = (
|
|
50
53
|
props: DatePickerInputProps,
|
|
51
54
|
) => {
|
|
52
55
|
const { value, onChange, ooui, showTime } = props;
|
|
@@ -74,7 +77,7 @@ const DatePickerInput: React.FC<DatePickerInputProps> = (
|
|
|
74
77
|
};
|
|
75
78
|
|
|
76
79
|
const dateValue = value
|
|
77
|
-
? dayjs(value, DatePickerConfig[mode].dateInternalFormat)
|
|
80
|
+
? dayjs.utc(value, DatePickerConfig[mode].dateInternalFormat)
|
|
78
81
|
: undefined;
|
|
79
82
|
|
|
80
83
|
return (
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
import LocaleProvider from "../context/LocaleContext";
|
|
3
|
+
import { Field as FieldOoui } from "@gisce/ooui";
|
|
4
|
+
import { DatePickerInput } from "../common/DatePicker";
|
|
5
|
+
|
|
6
|
+
export default {
|
|
7
|
+
title: "Components/Widgets/Base/DatePickerInput",
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
export const Default = (): React.ReactElement => {
|
|
11
|
+
const ooui = new FieldOoui({
|
|
12
|
+
name: "field",
|
|
13
|
+
string: "Lorem ipsum",
|
|
14
|
+
});
|
|
15
|
+
return (
|
|
16
|
+
<LocaleProvider lang="en_US">
|
|
17
|
+
<DatePickerInput ooui={ooui} value={"2023-03-26 02:00:00"} showTime />
|
|
18
|
+
</LocaleProvider>
|
|
19
|
+
);
|
|
20
|
+
};
|
|
@@ -5,8 +5,10 @@ import { Time as TimeOoui } from "@gisce/ooui";
|
|
|
5
5
|
import { WidgetProps } from "@/types";
|
|
6
6
|
import dayjs, { Dayjs } from "dayjs";
|
|
7
7
|
import customParseFormat from "dayjs/plugin/customParseFormat";
|
|
8
|
+
import utc from "dayjs/plugin/utc";
|
|
8
9
|
|
|
9
10
|
dayjs.extend(customParseFormat);
|
|
11
|
+
dayjs.extend(utc);
|
|
10
12
|
|
|
11
13
|
const Time = (props: WidgetProps) => {
|
|
12
14
|
const { ooui } = props;
|
|
@@ -34,7 +36,7 @@ export const TimeInput = (props: TimeInputProps) => {
|
|
|
34
36
|
return (
|
|
35
37
|
<TimePicker
|
|
36
38
|
onChange={onChange}
|
|
37
|
-
value={props.value ? dayjs(props.value, "HH:mm:ss") : undefined}
|
|
39
|
+
value={props.value ? dayjs.utc(props.value, "HH:mm:ss") : undefined}
|
|
38
40
|
/>
|
|
39
41
|
);
|
|
40
42
|
};
|
|
@@ -15,11 +15,13 @@ import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
|
|
|
15
15
|
import dayjs from "dayjs";
|
|
16
16
|
import relativeTime from "dayjs/plugin/relativeTime";
|
|
17
17
|
import md5 from "md5";
|
|
18
|
+
import utc from "dayjs/plugin/utc";
|
|
18
19
|
|
|
19
20
|
const { Meta } = Card;
|
|
20
21
|
const { Text } = Typography;
|
|
21
22
|
|
|
22
23
|
dayjs.extend(relativeTime);
|
|
24
|
+
dayjs.extend(utc);
|
|
23
25
|
|
|
24
26
|
type GravatarProps = {
|
|
25
27
|
email: string;
|
|
@@ -94,7 +96,7 @@ export const Comment = (props: CommentProps) => {
|
|
|
94
96
|
title={data.author}
|
|
95
97
|
description={
|
|
96
98
|
<Space direction="horizontal">
|
|
97
|
-
<span title={data.date}>{dayjs(data.date).fromNow()}</span>
|
|
99
|
+
<span title={data.date}>{dayjs.utc(data.date).fromNow()}</span>
|
|
98
100
|
{data.isAuthor && <Tag color="blue">{t("author")}</Tag>}
|
|
99
101
|
</Space>
|
|
100
102
|
}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
import dayjs from "dayjs";
|
|
2
|
+
import utc from "dayjs/plugin/utc";
|
|
3
|
+
|
|
4
|
+
dayjs.extend(utc);
|
|
2
5
|
|
|
3
6
|
const formatter = (graphType: "pie" | "default" | "barGrouped") => {
|
|
4
7
|
return (object: any) => {
|
|
@@ -24,9 +27,9 @@ const axisFormatter = (value: any) => {
|
|
|
24
27
|
if (dateType === null) {
|
|
25
28
|
return value;
|
|
26
29
|
}
|
|
27
|
-
return dayjs
|
|
28
|
-
(dateFormats.
|
|
29
|
-
|
|
30
|
+
return dayjs
|
|
31
|
+
.utc(value, (dateFormats.input as any)[dateType])
|
|
32
|
+
.format((dateFormats.output as any)[dateType]);
|
|
30
33
|
} else {
|
|
31
34
|
return value;
|
|
32
35
|
}
|
|
@@ -32,6 +32,9 @@ import Avatar from "../custom/Avatar";
|
|
|
32
32
|
import { TagInput } from "../custom/Tag";
|
|
33
33
|
import { DatePickerConfig } from "@/common/DatePicker";
|
|
34
34
|
import { SelectAllRecordsRow } from "@/common/SelectAllRecordsRow";
|
|
35
|
+
import utc from "dayjs/plugin/utc";
|
|
36
|
+
|
|
37
|
+
dayjs.extend(utc);
|
|
35
38
|
|
|
36
39
|
type Props = {
|
|
37
40
|
total?: number;
|
|
@@ -86,10 +89,9 @@ const textComponentFn = (value: any): React.ReactElement => {
|
|
|
86
89
|
const dateComponentFn = (value: any): React.ReactElement => {
|
|
87
90
|
if (!value || (value && value.length === 0)) return <></>;
|
|
88
91
|
|
|
89
|
-
const formattedValue = dayjs
|
|
90
|
-
value,
|
|
91
|
-
DatePickerConfig.date.
|
|
92
|
-
).format(DatePickerConfig.date.dateDisplayFormat);
|
|
92
|
+
const formattedValue = dayjs
|
|
93
|
+
.utc(value, DatePickerConfig.date.dateInternalFormat)
|
|
94
|
+
.format(DatePickerConfig.date.dateDisplayFormat);
|
|
93
95
|
return <>{formattedValue}</>;
|
|
94
96
|
};
|
|
95
97
|
|