From d1612da0e97cdec9114993473f92b7e1d9555225 Mon Sep 17 00:00:00 2001 From: shy Date: Wed, 20 Mar 2024 13:18:58 +0800 Subject: [PATCH] add some --- const.js | 4 ++-- lib/user.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/const.js b/const.js index a253ccd1..fa90ba5c 100644 --- a/const.js +++ b/const.js @@ -415,7 +415,6 @@ var icon = { pull: "bi bi-cloud-download", push: "bi bi-cloud-upload", upload: "bi bi-box-arrow-in-up", download: "bi bi-box-arrow-down", record1: "bi bi-images", record2: "bi bi-record-circle", record: "bi bi-record-circle", - "export": "bi bi-box-arrow-up", "import": "bi bi-box-arrow-in-down", "begin_time": "bi bi-clock-history", "end_time": "bi bi-clock-history", @@ -466,7 +465,8 @@ var icon = { vendor: "bi bi-box-arrow-up-right", configs: "bi bi-gear", config: "bi bi-gear", conf: "bi bi-gear", logs: "bi bi-calendar4-week", - tag: "bi bi-tags", save: "bi bi-floppy", trash: "bi bi-trash", + tag: "bi bi-tags", load: "bi bi-folder-plus", save: "bi bi-floppy", trash: "bi bi-trash", + "import": "bi bi-folder-plus", "export": "bi bi-floppy", top: "bi bi-globe", main: "bi bi-house-door", localCreate: "bi bi-cloud-download", diff --git a/lib/user.js b/lib/user.js index 647aa428..eb12c042 100644 --- a/lib/user.js +++ b/lib/user.js @@ -90,7 +90,7 @@ Volcanos("user", { meta.title = meta.title||can.core.Keys(can.ConfSpace(), can.ConfIndex())||can._name.split(nfs.PS).slice(-2).join(nfs.PS) meta.hash && can.misc.isDebug(can) && (meta.title += " "+meta.hash.slice(0, 6)), meta.action = meta.action||[""] var width = meta.width||(html.QRCODE_WIDTH+2*html.PLUGIN_PADDING+10); if (width < 0) { width = can.page.width() + width } - var ui = can.page.Append(can, meta.action.list || meta.action.length > 1? document.body: can._root.Action._toast, [{view: [[chat.TOAST, meta.style, chat.FLOAT]], style: {width: width}, list: [ + var ui = can.page.Append(can, meta.action.list || meta.action.length > 1 || !can._root || !can._root.Action || !can._root.Action._toast ? document.body: can._root.Action._toast, [{view: [[chat.TOAST, meta.style, chat.FLOAT]], style: {width: width}, list: [ {view: [wiki.TITLE, "", meta.title||""], title: "点击复制", onclick: function(event) { can.user.copy(event, can, meta.title) }}, {view: [cli.CLOSE, "", can.page.unicode.close], title: "点击关闭", onclick: function() { action.close() }}, {view: "duration", title: "点击关闭", onclick: function() { action.close() }}, @@ -122,7 +122,7 @@ Volcanos("user", { if (meta.action && meta.action.length == 1 && meta.action[0] === "") { can.page.Select(can, action._target, html.DIV_ACTION, function(target) { can.onmotion.hidden(can, target) }) } can._toast && (typeof can._toast.close == code.FUNCTION && can._toast.close(), delete(can._toast)) - can._root.Action._toast && (can._root.Action._toast.scrollTop += 10000) + can._root && can._root.Action && can._root.Action._toast && (can._root.Action._toast.scrollTop += 10000) if (meta.hash) { var list = can._root.Action._toastList = can._root.Action._toastList||{} list[meta.hash] && can.page.insertBefore(can, action._target, list[meta.hash]._target), can.__toast = action list[meta.hash] && (can.page.Remove(can, list[meta.hash]._target), list[meta.hash].close(), delete(list[meta.hash])), list[meta.hash] = action