efront 4.5.14 → 4.5.16

package/coms/zimoli/table.js

@@ -68,11 +68,29 @@ var getRowsOfTdsByCol = function (table, start, end) {
 var getTdsByCol = function (table, start, end) {
     return [].concat.apply([], getRowsOfTdsByCol(table, start, end));
 };
+var resizeR = function (t) {
+    var h = 0;
+    var children = [];
+    for (var c of t.children) {
+        if (getColspan(c) > 1) continue;
+        children.push(c);
+    }
+    for (var c of children) {
+        var height = c.offsetHeight;
+        if (h < height) h = height;
+    }
+    for (var c of children) {
+        var height = c.offsetHeight;
+        if (h > height) {
+            css(c, { height: h });
+        }
+    }
+}
 var resizeT = function (t, w) {
     if (!w) {
         var w = 0;
-        for (var cx = 0, dx = t.children.length; cx < dx; cx++) {
-            w += t.children[cx].offsetWidth;
+        for (var c of t.children) {
+            w += c.offsetWidth;
         }
     }
     css(t, { width: w });
@@ -143,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;
@@ -328,9 +347,7 @@ var removeYIng = function (activeCols) {
     });
 };
 var removeXIng = function (activeRows) {
-    activeRows.forEach(function (td) {
-        removeClass(td, 'x-ing');
-    });
+    for (var td of activeRows) removeClass(td, 'x-ing');
 };
 
 var getTdsOfSameRow = function (td) {
@@ -390,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) {
@@ -420,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);
@@ -440,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, {
@@ -481,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);
@@ -517,6 +560,7 @@ function table(elem) {
             data,
             adapter: null,
             resizeT,
+            resizeR,
             model,
             sort(f) {
                 this.data.sort(f);

package/coms/zimoli/table.less

@@ -43,26 +43,26 @@ td {
     white-space: normal;
     height: 100%;
     padding: 2px 10px;
+
+    >* {
+        position: relative;
+    }
 }
 
 .y-ing,
 .x-ing {
-    &:before {
-        content: "";
+    >mask {
         position: absolute;
         left: 0;
         top: 0;
         bottom: 0;
         right: 0;
+        pointer-events: none;
         background-color: rgba(0, 60, 69, .06);
     }
-
-    >* {
-        position: relative;
-    }
 }
 
-[draggable="false"]:before {
+[draggable="false"]>mask {
     display: none;
 }
 
@@ -70,7 +70,7 @@ thead {
 
     .y-ing,
     .x-ing {
-        &:before {
+        >mask {
             background-color: rgba(0, 60, 69, .3);
         }
     }
@@ -143,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.14",
+    "version": "4.5.16",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {