@peng_kai/kit 0.3.0-beta.36 → 0.3.0-beta.38

package/admin/components/settings/src/SchemaForm.vue

@@ -5,6 +5,7 @@ import { computed, toRef } from 'vue';
 import dayjs from '../../../../libs/dayjs';
 import { type ItemSchema, useAntdForm } from '../../../../antd';
 import { PictureCardUpload } from '../../../components/upload';
+import InputNumberRange from '../../../../antd/components/InputNumberRange.vue';
 
 export interface IConfigDetail {
   category_id: number
@@ -43,6 +44,8 @@ export enum FormTypes {
   SINGLE_DATE_PICKER = 13,
   /** 日期范围选择器 */
   RANGE_DATE_PICKER = 14,
+  /** 数字范围输入框 */
+  NUMBER_RANGE = 15,
 }
 
 const antdPropsResolvers: Record<number, (config: IConfigDetail) => IConfigDetail> = {
@@ -122,6 +125,12 @@ const antdPropsResolvers: Record<number, (config: IConfigDetail) => IConfigDetai
 
     return config;
   },
+  [FormTypes.NUMBER_RANGE](config) {
+    config.value = config.value === '' ? undefined : config.value.split(',');
+    const [min, max] = config.options?.split(',') || [];
+    config.options = { min: Number(min), max: Number(max) };
+    return config;
+  },
 };
 
 const antdValueResolvers: Record<number, (value: any) => any> = {
@@ -154,6 +163,11 @@ const antdValueResolvers: Record<number, (value: any) => any> = {
 
     return value;
   },
+  [FormTypes.NUMBER_RANGE](value) {
+    if (Array.isArray(value))
+      return value.join(',');
+    return value;
+  },
 };
 </script>
 
@@ -291,6 +305,10 @@ defineExpose({ reset, validate });
             <RangePicker v-model:value="settingForm.state[item.key]" v-bind="item.options" />
           </slot>
 
+          <slot v-else-if="item.form_type === FormTypes.NUMBER_RANGE" :name="FormTypes.NUMBER_RANGE">
+            <InputNumberRange v-model:value="settingForm.state[item.key]" v-bind="item.options" />
+          </slot>
+
           <span v-else class="text-red">没有找到预设 form_type:{{ item.form_type }}，可以通过 {{ item.key }} 插槽自定义</span>
         </template>
       </FormItem>

package/admin/layout/large/Notice.vue

@@ -2,7 +2,7 @@
 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'
+import { watch, ref, computed, customRef } from 'vue'
 import dayjs from '../../../libs/dayjs';
 import { useRouter } from 'vue-router';
 import audioURL from './y682.mp3?url';
@@ -12,6 +12,14 @@ noticeAudio.muted = true;
 noticeAudio.src = audioURL;
 document.body.append(noticeAudio);
 
+export const audioMuted = customRef<boolean>((tracker) => ({
+  get: () => noticeAudio.muted,
+  set: (val) => {
+    noticeAudio.muted = val;
+    tracker();
+  }
+}));
+
 const faviconEle = document.querySelector('link[rel="icon"]');
 const logoFaviconHref = document.querySelector('link[rel="icon"]')?.getAttribute('href')!;
 const numCanvas = document.createElement('canvas') as (HTMLCanvasElement & { num: number, dataURL: string });
@@ -52,7 +60,8 @@ function operate(notice: TNotice) {
 //   num > oldNum && noticeAudio.play();
 // }, { immediate: true });
 useEventListener(document, 'click', () => {
-  noticeAudio.muted = false;
+  // noticeAudio.muted = false;
+  audioMuted.value = false;
 });
 
 useIntervalFn(() => {
@@ -100,7 +109,8 @@ useIntervalFn(() => {
         <i class="i-ri:notification-4-line block text-5" :class="{ shake: !!noticeNum }" />
       </div>
       <template #overlay>
-        <Menu v-if="noticeNum" @click="visible = false" class="max-h-100 overflow-y-auto">
+        <div v-if="noticeNum">
+        <Menu  @click="visible = false" class="max-h-100 overflow-y-auto">
           <MenuItem v-for="(item, i) of noticeList" :key="i" @click="operate(item)">
           <div class="min-w-50">
             <div>{{ item.title }}</div>
@@ -110,6 +120,9 @@ useIntervalFn(() => {
           </div>
           </MenuItem>
         </Menu>
+        123
+        </div>
+
         <div v-else class="h-40 min-w-50 flex items-center justify-center rounded-2 bg-$antd-colorBgElevated shadow"
           @click="visible = false">
           <Empty description="暂无通知" :image="Empty.PRESENTED_IMAGE_SIMPLE" />

package/package.json

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