@soei/flyweight 0.2.0 → 0.2.1

package/Flyweight.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const c=require("@soei/util"),s=require("vue");const v=(e,t)=>{const i=e.__vccOpts||e;for(const[r,l]of t)i[r]=l;return i};let b=e=>e==null||e==null,N=/(\d+|[+\-\*/]|%)/g,k={"+":(e,t)=>e+t,"-":(e,t)=>e-t,"*":(e,t)=>e*t,"/":(e,t)=>e/t,"%":(e,t,i)=>parseFloat(e)/100*i},x=(e,t)=>{let i;if(i=c.runer("match",e,N)){let r=i.length,l,h=0,o,n=[];for(;r--;)h=i.shift(),h in k?(l&&n.push(l),h==="%"&&(n.length=2),o=h):+h&&n.push(+h),n.length==2&&(n.push(t),l=k[o].apply(null,n),n.length=0);+l||(l=+n.pop()),e=l>>0}return e},E=(...e)=>{console.info("::::FLYWEIGHT",...e)};const H={name:"Flyweight",props:{flys:{type:Array,default:()=>[]},width:{type:Number,default:0},height:{type:Number,default:100},offset:{type:Array,default:()=>[0,0]},lazy:{type:Number,default:100},view:{type:Object,default:()=>null},index:{type:Number,default:0},top:{type:Number,default:!1},left:{type:Number,default:!1},auto:{type:[Boolean,String],default:!1},space:{type:Object,default:()=>null}},computed:{flyweight(){return this.$refs.flyweight}},data(){return{flyweights:[],actice:!1,Height:null,column:1,row:1,fwheight:10,count:0,task:[],realW:0,realH:0}},watch:{flys(e){this.count=e.length,this.re();let t=this.task.shift();t&&this.$nextTick(()=>{this.setview(t)})},view:{handler(e){this.setview(e)},immediate:!0},index(e){this.setindex(e)},top(e){this.flyweight.scrollTop=e},left(e){this.flyweight.scrollLeft=e}},mounted(){this.flyweights=[],this.$set||(this.$set=(e,t,i)=>{e[t]=i}),this.setindex(this.index);try{new ResizeObserver(()=>{this.re(),this.$emit("resize")}).observe(this.flyweight)}catch(e){E(e)}},methods:{trigger(e,t){this.lazyrun(()=>{c.isArray(e)||(e=[[e,t]]),c.each(e,(i,r)=>{this.$emit(r[0],b(r[1])?!0:r[1])})})},cheackflys(e){if(!this.flys.length)return e&&this.task.push(e),!0},setview(e){c.runer([this.cheackflys,t=>{t=t||{};let i=t.index||c.each(this.flys,(r,l,h,o)=>{if(l[h]==o)return r},t.picker,t.id);b(i)||this.setindex(i)}],this,e)},setindex(e){c.runer([this.cheackflys,({index:t})=>{this.$nextTick(()=>{let i=t/this.column>>0,r=this.fwheight;(this.flyweight.scrollTop/r>>0)+this.row-i-1>0||(this.flyweight.scrollTop=i*r,this.scroll())})}],this,{index:e})},lazyrun(e,t){clearTimeout(this.time),this.time=setTimeout(()=>{c.runer(e)},t||this.lazy)},run(e){let t=[],i=c.picker(e.target,"scrollTop=>top");c.merge(i,{height:this.realH,width:this.realW,index:i.top/this.fwheight>>0},this.space,"mix"),e.from||t.push(["onscroll",i]),c.each(this.flyweights,(r,l,h,o,n,d,a,u)=>{if(h=r/n>>0,a=h+o*(+(h<d%o)+(d/o>>0)),u=a*n+r%n,u>=this.count){t.push(["onend"]);return}l.index=a,l.top=a*this.fwheight,l.data=this.flys[u]},null,this.row,this.column,i.index),this.trigger(t),t=null},scroll(e){this.run(e||{target:this.flyweight,from:"space"})},re(){let e=this.count||this.flys.length,t=this.flyweights;if(!e)return t.length=e;this.count=e;let i=this.flyweight,r=c.picker(i,"clientHeight=>height,clientWidth=>width");this.$nextTick(()=>{let l=this.auto===!0,[h,o]=this.offset,n=r.width,d=r.height,a=(x(this.width,n)||n)+h,u=x(this.height,d)+o;this.realH=u-o;let f=n/a>>0||1,y=d/u>>0;this.row=y+2,this.column=f,this.fwheight=u;let m;l?(a=(n/f>>0)-h/f*(f-1),m=h):m=n%a/(f-1)>>0,this.realW=a,this.Height=Math.ceil(e/f)*u;let w=Math.min(e,f*this.row),p=w-1,g,S;for(;w-- >0;)g=p-w,S=this.flys[g],i=t[g],y=g/f>>0,this.$set(t,g,{data:S,top:y*u,left:g%f*(a+m),index:y});t.length=p+1;let _=[];d/u>p/f&&_.push(["onend"]),this.scroll(),_.push(["update:space",{row:(p/f>>0)+1,column:f,showrow:this.row,showcolumn:this.column}]),this.trigger(_)})}}};function B(e,t,i,r,l,h){return s.openBlock(),s.createElementBlock("div",{ref:"flyweight",class:s.normalizeClass(["flyweight",{"flyweight-active":l.actice}]),style:s.normalizeStyle({"--width":l.realW+"px","--height":l.realH+"px"}),onScroll:t[0]||(t[0]=(...o)=>h.scroll&&h.scroll(...o))},[s.createElementVNode("div",{class:"flyweight-all",style:s.normalizeStyle({"--flyweight-height":l.Height+"px"})},[(s.openBlock(!0),s.createElementBlock(s.Fragment,null,s.renderList(l.flyweights,(o,n)=>(s.openBlock(),s.createElementBlock("div",{key:n,style:s.normalizeStyle({top:o.top+"px",left:o.left+"px"})},[s.renderSlot(e.$slots,"default",{data:o.data,index:o.index},void 0,!0)],4))),128))],4),l.flyweights.length?s.renderSlot(e.$slots,"end",{key:0},void 0,!0):s.createCommentVNode("",!0)],38)}const T=v(H,[["render",B],["__scopeId","data-v-5f77e7a2"]]);const C={name:"Card",props:{offset:{type:[String,Array],default:()=>[0,0,0,0]},background:{type:String,default:""},border:{type:String,default:"1px"},height:{type:String,default:"100%"},width:{type:String,default:"100%"},show:{type:String,default:""},close:{type:Object,default:null},title:{type:String,default:""}},data(){return{closecss:{},$$attrs:{},top:"0",right:"0",bottom:"0",left:"0"}},watch:{close:{handler(e){this.change(e)},deep:!0},offset:{handler(e){this.offser(e)},deep:!0}},methods:{isEmpty:c.isEmpty,isSimplyType:c.isSimplyType,change(e){c.isSimplyType(e)||(this.closecss=c.picker(e,"color=>--s-card-close-color,*"))},offser(e){e=c.isString(e)?e.split(/\s*(?:,|\s+)\s*/):e;let t=c.picker(e,"0=>top,1|0=>right,2|0=>bottom,3|1|0=>left",!0);c.each(t,(i,r,l)=>{l[i]=r+"px"},t),c.merge(this,t,!0)}},mounted(){this.change(this.close),this.offser(this.offset)}},O={class:"card-title"},F={class:"card-content"};function $(e,t,i,r,l,h){return s.openBlock(),s.createElementBlock("div",{class:"card",style:s.normalizeStyle({"--card-bgc":i.background,"--card-bw":i.border,"--card-height":i.height,"--card-width":i.width,"--top":l.top,"--right":l.right,"--bottom":l.bottom,"--left":l.left})},[s.renderSlot(e.$slots,"default",{},()=>[s.renderSlot(e.$slots,"title",{},()=>[s.createElementVNode("div",O,[s.createTextVNode(s.toDisplayString(i.show||i.title)+" ",1),s.createElementVNode("div",{class:s.normalizeClass(["card-close",{hide:h.isSimplyType(i.close)?!i.close:!1}]),style:s.normalizeStyle(l.closecss),onClick:t[0]||(t[0]=o=>e.$emit("close"))},null,6)])],!0),s.renderSlot(e.$slots,"content",{},()=>[s.createElementVNode("div",F,[s.renderSlot(e.$slots,"inner",{},void 0,!0)])],!0)],!0)],4)}const z=v(C,[["render",$],["__scopeId","data-v-74802ccb"]]),V=[T,z],W={install(e){V.forEach(t=>{e.component("S"+t.name,t),e.component(t.name+"S",t)})}};exports.Card=z;exports.Flyweight=T;exports.default=W;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const c=require("@soei/util"),s=require("vue");let H=/(\d+|[+\-\*/]|%)/g,b={"+":(e,t)=>e+t,"-":(e,t)=>e-t,"*":(e,t)=>e*t,"/":(e,t)=>e/t,"%":(e,t,l)=>parseFloat(e)/100*l},v=(e,t)=>{let l;if(l=c.runer("match",e,H)){let h=l.length,i,r=0,o,n=[];for(;h--;)r=l.shift(),r in b?(i&&n.push(i),r==="%"&&(n.length=2),o=r):+r&&n.push(+r),n.length==2&&(n.push(t),console.log(n,o,"W"),i=b[o].apply(null,n),n.length=0);+i||(i=+n.pop()),e=i>>0}return e},B=e=>e.replace(/\w+\((.*)\)/g,"$1").replace(/(?=\D)0(?!\w)/,"0px");const z=(e,t)=>{const l=e.__vccOpts||e;for(const[h,i]of t)l[h]=i;return l};let T=e=>e==null||e==null,C=(...e)=>{console.info("::::FLYWEIGHT",...e)};const O={name:"Flyweight",props:{flys:{type:Array,default:()=>[]},width:{type:Number,default:0},height:{type:Number,default:100},offset:{type:Array,default:()=>[0,0]},lazy:{type:Number,default:100},view:{type:Object,default:()=>({id:0})},index:{type:Number,default:0},top:{type:Number,default:!1},left:{type:Number,default:!1},auto:{type:[Boolean,String],default:!1},space:{type:Object,default:()=>null}},computed:{flyweight(){return this.$refs.flyweight}},data(){return{flyweights:[],actice:!1,Height:null,column:1,row:1,fwheight:10,count:0,task:[],realW:0,realH:0}},watch:{flys(e){this.count=e.length,this.re();let t=this.task.shift();t&&this.$nextTick(()=>{this.setview(t)})},view:{handler(e){this.setview(e)},immediate:!0,deep:!0},index(e){this.setindex(e)},top(e){this.flyweight.scrollTop=e},left(e){this.flyweight.scrollLeft=e}},mounted(){this.flyweights=[],this.$set||(this.$set=(e,t,l)=>{e[t]=l}),this.setindex(this.index);try{new ResizeObserver(()=>{this.re(),this.$emit("resize")}).observe(this.flyweight)}catch(e){C(e)}},methods:{trigger(e,t){this.lazyrun(()=>{c.isArray(e)||(e=[[e,t]]),c.each(e,(l,h)=>{this.$emit(h[0],T(h[1])?!0:h[1])})})},cheackflys(e){if(!this.flys.length)return e&&this.task.push(e),!0},setview(e){c.runer([this.cheackflys,t=>{t=t||{};let l=t.index||c.each(this.flys,(h,i,r,o)=>{if(i[r]==o)return h},t.picker,t.id);T(l)||this.setindex(l)}],this,e)},setindex(e){c.runer([this.cheackflys,({index:t})=>{this.$nextTick(()=>{let l=t/this.column>>0,h=this.fwheight;(this.flyweight.scrollTop/h>>0)+this.row-l-1>0||(this.flyweight.scrollTop=l*h,this.scroll())})}],this,{index:e})},lazyrun(e,t){clearTimeout(this.time),this.time=setTimeout(()=>{c.runer(e)},t||this.lazy)},run(e){let t=[],l=c.picker(e.target,"scrollTop=>top");c.merge(l,{height:this.realH,width:this.realW,index:l.top/this.fwheight>>0},this.space,"mix"),e.from||t.push(["onscroll",l]);let h=!1;c.each(this.flyweights,(i,r,o,n,d,u,a,f)=>{if(o=i/d>>0,a=o+n*(+(o<u%n)+(u/n>>0)),f=a*d+i%d,f>=this.count){h||(t.push(["onend"]),h=!0);return}r.index=a,r.top=a*this.fwheight,r.data=this.flys[f]},null,this.row,this.column,l.index),this.trigger(t),t=null},scroll(e){this.run(e||{target:this.flyweight,from:"space"})},re(){let e=this.count||this.flys.length,t=this.flyweights;if(!e)return t.length=e;this.count=e;let l=this.flyweight,h=c.picker(l,"clientHeight=>height,clientWidth=>width");this.$nextTick(()=>{let i=/true/.test(this.auto),[r,o]=this.offset,n=h.width,d=h.height,u=(v(this.width,n)||n)+r,a=v(this.height,d)+o;this.realH=a-o;let f=n/u>>0||1,p=d/a>>0;this.row=p+2,this.column=f,this.fwheight=a;let m,x=0;i?(u=(n/f>>0)-r/f*(f-1),m=r):(m=0,x=r/(f+1)*f+n%u/(f+1)>>0,u-=r),this.realW=u,this.Height=Math.ceil(e/f)*a;let w=Math.min(e,f*this.row),y=w-1,g,_,k;for(;w-- >0;)g=y-w,k=this.flys[g],l=t[g],p=g/f>>0,_=g%f,this.$set(t,g,{data:k,top:p*a,left:_*(u+m)+(_+1)*x,index:p});t.length=y+1;let S=[];d/a>y/f&&S.push(["onend"]),this.scroll(),S.push(["update:space",{row:(y/f>>0)+1,column:f,showrow:this.row,showcolumn:this.column}]),this.trigger(S)})}}};function F(e,t,l,h,i,r){return s.openBlock(),s.createElementBlock("div",{ref:"flyweight",class:s.normalizeClass(["flyweight",{"flyweight-active":i.actice}]),style:s.normalizeStyle({"--width":i.realW+"px","--height":i.realH+"px"}),onScroll:t[0]||(t[0]=(...o)=>r.scroll&&r.scroll(...o))},[s.createElementVNode("div",{class:"flyweight-all",style:s.normalizeStyle({"--flyweight-height":i.Height+"px"})},[(s.openBlock(!0),s.createElementBlock(s.Fragment,null,s.renderList(i.flyweights,(o,n)=>(s.openBlock(),s.createElementBlock("div",{key:n,style:s.normalizeStyle({top:o.top+"px",left:o.left+"px"})},[s.renderSlot(e.$slots,"default",{data:o.data,index:o.index},void 0,!0)],4))),128))],4),i.flyweights.length?s.renderSlot(e.$slots,"end",{key:0},void 0,!0):s.createCommentVNode("",!0)],38)}const N=z(O,[["render",F],["__scopeId","data-v-292d1069"]]);const V={name:"Card",props:{offset:{type:[String,Array],default:()=>[0,0,0,0]},background:{type:String,default:""},border:{type:String,default:"1px"},height:{type:String,default:"100%"},width:{type:String,default:"100%"},show:{type:String,default:""},close:{type:Object,default:null},title:{type:String,default:""}},data(){return{closecss:{},$$attrs:{},top:"0",right:"0",bottom:"0",left:"0"}},watch:{close:{handler(e){this.change(e)},deep:!0},offset:{handler(e){this.offser(e)},deep:!0}},methods:{exec:B,isEmpty:c.isEmpty,isSimplyType:c.isSimplyType,change(e){c.isSimplyType(e)||(this.closecss=c.picker(e,"color=>--s-card-close-color,*"))},offser(e){e=c.isString(e)?e.split(/\s*(?:,|\s+)\s*/):e;let t=c.picker(e,"0=>top,1|0=>right,2|0=>bottom,3|1|0=>left",!0);c.each(t,(l,h,i)=>{i[l]=h+"px"},t),c.merge(this,t,!0)}},mounted(){this.change(this.close),this.offser(this.offset)}},W={class:"card-title"},$={class:"card-content"};function j(e,t,l,h,i,r){return s.openBlock(),s.createElementBlock("div",{class:"card",style:s.normalizeStyle({"--card-background-color":l.background,"--card-bw":l.border,"--card-height":r.exec(l.height),"--card-width":r.exec(l.width),"--top":i.top,"--right":i.right,"--bottom":i.bottom,"--left":i.left})},[s.renderSlot(e.$slots,"default",{},()=>[s.renderSlot(e.$slots,"title",{},()=>[s.createElementVNode("div",W,[s.createTextVNode(s.toDisplayString(l.show||l.title)+" ",1),s.createElementVNode("div",{class:s.normalizeClass(["card-close",{hide:r.isSimplyType(l.close)?!l.close:!1}]),style:s.normalizeStyle(i.closecss),onClick:t[0]||(t[0]=o=>e.$emit("close"))},null,6)])],!0),s.renderSlot(e.$slots,"content",{},()=>[s.createElementVNode("div",$,[s.renderSlot(e.$slots,"inner",{},void 0,!0)])],!0)],!0)],4)}const E=z(V,[["render",j],["__scopeId","data-v-84f183dc"]]),I=[N,E],L={install(e){I.forEach(t=>{e.component("S"+t.name,t),e.component(t.name+"S",t)})}};exports.Card=E;exports.Flyweight=N;exports.default=L;

package/Flyweight.js

@@ -1,30 +1,31 @@
-import { isArray as W, each as w, runer as m, picker as k, merge as C, isEmpty as I, isSimplyType as H, isString as L } from "@soei/util";
-import { openBlock as _, createElementBlock as b, normalizeClass as F, normalizeStyle as g, createElementVNode as x, Fragment as j, renderList as A, renderSlot as d, createCommentVNode as B, createTextVNode as V, toDisplayString as M } from "vue";
-const E = (t, e) => {
-  const s = t.__vccOpts || t;
-  for (const [l, i] of e)
-    s[l] = i;
-  return s;
-};
-let N = (t) => t == null || t == null, R = /(\d+|[+\-\*/]|%)/g, O = {
+import { runer as w, isArray as L, each as m, picker as k, merge as $, isEmpty as j, isSimplyType as O, isString as A } from "@soei/util";
+import { openBlock as _, createElementBlock as x, normalizeClass as E, normalizeStyle as g, createElementVNode as b, Fragment as B, renderList as V, renderSlot as d, createCommentVNode as D, createTextVNode as M, toDisplayString as R } from "vue";
+let G = /(\d+|[+\-\*/]|%)/g, C = {
   "+": (t, e) => t + e,
   "-": (t, e) => t - e,
   "*": (t, e) => t * e,
   "/": (t, e) => t / e,
   "%": (t, e, s) => parseFloat(t) / 100 * s
-}, $ = (t, e) => {
+}, F = (t, e) => {
   let s;
-  if (s = m("match", t, R)) {
-    let l = s.length, i, h = 0, n, r = [];
-    for (; l--; )
-      h = s.shift(), h in O ? (i && r.push(i), h === "%" && (r.length = 2), n = h) : +h && r.push(+h), r.length == 2 && (r.push(e), i = O[n].apply(null, r), r.length = 0);
+  if (s = w("match", t, G)) {
+    let h = s.length, i, l = 0, n, r = [];
+    for (; h--; )
+      l = s.shift(), l in C ? (i && r.push(i), l === "%" && (r.length = 2), n = l) : +l && r.push(+l), r.length == 2 && (r.push(e), console.log(r, n, "W"), i = C[n].apply(null, r), r.length = 0);
     +i || (i = +r.pop()), t = i >> 0;
   }
   return t;
-}, D = (...t) => {
+}, U = (t) => t.replace(/\w+\((.*)\)/g, "$1").replace(/(?=\D)0(?!\w)/, "0px");
+const I = (t, e) => {
+  const s = t.__vccOpts || t;
+  for (const [h, i] of e)
+    s[h] = i;
+  return s;
+};
+let W = (t) => t == null || t == null, Y = (...t) => {
   console.info("::::FLYWEIGHT", ...t);
 };
-const G = {
+const q = {
   name: "Flyweight",
   props: {
     flys: {
@@ -49,7 +50,7 @@ const G = {
     },
     view: {
       type: Object,
-      default: () => null
+      default: () => ({ id: 0 })
     },
     index: {
       type: Number,
@@ -103,7 +104,8 @@ const G = {
       handler(t) {
         this.setview(t);
       },
-      immediate: !0
+      immediate: !0,
+      deep: !0
     },
     index(t) {
       this.setindex(t);
@@ -124,14 +126,14 @@ const G = {
         this.re(), this.$emit("resize");
       }).observe(this.flyweight);
     } catch (t) {
-      D(t);
+      Y(t);
     }
   },
   methods: {
     trigger(t, e) {
       this.lazyrun(() => {
-        W(t) || (t = [[t, e]]), w(t, (s, l) => {
-          this.$emit(l[0], N(l[1]) ? !0 : l[1]);
+        L(t) || (t = [[t, e]]), m(t, (s, h) => {
+          this.$emit(h[0], W(h[1]) ? !0 : h[1]);
         });
       });
     },
@@ -140,45 +142,47 @@ const G = {
         return t && this.task.push(t), !0;
     },
     setview(t) {
-      m([this.cheackflys, (e) => {
+      w([this.cheackflys, (e) => {
         e = e || {};
-        let s = e.index || w(this.flys, (l, i, h, n) => {
-          if (i[h] == n)
-            return l;
+        let s = e.index || m(this.flys, (h, i, l, n) => {
+          if (i[l] == n)
+            return h;
         }, e.picker, e.id);
-        N(s) || this.setindex(s);
+        W(s) || this.setindex(s);
       }], this, t);
     },
     setindex(t) {
-      m([this.cheackflys, ({ index: e }) => {
+      w([this.cheackflys, ({ index: e }) => {
         this.$nextTick(() => {
-          let s = e / this.column >> 0, l = this.fwheight;
-          (this.flyweight.scrollTop / l >> 0) + this.row - s - 1 > 0 || (this.flyweight.scrollTop = s * l, this.scroll());
+          let s = e / this.column >> 0, h = this.fwheight;
+          (this.flyweight.scrollTop / h >> 0) + this.row - s - 1 > 0 || (this.flyweight.scrollTop = s * h, this.scroll());
         });
       }], this, { index: t });
     },
     lazyrun(t, e) {
       clearTimeout(this.time), this.time = setTimeout(() => {
-        m(t);
+        w(t);
       }, e || this.lazy);
     },
     run(t) {
       let e = [], s = k(t.target, "scrollTop=>top");
-      C(s, {
+      $(s, {
         height: this.realH,
         width: this.realW,
         /* 显示区域第一行的索引 */
         index: s.top / this.fwheight >> 0
         // ...this
-      }, this.space, "mix"), t.from || e.push(["onscroll", s]), w(
+      }, this.space, "mix"), t.from || e.push(["onscroll", s]);
+      let h = !1;
+      m(
         this.flyweights,
-        (l, i, h, n, r, u, f, c) => {
-          if (h = l / r >> 0, f = h + n * /* 偏移量, 如果超出顶部 + 1轮,排列到列队后, 否则保持在当前*/
-          (+(h < u % n) + (u / n >> 0)), c = f * r + l % r, c >= this.count) {
-            e.push(["onend"]);
+        (i, l, n, r, u, f, c, o) => {
+          if (n = i / u >> 0, c = n + r * /* 偏移量, 如果超出顶部 + 1轮,排列到列队后, 否则保持在当前*/
+          (+(n < f % r) + (f / r >> 0)), o = c * u + i % u, o >= this.count) {
+            h || (e.push(["onend"]), h = !0);
             return;
           }
-          i.index = f, i.top = f * this.fwheight, i.data = this.flys[c];
+          l.index = c, l.top = c * this.fwheight, l.data = this.flys[o];
         },
         null,
         this.row,
@@ -195,53 +199,53 @@ const G = {
       if (!t)
         return e.length = t;
       this.count = t;
-      let s = this.flyweight, l = k(s, "clientHeight=>height,clientWidth=>width");
+      let s = this.flyweight, h = k(s, "clientHeight=>height,clientWidth=>width");
       this.$nextTick(() => {
-        let i = this.auto === !0, [h, n] = this.offset, r = l.width, u = l.height, f = ($(this.width, r) || r) + h, c = $(this.height, u) + n;
+        let i = /true/.test(this.auto), [l, n] = this.offset, r = h.width, u = h.height, f = (F(this.width, r) || r) + l, c = F(this.height, u) + n;
         this.realH = c - n;
         let o = r / f >> 0 || 1, p = u / c >> 0;
         this.row = p + 2, this.column = o, this.fwheight = c;
-        let v;
-        i ? (f = (r / o >> 0) - h / o * (o - 1), v = h) : v = r % f / (o - 1) >> 0, this.realW = f, this.Height = Math.ceil(t / o) * c;
-        let S = Math.min(t, o * this.row), y = S - 1, a, z;
+        let v, H = 0;
+        i ? (f = (r / o >> 0) - l / o * (o - 1), v = l) : (v = 0, H = l / (o + 1) * o + r % f / (o + 1) >> 0, f -= l), this.realW = f, this.Height = Math.ceil(t / o) * c;
+        let S = Math.min(t, o * this.row), y = S - 1, a, T, N;
         for (; S-- > 0; )
-          a = y - S, z = this.flys[a], s = e[a], p = a / o >> 0, this.$set(e, a, {
-            data: z,
+          a = y - S, N = this.flys[a], s = e[a], p = a / o >> 0, T = a % o, this.$set(e, a, {
+            data: N,
             top: p * c,
-            left: a % o * (f + v),
+            left: T * (f + v) + (T + 1) * H,
             index: p
           });
         e.length = y + 1;
-        let T = [];
-        u / c > y / o && T.push(["onend"]), this.scroll(), T.push(["update:space", {
+        let z = [];
+        u / c > y / o && z.push(["onend"]), this.scroll(), z.push(["update:space", {
           row: (y / o >> 0) + 1,
           column: o,
           showrow: this.row,
           showcolumn: this.column
-        }]), this.trigger(T);
+        }]), this.trigger(z);
       });
     }
   }
 };
-function U(t, e, s, l, i, h) {
-  return _(), b("div", {
+function J(t, e, s, h, i, l) {
+  return _(), x("div", {
     ref: "flyweight",
-    class: F(["flyweight", {
+    class: E(["flyweight", {
       "flyweight-active": i.actice
     }]),
     style: g({
       "--width": i.realW + "px",
       "--height": i.realH + "px"
     }),
-    onScroll: e[0] || (e[0] = (...n) => h.scroll && h.scroll(...n))
+    onScroll: e[0] || (e[0] = (...n) => l.scroll && l.scroll(...n))
   }, [
-    x("div", {
+    b("div", {
       class: "flyweight-all",
       style: g({
         "--flyweight-height": i.Height + "px"
       })
     }, [
-      (_(!0), b(j, null, A(i.flyweights, (n, r) => (_(), b("div", {
+      (_(!0), x(B, null, V(i.flyweights, (n, r) => (_(), x("div", {
         key: r,
         style: g({
           top: n.top + "px",
@@ -254,11 +258,11 @@ function U(t, e, s, l, i, h) {
         }, void 0, !0)
       ], 4))), 128))
     ], 4),
-    i.flyweights.length ? d(t.$slots, "end", { key: 0 }, void 0, !0) : B("", !0)
+    i.flyweights.length ? d(t.$slots, "end", { key: 0 }, void 0, !0) : D("", !0)
   ], 38);
 }
-const Y = /* @__PURE__ */ E(G, [["render", U], ["__scopeId", "data-v-5f77e7a2"]]);
-const q = {
+const K = /* @__PURE__ */ I(q, [["render", J], ["__scopeId", "data-v-292d1069"]]);
+const P = {
   name: "Card",
   // inheritAttrs: false,
   props: {
@@ -320,31 +324,32 @@ const q = {
     }
   },
   methods: {
-    isEmpty: I,
-    isSimplyType: H,
+    exec: U,
+    isEmpty: j,
+    isSimplyType: O,
     change(t) {
-      H(t) || (this.closecss = k(t, "color=>--s-card-close-color,*"));
+      O(t) || (this.closecss = k(t, "color=>--s-card-close-color,*"));
     },
     offser(t) {
-      t = L(t) ? t.split(/\s*(?:,|\s+)\s*/) : t;
+      t = A(t) ? t.split(/\s*(?:,|\s+)\s*/) : t;
       let e = k(t, "0=>top,1|0=>right,2|0=>bottom,3|1|0=>left", !0);
-      w(e, (s, l, i) => {
-        i[s] = l + "px";
-      }, e), C(this, e, !0);
+      m(e, (s, h, i) => {
+        i[s] = h + "px";
+      }, e), $(this, e, !0);
     }
   },
   mounted() {
     this.change(this.close), this.offser(this.offset);
   }
-}, J = { class: "card-title" }, K = { class: "card-content" };
-function P(t, e, s, l, i, h) {
-  return _(), b("div", {
+}, Q = { class: "card-title" }, X = { class: "card-content" };
+function Z(t, e, s, h, i, l) {
+  return _(), x("div", {
     class: "card",
     style: g({
-      "--card-bgc": s.background,
+      "--card-background-color": s.background,
       "--card-bw": s.border,
-      "--card-height": s.height,
-      "--card-width": s.width,
+      "--card-height": l.exec(s.height),
+      "--card-width": l.exec(s.width),
       "--top": i.top,
       "--right": i.right,
       "--bottom": i.bottom,
@@ -353,32 +358,32 @@ function P(t, e, s, l, i, h) {
   }, [
     d(t.$slots, "default", {}, () => [
       d(t.$slots, "title", {}, () => [
-        x("div", J, [
-          V(M(s.show || s.title) + " ", 1),
-          x("div", {
-            class: F(["card-close", { hide: h.isSimplyType(s.close) ? !s.close : !1 }]),
+        b("div", Q, [
+          M(R(s.show || s.title) + " ", 1),
+          b("div", {
+            class: E(["card-close", { hide: l.isSimplyType(s.close) ? !s.close : !1 }]),
             style: g(i.closecss),
             onClick: e[0] || (e[0] = (n) => t.$emit("close"))
           }, null, 6)
         ])
       ], !0),
       d(t.$slots, "content", {}, () => [
-        x("div", K, [
+        b("div", X, [
           d(t.$slots, "inner", {}, void 0, !0)
         ])
       ], !0)
     ], !0)
   ], 4);
 }
-const Q = /* @__PURE__ */ E(q, [["render", P], ["__scopeId", "data-v-74802ccb"]]), X = [Y, Q], et = {
+const tt = /* @__PURE__ */ I(P, [["render", Z], ["__scopeId", "data-v-84f183dc"]]), et = [K, tt], lt = {
   install(t) {
-    X.forEach((e) => {
+    et.forEach((e) => {
       t.component("S" + e.name, e), t.component(e.name + "S", e);
     });
   }
 };
 export {
-  Q as Card,
-  Y as Flyweight,
-  et as default
+  tt as Card,
+  K as Flyweight,
+  lt as default
 };

package/README.md

@@ -1,8 +1,8 @@
-![安装](https://img.shields.io/badge/安装-npm_i_@soei/flyweight-ffc107?style=flat)
+[![安装](https://img.shields.io/badge/安装-npm_i_@soei/flyweight-ffc107?style=flat)](https://npmjs.com/package/@soei/flyweight)
 
-# 享元模式 [![Latest Version on NPM](https://img.shields.io/npm/v/@soei/flyweight?label=npm&style=flat-square)](https://npmjs.com/package/@soei/flyweight) [![Software License](https://img.shields.io/badge/license-ISC-brightgreen?label=&style=flat-square)](LICENSE.md) [![npm](https://img.shields.io/npm/dw/@soei/flyweight?label=Downloads&style=flat-square)](https://www.npmjs.com/package/@soei/flyweight) ![npm bundle size](https://img.shields.io/bundlephobia/min/%40soei%2Futil?label=Size&color=&style=flat-square)
+# 享元模式 [![Latest Version on NPM](https://img.shields.io/npm/v/@soei/flyweight?label=npm&style=flat-square)](https://npmjs.com/package/@soei/flyweight) [![Software License](https://img.shields.io/badge/license-ISC-brightgreen?label=&style=flat-square)](LICENSE.md) [![npm](https://img.shields.io/npm/dw/@soei/flyweight?label=Downloads&style=flat-square)](https://www.npmjs.com/package/@soei/flyweight) [![npm bundle size](https://img.shields.io/bundlephobia/min/%40soei%2Futil?label=Size&color=&style=flat-square)](https://npmjs.com/package/@soei/flyweight)
 
-![安装](https://img.shields.io/badge/-@soei-ae8aff?style=flat-square)![NPM Downloads by package author](https://img.shields.io/npm-stat/dw/soeiz?style=flat-square)
+[![安装](https://img.shields.io/badge/-@soei-ae8aff?style=flat-square)![NPM Downloads by package author](https://img.shields.io/npm-stat/dw/soeiz?style=flat-square)](https://npmjs.com/package/@soei/flyweight) 
 
 ```html
 <div style="height:100px;width:300px;">
@@ -11,7 +11,7 @@
 </div>
 ```
 
-![安装](https://img.shields.io/badge/引用-import_{_Flyweight_}_from_"@soei/flyweight"-00bcd4?style=flat-square)
+[![安装](https://img.shields.io/badge/引用-import_{_Flyweight_}_from_"@soei/flyweight"-00bcd4?style=flat-square)](https://npmjs.com/package/@soei/flyweight)
 
 ## `安装`
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@soei/flyweight",
   "private": false,
   "description": "Vue组件, 列表de享元模式~减少DOM节点 flyweight, Card组件",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "main": "Flyweight.cjs",
   "module": "Flyweight.js",

package/style.css

@@ -1 +1 @@
-.flyweight[data-v-5f77e7a2]{height:100%;width:100%;overflow:auto;position:relative}.flyweight .flyweight-all[data-v-5f77e7a2]{height:var(--flyweight-height)}.flyweight .flyweight-all[data-v-5f77e7a2]>*{width:calc(var(--width));height:var(--height);position:absolute}.card[data-v-74802ccb]{position:relative;background-color:var(--card-bgc);height:100%;width:100%;padding:10px;border-radius:10px;box-sizing:border-box;border-style:solid;border-color:var(--card-border-color, #555);justify-content:flex-start;margin:var(--top, 0) var(--right, 0) var(--bottom, 0) var(--left, 0);height:calc(var(--card-height, 100%) - var(--top, 0) - var(--bottom, 0))}.card[simply][data-v-74802ccb],.card [simply][data-v-74802ccb]{background-color:inherit;border:0!important}.card[flex][data-v-74802ccb],.card [flex][data-v-74802ccb]{display:flex}.card[column][data-v-74802ccb],.card [column][data-v-74802ccb]{flex-direction:column}.card[row][data-v-74802ccb],.card [row][data-v-74802ccb]{flex-direction:row}.card[center][data-v-74802ccb],.card [center][data-v-74802ccb]{justify-content:center}.card[vcenter][data-v-74802ccb],.card [vcenter][data-v-74802ccb]{align-items:center}.card .card-title[data-v-74802ccb]{max-height:40px}.card .card-close[data-v-74802ccb]{position:absolute;width:20px;height:20px;right:10px;top:10px;border-radius:10px;z-index:1;--s-transform: 45deg;--s-hover-transform: 35deg;--s-close-width: 11px;--s-close-height: 2px;cursor:pointer;background-color:var(--s-card-close-background-color, transparent);transition:all .3s ease}.card .card-close.hide[data-v-74802ccb]{display:none}.card .card-close[data-v-74802ccb]:before,.card .card-close[data-v-74802ccb]:after{content:"";width:var(--s-close-width, 11px);height:var(--s-close-height, 2px);background-color:var(--s-card-close-color, #555);transform-origin:center;position:inherit;border-radius:10px;top:calc(50% - var(--s-close-height, 2px) / 2);left:calc(50% - var(--s-close-width, 11px) / 2)}.card .card-close[data-v-74802ccb]:before{transform:rotate(var(--s-transform, 45deg))}.card .card-close[data-v-74802ccb]:after{transform:rotate(calc(0deg - var(--s-transform, 45deg)))}.card .card-close[data-v-74802ccb]:hover:before{transform:rotate(var(--s-hover-transform, 45deg))}.card .card-close[data-v-74802ccb]:hover:after{transform:rotate(calc(0deg - var(--s-hover-transform, 45deg)))}.card .card-content[data-v-74802ccb]{overflow:auto}
+.flyweight[data-v-292d1069]{height:100%;width:100%;overflow:auto;position:relative}.flyweight .flyweight-all[data-v-292d1069]{height:var(--flyweight-height)}.flyweight .flyweight-all[data-v-292d1069]>*{width:calc(var(--width));height:var(--height);position:absolute}.card[data-v-84f183dc]{position:relative;background-color:var(--card-bgc, var(--card-background-color, #fff));padding:10px;border-radius:10px;box-sizing:border-box;border-style:solid;border-color:var(--card-border-color, #555);justify-content:flex-start;margin:var(--top, 0) var(--right, 0) var(--bottom, 0) var(--left, 0);height:calc(var(--card-height, 100%) - var(--top, 0) - var(--bottom, 0));width:var(--card-width, 100%);overflow:auto}.card[simply][data-v-84f183dc],.card [simply][data-v-84f183dc]{background-color:inherit;border:0!important}.card[flex][data-v-84f183dc],.card [flex][data-v-84f183dc]{display:flex}.card[column][data-v-84f183dc],.card [column][data-v-84f183dc]{flex-direction:column}.card[row][data-v-84f183dc],.card [row][data-v-84f183dc]{flex-direction:row}.card[center][data-v-84f183dc],.card [center][data-v-84f183dc]{justify-content:center}.card[vcenter][data-v-84f183dc],.card [vcenter][data-v-84f183dc]{align-items:center}.card .card-title[data-v-84f183dc]{max-height:40px}.card .card-close[data-v-84f183dc]{position:absolute;width:20px;height:20px;right:10px;top:10px;border-radius:10px;z-index:1;--s-transform: 45deg;--s-hover-transform: 35deg;--s-close-width: 11px;--s-close-height: 2px;cursor:pointer;background-color:var(--s-card-close-background-color, transparent);transition:all .3s ease}.card .card-close.hide[data-v-84f183dc]{display:none}.card .card-close[data-v-84f183dc]:before,.card .card-close[data-v-84f183dc]:after{content:"";width:var(--s-close-width, 11px);height:var(--s-close-height, 2px);background-color:var(--s-card-close-color, #555);transform-origin:center;position:inherit;border-radius:10px;top:calc(50% - var(--s-close-height, 2px) / 2);left:calc(50% - var(--s-close-width, 11px) / 2)}.card .card-close[data-v-84f183dc]:before{transform:rotate(var(--s-transform, 45deg))}.card .card-close[data-v-84f183dc]:after{transform:rotate(calc(0deg - var(--s-transform, 45deg)))}.card .card-close[data-v-84f183dc]:hover:before{transform:rotate(var(--s-hover-transform, 45deg))}.card .card-close[data-v-84f183dc]:hover:after{transform:rotate(calc(0deg - var(--s-hover-transform, 45deg)))}.card .card-content[data-v-84f183dc]{overflow:auto}