efront 4.35.6 → 4.35.8

package/coms/zimoli/getChanges.js

@@ -1,14 +1,14 @@
-function getChanges(current_props, previous_props) {
-    if (!isObject(current_props) && !isObject(previous_props)) return !shallowEqual(current_props, previous_props);
-    var changes = null;
-    if (!isObject(current_props)) current_props = Object.create(null), changes = {};
-    if (!isObject(previous_props)) previous_props = Object.create(null), changes = {};
-    keys(previous_props, current_props).forEach(function (key) {
-        if (key.charAt(0) === "$") return;
-        if (!shallowEqual(current_props[key], previous_props[key])) {
-            if (!changes) changes = {};
-            changes[key] = { previous: previous_props[key], current: current_props[key] };
-        }
-    });
-    return changes;
+function getChanges(current_props, previous_props) {
+    if (!isObject(current_props) && !isObject(previous_props)) return !shallowEqual(current_props, previous_props);
+    var changes = null;
+    if (!isObject(current_props)) current_props = Object.create(null), changes = {};
+    if (!isObject(previous_props)) previous_props = Object.create(null), changes = {};
+    keys(previous_props, current_props).forEach(function (key) {
+        if (key.charAt(0) === "$") return;
+        if (!shallowEqual(current_props[key], previous_props[key])) {
+            if (!changes) changes = {};
+            changes[key] = { previous: previous_props[key], current: current_props[key] };
+        }
+    });
+    return changes;
 }

package/coms/zimoli/lattice.js

@@ -1,110 +1,110 @@
-var complete_class = "complete";
-var inadequate_class = "lack";
-function lattice(element, minWidth, _maxWidth, layers) {
-    var boxCount, maxWidth = _maxWidth || minWidth << 1;
-    var resize = function () {
-        var _layers = layers || _box.src || [];
-        if (!_layers.length) return;
-        var _minWidth = +(element.getAttribute("min-width") || element.getAttribute("item-width"));
-        if (_minWidth) {
-            minWidth = _minWidth;
-            maxWidth = _maxWidth || minWidth << 1;
-        }
-        var clientWidth = parseFloat(freePixel(_box.clientWidth));
-        if (!clientWidth) return;
-        var savedCount = boxCount;
-        boxCount = clientWidth / minWidth | 0;
-        if (boxCount >= _layers.length) {
-            boxCount = _layers.length;
-            var minCount = Math.ceil(clientWidth / maxWidth);
-            if (minCount >= _layers.length) {
-                boxCount = minCount;
-            }
-            addClass(_box, complete_class);
-        }
-        else removeClass(_box, complete_class);
-        if (boxCount < 1) boxCount = 1, addClass(_box, inadequate_class);
-        else removeClass(_box, inadequate_class);
-        _box.paddingMax = boxCount;
-        _box.group = boxCount;
-        if (savedCount === boxCount) return;
-        _box.clean();
-        [].forEach.call(_box.children, build);
-        return true;
-    };
-    if (layers) {
-        var _box = list(element, function (index) {
-            var offset = boxCount * index;
-            var objs = layers.slice(offset, offset + boxCount).map(function (a) {
-                css(a, {
-                    width: (1000000 / boxCount | 0) / 10000 + "%",
-                    maxWidth: fromPixel(maxWidth),
-                });
-                return a;
-            });
-            if (!objs.length) return false;
-            var _container = div();
-            appendChild(_container, objs);
-            return _container;
-        })
-    } else {
-        var _box = list(element);
-        var insertBefore = _box.insertBefore;
-        _box.insertBefore = function (element) {
-            build(element);
-            return insertBefore.apply(_box, arguments);
-        };
-    }
-    var build = function (element) {
-        css(element, {
-            width: (1000000 / boxCount | 0) / 10000 + "%",
-            maxWidth: fromPixel(maxWidth),
-        });
-        if (element.with instanceof Array) element.with.forEach(build);
-        else if (isElement(element.with)) build(element.with);
-    };
-    var go = _box.go;
-    _box.go = function () {
-        resize();
-        go.apply(this, arguments);
-    };
-    _box.resize = lazy(function () {
-        var index = _box.index();
-        var savedCount = boxCount;
-        if (resize()) {
-            var realIndex = index * (savedCount || 1);
-            index = realIndex / boxCount || 0;
-            go.call(_box, index);
-        }
-    });
-    resizingList.set(_box, _box.resize);
-    return _box;
-}
-function main() {
-    var element, minWidth, maxWidth, layers;
-    var initMinWidth = function (arg) {
-        if (minWidth) {
-            if (arg >= minWidth) {
-                maxWidth = arg;
-            } else {
-                maxWidth = minWidth;
-                minWidth = arg;
-            }
-        } else {
-            minWidth = arg;
-        }
-    };
-    [].forEach.call(arguments, function (arg) {
-        if (isNode(arg)) {
-            element = arg;
-        } else if (isArray(arg)) {
-            layers = arg;
-        } else if (isFinite(arg)) {
-            initMinWidth(arg);
-        }
-    });
-    if (element && element.$src) {
-        layers = null;
-    }
-    return lattice(element, minWidth || 240, maxWidth, layers);
+var complete_class = "complete";
+var inadequate_class = "lack";
+function lattice(element, minWidth, _maxWidth, layers) {
+    var boxCount, maxWidth = _maxWidth || minWidth << 1;
+    var resize = function () {
+        var _layers = layers || _box.src || [];
+        if (!_layers.length) return;
+        var _minWidth = +(element.getAttribute("min-width") || element.getAttribute("item-width"));
+        if (_minWidth) {
+            minWidth = _minWidth;
+            maxWidth = _maxWidth || minWidth << 1;
+        }
+        var clientWidth = parseFloat(freePixel(_box.clientWidth));
+        if (!clientWidth) return;
+        var savedCount = boxCount;
+        boxCount = clientWidth / minWidth | 0;
+        if (boxCount >= _layers.length) {
+            boxCount = _layers.length;
+            var minCount = Math.ceil(clientWidth / maxWidth);
+            if (minCount >= _layers.length) {
+                boxCount = minCount;
+            }
+            addClass(_box, complete_class);
+        }
+        else removeClass(_box, complete_class);
+        if (boxCount < 1) boxCount = 1, addClass(_box, inadequate_class);
+        else removeClass(_box, inadequate_class);
+        _box.paddingMax = boxCount;
+        _box.group = boxCount;
+        if (savedCount === boxCount) return;
+        _box.clean();
+        [].forEach.call(_box.children, build);
+        return true;
+    };
+    if (layers) {
+        var _box = list(element, function (index) {
+            var offset = boxCount * index;
+            var objs = layers.slice(offset, offset + boxCount).map(function (a) {
+                css(a, {
+                    width: (1000000 / boxCount | 0) / 10000 + "%",
+                    maxWidth: fromPixel(maxWidth),
+                });
+                return a;
+            });
+            if (!objs.length) return false;
+            var _container = div();
+            appendChild(_container, objs);
+            return _container;
+        })
+    } else {
+        var _box = list(element);
+        var insertBefore = _box.insertBefore;
+        _box.insertBefore = function (element) {
+            build(element);
+            return insertBefore.apply(_box, arguments);
+        };
+    }
+    var build = function (element) {
+        css(element, {
+            width: (1000000 / boxCount | 0) / 10000 + "%",
+            maxWidth: fromPixel(maxWidth),
+        });
+        if (element.with instanceof Array) element.with.forEach(build);
+        else if (isElement(element.with)) build(element.with);
+    };
+    var go = _box.go;
+    _box.go = function () {
+        resize();
+        go.apply(this, arguments);
+    };
+    _box.resize = lazy(function () {
+        var index = _box.index();
+        var savedCount = boxCount;
+        if (resize()) {
+            var realIndex = index * (savedCount || 1);
+            index = realIndex / boxCount || 0;
+            go.call(_box, index);
+        }
+    });
+    resizingList.set(_box, _box.resize);
+    return _box;
+}
+function main() {
+    var element, minWidth, maxWidth, layers;
+    var initMinWidth = function (arg) {
+        if (minWidth) {
+            if (arg >= minWidth) {
+                maxWidth = arg;
+            } else {
+                maxWidth = minWidth;
+                minWidth = arg;
+            }
+        } else {
+            minWidth = arg;
+        }
+    };
+    [].forEach.call(arguments, function (arg) {
+        if (isNode(arg)) {
+            element = arg;
+        } else if (isArray(arg)) {
+            layers = arg;
+        } else if (isFinite(arg)) {
+            initMinWidth(arg);
+        }
+    });
+    if (element && element.$src) {
+        layers = null;
+    }
+    return lattice(element, minWidth || 240, maxWidth, layers);
 }

package/coms/zimoli/lattice_test.less

@@ -1,24 +1,24 @@
-& {
-    height: 100%;
-    background: #fff;
-}
-
->lattice {
-    max-height: 300px;
-    height: 100%;
-    @mask-color: rgba(0, 0, 0, .4);
-    // background: linear-gradient(45deg, @mask-color, 25%, @mask-color, 25%, rgba(0, 0, 0, 0), 75%, rgba(0, 0, 0, 0), 75%, @mask-color), linear-gradient(135deg, @mask-color, 25%, @mask-color, 25%, rgba(0, 0, 0, 0), 75%, rgba(0, 0, 0, 0), 75%, @mask-color);
-    background-size: 20px 20px;
-    background-repeat: repeat;
-    border: 2px solid transparent;
-    background-clip: content-box;
-
-    >div {
-        box-sizing: border-box;
-        height: 100px;
-        color: #fff;
-        border: 1px solid #fff;
-        padding: 10px 16px;
-        display: inline-block;
-    }
+& {
+    height: 100%;
+    background: #fff;
+}
+
+>lattice {
+    max-height: 300px;
+    height: 100%;
+    @mask-color: rgba(0, 0, 0, .4);
+    // background: linear-gradient(45deg, @mask-color, 25%, @mask-color, 25%, rgba(0, 0, 0, 0), 75%, rgba(0, 0, 0, 0), 75%, @mask-color), linear-gradient(135deg, @mask-color, 25%, @mask-color, 25%, rgba(0, 0, 0, 0), 75%, rgba(0, 0, 0, 0), 75%, @mask-color);
+    background-size: 20px 20px;
+    background-repeat: repeat;
+    border: 2px solid transparent;
+    background-clip: content-box;
+
+    >div {
+        box-sizing: border-box;
+        height: 100px;
+        color: #fff;
+        border: 1px solid #fff;
+        padding: 10px 16px;
+        display: inline-block;
+    }
 }

package/coms/zimoli/moveupon.js

@@ -50,16 +50,35 @@ var locktouch = function (target, handles) {
         }
     }
 };
-
+var getX = function (event) {
+    if ('screenX' in event) return event.screenX;
+    return event.clientX;
+};
+var getY = function (event) {
+    if ('screenY' in event) return event.screenY;
+    return event.clientY;
+};
 function moveupon(target, handles, initialEvent) {
     var { start, move, end } = handles;
     var touchLocked = false;
+    var savedX, savedY;
     var offmouseup, offtouchend, offtouchcancel;
+    var setMovement = function (event) {
+        if ("movementX" in event) return
+        var x = getX(event);
+        event.movementX = x - savedX;
+        savedX = x;
+        var y = getY(event);
+        event.movementY = y - savedY;
+        savedY = y;
+    }
     var mousemove = function (event) {
+        setMovement(event);
         if (isFunction(move)) move.call(target, event);
     };
 
     var touchmove = function (event) {
+        setMovement(event);
         extendTouchEvent(event);
         if (isFunction(move)) move.call(target, event);
     };
@@ -87,6 +106,7 @@ function moveupon(target, handles, initialEvent) {
 
     if (initialEvent) {
         if (locktouch(initialEvent.target, handles)) return;
+        if (target.notouch) return;
         if (initialEvent.type === "touchstart") {
             extendTouchEvent(initialEvent);
             initialEvent.preventDefault();
@@ -100,8 +120,11 @@ function moveupon(target, handles, initialEvent) {
     onmousedown(target, function (event) {
         if (touchLocked) return;
         if (locktouch(event.target, handles)) return;
+        if (target.notouch) return;
         touchLocked = true;
         hookmouse(event);
+        savedX = getX(event);
+        savedY = getY(event);
         if (isFunction(start)) start.call(this, event);
     });
     ontouchstart(target, function (event) {
@@ -109,6 +132,8 @@ function moveupon(target, handles, initialEvent) {
         if (locktouch(event.target, handles)) return;
         touchLocked = true;
         extendTouchEvent(event);
+        savedX = getX(event);
+        savedY = getY(event);
         hooktouch(event);
         if (isFunction(start)) start.call(this, event);
     });

package/coms/zimoli/picture.less

@@ -1,72 +1,55 @@
-& {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    padding: 0;
-    background-color: #000;
-}
-
-
-.grid() {
-    @mask-color1 : rgba(255, 255, 255, .6);
-    @mask-color2 : rgba(0, 0, 0, 0);
-    @mask-color3 : rgba(0, 0, 0, .1);
-    background-image:
-        linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
-        linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
-        linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3),
-        linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3);
-    background-size: 20px 20px;
-    background-position: 0 0, 10px 10px, 10px 0, 0 10px;
-    background-repeat: repeat;
-    background-clip: border-box;
-    background-color: #fff;
-
-}
-
-&[grid],
-&.grid,
-&[type=grid] {
-    .grid();
-}
-
-&+.mask {
-    background: #fff;
-    opacity: .5;
-}
-
->div {
-    height: 100%;
-
-    >[imgpic] {
-        position: absolute;
-        pointer-events: none;
-        .grid();
-    }
-
-    >.adv {
-        color: #fff9;
-        vertical-align: top;
-        position: absolute;
-        left: 0;
-        right: 0;
-        text-align: center;
-    }
-
-    &:after {
-        content: "";
-        display: block;
-        left: -1px;
-        top: -1px;
-        bottom: -1px;
-        right: -1px;
-        width: auto;
-        height: auto;
-        pointer-events: none;
-        position: absolute;
-    }
+@import "bggrid-func.less";
+& {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    padding: 0;
+    background-color: #000;
+}
+
+&[grid],
+&.grid,
+&[type=grid] {
+    .grid();
+}
+
+&+.mask {
+    background: #fff;
+    opacity: .5;
+}
+
+>div {
+    height: 100%;
+
+    >[imgpic] {
+        position: absolute;
+        pointer-events: none;
+        .grid();
+    }
+
+    >.adv {
+        color: #fff9;
+        vertical-align: top;
+        position: absolute;
+        left: 0;
+        right: 0;
+        text-align: center;
+    }
+
+    &:after {
+        content: "";
+        display: block;
+        left: -1px;
+        top: -1px;
+        bottom: -1px;
+        right: -1px;
+        width: auto;
+        height: auto;
+        pointer-events: none;
+        position: absolute;
+    }
 }

package/coms/zimoli/refilm_test.html

@@ -1,42 +1,42 @@
-<hbox class="topbar">
-    <btn @click="index=i" v-for="(s,i) in steps" type_="i&lt;=index?'default':'white'">
-        <span ng-bind="s[0].name"></span>
-    </btn>
-</hbox>
-<div class="body">
-    <textarea _value="refilm_encode(steps[index])">
-
-    </textarea>
-    <div class="form">
-        <table>
-            <thead>
-                <tr>
-                    <td ng-repeat="(f,i) in refilms">
-                        <span ng-bind="f.name"></span>
-                    </td>
-                </tr>
-            </thead>
-            <tbody>
-                <tr ng-repeat="s in steps[index]">
-                    <td ng-repeat="r in refilms">
-                        <span bg-bind="String(s[r.key]||'')"></span>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-    <form class="form">
-        <field ng-src="[f,data]" ng-repeat="(f,i) in steps[index]"></field>
-    </form>
-    <div class="step">
-        <div class="page-number">
-            <span ng-bind=index+1></span>
-            /
-            <span ng-bind="steps.length"></span>
-        </div>
-    </div>
-    <div class="foot">
-        <btn @click="prevStep()">上一步</btn>
-        <btn @click="nextStep()">下一步</btn>
-    </div>
+<hbox class="topbar">
+    <btn @click="index=i" v-for="(s,i) in steps" type_="i&lt;=index?'default':'white'">
+        <span ng-bind="s[0].name"></span>
+    </btn>
+</hbox>
+<div class="body">
+    <textarea _value="refilm_encode(steps[index])">
+
+    </textarea>
+    <div class="form">
+        <table>
+            <thead>
+                <tr>
+                    <td ng-repeat="(f,i) in refilms">
+                        <span ng-bind="f.name"></span>
+                    </td>
+                </tr>
+            </thead>
+            <tbody>
+                <tr ng-repeat="s in steps[index]">
+                    <td ng-repeat="r in refilms">
+                        <span bg-bind="String(s[r.key]||'')"></span>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <form class="form">
+        <field ng-src="[f,data]" ng-repeat="(f,i) in steps[index]"></field>
+    </form>
+    <div class="step">
+        <div class="page-number">
+            <span ng-bind=index+1></span>
+            /
+            <span ng-bind="steps.length"></span>
+        </div>
+    </div>
+    <div class="foot">
+        <btn @click="prevStep()">上一步</btn>
+        <btn @click="nextStep()">下一步</btn>
+    </div>
 </div>