efront 3.13.3 → 3.14.3

package/coms/zimoli/table.html

@@ -1,10 +1,12 @@
-<tbody -src="d in data" :style="{'max-height':((innerHeight-46)/32|0)*32+36}">
+<tbody -src="(d,i) in data" :style="tbodyHeight()">
     <tr thead #adapter insert>
+        <td row-index>序号</td>
         <td -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)"><i -if="f.icon"
                 -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
         </td>
     </tr>
     <tr>
+        <td row-index -bind="i+1"></td>
         <td -repeat="f in fields">
             <model -if="f.key" :field=f :data=d readonly></model>
             <a on-click="o.do(d)" -if="!f.key&&f.options&&(!o.when||o.when(d))"

package/coms/zimoli/table.js

@@ -146,7 +146,6 @@ function enrichField(f) {
     f.width = width + 60;
 }
 
-
 function table(elem) {
     var tableElement = isElement(elem) ? elem : document.createElement("table");
     var activeCols = [];
@@ -214,18 +213,21 @@ function table(elem) {
     table.dragbox = function () {
         return thead;
     };
+    var tbodyHeight = e => ({ 'max-height': ((innerHeight - getScreenPosition(table).top - 46) / 32 | 0) * 32 + 36 });
     care(table, function ([fields, data]) {
         thead = null;
-        this.innerHTML = template;
         fields.forEach(enrichField);
+        remove(this.children);
+        this.innerHTML = template;
+
         render(this, {
             fields,
-            tbody: list,
-            innerHeight: {
-                valueOf() {
-                    return innerHeight - getScreenPosition(table).top;
-                }
+            tbody() {
+                var e = list.apply(null, arguments);
+                css(e, tbodyHeight());
+                return e;
             },
+            tbodyHeight,
             data,
             adapter: null,
             model,
@@ -250,9 +252,10 @@ function table(elem) {
         cellMatchManager,
         function (src, dst, rel, append, parentNode) {
             if (table.src) {
-                var [fields] = table.src;
-                var [f] = fields.splice(src, 1);
-                fields.splice(dst, 0, f);
+                if (src < 1 || dst < 1) return false;
+                var fields = parentNode.$scope.fields;
+                var [f] = fields.splice(src - 1, 1);
+                fields.splice(dst - 1, 0, f);
             }
             var children = parentNode.children;
             var srcElement = children[src];

package/coms/zimoli/table.less

@@ -10,6 +10,9 @@
                 box-shadow: 1px 0 0 0 #00000033, -1px 0 0 0 #00000033;
             }
 
+            &:insert {
+                background: #999;
+            }
         }
     }
 
@@ -25,10 +28,15 @@ table,
     box-sizing: border-box;
 }
 
+* {
+    vertical-align: top;
+}
+
 & {
     outline: 1px solid #0006;
 }
 
+
 .y-ing {
     &:before {
         content: "";
@@ -91,21 +99,14 @@ table,
         }
 
         &:nth-of-type(odd) {
-
-            >td,
-            >th {
-                background-color: #eee;
-            }
+            background-color: #eee;
         }
 
         &:nth-of-type(even) {
-
-            >td,
-            >th {
-                background-color: #fff;
-            }
+            background-color: #fff;
         }
 
+
         &:hover {
 
             >td,
@@ -121,12 +122,28 @@ table,
         z-index: 1;
 
         >td {
-            background: #6669;
-            backdrop-filter: blur(20px);
             z-index: 1;
+            background: #999;
             color: #fff;
         }
     }
+
+}
+
+
+tr {
+
+    >th,
+    >td {
+        background: inherit;
+
+        &[row-index] {
+            user-select: none;
+            // pointer-events: none;
+            background: #fff;
+            text-align: right;
+        }
+    }
 }
 
 [thead] {

package/coms/zimoli/vbox.js

@@ -5,7 +5,6 @@ function ybox(generator) {
     var sign = Math.sign || function (a) {
         return +a > 0 ? 1 : -a > 0 ? -1 : 0;
     };
-    var { min, max } = Math;
     var _box;
     if (isNode(generator)) {
         _box = generator;
@@ -63,7 +62,7 @@ function ybox(generator) {
         return _Top;
     };
     var __speed = 0;
-    var smooth = function (useIncrease = true) {
+    var smooth = function smooth(useIncrease = true) {
         var abs_speed = abs(__speed << 2) / time_splitter;
         var abs_speed = abs(__speed << 2) / time_splitter;
         if (abs_speed < 1) {
@@ -107,9 +106,24 @@ function ybox(generator) {
         remove(increaser);
         return 0;
     };
+    var stop_timer = 0, stop_id = 0, cancel_id = 0;
+    var stop = lazy(function stop() {
+        if (cancel_id !== stop_id) return;
+        if (Math.abs(_box.stopY() - _box.Top() )> 0.0001) stop_timer = setTimeout(stop, 16);
+    }, 310);
+    var cancelFrame = function () {
+        __speed = _speed(0);
+        clearTimeout(stop_timer);
+        cancelAnimationFrame(smooth_timer);
+        cancelAnimationFrame(decrease_timer);
+        return ++cancel_id;
+    };
     var decrease = function () {
         if (_decrease(increaser_t) + _decrease(increaser_b)) decrease_timer = requestAnimationFrame(decrease);
-        else if (_box.stopY() - _box.Top()) decrease_timer = requestAnimationFrame(decrease);
+        else {
+            stop_id = cancel_id;
+            stop();
+        }
     };
     var increase = function (deltaY, minusOnly) {
         var t_height = increaser_t.height || 0;
@@ -170,9 +184,7 @@ function ybox(generator) {
         });
         bindtouch(_box, {
             start() {
-                cancelAnimationFrame(smooth_timer);
-                cancelAnimationFrame(decrease_timer);
-                _speed(0);
+                cancelFrame();
             },
             move(scrolled) {
                 var y = -this.Top();
@@ -203,11 +215,7 @@ function ybox(generator) {
     }
     if (isMounted(_box)) initScrollId.call(_box);
     on("append")(_box, initScrollId);
-    _box.cancelFrame = function () {
-        cancelAnimationFrame(smooth_timer);
-        cancelAnimationFrame(decrease_timer);
-        __speed = _speed(0);
-    };
+    _box.cancelFrame = cancelFrame;
     preventOverflowScrolling(_box);
     return _box;
 }

package/coms/zimoli/zIndex.js

@@ -1,4 +1,6 @@
-var count=0x10000000;//弹出式菜单或窗口的zIndex起点
-function zIndex(){
-    return count++;
+var count = 0x10000000;//弹出式菜单或窗口的zIndex起点
+function zIndex(inc = 1) {
+    inc |= 0;
+    if (inc > 0) count += inc;
+    return count;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.13.3",
+    "version": "3.14.3",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {