efront 4.23.0 → 4.23.3

package/coms/zimoli/scrollbar.js

@@ -185,7 +185,7 @@ var scrollbary = function () {
         var onscroll = function () {
             if (moving) return;
             var top = _scrollbar.getTTop();
-            if (Number.isFinite(top)) {
+            if (isFinit(top)) {
                 _scrollbar.scrollTo(top);
                 _scrollbar.autoshow();
             }

package/coms/zimoli/view.js

@@ -119,7 +119,7 @@ var resize2 = function () {
             marginTop: fromOffset(-height)
         });
         css(body, {
-            paddingBottom: fromOffset(body.clientTop + body.clientHeight + body.offsetTop - foot.offsetTop)
+            paddingBottom: fromOffset(foot.offsetHeight)
         });
     }
 };

package/coms/zimoli/watch.js

@@ -1,5 +1,5 @@
 function watcher({ changes }) {
-    var watches = this.$watches;
+    var watches = $watches.get(this);
     for (var k in changes) {
         if (k in watches) {
             var h = watches[k];
@@ -10,18 +10,20 @@ function watcher({ changes }) {
     }
 }
 function watch(elem, prop, handler) {
-    if (!elem.$watches) {
-        elem.$watches = {};
+    var w = $watches.get(elem);
+    if (!w) {
+        w = {};
+        $watches.set(elem, w);
         on("changes")(elem, watcher);
     }
     if (isFunction(handler)) {
-        elem.$watches[prop] = handler;
+        w[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];
+            else w[k] = prop[k];
         }
         if (e > 0) throw new Error(i18n`参数不支持！`);
     }

package/coms/zimoli/zimoli.js

@@ -120,54 +120,28 @@ function go(pagepath, args, history_name, oldpagepath) {
         return true;
     }
     var realpath = getpgpath(pagepath);
-    if (realpath.length > 1) var [pgpath, args0] = realpath;
+    if (realpath.length > 1) var [pgpath] = realpath;
     else pgpath = pagepath;
-    setZimoliParams(pagepath, { data: args, from: oldpagepath, options, roles, id });
+    var params = { data: args, from: oldpagepath, options, roles, id };
+    setZimoliParams(pagepath, params);
     if (!page_generators[pgpath]) {
         return zimoli(pagepath, args, history_name, oldpagepath);
     }
-    var page_object = page_generators[pgpath];
-    if (!isEmpty(args0)) page_object.state.data = args, args = args0;
-    var fullfill = function () {
-        zimoliad = zimoliid;
-        var _page = create(pgpath, args, oldpagepath);
-        var isRecover = pushstate(pagepath, history_name, oldpagepath);
-        if (isNode(history_name)) {
-            if (history_name.activate === pagepath && history_name.activateNode === _page) return fullfill_is_dispatched--;
-            else remove(history_name.activateNode);
-            history_name.activate = pagepath;
-            history_name.activateNode = _page;
-        }
-        else if (isString(pagepath)) {
-            if (fullfill_is_dispatched > 0) return;
-            fullfill_is_dispatched = 1;
-            var event = createEvent("zimoli");
-            event.$reload = fullfill;
-            event.zimoli = {
-                path: pagepath,
-                roles,
-                data: args,
-                target: _page,
-                id,
-                options
-            };
-            dispatch(document, event);
-            fullfill_is_dispatched = 0;
-        }
-        if (isRecover) setWithStyle(_page, false);
-        addGlobal(_page, history_name, isRecover);
-        page_object.prepares.splice(0, page_object.prepares.length).forEach(function (url) {
-            if (isNumber(url)) {
-                url = _history[url < 2 ? _history.index + url : url];
-            }
-            if (isString(url)) prepare(url);
-        });
-        if (_page) {
-            _page.$reload = fullfill;
-        }
-        return _page;
-    };
-    return fullfill();
+    var page = create(pagepath, args, oldpagepath, roles, params);
+    zimoliad = zimoliid;
+    var isRecover = pushstate(pagepath, history_name, oldpagepath);
+    if (isNode(history_name)) {
+        if (history_name.activate === pgpath && history_name.activateNode === page) return;
+        else remove(history_name.activateNode);
+        history_name.activate = pgpath;
+        history_name.activateNode = page;
+    }
+    else if (isString(pgpath)) {
+        page.disptch();
+    }
+    if (isRecover) setWithStyle(page, false);
+    addGlobal(page, history_name, isRecover);
+    return page;
 }
 var page_generators = {};
 /**
@@ -359,16 +333,26 @@ function prepare(pgpath, ok) {
         emit(pg);
     }, state, true);
 }
-function create(pagepath, args, from, needroles) {
+function create(pagepath, args, from, needroles, zimolidata) {
+    if (zimolidata) {
+        if (!isHandled(args)) args = zimolidata.data;
+        if (!isHandled(needroles)) needroles = zimolidata.roles;
+    }
     if (typeof pagepath === 'string') {
-        var page_object = page_generators[pagepath];
+        var [pgpath, args0] = getpgpath(pagepath);
+        var page_object = page_generators[pgpath];
+        if (!isEmpty(args0)) page_object.state.data = args, args = args0;
+    }
+    else pgpath = pagepath;
+    if (typeof pgpath === 'string') {
+        var page_object = page_generators[pgpath];
         if (!page_object) {
-            throw new Error(i18n`调用create前请确保prepare执行完毕:${pagepath}`);
+            throw new Error(i18n`调用create前请确保prepare执行完毕:${pgpath}`);
         }
         var { pg, "with": _with_elements, state, onback: _pageback_listener, roles } = page_object;
     }
-    else if (isFunction(pagepath)) {
-        var pg = pagepath;
+    else if (isFunction(pgpath)) {
+        var pg = pgpath;
         var { with: _with_elements = [], state = {}, onback: _pageback_listener, roles } = pg;
     }
     var h = history[current_history];
@@ -379,7 +363,7 @@ function create(pagepath, args, from, needroles) {
             if (h) h.wardable = false;
             return pg;
         }
-        return alert(i18n`没有权限！`, 0);
+        return zimoli.alert(i18n`没有权限！`, 0);
     }
     if (!pg) return;
     if (h) h.wardable = true;
@@ -419,7 +403,33 @@ function create(pagepath, args, from, needroles) {
         if (isEmpty(_page.onback)) {
             _page.onback = _pageback_listener;
         }
+        _page.disptch = function () {
+            if (!zimolidata) return;
+            zimoli.upwith = state.upwith;
+            if (fullfill_is_dispatched > 0) return;
+            fullfill_is_dispatched = 1;
+            var event = createEvent("zimoli");
+            event.$reload = _page.$reload.bind(_page);
+            zimolidata.target = _page;
+            zimolidata.path = pagepath;
+            event.zimoli = zimolidata;
+            dispatch(document, event);
+            fullfill_is_dispatched = 0;
+        }
+        _page.$reload = function () {
+            var _page = create(pagepath, undefined, from, undefined, zimolidata);
+            appendChild.replace(this, _page);
+            return _page;
+        };
     }
+    if (!page_object) return _page;
+    var _history = history[current_history];
+    if (_history) page_object.prepares.splice(0, page_object.prepares.length).forEach(function (url) {
+        if (isNumber(url)) {
+            url = _history[url < 2 ? _history.index + url : url];
+        }
+        if (isString(url)) prepare(url);
+    });
     return _page;
 
 }
@@ -677,7 +687,7 @@ function addGlobal(element, name = null, isBack) {
             if (isBack) appendChild.insert(body, element);
             else appendChild(body, element);
         }
-        var upwith = element.$upwith || rootElements;
+        var upwith = $upwith.get(element) || rootElements;
         if (upwith.indexOf(element) < 0) upwith.push(element);
     }
     if (hasLock) fixurl(), fixLock = false;
@@ -731,6 +741,8 @@ rootElements.splice = function () {
 appendChild.transition = transition;
 remove.transition = transition;
 zimoli.prepare = prepare;
+var upwith = [];
+zimoli.upwith = popup.upwith(upwith);
 zimoli.setStorage = function (storage) {
     historyStorage = storage;
     try {
@@ -801,8 +813,7 @@ zimoli.enableTouchBack = function () {
                     var path0 = historyList[historyList.index - 1];
                     prepare(path0, function () {
                         if (id !== touchId) return;
-                        var args = getZimoliParams(path0).data;
-                        backwardTarget = create(path0, args, path1);
+                        backwardTarget = create(path0, null, path1, null, getZimoliParams(path0));
                         setWithStyle(backwardTarget, true);
                         appendChild.insert(body, backwardTarget);
                     });
@@ -815,8 +826,7 @@ zimoli.enableTouchBack = function () {
                     var path2 = historyList[historyList.index + 1];
                     prepare(path2, function () {
                         if (id !== touchId) return;
-                        var args = getZimoliParams(path2).data;
-                        forwardTarget = create(path2, args, path1);
+                        forwardTarget = create(path2, null, path1, null, getZimoliParams(path2));
                         setWithStyle(forwardTarget, false);
                         appendChild.insert(body, forwardTarget);
                     });
@@ -839,6 +849,7 @@ zimoli.enableTouchBack = function () {
                 transition(backwardTarget, 1);
                 global[history_name] = backwardTarget;
                 fixurl();
+                backwardTarget.disptch();
             }
             else if (historyList.index < historyList.length - 1 && (deltaX < 0 && ratio < -.1 || deltaX > 0 && ratio < -.9 || deltaX === 0 && ratio < -.4)) {
                 pushstate(historyList[historyList.index + 1], history_name);
@@ -848,6 +859,7 @@ zimoli.enableTouchBack = function () {
                 transition(forwardTarget, 1);
                 global[history_name] = forwardTarget;
                 fixurl();
+                forwardTarget.disptch();
             }
             else {
                 if (backwardTarget) setWithStyle(backwardTarget, false), remove(backwardTarget);
@@ -861,4 +873,9 @@ zimoli.enableTouchBack = function () {
             ratio = null;
         }
     }, 'x')
+};
+zimoli.alert = function () {
+    var ae = alert.apply(this, arguments);
+    zimoli.upwith(ae.parentNode);
+    return ae;
 };

package/docs//347/273/204/344/273/266.xht

@@ -286,7 +286,20 @@
                 }
             }
             var argNames = Object.keys(envs);
-            var args = await Promise.all(argNames.map(a => init(a + "*" + live, null, { ["init*" + live]: init, ["put*" + live]: put, ["zimoli*" + live]: zimoli, ["appendChild*" + live]: appendChild, ["remove*" + live]: remove, ["render*" + live]: render })));
+            var args = await Promise.all(argNames.map(a => init(a + "*" + live, null, {
+                ["init*" + live]: init,
+                ["put*" + live]: put,
+                ["zimoli*" + live]: zimoli,
+                ["appendChild*" + live]: appendChild,
+                ["remove*" + live]: remove,
+                ["render*" + live]: render,
+                ["$structed*" + live]: $structed,
+                ["$scoped*" + live]: $scoped,
+                ["$parented*" + live]: $parented,
+                ["$mounted*" + live]: $mounted,
+                ["$watches*" + live]: $watches,
+                ["$renders*" + live]: $renders,
+            })));
             var func = createFunction("", jstext, argNames, code.async, code.yield);
             var res = func.apply(window, args);
             if (isFunction(res)) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.23.0",
+    "version": "4.23.3",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {