Bladeren bron

锁定屏幕功能报错 https://gitee.com/jeecg/jeecgboot-vue3/issues/I5TCGE

zhangdaiscott 2 jaren geleden
bovenliggende
commit
ee0432fc09
3 gewijzigde bestanden met toevoegingen van 8 en 11 verwijderingen
  1. 1 0
      src/layouts/default/header/components/lock/LockModal.vue
  2. 4 5
      src/utils/dateUtil.ts
  3. 3 6
      src/views/sys/lock/useNow.ts

+ 1 - 0
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: [
           {

+ 4 - 5
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);
 }
 

+ 3 - 6
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() {