@king-one/antdv 1.0.69 → 1.0.70

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @king-one/antdv
 
+## 1.0.70
+
+### Patch Changes
+
+- fix：修复虚拟列表，高度为小数时，current 计算错误
+
 ## 1.0.69
 
 ### Patch Changes

package/dist/es/components/scale-virtual-list/hooks/useVirtualList.mjs

@@ -1,5 +1,5 @@
 import { createEventHook as $ } from "@vueuse/shared";
-import { ref as z, shallowRef as F, watch as M, computed as y } from "vue";
+import { ref as z, shallowRef as _, watch as F, computed as y } from "vue";
 import { useElementSize as X } from "@vueuse/core";
 function I(r, t) {
   const { containerStyle: a, wrapperProps: n, scrollTo: c, calculateRange: e, currentList: o, containerRef: l, scaleTo: u, state: s, onUpdate: f } = "itemHeight" in t ? Y(t, r) : S(t, r);
@@ -20,10 +20,10 @@ function I(r, t) {
   };
 }
 function O(r) {
-  const t = z(null), a = X(t), n = z([]), c = F(r);
+  const t = z(null), a = X(t), n = z([]), c = _(r);
   return { state: z({ start: 0, end: 10, current: 0, scale: 1 }), source: c, currentList: n, size: a, containerRef: t };
 }
-function P(r, t, a) {
+function M(r, t, a) {
   return (n) => {
     const { start: c = 0, scale: e = 1 } = r.value;
     if (typeof a == "number")
@@ -37,7 +37,7 @@ function P(r, t, a) {
     return l - c;
   };
 }
-function W(r, t, a) {
+function P(r, t, a) {
   return (n) => {
     const { scale: c = 1 } = a.value;
     if (typeof t == "number")
@@ -53,11 +53,11 @@ function W(r, t, a) {
     return o + 1;
   };
 }
-function k(r, t, a, n, { containerRef: c, state: e, currentList: o, source: l }, u) {
+function W(r, t, a, n, { containerRef: c, state: e, currentList: o, source: l }, u) {
   return () => {
     const s = c.value;
     if (s) {
-      const f = a(r === "vertical" ? s.scrollTop : s.scrollLeft), i = n(r === "vertical" ? s.clientHeight : s.clientWidth), p = f - t, g = f + i + t;
+      const f = a(Math.ceil(r === "vertical" ? s.scrollTop : s.scrollLeft)), i = n(r === "vertical" ? s.clientHeight : s.clientWidth), p = f - t, g = f + i + t;
       e.value = {
         start: p < 0 ? 0 : p,
         end: g > l.value.length ? l.value.length : g,
@@ -70,18 +70,18 @@ function k(r, t, a, n, { containerRef: c, state: e, currentList: o, source: l },
     }
   };
 }
-function D(r, t, a) {
+function k(r, t, a) {
   return (n) => {
     const { scale: c = 1 } = a.value;
     return typeof r == "number" ? n * (r * c) : t.value.slice(0, n).reduce((o, l, u) => o + r(u) * c, 0);
   };
 }
-function E(r, t, a, n) {
-  M([r.width, r.height, t, a], () => {
+function D(r, t, a, n) {
+  F([r.width, r.height, t, a], () => {
     n();
   });
 }
-function G(r, t, a) {
+function E(r, t, a) {
   return y(() => {
     const { scale: n = 1 } = a.value;
     return typeof r == "number" ? t.value.length * r * n : t.value.reduce((c, e, o) => c + r(o) * n, 0);
@@ -91,15 +91,15 @@ const K = {
   horizontal: "scrollLeft",
   vertical: "scrollTop"
 };
-function U(r, t, a, n) {
+function G(r, t, a, n) {
   return (c) => {
     n.value && (n.value[K[r]] = a(c), t());
   };
 }
 function S(r, t) {
-  const { on: a, trigger: n } = $(), c = O(t), { state: e, source: o, currentList: l, size: u, containerRef: s } = c, f = { overflowX: "auto" }, { itemWidth: i, overscan: p = 5 } = r, g = P(e, o, i), h = W(o, i, e), v = k("horizontal", p, h, g, c, n), m = D(i, o, e), d = y(() => m(e.value.start)), R = G(i, o, e);
-  E(u, t, s, v);
-  const V = U("horizontal", v, m, s), b = (T) => {
+  const { on: a, trigger: n } = $(), c = O(t), { state: e, source: o, currentList: l, size: u, containerRef: s } = c, f = { overflowX: "auto" }, { itemWidth: i, overscan: p = 5 } = r, g = M(e, o, i), h = P(o, i, e), v = W("horizontal", p, h, g, c, n), m = k(i, o, e), d = y(() => m(e.value.start)), R = E(i, o, e);
+  D(u, t, s, v);
+  const V = G("horizontal", v, m, s), b = (T) => {
     e.value.scale = T;
   }, x = y(() => ({
     style: {
@@ -126,14 +126,14 @@ function S(r, t) {
   };
 }
 function Y(r, t) {
-  const { on: a, trigger: n } = $(), c = O(t), { state: e, source: o, currentList: l, size: u, containerRef: s } = c, f = { overflowY: "auto" }, { itemHeight: i, overscan: p = 5 } = r, g = P(e, o, i), h = W(o, i, e), v = k("vertical", p, h, g, c, n), m = D(i, o, e), d = y(() => m(e.value.start)), R = G(i, o, e);
-  E(u, t, s, v);
-  const V = U("vertical", v, m, s), b = (T) => {
+  const { on: a, trigger: n } = $(), c = O(t), { state: e, source: o, currentList: l, size: u, containerRef: s } = c, f = { overflowY: "auto" }, { itemHeight: i, overscan: p = 5 } = r, g = M(e, o, i), h = P(o, i, e), v = W("vertical", p, h, g, c, n), m = k(i, o, e), d = y(() => m(e.value.start)), R = E(i, o, e);
+  D(u, t, s, v);
+  const V = G("vertical", v, m, s), b = (T) => {
     const w = s.value;
     if (w) {
       const { current: C } = e.value;
       let L = 0;
-      typeof i == "number" ? L = C * (T * i - e.value.scale * i) : L = o.value.slice(0, C).reduce((_, j, H) => _ + T * i(H) - e.value.scale * i(H), 0), w.scrollTop = w.scrollTop + L >= 0 ? w.scrollTop + L : 0, e.value.scale = T;
+      typeof i == "number" ? L = C * (T * i - e.value.scale * i) : L = o.value.slice(0, C).reduce((U, j, H) => U + T * i(H) - e.value.scale * i(H), 0), w.scrollTop = w.scrollTop + L >= 0 ? w.scrollTop + L : 0, e.value.scale = T;
     }
   }, x = y(() => ({
     style: {

package/dist/lib/components/scale-virtual-list/hooks/useVirtualList.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const O=require("@vueuse/shared"),f=require("vue"),M=require("@vueuse/core");function S(r,t){const{containerStyle:a,wrapperProps:o,scrollTo:c,calculateRange:e,currentList:n,containerRef:l,scaleTo:u,state:s,onUpdate:v}="itemHeight"in t?F(t,r):_(t,r);return{onUpdate:v,state:s,scaleTo:u,list:n,scrollTo:c,containerProps:{ref:l,onScroll:()=>{e()},style:a},wrapperProps:o}}function $(r){const t=f.ref(null),a=M.useElementSize(t),o=f.ref([]),c=f.shallowRef(r);return{state:f.ref({start:0,end:10,current:0,scale:1}),source:c,currentList:o,size:a,containerRef:t}}function x(r,t,a){return o=>{const{start:c=0,scale:e=1}=r.value;if(typeof a=="number")return Math.ceil(o/(a*e));let n=0,l=0;for(let u=c;u<t.value.length;u++){const s=a(u)*e;if(n+=s,l=u,n>o)break}return l-c}}function P(r,t,a){return o=>{const{scale:c=1}=a.value;if(typeof t=="number")return Math.floor(o/(t*c))+1;let e=0,n=0;for(let l=0;l<r.value.length;l++){const u=t(l)*c;if(e+=u,e>=o){n=l;break}}return n+1}}function k(r,t,a,o,{containerRef:c,state:e,currentList:n,source:l},u){return()=>{const s=c.value;if(s){const v=a(r==="vertical"?s.scrollTop:s.scrollLeft),i=o(r==="vertical"?s.clientHeight:s.clientWidth),g=v-t,h=v+i+t;e.value={start:g<0?0:g,end:h>l.value.length?l.value.length:h,current:v,scale:e.value.scale},n.value=l.value.slice(e.value.start,e.value.end).map((d,p)=>({data:d,index:p+e.value.start})),u(e.value)}}}function E(r,t,a){return o=>{const{scale:c=1}=a.value;return typeof r=="number"?o*(r*c):t.value.slice(0,o).reduce((n,l,u)=>n+r(u)*c,0)}}function W(r,t,a,o){f.watch([r.width,r.height,t,a],()=>{o()})}function q(r,t,a){return f.computed(()=>{const{scale:o=1}=a.value;return typeof r=="number"?t.value.length*r*o:t.value.reduce((c,e,n)=>c+r(n)*o,0)})}const U={horizontal:"scrollLeft",vertical:"scrollTop"};function D(r,t,a,o){return c=>{o.value&&(o.value[U[r]]=a(c),t())}}function _(r,t){const{on:a,trigger:o}=O.createEventHook(),c=$(t),{state:e,source:n,currentList:l,size:u,containerRef:s}=c,v={overflowX:"auto"},{itemWidth:i,overscan:g=5}=r,h=x(e,n,i),d=P(n,i,e),p=k("horizontal",g,d,h,c,o),m=E(i,n,e),y=f.computed(()=>m(e.value.start)),b=q(i,n,e);W(u,t,s,p);const R=D("horizontal",p,m,s),V=T=>{e.value.scale=T},H=f.computed(()=>({style:{height:"100%",width:`${b.value-y.value}px`,marginLeft:`${y.value}px`,display:"flex",transform:`scale(${e.value.scale})`,transformOrigin:"0% 0%"}}));return{onUpdate:a,state:e,scaleTo:V,scrollTo:R,calculateRange:p,wrapperProps:H,containerStyle:v,currentList:l,containerRef:s}}function F(r,t){const{on:a,trigger:o}=O.createEventHook(),c=$(t),{state:e,source:n,currentList:l,size:u,containerRef:s}=c,v={overflowY:"auto"},{itemHeight:i,overscan:g=5}=r,h=x(e,n,i),d=P(n,i,e),p=k("vertical",g,d,h,c,o),m=E(i,n,e),y=f.computed(()=>m(e.value.start)),b=q(i,n,e);W(u,t,s,p);const R=D("vertical",p,m,s),V=T=>{const L=s.value;if(L){const{current:z}=e.value;let w=0;typeof i=="number"?w=z*(T*i-e.value.scale*i):w=n.value.slice(0,z).reduce((G,X,C)=>G+T*i(C)-e.value.scale*i(C),0),L.scrollTop=L.scrollTop+w>=0?L.scrollTop+w:0,e.value.scale=T}},H=f.computed(()=>({style:{height:`${b.value-y.value}px`,marginTop:`${y.value}px`,transform:`translateX(-50%) scale(${e.value.scale})`,transformOrigin:"50% 0%"}}));return{onUpdate:a,state:e,scaleTo:V,calculateRange:p,scrollTo:R,containerStyle:v,wrapperProps:H,currentList:l,containerRef:s}}exports.useVirtualList=S;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const O=require("@vueuse/shared"),f=require("vue"),G=require("@vueuse/core");function S(r,t){const{containerStyle:a,wrapperProps:o,scrollTo:n,calculateRange:e,currentList:c,containerRef:l,scaleTo:u,state:s,onUpdate:v}="itemHeight"in t?F(t,r):_(t,r);return{onUpdate:v,state:s,scaleTo:u,list:c,scrollTo:n,containerProps:{ref:l,onScroll:()=>{e()},style:a},wrapperProps:o}}function $(r){const t=f.ref(null),a=G.useElementSize(t),o=f.ref([]),n=f.shallowRef(r);return{state:f.ref({start:0,end:10,current:0,scale:1}),source:n,currentList:o,size:a,containerRef:t}}function x(r,t,a){return o=>{const{start:n=0,scale:e=1}=r.value;if(typeof a=="number")return Math.ceil(o/(a*e));let c=0,l=0;for(let u=n;u<t.value.length;u++){const s=a(u)*e;if(c+=s,l=u,c>o)break}return l-n}}function M(r,t,a){return o=>{const{scale:n=1}=a.value;if(typeof t=="number")return Math.floor(o/(t*n))+1;let e=0,c=0;for(let l=0;l<r.value.length;l++){const u=t(l)*n;if(e+=u,e>=o){c=l;break}}return c+1}}function P(r,t,a,o,{containerRef:n,state:e,currentList:c,source:l},u){return()=>{const s=n.value;if(s){const v=a(Math.ceil(r==="vertical"?s.scrollTop:s.scrollLeft)),i=o(r==="vertical"?s.clientHeight:s.clientWidth),g=v-t,h=v+i+t;e.value={start:g<0?0:g,end:h>l.value.length?l.value.length:h,current:v,scale:e.value.scale},c.value=l.value.slice(e.value.start,e.value.end).map((d,p)=>({data:d,index:p+e.value.start})),u(e.value)}}}function k(r,t,a){return o=>{const{scale:n=1}=a.value;return typeof r=="number"?o*(r*n):t.value.slice(0,o).reduce((c,l,u)=>c+r(u)*n,0)}}function E(r,t,a,o){f.watch([r.width,r.height,t,a],()=>{o()})}function W(r,t,a){return f.computed(()=>{const{scale:o=1}=a.value;return typeof r=="number"?t.value.length*r*o:t.value.reduce((n,e,c)=>n+r(c)*o,0)})}const U={horizontal:"scrollLeft",vertical:"scrollTop"};function q(r,t,a,o){return n=>{o.value&&(o.value[U[r]]=a(n),t())}}function _(r,t){const{on:a,trigger:o}=O.createEventHook(),n=$(t),{state:e,source:c,currentList:l,size:u,containerRef:s}=n,v={overflowX:"auto"},{itemWidth:i,overscan:g=5}=r,h=x(e,c,i),d=M(c,i,e),p=P("horizontal",g,d,h,n,o),m=k(i,c,e),y=f.computed(()=>m(e.value.start)),b=W(i,c,e);E(u,t,s,p);const R=q("horizontal",p,m,s),V=T=>{e.value.scale=T},H=f.computed(()=>({style:{height:"100%",width:`${b.value-y.value}px`,marginLeft:`${y.value}px`,display:"flex",transform:`scale(${e.value.scale})`,transformOrigin:"0% 0%"}}));return{onUpdate:a,state:e,scaleTo:V,scrollTo:R,calculateRange:p,wrapperProps:H,containerStyle:v,currentList:l,containerRef:s}}function F(r,t){const{on:a,trigger:o}=O.createEventHook(),n=$(t),{state:e,source:c,currentList:l,size:u,containerRef:s}=n,v={overflowY:"auto"},{itemHeight:i,overscan:g=5}=r,h=x(e,c,i),d=M(c,i,e),p=P("vertical",g,d,h,n,o),m=k(i,c,e),y=f.computed(()=>m(e.value.start)),b=W(i,c,e);E(u,t,s,p);const R=q("vertical",p,m,s),V=T=>{const L=s.value;if(L){const{current:z}=e.value;let w=0;typeof i=="number"?w=z*(T*i-e.value.scale*i):w=c.value.slice(0,z).reduce((D,X,C)=>D+T*i(C)-e.value.scale*i(C),0),L.scrollTop=L.scrollTop+w>=0?L.scrollTop+w:0,e.value.scale=T}},H=f.computed(()=>({style:{height:`${b.value-y.value}px`,marginTop:`${y.value}px`,transform:`translateX(-50%) scale(${e.value.scale})`,transformOrigin:"50% 0%"}}));return{onUpdate:a,state:e,scaleTo:V,calculateRange:p,scrollTo:R,containerStyle:v,wrapperProps:H,currentList:l,containerRef:s}}exports.useVirtualList=S;

package/dist/theme-chalk/icon.css

@@ -1 +1 @@
-@font-face{font-family:iconfont;src:url(fonts/iconfont.woff2?t=7246) format("woff2"),url(fonts/iconfont.woff?t=28361) format("woff"),url(fonts/iconfont.ttf?t=36646) format("truetype")}.king-icon{font-family:iconfont!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-king-title-icon:before{content:"\e680"}
+@font-face{font-family:iconfont;src:url(fonts/iconfont.woff2?t=79119) format("woff2"),url(fonts/iconfont.woff?t=85561) format("woff"),url(fonts/iconfont.ttf?t=83799) format("truetype")}.king-icon{font-family:iconfont!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-king-title-icon:before{content:"\e680"}

package/dist/theme-chalk/index.css

@@ -1 +1 @@
-:root{--king-color-white:#ffffff;--king-color-primary:#409eff;--king-color-success:#67c23a;--king-color-warning:#e6a23c;--king-color-danger:#f56c6c;--king-color-error:#f56c6c;--king-color-info:#909399;--king-transition-duration:0.3s}.king-button--primary{--king-button-text-color:var(--king-color-primary)}.king-button--success{--king-button-text-color:var(--king-color-success)}.king-button--warning{--king-button-text-color:var(--king-color-warning)}.king-button--danger{--king-button-text-color:var(--king-color-danger)}.king-button--error{--king-button-text-color:var(--king-color-error)}.king-button--info{--king-button-text-color:var(--king-color-info)}.king-button{color:var(--king-button-text-color)}.king-scrollbar{overflow:hidden;position:relative;z-index:auto;height:100%;width:100%}.king-scrollbar .king-scrollbar-container{width:100%;overflow:scroll;height:100%;min-height:inherit;max-height:inherit;scrollbar-width:none}.king-scrollbar .king-scrollbar-content{width:-moz-fit-content;width:fit-content}.king-scrollbar .king-scrollbar-rail{position:absolute}.king-scrollbar .king-scrollbar-rail--vertical{right:0;width:5px;top:2px;bottom:2px;right:4px}.king-scrollbar .king-scrollbar-rail--horizontal{bottom:2px;height:5px;left:2px;right:2px}.king-scrollbar .king-scrollbar-rail__scrollbar--vertical{background:rgba(0,0,0,.25);position:absolute;border-radius:5px;width:100%;cursor:pointer}.king-scrollbar .king-scrollbar-rail__scrollbar--horizontal{background:rgba(0,0,0,.25);position:absolute;border-radius:5px;height:100%;cursor:pointer}.v-vl-items{width:-moz-fit-content;width:fit-content}.king-scale-virtual-list{width:100%;height:100%}.king-scale-virtual-list .king-scale-virtual-list-container{margin:0 auto;position:relative}.king-scale-virtual-list .king-scale-vittual-wrapper{width:-moz-fit-content;width:fit-content;margin:0 auto;position:absolute;left:50%}.king-pro-title{border-bottom:1px solid #ccc;font-weight:500;display:flex;align-items:center}.king-pro-title .icon{margin-right:10px}.king-pro-title--unborder{border:none}.king-pro-modal .ant-modal-content{padding:0}.king-pro-modal .ant-modal-header{height:56px;padding-left:32px;padding-right:24px;display:flex;justify-content:space-between;align-items:center;background:#f1f7ff;border-bottom:1px solid #e6e8ea}.king-pro-modal .ant-modal-body{padding:10px 20px;max-height:65vh;overflow:auto}.king-pro-modal .ant-modal-footer{height:56px;display:flex;padding:0 16px;justify-content:flex-end;align-items:center;border-top:1px solid #e6e8ea}.king-pro-modal .ant-modal-title{flex:1}.king-pro-modal .pro-modal-title{cursor:move;width:100%}.king-pro-area-select{width:100%}@font-face{font-family:iconfont;src:url(fonts/iconfont.woff2?t=6990) format("woff2"),url(fonts/iconfont.woff?t=89318) format("woff"),url(fonts/iconfont.ttf?t=76164) format("truetype")}.king-icon{font-family:iconfont!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-king-title-icon:before{content:"\e680"}
+:root{--king-color-white:#ffffff;--king-color-primary:#409eff;--king-color-success:#67c23a;--king-color-warning:#e6a23c;--king-color-danger:#f56c6c;--king-color-error:#f56c6c;--king-color-info:#909399;--king-transition-duration:0.3s}.king-button--primary{--king-button-text-color:var(--king-color-primary)}.king-button--success{--king-button-text-color:var(--king-color-success)}.king-button--warning{--king-button-text-color:var(--king-color-warning)}.king-button--danger{--king-button-text-color:var(--king-color-danger)}.king-button--error{--king-button-text-color:var(--king-color-error)}.king-button--info{--king-button-text-color:var(--king-color-info)}.king-button{color:var(--king-button-text-color)}.king-scrollbar{overflow:hidden;position:relative;z-index:auto;height:100%;width:100%}.king-scrollbar .king-scrollbar-container{width:100%;overflow:scroll;height:100%;min-height:inherit;max-height:inherit;scrollbar-width:none}.king-scrollbar .king-scrollbar-content{width:-moz-fit-content;width:fit-content}.king-scrollbar .king-scrollbar-rail{position:absolute}.king-scrollbar .king-scrollbar-rail--vertical{right:0;width:5px;top:2px;bottom:2px;right:4px}.king-scrollbar .king-scrollbar-rail--horizontal{bottom:2px;height:5px;left:2px;right:2px}.king-scrollbar .king-scrollbar-rail__scrollbar--vertical{background:rgba(0,0,0,.25);position:absolute;border-radius:5px;width:100%;cursor:pointer}.king-scrollbar .king-scrollbar-rail__scrollbar--horizontal{background:rgba(0,0,0,.25);position:absolute;border-radius:5px;height:100%;cursor:pointer}.v-vl-items{width:-moz-fit-content;width:fit-content}.king-scale-virtual-list{width:100%;height:100%}.king-scale-virtual-list .king-scale-virtual-list-container{margin:0 auto;position:relative}.king-scale-virtual-list .king-scale-vittual-wrapper{width:-moz-fit-content;width:fit-content;margin:0 auto;position:absolute;left:50%}.king-pro-title{border-bottom:1px solid #ccc;font-weight:500;display:flex;align-items:center}.king-pro-title .icon{margin-right:10px}.king-pro-title--unborder{border:none}.king-pro-modal .ant-modal-content{padding:0}.king-pro-modal .ant-modal-header{height:56px;padding-left:32px;padding-right:24px;display:flex;justify-content:space-between;align-items:center;background:#f1f7ff;border-bottom:1px solid #e6e8ea}.king-pro-modal .ant-modal-body{padding:10px 20px;max-height:65vh;overflow:auto}.king-pro-modal .ant-modal-footer{height:56px;display:flex;padding:0 16px;justify-content:flex-end;align-items:center;border-top:1px solid #e6e8ea}.king-pro-modal .ant-modal-title{flex:1}.king-pro-modal .pro-modal-title{cursor:move;width:100%}.king-pro-area-select{width:100%}@font-face{font-family:iconfont;src:url(fonts/iconfont.woff2?t=97757) format("woff2"),url(fonts/iconfont.woff?t=33430) format("woff"),url(fonts/iconfont.ttf?t=96424) format("truetype")}.king-icon{font-family:iconfont!important;font-size:16px;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-king-title-icon:before{content:"\e680"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@king-one/antdv",
   "type": "module",
-  "version": "1.0.69",
+  "version": "1.0.70",
   "description": "",
   "author": "",
   "license": "ISC",