opt some

2020-07-01 20:39:48 +08:00 · 2020-07-01 20:39:48 +08:00 · 97f55bdf09
commit 97f55bdf09
parent d5ce8f9339
9 changed files with 57 additions and 34 deletions
--- a/frame.js
+++ b/frame.js
@ -42,19 +42,25 @@ Volcanos("onengine", { _init: function(can, meta, list, cb, target) {
        if (sub.hasOwnProperty(key)) { can.onengine[key] = value }
    }); return true },
    river: {
-        "main": {name: "main", storm: {
+        "product": {name: "产品群", storm: {
+            "office": {name: "office", index: [
+                "web.wiki.draw.draw",
+                "web.team.plan",
+                "web.wiki.word",
+                "web.wiki.data",
+                "web.wiki.feel",
+            ]},
+            "chrome": {name: "chrome", index: [
+                "web.code.chrome.chrome",
+                "web.code.chrome.bookmark",
+            ]},
+        }},
+        "project": {name: "研发群", storm: {
            "inner": {name: "inner", index: [
                "web.code.inner",
                "web.code.git.status",
                "web.code.git.total",
            ]},
-            "pprof": {name: "pprof", index: [
-                "web.code.pprof",
-                "web.code.bench",
-                "web.favor",
-                "web.cache",
-                "web.share",
-            ]},
            "relay": {name: "relay", index: [
                "aaa.totp.get",
                "web.route",
@ -63,23 +69,25 @@ Volcanos("onengine", { _init: function(can, meta, list, cb, target) {
                "web.code.docker.container",
                "web.code.tmux.session",
            ]},
-            "office": {name: "office", index: [
-                "web.team.plan",
-                "web.wiki.feel",
-                "web.wiki.data",
-                "web.wiki.word",
-                "web.wiki.draw.draw",
+            "tmux": {name: "tmux", index: [
+                "web.code.tmux.text",
+                "web.code.tmux.buffer",
+                "web.code.tmux.session",
+            ]},
+        }},
+        "profile": {name: "测试群", storm: {
+            "pprof": {name: "pprof", index: [
+                "web.code.pprof",
+                "web.code.bench",
+                "web.favor",
+                "web.cache",
+                "web.share",
            ]},
            "docker": {name: "docker", index: [
                "web.code.docker.image",
                "web.code.docker.container",
                "web.code.docker.command",
            ]},
-            "tmux": {name: "tmux", index: [
-                "web.code.tmux.text",
-                "web.code.tmux.buffer",
-                "web.code.tmux.session",
-            ]},
        }},
    },

@ -118,6 +126,9 @@ Volcanos("onengine", { _init: function(can, meta, list, cb, target) {
                        can.misc.Run(event, can, {names: pane._name}, [river.name, storm.name, "order"].concat(storm.index), cb)
                        return true
                    }
+                    if (location.pathname == "/share") {
+                        return false
+                    }

                    can.core.List(storm.action, function(value) {
                        msg.Push("name", value.name||"")
@ -193,7 +204,7 @@ Volcanos("onappend", { _init: function(can, meta, list, cb, target, field) { met
            can.page.ClassList.add(can, field, meta.feature.style||"")

            can.onappend._legend(sub, legend)
-            if (can.user.Search(can, "share") && can.user.Search(can, "river") && can.user.Search(can, "storm")) {
+            if (can.user.Search(can, "share") && can.user.Search(can, "title")) {
                can.page.Select(can, field, "legend", function(item) { can.page.Remove(can, item) })
            }
            sub.onaction && can.onappend._action(sub, sub._action, sub.onaction.list)
@ -527,7 +538,7 @@ Volcanos("onlayout", { _init: function(can, meta, list, cb, target) {
            can.page.Select(can, field, "div.output", function(output) {
                var border = output.offsetHeight - output.clientHeight
                can.page.Modify(can, output, { style: {
-                    height: height-border*2-20+"px",
+                    height: height-border*2-40+"px",
                } })
            })
        })
--- a/pane/Action.js
+++ b/pane/Action.js
@ -9,7 +9,7 @@ Volcanos("ondetail", {help: "交互菜单", list: ["共享", "更名", "删除"]
    "共享": function(event, can, value, sub) { var msg = sub.request(event)
        var list = [can.Conf("river"), can.Conf("storm"), "share", value.name, value.help]
        list = list.concat([
-            value.pod||"", value.group||"", value.index, JSON.stringify(can.core.Item(sub.Option(), function(key, value) { return value })),
+            value.pod||can.user.Search(can, "pod")||"", value.group||"", value.index, JSON.stringify(can.core.Item(sub.Option(), function(key, value) { return value })),
            JSON.stringify(sub.Option())
        ])
        can.user.share(can, msg, list)
--- a/pane/Header.js
+++ b/pane/Header.js
@ -56,7 +56,7 @@ Volcanos("onexport", {help: "导出数据", list: [], _init: function(can, msg,
        can.run(msg._event, [], function(msg) { can._output.innerHTML = ""
            can.Conf("username", msg.Option("user.nick")||msg.Option("user.name"))

-            can.core.List(msg.result||["github.com/shylinux/contexts"], function(title) {
+            can.user.isMobile || can.core.List(msg.result||["github.com/shylinux/contexts"], function(title) {
                can.page.Append(can, can._output, [{view: ["title", "div", title],
                    click: function(event) { can.onaction["title"](event, can, "title") },
                }])
@ -73,11 +73,11 @@ Volcanos("onexport", {help: "导出数据", list: [], _init: function(can, msg,
                })
            })

-            can.search = can.page.Append(can, can._output, [{view: "search", list: [{type: "input", onkeydown: function(event) {
+            can.user.isMobile || (can.search = can.page.Append(can, can._output, [{view: "search", list: [{type: "input", onkeydown: function(event) {
                switch (event.key) {
-                    case "Enter": can.run(event, ["search", "Search.onimport.input", event.target.value]); break
+                    case "Enter": can.run(event, ["search", "Search.onimport.input", "*", event.target.value]); break
                }
-            }, }], }]).input
+            }, }], }]).input)

            var height = document.body.offsetHeight
            var ui = can.page.Append(can, can._output, can.core.List(["Search", "River", "Storm", "Footer"], function(item) {
@ -106,6 +106,9 @@ Volcanos("onexport", {help: "导出数据", list: [], _init: function(can, msg,
                // ui.River.click(), ui.Footer.click(), ui.Storm.click()
                // ui.River.click(), ui.Footer.click()
            }
+            if (can.user.isMobile) {
+                ui.River.click(), ui.Footer.click(), ui.Storm.click()
+            }

            typeof cb == "function" && cb()
        })
--- a/pane/River.css
+++ b/pane/River.css
@ -12,6 +12,7 @@ fieldset.River>div.output>div.item {
    padding-left:6px;
 }
 fieldset.River>div.output>div.item:hover {
+    cursor:pointer;
    background-color:red;
    border:ridge 2px yellow;
 }
--- a/pane/River.js
+++ b/pane/River.js
@ -23,7 +23,7 @@ Volcanos("ondetail", {help: "菜单交互", list: ["添加用户", "重命名",
        can.onexport._init(can, msg, list, cb, target)
    },
    "添加用户": function(event, can, river, button) {
-        can.run(event, ["search", "Search.onimport.select", "", "", "user"], function(list) {
+        can.run(event, ["search", "Search.onimport.select", "user", "", ""], function(list) {
            var args = []; can.core.List(list, function(item) {
                args = args.concat([item[4]])
            })
--- a/pane/Search.js
+++ b/pane/Search.js
@ -7,7 +7,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, meta,
        can.ui = can.page.Append(can, can._output, [{view: "content"}, {view: "display"}])
        can.page.Modify(can, can._target, {style: {display: "block"}})

-        can.page.Select(can, can._action, "input[name=word]", function(item) { item.value = cmd[0] })
+        can.page.Select(can, can._action, "input[name=word]", function(item) { item.value = cmd[1] })
        can.run({}, cmd, function(msg) {
            can.onappend.table(can, can.ui.content, "table", msg, function(value, key, index, line) {
                return {text: [value, "td"], onclick: function(event) {
@ -28,8 +28,8 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, meta,
    },

    select: function(can, msg, cmd, cb) { can._output.innerHTML = ""
-        function search(word) { cmd[0] = word
-            can.run({}, [cmd.join(";")], function(msg) { can.ui.content.innerHTML = ""
+        function search(word) { cmd[1] = word
+            can.run({}, cmd, function(msg) { can.ui.content.innerHTML = ""
                can.onappend.table(can, can.ui.content, "table", msg, function(value, key, index, line) {
                    return {text: [value, "td"], onclick: function(event) {
                        can.Status("index", index)
@ -64,7 +64,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, meta,
        ])
        can.page.Modify(can, can._target, {style: {display: "block"}})
        can.ui.input.focus()
-        search(cmd[0])
+        search(cmd[1])
    },
 })
 Volcanos("onaction", {help: "交互操作", list: ["关闭", "清空", "完成"], _init: function(can, msg, list, cb, target) {
--- a/pane/Storm.js
+++ b/pane/Storm.js
@ -21,7 +21,7 @@ Volcanos("onaction", {help: "交互操作", list: ["创建", "刷新"], _init: f
 })
 Volcanos("ondetail", {help: "交互菜单", list: ["添加工具", "重命名", "共享", "删除"],
    "添加工具": function(event, can, value) {
-        can.run(event, ["search", "Search.onimport.select", "", "", "command"], function(list) {
+        can.run(event, ["search", "Search.onimport.select", "command", "", ""], function(list) {
            var args = []; can.core.List(list, function(item) {
                args = args.concat([item[0], item[5], item[4], ""])
            })
--- a/plugin/local/code/inner.js
+++ b/plugin/local/code/inner.js
@ -314,7 +314,12 @@ Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"],
    },

    png: {
-        line: function(can, line) { return can.page.Format("img", "/share/local/"+line) }
+        display: true,
+        show: function(can) {
+            can.page.Append(can, can.ui.display, can.core.List(can._msg.result, function(line) {
+                return {img: "/share/local/"+line, height: 400}
+            }))
+        }
    },
    url: {
        line: function(can, line) {
@ -327,6 +332,7 @@ Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"],
        }
    },
    svg: {
+        display: true,
        show: function(can) {
            can.page.Append(can, can.ui.display, can.core.List(can._msg.result, function(line) {
                return {type: "iframe", data: {src: "/share/local/"+line}, style: {width: can.Conf("width")-80+"px"}}
@ -334,9 +340,10 @@ Volcanos("onsyntax", {help: "语法高亮", list: ["keyword", "prefix", "line"],
        }
    },
    jpg: {
+        display: true,
        show: function(can) {
            can.page.Append(can, can.ui.display, can.core.List(can._msg.result, function(line) {
-                return {img: "/share/local/"+line}
+                return {img: "/share/local/"+line, height: 400}
            }))
        }
    },
--- a/plugin/local/wiki/feel.js
+++ b/plugin/local/wiki/feel.js
@ -63,6 +63,7 @@ Volcanos("onfigure", {help: "组件菜单", list: [],
        return {img: path, height: can.height}
    },
    jpg: function(can, path) { return can.onfigure.image(can, path) },
+    png: function(can, path) { return can.onfigure.image(can, path) },
    qrc: function(can, path) { return can.onfigure.image(can, path) },

    video: function(can, path) { var auto = true, loop = true, total = 0