efront 4.21.2 → 4.21.3

package/coms/basic/#loader.js

@@ -27,11 +27,6 @@ var {
     PREVENT_FRAMEWORK_MODE = preventFrame,
     devicePixelRatio = 1,
     startPath: efrontPath,
-    loading_title = {
-        "en-us": "Loading..",
-        "en-hk": "Loading..",
-        "en-ca": "Loading..",
-    }[navigator.language && navigator.language.toLowerCase()] || '加载中..',
     pixelDecoder // = d => d / 16 + "rem"
 } = window;
 if (PREVENT_FRAMEWORK_MODE !== false) {
@@ -138,8 +133,11 @@ var readFile = function (names, then) {
 
     readingCount++;
     var errorcount = 0;
-    var ok = function (res) {
-        responseTree[name] = res;
+    var ok = function (text) {
+        if (!/\~/.test(name)) {
+            "use ./#decrypt_.js";
+        }
+        responseTree[name] = text;
         flushTree(loadingTree, key);
         clearTimeout(flush_to_storage_timer);
         flush_to_storage_timer = setTimeout(saveResponseTreeToStorage, 200);
@@ -251,6 +249,7 @@ var killCircle = function () {
 var multiModules = Object.create(null);
 // -->
 var hasOwnProperty = {}.hasOwnProperty;
+"use ./#decrypt.js";
 var loadModule = function (url, then, prebuilds = {}) {
     var name = url.replace(/[\*~][\s\S]*$/, '');
     if (/^(?:module|exports|define|import_meta|require|window|global|undefined)$/.test(name)) return then();
@@ -345,11 +344,7 @@ var loadModule = function (url, then, prebuilds = {}) {
     }
 };
 var toRem = text => pixelDecoder && typeof text === 'string' ? text.replace(/(\:\s*)?\b((?:\d*\.)?\d+)px(\s*\))?/ig, (m, h, d, quote) => (h || "") + (d !== '1' ? h && quote ? renderPixelRatio * d + "pt" : pixelDecoder(d) : renderPixelRatio > 1 ? ".78pt" : 0.78 / devicePixelRatio + "pt") + (quote || "")) : text;
-"use ./#decrypt.js";
 var getArgs = function (text, aftfix) {
-    if (!aftfix || /^\*/.test(aftfix)) {
-        "use ./#decrypt_.js";
-    }
     var args, functionBody;
     //依赖项名称部分的长度限制为36*36*18=23328
     var doublecount = parseInt(text.slice(0, 3), 36);
@@ -514,8 +509,6 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
         return exec.apply(_this, args);
     });
 };
-var loading_count = 0;
-var saved_title = document && document.title;
 var init = function (url, then, prebuilds, keeppage) {
     // then = bindthen(then);
     var key = keyprefix + url;
@@ -610,13 +603,7 @@ var init = function (url, then, prebuilds, keeppage) {
         var report = window.performance || !window.alert ? console.error : window.alert;
         report(`加载 ${url} 失败，${ed && ed.length ? `${ed.join(', ')} 等 ${ed.length} 个模块` : "没有其他模块"}受到影响。\r\n${track.join("\r\n")}`);
     };
-    var loadingid = ++loading_count;
-    if (document && loading_title !== document.title) {
-        saved_title = document.title;
-        document.title = loading_title;
-    }
     loadModule(url, function (error) {
-        if (loadingid === loading_count && document && document.title === loading_title) document.title = saved_title;
         if (hasOwnProperty.call(modules, url)) {
             then(modules[url]);
             return;

package/coms/zimoli/table.html

@@ -20,7 +20,7 @@
             <mask></mask>
             <model -if="!isEmpty(f.key)" :field=f :data=d readonly></model>
             <template -else>&nbsp;</template>
-            <a on-click="o.do(d)" -if="isEmpty(f.key)&&f.options&&(!o.when||o.when(d))"
+            <a on-click="o.do(d,event)" -if="isEmpty(f.key)&&f.options&&(!o.when||o.when(d))"
                 _type="o.type instanceof Function?o.type(d):o.type" -repeat="o in f.options">
                 <span -text="o.name instanceof Function?o.name(d):o.name"></span>
             </a>

package/coms/zimoli/zimoli.js

@@ -136,9 +136,6 @@ function go(pagepath, args, history_name, oldpagepath) {
     if (realpath.length > 1) var [pgpath, args0] = realpath;
     else pgpath = pagepath;
     setZimoliParams(pagepath, { data: args, from: oldpagepath, options, roles, id });
-    prepare(pgpath, function (res) {
-        if (!res.roles || res.roles === true) res.roles = !!roles;
-    });
     if (!page_generators[pgpath]) {
         return zimoli(pagepath, args, history_name, oldpagepath);
     }
@@ -349,36 +346,27 @@ function prepare(pgpath, ok) {
         }
     };
     var emit = function (pg) {
-        if (pg) {
-            page_generators[pgpath] = {
-                pg,
-                roles,
-                state,
-                with: _with_elements,
-                onback: _pageback_listener,
-                prepares
-            };
-        }
+        page_generators[pgpath] = {
+            pg,
+            roles,
+            state,
+            with: _with_elements,
+            onback: _pageback_listener,
+            prepares
+        };
         var res = page_generators[pgpath];
         var emiters = loading_tree[pgpath];
         delete loading_tree[pgpath];
-        if (emiters) {
-            var noRoles = !res.roles;
-            if (noRoles && res.roles) {
-                prepare(user.loginPath, () => emit());
-                return;
-            }
-            while (emiters.length) {
-                var ok = emiters.shift();
-                if (isFunction(ok)) {
-                    ok(res);
-                }
+        if (emiters) while (emiters.length) {
+            var ok = emiters.shift();
+            if (isFunction(ok)) {
+                ok(res);
             }
         }
+
     };
     return init(pgpath, function (pg) {
-        if (!pg) return;
-        extendIfNeeded(pg, state);
+        if (pg) extendIfNeeded(pg, state);
         if (roles) return prepare(user.loginPath, () => emit(pg));
         emit(pg);
     }, state, true);
@@ -402,6 +390,7 @@ function create(pagepath, args, from, needroles) {
         }
         return alert(i18n`没有权限！`, 0);
     }
+    if (!pg) return;
     var _with_length = _with_elements.length;
     state.onback = function (handler) {
         _pageback_listener = handler;
@@ -442,7 +431,7 @@ function create(pagepath, args, from, needroles) {
 var zimoliid = 0, zimoliad = 0;
 function zimoli(pagepath, args, history_name, oldpagepath) {
     if (arguments.length === 0) {
-        if (zimoliid !== zimoliad) return;
+        if (zimoliid !== zimoliad && zimoli.caller === go) return;
         history_name = current_history;
         var _history = history[history_name] || [];
         root_path = _history[0] || "/main";

package/package.json

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