efront 3.22.7 → 3.22.8

package/coms/zimoli/autodragchildren.js

@@ -25,9 +25,11 @@ var moveChildrenX = function (targetBox, previousElements, followedElements, mov
                 var elementPosition = getScreenPosition(element);
                 var elementCenter = elementPosition.left + elementPosition.width / 2;
                 var delta = elementCenter - (element.moved || 0);
-                if (delta + 2 <= dragPositionLeft) {
+                if ((!element.hasAttribute || element.hasAttribute('draggable')) && element.draggable === false);
+                else if (delta + 2 <= dragPositionLeft) {
                     recover(element);
-                } else if (delta - 2 >= dragPositionLeft) {
+                }
+                else if (delta - 2 >= dragPositionLeft) {
                     moveMargin(element, dragPosition.width);
                 }
             });
@@ -35,9 +37,11 @@ var moveChildrenX = function (targetBox, previousElements, followedElements, mov
                 var elementPosition = getScreenPosition(element);
                 var elementCenter = elementPosition.left + elementPosition.width / 2;
                 var delta = elementCenter - (element.moved || 0);
-                if (delta + 2 <= dragPositionRight) {
+                if ((!element.hasAttribute || element.hasAttribute('draggable')) && element.draggable === false);
+                else if (delta + 2 <= dragPositionRight) {
                     moveMargin(element, -dragPosition.width);
-                } else if (delta - 2 >= dragPositionRight) {
+                }
+                else if (delta - 2 >= dragPositionRight) {
                     recover(element);
                 }
             });
@@ -53,6 +57,10 @@ var moveChildrenX = function (targetBox, previousElements, followedElements, mov
 var scrollX = function (targetBox, moveChildren) {
     var dragTarget = drag.target;
     if (!dragTarget || !targetBox) return;
+    targetBox = getTargetIn(function (a) {
+        var computed = getComputedStyle(a);
+        return (computed.overflowX || computed.overflow) !== 'visible' && a.scrollWidth > a.clientWidth;
+    }, targetBox);
     var areaPosition = getScreenPosition(targetBox);
     var dragPosition = getScreenPosition(dragTarget);
     var scrollDelta = 0;
@@ -133,7 +141,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             var [target] = targets;
             return {
                 style: target.style, target, getBoundingClientRect,
-                with: targets
+                with: targets,
+                draggable: !target.hasAttribute('draggable') || target.draggable,
             };
         }
         return targets;
@@ -227,7 +236,6 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             var children = targetBox.children;
             var srcElement = children[src];
             var dstElement = children[dst + delta];
-            console.log(targetChild, src)
             src = bindTarget(src, isMovingSource ? targetChild : srcElement);
             dst = bindTarget(dst, dstElement);
             var needFire = !isFunction(move) || move(src, dst, dst + delta, appendSibling, targetBox) !== false;
@@ -249,7 +257,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     var autoScroll = function () {
         if (autoScroll.ing) return;
         if (scroll) autoScroll.ing = setInterval(function () {
-            var delta = scroll(targetBox, moveChildren);
+            var delta = scroll(targetBox, dragmove);
+            if (isFunction(matcher)) return;
             if (isMovingSource === false) { }
             else if (delta < 0) {
                 var p = null;

package/coms/zimoli/drag.js

@@ -34,14 +34,14 @@ var setZIndex = function () {
 };
 function drag(target, initialEvent, preventOverflow, isMovingSource) {
     if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName) || getTargetIn(a => a.nodrag || a.hasAttribute('nodrag'), initialEvent.target)) return;
-    if (target.dragable === false) return;
-    initialEvent.preventDefault();
     if (isArray(target)) {
         var extraTargets = target.slice(1);
         target = target[0];
     } else {
         var extraTargets = target.with ? [].concat(target.with) : [];
     }
+    if ((!target.hasAttribute || target.hasAttribute('draggable')) && target.draggable === false) return;
+    initialEvent.preventDefault();
     var target_offset = getOffset(target);
     var saved_delta = { x: target_offset[0] - initialEvent.screenX, y: target_offset[1] - initialEvent.screenY };
     var clone;

package/coms/zimoli/table.html

@@ -1,6 +1,6 @@
 <thead @mounted="setFixedColumn.call(this.parentNode)">
     <tr inline-block #adapter thead @mounted="resizeT(this)">
-        <td fixed row-index>序号</td>
+        <td draggable="false" fixed row-index>序号</td>
         <td fixed:="f.fixed" -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)"><i
                 -if="f.icon" -class="f.icon"></i><span -if="f.name" -html="f.name"></span><template
                 -else>&nbsp;</template>
@@ -9,7 +9,7 @@
 </thead>
 <tbody -src="(d,i) in data" :style="tbodyHeight(this)">
     <tr inline-block @mounted="this.style.width=adapter.style.width">
-        <td fixed row-index -bind="i+1" @mounted="this.style=adapter.firstChild.getAttribute('style')">
+        <td draggable="false" fixed row-index -bind="i+1" @mounted="this.style=adapter.firstChild.getAttribute('style')">
         </td>
         <td fixed:="f.fixed" -repeat="(f,i) in fields"
             @mounted="this.style=adapter.children[i+1].getAttribute('style')">

package/package.json

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