diff --git a/client/packages/lowcoder/src/comps/comps/autoCompleteComp/autoCompleteComp.tsx b/client/packages/lowcoder/src/comps/comps/autoCompleteComp/autoCompleteComp.tsx index 81a8244bb..acd4b2d09 100644 --- a/client/packages/lowcoder/src/comps/comps/autoCompleteComp/autoCompleteComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/autoCompleteComp/autoCompleteComp.tsx @@ -44,7 +44,7 @@ import { booleanExposingStateControl, } from "comps/controls/codeStateControl"; -import { getMomentLocale } from "i18n/momentLocale"; +import { getDayJSLocale } from "i18n/dayjsLocale"; import { autoCompleteDate, itemsDataTooltip, @@ -151,7 +151,7 @@ let AutoCompleteCompBase = (function () { const [validateState, setvalidateState] = useState({}); // 是否中文环境 - const [chineseEnv, setChineseEnv] = useState(getMomentLocale() === "zh-cn"); + const [chineseEnv, setChineseEnv] = useState(getDayJSLocale() === "zh-cn"); useEffect(() => { setsearchtext(props.value.value); @@ -346,11 +346,11 @@ let AutoCompleteCompBase = (function () { tooltip: itemsDataTooltip, placeholder: "[]", })} - {getMomentLocale() === "zh-cn" && + {getDayJSLocale() === "zh-cn" && children.searchFirstPY.propertyView({ label: trans("autoComplete.searchFirstPY"), })} - {getMomentLocale() === "zh-cn" && + {getDayJSLocale() === "zh-cn" && children.searchCompletePY.propertyView({ label: trans("autoComplete.searchCompletePY"), })} diff --git a/client/packages/lowcoder/src/comps/comps/formComp/generate/comp.tsx b/client/packages/lowcoder/src/comps/comps/formComp/generate/comp.tsx index 1402baca2..c2dd82e6d 100644 --- a/client/packages/lowcoder/src/comps/comps/formComp/generate/comp.tsx +++ b/client/packages/lowcoder/src/comps/comps/formComp/generate/comp.tsx @@ -88,9 +88,9 @@ const multiSelectComps: CompConfig[] = [ const dateComp: CompConfig = { type: "date", }; -// TODO: RAHEEL + function dateTimeToTimestamp(compName: string) { - return "moment(" + compName + ".value || 0).valueOf()"; + return "dayjs(" + compName + ".value || 0).valueOf()"; } function dateTimeComp(toTimestamp?: boolean): CompConfig { return { diff --git a/client/packages/lowcoder/src/comps/generators/hookToComp.tsx b/client/packages/lowcoder/src/comps/generators/hookToComp.tsx index 6afbbcce1..bd9059413 100644 --- a/client/packages/lowcoder/src/comps/generators/hookToComp.tsx +++ b/client/packages/lowcoder/src/comps/generators/hookToComp.tsx @@ -42,7 +42,7 @@ export function hookToStateComp(useHookFn: () => JSONObject) { } /** - * Provide a comp of static data, such as exposure of lodash, moment library + * Provide a comp of static data, such as exposure of lodash, day.js library */ export function simpleValueComp(value: any) { return simpleValueGetterComp(() => value); diff --git a/client/packages/lowcoder/src/comps/hooks/dependencyHook.tsx b/client/packages/lowcoder/src/comps/hooks/dependencyHook.tsx index 069c8ac7b..c65895e4a 100644 --- a/client/packages/lowcoder/src/comps/hooks/dependencyHook.tsx +++ b/client/packages/lowcoder/src/comps/hooks/dependencyHook.tsx @@ -1,5 +1,5 @@ /** * Hooks for managing dependencies - * lodash and moment are supported by default + * lodash and dayJS are supported by default */ export const DependecyHook = null; diff --git a/client/packages/lowcoder/src/comps/hooks/drawerComp.tsx b/client/packages/lowcoder/src/comps/hooks/drawerComp.tsx index c544ffbfe..02e8e36b4 100644 --- a/client/packages/lowcoder/src/comps/hooks/drawerComp.tsx +++ b/client/packages/lowcoder/src/comps/hooks/drawerComp.tsx @@ -125,7 +125,7 @@ let TmpDrawerComp = (function () { { return { ...it, - start_time: moment(it.start_time).format('YYYY-MM-DD') + start_time: dayjs(it.start_time).format('YYYY-MM-DD') }; }) ``` diff --git a/docs/build-apps/write-javascript/write-javascript-in.md b/docs/build-apps/write-javascript/write-javascript-in.md index 52f849185..be29611c6 100644 --- a/docs/build-apps/write-javascript/write-javascript-in.md +++ b/docs/build-apps/write-javascript/write-javascript-in.md @@ -43,7 +43,7 @@ Lowercase a string. Change date format. ```javascript -{{moment(table1.selectedRow.date_column).format('YYYY-MM-DD')}} +{{dayjs(table1.selectedRow.date_column).format('YYYY-MM-DD')}} ``` Return name from query results.