efront 3.22.7 → 3.22.10

package/coms/basic/parseKV.js

@@ -1,7 +1,8 @@
 "use strict";
-function parseKV(string, spliter = "&", equals = "=") {
+var trim = a => a.trim();
+function parseKV(string, spliter = "&", equals = "=", decode) {
     var object = {};
-    var decode = spliter === "&" && equals === "=" ? decodeURIComponent : a => a;
+    if (!decode) decode = spliter === "&" && equals === "=" ? decodeURIComponent : trim;
     if (typeof string === "string") {
         var kvs = string.split(spliter);
         for (var cx = 0, dx = kvs.length; cx < dx; cx++) {

package/coms/kugou/playList.js

@@ -28,7 +28,7 @@ var $scope = {
 function main() {
     var page = view();
     page.initialStyle = 'margin-top:10px;opacity:0';
-    page.setAttribute("_dragable", "false");
+    page.setAttribute("_draggable", "false");
     page.innerHTML = playList;
     $scope.play = function (i) {
         if (page.play instanceof Function) {

package/coms/layer/glance.js

@@ -7,28 +7,7 @@ var dragview = function (dragview) {
             savedX = event.clientX;
             savedY = event.clientY;
             offsetWidth = menu.offsetWidth;
-            var { target } = event;
             moving = null;
-            if (/(input|textarea|select)/i.test(target.tagName) || getTargetIn(a => a.nodrag || a.hasAttribute('nodrag') || a.dragable === false, event.target)) {
-                moving = false;
-            } else {
-                var { childNodes } = target;
-                if (getComputedStyle(target).cursor === 'auto' && getComputedStyle(target).userSelect !== 'none') for (var cx = 0, dx = childNodes.length; cx < dx; cx++) {
-                    var child = childNodes[cx];
-                    if (child.nodeType === 3) {
-                        moving = false;
-                        break;
-                    }
-                }
-                if (moving !== false) do {
-                    var contentEditbale = target.getAttribute("contenteditable") !== null;
-                    if (contentEditbale) {
-                        moving = false;
-                        break;
-                    }
-                    target = target.parentNode;
-                } while (target && target.nodeType == 1);
-            }
         },
         move(event) {
             if (moving === false) return;

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/input.js

@@ -1,17 +1,28 @@
 var _input = createElement("input");
+/**
+ * @this HTMLInputElement
+ */
 var number = function (event) {
     var ipt = event.target;
     var { keyCode } = event;
     var { value, type } = ipt;
+    var s = this.selectionStart;
     if (keyCode === 13 || keyCode === 18 || keyCode === 37 || keyCode === 38 || keyCode === 39 || keyCode === 40 || keyCode === 8 || keyCode === 46 || keyCode === 9) {
     }
     else if (keyCode >= 48 && keyCode <= 57 || keyCode >= 96 && keyCode <= 105) {
         if (this.value) {
-            if (this.fixed && this.value.replace(/^[^\.]+/, '').length > this.fixed ||
+            if (s < this.value.length) {
+                var index = this.value.indexOf('.');
+                if (index >= 0 && s > index) {
+                    this.value = this.value.slice(0, this.value.length - 1);
+                }
+                this.setSelectionRange(s, s);
+            }
+            else if (this.fixed && this.value.replace(/^[^\.]+/, '').length > this.fixed ||
                 this.limit && this.value.length >= this.limit && !/\./.test(this.value)) {
                 event.preventDefault();
             }
-            if(/^[+-]?0$/.test(this.value)){
+            else if (/^[+-]?0$/.test(this.value)) {
                 event.preventDefault();
             }
         }
@@ -19,14 +30,27 @@ var number = function (event) {
     else if (keyCode === 110 || keyCode === 190) {
         if (/^int/i.test(type)) {
             event.preventDefault();
-        } else if (/\./i.test(value) || !value || /^[\-\+]$/.test(value)) {
+        }
+        else if (/\./i.test(value)) {
+            var index = this.value.indexOf(".");
+            if (s < index) {
+                this.value = this.value.slice(0, s) + this.value.slice(index + 1);
+                this.setSelectionRange(s, s);
+            }
+            else {
+                event.preventDefault();
+            }
+        }
+        else if (!value || /^[\-\+]$/.test(value)) {
             event.preventDefault();
         }
-    } else if (keyCode === 189 || keyCode === 187) {// 负号 正号
+    }
+    else if (keyCode === 189 || keyCode === 187) {// 负号 正号
         if (value || this.positive) {
             event.preventDefault();
         }
-    } else {
+    }
+    else {
         event.preventDefault();
     }
     if (value && !/^[\d]+$/i.test(value)) {
@@ -36,11 +60,19 @@ var number = function (event) {
             if (value !== v) {
                 ipt.value = v;
             }
-        } else if (!/^[\-\+]$/.test(value)) {
+        }
+        else if (!/^[\-\+]$/.test(value)) {
             ipt.value = '';
         }
     }
 };
+var toFixed = function () {
+    if (this.value && this.fixed) var fixed = BigNumber.fix(this.value, this.fixed);
+    if (this.value !== fixed) {
+        this.value = fixed;
+        dispatch(this, 'change');
+    }
+};
 var positiveReg = /^\+|^positive\-?|\-?positive$|\+$/i;
 var negativeReg = /^\-|^negative\-?|\-?negative$|\-$/i;
 var numberLimit = /\:(\d+)?(?:\.(\d+))?$/;
@@ -92,6 +124,7 @@ function input(element) {
                 case "money":
                     if (!element.fixed) element.fixed = 2;
                     on("keydown")(element, number);
+                    on("blur")(element, toFixed);
                     break;
                 case "natural":
                     if (!+element.positive) element.positive = true;

package/coms/zimoli/moveupon.js

@@ -23,6 +23,30 @@ function removeAllListeners() {
     if (isFunction(offhook)) offhook();
     offhook = null;
 }
+if (/Firefox/.test(navigator.userAgent)) on('dragstart')(document, function (e) {
+    if (e.target.draggable === false) {
+        e.preventDefault();
+        return false;
+    }
+});
+var locktouch = function (target) {
+    if (/(input|textarea|select)/i.test(target.tagName) || getTargetIn(a => String(a.contentEditable) === 'true' || a.draggable, target)) {
+        return true;
+    } else {
+        var { childNodes } = target;
+        var a = getTargetIn(a => {
+            if ((getComputedStyle(a).userSelect || getComputedStyle(a).webkitUserSelect) !== 'auto') return a;
+        });
+        if (!a) return;
+        var computed = getComputedStyle(a);
+        if (computed.cursor === 'auto' && (computed.userSelect || computed.webkitUserSelect) !== 'none') for (var cx = 0, dx = childNodes.length; cx < dx; cx++) {
+            var child = childNodes[cx];
+            if (child.nodeType === 3) {
+                return true;
+            }
+        }
+    }
+};
 
 function moveupon(target, { start, move, end }, initialEvent) {
     var touchLocked = false;
@@ -47,20 +71,18 @@ function moveupon(target, { start, move, end }, initialEvent) {
         if (isFunction(end)) end.call(target, event);
     };
     var hookmouse = function () {
-        if (touchLocked) return;
-        touchLocked = true;
         addHookListener(onmousemove, mousemove, target === window);
         offmouseup = onmouseup(window, cancel);
     };
     var hooktouch = function () {
-        if (touchLocked) return;
-        touchLocked = true;
         addHookListener(ontouchmove, touchmove, target === window);
         offtouchend = ontouchend(target, cancel);
         offtouchcancel = ontouchcancel(target, cancel);
     };
+
     if (!start) {
         if (!initialEvent) throw new Error("请传入touchstartEvent或者mousedownEvent");
+        if (locktouch(initialEvent.target)) return;
         if (initialEvent.type === "touchstart") {
             extendTouchEvent(initialEvent);
             initialEvent.preventDefault();
@@ -71,10 +93,16 @@ function moveupon(target, { start, move, end }, initialEvent) {
         return;
     }
     onmousedown(target, function (event) {
+        if (touchLocked) return;
+        if (locktouch(event.target)) return;
+        touchLocked = true;
         hookmouse(event);
         if (isFunction(start)) start.call(this, event);
     });
     ontouchstart(target, function (event) {
+        if (touchLocked) return;
+        if (locktouch(event.target)) return;
+        touchLocked = true;
         extendTouchEvent(event);
         hooktouch(event);
         if (isFunction(start)) start.call(this, event);

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/coms/zimoli/table.js

@@ -365,6 +365,7 @@ function table(elem) {
         }
         if (!getTargetIn(thead, event.target)) return;
         var tds = getTargetIn(cellMatchManager, event.target);
+        if (!tds) return;
         setClass(tds, 'y-ing', activeCols);
         activeCols = tds;
     });
@@ -379,15 +380,18 @@ function table(elem) {
     var table = tableElement;
     var thead;
     var markedRows = false;
+    var markThead = function () {
+        var savedRowDeltas = [];
+        Array.prototype.forEach.call(thead.children, function (tr) {
+            markRowTds(tr, savedRowDeltas);
+        });
+    };
     var cellMatchManager = function (element) {
         if (!thead) thead = getThead(table);
         if (!getTargetIn(thead, element)) return false;
         if (!tdElementReg.test(element.tagName)) return false;
         if (!markedRows) {
-            var savedRowDeltas = [];
-            Array.prototype.forEach.call(thead.children, function (tr) {
-                markRowTds(tr, savedRowDeltas);
-            });
+            markThead();
             markedRows = true;
         }
         var { colstart, colend } = element;
@@ -468,14 +472,17 @@ function table(elem) {
             var dstElement = children[rel];
             var dstTds = getRowsOfTdsByCol(table, dstElement.colstart, dstElement.colend);
             var srcTds = getRowsOfTdsByCol(table, srcElement.colstart, srcElement.colend);
+            var clearCss = { left: '', right: '', borderLeft: '', borderRight: '' };
             if (append === appendChild.before) {
                 srcTds.map(function (src, cx) {
                     var dst = dstTds[cx];
                     var d = dst[0] || dst.next;
                     if (d) src.map(function (s) {
+                        css(s, clearCss);
                         append(d, s);
                     });
                     else if (d = dst.prev) src.map(function (s) {
+                        css(s, clearCss);
                         appendChild.after(d, s);
                         d = s;
                     });
@@ -485,15 +492,22 @@ function table(elem) {
                     var dst = dstTds[cx];
                     var d = dst[dst.length - 1] || dst.prev;
                     if (d) src.map(function (s) {
+                        css(s, clearCss);
                         append(d, s);
                         d = s;
                     });
                     else if (d = dst.next) src.map(function (s) {
+                        css(s, clearCss);
                         appendChild.before(d, s);
                     });
                 });
 
             }
+            markThead();
+            markedRows = true;
+            requestAnimationFrame(function(){
+                setFixedColumn.call(table)
+            })
         }
     );
     resizingList.set(table);

package/coms/zimoli/view.js

@@ -1,6 +1,5 @@
 
 var prototype = {
-    dragable: undefined,
     resizable: false,
     closeable: true,
     showTitle: true,
@@ -98,10 +97,10 @@ function view(element) {
     if (window !== element) {
         extend(window, element);
         once("append")(window, function () {
-            if (window.dragable !== true && window.dragable !== false) {
-                window.dragable = /^(fixed|absolute)$/i.test(getComputedStyle(window).position);
+            if (window.draggable !== true && window.draggable !== false) {
+                window.draggable = /^(fixed|absolute)$/i.test(getComputedStyle(window).position);
             }
-            if (window.dragable) window.setAttribute('dragable', 'dragable');
+            if (window.draggable) window.setAttribute('draggable', 'draggable');
         })
         if (window.resizable) resize.on(window);
     }

package/coms/zimoli/view.less

@@ -16,7 +16,7 @@ body>& {
     border: 1px solid #0006;
 }
 
-&[dragable] {
+&[draggable] {
     position: absolute;
 }
 

package/package.json

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