@soei/flyweight 0.2.2 → 0.2.6

package/Flyweight.cjs

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

package/Flyweight.js

@@ -1,31 +1,31 @@
-import { runer as m, isArray as j, each as g, picker as b, merge as L, isEmpty as A, isSimplyType as W, isString as M } from "@soei/util";
-import { openBlock as _, createElementBlock as x, normalizeClass as E, normalizeStyle as p, createElementVNode as k, Fragment as R, renderList as V, renderSlot as d, mergeProps as D, createCommentVNode as G, createTextVNode as P, toDisplayString as U } from "vue";
-let Y = /(\d+|[+\-\*/]|%)/g, B = {
+import { runer as g, isArray as V, each as _, merge as E, picker as C, isEmpty as G, isSimplyType as F, isString as M } from "@soei/util";
+import { openBlock as b, createElementBlock as k, normalizeClass as A, normalizeStyle as v, createElementVNode as S, Fragment as D, renderList as P, renderSlot as p, mergeProps as U, createCommentVNode as X, createTextVNode as Y, toDisplayString as q } from "vue";
+let J = /(\d+|[+\-\*/]|%)/g, I = {
   "+": (e, t) => e + t,
   "-": (e, t) => e - t,
   "*": (e, t) => e * t,
   "/": (e, t) => e / t,
   "%": (e, t, s) => parseFloat(e) / 100 * s
-}, C = (e, t) => {
+}, R = (e, t) => {
   let s;
-  if (s = m("match", e, Y)) {
-    let r = s.length, l, i = 0, o, h = [];
+  if (s = g("match", e, J)) {
+    let r = s.length, l, h = 0, i, n = [];
     for (; r--; )
-      i = s.shift(), i in B ? (l && h.push(l), i === "%" && (h.length = 2), o = i) : +i && h.push(+i), h.length == 2 && (h.push(t), console.log(h, o, "W"), l = B[o].apply(null, h), h.length = 0);
-    +l || (l = +h.pop()), e = l >> 0;
+      h = s.shift(), h in I ? (l && n.push(l), h === "%" && (n.length = 2), i = h) : +h && n.push(+h), n.length == 2 && (n.push(t), l = I[i].apply(null, n), n.length = 0);
+    +l || (l = +n.pop()), e = l >> 0;
   }
   return e;
-}, O = (e) => e.replace(/\w+\((.*)\)/g, "$1").replace(/(?=\D)0(?!\w)/, "0px");
-const I = (e, t) => {
+}, O = (e) => (e + "").replace(/\w+\((.*)\)/g, "$1").replace(/(?=\s+|^)(\d+(\.\d+)*)(?!(?:\.)*\d|%|\w)/g, "$1px");
+const j = (e, t) => {
   const s = e.__vccOpts || e;
   for (const [r, l] of t)
     s[r] = l;
   return s;
 };
-let F = (e) => e == null || e == null, q = (...e) => {
+let W = (e) => e == null || e == null, K = (...e) => {
   console.info("::::FLYWEIGHT", ...e);
 };
-const J = {
+const Q = {
   name: "Flyweight",
   props: {
     flys: {
@@ -86,10 +86,10 @@ const J = {
     return {
       flyweights: [],
       actice: !1,
-      Height: null,
+      Size: null,
       column: 1,
       row: 1,
-      fwheight: 10,
+      expand: 10,
       count: 0,
       task: [],
       realW: 0,
@@ -98,7 +98,7 @@ const J = {
   },
   watch: {
     flys(e) {
-      this.count = e.length, this.re();
+      this.count = e.length, this.rebuild();
       let t = this.task.shift();
       t && this.$nextTick(() => {
         this.setview(t);
@@ -127,17 +127,20 @@ const J = {
     }), this.setindex(this.index);
     try {
       new ResizeObserver(() => {
-        this.re(), this.$emit("resize");
+        this.rebuild(), this.$emit("resize");
       }).observe(this.flyweight);
     } catch (e) {
-      q(e);
+      K(e);
     }
+    this.scrollx = g("hasAttribute", this.flyweight, "scroll-x"), this.BoxRule = /* this.scrollx ? 'clientHeight=>width,clientWidth=>height' : */
+    "clientHeight=>height,clientWidth=>width", this.direction = this.scrollx ? "scrollLeft" : "scrollTop";
   },
   methods: {
+    exec: O,
     trigger(e, t) {
       this.lazyrun(() => {
-        j(e) || (e = [[e, t]]), g(e, (s, r) => {
-          this.$emit(r[0], F(r[1]) ? !0 : r[1]);
+        V(e) || (e = [[e, t]]), _(e, (s, r) => {
+          this.$emit(r[0], W(r[1]) ? !0 : r[1]);
         });
       });
     },
@@ -146,124 +149,135 @@ const J = {
         return e && this.task.push(e), !0;
     },
     setview(e) {
-      m([this.cheackflys, (t) => {
+      g([this.cheackflys, (t) => {
         t = t || {};
-        let s = t.index || g(this.flys, (r, l, i, o) => {
-          if (l[i] == o)
+        let s = t.index || _(this.flys, (r, l, h, i) => {
+          if (l[h] == i)
             return r;
         }, t.picker, t.id);
-        F(s) || this.setindex(s);
+        W(s) || this.setindex(s);
       }], this, e);
     },
     setindex(e) {
-      m([this.cheackflys, ({ index: t }) => {
-        this.$nextTick(() => {
-          let s = t / this.column >> 0, r = this.fwheight;
-          (this.flyweight.scrollTop / r >> 0) + this.row - s - 1 > 0 || (this.flyweight.scrollTop = s * r, this.scroll());
+      g([this.cheackflys, ({ index: t }) => {
+        this.selectIndex = t, this.$nextTick(() => {
+          let s = t / this.column >> 0, r = this.expand;
+          (this.flyweight[this.direction] / r >> 0) + this.row - s - 1 > 0 || (this.flyweight[this.direction] = s * r, this.scroll());
         });
       }], this, { index: e });
     },
     lazyrun(e, t) {
       clearTimeout(this.time), this.time = setTimeout(() => {
-        m(e);
+        g(e);
       }, t || this.lazy);
     },
     run(e) {
-      let t = [], s = b(e.target, "scrollTop=>top");
-      L(s, {
-        height: this.realH,
+      let t = [], s = g(this.direction, e.target), r = {
+        // ...this
+        offset: s,
+        top: s,
         width: this.realW,
+        height: this.realH,
         /* 显示区域第一行的索引 */
-        index: s.top / this.fwheight >> 0
-        // ...this
-      }, this.space, "mix"), e.from || t.push(["onscroll", s]);
-      let r = !1;
-      g(
+        index: s / this.expand >> 0
+      };
+      E(r, this.space), e.from || t.push(["onscroll", r]);
+      let l = !1;
+      _(
         this.flyweights,
-        (l, i, o, h, a, c, f, n) => {
-          if (o = l / a >> 0, f = o + h * /* 偏移量, 如果超出顶部 + 1轮,排列到列队后, 否则保持在当前*/
-          (+(o < c % h) + (c / h >> 0)), n = f * a + l % a, n >= this.count) {
-            r || (t.push(["onend"]), r = !0);
+        (h, i, n, a, d, c, u, f, o) => {
+          if (n = h / d >> 0, f = n + a * /* 偏移量, 如果超出顶部 + 1轮,排列到列队后, 否则保持在当前*/
+          (+(n < c % a) + (c / a >> 0)), o = f * d + h % d, o >= this.count) {
+            l || (t.push(["onend"]), l = !0);
             return;
           }
-          i.index = f, i.i = n, i.top = f * this.fwheight, i.data = this.flys[n], i.width = this.realW, i.height = this.realH;
+          i.index = f, i.i = o, i.data = this.flys[o];
+          let y = [
+            /* top */
+            f * this.expand + i.x,
+            /* left */
+            i.space
+          ];
+          u && y.reverse(), i.top = y[0], i.left = y[1];
         },
         null,
         this.row,
         this.column,
         /* 显示区域第一行的索引 */
-        s.index
+        r.index,
+        this.scrollx
       ), this.trigger(t), t = null;
     },
     scroll(e) {
       this.run(e || { target: this.flyweight, from: "space" });
     },
-    re() {
+    rebuild() {
       let e = this.count || this.flys.length, t = this.flyweights;
       if (!e)
         return t.length = e;
       this.count = e;
-      let s = this.flyweight, r = b(s, "clientHeight=>height,clientWidth=>width");
+      let s = this.scrollx, r = this.flyweight, l = C(r, this.BoxRule);
       this.$nextTick(() => {
-        let l = /true/.test(this.auto), [i, o] = this.offset, h = r.width, a = r.height, c = (C(this.width, h) || h) + i, f = C(this.height, a) + o;
-        this.realH = f - o;
-        let n = h / c >> 0 || 1, y = a / f >> 0, S = this.padding;
-        this.row = y + 2, this.column = n, this.fwheight = f;
-        let T, $ = 0;
-        l ? (c = (h - i * (n + 2 * S - 1)) / n, T = !S * i, $ = S * i) : (T = 0, $ = (h % c + i * n) / (n + 1) >> 0, c -= i), this.realW = c, this.Height = Math.ceil(e / n) * f;
-        let v = Math.min(e, n * this.row), w = v - 1, u, z, N;
-        for (; v-- > 0; )
-          u = w - v, N = this.flys[u], s = t[u], y = u / n >> 0, z = u % n, this.$set(t, u, {
-            data: N,
-            top: y * f,
-            left: z * (c + T) + (z + 1) * $,
-            index: y
+        let h = /true/.test(this.auto), [i, n] = this.offset, a = l.width, d = l.height, c = (R(this.width, a) || a) + i, u = R(this.height, d) + n, f = [a / c >> 0 || 1, d / u >> 0];
+        s && f.reverse();
+        let [o, y] = f, z = this.padding, T, $ = 0, w, N;
+        s ? (w = c, c -= i, N = (m) => (
+          /* 计算top偏移量 */
+          m * (u - n) + (m + 1) * n
+        )) : (h ? (c = (a - i * (o + 2 * z - 1)) / o, T = !z * i, $ = z * i) : (T = 0, $ = (a % c + i * o) / (o + 1) >> 0, c -= i), N = (m) => m * (c + T) + (m + 1) * $, w = u), this.row = y + 2, this.column = o, this.realH = u - n, this.realW = c, this.expand = w, this.Size = Math.ceil(e / o) * w;
+        let B = Math.min(e, o * this.row), x = B - 1, H;
+        for (; B-- > 0; )
+          H = x - B, this.$set(t, H, {
+            x: i,
+            y: n,
+            width: c,
+            height: u - n,
+            space: N(H % o),
+            data: {}
           });
-        t.length = w + 1;
-        let H = [];
-        a / f > w / n && H.push(["onend"]), this.scroll(), H.push(["update:space", {
-          row: (w / n >> 0) + 1,
-          column: n,
+        t.length = x + 1;
+        let L = [];
+        d / w > x / o && L.push(["onend"]), g(this.direction, this.flyweight, 0), this.$nextTick(() => {
+          this.setindex(this.selectIndex || 0);
+        }), this.scroll(), L.push(["update:space", {
+          row: (x / o >> 0) + 1,
+          column: o,
           showrow: this.row,
           showcolumn: this.column
-        }]), this.trigger(H);
+        }]), this.trigger(L);
       });
     }
   }
-};
-function K(e, t, s, r, l, i) {
-  return _(), x("div", {
+}, Z = { class: "flyweight-all" };
+function ee(e, t, s, r, l, h) {
+  return b(), k("div", {
     ref: "flyweight",
-    class: E(["flyweight", {
+    class: A(["flyweight", {
       "flyweight-active": l.actice
     }]),
-    style: p({
-      "--width": l.realW + "px",
-      "--height": l.realH + "px"
+    style: v({
+      "--width": h.exec(l.realW),
+      "--height": h.exec(l.realH),
+      "--flyweight-content": h.exec(l.Size)
     }),
-    onScroll: t[0] || (t[0] = (...o) => i.scroll && i.scroll(...o))
+    onScroll: t[0] || (t[0] = (...i) => h.scroll && h.scroll(...i))
   }, [
-    k("div", {
-      class: "flyweight-all",
-      style: p({
-        "--flyweight-height": l.Height + "px"
-      })
-    }, [
-      (_(!0), x(R, null, V(l.flyweights, (o, h) => (_(), x("div", {
-        key: h,
-        style: p({
-          top: o.top + "px",
-          left: o.left + "px"
+    S("div", Z, [
+      (b(!0), k(D, null, P(l.flyweights, (i, n) => (b(), k("div", {
+        key: n,
+        style: v({
+          top: i.top + "px",
+          left: i.left + "px"
         })
       }, [
-        d(e.$slots, "default", D({ ref_for: !0 }, o), void 0, !0)
+        p(e.$slots, "default", U({ ref_for: !0 }, i), void 0, !0)
       ], 4))), 128))
-    ], 4),
-    l.flyweights.length ? d(e.$slots, "end", { key: 0 }, void 0, !0) : G("", !0)
+    ]),
+    l.flyweights.length ? p(e.$slots, "end", { key: 0 }, void 0, !0) : X("", !0)
   ], 38);
 }
-const Q = /* @__PURE__ */ I(J, [["render", K], ["__scopeId", "data-v-4f09502c"]]);
-const X = {
+const te = /* @__PURE__ */ j(Q, [["render", ee], ["__scopeId", "data-v-5e2833e7"]]);
+const se = {
   name: "Card",
   // inheritAttrs: false,
   props: {
@@ -303,19 +317,24 @@ const X = {
   data() {
     return {
       closecss: {},
-      $$attrs: {},
-      top: "0",
-      right: "0",
-      bottom: "0",
-      left: "0",
-      style: {}
+      style: {},
+      default: {
+        top: "0px",
+        right: "0px",
+        bottom: "0px",
+        left: "0px",
+        height: "100%",
+        width: "100%",
+        background: "",
+        border: "1px"
+      }
     };
   },
   computed: {
     style() {
       let e = {};
-      return g(["BackGround", "Border", "Height", "Width", "Top", "Right", "BottoM", "Left"], (t, s) => {
-        e["--" + s.replace(/[a-z]/g, "")] = O(this[s.toLowerCase()]);
+      return this.margin(this.offset), _(["BackGround", "BordeR", "Height", "Width", "Top", "Right", "Bottom", "Left"], (t, s) => {
+        this.css(e, s);
       }), e;
     }
   },
@@ -328,63 +347,70 @@ const X = {
     },
     offset: {
       handler(e) {
-        this.offser(e);
+        this.margin(e);
       },
       deep: !0
     }
   },
   methods: {
     exec: O,
-    isEmpty: A,
-    isSimplyType: W,
+    isEmpty: G,
+    isSimplyType: F,
+    tolower(e, t) {
+      return t && (e = e.replace(/[a-z]/g, "")), e.toLowerCase();
+    },
+    css(e, t) {
+      let s = this.tolower(t), r = this[s] || this.default[s];
+      !r || this.default[s] == r || (e["--" + this.tolower(t, !0)] = O(r));
+    },
     change(e) {
-      W(e) || (this.closecss = b(e, "color=>--s-card-close-color,*"));
-    },
-    offser(e) {
-      e = M(e) ? e.split(/\s*(?:,|\s+)\s*/) : e;
-      let t = b(e, "0=>top,1|0=>right,2|0=>bottom,3|1|0=>left", !0);
-      g(t, (s, r, l) => {
-        l[s] = r + "px";
-      }, t), L(this, t, !0);
+      F(e) || (this.closecss = C(e, "color=>--s-card-close-color,*"));
+    },
+    margin(e) {
+      E(this, C(
+        M(e) ? e.split(/\s*(?:,|\s+)\s*/) : e,
+        "0=>top,1|0=>right,2|0=>bottom,3|1|0=>left",
+        !0
+      ), !0);
     }
   },
   mounted() {
-    this.change(this.close), this.offser(this.offset);
+    this.change(this.close);
   }
-}, Z = { class: "card-title" }, ee = { class: "card-content" };
-function te(e, t, s, r, l, i) {
-  return _(), x("div", {
+}, ie = { class: "card-title" }, le = { class: "card-content" };
+function re(e, t, s, r, l, h) {
+  return b(), k("div", {
     class: "card",
-    style: p(i.style)
+    style: v(h.style)
   }, [
-    d(e.$slots, "default", {}, () => [
-      d(e.$slots, "title", {}, () => [
-        k("div", Z, [
-          P(U(s.show || s.title) + " ", 1),
-          k("div", {
-            class: E(["card-close", { hide: i.isSimplyType(s.close) ? !s.close : !1 }]),
-            style: p(l.closecss),
-            onClick: t[0] || (t[0] = (o) => e.$emit("close"))
+    p(e.$slots, "default", {}, () => [
+      p(e.$slots, "title", {}, () => [
+        S("div", ie, [
+          Y(q(s.show || s.title) + " ", 1),
+          S("div", {
+            class: A(["card-close", { hide: h.isSimplyType(s.close) ? !s.close : !1 }]),
+            style: v(l.closecss),
+            onClick: t[0] || (t[0] = (i) => e.$emit("close"))
           }, null, 6)
         ])
       ], !0),
-      d(e.$slots, "content", {}, () => [
-        k("div", ee, [
-          d(e.$slots, "inner", {}, void 0, !0)
+      p(e.$slots, "content", {}, () => [
+        S("div", le, [
+          p(e.$slots, "inner", {}, void 0, !0)
         ])
       ], !0)
     ], !0)
   ], 4);
 }
-const se = /* @__PURE__ */ I(X, [["render", te], ["__scopeId", "data-v-ca61ca3d"]]), ie = [Q, se], he = {
+const he = /* @__PURE__ */ j(se, [["render", re], ["__scopeId", "data-v-def66c95"]]), ne = [te, he], ae = {
   install(e) {
-    ie.forEach((t) => {
+    ne.forEach((t) => {
       e.component("S" + t.name, t), e.component(t.name + "S", t);
     });
   }
 };
 export {
-  se as Card,
-  Q as Flyweight,
-  he as default
+  he as Card,
+  te as Flyweight,
+  ae as default
 };

package/README.md

@@ -2,7 +2,7 @@
 
 # 享元模式 [![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://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://npmjs.com/package/@soei/flyweight)
 
 ```html
 <div style="height:100px;width:300px;">
@@ -20,6 +20,98 @@ npm i @soei/flyweight
 
 ```
 
+## `使用 <s-flyweight ...> `
+
+```html
+<!-- scroll-x 横向滚动, 无[scroll-x]属性这是上下滚动 -->
+<s-flyweight scroll-x></s-flyweight>
+
+<!-- hover-scroll 鼠标移入显示滚动条样式 -->
+<s-flyweight hover-scroll class="your-class"></s-flyweight>
+<s-card hover-scroll class="your-class"></s-card>
+<style lang="scss">
+  .your-class {
+    /* 设置滚动条颜色 */
+    --scrollbar-color: red;
+    /* 设置滚动条宽度 */
+    --scrollbar-width: 10px;
+  }
+</style>
+
+<!-- 设置高度 -->
+<s-flyweight height="100% - 10px"></s-flyweight>
+
+<!-- 设置宽度 -->
+<s-flyweight width="100% - 10px"></s-flyweight>
+<s-flyweight :width="`100% - 10px`"></s-flyweight>
+```
+
+## `使用 <s-card ...> `
+
+```html
+<!-- auto-scroll 默认显示滚动条样式 -->
+<s-card auto-scroll class="your-class"></s-card>
+<!-- hover-scroll 鼠标移入显示滚动条样式 -->
+<s-card hover-scroll class="your-class"></s-card>
+<style lang="scss">
+  .your-class {
+    /* 设置滚动条颜色 */
+    --scrollbar-color: red;
+    /* 设置滚动条宽度 */
+    --scrollbar-width: 10px;
+  }
+</style>
+
+<!-- 设置高度 -->
+<s-card height="100% - 10px"></s-card>
+
+<!-- 设置边距 -->
+<s-card offset="10px"></s-card>
+<s-card :offset="[10]"></s-card>
+
+<!-- 带删除的卡片 -->
+<s-card :close="true" #content @close="close"></s-card>
+<!-- 设置删除按钮颜色 -->
+<s-card
+  :close="{
+		color: 'red'
+	}"
+  #content
+  @close="close"
+></s-card>
+
+<s-card :close="true" @close="close">
+  <template #content>呈现内容</template>
+</s-card>
+<script setup>
+  let close = () => {
+    console.log("close");
+  };
+</script>
+
+<!-- 设置标题 -->
+<s-card
+  title="标题"
+  class="flyweight"
+
+  // ** 布局 **
+  flex row center column
+
+  // ** 边距 **
+  offset="20, 0, 10, 0"
+
+  // ** 是否显示关闭按钮 **
+  :close="true"
+  @close="close"
+
+  // ** 插槽 **
+  [#content, #inner, #default]
+>
+</s-card>
+```
+
+````
+
 `Vue3` 引入方式
 
 ```html
@@ -30,7 +122,7 @@ npm i @soei/flyweight
 <style>
   @import "@soei/flyweight/dist/style.css";
 </style>
-```
+````
 
 ```javascript
 // main.js

package/package.json

@@ -2,7 +2,7 @@
   "name": "@soei/flyweight",
   "private": false,
   "description": "Vue组件, 列表de享元模式~减少DOM节点 flyweight, Card组件",
-  "version": "0.2.2",
+  "version": "0.2.6",
   "type": "module",
   "main": "Flyweight.cjs",
   "module": "Flyweight.js",
@@ -24,7 +24,9 @@
     "Flyweight",
     "享元模式",
     "List",
-    "列表展示"
+    "列表展示",
+    "Card",
+    "卡片展示"
   ],
   "author": "soei | alwbg@163.com",
   "license": "ISC"

package/style.css

@@ -1 +1 @@
-.flyweight[data-v-4f09502c]{height:100%;width:100%;overflow:auto;position:relative}.flyweight .flyweight-all[data-v-4f09502c]{height:var(--flyweight-height)}.flyweight .flyweight-all[data-v-4f09502c]>*{width:calc(var(--width));height:var(--height);position:absolute}.card[data-v-ca61ca3d]{position:relative;background-color:var(--BG, 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(--T, 0) var(--R, 0) var(--BM, 0) var(--L, 0);height:calc(var(--H, 100%) - var(--T, 0) - var(--BM, 0));width:calc(var(--W, 100%) - var(--L, 0) - var(--R, 0));overflow:auto}.card[simply][data-v-ca61ca3d],.card [simply][data-v-ca61ca3d]{background-color:inherit;border:0!important}.card[flex][data-v-ca61ca3d],.card [flex][data-v-ca61ca3d]{display:flex}.card[column][data-v-ca61ca3d],.card [column][data-v-ca61ca3d]{flex-direction:column}.card[row][data-v-ca61ca3d],.card [row][data-v-ca61ca3d]{flex-direction:row}.card[center][data-v-ca61ca3d],.card [center][data-v-ca61ca3d]{justify-content:center}.card[vcenter][data-v-ca61ca3d],.card [vcenter][data-v-ca61ca3d]{align-items:center}.card .card-title[data-v-ca61ca3d]{max-height:40px}.card .card-close[data-v-ca61ca3d]{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-ca61ca3d]{display:none}.card .card-close[data-v-ca61ca3d]:before,.card .card-close[data-v-ca61ca3d]: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-ca61ca3d]:before{transform:rotate(var(--s-transform, 45deg))}.card .card-close[data-v-ca61ca3d]:after{transform:rotate(calc(0deg - var(--s-transform, 45deg)))}.card .card-close[data-v-ca61ca3d]:hover:before{transform:rotate(var(--s-hover-transform, 45deg))}.card .card-close[data-v-ca61ca3d]:hover:after{transform:rotate(calc(0deg - var(--s-hover-transform, 45deg)))}.card .card-content[data-v-ca61ca3d]{overflow:auto}
+@charset "UTF-8";.flyweight[data-v-5e2833e7]{height:100%;width:100%;overflow:auto;position:relative}.flyweight[hover-scroll][data-v-5e2833e7]::-webkit-scrollbar-track,.flyweight[auto-scroll][data-v-5e2833e7]::-webkit-scrollbar-track{border-radius:10px}.flyweight[hover-scroll][data-v-5e2833e7]::-webkit-scrollbar-thumb,.flyweight[auto-scroll][data-v-5e2833e7]::-webkit-scrollbar-thumb{border-radius:10px;background-color:transparent}.flyweight[hover-scroll][data-v-5e2833e7]::-webkit-scrollbar,.flyweight[auto-scroll][data-v-5e2833e7]::-webkit-scrollbar{border-radius:10px;width:var(--scrollbar-width, 5px);height:var(--scrollbar-width, 5px)}.flyweight[hover-scroll][data-v-5e2833e7]:hover::-webkit-scrollbar-thumb,.flyweight[auto-scroll][data-v-5e2833e7]::-webkit-scrollbar-thumb{background-color:var(--scrollbar-color, #101010)}.flyweight[scroll-x] .flyweight-all[data-v-5e2833e7]{width:var(--flyweight-content);height:auto;min-height:100%}.flyweight[scroll-x] .flyweight-all[data-v-5e2833e7]+*{left:var(--flyweight-content);position:absolute;top:0;height:100%}.flyweight .flyweight-all[data-v-5e2833e7]{height:var(--flyweight-content)}.flyweight .flyweight-all[data-v-5e2833e7]>*{width:calc(var(--width));height:var(--height);position:absolute}.card[data-v-def66c95]{--t: 0px;--r: 0px;--b: 0px;--l: 0px;--h: 100%;--w: 100%;--br: 1px;position:relative;background-color:var(--bg, var(--card-background-color, #fff));padding:10px;border-radius:10px;box-sizing:border-box;border-style:solid;border-color:var(--card-border-color, #555);border-width:var(--br);justify-content:flex-start;margin:var(--t) var(--r) var(--b) var(--l);height:calc(var(--h) - var(--t) - var(--b));width:calc(var(--w) - var(--l) - var(--r));overflow:auto}.card[hover-scroll][data-v-def66c95]::-webkit-scrollbar-track,.card[auto-scroll][data-v-def66c95]::-webkit-scrollbar-track{border-radius:10px}.card[hover-scroll][data-v-def66c95]::-webkit-scrollbar-thumb,.card[auto-scroll][data-v-def66c95]::-webkit-scrollbar-thumb{border-radius:10px;background-color:transparent}.card[hover-scroll][data-v-def66c95]::-webkit-scrollbar,.card[auto-scroll][data-v-def66c95]::-webkit-scrollbar{border-radius:10px;width:var(--scrollbar-width, 5px);height:var(--scrollbar-width, 5px)}.card[hover-scroll][data-v-def66c95]:hover::-webkit-scrollbar-thumb,.card[auto-scroll][data-v-def66c95]::-webkit-scrollbar-thumb{background-color:var(--scrollbar-color, #101010)}.card[simply][data-v-def66c95],.card [simply][data-v-def66c95]{background-color:inherit;border:0!important}.card[flex][data-v-def66c95],.card [flex][data-v-def66c95]{display:flex}.card[column][data-v-def66c95],.card [column][data-v-def66c95]{flex-direction:column}.card[row][data-v-def66c95],.card [row][data-v-def66c95]{flex-direction:row}.card[center][data-v-def66c95],.card [center][data-v-def66c95]{justify-content:center}.card[vcenter][data-v-def66c95],.card [vcenter][data-v-def66c95]{align-items:center}.card .card-title[data-v-def66c95]{max-height:40px}.card .card-close[data-v-def66c95]{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-def66c95]{display:none}.card .card-close[data-v-def66c95]:before,.card .card-close[data-v-def66c95]: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-def66c95]:before{transform:rotate(var(--s-transform, 45deg))}.card .card-close[data-v-def66c95]:after{transform:rotate(calc(0deg - var(--s-transform, 45deg)))}.card .card-close[data-v-def66c95]:hover:before{transform:rotate(var(--s-hover-transform, 45deg))}.card .card-close[data-v-def66c95]:hover:after{transform:rotate(calc(0deg - var(--s-hover-transform, 45deg)))}.card .card-content[data-v-def66c95]{overflow:auto;height:100%}