diff --git a/frame.js b/frame.js
index 32adf311..a469fc91 100644
--- a/frame.js
+++ b/frame.js
@@ -487,10 +487,7 @@ Volcanos("onlayout", {help: "页面布局", list: [], _init: function(can, targe
})
})
- can.user.isMobile || can.page.Select(can, target, html.FIELDSET_MAIN, function(field, index) {
- var scroll = 1
- if (!can.user.isMobile && !can.user.isMacOSX) { scroll = 18 }
-
+ can.user.isMobile || can.page.Select(can, target, html.FIELDSET_MAIN, function(field, index) { var scroll = 1
can.page.style(can, field, html.HEIGHT, height, html.WIDTH, width-scroll)
can.page.Select(can, target, [[html.FIELDSET_MAIN, html.DIV_OUTPUT]], function(output) {
height -= can.page.Select(can, field, html.DIV_ACTION)[0].offsetHeight
diff --git a/page/index.html b/page/index.html
index 506e3524..bb1ed14d 100644
--- a/page/index.html
+++ b/page/index.html
@@ -1,6 +1,6 @@
-
+
volcanos
diff --git a/panel/action.js b/panel/action.js
index 16e90ddc..f0c0d8f9 100644
--- a/panel/action.js
+++ b/panel/action.js
@@ -54,7 +54,7 @@ Volcanos("onimport", {help: "导入数据", list: [], _init: function(can, msg)
_cmd: function(can, item, next) {
can.base.Copy(item, {
height: can.Conf(html.HEIGHT)-can.Conf(html.MARGIN_Y)+(can.user.isWindows? 17: 0),
- width: can.Conf(html.WIDTH)-can.Conf(html.MARGIN_X),
+ width: can.Conf(html.WIDTH),
opts: can.misc.Search(can),
})
can.onappend.plugin(can, item, function(sub, meta, skip) {
diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js
index 03f02c27..99ef9c77 100644
--- a/plugin/local/code/inner.js
+++ b/plugin/local/code/inner.js
@@ -182,7 +182,7 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target
}, can.base.isFunc(cb) && cb(sub)
}, target)
},
- layout: function(can) { var height = can.ConfHeight(), width = can.ConfWidth()
+ layout: function(can) { var height = can.ConfHeight()-(can.user.mod.isCmd && can.user.isWindows? 20: 0), width = can.ConfWidth()
can.page.styleWidth(can, can.ui.profile_output, can.profile_size[can.onexport.keys(can)]||(width-can.ui.project.offsetWidth)/2)
can.page.styleWidth(can, can.ui.content, width-can.ui.project.offsetWidth-can.ui.profile.offsetWidth-26)