fix: 修复部分类型问题

FightingDesign · May 8, 2023 · 6081626 · 6081626
1 parent 64bebac
commit 6081626
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
 
+## 0.36.0 (2023-05-08)
+
 **优化**
 
 - 优化 `f-trigger` 和 `f-dropdown` 样式细节

diff --git a/packages/fighting-design/_hooks/use-global/index.ts b/packages/fighting-design/_hooks/use-global/index.ts
@@ -44,7 +44,7 @@ export interface UseGlobalReturn {
  * @param { Object } prop 组件的 prop
  * @returns { Object } 根据优先级返回需要的参数
  */
-export const useGlobal = (prop?: UseGlobalProp): UseGlobalReturn => {
+export const useGlobal = (prop?: Partial<UseGlobalProp>): UseGlobalReturn => {
   /** 获取全局配置组件注入的依赖项 */
   const global: FightingGlobalProps | null = inject(FIGHTING_GLOBAL_PROPS_KEY, null)
 

diff --git a/packages/fighting-design/time-picker/src/time-picker.vue b/packages/fighting-design/time-picker/src/time-picker.vue
@@ -46,7 +46,7 @@
    *
    * @param { boolean | 'now' } [target = true] 点击的是否为确定
    */
-  const onConfirm = (target: boolean | 'now' = true): void => {
+  const onConfirm = (evt: MouseEvent, target: boolean | 'now' = true): void => {
     /**
      * 如果为真说明点击的是确定按钮
      *
@@ -74,7 +74,7 @@
      * 如果非布尔值类型，咋代表点击的是当前时间，则不需要关闭
      */
     if (isBoolean(target)) {
-      ;(triggerInstance.value as TriggerInstance).handelClose()
+      (triggerInstance.value as TriggerInstance).handelClose(evt)
     }
   }
 
@@ -220,11 +220,11 @@
 
         <!-- 操作栏 -->
         <div class="f-time-picker__option">
-          <f-button size="mini" :on-click="() => onConfirm('now')">当前</f-button>
-          <f-button size="mini" :on-click="() => onConfirm(false)">取消</f-button>
-          <f-button type="primary" size="mini" :on-click="() => onConfirm(true)"
-            >确定</f-button
-          >
+          <f-button size="mini" :on-click="evt => onConfirm(evt, 'now')">当前</f-button>
+          <f-button size="mini" :on-click="evt => onConfirm(evt, false)">取消</f-button>
+          <f-button type="primary" size="mini" :on-click="evt => onConfirm(evt, true)">
+            确定
+          </f-button>
         </div>
       </template>
     </f-trigger>

diff --git a/packages/fighting-design/trigger/src/trigger.vue b/packages/fighting-design/trigger/src/trigger.vue
@@ -31,7 +31,7 @@
   })
 
   /** 向外导出关闭方法 */
-  defineExpose({ visible })
+  defineExpose({ handelClose })
 </script>
 
 <template>