comfy-tool 1.0.3 → 1.0.5

package/@types/components/global.d.ts

@@ -0,0 +1,3 @@
+import '../css/index.scss';
+import type { App } from 'vue';
+export default function useGlobalComponents(app: App): void;

package/@types/components/index.d.ts

@@ -1,3 +1,4 @@
-import type { App } from 'vue';
-import '../css/index.scss';
-export default function useGlobalComponents(app: App): void;
+export * from './layout/Column';
+export * from './layout/Row';
+export * from './layout/Expanded';
+export * from './utils/layer';

package/@types/components/layout/Column/Column.d.ts

@@ -0,0 +1,9 @@
+import './index.scss';
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    reverse: BooleanConstructor;
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    reverse: BooleanConstructor;
+}>> & Readonly<{}>, {
+    reverse: boolean;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+export default _default;

package/@types/components/layout/Column/index.d.ts

@@ -0,0 +1,14 @@
+import _Column from './Column';
+export declare const Column: import("../../../utils/app/component").WithInstall<import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    reverse: BooleanConstructor;
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    reverse: BooleanConstructor;
+}>> & Readonly<{}>, {
+    reverse: boolean;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
+export default Column;
+declare module 'vue' {
+    interface GlobalComponents {
+        column: typeof _Column;
+    }
+}

package/@types/components/layout/{Expended.vue.d.ts → Expanded/Expanded.d.ts}

@@ -1,14 +1,7 @@
+import './index.scss';
 import { PropType } from "vue";
-type _style = {
-    flex: string | number;
-    width?: string;
-    height?: string;
-    minWidth?: string;
-    minHeight?: string;
-    maxWidth?: string;
-    maxHeight?: string;
-};
 declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    /** 当需要设定宽高时可能需要设置为 `-`;需要撑满容器时设置为 `100%` */
     flex: {
         type: PropType<"-" | "100%" | number>;
         default: number;
@@ -18,13 +11,17 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     minWidth: (StringConstructor | NumberConstructor)[];
     minHeight: (StringConstructor | NumberConstructor)[];
     maxWidth: (StringConstructor | NumberConstructor)[];
+    /**
+     * @description 最大高度
+     * @default 'none'
+     */
     maxHeight: (StringConstructor | NumberConstructor)[];
+    /** 启用flexbox横向布局 */
     row: BooleanConstructor;
+    /** 启用flexbox纵向布局 */
     column: BooleanConstructor;
-}>, {
-    style: _style;
-    className: string[];
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    /** 当需要设定宽高时可能需要设置为 `-`;需要撑满容器时设置为 `100%` */
     flex: {
         type: PropType<"-" | "100%" | number>;
         default: number;
@@ -34,8 +31,14 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     minWidth: (StringConstructor | NumberConstructor)[];
     minHeight: (StringConstructor | NumberConstructor)[];
     maxWidth: (StringConstructor | NumberConstructor)[];
+    /**
+     * @description 最大高度
+     * @default 'none'
+     */
     maxHeight: (StringConstructor | NumberConstructor)[];
+    /** 启用flexbox横向布局 */
     row: BooleanConstructor;
+    /** 启用flexbox纵向布局 */
     column: BooleanConstructor;
 }>> & Readonly<{}>, {
     column: boolean;

package/@types/components/layout/Expanded/index.d.ts

@@ -0,0 +1,38 @@
+import _Expanded from './Expanded';
+export declare const Expanded: import("../../../utils/app/component").WithInstall<import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    flex: {
+        type: import("vue").PropType<"-" | "100%" | number>;
+        default: number;
+    };
+    width: (StringConstructor | NumberConstructor)[];
+    height: (StringConstructor | NumberConstructor)[];
+    minWidth: (StringConstructor | NumberConstructor)[];
+    minHeight: (StringConstructor | NumberConstructor)[];
+    maxWidth: (StringConstructor | NumberConstructor)[];
+    maxHeight: (StringConstructor | NumberConstructor)[];
+    row: BooleanConstructor;
+    column: BooleanConstructor;
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    flex: {
+        type: import("vue").PropType<"-" | "100%" | number>;
+        default: number;
+    };
+    width: (StringConstructor | NumberConstructor)[];
+    height: (StringConstructor | NumberConstructor)[];
+    minWidth: (StringConstructor | NumberConstructor)[];
+    minHeight: (StringConstructor | NumberConstructor)[];
+    maxWidth: (StringConstructor | NumberConstructor)[];
+    maxHeight: (StringConstructor | NumberConstructor)[];
+    row: BooleanConstructor;
+    column: BooleanConstructor;
+}>> & Readonly<{}>, {
+    column: boolean;
+    row: boolean;
+    flex: number | "-" | "100%";
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
+export default Expanded;
+declare module 'vue' {
+    interface GlobalComponents {
+        expanded: typeof _Expanded;
+    }
+}

package/@types/components/layout/Row/Row.d.ts

@@ -0,0 +1,9 @@
+import './index.scss';
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    reverse: BooleanConstructor;
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    reverse: BooleanConstructor;
+}>> & Readonly<{}>, {
+    reverse: boolean;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+export default _default;

package/@types/components/layout/Row/index.d.ts

@@ -0,0 +1,14 @@
+import _Row from './Row';
+export declare const Row: import("../../../utils/app/component").WithInstall<import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    reverse: BooleanConstructor;
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    reverse: BooleanConstructor;
+}>> & Readonly<{}>, {
+    reverse: boolean;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
+export default Row;
+declare module 'vue' {
+    interface GlobalComponents {
+        row: typeof _Row;
+    }
+}

package/@types/components/utils/layer/Component.d.ts

@@ -1,13 +1,12 @@
-import type { Ref, CSSProperties } from "vue";
+import type { Ref, CSSProperties, PropType } from "vue";
 import { LayerOptions } from "./layer";
-declare const VanDialog: VueComponentConstructor;
-type noReadonly<T> = {
-    -readonly [P in keyof T]: T[P];
-};
 type GetVueProps<T> = {
     [P in keyof T]: T[P] | Ref<T[P]>;
 };
-export type VueComponentConstructor = abstract new (...args: any) => any;
+type VueComponentConstructor = (abstract new (...args: any) => any);
+type GetComponentProps<C extends VueComponentConstructor> = GetVueProps<InstanceType<C>['$props']>;
+export type LayerComponent = VueComponentConstructor;
+export type LayerComponentProps<C extends VueComponentConstructor> = GetComponentProps<C>;
 export type LayerControler<T, C extends VueComponentConstructor, B extends VueComponentConstructor> = {
     init(options?: Partial<LayerState<C, B> & LayerOptions<T>>, _defaultOptions?: Partial<LayerState<C, B>>): void;
     open(options?: Partial<LayerState<C, B>>): void;
@@ -15,8 +14,9 @@ export type LayerControler<T, C extends VueComponentConstructor, B extends VueCo
     close(action?: 'complete' | 'cancel'): void;
     cancel(): void;
 };
-type ElDialogProps = noReadonly<GetVueProps<InstanceType<typeof VanDialog>['$props']>>;
-export interface LayerProps extends ElDialogProps {
+export interface LayerProps {
+    width?: string | number;
+    height?: string | number;
     class?: string;
     style?: CSSProperties;
     onClose?(action?: 'complete' | 'cancel'): void;
@@ -25,15 +25,25 @@ export interface LayerState<C extends VueComponentConstructor, B extends VueComp
     show: boolean;
     keepAlive: boolean;
     baseContent?: B;
-    baseContentProps?: GetVueProps<InstanceType<B>['$props']>;
+    baseContentProps?: GetComponentProps<B>;
     content: C;
-    contentProps?: GetVueProps<InstanceType<C>['$props']>;
+    contentProps?: GetComponentProps<C>;
 }
-declare const _default: import("vue").DefineComponent<{}, () => "" | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-    [key: string]: any;
-}>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "close" | "confirm")[], "cancel" | "close" | "confirm", import("vue").PublicProps, Readonly<{}> & Readonly<{
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
+    baseContent: {
+        type: PropType<VueComponentConstructor>;
+        default: null;
+    };
+}>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "close" | "confirm")[], "cancel" | "close" | "confirm", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+    baseContent: {
+        type: PropType<VueComponentConstructor>;
+        default: null;
+    };
+}>> & Readonly<{
     onCancel?: ((...args: any[]) => any) | undefined;
     onClose?: ((...args: any[]) => any) | undefined;
     onConfirm?: ((...args: any[]) => any) | undefined;
-}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+}>, {
+    baseContent: VueComponentConstructor;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/@types/components/utils/layer/index.d.ts

@@ -1,2 +1,2 @@
 export { Layer } from './layer';
-export type { LayerProps, LayerInstance, LayerOptions, LayerState, LayerControler, VueComponentConstructor } from './layer';
+export type { LayerProps, LayerInstance, LayerOptions, LayerState, LayerControler, LayerComponent, LayerComponentProps } from './layer';

package/@types/components/utils/layer/layer.d.ts

@@ -1,31 +1,24 @@
 import { PopupCreator, VueComponent } from '../../../plugins/PopupCreator';
-import { LayerState, LayerProps, VueComponentConstructor } from './Component';
-export type { LayerState, LayerProps, LayerControler, VueComponentConstructor } from './Component';
-export type LayerOptions<T = any, C extends VueComponentConstructor = any, B extends VueComponentConstructor = any> = Partial<LayerState<C, B>> & {
+import { LayerState, LayerProps, LayerComponent } from './Component';
+export type { LayerState, LayerProps, LayerControler, LayerComponent, LayerComponentProps } from './Component';
+export type LayerOptions<T = any, C extends LayerComponent = any, B extends LayerComponent = any> = Partial<LayerState<C, B>> & {
     onConfirm?: (data: T, close: (action?: 'complete' | 'cancel') => void) => void | boolean;
     onClose?(action?: 'complete' | 'cancel'): void;
 };
-export type LayerInstance<T, C extends VueComponentConstructor, B extends VueComponentConstructor> = _Layer<T, C, B>;
-declare class _Layer<T, C extends VueComponentConstructor, B extends VueComponentConstructor> extends PopupCreator<LayerProps, LayerState<C, B>> {
+export type LayerInstance<T, C extends LayerComponent, B extends LayerComponent> = _Layer<T, C, B>;
+declare class _Layer<T, C extends LayerComponent, B extends LayerComponent> extends PopupCreator<LayerProps, LayerState<C, B>> {
     constructor(component: VueComponent, props: Partial<LayerProps>);
     open(options: LayerOptions<T, C>): any;
-    static create<T, C extends VueComponentConstructor, B extends VueComponentConstructor>(props?: Partial<LayerProps>, isNew?: boolean): _Layer<T, C, B>;
+    static create<T, C extends LayerComponent, B extends LayerComponent>(props?: LayerOptions<T, C, B>, isNew?: boolean): _Layer<T, C, B>;
 }
-export declare function Layer<T, C extends VueComponentConstructor = any, B extends VueComponentConstructor = any>(options: RequiredOf<LayerOptions<T, C, B>, 'content'>, isNew?: boolean): Promise<T>;
+/**
+ * 创建并打开一个弹层组件
+ * @param options 图层配置选项，必须包含content属性
+ * @param isNew 是否为新弹层，默认为false
+ * @returns 返回一个Promise，成功时resolve弹层数据，失败时reject关闭操作
+ */
+export declare function Layer<T, C extends LayerComponent = any, B extends LayerComponent = any>(options: RequiredOf<LayerOptions<T, C, B>, 'content'>, isNew?: boolean): Promise<T>;
 export declare namespace Layer {
     var create: typeof _Layer.create;
     var close: () => void;
-    var Component: import("vue").DefineComponent<{}, () => "" | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-        [key: string]: any;
-    }>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "close" | "confirm")[], "cancel" | "close" | "confirm", import("vue").PublicProps, Readonly<{}> & Readonly<{
-        onCancel?: ((...args: any[]) => any) | undefined;
-        onClose?: ((...args: any[]) => any) | undefined;
-        onConfirm?: ((...args: any[]) => any) | undefined;
-    }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any> | import("../../../utils/app/component").WithInstall<import("vue").DefineComponent<{}, () => "" | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-        [key: string]: any;
-    }>, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "close" | "confirm")[], "cancel" | "close" | "confirm", import("vue").PublicProps, Readonly<{}> & Readonly<{
-        onCancel?: ((...args: any[]) => any) | undefined;
-        onClose?: ((...args: any[]) => any) | undefined;
-        onConfirm?: ((...args: any[]) => any) | undefined;
-    }>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>>;
 }

package/@types/constants/library.d.ts

@@ -0,0 +1,3 @@
+export declare const ORDER_EN: string[];
+export declare const ORDER_CN: string[];
+export declare const WEEK_TEXT: string[][];

package/@types/demo/App.vue.d.ts

@@ -0,0 +1,3 @@
+import 'element-plus/dist/index.css';
+declare const _default: import("vue").DefineComponent<{}, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
+export default _default;

package/@types/demo/components/AppDialog.vue.d.ts

@@ -0,0 +1,23 @@
+type __VLS_Props = {
+    show: boolean;
+};
+declare var __VLS_11: string | number, __VLS_12: {}, __VLS_15: {}, __VLS_17: {};
+type __VLS_Slots = {} & {
+    [K in NonNullable<typeof __VLS_11>]?: (props: typeof __VLS_12) => any;
+} & {
+    title?: (props: typeof __VLS_15) => any;
+} & {
+    header?: (props: typeof __VLS_17) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<__VLS_Props, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    "update:show": (...args: any[]) => void;
+}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
+    "onUpdate:show"?: ((...args: any[]) => any) | undefined;
+}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/@types/demo/components/Child.vue.d.ts

@@ -0,0 +1,5 @@
+type __VLS_Props = {
+    childMessage?: string;
+};
+declare const _default: import("vue").DefineComponent<__VLS_Props, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+export default _default;

package/@types/demo/components/Child2.vue.d.ts

@@ -0,0 +1,5 @@
+type __VLS_Props = {
+    childMessage?: string;
+};
+declare const _default: import("vue").DefineComponent<__VLS_Props, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+export default _default;

package/@types/demo/components/Dialog.vue.d.ts

@@ -0,0 +1,20 @@
+type __VLS_Props = {
+    title?: string;
+    show?: boolean;
+};
+declare var __VLS_1: {};
+type __VLS_Slots = {} & {
+    default?: (props: typeof __VLS_1) => any;
+};
+declare const __VLS_component: import("vue").DefineComponent<__VLS_Props, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    "update:show": (...args: any[]) => void;
+}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
+    "onUpdate:show"?: ((...args: any[]) => any) | undefined;
+}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
+export default _default;
+type __VLS_WithSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/@types/demo/components/TestWorld.vue.d.ts

@@ -0,0 +1,5 @@
+type __VLS_Props = {
+    title: string;
+};
+declare const _default: import("vue").DefineComponent<__VLS_Props, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+export default _default;

package/@types/demo/hooks/use-layer.d.ts

@@ -0,0 +1,24 @@
+import { Layer, LayerComponent, LayerComponentProps } from '../../index';
+export declare function elLayer<C extends LayerComponent>(options: {
+    content: C;
+    contentProps: LayerComponentProps<C>;
+} & Parameters<typeof Layer>[0]): void;
+export declare function appLayer<C extends LayerComponent>(options: {
+    content: C;
+    contentProps: LayerComponentProps<C>;
+} & Parameters<typeof Layer>[0]): Promise<unknown>;
+export declare namespace appLayer {
+    var create: (options: Parameters<typeof Layer>[0]) => {
+        open(options: import("../../index").LayerOptions<unknown, abstract new (...args: any) => any, any>): any;
+        component: import("../../plugins/PopupCreator.js").VueComponent;
+        appDOM: HTMLDivElement;
+        instance: import("vue").ComponentPublicInstance<any, any, S>;
+        container: HTMLDivElement;
+        properties: Partial<import("../../index").LayerProps>;
+        init(): void;
+        mount(): void;
+        unmount(): void;
+        close(): void;
+        toggle(show: boolean, options?: any): void;
+    };
+}

package/@types/demo/hooks/use-test-layer.d.ts

@@ -0,0 +1,6 @@
+export declare function useTestWorldLayer(): {
+    open: (props?: {
+        title: string;
+    }) => Promise<void>;
+    close: () => void;
+};

package/@types/globals.d.ts

@@ -1,7 +1,5 @@
+import type { LayerControler, LayerComponent } from '.';
 import type { Ref } from "vue";
-import type Column from './components/layout/Column.vue.d.ts';
-import type Row from './components/layout/Row.vue.d.ts';
-import type Expended from './components/layout/Expended.vue.d.ts';
 declare global {
     interface Window {
 
@@ -10,38 +8,24 @@ declare global {
     function parseFloat(string: string|number): number
     function parseInt(string: string|number): number
 
-    type ObjectKeyType = string|number|symbol;
-    //通用图表
-    interface ChartData {
-        title: string;
-        data: string[];
-        series: {
-            name: string;
-            data: number[];
-            [key:string]:any
-        }[];
-        [key:string]:any
-    }
-    // 选项通用类型
-    type SelectedData<T=string|number>  = {
-        text:string,
-        value:T
-        children?:SelectedData<T>[],
-        [key:Exclude<string, 'text'|'value'|'children'>]:any
-    }
     /**
-     * 补充工具类
+     * 对象属性类型
+     */
+    type ObjectKeyType = string|symbol;
+    /**
+     * 获取对象属性，排除指定属性
      */
     type PickEx<T, K extends keyof T> = { [P in Exclude<keyof T, K>]: T[P]; }
+    /**
+     * 获取Promise函数返回值类型
+     */
     type PromiseReturnType<T> = T extends (...arg:any[]) => Promise<infer R> ? R : T;
-    type GetArguments<T> = T extends (...arg:(infer R)) => any ? R : T;
-    type GetFirstArguments<T extends (...args: any[]) => any> = GetArguments<T>[0];
+    /** 部分属性可选 */
     type PartialOf<T, U extends keyof T> = PickEx<T, U>&Partial<T>
+    /** 部分属性必填 */
     type RequiredOf<T, U extends keyof T> =  Required<Pick<T, U>>&Partial<T>
     /** 获（对象或数组）取子属性 */
     type PickChild<T, K extends keyof T> = T extends (infer R)[] ? R : T[K]; 
-    /** 获取数组中的元素类型 */
-    type GetElementType<T> = T extends (infer R)[] ? R : never;
     interface ScrollToOptions {
         target?: Ref<any>|any
         right?: number
@@ -51,11 +35,7 @@ declare global {
         beforeScroll?(next:()=>void, options:ScrollToOptions, container:HTMLElement):void
     }
  }
- declare module '@vue/runtime-core' {
-    export interface GlobalComponents {
-        column: typeof Column,
-        row: typeof Row,
-        expended: typeof Expended,
-    }
+ declare module 'vue' {
+    export function inject<T, C extends LayerComponent=any>(key:'Layer', d?: LayerControler<T, C>):LayerControler<T, C>|undefined;
 }
  export {};

package/@types/index.d.ts

@@ -1,11 +1,10 @@
 import type { App } from 'vue';
 import { Util } from './utils/index';
-export { configComfyTool } from './utils/ui/install';
+export * from './components';
+export * from './utils/app/installer';
 export { resourceLoader } from './utils/index';
-export * from './components/utils/layer';
 export { version } from './constants/version';
 export declare const ComfyTool: typeof Util;
-export declare function useComfyTool(app: App): void;
 declare const installer: {
     install(app: App): void;
 };

package/@types/plugins/PopupCreator.d.ts

@@ -8,13 +8,14 @@ export declare abstract class PopupCreator<P extends {
     show: boolean;
 }> {
     component: VueComponent;
-    appDOM: any;
+    appDOM: HTMLDivElement;
     instance: ComponentPublicInstance<any, any, S>;
     container: HTMLDivElement;
     properties: Partial<P>;
     constructor(Component: VueComponent, properties: Partial<P>);
     private init;
     static use(options: typeof Config): void;
+    mount(): void;
     unmount(): void;
     abstract open(...args: ParamsType<P>[]): void;
     close(): void;

package/@types/shims-vue.d.ts

@@ -2,4 +2,5 @@ declare module '*.vue' {
     import { DefineComponent } from 'vue';
     const component: DefineComponent<{}, {}, any>;
     export default component;
-}
+}
+  

package/@types/utils/app/component.d.ts

@@ -31,7 +31,7 @@ export type WithInstall<T> = T & {
  * @return {*}
  */
 export declare function withInstall<T>(plugin: T): WithInstall<T>;
-export type VNodeProps = GetArguments<typeof h>[1];
+export type VNodeProps = Parameters<typeof h>[1];
 export declare function renderComponent<T extends VNodeProps>(comp?: any, defaultComp?: any, props?: T): any;
 export declare function isVueComponent(target: any): boolean;
 export {};

package/@types/utils/app/installer.d.ts

@@ -0,0 +1,8 @@
+import type { App } from 'vue';
+export { configComfyTool } from '../ui/install';
+/**
+ * 全量安装 ComfyTool
+ * @export
+ * @param {App} app
+ */
+export declare function useComfyTool(app: App): void;

package/@types/utils/tools.d.ts

@@ -0,0 +1,11 @@
+/** 通用函数在此导入 */
+export * from './util/url';
+export * from './util/cloneObject';
+export * from './util/format';
+export * from './util/basic';
+export * from './util/array';
+export * from './util/number';
+export * from './util/date';
+export * from './util/week';
+export * from './util/function';
+export * from './util/string';

package/@types/utils/ui/index.d.ts

@@ -1,3 +1,6 @@
+export declare function noop(): void;
+export declare function noopCatch(err: any): void;
+export declare function errorCatch(err: string): void;
 export declare function $toast(msg: string): void;
 export declare function $alert(msg: string): void;
 export declare const $loading: {

package/@types/utils/util/array.d.ts

@@ -1,3 +1,4 @@
+import type { SelectedData } from "@/types/data";
 /**
  * 移除数组中为某项
  *

package/@types/utils/util/basic.d.ts

@@ -1,8 +1,4 @@
-import { Util } from "..";
 type ObjectType = 'Object' | 'Array' | 'FormData' | 'Undefined' | 'Null' | 'Number' | 'String' | 'Function' | 'Boolnean' | 'Error' | 'Promise';
-export declare function noop(): void;
-export declare function noopCatch(err: any): void;
-export declare function errorCatch(err: string): void;
 export declare const extend: {
     <T extends {}, U>(target: T, source: U): T & U;
     <T extends {}, U, V>(target: T, source1: U, source2: V): T & U & V;
@@ -26,7 +22,7 @@ export type Writeable<T> = {
  * @param {boolean} [ignoreUndefined=false]
  * @return {*}
  */
-export declare function pick<T, U extends keyof T>(obj: T, keys: ReadonlyArray<U>, ignoreUndefined?: boolean): Util.Writeable<Pick<T, U>>;
+export declare function pick<T, U extends keyof T>(obj: T, keys: ReadonlyArray<U>, ignoreUndefined?: boolean): Writeable<Pick<T, U>>;
 /**
  * 从对象中取出非指定属性
  *
@@ -38,7 +34,7 @@ export declare function pick<T, U extends keyof T>(obj: T, keys: ReadonlyArray<U
  * @param {boolean} [ignoreUndefined=false]
  * @return {*}
  */
-export declare function pickEx<T extends Object, U extends keyof T>(obj: T, keys: Array<U>, ignoreUndefined?: boolean): Util.Writeable<PickEx<T, U>>;
+export declare function pickEx<T extends Object, U extends keyof T>(obj: T, keys: Array<U>, ignoreUndefined?: boolean): Writeable<PickEx<T, U>>;
 /**
  * 类型判断
  *

package/@types/utils/util/date.d.ts

@@ -13,7 +13,7 @@ interface configDate<T> {
  *
  * @export
  * @param {(Date|number)} date
- * @param {string} [format] YYYY-MM-DD HH:mm:SS
+ * @param {string} [format] YYYY-MM-DD HH:mm:SS 或 YYYY-MM-DD HH:mm:ss
  * @return {*}  {string}
  */
 export declare function formatDate(date: Date | number | string, format?: string): string;

package/@types/utils/util/{formate.d.ts → format.d.ts}

@@ -1,3 +1,4 @@
+import type { SelectedData } from "@/types/data";
 /**
  * 横杠转大写
  * `my-vue` => `MyVue`

package/@types/utils/util/function.d.ts

@@ -35,5 +35,5 @@ export declare function throttleAsync<T extends (...a: any[]) => Promise<any>>(f
  */
 export declare function methodApply<T extends Function | Function[]>(target: T, args?: any[]): void;
 export declare const Fn: {
-    cacheResult<T extends (...args: any) => any>(fn: T): (this: any, ...args: GetArguments<T>) => any;
+    cacheResult<T extends (...args: any) => any>(fn: T): (this: any, ...args: Parameters<T>) => any;
 };

package/@types/utils/util/index.d.ts

@@ -1,13 +1,8 @@
-export * from './url';
-export * from './cloneObject';
-export * from './formate';
-export * from './basic';
-export * from './array';
-export * from './number';
-export * from './date';
-export * from './week';
-export * from './function';
-export * from './string';
+/**
+ * 基础工具（不包含Dom、UI，属于通用工具包）
+ * 通用工具包应该放在 '../tools.ts' 中，防止部分没有浏览器环境(Node环境)的使用报错(如：document不存在)
+ */
+export * from '../tools';
 export * from './dom';
 export * from './other';
 export * from '../ui/index';