efront 3.35.2 → 3.35.4

package/coms/zimoli/table.js

@@ -41,6 +41,7 @@ var markRowTds = function (tr, deltas, colstart, colend) {
 };
 var forEachRow = function (tbody, call) {
     for (var tr of tbody.children) {
+        if (isTfoot(tr)) continue;
         if (isTableRow(tr)) {
             call(tr);
         }
@@ -86,9 +87,12 @@ var getTbody = function (table) {
         if (/^tbody$/i.test(c.tagName) || c.hasAttribute("tbody")) return c;
     }
 };
+var isTfoot = function (c) {
+    return /^tfoot$/i.test(c.tagName) || c.hasAttribute("tfoot");
+}
 var getTfoot = function (table) {
     for (var c of table.children) {
-        if (/^tfoot$/i.test(c.tagName) || c.hasAttribute("tfoot")) return c;
+        if (isTfoot(c)) return c;
     }
 };
 var isTableRow = function (e) {
@@ -106,6 +110,7 @@ var resizeColumn = function (target, targetW) {
         resizeT(tr, tr.offsetWidth + deltaW);
     });
     for (var c of this.children) {
+        if (isTfoot(c)) continue;
         if (!isTableRow(c)) {
             var tr = c.querySelector('tr');
             if (!tr) continue;
@@ -230,8 +235,9 @@ function enrichField(f) {
         f.fixed = true;
     }
 }
-var tbodyHeight = function (tbody) {
-    return { 'max-height': ((innerHeight - getScreenPosition(tbody).top - 8) / 36 | 0) * 36 }
+var tbodyHeight = function (tbody, hasFoot) {
+    var rowHeight = calcPixel(36);
+    return { 'max-height': ((innerHeight - (!!hasFoot ? rowHeight : 6) - getScreenPosition(tbody).top - 10) / rowHeight | 0) * rowHeight }
 };
 
 var setFixed = function (children, scrolled, left, borderRight) {
@@ -247,18 +253,17 @@ var setFixed = function (children, scrolled, left, borderRight) {
     for (var c of children) {
         var pc = getScreenPosition(c);
         var isfixed = c.hasAttribute('fixed');
-        if (fixedWidth + scrolled > offset && fixedWidth + pc.width < this.clientWidth / 3) {
-            if (isfixed) {
+        if (isfixed) {
+            if (fixedWidth + scrolled > offset && fixedWidth + pc.width < this.clientWidth / 3) {
                 css(c, { [left]: scrolled - offset + fixedWidth, [borderRight]: '' });
                 fixedElements.push(c);
                 fixedWidth += pc.width;
             }
-        }
-        else {
-            setBorderRight(fixedElements);
-            if (isfixed && c.style[left]) {
-                css(c, { [left]: '', [borderRight]: '' })
-                fixedElements.push(c);
+            else {
+                if (c.style[left]) {
+                    css(c, { [left]: '', [borderRight]: '' })
+                    fixedElements.push(c);
+                }
             }
         }
         offset += pc.width;
@@ -275,18 +280,34 @@ var setFixed = function (children, scrolled, left, borderRight) {
 };
 
 
-var setFixedColumn = function () {
+var setFixedColumn = function (remark) {
     var thead = getThead(this);
     if (!thead) return;
+    remark = remark === true;
+    if (remark) remark = [], forEachRow(thead, function (tr) {
+        markRowTds(tr, remark);
+    });
     if (!isTableRow(thead)) thead = thead.querySelector('tr');
     var children = Array.prototype.slice.call(thead.children);
     var lastChild = children[children.length - 1];
+    var lastFieldChild = children[children.length - 2];
+    if (children.length <= 2) lastFieldChild = null;
     if (!lastChild) return;
+    var cindex = children.length - 1;
+    if (lastFieldChild) css(lastChild, { width: 0 }), lastChild = lastFieldChild, cindex = children.length - 2;
     var deltaW = thead.scrollWidth - lastChild.offsetWidth;
-    if (this.clientWidth > deltaW + 200) {
+    if (this.clientWidth > deltaW + lastChild.offsetWidth) {
         css(lastChild, { width: this.clientWidth - deltaW });
         css(thead, { width: this.clientWidth });
         resizeColumn.call(this, lastChild, this.clientWidth - deltaW);
+        remark = true;
+    }
+    if (remark) {
+        var tbody = getTbody(this);
+        forEachRow(tbody, function (tr) {
+            css(tr.children[cindex], lastChild.style);
+        });
+        css(tbody, { width: thead.offsetWidth });
     }
     setFixed.call(this, children, this.scrollLeft, 'left', 'borderRight');
     setFixed.call(this, children.reverse(), this.scrollWidth - this.clientWidth - this.scrollLeft, 'right', 'borderLeft');
@@ -295,6 +316,7 @@ var setFixedColumn = function () {
         css(tfoot, { left: this.scrollLeft });
     }
 };
+var setLazyFixedColumn = lazy(setFixedColumn, 0);
 var setClass = function (tds, cls, old) {
     tds.forEach(td => td[cls] = true);
     old.forEach(td => { if (!td[cls]) removeClass(td, cls) });
@@ -348,7 +370,31 @@ var getTdsOfSameRow = function (td) {
     }
     return tds;
 };
-
+function setContextMenu(thead) {
+    var fields = this.fields.slice();
+    var scope = this;
+    var menuItems = fields.map(f => {
+        return {
+            name: f.name || "&nbsp;",
+            checked: !f.hidden,
+            width: f.width,
+            do() {
+                this.checked = !this.checked;
+                f.hidden = !this.checked;
+                scope.fields = fields.filter(f => !f.hidden);
+                var width = thead.scrollWidth / scope.fields.length;
+                if (!width || width < 200) width = 200;
+                forEachRow(thead, function (tr) {
+                    for (var td of tr.children) {
+                        if (td.offsetWidth > width) css(td, { width });
+                    }
+                });
+                setLazyFixedColumn.call(thead.parentNode, true)
+            }
+        }
+    });
+    contextmenu(thead, menuItems);
+}
 function table(elem) {
     var tableElement = isElement(elem) ? elem : document.createElement("table");
     var activeCols = [];
@@ -378,7 +424,7 @@ function table(elem) {
             thead = getThead(table);
         }
         if (!getTargetIn(thead, event.target)) return;
-        var tds = getTargetIn(cellMatchManager, event.target);
+        var tds = cellMatchManager(event.target);
         if (!tds) return;
         setClass(tds, 'y-ing', activeCols);
         removeXIng(activeRows);
@@ -408,12 +454,16 @@ function table(elem) {
         var { colstart, colend } = element;
         return getTdsByCol(table, colstart, colend);
     };
-
+    watch(table, {
+        showTotal(v) {
+            this.$scope.showTotal = v;
+            if (v) this.$scope.hasFoot = true;
+        }
+    })
     table.useIncrease = false;
     var _vbox = function () {
         table.$Left = function (x) {
-            if (isFinite(x)) this.scrollLeft = x;
-            setFixedColumn.call(this);
+            if (isFinite(x)) this.scrollLeft = x, setFixedColumn.call(this);
             return this.scrollLeft;
         };
         vbox(table, 'x');
@@ -435,10 +485,15 @@ function table(elem) {
         var $scope = {
             fields,
             isEmpty,
+            hasFoot: true,
+            setContextMenu,
             tbody0: null,
+            rowClick(d, i, event) {
+                active(table, i, d, event.target);
+            },
             tbody(e) {
                 var e = list.apply(null, arguments);
-                css(e, tbodyHeight(e));
+                css(e, tbodyHeight(e, this.hasFoot));
                 css(e, { width: this.adapter.offsetWidth, display: 'block' });
                 this.tbody0 = e;
                 return e;
@@ -522,9 +577,7 @@ function table(elem) {
             }
             markThead();
             markedRows = true;
-            requestAnimationFrame(function () {
-                setFixedColumn.call(table)
-            })
+            setLazyFixedColumn.call(table);
         }
     );
     resizingList.set(table, setFixedColumn);

package/coms/zimoli/table.less

@@ -62,6 +62,10 @@ td {
     }
 }
 
+[draggable="false"]:before {
+    display: none;
+}
+
 thead {
 
     .y-ing,
@@ -102,11 +106,14 @@ thead {
     border-right: 1px solid transparent;
 }
 
+.fade {
+    color: #bbb;
+}
+
 >tfoot {
     width: 100%;
     display: block;
     position: relative;
-    color: #bbb;
 
     >tr {
         width: 100%;

package/coms/zimoli/titlebar.js

@@ -27,7 +27,7 @@ function titlebar(elem) {
     }
     use_back = use_back !== false;
     var bar = nav.cloneNode();
-    var title = label();
+    var title = document.createElement("label");
     var _back = back();
     text(title, page_title || document.title);
     appendChild(bar, title);

package/coms/zimoli/vbox.js

@@ -91,12 +91,12 @@ function ybox(generator) {
     };
     var stop = _box.$stopY || _box.stopY;
     var stop2 = lazy(function () {
-        scrollY.smooth(stop);
+        scrollY.smooth(stop, 4);
     }, 40);
     var decrease = function (t) {
         var res = _decrease(increaser_t, t) + _decrease(increaser_b, t);
         if (!res) {
-            scrollY.smooth(stop);
+            scrollY.smooth(stop, 4);
         }
         return true;
     };

package/docs/index.html

@@ -10,6 +10,14 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="Shortcut Icon" href="favicon.ico" type="image/x-icon" />
     <meta name="viewport" content="initial-scale=1,maximum-scale=1,width=device-width" />
+    <script>
+        if (/Trident/i.test(navigator.userAgent)) document.createElement = function (createElement) {
+            return function (a) {
+                if (/\W/.test(a)) return createElement.call(this, 'efront');
+                return createElement.call(this, a);
+            };
+        }(document.createElement);
+    </script>
     <title>efront 文档</title>
     <style>
         body,
@@ -18,6 +26,7 @@
             margin: 0;
             overflow: hidden;
         }
+
         *,
         ::before,
         ::after {

package/docs/main.xht

@@ -91,9 +91,13 @@
             closed: true,
             children: []
         },
-        // {
-        //     name: "小工具"
-        // }
+        {
+            name: "小工具",
+            closed: true,
+            children: [
+                "字符集检查"
+            ].map(a => ({ name: a, path: "/工具/" + a }))
+        }
     ];
     zimoli.register("/mark");
     zimoli.register("/命令");

package/docs//345/267/245/345/205/267//345/255/227/347/254/246/351/233/206/346/243/200/346/237/245.xht

@@ -0,0 +1,157 @@
+<style>
+    h2 {
+        margin: 0;
+        padding: 10px 20px;
+    }
+
+    field {
+        width: 50%;
+        height: 200px;
+        display: inline-block;
+        position: relative;
+        vertical-align: top;
+    }
+
+    label {
+        padding: 0 20px;
+    }
+
+    .padding {
+        border: none;
+        padding: 0 20px;
+        width: 100%;
+        display: block;
+    }
+
+    [textarea] {
+        width: 100%;
+        height: 200px;
+        display: block;
+        border: 1.2px solid;
+        overflow-x: hidden;
+        overflow-y: scroll;
+        padding: 2px 6px;
+    }
+
+    [textarea]:focus {
+        border-color: #09c;
+    }
+
+    [textarea] w {
+        font-weight: normal;
+        color: #F24;
+    }
+
+    [textarea] a {
+        font-family: inherit;
+        font-weight: normal;
+        color: #08F;
+    }
+
+    button {
+        padding: 0 20px;
+    }
+</style>
+<h2>字符集检查工具</h2>
+<div style="text-align: right;padding: 0 20px;">
+    <button @click="check">检查</button>
+</div>
+<div>
+    <field>
+        <label>要检查的字符集区间（unicode）</label>
+        <padding>
+            <div textarea contenteditable="true" -model="ranges"></div>
+        </padding>
+    </field>
+    <field>
+        <label>当前浏览器支持的字符集区间(unicode)</label>
+        <padding>
+            <div textarea contenteditable="true" -model="result"></div>
+        </padding>
+    </field>
+</div>
+<script>
+    var checkOne = function (one) {
+        if (!String.fromCodePoint && one > 0xffff) return '';
+        var s = (String.fromCodePoint || String.fromCharCode)(one);
+        try {
+            eval(`(function (${s}){})`);
+            return true;
+        }
+        catch (e) { }
+        return '';
+    };
+    var toHex = function (one) {
+        one = one.toString(16).toUpperCase();
+        if (one.length <= 2) {
+            return "\\x" + Array(3 - one.length).join("0") + one.toString(16);
+        }
+        else if (one.length <= 4) {
+            return "\\u" + Array(5 - one.length).join("0") + one;
+        }
+        return `\\u{${one}}`;
+    };
+    var fromHex = function (hex) {
+        var str = hex.replace(/^[xu]/, '').replace(/^\{([\s\S]+)\}$/, '$1');
+        return parseInt(str, 16);
+    }
+    var check = async function () {
+        var elem = alert("正在检查", false);
+        var reg = /\\(x[0-9a-f]{2}|u[0-9a-f]{4}|u\{[0-9a-f]+\})/ig;
+        var dist0 = [];
+        ranges.replace(/<\/?\w+\/?>/g, '').replace(new RegExp(`${reg.source}(?:-${reg.source})?|${/[\s\S]/.source}`, 'ig'), function (_, a, b) {
+            dist0.push([_, a, b]);
+            return _;
+        });
+        var dist = [];
+        var dist1 = dist0.slice();
+        while (dist0.length) {
+            var [_, a, b] = dist0.shift();
+            if (_.length === 1) {
+                if (checkOne(_.codePointAt(0))) dist.push(toHex(_.codePointAt(0)));
+                else dist.push('');
+                continue;
+            }
+            a = fromHex(a);
+            if (!b) {
+                if (checkOne(a)) dist.push(toHex(a));
+                else dist.push('');
+                continue;
+            }
+            b = fromHex(b);
+            elem.setText(`正在检查${_}`);
+            await new Promise(a => setTimeout(a, 20));
+            var start = a;
+            var temp = [];
+            while (a <= b) {
+                if (checkOne(a++)) continue;
+                var end = a - 2;
+                if (start === end) {
+                    temp.push(toHex(start));
+                }
+                else if (start < end) {
+                    temp.push([start, end].map(toHex).join("-"));
+                }
+                start = a;
+            }
+            if (start < b) {
+                temp.push([start, b].map(toHex).join("-"));
+            }
+            else if (start === b) {
+                temp.push(toHex(start));
+            }
+            dist.push(temp.join(''))
+        }
+        dist = dist.map((a, i) => {
+            if (a.toUpperCase() === dist1[i][0].toUpperCase()) return a;
+            dist1[i][0] = `<a>${dist1[i][0]}</a>`;
+            return `<w>${a}</w>`;
+        })
+        elem.setText("检查完成", 600);
+        ranges = dist1.map(a => a[0]).join("");
+        result = dist.join("");
+    }
+    var ranges = /\xAA\xB5\xBA\xC0-\xD5\xD8-\xF2\xF8-\u02af\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052f\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA/.source
+    var result = '';
+
+</script>

package/package.json

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