efront 3.26.8 → 3.26.15

package/coms/zimoli/view.less

@@ -14,6 +14,7 @@ body>& {
     -moz-user-select: none;
     -webkit-user-select: none;
     border: 1px solid #0006;
+    min-width: 160px;
 }
 
 &[draggable] {
@@ -34,19 +35,18 @@ body>& {
     box-sizing: border-box;
     background-clip: padding-box;
 
-    &:not(:nth-child(1)) {
-        border-top: 42px solid transparent;
-    }
+    border-top: 6px solid #fff;
+    border-bottom: 6px solid #fff;
 
     &:not(:nth-last-child(1)) {
         padding-bottom: 42px;
-        border-bottom: 6px solid #fff;
     }
 }
 
 
 &>.head,
 >[head] {
+    top: 0;
     z-index: 2;
     background: #fffc;
     position: relative;
@@ -104,16 +104,15 @@ body>& {
 >[foot] {
     z-index: 1;
     text-align: right;
-    line-height: 1;
-    height: 42px;
-    padding: 6px 16px;
+    white-space: pre-wrap;
+    padding: 6px 16px 0 16px;
     border-top: 1px solid rgba(0, 0, 0, .16);
     backdrop-filter: blur(20px);
     background: #fffc;
     position: sticky;
+    width: 100%;
     bottom: 0;
     margin-top: -42px;
-
 }
 
 .button {
@@ -126,6 +125,7 @@ body>& {
         min-width: 60px;
         padding: 0 20px;
         margin-left: 10px;
+        margin-bottom: 6px;
     }
 
     a.button {

package/coms/zimoli/yousure.js

@@ -0,0 +1,53 @@
+
+/**
+ * 确定就继续，取消就中断
+ */
+function yousure(title = "您确定要这么做吗？", content = "当前操作需要您再次确认") {
+    var options = [button("确定(Y)"), button("取消(N)", "white")];
+    options[0].tabindex = -1;
+    options[1].tabindex = -1;
+    var changeFocus = function (event) {
+        if (event) event.preventDefault();
+        if (page.focused) removeClass(page.focused, 'focused');
+        page.focused = page.focused === options[0] ? options[1] : options[0];
+        addClass(page.focused, 'focused');
+    };
+    var page = confirm(title, content, options, function (b) {
+        if (options[0] === b) {
+            if (isFunction(page.onload)) page.onload();
+        }
+        else {
+            if (isFunction(page.onerror)) page.onerror();
+        }
+    });
+    on("keydown.left.only")(page, function () {
+        if (page.focused !== options[0]) changeFocus();
+    });
+    on("keydown.right.only")(page, function () {
+        if (page.focused !== options[1]) changeFocus();
+    });
+    on("keydown.tab.only")(page, changeFocus);
+    var clickbtn = function () {
+        if (page.focused) page.focused.click();
+    };
+    on("keydown.space")(page, clickbtn);
+    on("keydown.enter")(page, clickbtn);
+    var setFocus = function () {
+        if (page.focused !== this) changeFocus();
+    };
+    on("pointerdown")(options[0], setFocus)
+    on("pointerdown")(options[1], setFocus);
+    page.tabindex = 0;
+    var focuspage = function () {
+        setTimeout(function () {
+            page.focus();
+        });
+    };
+    onappend(page, function () {
+        focuspage();
+        on("pointerdown")(page.$mask, focuspage);
+    });
+    changeFocus();
+    awaitable(page);
+    return page;
+}

package/coms/zimoli/yousure.less

@@ -0,0 +1,4 @@
+.button.focused {
+    outline: 1.2px solid #28c;
+    outline-offset: 2px;
+}

package/coms/zimoli/zimoli.js

@@ -189,7 +189,9 @@ var page_generators = {};
  */
 var loading_tree = {};
 var getpgpath = function (pagepath) {
-    return /^[@#!]/.test(pagepath) ? pagepath.slice(1) : pagepath;
+    pagepath = /^[@#!]/.test(pagepath) ? pagepath.slice(1) : pagepath;
+    if (pagepath === 'main') pagepath = efrontPath || "/main";
+    return pagepath;
 };
 function createState(pgpath) {
     var pgpath = getpgpath(pgpath);
@@ -347,20 +349,20 @@ function prepare(pgpath, ok) {
         }
         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 (noRoles && res.roles) {
-                    prepare(user.loginPath, () => emit());
-                    return;
-                }
             }
         }
-        delete loading_tree[pgpath];
     };
     return init(pgpath, function (pg) {
         if (!pg) return;
@@ -430,6 +432,7 @@ function create(pagepath, args, from, needroles) {
 
 var zimoliid = 0;
 function zimoli(pagepath, args, history_name, oldpagepath) {
+
     if (isNode(history_name))
         var zid = history_name.zimoliid = (history_name.zimoliid | 0) + 1;
     else var zid = ++zimoliid;
@@ -601,6 +604,7 @@ function addGlobal(element, name = null, isDestroy) {
         global[name] = element;
     } else if (isNode(name)) {
         if (name.nodeType !== 1) {
+            remove(name.with);
             appendChild.after(name, element);
             name.with = [element];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.26.8",
+    "version": "3.26.15",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {