efront 3.25.3 → 3.25.8

package/coms/zimoli/touchList.js

@@ -24,7 +24,7 @@ var touchstart = function (event) {
     }
     if (!target) return;
     cancelAnimationFrame(target.scrollTimer);
-    saved_x = null;
+    saved_x = event.clientX, saved_y = event.clientY, moving = false, 0;
     currentTarget = target;
     if (!target.querySelector(".ylife-touch-delete")) {
         css(target, {
@@ -37,11 +37,10 @@ var touchstart = function (event) {
 };
 var moving = false;
 var touchmove = function (event) {
-    if (!saved_x) return saved_x = event.clientX, saved_y = event.clientY, moving = false, 0;
     var delta_x = event.clientX - saved_x;
     var delta_y = event.clientY - saved_y;
     if (!moving) {
-        if (Math.abs(delta_x) < 2 && Math.abs(delta_y) < 2) return;
+        if (Math.abs(delta_x) < MOVELOCK_DELTA && Math.abs(delta_y) < MOVELOCK_DELTA) return;
         if (Math.abs(delta_y) < Math.abs(delta_x)) {
             moving = 1;
         } else {
@@ -49,28 +48,35 @@ var touchmove = function (event) {
         }
     }
     if (moving !== 1) return;
-    event.preventDefault();
-    var marginLeft = -parseInt(currentTarget.scrollLeft) || 0;
-    if (delta_x + marginLeft > 0) {
-        delta_x = -marginLeft;
+    event.moveLocked = true;
+    var buttonWidth = currentTarget.scrollWidth - currentTarget.clientWidth;
+    var scrollLeft = -currentTarget.scrollLeft;
+    if (delta_x + scrollLeft > 0) {
+        delta_x = -scrollLeft;
     }
-    else if (delta_x + marginLeft < - calcPixel(85)) {
-        delta_x = -calcPixel(85) - marginLeft;
+    else if (delta_x + scrollLeft < - buttonWidth) {
+        delta_x = -buttonWidth - scrollLeft;
     }
-    marginLeft += delta_x;
+    scrollLeft += delta_x;
     saved_x += delta_x;
     direction = delta_x;
-    currentTarget.scrollLeft = -marginLeft;
+    currentTarget.scrollLeft = -scrollLeft;
 };
 var scrollTo = function (targetLeft) {
     if (!this) return;
     cancelAnimationFrame(this.scrollTimer);
     var that = this;
+    var scrollTime = +Speed.now();
     var reshape = function () {
-        var currentLeft = parseInt(that.scrollLeft) || 0;
+        var currentLeft = that.scrollLeft;
         if (0 === (0 | currentLeft - targetLeft)) return;
-        var thisTimeLeft = (targetLeft + currentLeft * 3) / 4 | 0;
-        if (Math.abs(thisTimeLeft - currentLeft) < 3) {
+        var now = +Speed.now();
+        var thisTimeLeft = currentLeft;
+        while (scrollTime < now) {
+            scrollTime += 6;
+            thisTimeLeft = (thisTimeLeft * 11 + targetLeft) / 12;
+        }
+        if (Math.abs(thisTimeLeft - currentLeft) < .5) {
             thisTimeLeft = targetLeft;
         } else {
             that.scrollTimer = requestAnimationFrame(reshape);
@@ -94,10 +100,10 @@ var scrollToRight = function () {
 var touchend = function () {
     var marginLeft = -parseInt(currentTarget.scrollLeft) || 0;
     moving = false;
-    if (direction < 0 && marginLeft < -calcPixel(20)) {
+    if (direction < 0 && marginLeft < -7) {
         scrollToLeft.call(currentTarget);
     }
-    else if (direction > 0 && marginLeft > -currentTarget.clientWidth + calcPixel(20)) {
+    else if (direction > 0 && marginLeft > -currentTarget.clientWidth + 7) {
         scrollToRight.call(currentTarget);
     }
     else if (marginLeft < currentTarget.clientWidth - currentTarget.scrollWidth >> 1) {
@@ -130,9 +136,5 @@ function touchList(listElement) {
         move: touchmove,
         end: touchend
     });
-    // ontouchstart(listElement, touchstart);
-    // ontouchmove(listElement, touchmove);
-    // ontouchend(listElement, touchend);
-    // ontouchcancel(listElement, touchend);
     return listElement;
 }

package/coms/zimoli/tree.js

@@ -39,7 +39,7 @@ function tree() {
             generator = arg;
         }
     });
-    if (!generator && "$src" in element && element.childNodes.length) {
+    if (!generator && element && "$src" in element && element.childNodes.length) {
         generator = getGenerator(element, 'node');
     }
     var dom = [], root = null;
@@ -65,11 +65,12 @@ function tree() {
             if (!elem) return;
             span = document.createElement('span');
             span.innerHTML = tabs;
+            span.setAttribute("tabs", '');
             elem.insertBefore(span, elem.firstChild);
             span = elem;
         } else {
             span = document.createElement("node");
-            html(span, `${tabs}<c>${com.name}</c>${com.test ? "<i>_test</i>" : ""}<a class=count>${com.count}</a>`);
+            html(span, `<span tabs>${tabs}</span><c>${com.name}</c>${com.test ? "<i>_test</i>" : ""}<a class=count>${com.count}</a>`);
             span.count = span.lastElementChild;
         }
         var _div = button(span);

package/coms/zimoli/tree.less

@@ -53,19 +53,19 @@ t {
 
     .closed,
     .open {
-        c:before {
+        [tabs]+*:before {
             content: "";
-            display: inline-block;
+            display: inline-block !important;
             border: .3em solid transparent;
         }
     }
 
-    .closed c:before {
+    .closed [tabs]+*:before {
         border-left: .4em solid;
         border-right: .2em solid transparent;
     }
 
-    .open c:before {
+    .open [tabs]+*:before {
         margin-left: -.2em;
         margin-right: .2em;
         margin-top: .2em;

package/coms/zimoli/vbox.js

@@ -61,7 +61,7 @@ function ybox(generator) {
     addClass(increaser_t, 'y-insert');
     var increaser_b = increaser_t.cloneNode();
     var increase_height = calcPixel(100);
-    var _decrease = function (increaser) {
+    var _decrease = function (increaser, t) {
         var height = parseInt(increaser.height);
         if (height > 1) {
             var scrollTop = _box.$Top();
@@ -76,8 +76,9 @@ function ybox(generator) {
                 var deltaY = tH - bH - scrollTop > height ? height : tH - bH - scrollTop;
                 height -= deltaY;
             }
-            increaser.height = height = height > 16 ? (height * 2 + 6) / 3 : height >> 1;
-            increaser.style.height = fromOffset(height | 0);
+            height = height * Math.pow(.92, t / 6);
+            increaser.height = height
+            increaser.style.height = fromOffset(height);
             return height;
         }
         if (increaser.height) {
@@ -92,8 +93,8 @@ function ybox(generator) {
     var stop2 = lazy(function () {
         scrollY.smooth(stop);
     }, 40);
-    var decrease = function () {
-        var res = _decrease(increaser_t) + _decrease(increaser_b);
+    var decrease = function (t) {
+        var res = _decrease(increaser_t, t) + _decrease(increaser_b, t);
         if (!res) {
             scrollY.smooth(stop);
         }

package/coms/zimoli/watch.js

@@ -0,0 +1,26 @@
+function watcher({ changes }) {
+    var watches = this.$watches;
+    for (var k in changes) {
+        if (k in watches) {
+            var { current, previous } = changes[k];
+            watches[k](current, previous);
+        }
+    }
+}
+function watch(elem, prop, handler) {
+    if (!elem.$watches) {
+        elem.$watches = {};
+        on("changes")(elem, watcher);
+    }
+    if (isFunction(handler)) {
+        elem.$watches[prop] = handler;
+    }
+    else if (isObject(prop)) {
+        var e = 0;
+        for (var k in prop) {
+            if (!isFunction(prop[k])) e++;
+            else elem.$watches[k] = prop[k];
+        }
+        if (e > 0) throw new Error("参数不支持！");
+    }
+}

package/docs/compare.md

@@ -6,17 +6,17 @@
 
 ## 表面参数对比
 
-| 对比项\框架          | efront/(zimoli)                                                        | angular                            | react                            | vue                            |
-| -------------------- | ---------------------------------------------------------------------- | ---------------------------------- | -------------------------------- | ------------------------------ |
-| Hello World 目标代码 | ≈1kb;                                                                  | >30kb                           | >30kb                         | ≈30kb;                         |
-| 开发环境启动时间     | ≈0s;                                                                   | >2s                             | >2s                           | >2s                            |
-| 开发语言             | js/html/less/ts                                                        | ts/html/less/sass/scss             | jsx/css/js/ts/html               | html/css/js                    |
-| 导出组件依赖项       | 无                                                                     | angular                            | react                            | vue                            |
-| 官方路由             | zimoli，使用前无需注册路径                                             | angular-router, 使用前需要注册路径 | react-router, 使用前需要注册路径 | vue-router, 使用前需要注册路径 |
-| 跨域实现             | 开发环境内置                                                           | 配置浏览器或服务器                 | 配置浏览器或服务器               | 配置浏览器或服务器             |
+| 对比项\框架          | efront/(zimoli)                                                             | angular                            | react                            | vue                            |
+| -------------------- | --------------------------------------------------------------------------- | ---------------------------------- | -------------------------------- | ------------------------------ |
+| Hello World 目标代码 | ≈1kb;                                                                       | >30kb                           | >30kb                         | ≈30kb;                         |
+| 开发环境启动时间     | ≈0s;                                                                        | >2s                             | >2s                           | >2s                            |
+| 开发语言             | js/html/less                                                                | ts/html/less/sass/scss             | jsx/css/js/ts/html               | html/css/js                    |
+| 导出组件依赖项       | 无                                                                          | angular                            | react                            | vue                            |
+| 官方路由             | zimoli，使用前无需注册路径                                                  | angular-router, 使用前需要注册路径 | react-router, 使用前需要注册路径 | vue-router, 使用前需要注册路径 |
+| 跨域实现             | 开发环境内置                                                                | 配置浏览器或服务器                 | 配置浏览器或服务器               | 配置浏览器或服务器             |
 | 代码加载方案         | 依赖加载/自动预加载/手动预加载`preapre('/page/path');` / 动态路径访问时加载 | 一次加载/或访问时加载              | 一次加载/或访问时加载            | 一次加载/或访问时加载          |
-| 跳转传参             | `go`(pagepath, params)                                            | 略                                 | 略                               | 略                             |
-| 异步对象传参         | `cast`(target, data) 
 `care`(target, handle)     | 略                                 | 略                               | 略                             |
+| 跳转传参             | `go`(pagepath, params)                                                 | 略                                 | 略                               | 略                             |
+| 异步对象传参         | `cast`(target, data) 
 `care`(target, handle)          | 略                                 | 略                               | 略                             |
 
 ## 架构对比
 
@@ -205,6 +205,12 @@ function main(elem){
     onremove(elem,function(event){
         // 移除之前触发，必要时可以绑定
     });
+    watch(elem, {
+        // propname 指用法<element :propname=propvalue ></element>中的propname
+        propname(current_value, previous_value){
+            // 参数变化后的任务
+        }
+    });
     var scope = {
         // html内使用的内容要在这里出现
         btn: button, // 内部组件可以在渲染前重命名，以简化html中的tagName，方便在局部语境中编写和阅读

package/docs/main.js

@@ -2,13 +2,13 @@ zimoli.clearHistory();
 zimoli('/loader');
 contextmenu(document, function (event) {
     if (!window.require) return;
-    return [
+    return menuList(null, [
         {
             "name": "开发者选项",
-            do(){
+            do() {
                 window.require("electron").ipcRenderer.send("window", "open-dev-tools");
                 window.resizeBy(400, 0);
             }
         }
-    ];
+    ]);
 })

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.25.3",
+    "version": "3.25.8",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {
@@ -18,14 +18,10 @@
         "url": "https://github.com/yunxu1019/efront.git"
     },
     "keywords": [
-        "angular",
-        "angularjs",
-        "react",
-        "vue",
-        "jquery",
-        "commonjs",
-        "cross",
-        "server"
+        "efront",
+        "前端",
+        "server",
+        "webpack"
     ],
     "author": "yunxu1019",
     "license": "MIT"