@aplus-frontend/ui 0.4.18 → 0.4.19

package/lib/src/full-screen/index.vue.d.ts

@@ -4,7 +4,6 @@ declare function enter(mode: FullScreenMode, force?: boolean): Promise<void>;
 declare function exit(force?: boolean): Promise<void>;
 declare function toggle(mode: FullScreenMode, force?: boolean): Promise<void>;
 declare function __VLS_template(): {
-    attrs: Partial<{}>;
     slots: {
         default?(_: {
             full: boolean;
@@ -19,7 +18,7 @@ declare function __VLS_template(): {
         target: unknown;
         portalRootRef: HTMLDivElement;
     };
-    rootEl: any;
+    attrs: Partial<{}>;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: DefineComponent<FullScreenProps, {
@@ -30,10 +29,7 @@ declare const __VLS_component: DefineComponent<FullScreenProps, {
     enter: typeof enter;
     exit: typeof exit;
     toggle: typeof toggle;
-}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<FullScreenProps> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {
-    target: unknown;
-    portalRootRef: HTMLDivElement;
-}, any>;
+}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<FullScreenProps> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {

package/lib/src/portal/index.vue.d.ts

@@ -1,11 +1,10 @@
 import { DefineComponent, TeleportProps, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 declare function __VLS_template(): {
-    attrs: Partial<{}>;
     slots: {
         default?(_: {}): any;
     };
     refs: {};
-    rootEl: any;
+    attrs: Partial<{}>;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: DefineComponent<Partial< TeleportProps>, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<Partial< TeleportProps>> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;

package/lib/src/resize-observer/index.vue.d.ts

@@ -3,12 +3,11 @@ import { DefineComponent, ComputedRef, ComponentOptionsMixin, PublicProps, Compo
 declare function observe(): void;
 declare function unobserve(): void;
 declare function __VLS_template(): {
-    attrs: Partial<{}>;
     slots: {
         default?(_: {}): any;
     };
     refs: {};
-    rootEl: any;
+    attrs: Partial<{}>;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: DefineComponent<ResizeObserverProps, {

package/lib/src/scroll-bar/index.vue.d.ts

@@ -1,8 +1,8 @@
-import { ScrollBarProps, ScrollBarDirection, InternalScrollBarProps } from './interface';
-import { DefineComponent, ComputedRef, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, CreateComponentPublicInstanceWithMixins, Ref, GlobalComponents, GlobalDirectives } from 'vue';
+import { ScrollBarProps, ScrollBarDirection } from './interface';
+import { DefineComponent, ComputedRef, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 declare const _default: DefineComponent<ScrollBarProps, {
     currentScroll: ComputedRef<number | undefined>;
-    scroll: ((percent: number) => void) | undefined;
+    scroll: (percent: number) => void | undefined;
     visible: ComputedRef<boolean>;
     rootElement: ComputedRef<HTMLElement | undefined>;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ScrollBarProps> & Readonly<{}>, {
@@ -12,44 +12,5 @@ declare const _default: DefineComponent<ScrollBarProps, {
     trackSpeed: number;
     barLength: number;
     showTrack: boolean;
-}, {}, {}, {}, string, ComponentProvideOptions, false, {
-    barRef: CreateComponentPublicInstanceWithMixins<Readonly< InternalScrollBarProps> & Readonly<{}>, {
-        currentScroll: Ref<number, number>;
-        container: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        bar: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        track: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        scroll: (percent: number) => void;
-    }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
-        scroll: number;
-        disabled: boolean;
-        direction: ScrollBarDirection;
-        trackSpeed: number;
-        barLength: number;
-        showTrack: boolean;
-    }, false, {}, {}, GlobalComponents, GlobalDirectives, string, {
-        container: HTMLDivElement;
-        track: HTMLDivElement;
-        bar: HTMLDivElement;
-    }, HTMLDivElement, ComponentProvideOptions, {
-        P: {};
-        B: {};
-        D: {};
-        C: {};
-        M: {};
-        Defaults: {};
-    }, Readonly< InternalScrollBarProps> & Readonly<{}>, {
-        currentScroll: Ref<number, number>;
-        container: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        bar: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        track: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        scroll: (percent: number) => void;
-    }, {}, {}, {}, {
-        scroll: number;
-        disabled: boolean;
-        direction: ScrollBarDirection;
-        trackSpeed: number;
-        barLength: number;
-        showTrack: boolean;
-    }> | null;
-}, any>;
+}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 export default _default;

package/lib/src/scroll-bar/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue");require("./internal.vue2.js");const _=require("lodash-unified"),u=require("./utils/index.js"),g=require("@vueuse/core"),m=require("./internal.vue.js"),z=e.defineComponent({name:"ScrollBar",__name:"index",props:{scrollContainer:{},extraSize:{default:0},direction:{default:"vertical"},scroll:{},barLength:{default:30},width:{},barColor:{},trackColor:{},trackWidth:{},disabled:{type:Boolean,default:!1},showTrack:{type:Boolean,default:!0},trackSpeed:{default:2},onScrollStart:{},onScroll:{},onScrollEnd:{}},setup(d,{expose:S}){var f;const t=d,o=e.toRef(t,"scrollContainer"),n=e.ref(),a=e.ref(t.barLength);function v(){if(!o.value||!n.value)return;const{totalSize:r,visibleSize:l,distance:c}=u.getScrollable(o.value,t.direction),i=c/(r+t.extraSize-l||1)*100;n.value.scroll(i)}function s(){const{visibleSize:r,totalSize:l}=u.getScrollable(o.value,t.direction);a.value=u.ensureRangeValue(r/(l+t.extraSize||1)*100)}g.useResizeObserver(o,()=>{s()}),e.watchEffect(()=>{const r=e.unref(o.value);r&&(s(),r.addEventListener("scroll",v))},{flush:"post"}),e.watch(()=>t.barLength,r=>{a.value=r});function p(r){const l=e.unref(o);if(!l)return;const{totalSize:c,visibleSize:i,topOrLeft:b}=u.getScrollable(l,t.direction);if(c<=i)return;const h=`scroll${b}`;l[h]=r*(c+t.extraSize-i)/100}return S({currentScroll:e.computed(()=>{var r;return e.unref((r=n.value)==null?void 0:r.currentScroll)}),scroll:(f=n.value)==null?void 0:f.scroll,visible:e.computed(()=>a.value<100),rootElement:e.computed(()=>{var r;return e.unref((r=n.value)==null?void 0:r.container)})}),(r,l)=>a.value!==100?(e.openBlock(),e.createBlock(m.default,e.mergeProps({key:0,ref_key:"barRef",ref:n},e.unref(_.omit)(t,["onScroll","extraSize","scrollContainer"]),{"bar-length":a.value,onScroll:p}),null,16,["bar-length"])):e.createCommentVNode("",!0)}});exports.default=z;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const r=require("vue");require("./internal.vue2.js");const h=require("lodash-unified"),u=require("./utils/index.js"),_=require("@vueuse/core"),g=require("./internal.vue.js"),m=r.defineComponent({name:"ScrollBar",__name:"index",props:{scrollContainer:{},extraSize:{default:0},direction:{default:"vertical"},scroll:{},barLength:{default:30},width:{},barColor:{},trackColor:{},trackWidth:{},disabled:{type:Boolean,default:!1},showTrack:{type:Boolean,default:!0},trackSpeed:{default:2},onScrollStart:{},onScroll:{},onScrollEnd:{}},setup(f,{expose:d}){const l=f,n=r.toRef(l,"scrollContainer"),a=r.ref(),c=r.ref(l.barLength);function S(){if(!n.value||!a.value)return;const{totalSize:e,visibleSize:t,distance:o}=u.getScrollable(n.value,l.direction),i=o/(e+l.extraSize-t||1)*100;a.value.scroll(i)}function s(){const{visibleSize:e,totalSize:t}=u.getScrollable(n.value,l.direction);c.value=u.ensureRangeValue(e/(t+l.extraSize||1)*100)}_.useResizeObserver(n,()=>{s()}),r.watchEffect(()=>{const e=r.unref(n.value);e&&(s(),e.addEventListener("scroll",S))},{flush:"post"}),r.watch(()=>l.barLength,e=>{c.value=e});function v(e){const t=r.unref(n);if(!t)return;const{totalSize:o,visibleSize:i,topOrLeft:p}=u.getScrollable(t,l.direction);if(o<=i)return;const b=`scroll${p}`;t[b]=e*(o+l.extraSize-i)/100}return d({currentScroll:r.computed(()=>{var e;return r.unref((e=a.value)==null?void 0:e.currentScroll)}),scroll:e=>{var t,o;return(o=(t=a.value)==null?void 0:t.scroll)==null?void 0:o.call(t,e)},visible:r.computed(()=>c.value<100),rootElement:r.computed(()=>{var e;return r.unref((e=a.value)==null?void 0:e.container)})}),(e,t)=>c.value!==100?(r.openBlock(),r.createBlock(g.default,r.mergeProps({key:0,ref_key:"barRef",ref:a},r.unref(h.omit)(l,["onScroll","extraSize","scrollContainer"]),{"bar-length":c.value,onScroll:v}),null,16,["bar-length"])):r.createCommentVNode("",!0)}});exports.default=m;

package/lib/src/scroll-bar/internal.vue.d.ts

@@ -14,9 +14,5 @@ declare const _default: DefineComponent<InternalScrollBarProps, {
     trackSpeed: number;
     barLength: number;
     showTrack: boolean;
-}, {}, {}, {}, string, ComponentProvideOptions, false, {
-    container: HTMLDivElement;
-    track: HTMLDivElement;
-    bar: HTMLDivElement;
-}, HTMLDivElement>;
+}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 export default _default;

package/lib/src/scroll-view/index.vue.d.ts

@@ -1,11 +1,10 @@
 import { ScrollOptions, ScrollViewProps } from './interface';
-import { ScrollBarDirection, InternalScrollBarProps } from '../scroll-bar';
+import { ScrollBarDirection, InternalScrollBarProps, ColorType } from '../scroll-bar';
 import { CreateComponentPublicInstanceWithMixins, Ref, ComponentOptionsMixin, PublicProps, GlobalComponents, GlobalDirectives, ComponentProvideOptions, DefineComponent, ComputedRef } from 'vue';
 declare function scroll(x?: number, y?: number): void;
 declare function scrollTo({ smooth, left, top }: ScrollOptions): void;
 declare function scrollIntoView(element: HTMLElement, position?: 'start' | 'center' | 'end'): void;
 declare function __VLS_template(): {
-    attrs: Partial<{}>;
     slots: {
         default?(_: {}): any;
     };
@@ -25,11 +24,7 @@ declare function __VLS_template(): {
             trackSpeed: number;
             barLength: number;
             showTrack: boolean;
-        }, false, {}, {}, GlobalComponents, GlobalDirectives, string, {
-            container: HTMLDivElement;
-            track: HTMLDivElement;
-            bar: HTMLDivElement;
-        }, HTMLDivElement, ComponentProvideOptions, {
+        }, false, {}, {}, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
             P: {};
             B: {};
             D: {};
@@ -63,11 +58,7 @@ declare function __VLS_template(): {
             trackSpeed: number;
             barLength: number;
             showTrack: boolean;
-        }, false, {}, {}, GlobalComponents, GlobalDirectives, string, {
-            container: HTMLDivElement;
-            track: HTMLDivElement;
-            bar: HTMLDivElement;
-        }, HTMLDivElement, ComponentProvideOptions, {
+        }, false, {}, {}, GlobalComponents, GlobalDirectives, string, {}, any, ComponentProvideOptions, {
             P: {};
             B: {};
             D: {};
@@ -89,7 +80,7 @@ declare function __VLS_template(): {
             showTrack: boolean;
         }> | null;
     };
-    rootEl: HTMLDivElement;
+    attrs: Partial<{}>;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: DefineComponent<ScrollViewProps, {
@@ -106,8 +97,8 @@ declare const __VLS_component: DefineComponent<ScrollViewProps, {
         onScroll?: ((percent: number) => void) | undefined;
         disabled?: boolean | undefined;
         trackSpeed?: number | undefined;
-        barColor?: import("csstype").Property.BackgroundColor | undefined;
-        trackColor?: import("csstype").Property.BackgroundColor | undefined;
+        barColor?: ColorType;
+        trackColor?: ColorType;
         trackWidth?: number | undefined;
         showTrack?: boolean | undefined;
         onScrollStart?: ((percent: number) => void) | undefined;
@@ -118,93 +109,14 @@ declare const __VLS_component: DefineComponent<ScrollViewProps, {
         onScroll?: ((percent: number) => void) | undefined;
         disabled?: boolean | undefined;
         trackSpeed?: number | undefined;
-        barColor?: import("csstype").Property.BackgroundColor | undefined;
-        trackColor?: import("csstype").Property.BackgroundColor | undefined;
+        barColor?: ColorType;
+        trackColor?: ColorType;
         trackWidth?: number | undefined;
         showTrack?: boolean | undefined;
         onScrollStart?: ((percent: number) => void) | undefined;
         onScrollEnd?: ((percent: number) => void) | undefined;
     };
-}, {}, {}, {}, string, ComponentProvideOptions, false, {
-    containerRef: HTMLDivElement;
-    contentRef: HTMLDivElement;
-    yBarRef: CreateComponentPublicInstanceWithMixins<Readonly< InternalScrollBarProps> & Readonly<{}>, {
-        currentScroll: Ref<number, number>;
-        container: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        bar: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        track: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        scroll: (percent: number) => void;
-    }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
-        scroll: number;
-        disabled: boolean;
-        direction: ScrollBarDirection;
-        trackSpeed: number;
-        barLength: number;
-        showTrack: boolean;
-    }, false, {}, {}, GlobalComponents, GlobalDirectives, string, {
-        container: HTMLDivElement;
-        track: HTMLDivElement;
-        bar: HTMLDivElement;
-    }, HTMLDivElement, ComponentProvideOptions, {
-        P: {};
-        B: {};
-        D: {};
-        C: {};
-        M: {};
-        Defaults: {};
-    }, Readonly< InternalScrollBarProps> & Readonly<{}>, {
-        currentScroll: Ref<number, number>;
-        container: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        bar: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        track: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        scroll: (percent: number) => void;
-    }, {}, {}, {}, {
-        scroll: number;
-        disabled: boolean;
-        direction: ScrollBarDirection;
-        trackSpeed: number;
-        barLength: number;
-        showTrack: boolean;
-    }> | null;
-    xBarRef: CreateComponentPublicInstanceWithMixins<Readonly< InternalScrollBarProps> & Readonly<{}>, {
-        currentScroll: Ref<number, number>;
-        container: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        bar: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        track: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        scroll: (percent: number) => void;
-    }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, PublicProps, {
-        scroll: number;
-        disabled: boolean;
-        direction: ScrollBarDirection;
-        trackSpeed: number;
-        barLength: number;
-        showTrack: boolean;
-    }, false, {}, {}, GlobalComponents, GlobalDirectives, string, {
-        container: HTMLDivElement;
-        track: HTMLDivElement;
-        bar: HTMLDivElement;
-    }, HTMLDivElement, ComponentProvideOptions, {
-        P: {};
-        B: {};
-        D: {};
-        C: {};
-        M: {};
-        Defaults: {};
-    }, Readonly< InternalScrollBarProps> & Readonly<{}>, {
-        currentScroll: Ref<number, number>;
-        container: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        bar: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        track: Ref<HTMLElement | undefined, HTMLElement | undefined>;
-        scroll: (percent: number) => void;
-    }, {}, {}, {}, {
-        scroll: number;
-        disabled: boolean;
-        direction: ScrollBarDirection;
-        trackSpeed: number;
-        barLength: number;
-        showTrack: boolean;
-    }> | null;
-}, HTMLDivElement>;
+}, {}, {}, {}, string, ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {

package/lib/src/tests/wrapper.d.ts

@@ -1,8 +1,8 @@
 import { DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions } from 'vue';
 export declare const Wrapper: DefineComponent<{
-    uiMode?: "admin" | "aplus" | undefined;
-    lang?: "en" | "zh-cn" | undefined;
+    uiMode?: ("admin" | "aplus") | undefined;
+    lang?: ("en" | "zh-cn") | undefined;
 }, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<{
-    uiMode?: "admin" | "aplus" | undefined;
-    lang?: "en" | "zh-cn" | undefined;
+    uiMode?: ("admin" | "aplus") | undefined;
+    lang?: ("en" | "zh-cn") | undefined;
 }> & Readonly<{}>, {}, {}, {}, {}, string, ComponentProvideOptions, true, {}, any>;

package/lib/src/utils/index.d.ts

@@ -1,3 +1,4 @@
+import { Ref } from 'vue';
 import { Recordable } from '../type';
 /**
  * @description:  Set ui mount node
@@ -40,3 +41,10 @@ export declare function runFunction<T extends any[]>(func: any, ...restParams: T
  */
 export declare function getRouteType(): "history" | "hash";
 export declare function getScrollbarSize(): number;
+export type UnwrapRef<T> = T extends Ref<infer U> ? U : T;
+/**
+ * 将传入的泛型中所有类型为 Ref<x> 转换为类型 x
+ */
+export type UnwrapRefProps<T> = {
+    [K in keyof T]: UnwrapRef<T[K]>;
+};