From ee0432fc09f7ba98b503fd5d51196ef09f2052b1 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Tue, 27 Sep 2022 19:31:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=81=E5=AE=9A=E5=B1=8F=E5=B9=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=8A=A5=E9=94=99=20https://gitee.com/jeecg/jeecgboot?=
 =?UTF-8?q?-vue3/issues/I5TCGE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/default/header/components/lock/LockModal.vue | 1 +
 src/utils/dateUtil.ts                                    | 9 ++++-----
 src/views/sys/lock/useNow.ts                             | 9 +++------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/layouts/default/header/components/lock/LockModal.vue b/src/layouts/default/header/components/lock/LockModal.vue
index b2e4b0e..814fdfb 100644
--- a/src/layouts/default/header/components/lock/LockModal.vue
+++ b/src/layouts/default/header/components/lock/LockModal.vue
@@ -42,6 +42,7 @@
       const [register, { closeModal }] = useModalInner();
 
       const [registerForm, { validateFields, resetFields }] = useForm({
+        labelWidth: 100,
         showActionButtonGroup: false,
         schemas: [
           {
diff --git a/src/utils/dateUtil.ts b/src/utils/dateUtil.ts
index e027301..687eb25 100644
--- a/src/utils/dateUtil.ts
+++ b/src/utils/dateUtil.ts
@@ -3,15 +3,14 @@
  */
 import dayjs from 'dayjs';
 
-const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm';
-const DATE_FORMAT = 'YYYY-MM-DD ';
+const DATE_TIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+const DATE_FORMAT = 'YYYY-MM-DD';
 
-//TODO dayjs.ConfigType不知是否用对
-export function formatToDateTime(date: dayjs.ConfigType = undefined, format = DATE_TIME_FORMAT): string {
+export function formatToDateTime(date: dayjs.Dayjs | undefined = undefined, format = DATE_TIME_FORMAT): string {
   return dayjs(date).format(format);
 }
 
-export function formatToDate(date:  dayjs.ConfigType = undefined, format = DATE_FORMAT): string {
+export function formatToDate(date: dayjs.Dayjs | undefined = undefined, format = DATE_FORMAT): string {
   return dayjs(date).format(format);
 }
 
diff --git a/src/views/sys/lock/useNow.ts b/src/views/sys/lock/useNow.ts
index 2fac748..ee461fc 100644
--- a/src/views/sys/lock/useNow.ts
+++ b/src/views/sys/lock/useNow.ts
@@ -1,11 +1,8 @@
 import { dateUtil } from '/@/utils/dateUtil';
 import { reactive, toRefs } from 'vue';
-import { useLocaleStore } from '/@/store/modules/locale';
 import { tryOnMounted, tryOnUnmounted } from '@vueuse/core';
 
 export function useNow(immediate = true) {
-  const localeStore = useLocaleStore();
-  const localData = dateUtil.localeData(localeStore.getLocale);
   let timer: IntervalHandle;
 
   const state = reactive({
@@ -28,13 +25,13 @@ export function useNow(immediate = true) {
 
     state.year = now.get('y');
     state.month = now.get('M') + 1;
-    state.week = localData.weekdays()[now.day()];
-    state.day = now.get('D');
+    state.week = '星期' + ['日', '一', '二', '三', '四', '五', '六'][now.day()];
+    state.day = now.get('date');
     state.hour = h;
     state.minute = m;
     state.second = s;
 
-    state.meridiem = localData.meridiem(Number(h), Number(h), true);
+    state.meridiem = now.format('A');
   };
 
   function start() {