efront 4.22.8 → 4.22.9

package/apps/kugou/home.less

@@ -14,7 +14,6 @@
     padding-right: 60px;
     cursor: default;
     white-space: nowrap;
-    margin: 0 -6px;
     width: auto;
 
     >tag {
@@ -96,8 +95,17 @@
     font-size: 16px;
     width: auto;
     background: inherit;
-    border-left: 6px solid transparent;
-    border-right: 6px solid transparent;
+
+    &:before {
+        content: "";
+        z-index: 1;
+        position: absolute;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        width: 16px;
+        display: block;
+    }
 }
 
 .search-box {

package/apps/pivot/db/config.xht

@@ -28,6 +28,7 @@
         border: 1px solid #999;
         padding: 4px 10px;
         height: 60px;
+
         [a-key] {
             font-family: 20px;
             font-style: italic;
@@ -67,7 +68,8 @@
     动作管理
     `;
     var fields = refilm`
-    是否公开/open swap`;
+    是否公开/open swap // 允许所有人检索全部内容
+    (用户互访/visit/,open=false) swap // 不公开时检查此项`;
     var [db] = arguments;
     if (!db.fields) {
         var [da1] = await data.from('dbfind', { dbid: db.name, size: 1 });

package/coms/basic/writeLEB128.js

@@ -3,7 +3,7 @@ function writeLEB128(dist, offset, value) {
     while (b > 127) {
         var t = b & 0x7f;
         dist[offset++] = t | 0b10000000;
-        b = b >> 7;
+        b = b >>> 7;
     }
     dist[offset++] = b;
     return offset;

package/coms/frame/route.js

@@ -201,7 +201,7 @@
             menu = result.active || firstMenu;
             if (!menu?.path) return;
             first_opened = true;
-            zimoli.switch(null, null, menu.path);
+            zimoli.switch(null, null, menu);
             zimoli();
             return;
         }

package/coms/zimoli/zimoli.js

@@ -6,7 +6,7 @@
 var body = document.body;
 var onbacks = [];
 var window_history = window.history || { length: 0, go() { }, back() { } };
-var hostoryStorage = sessionStorage;
+var historyStorage = sessionStorage;
 var getLocationHash = function () {
     if ('hash' in location) return location.hash;
     return location.href.replace(/^[^#]+/, '');
@@ -72,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`存储空间被破坏`);
     }
@@ -80,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;
@@ -194,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 {
@@ -219,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;
     };
@@ -367,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;
@@ -408,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;
@@ -422,7 +431,7 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
         root_path = _history[0];
         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 = {};
         }
@@ -443,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) {
@@ -460,6 +472,7 @@ var pushstate = function (path_name, history_name) {
         history[history_name] = createEmptyHistory(path_name);
     } else {
         var _history = history[history_name];
+        var index = _history.index;
         for (var cx = 0, dx = _history.index + 1; cx < dx; cx++) {
             if (_history[cx] === path_name) {
                 _history.index = cx;
@@ -471,11 +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;
         }
     }
-    hostoryStorage.setItem(history_session_object_key, JSAM.stringify(history) || null);
+    savestate();
     return isBack;
 };
 var popstate = function (path_name, history_name) {
@@ -502,6 +516,7 @@ var getCurrentHash = function () {
     return encodeURI(targeturl);
 };
 var fixurl = function () {
+    if (false === fullfill_is_dispatched) return;
     var zimoli_hash = getCurrentHash();
     var location_hash = getLocationHash();
     if (location_hash === zimoli_hash) return;
@@ -534,9 +549,10 @@ var fixurl = function () {
             }
         }
     }
-    else if (location_hash !== locationInitHash) {
+    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);
@@ -562,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);
     }
@@ -664,6 +682,11 @@ var _switch = zimoli.switch = function (history_name = default_history, target_b
         if (target_body) body = target_body;
     }
     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];
@@ -695,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) {
     }
 };
@@ -710,7 +733,7 @@ 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 () {
@@ -721,8 +744,13 @@ zimoli.getCurrentHistory = function () {
 };
 zimoli.inithash = locationInitHash;
 zimoli.createState = createState;
-zimoli.getInitPath = function () {
-    return pathFromHash(locationInitHash);
+// 赤匪最擅长的是移花接木。别人写好的文章，它改一下作者名，就成了它写的；别人种的粮食，它抢过来，说是别人贡献的。
+// 赤匪在中国设置各种语言陷井，欺压民众，不让民众发声，还说这是民众对它的信任。
+// 家中进了贼，我们是把家让给它，还是找机会把贼杀了。
+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 () {
@@ -795,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);
@@ -803,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/package.json

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