@whitesev/pops 2.6.0 → 3.0.0

package/dist/types/src/utils/PopsInstanceUtils.d.ts

@@ -1,12 +1,12 @@
-import type { PopsAlertDetails } from "../components/alert/types";
-import type { PopsConfirmDetails } from "../components/confirm/types";
-import type { PopsDrawerDetails } from "../components/drawer/types";
-import type { PopsFolderDetails } from "../components/folder/types";
-import type { PopsIframeDetails } from "../components/iframe/types";
-import type { PopsLoadingDetails } from "../components/loading/types";
-import type { PopsPanelDetails } from "../components/panel/types";
-import type { PopsPromptDetails } from "../components/prompt/types/index";
-import type { PopsInstCommonConfig } from "../types/inst";
+import type { PopsAlertConfig } from "../components/alert/types";
+import type { PopsConfirmConfig } from "../components/confirm/types";
+import type { PopsDrawerConfig } from "../components/drawer/types";
+import type { PopsFolderConfig } from "../components/folder/types";
+import type { PopsIframeConfig } from "../components/iframe/types";
+import type { PopsLoadingConfig } from "../components/loading/types";
+import type { PopsPanelConfig } from "../components/panel/types";
+import type { PopsPromptConfig } from "../components/prompt/types/index";
+import type { PopsInstGeneralConfig } from "../types/inst";
 import type { PopsInstStoreType } from "../types/main";
 export declare const PopsInstanceUtils: {
     /**
@@ -48,7 +48,7 @@ export declare const PopsInstanceUtils: {
      * @param  guid 唯一标识
      * @param isAll 是否全部删除
      */
-    removeInstance(instConfigList: PopsInstCommonConfig[][], guid: string, isAll?: boolean): PopsInstCommonConfig[][];
+    removeInstance(instConfigList: PopsInstGeneralConfig[][], guid: string, isAll?: boolean): PopsInstGeneralConfig[][];
     /**
      * 隐藏
      * @param popsType
@@ -58,7 +58,7 @@ export declare const PopsInstanceUtils: {
      * @param $anim
      * @param $mask
      */
-    hide(config: PopsAlertDetails | PopsDrawerDetails | PopsPromptDetails | PopsConfirmDetails | PopsIframeDetails | PopsLoadingDetails | PopsPanelDetails | PopsFolderDetails, popsType: PopsInstStoreType, instConfigList: PopsInstCommonConfig[], guid: string, $anim: HTMLElement, $mask?: HTMLElement): Promise<void>;
+    hide(config: PopsAlertConfig | PopsDrawerConfig | PopsPromptConfig | PopsConfirmConfig | PopsIframeConfig | PopsLoadingConfig | PopsPanelConfig | PopsFolderConfig, popsType: PopsInstStoreType, instConfigList: PopsInstGeneralConfig[], guid: string, $anim: HTMLElement, $mask?: HTMLElement): Promise<void>;
     /**
      * 显示
      * @param popsType
@@ -68,7 +68,7 @@ export declare const PopsInstanceUtils: {
      * @param $anim
      * @param $mask
      */
-    show(config: PopsAlertDetails | PopsDrawerDetails | PopsPromptDetails | PopsConfirmDetails | PopsIframeDetails | PopsLoadingDetails | PopsPanelDetails | PopsFolderDetails, popsType: PopsInstStoreType, instConfigList: PopsInstCommonConfig[], guid: string, $anim: HTMLElement, $mask?: HTMLElement): Promise<void>;
+    show(config: PopsAlertConfig | PopsDrawerConfig | PopsPromptConfig | PopsConfirmConfig | PopsIframeConfig | PopsLoadingConfig | PopsPanelConfig | PopsFolderConfig, popsType: PopsInstStoreType, instConfigList: PopsInstGeneralConfig[], guid: string, $anim: HTMLElement, $mask?: HTMLElement): Promise<void>;
     /**
      * 关闭
      * @param popsType
@@ -77,16 +77,16 @@ export declare const PopsInstanceUtils: {
      * @param config
      * @param $anim
      */
-    close(config: PopsAlertDetails | PopsDrawerDetails | PopsPromptDetails | PopsConfirmDetails | PopsIframeDetails | PopsLoadingDetails | PopsPanelDetails | PopsFolderDetails, popsType: string, instConfigList: PopsInstCommonConfig[], guid: string, $anim: HTMLElement): Promise<void>;
+    close(config: PopsAlertConfig | PopsDrawerConfig | PopsPromptConfig | PopsConfirmConfig | PopsIframeConfig | PopsLoadingConfig | PopsPanelConfig | PopsFolderConfig, popsType: string, instConfigList: PopsInstGeneralConfig[], guid: string, $anim: HTMLElement): Promise<void>;
     /**
      * 拖拽元素
      * 说明：
      * + 元素的position为absolute或者fixed
      * + 会为元素的
-     * @param moveElement 需要拖拽的元素
+     * @param $move 需要拖拽的元素
      * @param options 配置
      */
-    drag(moveElement: HTMLElement, options: {
+    drag($move: HTMLElement, options: {
         dragElement: HTMLElement;
         limit: boolean;
         triggerClick?: boolean;

package/dist/types/src/utils/PopsUtils.d.ts

@@ -134,6 +134,10 @@ declare class PopsUtils {
      * 配合 .setInterval 使用
      */
     clearInterval(timeId: number | undefined): void;
+    /**
+     * 覆盖对象中的数组新值
+     */
+    setArray<T>(target: T, key: keyof T, newArr: any[]): void;
 }
 declare const popsUtils: PopsUtils;
 export { popsUtils };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@whitesev/pops",
-  "version": "2.6.0",
-  "description": "弹窗库",
+  "version": "3.0.0",
+  "description": "弹窗库，包含了alert、confirm、prompt、drawer、loading、iframe、rightClickMenu等组件",
   "type": "module",
   "homepage": "https://github.com/WhiteSevs/TamperMonkeyScript/tree/master/lib/pops#readme",
   "bugs": {
@@ -44,22 +44,22 @@
     "worker-timers": "^8.0.25"
   },
   "devDependencies": {
-    "@eslint/js": "^9.38.0",
-    "@rollup/plugin-commonjs": "^28.0.8",
+    "@eslint/js": "^9.39.0",
+    "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "12.1.4",
-    "browserslist": "^4.26.3",
-    "caniuse-lite": "^1.0.30001751",
-    "eslint": "^9.38.0",
+    "@rollup/plugin-typescript": "12.3.0",
+    "browserslist": "^4.27.0",
+    "caniuse-lite": "^1.0.30001753",
+    "eslint": "^9.39.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-compat": "^6.0.2",
     "eslint-plugin-prettier": "^5.5.4",
-    "globals": "^16.4.0",
+    "globals": "^16.5.0",
     "rollup": "^4.52.5",
     "rollup-plugin-clear": "^2.0.7",
-    "rollup-plugin-import-css": "^4.0.2",
+    "rollup-plugin-import-css": "^4.1.1",
     "tslib": "^2.8.1",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.46.2"

package/src/Pops.ts

@@ -1,26 +1,26 @@
 import { PopsAlert } from "./components/alert";
-import type { PopsAlertDetails } from "./components/alert/types";
+import type { PopsAlertConfig } from "./components/alert/types";
 import { PopsConfirm } from "./components/confirm";
-import type { PopsConfirmDetails } from "./components/confirm/types";
+import type { PopsConfirmConfig } from "./components/confirm/types";
 import { PopsDrawer } from "./components/drawer";
-import type { PopsDrawerDetails } from "./components/drawer/types";
+import type { PopsDrawerConfig } from "./components/drawer/types";
 import { PopsFolder } from "./components/folder";
-import type { PopsFolderDetails } from "./components/folder/types";
+import type { PopsFolderConfig } from "./components/folder/types";
 import { PopsIframe } from "./components/iframe";
-import type { PopsIframeDetails } from "./components/iframe/types";
+import type { PopsIframeConfig } from "./components/iframe/types";
 import { PopsLoading } from "./components/loading";
-import type { PopsLoadingDetails } from "./components/loading/types";
+import type { PopsLoadingConfig } from "./components/loading/types";
 import { PopsPanel } from "./components/panel";
 import { PanelHandlerComponents } from "./components/panel/handlerComponents";
-import type { PopsPanelDetails } from "./components/panel/types";
+import type { PopsPanelConfig } from "./components/panel/types";
 import { PopsPrompt } from "./components/prompt";
-import type { PopsPromptDetails } from "./components/prompt/types/index";
+import type { PopsPromptConfig } from "./components/prompt/types/index";
 import { PopsRightClickMenu } from "./components/rightClickMenu";
-import type { PopsRightClickMenuDetails } from "./components/rightClickMenu/types";
+import type { PopsRightClickMenuConfig } from "./components/rightClickMenu/types";
 import { PopsSearchSuggestion } from "./components/searchSuggestion";
-import type { PopsSearchSuggestionDetails } from "./components/searchSuggestion/types/index";
+import type { PopsSearchSuggestionConfig } from "./components/searchSuggestion/types/index";
 import { PopsTooltip } from "./components/tooltip";
-import type { PopsToolTipDetails } from "./components/tooltip/types/index";
+import type { PopsToolTipConfig } from "./components/tooltip/types/index";
 import { GlobalConfig } from "./config/GlobalConfig";
 import { PopsAnimation } from "./PopsAnimation";
 import { PopsCore } from "./PopsCore";
@@ -90,91 +90,91 @@ class Pops {
   GlobalConfig = GlobalConfig;
   /**
    * 普通信息框
-   * @param details 配置
+   * @param config 配置
    */
-  alert = (details: PopsAlertDetails) => {
-    const dialog = PopsAlert.init(details);
+  alert = (config: PopsAlertConfig) => {
+    const dialog = PopsAlert.init(config);
     return dialog;
   };
 
   /**
    * 询问框
-   * @param details 配置
+   * @param config 配置
    */
-  confirm = (details: PopsConfirmDetails) => {
-    const dialog = PopsConfirm.init(details);
+  confirm = (config: PopsConfirmConfig) => {
+    const dialog = PopsConfirm.init(config);
     return dialog;
   };
 
   /**
    * 输入框
-   * @param details 配置
+   * @param config 配置
    */
-  prompt = (details: PopsPromptDetails) => {
-    const dialog = PopsPrompt.init(details);
+  prompt = (config: PopsPromptConfig) => {
+    const dialog = PopsPrompt.init(config);
     return dialog;
   };
 
   /**
    * 加载层
-   * @param details 配置
+   * @param config 配置
    */
-  loading = (details: PopsLoadingDetails) => {
-    const popsLoading = PopsLoading.init(details);
+  loading = (config: PopsLoadingConfig) => {
+    const popsLoading = PopsLoading.init(config);
     return popsLoading;
   };
 
   /**
    * iframe层
-   * @param details 配置
+   * @param config 配置
    */
-  iframe = (details: PopsIframeDetails) => {
-    const dialog = PopsIframe.init(details);
+  iframe = (config: PopsIframeConfig) => {
+    const dialog = PopsIframe.init(config);
     return dialog;
   };
 
   /**
    * 提示框
-   * @param details 配置
+   * @param config 配置
    */
-  tooltip = (details: PopsToolTipDetails) => {
-    const popsTooltip = PopsTooltip.init(details);
+  tooltip = (config: PopsToolTipConfig) => {
+    const popsTooltip = PopsTooltip.init(config);
     return popsTooltip;
   };
 
   /**
    * 抽屉
-   * @param details 配置
+   * @param config 配置
    */
-  drawer = (details: PopsDrawerDetails) => {
-    const dialog = PopsDrawer.init(details);
+  drawer = (config: PopsDrawerConfig) => {
+    const dialog = PopsDrawer.init(config);
     return dialog;
   };
 
   /**
    * 文件夹
-   * @param details 配置
+   * @param config 配置
    */
-  folder = (details: PopsFolderDetails) => {
-    const dialog = PopsFolder.init(details);
+  folder = (config: PopsFolderConfig) => {
+    const dialog = PopsFolder.init(config);
     return dialog;
   };
 
   /**
    * 配置面板
-   * @param details 配置
+   * @param config 配置
    */
-  panel = (details: PopsPanelDetails) => {
-    const dialog = PopsPanel.init(details);
+  panel = (config: PopsPanelConfig) => {
+    const dialog = PopsPanel.init(config);
     return dialog;
   };
 
   /**
    * 右键菜单
-   * @param details 配置
+   * @param config 配置
    */
-  rightClickMenu = (details: PopsRightClickMenuDetails) => {
-    const popsRightClickMenu = PopsRightClickMenu.init(details);
+  rightClickMenu = (config: PopsRightClickMenuConfig) => {
+    const popsRightClickMenu = PopsRightClickMenu.init(config);
     return popsRightClickMenu;
   };
 
@@ -182,7 +182,7 @@ class Pops {
    * 搜索建议
    *
    * 注意：调用后需要主动调用.init()和.setAllEvent()进行初始化
-   * @param details 配置
+   * @param config 配置
    * @example
    * let $input = document.querySelector("#input");
    * let searchSuggestion = pops.searchSuggestion({
@@ -195,8 +195,8 @@ class Pops {
    * searchSuggestion.init();
    * searchSuggestion.setAllEvent();
    */
-  searchSuggestion = <T = any>(details: PopsSearchSuggestionDetails<T>) => {
-    const popsSearchSuggestion = PopsSearchSuggestion.init<T>(details);
+  searchSuggestion = <T = any>(config: PopsSearchSuggestionConfig<T>) => {
+    const popsSearchSuggestion = PopsSearchSuggestion.init<T>(config);
     return popsSearchSuggestion;
   };
 }

package/src/PopsAnimation.ts

@@ -11,7 +11,7 @@ export const PopsAnimation = {
   init() {
     if (!this.$flag.isInit) {
       this.$flag.isInit = true;
-      /* 处理获取当前所有的动画名 */
+      // 处理获取当前所有的动画名
       const $style = popsDOMUtils.createElement("style", {
         innerHTML: PopsCSS.anim,
       });

package/src/PopsInst.ts

@@ -1,11 +1,11 @@
-import type { PopsInstCommonConfig } from "./types/inst";
+import type { PopsInstGeneralConfig } from "./types/inst";
 import type { PopsInstStoreType } from "./types/main";
 
 /**
  * 弹窗实例数据
  */
 export const PopsInstData: {
-  [key in PopsInstStoreType]: PopsInstCommonConfig[];
+  [key in PopsInstStoreType]: PopsInstGeneralConfig[];
 } = {
   alert: [],
   confirm: [],

package/src/components/alert/{config.ts → defaultConfig.ts}

@@ -1,6 +1,6 @@
-import type { PopsAlertDetails } from "./types";
+import type { PopsAlertConfig } from "./types";
 
-export const PopsAlertConfig = (): DeepRequired<PopsAlertDetails> => {
+export const PopsAlertDefaultConfig = (): DeepRequired<PopsAlertConfig> => {
   return {
     title: {
       text: "默认标题",
@@ -23,14 +23,14 @@ export const PopsAlertConfig = (): DeepRequired<PopsAlertDetails> => {
         iconIsLoading: false,
         text: "确定",
         type: "primary",
-        callback: function (details: any) {
-          details.close();
+        callback: function (eventConfig) {
+          eventConfig.close();
         },
       },
       close: {
         enable: true,
-        callback: function (details: any) {
-          details.close();
+        callback: function (eventConfig) {
+          eventConfig.close();
         },
       },
     },
@@ -58,5 +58,5 @@ export const PopsAlertConfig = (): DeepRequired<PopsAlertDetails> => {
     forbiddenScroll: false,
     style: null,
     beforeAppendToPageCallBack() {},
-  } as DeepRequired<PopsAlertDetails>;
+  } as DeepRequired<PopsAlertConfig>;
 };

package/src/components/alert/index.ts

@@ -4,19 +4,20 @@ import { PopsHandler } from "../../handler/PopsHandler";
 import { popsDOMUtils } from "../../utils/PopsDOMUtils";
 import { PopsInstanceUtils } from "../../utils/PopsInstanceUtils";
 import { popsUtils } from "../../utils/PopsUtils";
-import { PopsAlertConfig } from "./config";
+import { PopsAlertDefaultConfig } from "./defaultConfig";
 import type { PopsType } from "../../types/main";
-import type { PopsAlertDetails } from "./types";
+import type { PopsAlertConfig } from "./types";
 import { PopsCSS } from "../../PopsCSS";
 
 export const PopsAlert = {
-  init(details: PopsAlertDetails) {
+  init(__config__: PopsAlertConfig) {
     const guid = popsUtils.getRandomGUID();
     // 设置当前类型
     const popsType: PopsType = "alert";
-    let config = PopsAlertConfig();
+
+    let config = PopsAlertDefaultConfig();
     config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
-    config = popsUtils.assign(config, details);
+    config = popsUtils.assign(config, __config__);
     config = PopsHandler.handleOnly(popsType, config);
 
     const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow(config);
@@ -93,7 +94,7 @@ export const PopsAlert = {
     /** 已创建的元素列表 */
     const $elList: HTMLElement[] = [$anim];
 
-    /* 遮罩层元素 */
+    // 遮罩层元素
 
     if (config.mask.enable) {
       const handleMask = PopsHandler.handleMask({
@@ -106,7 +107,7 @@ export const PopsAlert = {
       $mask = handleMask.maskElement;
       $elList.push($mask);
     }
-    /* 处理返回的配置 */
+    // 处理返回的配置
     const evtConfig = PopsHandler.handleEventConfig(
       config,
       guid,
@@ -117,12 +118,12 @@ export const PopsAlert = {
       $pops,
       $mask
     );
-    /* 为顶部右边的关闭按钮添加点击事件 */
+    // 为顶部右边的关闭按钮添加点击事件
     PopsHandler.handleClickEvent("close", $headerCloseBtn, evtConfig, config.btn.close?.callback);
-    /* 为底部ok按钮添加点击事件 */
+    // 为底部ok按钮添加点击事件
     PopsHandler.handleClickEvent("ok", btnOkElement, evtConfig, config.btn.ok?.callback);
 
-    /* 创建到页面中 */
+    // 创建到页面中
 
     popsDOMUtils.append($shadowRoot, $elList);
     if (typeof config.beforeAppendToPageCallBack === "function") {
@@ -134,19 +135,16 @@ export const PopsAlert = {
       // 添加遮罩层
       $anim.after($mask);
     }
-    /* 保存 */
+    // 保存
     PopsHandler.handlePush(popsType, {
       guid: guid,
-
-      animElement: $anim,
-
-      popsElement: $pops!,
-
-      maskElement: $mask!,
+      $anim: $anim,
+      $pops: $pops!,
+      $mask: $mask!,
       $shadowContainer: $shadowContainer,
       $shadowRoot: $shadowRoot,
     });
-    /* 拖拽 */
+    // 拖拽
     if (config.drag) {
       PopsInstanceUtils.drag($pops!, {
         dragElement: $title!,

package/src/components/alert/types/index.ts

@@ -2,15 +2,15 @@ import type {
   PopsTitleConfig,
   PopsContentConfig,
   PopsDragConfig,
-  PopsCommonConfig,
+  PopsGeneralConfig,
   PopsButtonConfig,
 } from "../../../types/components";
-import type { PopsButtonDetails, PopsButtonDetailsAnyType } from "../../../types/button";
+import type { PopsGlobalButtonConfig, PopsButtonConfigAnyType } from "../../../types/button";
 
 /**
  * pops.alert
  */
-export interface PopsAlertDetails extends PopsTitleConfig, PopsContentConfig, PopsDragConfig, PopsCommonConfig {
+export interface PopsAlertConfig extends PopsTitleConfig, PopsContentConfig, PopsDragConfig, PopsGeneralConfig {
   /**
    * 按钮配置
    */
@@ -18,6 +18,6 @@ export interface PopsAlertDetails extends PopsTitleConfig, PopsContentConfig, Po
     /**
      * 确定按钮
      */
-    ok?: Partial<PopsButtonDetails | PopsButtonDetailsAnyType>;
+    ok?: Partial<PopsGlobalButtonConfig | PopsButtonConfigAnyType>;
   };
 }

package/src/components/confirm/{config.ts → defaultConfig.ts}

@@ -1,6 +1,6 @@
-import type { PopsConfirmDetails } from "./types";
+import type { PopsConfirmConfig } from "./types";
 
-export const PopsConfirmConfig = (): DeepRequired<PopsConfirmDetails> => {
+export const PopsConfirmDefaultConfig = (): DeepRequired<PopsConfirmConfig> => {
   return {
     title: {
       text: "默认标题",
@@ -26,8 +26,8 @@ export const PopsConfirmConfig = (): DeepRequired<PopsConfirmDetails> => {
         iconIsLoading: false,
         text: "确定",
         type: "primary",
-        callback(detail: any) {
-          detail.close();
+        callback(eventConfig) {
+          eventConfig.close();
         },
       },
       cancel: {
@@ -38,8 +38,8 @@ export const PopsConfirmConfig = (): DeepRequired<PopsConfirmDetails> => {
         iconIsLoading: false,
         text: "关闭",
         type: "default",
-        callback(detail: any) {
-          detail.close();
+        callback(eventConfig) {
+          eventConfig.close();
         },
       },
       other: {
@@ -50,14 +50,14 @@ export const PopsConfirmConfig = (): DeepRequired<PopsConfirmDetails> => {
         iconIsLoading: false,
         text: "其它按钮",
         type: "default",
-        callback(detail: any) {
-          detail.close();
+        callback(eventConfig) {
+          eventConfig.close();
         },
       },
       close: {
         enable: true,
-        callback(detail: any) {
-          detail.close();
+        callback(eventConfig) {
+          eventConfig.close();
         },
       },
     },
@@ -86,5 +86,5 @@ export const PopsConfirmConfig = (): DeepRequired<PopsConfirmDetails> => {
 
     style: null,
     beforeAppendToPageCallBack() {},
-  } as DeepRequired<PopsConfirmDetails>;
+  } as DeepRequired<PopsConfirmConfig>;
 };

package/src/components/confirm/index.ts

@@ -6,17 +6,18 @@ import type { PopsType } from "../../types/main";
 import { popsDOMUtils } from "../../utils/PopsDOMUtils";
 import { PopsInstanceUtils } from "../../utils/PopsInstanceUtils";
 import { popsUtils } from "../../utils/PopsUtils";
-import { PopsConfirmConfig } from "./config";
-import type { PopsConfirmDetails } from "./types";
+import { PopsConfirmDefaultConfig } from "./defaultConfig";
+import type { PopsConfirmConfig } from "./types";
 
 export const PopsConfirm = {
-  init(details: PopsConfirmDetails) {
+  init(__config__: PopsConfirmConfig) {
     const guid = popsUtils.getRandomGUID();
     // 设置当前类型
     const popsType: PopsType = "confirm";
-    let config = PopsConfirmConfig();
+
+    let config = PopsConfirmDefaultConfig();
     config = popsUtils.assign(config, GlobalConfig.getGlobalConfig());
-    config = popsUtils.assign(config, details);
+    config = popsUtils.assign(config, __config__);
     config = PopsHandler.handleOnly(popsType, config);
 
     const { $shadowContainer, $shadowRoot } = PopsHandler.handlerShadow(config);
@@ -127,7 +128,7 @@ export const PopsConfirm = {
     PopsHandler.handleClickEvent("cancel", $btnCancel, evtConfig, config.btn.cancel.callback);
     PopsHandler.handleClickEvent("other", $btnOther, evtConfig, config.btn.other.callback);
 
-    /* 创建到页面中 */
+    // 创建到页面中
 
     popsDOMUtils.append($shadowRoot, $elList);
     if (typeof config.beforeAppendToPageCallBack === "function") {
@@ -140,16 +141,13 @@ export const PopsConfirm = {
     }
     PopsHandler.handlePush(popsType, {
       guid: guid,
-
-      animElement: $anim,
-
-      popsElement: $pops!,
-
-      maskElement: $mask!,
+      $anim: $anim,
+      $pops: $pops!,
+      $mask: $mask!,
       $shadowContainer: $shadowContainer,
       $shadowRoot: $shadowRoot,
     });
-    /* 拖拽 */
+    // 拖拽
     if (config.drag) {
       PopsInstanceUtils.drag($pops!, {
         dragElement: $title!,

package/src/components/confirm/types/index.ts

@@ -2,16 +2,16 @@ import type {
   PopsTitleConfig,
   PopsContentConfig,
   PopsDragConfig,
-  PopsCommonConfig,
+  PopsGeneralConfig,
   PopsMoreButtonConfig,
 } from "../../../types/components";
 
 /**
  * pops.confirm
  */
-export interface PopsConfirmDetails
+export interface PopsConfirmConfig
   extends PopsTitleConfig,
     PopsContentConfig,
     PopsMoreButtonConfig,
     PopsDragConfig,
-    PopsCommonConfig {}
+    PopsGeneralConfig {}

package/src/components/drawer/{config.ts → defaultConfig.ts}

@@ -1,6 +1,6 @@
-import type { PopsDrawerDetails } from "./types";
+import type { PopsDrawerConfig } from "./types";
 
-export const PopsDrawerConfig = (): DeepRequired<PopsDrawerDetails> => {
+export const PopsDrawerDefaultConfig = (): DeepRequired<PopsDrawerConfig> => {
   return {
     title: {
       enable: true,
@@ -27,8 +27,8 @@ export const PopsDrawerConfig = (): DeepRequired<PopsDrawerDetails> => {
         iconIsLoading: false,
         text: "确定",
         type: "primary",
-        callback(detail: any) {
-          detail.close();
+        callback(eventConfig) {
+          eventConfig.close();
         },
       },
       cancel: {
@@ -39,8 +39,8 @@ export const PopsDrawerConfig = (): DeepRequired<PopsDrawerDetails> => {
         iconIsLoading: false,
         text: "关闭",
         type: "default",
-        callback(detail: any) {
-          detail.close();
+        callback(eventConfig) {
+          eventConfig.close();
         },
       },
       other: {
@@ -51,14 +51,14 @@ export const PopsDrawerConfig = (): DeepRequired<PopsDrawerDetails> => {
         iconIsLoading: false,
         text: "其它按钮",
         type: "default",
-        callback(detail: any) {
-          detail.close();
+        callback(eventConfig) {
+          eventConfig.close();
         },
       },
       close: {
         enable: true,
-        callback(detail: any) {
-          detail.close();
+        callback(eventConfig) {
+          eventConfig.close();
         },
       },
     },