Merge remote-tracking branch 'origin/main' into lichang

src/App.vue

@@ -4,6 +4,7 @@ import { usePrimaryColor } from '@/hooks/useTheme';
 import zhCN from 'ant-design-vue/lib/locale/zh_CN';
 import enUS from 'ant-design-vue/lib/locale/en_US';
 import dayjs from 'dayjs';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
 import 'dayjs/locale/zh-cn';
 import { ref, watch } from 'vue';
 import useAppStore from '@/store/modules/app';
@@ -11,6 +12,7 @@ import useI18n from '@/hooks/useI18n';
 const { t, currentLocale } = useI18n();
 const appStore = useAppStore();
  
+dayjs.extend(advancedFormat)
 dayjs.locale('zh-cn'); // 默认中文
 usePrimaryColor(); // 载入用户自定义主题色
 

src/views/monitor/job/log.vue

@@ -470,7 +470,7 @@ onMounted(() => {
                 v-model:value="queryRangePicker"
                 allow-clear
                 bordered
-                value-format="YYYY-MM-DD"
+                value-format="x"
                 style="width: 100%"
               ></a-range-picker>
             </a-form-item>

src/views/system/config/index.vue

@@ -527,7 +527,7 @@ onMounted(() => {
                 v-model:value="queryRangePicker"
                 allow-clear
                 bordered
-                value-format="YYYY-MM-DD"
+                value-format="x"
                 style="width: 100%"
               ></a-range-picker>
             </a-form-item>

src/views/system/dict/index.vue

@@ -527,7 +527,7 @@ onMounted(() => {
                 v-model:value="queryRangePicker"
                 allow-clear
                 bordered
-                value-format="YYYY-MM-DD"
+                value-format="x"
                 style="width: 100%"
               ></a-range-picker>
             </a-form-item>

src/views/system/log/login/index.vue

@@ -429,7 +429,7 @@ onMounted(() => {
                 bordered
                 :show-time="{ format: 'HH:mm:ss' }"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="x"
                 style="width: 100%"
               ></a-range-picker>
             </a-form-item>

src/views/system/log/operate/index.vue

@@ -459,7 +459,7 @@ onMounted(() => {
                 bordered
                 :show-time="{ format: 'HH:mm:ss' }"
                 format="YYYY-MM-DD HH:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss"
+                value-format="x"
                 style="width: 100%"
               ></a-range-picker>
             </a-form-item>

src/views/system/role/index.vue

@@ -791,7 +791,7 @@ onMounted(() => {
                 v-model:value="queryRangePicker"
                 allow-clear
                 bordered
-                value-format="YYYY-MM-DD"
+                value-format="x"
                 style="width: 100%"
               ></a-range-picker>
             </a-form-item>

src/views/system/user/index.vue

@@ -877,7 +877,7 @@ onMounted(() => {
                 v-model:value="queryRangePicker"
                 allow-clear
                 bordered
-                value-format="YYYY-MM-DD"
+                value-format="x"
                 style="width: 100%"
               ></a-range-picker>
             </a-form-item>