efront 4.22.7 → 4.22.9

package/coms/zimoli/zimoli.js

@@ -6,14 +6,17 @@
 var body = document.body;
 var onbacks = [];
 var window_history = window.history || { length: 0, go() { }, back() { } };
-var window_history_length = window_history.length;
-var sessionSavedHashKey = "__zimoli_session_init_hash" + location.pathname;
-var sessionInitHash = sessionStorage.getItem(sessionSavedHashKey);
-var hostoryStorage = sessionStorage;
-var pagehash_reg = /#([\/\w\:@\.\_\(\)\+\-\*\$@!~_'\?,&~%]+)$/;
-var locationInitHash = location.hash;
-var isFirstTimeLoad = sessionInitHash === null;
-var isSimpleRefresh = sessionInitHash === locationInitHash;
+var historyStorage = sessionStorage;
+var getLocationHash = function () {
+    if ('hash' in location) return location.hash;
+    return location.href.replace(/^[^#]+/, '');
+};
+var setLocationHash = function (hash) {
+    preventNextHashChange = true;
+    if ('hash' in location) location.hash = hash;
+    else location.href = location.href.replace(/#[\s\S]*$/, '') + hash;
+};
+var locationInitHash = getLocationHash();
 var preventNextHashChange = false;
 window_history.scrollRestoration = 'manual';
 var popupHashlessPath = '/';
@@ -28,9 +31,8 @@ onhashchange(window, function (event) {
     if (preventNextHashChange) return preventNextHashChange = false;
     // 如果是返回事件，一定不是第一次改变hash
     // 这里刚好可以屏蔽首次手动改变url可能产生的hashchange事件
-    var targetHash = location.hash;
-    sessionStorage.setItem(sessionSavedHashKey, targetHash);
-    if (pagehash_reg.test(targetHash)) {
+    var targetHash = getLocationHash();
+    if (targetHash) {
         var currentHash = getCurrentHash();
         if (currentHash && currentHash === targetHash) return;
         var targetpath = pathFromHash(targetHash);
@@ -70,7 +72,7 @@ function getReverseStyle(style) {
 }
 var getZimoliParams = function (pagepath) {
     try {
-        return JSAM.parse(hostoryStorage.getItem(_zimoli_params_key + pagepath)) || {};
+        return JSAM.parse(historyStorage.getItem(_zimoli_params_key + pagepath)) || {};
     } catch (e) {
         console.warn(i18n`存储空间被破坏`);
     }
@@ -78,14 +80,19 @@ var getZimoliParams = function (pagepath) {
 };
 var setZimoliParams = function (pagepath, args) {
     try {
-        var stringified_args = JSAM.stringify(args);
-        if (stringified_args.length === 2) hostoryStorage.removeItem(_zimoli_params_key + pagepath);
-        else hostoryStorage.setItem(_zimoli_params_key + pagepath, stringified_args);
+        if (!isHandled(args)) {
+            historyStorage.removeItem(_zimoli_params_key + pagepath);
+        }
+        else {
+            var stringified_args = JSAM.stringify(args);
+            if (stringified_args.length === 2) historyStorage.removeItem(_zimoli_params_key + pagepath);
+            else historyStorage.setItem(_zimoli_params_key + pagepath, stringified_args);
+        }
     } catch (e) {
         console.warn(i18n`写入存储空间失败！`, e);
     }
 };
-var fullfill_is_dispatched = 0;
+var fullfill_is_dispatched = false;
 function go(pagepath, args, history_name, oldpagepath) {
     if (history_name === undefined)
         history_name = current_history;
@@ -192,7 +199,7 @@ function createState(pgpath) {
     var [pgpath] = getpgpath(pgpath);
     var _zimoli_state_key = _zimoli_state_prefix + pgpath;
     var state = function state(condition, setAsAdditional = condition !== null) {
-        var state_string = hostoryStorage.getItem(_zimoli_state_key);
+        var state_string = historyStorage.getItem(_zimoli_state_key);
         var state_object;
         if (state_string) {
             try {
@@ -217,7 +224,7 @@ function createState(pgpath) {
             state_object = condition;
         }
         if (arguments.length) {
-            hostoryStorage.setItem(_zimoli_state_key, JSAM.stringify(state_object) || null);
+            historyStorage.setItem(_zimoli_state_key, JSAM.stringify(state_object) || null);
         }
         return state_object;
     };
@@ -365,11 +372,14 @@ function create(pagepath, args, from, needroles) {
     if (!checkroles(user.roles, roles) || !checkroles(user.roles, needroles)) {
         // 检查权限
         if (!user.isLogin && user.loginPath) {
-            return create(user.loginPath);
+            var pg = create(user.loginPath);
+            history[current_history].wardable = false;
+            return pg;
         }
         return alert(i18n`没有权限！`, 0);
     }
     if (!pg) return;
+    history[current_history].wardable = true;
     var _with_length = _with_elements.length;
     state.onback = function (handler) {
         _pageback_listener = handler;
@@ -406,9 +416,10 @@ function create(pagepath, args, from, needroles) {
     return _page;
 
 }
-var createEmptyHistory = function (emptyState) {
+var createEmptyHistory = function (emptyState, allowForward = true) {
     var h = [emptyState];
     h.index = 0;
+    h.wardable = allowForward;
     return h;
 }
 var zimoliid = 0, zimoliad = 0;
@@ -418,19 +429,9 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
         history_name = current_history;
         var _history = history[history_name] || createEmptyHistory('/main');
         root_path = _history[0];
-        pagepath = location.hash;
-        if (pagepath) {
-            pagepath = pathFromHash(pagepath);
-            if (pagepath === popupHashlessPath) {
-                preventNextHashChange = true;
-                window_history.go(-1);
-                pagepath = pathFromHash(location.hash);
-            }
-            if (_history.index === 0) pagepath = '';
-        }
-        if (!pagepath) pagepath = _history[_history.index];
+        pagepath = _history[_history.index];
         try {
-            var saveddata = JSAM.parse(hostoryStorage.getItem(_zimoli_params_key + pagepath)) || {};
+            var saveddata = JSAM.parse(historyStorage.getItem(_zimoli_params_key + pagepath)) || {};
         } catch (e) {
             var saveddata = {};
         }
@@ -451,13 +452,16 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
 var global = {};
 var history = {};
 var current_history, default_history = current_history = "";
-history[current_history] = createEmptyHistory('/main');
+history[current_history] = createEmptyHistory('/main', false);
 var history_session_object_key = `_zimoli_history_key:${location_pathname}`;
 try {
-    history = JSAM.parse(hostoryStorage.getItem(history_session_object_key)) || history;
+    history = JSAM.parse(historyStorage.getItem(history_session_object_key)) || history;
 } catch (e) {
 }
 var root_path;
+var savestate = function () {
+    historyStorage.setItem(history_session_object_key, JSAM.stringify(history) || null);
+};
 var pushstate = function (path_name, history_name) {
     var isBack = false;
     if (history_name === undefined) {
@@ -468,7 +472,7 @@ var pushstate = function (path_name, history_name) {
         history[history_name] = createEmptyHistory(path_name);
     } else {
         var _history = history[history_name];
-        var prevIndex = _history.index;
+        var index = _history.index;
         for (var cx = 0, dx = _history.index + 1; cx < dx; cx++) {
             if (_history[cx] === path_name) {
                 _history.index = cx;
@@ -480,12 +484,12 @@ var pushstate = function (path_name, history_name) {
             _history.index++;
         }
         if (_history[_history.index] !== path_name) {
+            _history.lastIndex = index;
             _history.splice(_history.index, _history.length - _history.index);
             _history[_history.index] = path_name;
         }
-        if (_history.index >= 0) fixurl(_history.index - prevIndex);
     }
-    hostoryStorage.setItem(history_session_object_key, JSAM.stringify(history) || null);
+    savestate();
     return isBack;
 };
 var popstate = function (path_name, history_name) {
@@ -500,6 +504,7 @@ var popstate = function (path_name, history_name) {
         }
     }
 };
+
 var getCurrentHash = function () {
     var history_name = current_history.replace(/\/$/, '');
     if (rootElements.length) {
@@ -510,39 +515,48 @@ var getCurrentHash = function () {
     var targeturl = `#${history_name}${_historylist.length ? _historylist[_historylist.index] : ""}`;
     return encodeURI(targeturl);
 };
-
-var fixurl = function (historyDelta) {
-    var hash = getCurrentHash();
-    preventNextHashChange = true;
-    if (pagehash_reg.test(hash)) {
-        hash = location.href.replace(/\#[\s\S]*$/, '') + hash;
-        if (!pagehash_reg.test(location.href)) location.href = hash;
-        else if (location.href !== hash) {
-            if (historyDelta) {
-                window_history.go(historyDelta);
-                if (location.href !== hash) {
-                    location.href = hash;
-                }
-                else {
-                    preventNextHashChange = false;
+var fixurl = function () {
+    if (false === fullfill_is_dispatched) return;
+    var zimoli_hash = getCurrentHash();
+    var location_hash = getLocationHash();
+    if (location_hash === zimoli_hash) return;
+    var location_path = pathFromHash(location_hash);
+    if (location_path === popupHashlessPath) {
+        preventNextHashChange = true;
+        window_history.go(-1);
+        location_hash = getCurrentHash();
+        location_path = pathFromHash(location_hash);
+    };
+    if (zimoli_hash === location_hash) return;
+    var zimoli_path = pathFromHash(zimoli_hash);
+    if (zimoli_path === popupHashlessPath) return setLocationHash(zimoli_hash);
+    if (zimoli_hash) {
+        if (!location_hash) setLocationHash(zimoli_hash);
+        else {
+            var _history = history[current_history];
+            var b = _history.indexOf(location_path);
+            if (b >= 0) {
+                var c = _history.indexOf(zimoli_path);
+                if (c >= 0) {
+                    var d = c - b;
+                    preventNextHashChange = true;
+                    window_history.go(d);
+                    location_hash = getLocationHash();
                 }
             }
-            else if (location.href !== hash) {
-                location.href = hash;
-            }
-            else {
-                preventNextHashChange = false;
+            if (location_hash !== zimoli_hash) {
+                setLocationHash(zimoli_hash);
             }
         }
-        else {
-            preventNextHashChange = false;
-        }
-    }
-    else if (pagehash_reg.test(location.hash)) {
-        window_history.go(-1);
     }
-    else {
-        preventNextHashChange = false;
+    else if (location_path !== getInitPath()) {
+        var _history = history[current_history];
+        var i = _history.indexOf(location_path);
+        if (i === -1) i = _history.lastIndex;
+        if (i > 0) {
+            preventNextHashChange = true;
+            window_history.go(-i);
+        }
     }
 };
 var checkonback = function (elements) {
@@ -564,12 +578,14 @@ put(":empty", function () {
 });
 var forward = function (pgpath) {
     var hty = history[current_history];
+    if (hty[hty.index - 1] === pgpath) {
+        backward();
+        return;
+    }
+    if (!hty.wardable) return;
     if (hty[hty.index + 1] === pgpath) {
         go(1);
     }
-    else if (hty[hty.index - 1] === pgpath) {
-        backward();
-    }
     else {
         go(pgpath);
     }
@@ -577,11 +593,12 @@ var forward = function (pgpath) {
 var backward = function () {
     if (rootElements.length) {
         var onback = checkonback(rootElements.slice(rootElements.length - 1));
-        fixurl();
         if (onback === false) {
+            fixurl();
             return;
         }
         remove(rootElements.pop());
+        fixurl();
         return;
     }
     var onback = checkonback([
@@ -610,7 +627,10 @@ function setWithStyle(target, isDestroy) {
     }
 
 }
+var fixLock = false;
 function addGlobal(element, name = null, isBack) {
+    var hasLock = !fixLock;
+    if (hasLock) fixLock = true;
     if (isString(name)) {
         if (global[name] === element) return;
         var oldElement = global[name];
@@ -648,6 +668,7 @@ function addGlobal(element, name = null, isBack) {
         }
         rootElements.push(element);
     }
+    if (hasLock) fixurl(), fixLock = false;
 }
 var _switch = zimoli.switch = function (history_name = default_history, target_body = document.body, emptyState) {
     if (!arguments.length) {
@@ -660,7 +681,18 @@ var _switch = zimoli.switch = function (history_name = default_history, target_b
         }
         if (target_body) body = target_body;
     }
-    if (emptyState !== false && !history[current_history]) root_path = (history[current_history] = createEmptyHistory(emptyState))[0];
+    if (isHandled(emptyState) && emptyState !== false) {
+        if (isObject(emptyState)) {
+            var { path: pagepath, need, roles = need, data: args, id, options } = emptyState;
+            setZimoliParams(pagepath, { roles, data: args, id, options });
+            emptyState = pagepath;
+        }
+        if (!history[current_history]) root_path = (history[current_history] = createEmptyHistory(emptyState))[0];
+        else {
+            var _history = history[current_history];
+            if (_history.index === 0) root_path = _history[0] = emptyState;
+        }
+    }
 };
 popup.global = zimoli.global = addGlobal;
 popup.go = zimoli.go = go;
@@ -686,9 +718,9 @@ appendChild.transition = transition;
 remove.transition = transition;
 zimoli.prepare = prepare;
 zimoli.setStorage = function (storage) {
-    hostoryStorage = storage;
+    historyStorage = storage;
     try {
-        history = JSAM.parse(hostoryStorage.getItem(history_session_object_key)) || history;
+        history = JSAM.parse(historyStorage.getItem(history_session_object_key)) || history;
     } catch (e) {
     }
 };
@@ -701,15 +733,25 @@ zimoli.register = function (pathlike) {
     pathmaped[pathlike] = params;
 };
 zimoli.clearHistory = function () {
-    hostoryStorage.removeItem(history_session_object_key);
+    historyStorage.removeItem(history_session_object_key);
     history = {};
 };
 zimoli.getCurrentHistory = function () {
-    if (!history[current_history]) history[current_history] = createEmptyHistory();
-    return history[current_history];
+    var h = history[current_history];
+    if (h) h = h.slice(0, h.index + 1);
+    else h = [];
+    return h;
 };
 zimoli.inithash = locationInitHash;
 zimoli.createState = createState;
+// 赤匪最擅长的是移花接木。别人写好的文章，它改一下作者名，就成了它写的；别人种的粮食，它抢过来，说是别人贡献的。
+// 赤匪在中国设置各种语言陷井，欺压民众，不让民众发声，还说这是民众对它的信任。
+// 家中进了贼，我们是把家让给它，还是找机会把贼杀了。
+var getInitPath = zimoli.getInitPath = function () {
+    var h = history[current_history];
+    if (h.length < 2) return pathFromHash(locationInitHash);
+    return h[0];
+};
 var touchEnabled = false;
 zimoli.enableTouchBack = function () {
     if (touchEnabled) return;
@@ -781,6 +823,7 @@ zimoli.enableTouchBack = function () {
                 remove(forwardTarget, false);
                 transition(backwardTarget, 1);
                 global[history_name] = backwardTarget;
+                fixurl();
             }
             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);
@@ -789,6 +832,7 @@ zimoli.enableTouchBack = function () {
                 remove(backwardTarget, false);
                 transition(forwardTarget, 1);
                 global[history_name] = forwardTarget;
+                fixurl();
             }
             else {
                 if (backwardTarget) setWithStyle(backwardTarget, false), remove(backwardTarget);

package/coms/zimoli/zimoli.md

@@ -1,5 +1,8 @@
+# 紫茉莉
+默认不支持带hash打开页面，但您可以在主页面或您指定的初始化脚本中切换到hash指向的页面，这样可以让一些写在主文件中的配置项按序加载。
 ```javascript
     zimoli(pathname, params) // 跳转
+    zimoli.getInitPath()// 返回页面加载时的hash路径在当前历史中指向的路径
     zimoli.switch(historyName, targetElement, homePath) // 切换历史及目标挂载元素
     zimoli() // 切换历史后初始化
     zimoli.clearHistory() // 清空历史

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -264,10 +264,10 @@
     //     克什米尔: ["ks", "Kashmiri"],
     //     哈萨克语: ["kk", "Kazakh"],
     //     高棉语: ["km", "Khmer"],
-    //     Kikuyu公司: ["ki", "Kikuyu"],
+    //     基库尤: ["ki", "Kikuyu"],
     //     "基尼亚卢旺达语（卢旺达）": ["rw", "Kinyarwanda (Rwanda)"],
     //     基隆迪语: ["rn", "Kirundi"],
-    //     Kyrgyz: ["ky", "Kyrgyz"],
+    //     吉尔吉斯斯坦: ["ky", "Kyrgyz"],
     //     科米牌手表: ["kv", "Komi"],
     //     孔戈: ["kg", "Kongo"],
     //     韩国人: ["ko", "Korean"],
@@ -372,34 +372,34 @@
     //     祖鲁语: ["zu", "Zulu"]
     // };
     var supports = [
-        { name: i18n`中文`, id: "zh", lang: "zh-CN" },
-        { name: i18n`繁体中文`, id: "cht", lang: "zh-TW" },
-        { name: i18n`英语`, id: "en", lang: "en" },
+        { name: `汉语`/*中文简体*/, id: "zh", lang: "zh-CN" },
+        { name: `漢語`/*中文繁体*/, id: "cht", lang: "zh-TW" },
+        { name: `English`/*英文*/, id: "en", lang: "en" },
         // { name: i18n`文言文`, id: "wyw" },
         // { name: i18n`粤语`, id: "yue" },
-        { name: i18n`日语`, id: "jp", lang: "ja" },
-        { name: i18n`法语`, id: "fra", lang: 'fr' },
-        { name: i18n`俄语`, id: "ru", lang: 'ru' },
-        { name: i18n`韩语`, id: "kor", lang: "ko" },
-        { name: i18n`德语`, id: "de", lang: "de" },
-        { name: i18n`意大利语`, id: "it", lang: 'it' },
-        { name: i18n`泰语`, id: "th", lang: "th" },
-        { name: i18n`越南语`, id: "vie", lang: 'vi' },
-        { name: i18n`阿拉伯语`, id: "ara", lang: "ar" },
-        { name: i18n`荷兰语`, id: "nl", lang: "nl" },
-        { name: i18n`芬兰语`, id: "fin", lang: "fi" },
-        { name: i18n`希腊语`, id: "el", lang: "el" },
-        { name: i18n`西班牙语`, id: "spa", lang: "es" },
-        // { name: i18n`葡萄牙语`, id: "pt", lang: /pt\-(BR|PT)/ },
-        { name: i18n`匈牙利语`, id: "hu", lang: 'hu' },
-        { name: i18n`瑞典语`, id: "swe", lang: 'sv' },
-        { name: i18n`丹麦语`, id: "dan", lang: 'da' },
-        { name: i18n`捷克语`, id: "cs", lang: 'cs' },
-        // { name: i18n`波兰语`, id: "pl" },
-        { name: i18n`保加利亚语`, id: "bul", lang: "bg" },
-        { name: i18n`爱沙尼亚语`, id: "est", lang: 'et' },
-        { name: i18n`罗马尼亚语`, id: "rom", lang: 'ro' },
-        { name: i18n`斯洛文尼亚语`, id: "slo", lang: 'sl' },
+        { name: `日本語`/*日语*/, id: "jp", lang: "ja" },
+        { name: `Français`/*法语*/, id: "fra", lang: 'fr' },
+        { name: `Русский язык`/*俄语*/, id: "ru", lang: 'ru' },
+        { name: `한국어`/*韩语*/, id: "kor", lang: "ko" },
+        { name: `Deutsch`/*德语*/, id: "de", lang: "de" },
+        { name: `Italiano`/*意大利语*/, id: "it", lang: 'it' },
+        { name: `ภาษาไทย`/*泰语*/, id: "th", lang: "th" },
+        { name: `Tiếng Việt`/*越南语*/, id: "vie", lang: 'vi' },
+        { name: `بالعربية`/*阿拉伯语*/, id: "ara", lang: "ar" },
+        { name: `Nederlands`/*荷兰语*/, id: "nl", lang: "nl" },
+        { name: `suomi`/*芬兰语*/, id: "fin", lang: "fi" },
+        { name: `Ελληνικά`/*希腊语*/, id: "el", lang: "el" },
+        { name: `Español`/*西班牙语*/, id: "spa", lang: "es" },
+        { name: `Português`/*葡萄牙语*/, id: "pt", lang: /pt\-(BR|PT)/ },
+        { name: `Húngaro`/*匈牙利语*/, id: "hu", lang: 'hu' },
+        { name: `Svenska`/*瑞典语*/, id: "swe", lang: 'sv' },
+        { name: `Dansk`/*丹麦语*/, id: "dan", lang: 'da' },
+        { name: `Čeština`/*捷克语*/, id: "cs", lang: 'cs' },
+        { name: `Polski`/*波兰语*/, id: "pl" },
+        { name: `Български`/*保加利亚语*/, id: "bul", lang: "bg" },
+        { name: `Eesti keel`/*爱沙尼亚语*/, id: "est", lang: 'et' },
+        { name: `Română`/*罗马尼亚语*/, id: "rom", lang: 'ro' },
+        { name: `slovenski jezik`/*斯洛文尼亚语*/, id: "slo", lang: 'sl' },
     ];
     supports.forEach(s => s.key = s.id);
     var getAllText = function (data, f) {

package/package.json

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