@soei/flyweight 0.0.5 → 0.0.7

package/README.md

@@ -9,6 +9,20 @@
 
 ### 更新日志
 
+### `0.0.7`
+
+- #### 新增 `:auto`, 默认值: `false`
+
+  当 `auto` 为 `true` 时, `:width` 赋值会被视为 `最小值`, 剩余空间自动填充
+
+  ```html
+  <s-flyweight :auto="true" :width="100"></s-flyweight>
+  ```
+
+### `0.0.6`
+
+- #### 优化 `flys` 初始化赋值,不改变时,获取 length 问题
+
 ### `0.0.5`
 
 - #### 扩展 `width` 赋值

package/dist/Flyweight.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const u=require("@soei/util"),o=require("vue");const v=(e,t)=>{const l=e.__vccOpts||e;for(const[n,i]of t)l[n]=i;return l};let b=e=>e==null||e==null,z=/(\d+|[+\-\*/]|%)/g,m={"+":(e,t)=>e+t,"-":(e,t)=>e-t,"*":(e,t)=>e*t,"/":(e,t)=>e/t,"%":(e,t,l)=>parseFloat(e)/100*l},k=(e,t)=>{let l;if(l=u.runer("match",e,z)){let n=l.length,i,h=0,s,r=[];for(;n--;)h=l.shift(),h in m?(i&&r.push(i),h==="%"&&(r.length=2),s=h):+h&&r.push(+h),r.length==2&&(r.push(t),i=m[s].apply(null,r),r.length=0);+i||(i=+r.pop()),e=i>>0}return e},T=(...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}},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,l)=>{e[t]=l}),this.setindex(this.index);try{new ResizeObserver(()=>{this.re(),this.$emit("resize")}).observe(this.flyweight)}catch(e){T(e)}},methods:{trigger(e){this.lazyrun(()=>this.$emit(e,!0))},cheackflys(e){if(!this.flys.length)return e&&this.task.push(e),!0},setview(e){u.runer([this.cheackflys,t=>{t=t||{};let l=t.index||u.each(this.flys,(n,i,h,s)=>{if(i[h]==s)return n},t.picker,t.id);b(l)||this.setindex(l)}],this,e)},setindex(e){u.runer([this.cheackflys,({index:t})=>{this.$nextTick(()=>{let l=t/this.column>>0,n=this.fwheight;(this.flyweight.scrollTop/n>>0)+this.row-l-1>0||(this.flyweight.scrollTop=l*n,this.scroll())})}],this,{index:e})},lazyrun(e,t){clearTimeout(this.time),this.time=setTimeout(()=>{u.runer(e)},t||this.lazy)},run(e){let t=u.picker(e.target,"scrollTop=>top");u.each(this.flyweights,(l,n,i,h,s,r,c,f)=>{if(i=l/s>>0,c=i+h*(+(i<r%h)+(r/h>>0)),f=c*s+l%s,f>=this.count){this.trigger("onend");return}n.index=c,n.top=c*this.fwheight,n.data=this.flys[f]},null,this.row,this.column,t.top/this.fwheight>>0)},scroll(e){this.run(e||{target:this.flyweight})},re(){let e=this.count||this.flys.length,t=this.flyweights;if(!e)return t.length=e;let l=this.flyweight,n=u.picker(l,"clientHeight=>height,clientWidth=>width");this.$nextTick(()=>{let[i,h]=this.offset,s=n.width,r=n.height,c=(k(this.width,s)||s)+i,f=k(this.height,r)+h;this.realW=c-i,this.realH=f-h;let a=s/c>>0||1,y=r/f>>0;this.row=y+2,this.column=a,this.fwheight=f;let _=s%c/(a-1)>>0;this.Height=Math.ceil(e/a)*f;let d=Math.min(e,a*this.row),p=d-1,g,w;for(;d-- >0;)g=p-d,w=this.flys[g],l=t[g],y=g/a>>0,this.$set(t,g,{data:w,top:y*f,left:g%a*(c+_),index:y});t.length=p+1,r/f>p&&this.trigger("onend"),this.scroll()})}}},N=["data"];function S(e,t,l,n,i,h){return o.openBlock(),o.createElementBlock("div",{ref:"flyweight",class:o.normalizeClass(["flyweight",{"flyweight-active":i.actice}]),style:o.normalizeStyle({"--width":i.realW+"px","--height":i.realH+"px"}),onScroll:t[0]||(t[0]=(...s)=>h.scroll&&h.scroll(...s))},[o.createElementVNode("div",{class:"flyweight-all",style:o.normalizeStyle({"--flyweight-height":i.Height+"px"})},[(o.openBlock(!0),o.createElementBlock(o.Fragment,null,o.renderList(i.flyweights,(s,r)=>(o.openBlock(),o.createElementBlock("div",{key:r,data:s.top,style:o.normalizeStyle({top:s.top+"px",left:s.left+"px"})},[o.renderSlot(e.$slots,"default",{data:s.data,index:s.index},void 0,!0)],12,N))),128))],4),i.flyweights.length?o.renderSlot(e.$slots,"end",{key:0},void 0,!0):o.createCommentVNode("",!0)],38)}const x=v(H,[["render",S],["__scopeId","data-v-44af801a"]]),F=[x],$={install(e){F.forEach(t=>{e.component("s-"+t.name.toLowerCase(),t)})}};exports.Flyweight=x;exports.default=$;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const a=require("@soei/util"),o=require("vue");const b=(e,t)=>{const l=e.__vccOpts||e;for(const[n,i]of t)l[n]=i;return l};let z=e=>e==null||e==null,T=/(\d+|[+\-\*/]|%)/g,x={"+":(e,t)=>e+t,"-":(e,t)=>e-t,"*":(e,t)=>e*t,"/":(e,t)=>e/t,"%":(e,t,l)=>parseFloat(e)/100*l},_=(e,t)=>{let l;if(l=a.runer("match",e,T)){let n=l.length,i,s=0,h,r=[];for(;n--;)s=l.shift(),s in x?(i&&r.push(i),s==="%"&&(r.length=2),h=s):+s&&r.push(+s),r.length==2&&(r.push(t),i=x[h].apply(null,r),r.length=0);+i||(i=+r.pop()),e=i>>0}return e},H=(...e)=>{console.info("::::FLYWEIGHT",...e)};const N={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}},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,l)=>{e[t]=l}),this.setindex(this.index);try{new ResizeObserver(()=>{this.re(),this.$emit("resize")}).observe(this.flyweight)}catch(e){H(e)}},methods:{trigger(e){this.lazyrun(()=>this.$emit(e,!0))},cheackflys(e){if(!this.flys.length)return e&&this.task.push(e),!0},setview(e){a.runer([this.cheackflys,t=>{t=t||{};let l=t.index||a.each(this.flys,(n,i,s,h)=>{if(i[s]==h)return n},t.picker,t.id);z(l)||this.setindex(l)}],this,e)},setindex(e){a.runer([this.cheackflys,({index:t})=>{this.$nextTick(()=>{let l=t/this.column>>0,n=this.fwheight;(this.flyweight.scrollTop/n>>0)+this.row-l-1>0||(this.flyweight.scrollTop=l*n,this.scroll())})}],this,{index:e})},lazyrun(e,t){clearTimeout(this.time),this.time=setTimeout(()=>{a.runer(e)},t||this.lazy)},run(e){let t=a.picker(e.target,"scrollTop=>top");a.each(this.flyweights,(l,n,i,s,h,r,u,f)=>{if(i=l/h>>0,u=i+s*(+(i<r%s)+(r/s>>0)),f=u*h+l%h,f>=this.count){this.trigger("onend");return}n.index=u,n.top=u*this.fwheight,n.data=this.flys[f]},null,this.row,this.column,t.top/this.fwheight>>0)},scroll(e){this.run(e||{target:this.flyweight})},re(){let e=this.count||this.flys.length,t=this.flyweights;if(!e)return t.length=e;this.count=e;let l=this.flyweight,n=a.picker(l,"clientHeight=>height,clientWidth=>width");this.$nextTick(()=>{let i=this.auto===!0,[s,h]=this.offset,r=n.width,u=n.height,f=(_(this.width,r)||r)+s,g=_(this.height,u)+h;this.realW=f-s,this.realH=g-h;let c=r/f>>0||1,d=u/g>>0;this.row=d+2,this.column=c,this.fwheight=g;let m=r%f/(c-1*+!i)>>0;i&&(f=this.realW=(r/c>>0)-s,m=s),this.Height=Math.ceil(e/c)*g;let p=Math.min(e,c*this.row),w=p-1,y,k;for(;p-- >0;)y=w-p,k=this.flys[y],l=t[y],d=y/c>>0,this.$set(t,y,{data:k,top:d*g,left:y%c*(f+m),index:d});t.length=w+1,u/g>w&&this.trigger("onend"),this.scroll()})}}},S=["data"];function B(e,t,l,n,i,s){return o.openBlock(),o.createElementBlock("div",{ref:"flyweight",class:o.normalizeClass(["flyweight",{"flyweight-active":i.actice}]),style:o.normalizeStyle({"--width":i.realW+"px","--height":i.realH+"px"}),onScroll:t[0]||(t[0]=(...h)=>s.scroll&&s.scroll(...h))},[o.createElementVNode("div",{class:"flyweight-all",style:o.normalizeStyle({"--flyweight-height":i.Height+"px"})},[(o.openBlock(!0),o.createElementBlock(o.Fragment,null,o.renderList(i.flyweights,(h,r)=>(o.openBlock(),o.createElementBlock("div",{key:r,data:h.top,style:o.normalizeStyle({top:h.top+"px",left:h.left+"px"})},[o.renderSlot(e.$slots,"default",{data:h.data,index:h.index},void 0,!0)],12,S))),128))],4),i.flyweights.length?o.renderSlot(e.$slots,"end",{key:0},void 0,!0):o.createCommentVNode("",!0)],38)}const v=b(N,[["render",B],["__scopeId","data-v-144a29f8"]]),F=[v],$={install(e){F.forEach(t=>{e.component("s-"+t.name.toLowerCase(),t)})}};exports.Flyweight=v;exports.default=$;

package/dist/Flyweight.js

@@ -1,30 +1,30 @@
-import { runer as g, each as _, picker as k } from "@soei/util";
-import { openBlock as p, createElementBlock as w, normalizeClass as H, normalizeStyle as m, createElementVNode as N, Fragment as $, renderList as F, renderSlot as v, createCommentVNode as L } from "vue";
-const O = (t, e) => {
+import { runer as y, each as v, picker as b } from "@soei/util";
+import { openBlock as w, createElementBlock as m, normalizeClass as N, normalizeStyle as x, createElementVNode as $, Fragment as F, renderList as L, renderSlot as z, createCommentVNode as O } from "vue";
+const W = (t, e) => {
   const s = t.__vccOpts || t;
   for (const [n, i] of e)
     s[n] = i;
   return s;
 };
-let E = (t) => t == null || t == null, W = /(\d+|[+\-\*/]|%)/g, b = {
+let E = (t) => t == null || t == null, S = /(\d+|[+\-\*/]|%)/g, T = {
   "+": (t, e) => t + e,
   "-": (t, e) => t - e,
   "*": (t, e) => t * e,
   "/": (t, e) => t / e,
   "%": (t, e, s) => parseFloat(t) / 100 * s
-}, z = (t, e) => {
+}, H = (t, e) => {
   let s;
-  if (s = g("match", t, W)) {
-    let n = s.length, i, h = 0, l, r = [];
+  if (s = y("match", t, S)) {
+    let n = s.length, i, l = 0, h, r = [];
     for (; n--; )
-      h = s.shift(), h in b ? (i && r.push(i), h === "%" && (r.length = 2), l = h) : +h && r.push(+h), r.length == 2 && (r.push(e), i = b[l].apply(null, r), r.length = 0);
+      l = s.shift(), l in T ? (i && r.push(i), l === "%" && (r.length = 2), h = l) : +l && r.push(+l), r.length == 2 && (r.push(e), i = T[h].apply(null, r), r.length = 0);
     +i || (i = +r.pop()), t = i >> 0;
   }
   return t;
-}, C = (...t) => {
+}, B = (...t) => {
   console.info("::::FLYWEIGHT", ...t);
 };
-const I = {
+const C = {
   name: "Flyweight",
   props: {
     flys: {
@@ -62,6 +62,10 @@ const I = {
     left: {
       type: Number,
       default: !1
+    },
+    auto: {
+      type: [Boolean, String],
+      default: !1
     }
   },
   computed: {
@@ -116,7 +120,7 @@ const I = {
         this.re(), this.$emit("resize");
       }).observe(this.flyweight);
     } catch (t) {
-      C(t);
+      B(t);
     }
   },
   methods: {
@@ -128,17 +132,17 @@ const I = {
         return t && this.task.push(t), !0;
     },
     setview(t) {
-      g([this.cheackflys, (e) => {
+      y([this.cheackflys, (e) => {
         e = e || {};
-        let s = e.index || _(this.flys, (n, i, h, l) => {
-          if (i[h] == l)
+        let s = e.index || v(this.flys, (n, i, l, h) => {
+          if (i[l] == h)
             return n;
         }, e.picker, e.id);
         E(s) || this.setindex(s);
       }], this, t);
     },
     setindex(t) {
-      g([this.cheackflys, ({ index: e }) => {
+      y([this.cheackflys, ({ index: e }) => {
         this.$nextTick(() => {
           let s = e / this.column >> 0, n = this.fwheight;
           (this.flyweight.scrollTop / n >> 0) + this.row - s - 1 > 0 || (this.flyweight.scrollTop = s * n, this.scroll());
@@ -147,16 +151,16 @@ const I = {
     },
     lazyrun(t, e) {
       clearTimeout(this.time), this.time = setTimeout(() => {
-        g(t);
+        y(t);
       }, e || this.lazy);
     },
     run(t) {
-      let e = k(t.target, "scrollTop=>top");
-      _(
+      let e = b(t.target, "scrollTop=>top");
+      v(
         this.flyweights,
-        (s, n, i, h, l, r, f, o) => {
-          if (i = s / l >> 0, f = i + h * /* 偏移量, 如果超出顶部 + 1轮,排列到列队后, 否则保持在当前*/
-          (+(i < r % h) + (r / h >> 0)), o = f * l + s % l, o >= this.count) {
+        (s, n, i, l, h, r, f, o) => {
+          if (i = s / h >> 0, f = i + l * /* 偏移量, 如果超出顶部 + 1轮,排列到列队后, 否则保持在当前*/
+          (+(i < r % l) + (r / l >> 0)), o = f * h + s % h, o >= this.count) {
             this.trigger("onend");
             return;
           }
@@ -176,70 +180,71 @@ const I = {
       let t = this.count || this.flys.length, e = this.flyweights;
       if (!t)
         return e.length = t;
-      let s = this.flyweight, n = k(s, "clientHeight=>height,clientWidth=>width");
+      this.count = t;
+      let s = this.flyweight, n = b(s, "clientHeight=>height,clientWidth=>width");
       this.$nextTick(() => {
-        let [i, h] = this.offset, l = n.width, r = n.height, f = (z(this.width, l) || l) + i, o = z(this.height, r) + h;
-        this.realW = f - i, this.realH = o - h;
-        let a = l / f >> 0 || 1, u = r / o >> 0;
-        this.row = u + 2, this.column = a, this.fwheight = o;
-        let T = l % f / (a - 1) >> 0;
-        this.Height = Math.ceil(t / a) * o;
-        let y = Math.min(t, a * this.row), d = y - 1, c, x;
-        for (; y-- > 0; )
-          c = d - y, x = this.flys[c], s = e[c], u = c / a >> 0, this.$set(e, c, {
-            data: x,
-            top: u * o,
-            left: c % a * (f + T),
-            index: u
+        let i = this.auto === !0, [l, h] = this.offset, r = n.width, f = n.height, o = (H(this.width, r) || r) + l, u = H(this.height, f) + h;
+        this.realW = o - l, this.realH = u - h;
+        let a = r / o >> 0 || 1, g = f / u >> 0;
+        this.row = g + 2, this.column = a, this.fwheight = u;
+        let _ = r % o / (a - 1 * +!i) >> 0;
+        i && (o = this.realW = (r / a >> 0) - l, _ = l), this.Height = Math.ceil(t / a) * u;
+        let d = Math.min(t, a * this.row), p = d - 1, c, k;
+        for (; d-- > 0; )
+          c = p - d, k = this.flys[c], s = e[c], g = c / a >> 0, this.$set(e, c, {
+            data: k,
+            top: g * u,
+            left: c % a * (o + _),
+            index: g
           });
-        e.length = d + 1, r / o > d && this.trigger("onend"), this.scroll();
+        e.length = p + 1, f / u > p && this.trigger("onend"), this.scroll();
       });
     }
   }
-}, S = ["data"];
-function A(t, e, s, n, i, h) {
-  return p(), w("div", {
+}, I = ["data"];
+function A(t, e, s, n, i, l) {
+  return w(), m("div", {
     ref: "flyweight",
-    class: H(["flyweight", {
+    class: N(["flyweight", {
       "flyweight-active": i.actice
     }]),
-    style: m({
+    style: x({
       "--width": i.realW + "px",
       "--height": i.realH + "px"
     }),
-    onScroll: e[0] || (e[0] = (...l) => h.scroll && h.scroll(...l))
+    onScroll: e[0] || (e[0] = (...h) => l.scroll && l.scroll(...h))
   }, [
-    N("div", {
+    $("div", {
       class: "flyweight-all",
-      style: m({
+      style: x({
         "--flyweight-height": i.Height + "px"
       })
     }, [
-      (p(!0), w($, null, F(i.flyweights, (l, r) => (p(), w("div", {
+      (w(!0), m(F, null, L(i.flyweights, (h, r) => (w(), m("div", {
         key: r,
-        data: l.top,
-        style: m({
-          top: l.top + "px",
-          left: l.left + "px"
+        data: h.top,
+        style: x({
+          top: h.top + "px",
+          left: h.left + "px"
         })
       }, [
-        v(t.$slots, "default", {
-          data: l.data,
-          index: l.index
+        z(t.$slots, "default", {
+          data: h.data,
+          index: h.index
         }, void 0, !0)
-      ], 12, S))), 128))
+      ], 12, I))), 128))
     ], 4),
-    i.flyweights.length ? v(t.$slots, "end", { key: 0 }, void 0, !0) : L("", !0)
+    i.flyweights.length ? z(t.$slots, "end", { key: 0 }, void 0, !0) : O("", !0)
   ], 38);
 }
-const B = /* @__PURE__ */ O(I, [["render", A], ["__scopeId", "data-v-44af801a"]]), M = [B], G = {
+const M = /* @__PURE__ */ W(C, [["render", A], ["__scopeId", "data-v-144a29f8"]]), R = [M], U = {
   install(t) {
-    M.forEach((e) => {
+    R.forEach((e) => {
       t.component("s-" + e.name.toLowerCase(), e);
     });
   }
 };
 export {
-  B as Flyweight,
-  G as default
+  M as Flyweight,
+  U as default
 };

package/dist/style.css

@@ -1 +1 @@
-.flyweight[data-v-44af801a]{height:100%;width:100%;overflow:auto;position:relative}.flyweight .flyweight-all[data-v-44af801a]{height:var(--flyweight-height)}.flyweight .flyweight-all[data-v-44af801a]>*{width:calc(var(--width));height:var(--height);position:absolute}
+.flyweight[data-v-144a29f8]{height:100%;width:100%;overflow:auto;position:relative}.flyweight .flyweight-all[data-v-144a29f8]{height:var(--flyweight-height)}.flyweight .flyweight-all[data-v-144a29f8]>*{width:calc(var(--width));height:var(--height);position:absolute}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@soei/flyweight",
   "private": false,
   "description": "Vue组件, 列表de享元模式~减少DOM节点 flyweight",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "type": "module",
   "main": "dist/Flyweight.cjs",
   "module": "dist/Flyweight.js",
@@ -25,5 +25,7 @@
     "享元模式",
     "List",
     "列表展示"
-  ]
+  ],
+  "author": "soei | alwbg@163.com",
+  "license": "ISC"
 }

package/src/Flyweight.vue

@@ -21,7 +21,6 @@
 
 <script>
 import { each, picker, runer } from '@soei/util';
-
 let isNil = (data) => {
     return data == null || data == undefined;
 }
@@ -101,6 +100,10 @@ export default {
         left: {
             type: Number,
             default: false
+        },
+        auto: {
+            type: [Boolean, String],
+            default: false
         }
     },
     computed: {
@@ -242,9 +245,11 @@ export default {
             let size = this.count || this.flys.length;
             let fws = this.flyweights;
             if (!size) return fws.length = size;
+            this.count = size;
             let flyweight = this.flyweight;
             let wh = picker(flyweight, 'clientHeight=>height,clientWidth=>width');
             this.$nextTick(() => {
+                let auto = this.auto === true;
                 let [x, y] = this.offset, W = wh.width, H = wh.height;
                 let width = (computer(this.width, W) || W) + x;
                 let height = computer(this.height, H) + y/* 偏移量填充宽度 */;
@@ -257,7 +262,11 @@ export default {
                 this.fwheight = height;
                 let offset = W % width;
                 /* 偏移量 */
-                let margin = offset / (column - 1) >> 0;
+                let margin = offset / (column - 1 * +!auto) >> 0;
+                if (auto) {
+                    width = this.realW = (W / column >> 0) - x;
+                    margin = x;
+                }
                 /* 总高度 */
                 this.Height = Math.ceil(size / column) * height;
                 /* 计算数量 */