From f7452a1e6cba6b47521f61c491953adf8196a363 Mon Sep 17 00:00:00 2001 From: shaoying Date: Fri, 19 Feb 2021 23:37:40 +0800 Subject: [PATCH] opt some --- lib/user.js | 8 +++----- page/index.css | 4 ++++ pane/Action.js | 10 +++++++--- pane/Header.js | 19 +++++++++++++------ pane/River.js | 8 +++++++- 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/lib/user.js b/lib/user.js index 00ef9b55..569204b1 100644 --- a/lib/user.js +++ b/lib/user.js @@ -262,8 +262,8 @@ Volcanos("user", {help: "用户模块", agent: { return can.core.List(value, function(value) {return key+"="+encodeURIComponent(value)}).join("&") }).join("&")], function(item) { return item? item: undefined }).join("?") }), - Search: shy("请求参数", function(can, key, value) {var args = {} - location.search && location.search.slice(1).split("&").forEach(function(item) {var x = item.split("=") + Search: shy("请求参数", function(can, key, value) { var args = {} + location.search && location.search.slice(1).split("&").forEach(function(item) { var x = item.split("=") x[1] != "" && (args[x[0]] = decodeURIComponent(x[1])) }) @@ -275,11 +275,9 @@ Volcanos("user", {help: "用户模块", agent: { } else if (key == undefined) { return args } else if (value == undefined) { - // return args[key] || can.user.Cookie(can, key) return args[key] } else { - args[key] = value - args[key] == "" && delete(args[key]) + args[key] = value, args[key] == "" && delete(args[key]) } return location.search = can.core.Item(args, function(key, value) { diff --git a/page/index.css b/page/index.css index 42d7c6aa..e7fd8530 100644 --- a/page/index.css +++ b/page/index.css @@ -358,6 +358,10 @@ fieldset>div.output div.project div.list { margin-left:10px; } +body>fieldset.input td { + word-break:keep-all; +} + body>fieldset.input { position:fixed; top:32px; background-color:#0d4142a6; diff --git a/pane/Action.js b/pane/Action.js index 0cef8fc2..cd2f01de 100644 --- a/pane/Action.js +++ b/pane/Action.js @@ -92,8 +92,9 @@ Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, msg, can.run({}, ["search", "Header.onimport.menu", "action", ["布局", "默认布局", "流动布局", "网格布局", "标签布局", "自由布局"], ], function(event, key) { can.onaction._layout(can, key) }) + can.onaction._layout(can, can.user.Search(can, "layout")) }, - _layout: function(can, key) { + _layout: function(can, key) { if (!key) { return } var trans = { "默认布局": "auto", "流动布局": "flow", @@ -101,8 +102,10 @@ Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, msg, "标签布局": "tabs", "自由布局": "free", } - can.page.Modify(can, can._action, {className: "action "+trans[key]}) - can.page.Modify(can, can._output, {className: "output "+trans[key]}) + + key = trans[key]||key, can.Conf("layout", key) + can.page.Modify(can, can._action, {className: "action "+key}) + can.page.Modify(can, can._output, {className: "output "+key}) if (key == "标签布局") { can.onmotion.select(can, can._output, "fieldset.plugin", 0) @@ -142,6 +145,7 @@ Volcanos("onexport", {help: "导出数据", list: [], msg.Option("width", can._target.offsetWidth) msg.Option("height", can._target.offsetHeight) }, + layout: function(can, msg) { return can.Conf("layout") }, plugin: function(can, msg, word) { var fields = (msg.Option("fields")||"ctx,cmd,type,name,text").split(",") can.page.Select(can, can._output, "fieldset.plugin>legend", function(item) { diff --git a/pane/Header.js b/pane/Header.js index 030bf8c2..9ff8b93c 100644 --- a/pane/Header.js +++ b/pane/Header.js @@ -8,6 +8,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, "print": "打印主题", "clear": "清除背景", "pack": "打包页面", + "usernick": "昵称", "logout": "退出", } can.onmotion.clear(can) @@ -98,10 +99,8 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }) }) }, _time: function(can, target) { - can.core.Timer({interval: 1000}, function() { - can.onimport.time(can, target) - }) - can.onappend.figure(can, {style: {left: "", right: "0", top: can._target.offsetHeight}}, "@date", target) + can.core.Timer({interval: 1000}, function() { can.onimport.time(can, target) }) + can.onappend.figure(can, {style: {left: "", right: "0", top: can._target.offsetHeight, "min-width": 310}}, "@date", target) }, time: function(can, target) { can.onlayout.topic(can) @@ -156,15 +155,22 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, msg, }, title: function(event, can) { - var args = {}; can.core.List(["pod", "topic", "title"], function(key) { + var args = {}; can.core.List(["pod", "title", "topic", "layout"], function(key) { var value = can.user.Search(can, key); value && (args[key] = value) }) can.user.jumps(can.user.MergeURL(can, args, true)) }, username: function(event, can) { - var ui = can.user.carte(event, can, can.onaction, ["logout"]) + var ui = can.user.carte(event, can, can.onaction, ["usernick", "logout"]) can.page.Modify(can, ui.first, {style: {top: can._target.offsetHeight}}) }, + usernick: function(event, can) { + can.user.input(event, can, ["usernick"], function(ev, button, data, list, args) { + can.run(event, ["usernick", list[0]], function(msg) { + can.user.toast(can, "修改成功") + }, true) + }) + }, logout: function(event, can) { can.user.logout(can) }, river: function(event, can) { can.run(event, ["search", "River.onmotion.toggle"]) }, @@ -197,4 +203,5 @@ Volcanos("onaction", {help: "交互数据", list: [], _init: function(can, msg, }) Volcanos("onexport", {help: "导出数据", list: [], height: function(can) { return can._target.offsetHeight }, + topic: function(can) { return can._topic }, }) diff --git a/pane/River.js b/pane/River.js index c916777e..90ec49ca 100644 --- a/pane/River.js +++ b/pane/River.js @@ -99,7 +99,13 @@ Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, msg, }, "创建": function(event, can) { can.onaction.create(event, can) }, - "刷新": function(event, can) { can.user.Search(can, {river: can.Conf("river"), storm: can.Conf("storm")}) }, + "刷新": function(event, can) { + can.user.Search(can, { + river: can.Conf("river"), storm: can.Conf("storm"), + topic: can.run(event, ["search", "Header.onexport.topic"]), + layout: can.run(event, ["search", "Action.onexport.layout"]), + }) + }, }) Volcanos("ondetail", {help: "菜单交互", list: ["共享群组", "添加用户", "添加设备", "添加应用", "重命名群组", "删除群组"], "创建群组": function(event, can) { can.onaction.create(event, can) },