fix: 时间控件格式移除插件属性value-format="x"

2025-04-29 20:28:10 +08:00
parent 0085310518
commit f0fd698bec
9 changed files with 245 additions and 192 deletions
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -20,6 +20,7 @@ import { parseDateToStr } from '@/utils/date-utils';
 import useDictStore from '@/store/modules/dict';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
+import type { Dayjs } from 'dayjs';
 const { t } = useI18n();
 const { getDict } = useDictStore();

@@ -32,7 +33,7 @@ let dict: {
 });

 /**开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);

 /**查询参数 */
 let queryParams = reactive({
@@ -43,9 +44,9 @@ let queryParams = reactive({
  /**系统内置 */
  configType: undefined,
  /**记录开始时间 */
-  beginTime: '',
+  beginTime: undefined as number | undefined,
  /**记录结束时间 */
-  endTime: '',
+  endTime: undefined as number | undefined,
  /**当前页数 */
  pageNum: 1,
  /**每页条数 */
@@ -58,12 +59,12 @@ function fnQueryReset() {
    configName: '',
    configKey: '',
    configType: undefined,
-    beginTime: '',
-    endTime: '',
+    beginTime: undefined,
+    endTime: undefined,
    pageNum: 1,
    pageSize: 20,
  });
-  queryRangePicker.value = ['', ''];
+  queryRangePicker.value = undefined;
  tablePagination.current = 1;
  tablePagination.pageSize = 20;
  fnGetList();
@@ -439,13 +440,21 @@ function fnGetList(pageNum?: number) {
  if (pageNum) {
    queryParams.pageNum = pageNum;
  }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
  }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
+
  listConfig(toRaw(queryParams)).then(res => {
-     if (res.code === RESULT_CODE_SUCCESS) {
+    if (res.code === RESULT_CODE_SUCCESS) {
      // 取消勾选
      if (tableState.selectedRowKeys.length > 0) {
        tableState.selectedRowKeys = [];
@@ -533,12 +542,11 @@ onMounted(() => {
            >
              <a-range-picker
                v-model:value="queryRangePicker"
-                allow-clear
-                bordered
+                :bordered="true"
+                :allow-clear="true"
+                style="width: 100%"
                :show-time="{ format: 'HH:mm:ss' }"
                format="YYYY-MM-DD HH:mm:ss"
-                value-format="x"
-                style="width: 100%"
              ></a-range-picker>
            </a-form-item>
          </a-col>
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -22,6 +22,7 @@ import useDictStore from '@/store/modules/dict';
 import { MENU_PATH_INLINE } from '@/constants/menu-constants';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
+import type { Dayjs } from 'dayjs';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 const router = useRouter();
@@ -37,7 +38,7 @@ let dict: {
 });

 /**开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);

 /**查询参数 */
 let queryParams = reactive({
@@ -48,9 +49,9 @@ let queryParams = reactive({
  /**字典状态 */
  statusFlag: undefined,
  /**记录开始时间 */
-  beginTime: '',
+  beginTime: undefined as number | undefined,
  /**记录结束时间 */
-  endTime: '',
+  endTime: undefined as number | undefined,
  /**当前页数 */
  pageNum: 1,
  /**每页条数 */
@@ -63,12 +64,12 @@ function fnQueryReset() {
    dictName: '',
    dictType: '',
    statusFlag: undefined,
-    beginTime: '',
-    endTime: '',
+    beginTime: undefined,
+    endTime: undefined,
    pageNum: 1,
    pageSize: 20,
  });
-  queryRangePicker.value = ['', ''];
+  queryRangePicker.value = undefined;
  tablePagination.current = 1;
  tablePagination.pageSize = 20;
  fnGetList();
@@ -440,13 +441,19 @@ function fnGetList(pageNum?: number) {
  if (pageNum) {
    queryParams.pageNum = pageNum;
  }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
  }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
  listType(toRaw(queryParams)).then(res => {
-     if (res.code === RESULT_CODE_SUCCESS) {
+    if (res.code === RESULT_CODE_SUCCESS) {
      // 取消勾选
      if (tableState.selectedRowKeys.length > 0) {
        tableState.selectedRowKeys = [];
@@ -531,12 +538,11 @@ onMounted(() => {
            >
              <a-range-picker
                v-model:value="queryRangePicker"
-                allow-clear
-                bordered
+                :bordered="true"
+                :allow-clear="true"
+                style="width: 100%"
                :show-time="{ format: 'HH:mm:ss' }"
                format="YYYY-MM-DD HH:mm:ss"
-                value-format="x"
-                style="width: 100%"
              ></a-range-picker>
            </a-form-item>
          </a-col>
@@ -671,7 +677,10 @@ onMounted(() => {
      >
        <template #bodyCell="{ column, record }">
          <template v-if="column.key === 'statusFlag'">
-            <DictTag :options="dict.sysNormalDisable" :value="record.statusFlag" />
+            <DictTag
+              :options="dict.sysNormalDisable"
+              :value="record.statusFlag"
+            />
          </template>
          <template v-if="column.key === 'dictId'">
            <a-space :size="8" align="center">
@@ -741,7 +750,10 @@ onMounted(() => {
        <a-form-item :label="t('views.system.dict.dictType')" name="dictType">
          {{ modalState.from.dictType }}
        </a-form-item>
-        <a-form-item :label="t('views.system.dict.dictSatus')" name="statusFlag">
+        <a-form-item
+          :label="t('views.system.dict.dictSatus')"
+          name="statusFlag"
+        >
          <DictTag
            :options="dict.sysNormalDisable"
            :value="modalState.from.statusFlag"
@@ -801,7 +813,10 @@ onMounted(() => {
            allow-clear
          ></a-input>
        </a-form-item>
-        <a-form-item :label="t('views.system.dict.dictSatus')" name="statusFlag">
+        <a-form-item
+          :label="t('views.system.dict.dictSatus')"
+          name="statusFlag"
+        >
          <a-select
            v-model:value="modalState.from.statusFlag"
            default-value="0"
--- a/src/views/system/log/login/index.vue
+++ b/src/views/system/log/login/index.vue
@@ -17,6 +17,7 @@ import { parseDateToStr } from '@/utils/date-utils';
 import useDictStore from '@/store/modules/dict';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
+import type { Dayjs } from 'dayjs';
 const { t } = useI18n();
 const { getDict } = useDictStore();

@@ -29,7 +30,7 @@ let dict: {
 });

 /**开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);

 /**查询参数 */
 let queryParams = reactive({
@@ -39,10 +40,10 @@ let queryParams = reactive({
  userName: '',
  /**登录状态 */
  statusFlag: undefined,
-  /**开始时间 */
-  beginTime: '',
-  /**结束时间 */
-  endTime: '',
+  /**记录开始时间 */
+  beginTime: undefined as number | undefined,
+  /**记录结束时间 */
+  endTime: undefined as number | undefined,
  /**当前页数 */
  pageNum: 1,
  /**每页条数 */
@@ -55,12 +56,12 @@ function fnQueryReset() {
    loginIp: '',
    userName: '',
    statusFlag: undefined,
-    beginTime: '',
-    endTime: '',
+    beginTime: undefined,
+    endTime: undefined,
    pageNum: 1,
    pageSize: 20,
  });
-  queryRangePicker.value = ['', ''];
+  queryRangePicker.value = undefined;
  tablePagination.current = 1;
  tablePagination.pageSize = 20;
  fnGetList();
@@ -325,13 +326,21 @@ function fnGetList(pageNum?: number) {
  if (pageNum) {
    queryParams.pageNum = pageNum;
  }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
  }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
+
  listSysLogLogin(toRaw(queryParams)).then(res => {
-     if (res.code === RESULT_CODE_SUCCESS) {
+    if (res.code === RESULT_CODE_SUCCESS) {
      // 取消勾选
      if (tableState.selectedRowKeys.length > 0) {
        tableState.selectedRowKeys = [];
@@ -424,12 +433,11 @@ onMounted(() => {
            >
              <a-range-picker
                v-model:value="queryRangePicker"
-                allow-clear
-                bordered
+                :bordered="true"
+                :allow-clear="true"
+                style="width: 100%"
                :show-time="{ format: 'HH:mm:ss' }"
                format="YYYY-MM-DD HH:mm:ss"
-                value-format="x"
-                style="width: 100%"
              ></a-range-picker>
            </a-form-item>
          </a-col>
@@ -543,7 +551,10 @@ onMounted(() => {
      >
        <template #bodyCell="{ column, record }">
          <template v-if="column.key === 'statusFlag'">
-            <DictTag :options="dict.sysCommonStatus" :value="record.statusFlag" />
+            <DictTag
+              :options="dict.sysCommonStatus"
+              :value="record.statusFlag"
+            />
          </template>
        </template>
      </a-table>
--- a/src/views/system/log/operate/index.vue
+++ b/src/views/system/log/operate/index.vue
@@ -17,6 +17,7 @@ import { parseDateToStr } from '@/utils/date-utils';
 import useDictStore from '@/store/modules/dict';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
+import type { Dayjs } from 'dayjs';
 const { t } = useI18n();
 const { getDict } = useDictStore();

@@ -32,7 +33,7 @@ let dict: {
 });

 /**开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);

 /**查询参数 */
 let queryParams = reactive({
@@ -44,10 +45,10 @@ let queryParams = reactive({
  businessType: undefined,
  /**操作状态 */
  statusFlag: undefined,
-  /**开始时间 */
-  beginTime: '',
-  /**结束时间 */
-  endTime: '',
+  /**记录开始时间 */
+  beginTime: undefined as number | undefined,
+  /**记录结束时间 */
+  endTime: undefined as number | undefined,
  /**当前页数 */
  pageNum: 1,
  /**每页条数 */
@@ -61,12 +62,12 @@ function fnQueryReset() {
    operaBy: '',
    businessType: undefined,
    statusFlag: undefined,
-    beginTime: '',
-    endTime: '',
+    beginTime: undefined,
+    endTime: undefined,
    pageNum: 1,
    pageSize: 20,
  });
-  queryRangePicker.value = ['', ''];
+  queryRangePicker.value = undefined;
  tablePagination.current = 1;
  tablePagination.pageSize = 20;
  fnGetList();
@@ -349,11 +350,17 @@ function fnGetList(pageNum?: number) {
  if (pageNum) {
    queryParams.pageNum = pageNum;
  }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
  }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
  listSysLogOperate(toRaw(queryParams)).then(res => {
    if (res.code === RESULT_CODE_SUCCESS) {
      // 取消勾选
@@ -456,12 +463,11 @@ onMounted(() => {
            >
              <a-range-picker
                v-model:value="queryRangePicker"
-                allow-clear
-                bordered
+                :bordered="true"
+                :allow-clear="true"
+                style="width: 100%"
                :show-time="{ format: 'HH:mm:ss' }"
                format="YYYY-MM-DD HH:mm:ss"
-                value-format="x"
-                style="width: 100%"
              ></a-range-picker>
            </a-form-item>
          </a-col>
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -33,6 +33,7 @@ import { MENU_PATH_INLINE } from '@/constants/menu-constants';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
 import useUserStore from '@/store/modules/user';
+import type { Dayjs } from 'dayjs';
 const { t } = useI18n();
 const { getDict } = useDictStore();
 const userStore = useUserStore();
@@ -49,7 +50,7 @@ let dict: {
 });

 /**开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);

 /**查询参数 */
 let queryParams = reactive({
@@ -60,9 +61,9 @@ let queryParams = reactive({
  /**角色状态 */
  statusFlag: undefined,
  /**记录开始时间 */
-  beginTime: '',
+  beginTime: undefined as number | undefined,
  /**记录结束时间 */
-  endTime: '',
+  endTime: undefined as number | undefined,
  /**当前页数 */
  pageNum: 1,
  /**每页条数 */
@@ -75,12 +76,12 @@ function fnQueryReset() {
    roleName: '',
    roleKey: '',
    statusFlag: undefined,
-    beginTime: '',
-    endTime: '',
+    beginTime: undefined,
+    endTime: undefined,
    pageNum: 1,
    pageSize: 20,
  });
-  queryRangePicker.value = ['', ''];
+  queryRangePicker.value = undefined;
  tablePagination.current = 1;
  tablePagination.pageSize = 20;
  fnGetList();
@@ -728,11 +729,17 @@ function fnGetList(pageNum?: number) {
  if (pageNum) {
    queryParams.pageNum = pageNum;
  }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
  }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
  listRole(toRaw(queryParams)).then(res => {
    if (res.code === RESULT_CODE_SUCCESS) {
      // 取消勾选
@@ -816,12 +823,11 @@ onMounted(() => {
            >
              <a-range-picker
                v-model:value="queryRangePicker"
-                allow-clear
-                bordered
+                :bordered="true"
+                :allow-clear="true"
+                style="width: 100%"
                :show-time="{ format: 'HH:mm:ss' }"
                format="YYYY-MM-DD HH:mm:ss"
-                value-format="x"
-                style="width: 100%"
              ></a-range-picker>
            </a-form-item>
          </a-col>
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -35,6 +35,7 @@ import useUserStore from '@/store/modules/user';
 import { DataNode } from 'ant-design-vue/es/tree';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import { uploadFile } from '@/api/tool/file';
+import type { Dayjs } from 'dayjs';
 const { getDict } = useDictStore();
 const userStore = useUserStore();
 const { t } = useI18n();
@@ -51,7 +52,7 @@ let dict: {
 });

 /**开始结束时间 */
-let queryRangePicker = ref<[string, string]>(['', '']);
+let queryRangePicker = ref<[Dayjs, Dayjs] | undefined>(undefined);

 /**查询参数 */
 let queryParams = reactive({
@@ -64,9 +65,9 @@ let queryParams = reactive({
  /**用户状态 */
  statusFlag: undefined,
  /**记录开始时间 */
-  beginTime: '',
+  beginTime: undefined as number | undefined,
  /**记录结束时间 */
-  endTime: '',
+  endTime: undefined as number | undefined,
  /**当前页数 */
  pageNum: 1,
  /**每页条数 */
@@ -80,12 +81,12 @@ function fnQueryReset() {
    phone: '',
    deptId: undefined,
    statusFlag: undefined,
-    beginTime: '',
-    endTime: '',
+    beginTime: undefined,
+    endTime: undefined,
    pageNum: 1,
    pageSize: 20,
  });
-  queryRangePicker.value = ['', ''];
+  queryRangePicker.value = undefined;
  tablePagination.current = 1;
  tablePagination.pageSize = 20;
  fnGetList();
@@ -747,11 +748,19 @@ function fnGetList(pageNum?: number) {
  if (pageNum) {
    queryParams.pageNum = pageNum;
  }
-  if (!queryRangePicker.value) {
-    queryRangePicker.value = ['', ''];
+
+  // 时间范围
+  if (
+    Array.isArray(queryRangePicker.value) &&
+    queryRangePicker.value.length > 0
+  ) {
+    queryParams.beginTime = queryRangePicker.value[0].valueOf();
+    queryParams.endTime = queryRangePicker.value[1].valueOf();
+  } else {
+    queryParams.beginTime = undefined;
+    queryParams.endTime = undefined;
  }
-  queryParams.beginTime = queryRangePicker.value[0];
-  queryParams.endTime = queryRangePicker.value[1];
+
  listUser(toRaw(queryParams)).then(res => {
     if (res.code === RESULT_CODE_SUCCESS) {
      // 取消勾选
@@ -1059,7 +1068,10 @@ onMounted(() => {
                  <template #icon><FormOutlined /></template>
                </a-button>
              </a-tooltip>
-              <a-tooltip placement="topLeft" v-if="record.userId != userStore.userId">
+              <a-tooltip
+                placement="topLeft"
+                v-if="record.userId != userStore.userId"
+              >
                <template #title>{{ t('common.deleteText') }}</template>
                <a-button
                  type="link"
@@ -1069,7 +1081,10 @@ onMounted(() => {
                  <template #icon><DeleteOutlined /></template>
                </a-button>
              </a-tooltip>
-              <a-tooltip placement="topLeft" v-if="record.userId != userStore.userId">
+              <a-tooltip
+                placement="topLeft"
+                v-if="record.userId != userStore.userId"
+              >
                <template #title>
                  {{ t('views.system.user.resetPwd') }}
                </template>