efront 4.5.15 → 4.5.17

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);

package/coms/zimoli/table.less

@@ -43,12 +43,15 @@ td {
     white-space: normal;
     height: 100%;
     padding: 2px 10px;
+
+    >* {
+        position: relative;
+    }
 }
 
 .y-ing,
 .x-ing {
-    &:before {
-        content: "";
+    >mask {
         position: absolute;
         left: 0;
         top: 0;
@@ -57,13 +60,9 @@ td {
         pointer-events: none;
         background-color: rgba(0, 60, 69, .06);
     }
-
-    >* {
-        position: relative;
-    }
 }
 
-[draggable="false"]:before {
+[draggable="false"]>mask {
     display: none;
 }
 
@@ -71,7 +70,7 @@ thead {
 
     .y-ing,
     .x-ing {
-        &:before {
+        >mask {
             background-color: rgba(0, 60, 69, .3);
         }
     }
@@ -144,8 +143,27 @@ thead {
             color: #fff;
             background-color: #395268;
             clear: both;
+
+            &:before {
+                content: '';
+                display: block;
+                position: absolute;
+                left: 0;
+                height: 0;
+                bottom: 0;
+                right: 0;
+                background: #426;
+                transition: height .3s ease-in;
+                transition-delay: .7s;
+            }
+
+            &[swapped]:before {
+                height: 100%;
+            }
         }
     }
+
+
 }
 
 >tbody {

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -61,11 +61,6 @@
         }
 
     }
-
-    p span,
-    p a {
-        vertical-align: middle;
-    }
 </style>
 <p><span>${i18n`翻译结果仅做为参考，未必完美替换，语法参考:`}<a @click="zimoli.go('/组件/basic/i18n.js',{mark:true})">i18n.js</a></span></p>
 <p -if="!window.showDirectoryPicker" error>${i18n`国际化工具仅在浏览器支持 showDirectoryPicker 时可用`}</p>

package/package.json

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