@peng_kai/kit 0.3.0-beta.27 → 0.3.0-beta.29

package/admin/components/date/presetProps.ts

@@ -3,14 +3,14 @@ import dayjs, { type Dayjs } from '../../../libs/dayjs';
 import { type ComponentProps } from 'vue-component-type-helpers'
 
 export const  antdRangePickerPresets = [
-  { label: '今天', key: 'today', value: [dayjs().startOf('day'), dayjs().endOf('day')] },
-  { label: '昨天', key: 'yesterday', value: [dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day')] },
-  { label: '本月', key: 'thisMonth', value: [dayjs().startOf('month'), dayjs().endOf('month')] },
-  { label: '上个月', key: 'lastMonth', value: [dayjs().subtract(1, 'month').startOf('month'), dayjs().subtract(1, 'month').endOf('month')] },
-  { label: '近3个月', key: 'last3months', value: [dayjs().subtract(2, 'month').startOf('month'), dayjs().endOf('month')] },
-  { label: '近半年', key: 'last6months', value: [dayjs().subtract(5, 'month').startOf('month'), dayjs().endOf('month')] },
-  { label: '今年', key: 'thisMonth', value: [dayjs().startOf('year'), dayjs().endOf('month')] },
-] as { label: string; key: string; value: [Dayjs, Dayjs] }[]
+  { label: '今天', key: 'today', get value() {return [dayjs().startOf('day'), dayjs().endOf('day')] } },
+  { label: '昨天', key: 'yesterday', get value() { return [dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day')] } },
+  { label: '本月', key: 'thisMonth', get value() { return [dayjs().startOf('month'), dayjs().endOf('month')] } },
+  { label: '上个月', key: 'lastMonth', get value() { return [dayjs().subtract(1, 'month').startOf('month'), dayjs().subtract(1, 'month').endOf('month')] } },
+  { label: '近3个月', key: 'last3months', get value() { return [dayjs().subtract(2, 'month').startOf('month'), dayjs().endOf('month')] } },
+  { label: '近半年', key: 'last6months', get value() { return [dayjs().subtract(5, 'month').startOf('month'), dayjs().endOf('month')] } },
+  { label: '今年', key: 'thisYear', get value() { return [dayjs().startOf('year'), dayjs().endOf('month')] } },
+] as unknown as { label: string; key: string; value: [Dayjs, Dayjs] }[]
 
 export const antdRangePickerShowTimeProps: ComponentProps<typeof RangePicker> = {
   presets: antdRangePickerPresets,

package/admin/layout/large/Notice.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import { useIntervalFn } from '@vueuse/core';
+import { useEventListener, useIntervalFn } from '@vueuse/core';
 import { Empty, Dropdown, Badge, Menu, MenuItem } from 'ant-design-vue';
 import { type UseQueryReturnType } from '@tanstack/vue-query'
 import { watch, ref, computed } from 'vue'
@@ -8,6 +8,7 @@ import { useRouter } from 'vue-router';
 import audioURL from './y682.mp3?url';
 
 const noticeAudio = new Audio(audioURL);
+noticeAudio.muted = true;
 noticeAudio.src = audioURL;
 document.body.append(noticeAudio);
 
@@ -50,6 +51,9 @@ function operate(notice: TNotice) {
 // watch(noticeNum, (num = 0, oldNum = 0) => {
 //   num > oldNum && noticeAudio.play();
 // }, { immediate: true });
+useEventListener(document, 'click', () => {
+  noticeAudio.muted = false;
+});
 
 useIntervalFn(() => {
   const num = noticeNum.value;

package/antd/hooks/useAntdModal.ts

@@ -1,5 +1,5 @@
 import { Modal as AntModal } from 'ant-design-vue';
-import { tryOnBeforeUnmount } from '@vueuse/core';
+import { tryOnBeforeUnmount, tryOnMounted } from '@vueuse/core';
 import { createVNode, defineComponent, isProxy, onDeactivated, onMounted, reactive, toRef, toRefs } from 'vue';
 import type { Component } from 'vue';
 import type { ModalProps } from 'ant-design-vue';
@@ -128,7 +128,7 @@ export function useAntdModal<Comp extends Component>(
   (compProps as any).onConfirm = onConfirm;
 
   tryOnBeforeUnmount(_onClose);
-  onDeactivated(_onClose);
+  tryOnMounted(() => onDeactivated(_onClose));
 
   return {
     PresetComponent,

package/libs/dayjs.ts

@@ -12,7 +12,7 @@ import advancedFormat from 'dayjs/esm/plugin/advancedFormat';
 import customParseFormat from 'dayjs/esm/plugin/customParseFormat';
 import updateLocale from 'dayjs/esm/plugin/updateLocale';
 import isBetween from 'dayjs/esm/plugin/isBetween';
-import 'dayjs/esm/locale/zh';
+import 'dayjs/esm/locale/zh-cn';
 import 'dayjs/esm/locale/en';
 
 export type { Dayjs, PluginFunc, UnitType, UnitTypeLong, UnitTypeLongPlural, UnitTypeShort, QUnitType, ConfigType, ConfigTypeMap, OpUnitType, OptionType, ManipulateType } from 'dayjs';
@@ -30,4 +30,4 @@ dayjs.extend(advancedFormat);
 dayjs.extend(customParseFormat);
 dayjs.extend(updateLocale);
 dayjs.extend(isBetween);
-dayjs.locale('zh');
+dayjs.locale('zh-cn');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.3.0-beta.27",
+  "version": "0.3.0-beta.29",
   "description": "",
   "author": "",
   "license": "ISC",