From cb132248c6b8891fb4d0679acaf8730767c677e9 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 17 Oct 2023 11:10:43 +0800
Subject: [PATCH] fix: type

---
 .../VFormDesign/components/ComponentProps.vue | 14 ++-
 .../components/FormItemColumnProps.vue        |  2 +-
 .../VFormDesign/components/FormItemProps.vue  |  3 +
 src/components/Scrollbar/src/util.ts          | 13 ++-
 .../SimpleMenu/src/components/Menu.vue        | 19 ++--
 .../SimpleMenu/src/components/SubMenuItem.vue |  2 +-
 src/components/Tree/src/types/tree.ts         |  2 +-
 src/hooks/web/useMessage.tsx                  | 14 +--
 .../header/components/notify/NoticeList.vue   |  7 +-
 src/logics/mitt/routeChange.ts                |  8 +-
 src/utils/mitt.ts                             | 96 ++++++++++++-------
 src/utils/types.ts                            | 23 +++++
 12 files changed, 134 insertions(+), 69 deletions(-)

diff --git a/src/components/FormDesign/src/components/VFormDesign/components/ComponentProps.vue b/src/components/FormDesign/src/components/VFormDesign/components/ComponentProps.vue
index 906b2b5..dda6ded 100644
--- a/src/components/FormDesign/src/components/VFormDesign/components/ComponentProps.vue
+++ b/src/components/FormDesign/src/components/VFormDesign/components/ComponentProps.vue
@@ -141,14 +141,18 @@ const linkOptions = computed(() => {
             <!--     处理数组属性，placeholder       -->
 
             <div v-if="item.children">
-              <component
-                v-bind="child.componentProps" :is="child.component" v-for="(child, index) of item.children"
-                :key="index" v-model:value="formConfig.currentItem.componentProps[item.name][index]"
-              />
+              <template v-for="(child, index) of item.children" :key="index">
+                <component
+                  v-bind="child.componentProps"
+                  :is="child.component"
+                  v-if="child.component"
+                  v-model:value="formConfig.currentItem.componentProps[item.name][index]"
+                />
+              </template>
             </div>
             <!--     如果不是数组，则正常处理属性值       -->
             <component
-              v-bind="item.componentProps" :is="item.component" v-else
+              v-bind="item.componentProps" :is="item.component" v-else-if="item.component"
               v-model:value="formConfig.currentItem.componentProps[item.name]" class="component-prop"
             />
           </FormItem>
diff --git a/src/components/FormDesign/src/components/VFormDesign/components/FormItemColumnProps.vue b/src/components/FormDesign/src/components/VFormDesign/components/FormItemColumnProps.vue
index fc6bcda..ccfeb7a 100644
--- a/src/components/FormDesign/src/components/VFormDesign/components/FormItemColumnProps.vue
+++ b/src/components/FormDesign/src/components/VFormDesign/components/FormItemColumnProps.vue
@@ -25,7 +25,7 @@ function showProps(exclude: string[] | undefined) {
         <div v-for="item of baseItemColumnProps" :key="item.name">
           <FormItem v-if="showProps(item.exclude)" :label="item.label">
             <component
-              v-bind="item.componentProps" :is="item.component" v-if="formConfig.currentItem.colProps"
+              v-bind="item.componentProps" :is="item.component" v-if="formConfig.currentItem.colProps && item.component"
               v-model:value="formConfig.currentItem.colProps[item.name]" class="component-props"
             />
           </FormItem>
diff --git a/src/components/FormDesign/src/components/VFormDesign/components/FormItemProps.vue b/src/components/FormDesign/src/components/VFormDesign/components/FormItemProps.vue
index 9c24cf6..9c6e92f 100644
--- a/src/components/FormDesign/src/components/VFormDesign/components/FormItemProps.vue
+++ b/src/components/FormDesign/src/components/VFormDesign/components/FormItemProps.vue
@@ -56,6 +56,7 @@ const controlPropsList = computed(() => {
             <component
               v-bind="item.componentProps"
               :is="item.component"
+              v-if="item.component"
               v-model:value="formConfig.currentItem[item.name]"
               class="component-props"
             />
@@ -66,6 +67,7 @@ const controlPropsList = computed(() => {
             <component
               v-bind="item.componentProps"
               :is="item.component"
+              v-if="item.component"
               v-model:value="formConfig.currentItem.itemProps[item.name]"
               class="component-props"
             />
@@ -75,6 +77,7 @@ const controlPropsList = computed(() => {
             <component
               v-bind="item.componentProps"
               :is="item.component"
+              v-if="item.component"
               v-model:value="formConfig.currentItem.itemProps[item.name].span"
               class="component-props"
             />
diff --git a/src/components/Scrollbar/src/util.ts b/src/components/Scrollbar/src/util.ts
index 65d6d98..198cff7 100644
--- a/src/components/Scrollbar/src/util.ts
+++ b/src/components/Scrollbar/src/util.ts
@@ -1,4 +1,5 @@
 import type { BarMap } from './types'
+import type { MergeAll } from '@/utils/types'
 
 export const BAR_MAP: BarMap = {
   vertical: {
@@ -39,8 +40,16 @@ function extend<T extends object, K extends object>(to: T, _from: K): T & K {
   return Object.assign(to as any, _from)
 }
 
-export function toObject<T extends object>(arr: Array<T>): Recordable<T> {
-  const res = {}
+/**
+ * [
+ *  { name: 'zhangsan', age: 18 },
+ *  { sex: 'male', age: 20 }
+ * ]
+ * =>
+ * { name: 'zhangsan', sex: 'male', age: 20 }
+ */
+export function toObject<T extends object[]>(arr: T): MergeAll<T> {
+  const res = {} as MergeAll<T>
   for (let i = 0; i < arr.length; i++) {
     if (arr[i])
       extend(res, arr[i])
diff --git a/src/components/SimpleMenu/src/components/Menu.vue b/src/components/SimpleMenu/src/components/Menu.vue
index 884437d..19ed4d4 100644
--- a/src/components/SimpleMenu/src/components/Menu.vue
+++ b/src/components/SimpleMenu/src/components/Menu.vue
@@ -4,7 +4,7 @@ import type { SubMenuProvider } from './types'
 import { createSimpleRootMenuContext } from './useSimpleMenuContext'
 import { useDesign } from '@/hooks/web/useDesign'
 import { propTypes } from '@/utils/propTypes'
-import mitt from '@/utils/mitt'
+import { mitt } from '@/utils/mitt'
 
 // eslint-disable-next-line vue/no-reserved-component-names
 defineOptions({ name: 'Menu' })
@@ -28,11 +28,18 @@ const props = defineProps({
 })
 const emit = defineEmits(['select', 'open-change'])
 
-const rootMenuEmitter = mitt()
+const rootMenuEmitter = mitt<{
+  'on-update-opened': (string | number)[]
+  'on-menu-item-select': string | number
+  'open-name-change': {
+    name: string
+    opened: boolean
+  }
+}>()
 const instance = getCurrentInstance()
 
 const currentActiveName = ref<string | number>('')
-const openedNames = ref<string[]>([])
+const openedNames = ref<(string | number)[]>([])
 
 const { prefixCls } = useDesign('menu')
 
@@ -77,14 +84,14 @@ function updateOpened() {
   rootMenuEmitter.emit('on-update-opened', openedNames.value)
 }
 
-function addSubMenu(name: string) {
+function addSubMenu(name: string | number) {
   if (openedNames.value.includes(name))
     return
   openedNames.value.push(name)
   updateOpened()
 }
 
-function removeSubMenu(name: string) {
+function removeSubMenu(name: string | number) {
   openedNames.value = openedNames.value.filter(item => item !== name)
   updateOpened()
 }
@@ -115,7 +122,7 @@ provide<SubMenuProvider>(`subMenu:${instance?.uid}`, {
 onMounted(() => {
   openedNames.value = !props.collapse ? [...props.openNames] : []
   updateOpened()
-  rootMenuEmitter.on('on-menu-item-select', (name: string) => {
+  rootMenuEmitter.on('on-menu-item-select', (name: string | number) => {
     currentActiveName.value = name
 
     nextTick(() => {
diff --git a/src/components/SimpleMenu/src/components/SubMenuItem.vue b/src/components/SimpleMenu/src/components/SubMenuItem.vue
index 829b343..2e9891c 100644
--- a/src/components/SimpleMenu/src/components/SubMenuItem.vue
+++ b/src/components/SimpleMenu/src/components/SubMenuItem.vue
@@ -10,7 +10,7 @@ import { propTypes } from '@/utils/propTypes'
 import { CollapseTransition } from '@/components/Transition'
 import { Icon } from '@/components/Icon'
 import { isBoolean, isObject } from '@/utils/is'
-import mitt from '@/utils/mitt'
+import { mitt } from '@/utils/mitt'
 
 defineOptions({ name: 'SubMenu' })
 
diff --git a/src/components/Tree/src/types/tree.ts b/src/components/Tree/src/types/tree.ts
index 2ce00ef..d6f8bb1 100644
--- a/src/components/Tree/src/types/tree.ts
+++ b/src/components/Tree/src/types/tree.ts
@@ -37,7 +37,7 @@ export const treeProps = buildProps({
   },
 
   renderIcon: {
-    type: Function as PropType<(params: Recordable) => string>,
+    type: Function as PropType<(...params: any[]) => string>,
   },
 
   helpMessage: {
diff --git a/src/hooks/web/useMessage.tsx b/src/hooks/web/useMessage.tsx
index 0ce8cd9..6537343 100644
--- a/src/hooks/web/useMessage.tsx
+++ b/src/hooks/web/useMessage.tsx
@@ -1,4 +1,4 @@
-import type { ModalFunc, ModalFuncProps } from 'ant-design-vue/lib/modal/Modal'
+import type { ModalFuncProps } from 'ant-design-vue/lib/modal/Modal'
 
 import { message as Message, Modal, notification } from 'ant-design-vue'
 import { CheckCircleFilled, CloseCircleFilled, InfoCircleFilled } from '@ant-design/icons-vue'
@@ -26,14 +26,6 @@ export interface ModalOptionsEx extends Omit<ModalFuncProps, 'iconType'> {
 }
 export type ModalOptionsPartial = Partial<ModalOptionsEx> & Pick<ModalOptionsEx, 'content'>
 
-interface ConfirmOptions {
-  info: ModalFunc
-  success: ModalFunc
-  error: ModalFunc
-  warn: ModalFunc
-  warning: ModalFunc
-}
-
 function getIcon(iconType: string) {
   if (iconType === 'warning')
     return <InfoCircleFilled class="modal-icon-warning" />
@@ -55,7 +47,7 @@ function renderContent({ content }: Pick<ModalOptionsEx, 'content'>) {
 /**
  * @description: Create confirmation box
  */
-function createConfirm(options: ModalOptionsEx): ConfirmOptions {
+function createConfirm(options: ModalOptionsEx) {
   const iconType = options.iconType || 'warning'
   Reflect.deleteProperty(options, 'iconType')
   const opt: ModalFuncProps = {
@@ -64,7 +56,7 @@ function createConfirm(options: ModalOptionsEx): ConfirmOptions {
     ...options,
     content: renderContent(options),
   }
-  return Modal.confirm(opt) as unknown as ConfirmOptions
+  return Modal.confirm(opt)
 }
 
 function getBaseOptions() {
diff --git a/src/layouts/default/header/components/notify/NoticeList.vue b/src/layouts/default/header/components/notify/NoticeList.vue
index 5b4884d..024c98c 100644
--- a/src/layouts/default/header/components/notify/NoticeList.vue
+++ b/src/layouts/default/header/components/notify/NoticeList.vue
@@ -47,10 +47,13 @@ watch(
 const isTitleClickable = computed(() => !!props.onTitleClick)
 const getPagination = computed(() => {
   const { list, pageSize } = props
-  if (isNumber(pageSize) && pageSize > 0 && list && list.length > pageSize) {
+  // compatible line 104
+  // if typeof pageSize is boolean, Number(true) && 5 = 5, Number(false) && 5 = 0
+  const size = isNumber(pageSize) ? pageSize : Number(pageSize) && 5
+  if (size > 0 && list && list.length > size) {
     return {
       total: list.length,
-      pageSize,
+      pageSize: size,
       // size: 'small',
       current: unref(current),
       onChange(page) {
diff --git a/src/logics/mitt/routeChange.ts b/src/logics/mitt/routeChange.ts
index 691856b..b1d25ed 100644
--- a/src/logics/mitt/routeChange.ts
+++ b/src/logics/mitt/routeChange.ts
@@ -3,13 +3,15 @@
  */
 
 import type { RouteLocationNormalized } from 'vue-router'
-import mitt from '@/utils/mitt'
+import { mitt } from '@/utils/mitt'
 import { getRawRoute } from '@/utils'
 
-const emitter = mitt()
-
 const key = Symbol('route-change')
 
+const emitter = mitt<{
+  [key]: RouteLocationNormalized
+}>()
+
 let lastChangeTab: RouteLocationNormalized
 
 export function setRouteChange(lastChangeRoute: RouteLocationNormalized) {
diff --git a/src/utils/mitt.ts b/src/utils/mitt.ts
index ba36be8..67d3e49 100644
--- a/src/utils/mitt.ts
+++ b/src/utils/mitt.ts
@@ -1,34 +1,38 @@
-/* eslint-disable array-callback-return */
 /**
  * copy to https://github.com/developit/mitt
  * Expand clear method
  */
-
 export type EventType = string | symbol
 
 // An event handler can take an optional event argument
 // and should not return a value
-export type Handler<T = any> = (event?: T) => void
-export type WildcardHandler = (type: EventType, event?: any) => void
+export type Handler<T = unknown> = (event: T) => void
+export type WildcardHandler<T = Record<string, unknown>> = (
+  type: keyof T,
+  event: T[keyof T],
+) => void
 
 // An array of all currently registered event handlers for a type
-export type EventHandlerList = Array<Handler>
-export type WildCardEventHandlerList = Array<WildcardHandler>
+export type EventHandlerList<T = unknown> = Array<Handler<T>>
+export type WildCardEventHandlerList<T = Record<string, unknown>> = Array<WildcardHandler<T>>
 
 // A map of event types and their corresponding event handlers.
-export type EventHandlerMap = Map<EventType, EventHandlerList | WildCardEventHandlerList>
+export type EventHandlerMap<Events extends Record<EventType, unknown>> = Map<
+  keyof Events | '*',
+  EventHandlerList<Events[keyof Events]> | WildCardEventHandlerList<Events>
+>
 
-export interface Emitter {
-  all: EventHandlerMap
+export interface Emitter<Events extends Record<EventType, unknown>> {
+  all: EventHandlerMap<Events>
 
-  on<T = any>(type: EventType, handler: Handler<T>): void
-  on(type: '*', handler: WildcardHandler): void
+  on<Key extends keyof Events>(type: Key, handler: Handler<Events[Key]>): void
+  on(type: '*', handler: WildcardHandler<Events>): void
 
-  off<T = any>(type: EventType, handler: Handler<T>): void
-  off(type: '*', handler: WildcardHandler): void
+  off<Key extends keyof Events>(type: Key, handler?: Handler<Events[Key]>): void
+  off(type: '*', handler: WildcardHandler<Events>): void
 
-  emit<T = any>(type: EventType, event?: T): void
-  emit(type: '*', event?: any): void
+  emit<Key extends keyof Events>(type: Key, event: Events[Key]): void
+  emit<Key extends keyof Events>(type: undefined extends Events[Key] ? Key : never): void
   clear(): void
 }
 
@@ -37,7 +41,10 @@ export interface Emitter {
  * @name mitt
  * @returns {Mitt}
  */
-export default function mitt(all?: EventHandlerMap): Emitter {
+export function mitt<Events extends Record<EventType, unknown>>(
+  all?: EventHandlerMap<Events>,
+): Emitter<Events> {
+  type GenericEventHandler = Handler<Events[keyof Events]> | WildcardHandler<Events>
   all = all || new Map()
 
   return {
@@ -48,46 +55,61 @@ export default function mitt(all?: EventHandlerMap): Emitter {
 
     /**
      * Register an event handler for the given type.
-     * @param {string|symbol} type Type of event to listen for, or `"*"` for all events
+     * @param {string|symbol} type Type of event to listen for, or `'*'` for all events
      * @param {Function} handler Function to call in response to given event
      * @memberOf mitt
      */
-    on<T = any>(type: EventType, handler: Handler<T>) {
-      const handlers = all?.get(type)
-      const added = handlers && handlers.push(handler)
-      if (!added)
-        all?.set(type, [handler])
+    on<Key extends keyof Events>(type: Key, handler: GenericEventHandler) {
+      const handlers: Array<GenericEventHandler> | undefined = all!.get(type)
+      if (handlers)
+        handlers.push(handler)
+
+      else
+        all!.set(type, [handler] as EventHandlerList<Events[keyof Events]>)
     },
 
     /**
      * Remove an event handler for the given type.
-     * @param {string|symbol} type Type of event to unregister `handler` from, or `"*"`
-     * @param {Function} handler Handler function to remove
+     * If `handler` is omitted, all handlers of the given type are removed.
+     * @param {string|symbol} type Type of event to unregister `handler` from (`'*'` to remove a wildcard handler)
+     * @param {Function} [handler] Handler function to remove
      * @memberOf mitt
      */
-    off<T = any>(type: EventType, handler: Handler<T>) {
-      const handlers = all?.get(type)
-      if (handlers)
-        handlers.splice(handlers.indexOf(handler) >>> 0, 1)
+    off<Key extends keyof Events>(type: Key, handler?: GenericEventHandler) {
+      const handlers: Array<GenericEventHandler> | undefined = all!.get(type)
+      if (handlers) {
+        if (handler)
+          handlers.splice(handlers.indexOf(handler) >>> 0, 1)
+
+        else
+          all!.set(type, [])
+      }
     },
 
     /**
      * Invoke all handlers for the given type.
-     * If present, `"*"` handlers are invoked after type-matched handlers.
+     * If present, `'*'` handlers are invoked after type-matched handlers.
      *
-     * Note: Manually firing "*" handlers is not supported.
+     * Note: Manually firing '*' handlers is not supported.
      *
      * @param {string|symbol} type The event type to invoke
      * @param {Any} [evt] Any value (object is recommended and powerful), passed to each handler
      * @memberOf mitt
      */
-    emit<T = any>(type: EventType, evt: T) {
-      ;((all?.get(type) || []) as EventHandlerList).slice().map((handler) => {
-        handler(evt)
-      })
-      ;((all?.get('*') || [])).slice().map((handler) => {
-        handler(type, evt)
-      })
+    emit<Key extends keyof Events>(type: Key, evt?: Events[Key]) {
+      let handlers = all!.get(type)
+      if (handlers) {
+        (handlers as EventHandlerList<Events[keyof Events]>).slice().forEach((handler) => {
+          handler(evt as Events[Key])
+        })
+      }
+
+      handlers = all!.get('*')
+      if (handlers) {
+        (handlers as WildCardEventHandlerList<Events>).slice().forEach((handler) => {
+          handler(type, evt as Events[Key])
+        })
+      }
     },
 
     /**
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 1155a5c..1b6d6d7 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -39,3 +39,26 @@ export type ComponentSize = 'large' | 'medium' | 'small' | 'mini'
 export type StyleValue = string | CSSProperties | Array<StyleValue>
 
 export type Mutable<T> = { -readonly [P in keyof T]: T[P] }
+
+type Merge<O extends object, T extends object> = {
+  [K in keyof O | keyof T]: K extends keyof T ? T[K] : K extends keyof O ? O[K] : never;
+}
+
+/**
+ * T = [
+ *  { name: string; age: number; },
+ *  { sex: 'male' | 'female'; age: string }
+ * ]
+ * =>
+ * MergeAll<T> = {
+ *  name: string;
+ *  sex: 'male' | 'female';
+ *  age: string
+ * }
+ */
+export type MergeAll<T extends object[], R extends object = object> = T extends [
+  infer F extends object,
+  ...infer Rest extends object[],
+]
+  ? MergeAll<Rest, Merge<R, F>>
+  : R