@aplus-frontend/ui 0.4.22 → 0.4.24

package/lib/src/business/hooks/usePageListApTable.d.ts

@@ -2,8 +2,6 @@ import { ApTableProps } from '../../';
 import { UseTableRefreshOption } from './useTableRefresh';
 import { Recordable } from '../../type';
 import { TableColumnsType } from '@aplus-frontend/antdv';
-import { UnwrapRefProps } from '../../utils';
-import { ScrollBarExpose } from '../../scroll-bar';
 export interface UsePageListApTable extends ApTableProps {
     /** 是否显示默认的行选择配置
      * @default true
@@ -52,8 +50,11 @@ export declare function usePageListApTable(props?: UsePageListApTable): [ApTable
         } | undefined;
         getShownColumns: () => TableColumnsType<any>;
         scrollBar: {
-            x: UnwrapRefProps<ScrollBarExpose>;
-            y: UnwrapRefProps<ScrollBarExpose>;
+            x: {
+                getCurrentScroll: () => number;
+                scroll: (percent: number) => void | undefined;
+            };
+            y: undefined;
         };
     } | null | undefined;
     getSearchFormValuesAndSorted: (transform?: boolean) => any;

package/lib/src/business/hooks/useTableRefresh.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("vue");require("../../index.js");const q=require("../../config-provider/hooks/use-global-config.js");function m(e){return document.querySelector(e)}function Y(e,r=".demo"){const s=m(r);s&&(s.scrollTop=e)}function D(e){const r=q.useGlobalConfig("scrollYDomName");let s=!0;const b=a.ref(0),T=a.ref(0),o=(["reset","submit",void 0].includes(e==null?void 0:e.refreshType)?e==null?void 0:e.refreshType:"submit")??"submit",n=(e==null?void 0:e.refreshBefore)??(()=>!0);let g=!0;const S=u=>{if(s===!1)return;const l=u.target;T.value=l.scrollTop};return a.onMounted(()=>{a.nextTick(()=>{g=!1})}),a.onActivated(()=>{const u=n==null?void 0:n();if(g){setTimeout(()=>{const l=m(r.value);l&&l.addEventListener("scroll",S)});return}u&&setTimeout(()=>{var c,t,f,v,h,y,d,R;s=!0,(t=(c=e==null?void 0:e.apTableRef)==null?void 0:c.value)==null||t[o](),(R=(d=(y=(h=(v=(f=e==null?void 0:e.apTableRef)==null?void 0:f.value)==null?void 0:v.scrollBar)==null?void 0:h.x)==null?void 0:y.value)==null?void 0:d.scroll)==null||R.call(d,b.value),Y(T.value,r.value);const l=m(r.value);l&&l.addEventListener("scroll",S)})}),a.onDeactivated(()=>{var l,c,t,f,v;s=!1,b.value=((v=(f=(t=(c=(l=e==null?void 0:e.apTableRef)==null?void 0:l.value)==null?void 0:c.scrollBar)==null?void 0:t.x)==null?void 0:f.value)==null?void 0:v.currentScroll)??0;const u=m(r.value);u&&u.removeEventListener("scroll",S)}),{tableScrollX:b,tableScrollY:T}}exports.useTableRefresh=D;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("vue");require("../../index.js");const o=require("../../config-provider/hooks/use-global-config.js");function m(e){return document.querySelector(e)}function q(e,s=".demo"){const u=m(s);u&&(u.scrollTop=e)}function Y(e){const s=o.useGlobalConfig("scrollYDomName");let u=!0;const b=c.ref(0),T=c.ref(0),R=(["reset","submit",void 0].includes(e==null?void 0:e.refreshType)?e==null?void 0:e.refreshType:"submit")??"submit",n=(e==null?void 0:e.refreshBefore)??(()=>!0);let g=!0;const S=a=>{if(u===!1)return;const l=a.target;T.value=l.scrollTop};return c.onMounted(()=>{c.nextTick(()=>{g=!1})}),c.onActivated(()=>{const a=n==null?void 0:n();if(g){setTimeout(()=>{const l=m(s.value);l&&l.addEventListener("scroll",S)});return}a&&setTimeout(()=>{var t,f,r,v,h,d,y;u=!0,(f=(t=e==null?void 0:e.apTableRef)==null?void 0:t.value)==null||f[R](),(y=(d=(h=(v=(r=e==null?void 0:e.apTableRef)==null?void 0:r.value)==null?void 0:v.scrollBar)==null?void 0:h.x)==null?void 0:d.scroll)==null||y.call(d,b.value),q(T.value,s.value);const l=m(s.value);l&&l.addEventListener("scroll",S)})}),c.onDeactivated(()=>{var l,t,f,r,v;u=!1,b.value=((v=(r=(f=(t=(l=e==null?void 0:e.apTableRef)==null?void 0:l.value)==null?void 0:t.scrollBar)==null?void 0:f.x)==null?void 0:r.getCurrentScroll)==null?void 0:v.call(r))??0;const a=m(s.value);a&&a.removeEventListener("scroll",S)}),{tableScrollX:b,tableScrollY:T}}exports.useTableRefresh=Y;

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

@@ -1,8 +1,9 @@
 import { ScrollBarProps, ScrollBarDirection, InternalScrollBarProps } from './interface';
 import { DefineComponent, ComputedRef, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, CreateComponentPublicInstanceWithMixins, Ref, GlobalComponents, GlobalDirectives } from 'vue';
+declare function handleBarScroll(percent: number): void;
 declare const _default: DefineComponent<ScrollBarProps, {
     currentScroll: ComputedRef<number | undefined>;
-    scroll: (percent: number) => void | undefined;
+    scroll: typeof handleBarScroll;
     visible: ComputedRef<boolean>;
     rootElement: ComputedRef<HTMLElement | undefined>;
 }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ScrollBarProps> & Readonly<{}>, {

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

@@ -1 +1 @@
-"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;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=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=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}){const t=d,o=e.toRef(t,"scrollContainer"),n=e.ref(),a=e.ref(t.barLength);function p(){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)}_.useResizeObserver(o,()=>{s()}),e.watchEffect(()=>{const r=e.unref(o.value);r&&(s(),r.addEventListener("scroll",p))},{flush:"post"}),e.watch(()=>t.barLength,r=>{a.value=r});function f(r){const l=e.unref(o);if(!l)return;const{totalSize:c,visibleSize:i,topOrLeft:v}=u.getScrollable(l,t.direction);if(c<=i)return;const b=`scroll${v}`;l[b]=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,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(g.default,e.mergeProps({key:0,ref_key:"barRef",ref:n},e.unref(h.omit)(t,["onScroll","extraSize","scrollContainer"]),{"bar-length":a.value,onScroll:f}),null,16,["bar-length"])):e.createCommentVNode("",!0)}});exports.default=m;

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue");require("../config-provider/index.js");const T=require("./hooks/use-track.js"),y=require("./utils/index.js"),P=require("../config-provider/hooks/use-namespace.js"),B=t.defineComponent({__name:"internal",props:{direction:{default:"vertical"},scroll:{default:0},barLength:{default:35},width:{},barColor:{},trackColor:{},trackWidth:{},disabled:{type:Boolean,default:!1},showTrack:{type:Boolean,default:!0},trackSpeed:{default:2},onScrollStart:{},onScroll:{},onScrollEnd:{}},setup(E,{expose:p}){const n=E,h=t.ref(),c=t.ref(),l=t.ref(),{b:L,e:b,m:C,em:u,cssVar:R}=P.useNamespace("scroll-bar"),o=t.ref(n.scroll),{handleMouseDown:k}=T.useTrack({currentScroll:o,track:c,bar:l,type:t.toRef(n,"direction"),trackSpeed:t.toRef(n,"trackSpeed"),barLength:t.toRef(n,"barLength"),disabled:t.toRef(n,"disabled"),onDown:e=>{var r;(r=n.onScrollStart)==null||r.call(n,e)},onUp:e=>{var r;(r=n.onScrollEnd)==null||r.call(n,e)},onScroll:e=>{var r;(r=n.onScroll)==null||r.call(n,e)}});t.watch(()=>n.scroll,e=>{o.value=e}),t.watchEffect(()=>{if(!t.unref(l))return;const e=`${(100-n.barLength)*o.value/n.barLength}%`,r=`${n.barLength}%`;n.direction==="vertical"?(l.value.style.height=r,l.value.style.transform=`translate3d(0, ${e}, 0)`):(l.value.style.width=r,l.value.style.transform=`translate3d(${e}, 0, 0)`)});let f,s,d;function M(e){var w;if(n.disabled||e.button!==0)return;e.preventDefault(),e.stopPropagation();const r=t.unref(c),i=t.unref(l);if(!r||!i)return;document.addEventListener("pointermove",v),document.addEventListener("pointerup",m);const a=r.getBoundingClientRect(),S=i.getBoundingClientRect();n.direction==="vertical"?(f=a.height,s=S.top-a.top,d=e.clientY):(f=a.width,s=S.left-a.left,d=e.clientX),(w=n.onScrollStart)==null||w.call(n,t.unref(o))}function v(e){var a;e.stopPropagation(),e.preventDefault();let r;n.direction==="vertical"?r=s+e.clientY-d:r=s+e.clientX-d;const i=r/f/(100-n.barLength)*1e4;o.value=y.ensureRangeValue(i),(a=n.onScroll)==null||a.call(n,t.unref(o))}function m(e){var r;e.preventDefault(),document.removeEventListener("pointermove",v),document.removeEventListener("pointerup",m),(r=n.onScrollEnd)==null||r.call(n,t.unref(o))}function g(e){e.cancelable&&(e.stopPropagation(),e.preventDefault())}function D(e){var r;Math.abs(t.unref(o)-e)<=.001||(o.value=y.ensureRangeValue(e),(r=n.onScroll)==null||r.call(n,e))}return p({currentScroll:o,container:h,bar:l,track:c,scroll:D}),(e,r)=>(t.openBlock(),t.createElementBlock("div",{ref_key:"container",ref:h,class:t.normalizeClass([t.unref(L)(),t.unref(C)(e.direction)]),style:t.normalizeStyle(t.unref(R)({"bar-color":e.barColor,"track-color":e.trackColor,"bar-width":e.width?`${e.width}px`:void 0,"track-width":e.trackWidth?`${e.trackWidth}px`:void 0}))},[t.createElementVNode("div",{ref_key:"track",ref:c,class:t.normalizeClass([t.unref(b)("track"),e.disabled?t.unref(u)("track","disabled"):null,e.showTrack?null:t.unref(u)("track","hidden")]),onPointerdown:r[0]||(r[0]=(...i)=>t.unref(k)&&t.unref(k)(...i)),onTouchstart:g},null,34),t.createElementVNode("div",{ref_key:"bar",ref:l,class:t.normalizeClass([t.unref(b)("bar"),t.unref(u)("bar",e.direction),e.disabled?t.unref(u)("bar","disabled"):null]),onPointerdown:M,onTouchstart:g},null,34)],6))}});exports.default=B;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue");require("../config-provider/index.js");const T=require("./hooks/use-track.js"),p=require("./utils/index.js"),P=require("../config-provider/hooks/use-namespace.js"),B=t.defineComponent({__name:"internal",props:{direction:{default:"vertical"},scroll:{default:0},barLength:{default:35},width:{},barColor:{},trackColor:{},trackWidth:{},disabled:{type:Boolean,default:!1},showTrack:{type:Boolean,default:!0},trackSpeed:{default:2},onScrollStart:{},onScroll:{},onScrollEnd:{}},setup(y,{expose:E}){const n=y,h=t.ref(),c=t.ref(),l=t.ref(),{b:L,e:b,m:C,em:u,cssVar:R}=P.useNamespace("scroll-bar"),o=t.ref(n.scroll),{handleMouseDown:k}=T.useTrack({currentScroll:o,track:c,bar:l,type:t.toRef(n,"direction"),trackSpeed:t.toRef(n,"trackSpeed"),barLength:t.toRef(n,"barLength"),disabled:t.toRef(n,"disabled"),onDown:e=>{var r;(r=n.onScrollStart)==null||r.call(n,e)},onUp:e=>{var r;(r=n.onScrollEnd)==null||r.call(n,e)},onScroll:e=>{var r;(r=n.onScroll)==null||r.call(n,e)}});t.watch(()=>n.scroll,e=>{o.value=e}),t.watchEffect(()=>{if(!t.unref(l))return;const e=`${(100-n.barLength)*o.value/n.barLength}%`,r=`${n.barLength}%`;n.direction==="vertical"?(l.value.style.height=r,l.value.style.transform=`translate3d(0, ${e}, 0)`):(l.value.style.width=r,l.value.style.transform=`translate3d(${e}, 0, 0)`)});let f,s,d;function M(e){var w;if(n.disabled||e.button!==0)return;e.preventDefault(),e.stopPropagation();const r=t.unref(c),i=t.unref(l);if(!r||!i)return;document.addEventListener("pointermove",v),document.addEventListener("pointerup",m);const a=r.getBoundingClientRect(),S=i.getBoundingClientRect();n.direction==="vertical"?(f=a.height,s=S.top-a.top,d=e.clientY):(f=a.width,s=S.left-a.left,d=e.clientX),(w=n.onScrollStart)==null||w.call(n,t.unref(o))}function v(e){var a;e.stopPropagation(),e.preventDefault();let r;n.direction==="vertical"?r=s+e.clientY-d:r=s+e.clientX-d;const i=r/f/(100-n.barLength)*1e4;o.value=p.ensureRangeValue(i),(a=n.onScroll)==null||a.call(n,t.unref(o))}function m(e){var r;e.preventDefault(),document.removeEventListener("pointermove",v),document.removeEventListener("pointerup",m),(r=n.onScrollEnd)==null||r.call(n,t.unref(o))}function g(e){e.cancelable&&(e.stopPropagation(),e.preventDefault())}function D(e){Math.abs(t.unref(o)-e)<=.001||(o.value=p.ensureRangeValue(e))}return E({currentScroll:o,container:h,bar:l,track:c,scroll:D}),(e,r)=>(t.openBlock(),t.createElementBlock("div",{ref_key:"container",ref:h,class:t.normalizeClass([t.unref(L)(),t.unref(C)(e.direction)]),style:t.normalizeStyle(t.unref(R)({"bar-color":e.barColor,"track-color":e.trackColor,"bar-width":e.width?`${e.width}px`:void 0,"track-width":e.trackWidth?`${e.trackWidth}px`:void 0}))},[t.createElementVNode("div",{ref_key:"track",ref:c,class:t.normalizeClass([t.unref(b)("track"),e.disabled?t.unref(u)("track","disabled"):null,e.showTrack?null:t.unref(u)("track","hidden")]),onPointerdown:r[0]||(r[0]=(...i)=>t.unref(k)&&t.unref(k)(...i)),onTouchstart:g},null,34),t.createElementVNode("div",{ref_key:"bar",ref:l,class:t.normalizeClass([t.unref(b)("bar"),t.unref(u)("bar",e.direction),e.disabled?t.unref(u)("bar","disabled"):null]),onPointerdown:M,onTouchstart:g},null,34)],6))}});exports.default=B;

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

@@ -1,4 +1,3 @@
-import { Ref } from 'vue';
 import { Recordable } from '../type';
 /**
  * @description:  Set ui mount node
@@ -41,10 +40,3 @@ 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]>;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.4.22",
+  "version": "0.4.24",
   "main": "./lib/index.js",
   "type": "module",
   "files": [