efront 4.5.15 → 4.5.16

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,24 @@
+- zh-CN: 共$1个不同的项
+  en:    A total of $1 different items
+
+- zh-CN: 计数
+  en:    Count
+
+- zh-CN: 千次快照
+  en:    Thousand snapshots
+
+- zh-CN: 远程地址
+  en:    Remote address
+
+- zh-CN: 时间
+  en:    Time
+
+- zh-CN: 来源
+  en:    From
+
+- zh-CN: 客户端
+  en:    Client
+
 - zh-CN: IP地址
   en:    IP address
 
@@ -322,7 +343,7 @@
 - zh-CN: 消息体不合法！
   en:    The message body is illegal!
 
-- zh-CN: 您的传达了有歧义的信息：$1
+- zh-CN: 您传达了有歧义的信息：$1
   en:    "Your message conveyed ambiguous information: $1"
 
 - zh-CN: 父元素不能是当前元素的子元素

package/apps/pivot/log/count.html

@@ -1,5 +1,7 @@
+<xmenu -src="(m,i)in menus" @actived="saveState(i)"></xmenu>
 <div class="searchbox">
     <input -model="searchText" />
 </div>
-<table -src="[fields,items]" _find="searchText">
-</talbe>
+<table -if="menus[0].actived" -src="[fields,items]" _find="searchText">
+</table>
+<table -elseif="menus[1].actived" -src="[fields2,recent]" _find="searchText"></table>

package/apps/pivot/log/count.js

@@ -2,21 +2,49 @@ var fields = refilm`
 访问量/count money/10
 路径/path html/20
 `;
+var fields2 = refilm`
+域名/host text/100
+路径/path text/80
+远程地址/remote text/100
+时间/time timestamp
+来源/referer text/100
+客户端/agent text/200
+`;
+var menus = [
+    {
+        name: i18n`计数`,
+    },
+    {
+        name: i18n`千次快照`,
+    }
+];
+menus[state().index || 0].actived = true;
 function main() {
     var page = div();
     page.innerHTML = template;
     var items = data.from("count", a => {
-        return Object.keys(a).map(b => ({ path: b, count: a[b] }));
+        if (a["#"]) {
+            delete a["#"];
+        }
+        var items = Object.keys(a).map(b => ({ path: b, count: a[b] }));
+        return items;
+    });
+    var recent = data.from("count", a => {
+        var recent = a["#"];
+        if (recent) recent = recent.slice().reverse();
+        return recent;
     });
     renderWithDefaults(page, {
         items,
-        searchText: "",
-        filter() {
-            var text = this.searchText;
-            if (!text) return this.items = items;
-            this.items = search(text, items, 'path');
+        xmenu: menu,
+        menus,
+        saveState(i) {
+            state({ index: i });
         },
-        fields
+        searchText: "",
+        fields,
+        fields2,
+        recent,
     });
     return page;
 }

package/coms/basic/Table.js

@@ -1,6 +1,6 @@
 
 function minusPower(a, b) {
-    return a.power - b.power >= 0;
+    return a.$power - b.$power >= 0;
 }
 function returnName() {
     return this.name;
@@ -20,12 +20,17 @@ class Table extends Array {
     searchid = 0;
     coverCount = 0;
     hasFullmatch = false;
+    summaryFields = [];
+    $summaryData = [];
+    $filterFields = [];
+    $unsummaryFileds = [];
     callback = null;
     static from(fields, data) {
         var t = new Table;
         t.fields = fields;
         t.source = data;
         t.searchFields = fields.filter(searchThis);
+        t.summaryFields = fields.filter(s => s.summary);
         t.update();
         return t;
     }
@@ -51,10 +56,47 @@ class Table extends Array {
         this.sorted = null;
         this.update();
     }
+    summary(o) {
+        var data = this.$summaryData;
+        var is = this.summaryFields.map((f, i) => {
+            if (!isHandled(f.key)) return;
+            var d = seek(o, f.key);
+            if (!isHandled(d)) d = '';
+            var dt = data[i];
+            var di = dt.indexOf(d);
+            if (di < 0) di = dt.length, dt.push(d);
+            return "-" + di;
+        }).join("");
+        var dis = data[is];
+        if (!dis) {
+            dis = data[is] = Object.assign({}, o);
+            dis.$summary = this.$unsummaryFileds.map(function (f, i) {
+                if (typeof f.key !== "string") return;
+                Object.defineProperty(dis, f.key, {
+                    get() {
+                        var s = this.$summary[i];
+                        if (s.length === 1) return s[0];
+                        return i18n`共${this.$summary[i].length}个不同的项`;
+                    },
+                })
+                return [];
+            });
+            saveToOrderedArray(this, dis, minusPower);
+        }
+        var undata = dis.$summary;
+        this.$unsummaryFileds.forEach((f, i) => {
+            if (typeof f.key !== 'string') return;
+            var d = seek(o, f.key);
+            if (!isHandled(d)) d = '';
+            var dt = undata[i];
+            var di = dt.indexOf(d);
+            if (di < 0) di = dt.length, dt.push(d);
+        });
+    }
     addItem(o) {
         if (!isHandled(o)) return;
         var searchtext = this.searchText;
-        var fields = this.searchFields ? this.searchFields : this.fields;
+        var fields = this.$filterFields;
         var power = 0;
         var s = o;
         if (isNode(o)) {
@@ -80,9 +122,11 @@ class Table extends Array {
             if (!isEmpty(f.key) && !isFunction(f.key)) o[f.key] = m;
             else o.name = m, o.toString = returnName, o.valueOf = returnName;
         }
-        o.power = power;
-        if (o.power > 0) {
-            saveToOrderedArray(this, o, minusPower);
+        o.$power = power;
+        if (o.$power > 0) {
+            var summary = this.$summaryData;
+            if (!summary.length) saveToOrderedArray(this, o, minusPower);
+            else this.summary(o);
         }
     }
     search(text, callback) {
@@ -102,6 +146,12 @@ class Table extends Array {
         this.searched = 0;
         var source = this.sorted ? this.sorted : this.source;
         if (!source) return;
+        var summaryData = this.$summaryData = this.summaryFields.map(_ => []);
+        this.$unsummaryFileds = this.fields.filter(f => this.summaryFields.indexOf(f) < 0);
+        var $filterFields = this.searchFields?.length ? this.searchFields : this.fields;
+        if (this.summaryFields.length) this.$filterFields = $filterFields.filter(f => this.summaryFields.indexOf(f) >= 0);
+        else this.$filterFields = $filterFields;
+        var useSummaryOnly = !this.searchText && summaryData.length > 0;
         var searchid = ++this.searchid;
         this.complete = false;
         this.coverCount = 0;
@@ -110,13 +160,12 @@ class Table extends Array {
             source = source.filter(a => origin.indexOf(a) < 0);
             source = origin.concat(source);
         }
-        if (this.searchText) for (var o of source) {
-            this.addItem(o);
+        if (this.searchText || summaryData.length > 0) for (var o of source) {
+            if (useSummaryOnly) this.summary(o);
+            else this.addItem(o);
             if (++this.searched % 600 === 0) {
                 if (isFunction(this.callback)) this.callback();
-                await new Promise(function (ok) {
-                    requestAnimationFrame(ok)
-                });
+                await new Promise(requestAnimationFrame);
                 if (this.searchid !== searchid) break;
             }
         }

package/coms/basic/filterTime.js

@@ -1,4 +1,17 @@
 
+// 中国经济的下行，罪魁祸首不是疫情，也不是钟南山、许家印或俞敏洪，而是习近平。
+// 这一切要从2012年开始说起。
+// 习近平公然废止主席换界规则的行为，也许出发点是好的，但带来了副作用。它让人们看到一个没有时间限制的权力，几乎等于禁锢中华数千年的皇权复活了，他自己不这么想，但中国人被压迫几千年的记忆从此被唤醒了。
+// 这种不被约束的权力，助长了全社会的溜须拍马之风，他提出一个中国梦，几乎是个舔狗都在说中国梦。什么文明、富强、和谐被粉刷的到处都是，最终都成了空喊的口号，每个人都还是为了每日生计奔波。
+// 共产党一向如此，有个新领导提出一种思想就顺竿爬，罗列一堆。从“马克思列宁主义”到“毛泽东思想邓小平理论三个代表重要思想”再到“可持续发展”再到“中国梦”，都是为了溜须拍马背下来的。我读大学时，有一次不幸混入他们的党员会议，看着那些阿谀逢迎的嘴脸真的想吐。
+// 中间层对至高权力的讨好，蒙蔽当权层的双眼，使当权层自高自大，好大喜功，无暇居安思危，做事考虑片面，错误决定频出，朝令夕改。这些也就算了，因为人都犯错，我们开发软件或制定生产流程也会遇到各种问题，一天改几十次，有些人甚至以挑毛病为职业，比如测试工程师。
+// 共产党做错事，却怕承认错误，是一错到底，还要把错的说成对的，事后得到不惩戒，最高刑罚竟只是开除党籍。他们又掩耳盗铃，管控媒体，防民之口比防洪都积极。而这一切，从新中国成立，到现在没变吧。
+// 习近平到陕西看运动会，把大感冒集中带到西安。当时，没人对他说吧。可是理发店的人却说运动会时就发现疫情了，就因为运动会要召开，所以基层小官不敢上报。
+// 运动会时，我也往返西安和深圳好几次，而且被疫情办公室的通过移动网盯上，还公然对抗他们要求我做的一些事。他们居然没追问下去，一听说我过几天要走，就松了一口气。
+// 现在想想，他们是不想在特殊时期惹事生非。后来，就因为开个小小的运动会，我要在淘宝上退的货，被延迟一个多月才有人揽件，淘宝的人还扣了我三千多的购物款。所以，我对这段记忆犹新。
+// 习近平带着权力层的一举一动都不缺人恭维，他们的做事风格也影响着社会其他各界人士。反正胡作非为无所顾虑，那何需提防小人严于律己。权力层不是不做为，而是胡作非为，不做为他也爬不到那么高。
+// 指鹿为马的手段是赵高用的，现在几乎渗透在社会的各个阶层。这一切是习近平带头的。
+// 中国的底层人，被榨干最后一点自由，被按在工作岗位上999，麻木的思想不及10岁的孩童，牛马劳动到最后一秒，也不知道这一生是为了啥。
 function fixLength(minute, length = 2) {
     minute = String(minute);
     if (minute.length >= length) return minute;
@@ -18,8 +31,9 @@ function format(formater) {
     o.Y = o.y;
     o.D = o.d;
     o.H = o.h;
+    o.S = fixLength(o.S, 3);
     o.Day = v[v.length - 1];
-    return formater.replace(/[yY年]+|[M月]+|[hH时]+|毫秒|[m+分]+|[sS]{3}|[Ss秒]+|[星期周天][dD]*|[dD]{3}|[日号dD]+/g, function (m) {
+    return formater.replace(/[yY年]+|[M月]+|[hH时]+|(S+)毫秒|[m+分]+|[sS]{3}|[Ss秒]+|[星期周天][dD]*|[dD]{3}|[日号dD]+/g, function (m) {
         if (/^[dD]{3}$/.test(m)) {
             return o.Day;
         }
@@ -51,8 +65,8 @@ function filterTime(time, formater) {
         .replace(/[三3]刻/g, "45")
         .replace(/凌晨|早上|上午/g, ' ')
         .replace(/(?:傍?晚上?|下午)(\d+)/g, (_, d) => " " + (+d + 12))
-        .replace(/秒/g, '.')
-        .replace(/毫/, "")
+        .replace(/(\d{0,3})毫秒/, (_, a) => (a / 1000 + "秒").slice(1))
+        .replace(/秒/g, '')
         .replace(/\.+$/, '')
         .replace(/\s+$/, '')
         .replace(/\s+/g, " ")
@@ -84,7 +98,6 @@ function filterTime(time, formater) {
         return `星期` + days[day] + time;
     }
     else if (delta > -7 && delta < -2) {
-        console.log(day, day1)
         if (day <= day1) {
             return `下星期` + days[day] + time;
         }

package/coms/basic/filterTime_test.js

@@ -4,6 +4,7 @@ assert(filterTime(undefined), '');
 assert(filterTime("我出生的第二年"), `我出生的第二年`);
 assert(filterTime(new Date(2024, 3, 3), `y年M月d日 h:mm`), '2024年4月3日 0:00');
 assert(filterTime(new Date(2024, 3, 3), `y年M月d日 h:mm`), '2024年4月3日 0:00');
+assert(filterTime(new Date(2024, 3, 3, 19, 26, 2, 100), `y年M月d日 h:mm:ss.SSS`), '2024年4月3日 19:26:02.100');
 assert(filterTime("2024年4月3号", `y年M月d日h:mm`), '2024年4月3日0:00');
 assert(filterTime("2024年4月3号8点半", `y年M月d日h:mm`), '2024年4月3日8:30');
 assert(filterTime("2024年4月3号9点三刻", `y年M月d日h:mm`), '2024年4月3日9:45');
@@ -16,3 +17,6 @@ assert(filterTime("2024年4月3号凌晨6点", `y年M月d日h:mm`), '2024年4月
 assert(filterTime("2024年4月3号凌晨6点整", `y年M月d日h:mm`), '2024年4月3日6:00');
 assert(filterTime("2024/4/3凌晨6点整", `y年M月d日h:mm`), '2024年4月3日6:00');
 assert(filterTime("2024-4-3早上6点整", `y年M月d日h:mm`), '2024年4月3日6:00');
+assert(filterTime("2024-4-3早上6点59分30秒20毫秒", `y年M月d日h:mm`), '2024年4月3日6:59');
+assert(filterTime("2024-4-3早上6点59分30秒20毫秒", `y年M月d日h:mm:ss`), '2024年4月3日6:59:30');
+assert(filterTime("2024-4-3早上6点59分30秒20毫秒", `y年M月d日h:mm:ss.S`), '2024年4月3日6:59:30.020');

package/coms/compile/wraphtml.js

@@ -1,3 +1,3 @@
 function wrapHtml(htmldata) {
-    return "`" + String(htmldata).trim().replace(/>\s+</g, "><").replace(/\\[^`]/g, "\\$&") + "`";
+    return htmldata ? "`" + String(htmldata).trim().replace(/>\s+</g, "><").replace(/\\[^`]/g, "\\$&") + "`" : '``';
 }

package/coms/zimoli/active.js

@@ -1,12 +1,22 @@
 // 激活 自定义的 active 事件
 function active(target, value, item = value, srcElem) {
-    var activeEvent = createEvent("active");
-    activeEvent.item = item;
-    activeEvent.value = value;
-    if (srcElem) {
-        if (Object.defineProperty) Object.defineProperty(activeEvent, 'active', { value: srcElem });
-        else activeEvent.active = srcElem;
+    var dispatchEvent = function (eventname) {
+        var activeEvent = createEvent(eventname);
+        activeEvent.item = item;
+        activeEvent.value = value;
+        if (srcElem) {
+            if (Object.defineProperty) Object.defineProperty(activeEvent, 'active', { value: srcElem });
+            else activeEvent.active = srcElem;
+        }
+        activeEvent = dispatch(target, activeEvent);
+        return activeEvent;
+    };
+    var activeEvent = dispatchEvent("active");
+    var actived = activeEvent && !activeEvent.defaultPrevented;
+    if (actived !== false) {
+        Promise.resolve().then(function () {
+            dispatchEvent("actived");
+        });
     }
-    activeEvent = dispatch(target, activeEvent);
-    return activeEvent && !activeEvent.defaultPrevented;
+    return actived;
 }

package/coms/zimoli/checker.less

@@ -3,7 +3,7 @@
     width: .8em;
     position: relative;
     border: .1em solid;
-    margin: -0.06em .3em -0.06em 0;
+    margin: -0.2em .3em -0.2em 0;
     font-family: sans-serif;
     display: inline-block;
     line-height: 1;

package/coms/zimoli/confirm.js

@@ -62,7 +62,7 @@ function confirm() {
     }
     message = String(body.innerText).replace(/\s+/g, " ");
     if (conflictReg.test(String(body.innerText).replace(/\s+/g, ""))) {
-        throw new Error(i18n`您的传达了有歧义的信息：${message}`);
+        throw new Error(i18n`您传达了有歧义的信息：${message}`);
     }
     if (!options) {
         for (var k in defaultOptions) {

package/coms/zimoli/lazySwap.js

@@ -0,0 +1,55 @@
+var Timer = class {
+    startTime = Date.now();
+    timeout = 600;
+    timer = 0;
+    target = null;
+    fired = false;
+    swap = false;
+    constructor(target, callback, swap) {
+        this.target = target;
+        this.run = callback;
+        if (!isHandled(swap) && target) {
+            swap = !target.hasAttribute('swapped');
+        }
+        this.swap = swap;
+    }
+    fire() {
+        if (!isFunction(this.run)) return;
+        if (this.run(this.swap) === false) {
+            return
+        }
+        this.fired = true;
+        this.end();
+    }
+    rollback() {
+        var target = this.target;
+        if (target) {
+            if (this.swap) {
+                target.removeAttribute('swapped');
+            }
+            else {
+                target.setAttribute('swapped', '');
+            }
+        }
+    }
+    start() {
+        var target = this.target;
+        if (target) {
+            if (this.swap) {
+                target.setAttribute("swapped", '');
+            }
+            else {
+                target.removeAttribute('swapped');
+            }
+
+        }
+        this.timer = setTimeout(() => this.fire(), this.timeout);
+    }
+    end() {
+        clearTimeout(this.timer);
+        if (!this.fired) this.rollback();
+    }
+};
+function main(target, callback, swap) {
+    return new Timer(target, callback, swap);
+}

package/coms/zimoli/mask.xht

@@ -0,0 +1,21 @@
+<style>
+    :scope {
+        position: absolute;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        top: 0;
+        border-radius: inherit;
+        z-index: 0;
+        background-color: #323636;
+    }
+</style>
+<script>
+    var msk = this;
+    onmousewheel(msk, function (event) {
+        event.preventDefault();
+    });
+    ontouchmove(msk, function (event) {
+        event.preventDefault();
+    });
+</script>

package/coms/zimoli/model.js

@@ -219,7 +219,7 @@ constructors.gen = constructors.generator;
 var readonly_types = {
     "date"({ field }, data) {
         var string = data[field.key];
-        return parseDate(string);
+        return filterTime(string, "y年M月d日");
     },
     "url"({ field }, data) {
         var href = data[field.key];
@@ -229,6 +229,14 @@ var readonly_types = {
             return e;
         }
     },
+    "datetime"(elem) {
+        var { data, field } = elem;
+        elem.innerHTML = filterTime(data[field.key], "y年M月d日 h:mm");
+    },
+    "timestamp"(elem) {
+        var { data, field } = elem;
+        elem.innerHTML = filterTime(data[field.key]);
+    },
     "size"({ field }, data) {
         var f = data[field.key];
         return size(f);

package/coms/zimoli/on.js

@@ -278,7 +278,6 @@ var remove = function (k, hk, [eventtypes, handler, context]) {
 var broadcast = function (k, hk, event) {
     var element = this;
     var handlers = element[hk];
-    if (!handlers) console.log(handlers, hk, event, element)
     if (handlers.length > 1) handlers = handlers.slice();
     if (event.which === 1 && event.buttons === 0) {
         // firefox 无按键
@@ -426,7 +425,7 @@ var invoke = function (event, type, pointerType) {
 
 (function () {
     var pointeractive = null;
-    if ("onpointerdown" in document || document.efronton) return;
+    if ("onpointerdown" in document) return;
     var getPointerType = function (event) {
         return event.type.replace(/(start|move|end|cancel|down|up|leave|out|over|enter)$/i, '');
     };
@@ -455,8 +454,7 @@ var invoke = function (event, type, pointerType) {
 }());
 
 (function () {
-    // fastclick
-    if (window.fastclick) return;
+    // 不再兼容fastclick
     var onclick = on("click");
     var onmousedown = on("mousedown");
     var onmousemove = on("mousemove");
@@ -471,13 +469,15 @@ var invoke = function (event, type, pointerType) {
         onclick.preventClick = false;
         pointerX = event.clientX, pointerY = event.clientY;
     }
-    var abs = Math.abs;
+    var dis = (a, b) => a * a + b * b
     function clickcancel(event) {
-        if (!event || abs(event.clientX - pointerX) >= MOVELOCK_DELTA || abs(event.clientY - pointerY) >= MOVELOCK_DELTA) onclick.preventClick = true;
+        if (!event || event.which && dis(event.clientX - pointerX, event.clientY - pointerY) >= MOVELOCK_DELTA * MOVELOCK_DELTA) {
+            onclick.preventClick = true;
+        }
     }
-    onmousedown(window, clickstart);
+    onmousedown(window, clickstart, true);
 
-    onmousemove(window, clickcancel);
+    onmousemove(window, clickcancel, true);
     if (window.addEventListener) {
         window.addEventListener("touchmove", function (event) {
             extendTouchEvent(event);

package/coms/zimoli/table.html

@@ -1,7 +1,7 @@
 <thead @mounted="setFixedColumn.call(this.parentNode),setContextMenu(this)">
     <tr inline-block #adapter thead @mounted="resizeT(this)">
-        <td draggable="false" fixed row-index>${i18n`序号`}</td>
-        <td fixed:="f.fixed" -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)"><i
+        <td draggable="false" fixed row-index><mask></mask>${i18n`序号`}</td>
+        <td fixed:="f.fixed" -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)" swapped_="f.summary"><mask></mask><i
                 -if="f.icon" -class="f.icon"></i><span -if="f.name" -html="f.name"
                 type@="typeof f.type==='string'?f.type:''"></span><template -else>&nbsp;</template>
         </td>
@@ -10,9 +10,10 @@
 </thead>
 <tbody -src="(d,i) in data" :style="tbodyHeight(this,hasFoot)">
     <tr inline-block :style="{width:adapter.style.width}" @click="rowClick(d,i,event)" @mounted="resizeR(this)">
-        <td fixed row-index -bind="i+1" :style="adapter.firstChild.getAttribute('style')">
+        <td fixed row-index :style="adapter.firstChild.getAttribute('style')"><mask></mask><span -bind="i+1"></span>
         </td>
         <td fixed:="f.fixed" -repeat="(f,i) in fields" :style="adapter.children[i+1].getAttribute('style')">
+            <mask></mask>
             <model -if="!isEmpty(f.key)" :field=f :data=d readonly></model>
             <template -else>&nbsp;</template>
             <a on-click="o.do(d)" -if="isEmpty(f.key)&&f.options&&(!o.when||o.when(d))"
@@ -20,7 +21,7 @@
                 <span -text="o.name instanceof Function?o.name(d):o.name"></span>
             </a>
         </td>
-        <td :style="adapter.lastChild.getAttribute('style')">&nbsp;</td>
+        <td :style="adapter.lastChild.getAttribute('style')"><mask></mask>&nbsp;</td>
     </tr>
 </tbody>
 <tfoot>

package/coms/zimoli/table.js

@@ -161,6 +161,7 @@ var resizeColumn = function (target, targetW) {
     }
 };
 var resizeTarget = function (event) {
+    if (swapping && onclick.preventClick) swapping.end(), swapping = null;
     var { resizing } = this;
     if (!resizing) return;
     event.moveLocked = true;
@@ -406,15 +407,34 @@ function setContextMenu(thead) {
     var scope = this;
     contextmenu(thead, menuItems);
 }
+
+var swapping = null;
+
 function table(elem) {
     var tableElement = isElement(elem) ? elem : document.createElement("table");
     var activeCols = [];
     bind('mousemove')(tableElement, adaptTarget);
+    var updateSummaryFields = null;
     moveupon(tableElement, {
         start(event) {
-            if (this.resizing) event.preventDefault();
+            if (this.resizing) return event.preventDefault();
+            if (!updateSummaryFields) return;
+            var thead = getThead(this);
+            var th = getTargetIn(thead, event.target, false);
+            if (!th) return;
+            if (th.tagName.toLowerCase() === 'tr') th = getTargetIn(th, event.target, false);
+            var field = th.$scope?.f;
+            if (!field || field.fixed || !isHandled(field.key)) return;
+            swapping = lazySwap(th, function (value) {
+                field.summary = value;
+                updateSummaryFields();
+            });
+            swapping.start();
         },
         move: resizeTarget,
+        end() {
+            if (swapping) swapping.end(), swapping = null;
+        }
     });
     var activeRows = [];
     onmousemove(tableElement, function (event) {
@@ -436,6 +456,7 @@ function table(elem) {
         }
         if (!getTargetIn(thead, event.target)) return;
         var tds = cellMatchManager(event.target);
+
         if (!tds) return;
         setClass(tds, 'y-ing', activeCols);
         removeXIng(activeRows);
@@ -456,13 +477,15 @@ function table(elem) {
     };
     var cellMatchManager = function (element) {
         if (!thead) thead = getThead(table);
-        if (!getTargetIn(thead, element)) return false;
-        if (!tdElementReg.test(element.tagName)) return false;
+        var td = getTargetIn(thead, element, false);
+        if (!td) return false;
+        if (td.tagName.toLowerCase() === 'tr') td = getTargetIn(td, element, false);
+        if (!tdElementReg.test(td.tagName)) return false;
         if (!markedRows) {
             markThead();
             markedRows = true;
         }
-        var { colstart, colend } = element;
+        var { colstart, colend } = td;
         return getTdsByCol(table, colstart, colend);
     };
     watch(table, {
@@ -497,6 +520,10 @@ function table(elem) {
                 }
             }
         })
+        updateSummaryFields = function () {
+            $scope.data.summaryFields = fields.filter(f => f.summary);
+            $scope.data.update();
+        };
         thead = null;
         fields.forEach(enrichField);
         remove(this.children);