From 6b328172e872cdeda6c0cba9d5f7cf39eea7a756 Mon Sep 17 00:00:00 2001 From: shaoying Date: Fri, 26 Feb 2021 21:42:54 +0800 Subject: [PATCH] opt some --- pane/Action.js | 3 +-- pane/Header.js | 6 ++++-- pane/River.js | 2 +- plugin/local/team/plan.js | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pane/Action.js b/pane/Action.js index cd2f01de..49cf74d9 100644 --- a/pane/Action.js +++ b/pane/Action.js @@ -88,8 +88,7 @@ Volcanos("onaction", {help: "交互操作", list: [], _init: function(can, msg, })) }) }) - - can.run({}, ["search", "Header.onimport.menu", "action", + !can.user.isMobile && can.run({}, ["search", "Header.onimport.menu", "action", ["布局", "默认布局", "流动布局", "网格布局", "标签布局", "自由布局"], ], function(event, key) { can.onaction._layout(can, key) }) can.onaction._layout(can, can.user.Search(can, "layout")) diff --git a/pane/Header.js b/pane/Header.js index 21ae2559..a728a2c1 100644 --- a/pane/Header.js +++ b/pane/Header.js @@ -67,7 +67,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, can.user.isWeiXin && can.onimport._weixin(can) }, _menu: function(can, msg, target) { - can.page.Append(can, target, can.core.List(can.user.isMobile || can.user.isExtension || can.user.Search(can, "pod")? ["river", "setting"]: ["setting"], function(item) { + can.page.Append(can, target, can.core.List(can.user.isMobile || can.user.isExtension || can.user.Search(can, "pod")? ["river"]: ["setting"], function(item) { return {view: ["menus", "div", item], onclick: function(event) { can.core.CallFunc([can.onaction, item], [event, can, item]) }} @@ -113,7 +113,9 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, }, menu: function(can, cmds, cb) { // type item... return can.page.Append(can, can._output, [{type: cmds[0], list: can.core.List(cmds.slice(1), function(item) { - if (typeof item == "string") { + if (!item) { + + } else if (typeof item == "string") { return {view: ["menu", "div", item], onclick: function(event) { typeof cb == "function" && cb(event, item) }} diff --git a/pane/River.js b/pane/River.js index d3881b76..67144a43 100644 --- a/pane/River.js +++ b/pane/River.js @@ -45,7 +45,7 @@ Volcanos("onaction", {help: "控件交互", list: [], _init: function(can, msg, can.run({}, ["search", "Header.onimport.menu", "river", ["添加", "创建群组", "添加应用", "添加工具", "添加用户", "添加设备", "创建空间"], - ["访问", "内部系统", "访问应用", "访问工具", "访问用户", "访问设备", "工作任务"], + !can.user.isMobile && ["访问", "内部系统", "访问应用", "访问工具", "访问用户", "访问设备", "工作任务"], ["共享", "共享群组", "共享应用", "共享工具", "共享用户", "共享设备"], ], function(event, item) { can.core.CallFunc([can.ondetail, item], [event, can, item, can.Conf("river"), can.Conf("storm")]) diff --git a/plugin/local/team/plan.js b/plugin/local/team/plan.js index c2d96278..6410ca29 100644 --- a/plugin/local/team/plan.js +++ b/plugin/local/team/plan.js @@ -54,7 +54,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg, task.extra && can.core.Item(can.base.Obj(task.extra), function(key, value) { task["extra."+key] = value }), delete(task.extra) var info = {}; can.core.List(can.onexport.list, function(key) { info[key] = task[key] }), can.Status(info) - function keys(task, key) { return [task.zone, task.id, key].join(".") } + function keys(task, key) { return [task.pod, task.zone, task.id, key].join(".") } if (can.task) { can.page.Cache(keys(can.task, "profile"), can.ui.profile, can.task.id)