efront 3.29.1 → 3.29.3

package/coms/basic/analyse.js

@@ -96,9 +96,9 @@ class Word {
         return this.rate * Math.pow(this.mask, powertime - this.time);
     }
     update() {
-        var p = this.power();
+        var p = this;
         if (this.rate) {
-            var i = getIndexFromOrderedArray(wordslike, a => a.power() <= p);
+            var i = getIndexFromOrderedArray(wordslike, p, comparepower);
             var w = wordslike[i];
             if (w && w.power() === p) {
                 if (p < 1e-306) {
@@ -106,7 +106,7 @@ class Word {
                 } else {
                     p = p - p / 0x1fffffffffffff;
                 }
-                for (var dx = i + 1, cx = getIndexFromOrderedArray(wordslike, a => a.power() <= p); cx < dx; cx++) {
+                for (var dx = i + 1, cx = getIndexFromOrderedArray(wordslike, p, comparepower); cx < dx; cx++) {
                     if (wordslike[cx] == this) {
                         wordslike.splice(cx, 1);
                         break;
@@ -149,7 +149,7 @@ function format() {
     for (var cx = like.length - 1; cx >= 0; cx--) {
         var m = like[cx];
         var p = Math.sqrt(m.power() / 10) * 10;
-        for (var cy = 0, dy = getIndexFromOrderedArray(wordslike, a => a.power() <= p); cy < dy; cy++) {
+        for (var cy = 0, dy = getIndexFromOrderedArray(wordslike, { power() { return p } }, comparepower); cy < dy; cy++) {
             var n = wordslike[cy];
             if (n.name.indexOf(m.name) >= 0) {
                 wordslike.splice(cy, 1);
@@ -307,7 +307,6 @@ function main(text) {
         getWord(result[cx]).update();
     }
     format();
-    console.log(result)
     return result;
 }
 window.wordslike = wordslike;

package/coms/layer/leftCenter.js

@@ -13,7 +13,7 @@ appendChild(layer, leftLayer, centerLayer);
 onappend(centerLayer, function () {
     zimoli.switch("layer-left-center", layer);
     zimoli();
-    var cancel_resize = onresize(window, reshape);
+    var cancel_resize = on("resize")(window, reshape);
     once("remove")(centerLayer, cancel_resize);
 });
 function reshape() {

package/coms/zimoli/back.xht

@@ -27,4 +27,7 @@
         line-height: 20px;
         font-style: normal;
     }
-</style>
+</style>
+<script>
+    var back = button;
+</script>

package/coms/zimoli/gallery.js

@@ -47,7 +47,6 @@ function gallery(element, minWidth, generator) {
             maxWidth: fromPixel(maxWidth),
         });
     };
-    resizingList.set(element);
     var createColumn = function (id) {
         var _box = list(function (index) {
             var realindex = index * boxCount + id;
@@ -95,7 +94,7 @@ function gallery(element, minWidth, generator) {
         this.clean();
         this.go(index || 0);
     });
-    on('resize')(element, element.resize);
+    resizingList.set(element, element.resize);
     return element;
 }
 function main() {

package/coms/zimoli/lattice.js

@@ -79,7 +79,7 @@ function lattice(element, minWidth, _maxWidth, layers) {
             go.call(_box, index);
         }
     });
-    resizingList.set(_box);
+    resizingList.set(_box, _box.resize);
     on('resize')(_box, _box.resize);
     return _box;
 }

package/coms/zimoli/list.js

@@ -218,12 +218,15 @@ function ylist(container, generator, $Y) {
     var rebuild = function () {
         runbuild();
     };
+    var topinsert = null;
     oncemount(list, function () {
         if (!/^(?:auto|scroll)$/i.test(getComputedStyle(list).overflowY)) return;
         on("scroll")(list, rebuild);
+        if (!topinsert) {
+            topinsert = document.createElement('insertY');
+            list.insertBefore(topinsert, list.firstChild);
+        }
     });
-    var topinsert = document.createElement('ylist-insert');
-    list.insertBefore(topinsert, list.firstChild);
     //计算当前高度
     var currentY = function () {
         var firstElement = getFirstElement();

package/coms/zimoli/list.less

@@ -8,10 +8,10 @@
     white-space: nowrap;
 }
 
->ylist-insert {
+>inserty {
     display: block;
 }
 
->xlist-insert {
+>insertx {
     display: inline-block;
 }

package/coms/zimoli/onresize.js

@@ -1 +1,2 @@
-var onresize=on("resize");
+console.warn(`%c onresize(...) %c方法将在未来的版本中移除！使用%c on("resize")(window, handler) %c 或 %c resizingList.set(element, handler) %c 代替`,
+"color:red","color:#333","color:blue","color:#333","color:blue","color:#333"), on("resize");

package/coms/zimoli/render.js

@@ -797,6 +797,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     }
     if (!isFirstRender) return element;
     renderRest(element, element.$struct, replacer);
+    var restons = element.$struct.ons;
     if (replacer) {
         if (!replacer.renders) replacer.renders = [];
         if (isElement(replacer)) createStructure(replacer);
@@ -810,7 +811,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         }
         element = replacer;
     }
-    if (element.$struct) element.$struct.ons.forEach(([on, key, value]) => on.call(element, element, key, value));
+    restons.forEach(([on, key, value]) => on.call(element, element, key, value));
     if (element.renders.length) {
         if (element.renderid !== 9) {
             onmounted(element, addRenderElement);
@@ -897,7 +898,7 @@ function createStructure(element) {
             value = name.slice(1).replace(/\./g, ' ')
             name = 'class';
             copys.push({ name, value });
-            element.setAttribute(name, value);
+            addClass(element, value);
             continue;
         }
         if (/^(?:class|style|src|\:|placeholder)$/i.test(name)) {

package/coms/zimoli/resizingList.js

@@ -1,3 +1,4 @@
+var onresize = on("resize");
 onresize(window, function () {
     for (var r of resizingList) {
         dispatch(r, 'resize');
@@ -11,9 +12,13 @@ var unmount = function () {
     removeFromList(resizingList, this);
 };
 var resizingList = [];
-resizingList.set = function (e) {
-    on('append')(e, mount);
-    on("remove")(e, unmount);
+resizingList.set = function (e, h) {
+    var off1 = onmounted(e, mount);
+    var off2 = on("remove")(e, unmount);
+    if (isFunction(h)) var off3 = onresize(e, h);
+    var offs = [off1, off2];
+    if (off3) offs.push(off3);
+    return function (offs) { for (var off of offs) off() };
 };
 resizingList.hit = function (e) {
     for (var a of this) {

package/coms/zimoli/slider.js

@@ -323,7 +323,7 @@ function slider(autoplay, circle = true) {
     var cancel_resize;
     onappend(outter, function () {
         cancel_resize && cancel_resize();
-        cancel_resize = onresize(window, function () {
+        cancel_resize = on("resize")(window, function () {
             switchBy(0);
         });
         if (isFinite(outter.index)) switchBy(0);

package/coms/zimoli/table.js

@@ -527,8 +527,7 @@ function table(elem) {
             })
         }
     );
-    resizingList.set(table);
-    on("resize")(table, setFixedColumn);
+    resizingList.set(table, setFixedColumn);
     on("scroll")(table, setFixedColumn);
     return table;
 }

package/coms/zimoli/view.less

@@ -3,6 +3,7 @@ body>& {
 }
 
 & {
+    display: block;
     max-width: 100%;
     width: 360px;
     height: auto;
@@ -22,7 +23,7 @@ body>& {
     position: absolute;
 }
 
-&>.body,
+>.body,
 >[body] {
     padding: 6px 20px 6px 6px;
     margin-right: -20px;
@@ -45,7 +46,7 @@ body>& {
 }
 
 
-&>.head,
+>.head,
 >[head] {
     top: 0;
     z-index: 2;
@@ -94,13 +95,13 @@ body>& {
     }
 }
 
-&>.foot,
+>.foot,
 >[foot] {
     white-space: nowrap;
     overflow: auto;
 }
 
-&>.foot,
+>.foot,
 >[foot] {
     z-index: 1;
     text-align: right;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.29.1",
+    "version": "3.29.3",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {