From 7692d4069f42bd5cc68778b78eb570717ef5e165 Mon Sep 17 00:00:00 2001
From: shylinux <shylinux@163.com>
Date: Tue, 18 Jan 2022 09:30:52 +0800
Subject: [PATCH] opt inner.js

---
 lib/page.js                 |  8 ++++++++
 plugin/local/code/inner.css | 34 ++++++++++++++++++++++------------
 plugin/local/code/inner.js  | 22 ++++++++++++++--------
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/lib/page.js b/lib/page.js
index 0157390f..0db4c7cf 100644
--- a/lib/page.js
+++ b/lib/page.js
@@ -360,6 +360,14 @@ Volcanos("page", {help: "用户界面", ClassList: {
         return input
     },
 
+    styleHeight: function(can, target, value) {
+        can.page.style(can, target, html.HEIGHT, value)
+        return target.offsetHeight
+    },
+    styleWidth: function(can, target, value) {
+        can.page.style(can, target, html.WIDTH, value)
+        return target.offsetWidth
+    },
     style: function(can, target, style) { var value = {}
         for (var i = 2; i < arguments.length; i += 2) {
             if (typeof arguments[i] == lang.OBJECT) {
diff --git a/plugin/local/code/inner.css b/plugin/local/code/inner.css
index cbdd433f..4522136b 100644
--- a/plugin/local/code/inner.css
+++ b/plugin/local/code/inner.css
@@ -1,15 +1,3 @@
-fieldset.inner.full>div.legend {
-    display:none;
-}
-fieldset.inner.full>div.action {
-    display:none;
-}
-fieldset.inner.full>form.option {
-    display:none;
-}
-fieldset.inner.full>div.status {
-    display:none;
-}
 fieldset.inner>div.action {
     float:none; display:block;
     height:26px; overflow:auto;
@@ -173,6 +161,28 @@ fieldset.inner>div.status legend:hover {
     background:green;
 }
 
+fieldset.inner.full>div.legend {
+    display:none;
+}
+fieldset.inner.full>div.action {
+    display:none;
+}
+fieldset.inner.full>form.option {
+    display:none;
+}
+fieldset.inner.full>div.status {
+    display:none;
+}
+fieldset.inner.full>div.status {
+    display:none;
+}
+fieldset.inner.full>div.output div.profile>div.action {
+    display:none;
+}
+fieldset.inner.full>div.output div.display>div.action {
+    display:none;
+}
+
 body.white fieldset.inner>div.output div.project {
     color:#a2dad2;
 }
diff --git a/plugin/local/code/inner.js b/plugin/local/code/inner.js
index a2374bd4..2c27f9ff 100644
--- a/plugin/local/code/inner.js
+++ b/plugin/local/code/inner.js
@@ -88,19 +88,21 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target
         line == ctx.INDEX? show(can.request({}, {index: file, line: line})): can.run({}, [path, file], show, true)
     },
     profile: function(can, msg) {
-        if (msg) {
+        if (msg) { can.onmotion.clear(can, can.ui.profile_output)
             // can.onappend.table(can, msg, null, can.ui.profile_output)
             can.onappend.board(can, msg.Result(), can.ui.profile_output)
+            can.user.toastSuccess(can)
         }
-        can.page.style(can, can.ui.profile_output, html.WIDTH, (can.ConfWidth()-can.ui.project.offsetWidth)/2)
+        can.page.styleWidth(can, can.ui.profile_output, (can.ConfWidth()-can.ui.project.offsetWidth)/2)
         can.onmotion.hidden(can, can.ui.profile, true), can.onimport.layout(can)
     },
     display: function(can, msg) {
-        if (msg) {
+        if (msg) { can.onmotion.clear(can, can.ui.display_output)
             // can.onappend.table(can, msg, null, can.ui.display_output)
             can.onappend.board(can, msg.Result(), can.ui.display_output)
+            can.user.toastSuccess(can)
         }
-        can.page.style(can, can.ui.display_output, html.HEIGHT, can.ConfHeight()/4)
+        can.page.style(can, can.ui.display_output, html.MAX_HEIGHT, can.ConfHeight()/4)
         can.onmotion.hidden(can, can.ui.display, true), can.onimport.layout(can)
     },
     toolkit: function(can, meta, cb) {
@@ -134,13 +136,17 @@ Volcanos("onimport", {help: "导入数据", _init: function(can, msg, cb, target
     layout: function(can) { var height = can.ConfHeight(), width = can.ConfWidth()
         can.page.style(can, can.ui.content, can.user.mod.isCmd? html.HEIGHT: html.MAX_HEIGHT, height)
         if (can.ui.project.style.display != html.NONE) {
-            can.page.style(can, can.ui.project, html.HEIGHT, can.ui.content.offsetHeight)
+            can.page.styleHeight(can, can.ui.project, can.ui.content.offsetHeight)
         }
         if (can.user.mod.isCmd) {
-            can.page.style(can, can.ui.content, html.HEIGHT, (can.ui.project.offsetHeight||height)-can.ui.display.offsetHeight)
+            can.page.styleHeight(can, can.ui.content, (can.ui.project.offsetHeight||height)-can.ui.display.offsetHeight)
+        }
+        can.page.styleWidth(can, can.ui.content, width-can.ui.project.offsetWidth-can.ui.profile.offsetWidth-25)
+        if (can.page.ClassList.has(can, can._fields, "full")) {
+            can.page.styleHeight(can, can.ui.profile_output, can.ui.content.offsetHeight)
+        } else {
+            can.page.styleHeight(can, can.ui.profile_output, can.ui.content.offsetHeight-html.ACTION_HEIGHT)
         }
-        can.page.style(can, can.ui.content, html.WIDTH, width-can.ui.project.offsetWidth-can.ui.profile.offsetWidth-25)
-        can.page.style(can, can.ui.profile_output, html.HEIGHT, can.ui.content.offsetHeight-html.ACTION_HEIGHT)
     },
     exts: function(can, url, cb) {
         can.require([url], function() {}, function(can, name, sub) { sub._init(can, can.base.ParseURL(sub._path), function(sub) {