From 8ac0767958c7afebaff001a4ebb96d12465d4f1f Mon Sep 17 00:00:00 2001
From: ZoeLeeFZ <lizhou1021@qq.com>
Date: Tue, 10 Sep 2019 11:21:29 +0800
Subject: [PATCH] =?UTF-8?q?!487=20=E8=AE=BE=E8=AE=A1=E5=99=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2,=E4=BA=91=E7=9B=98=E4=BF=A1=E6=81=AFUi=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UI/Components/Modal/ModalStyle/Modal.less |  1 +
 .../Components/SourceManage/SpaceInfoBar.tsx  | 13 ++++---
 src/UI/Components/Template/Template.less      | 34 +++++++++++--------
 .../Template/TemplateActionList.tsx           |  2 +-
 src/UI/Components/Template/TemplateEditor.tsx | 16 ++++-----
 .../Components/Template/TemplateParamList.tsx |  2 +-
 .../Components/Template/TemplateSaveDir.tsx   |  2 +-
 src/UI/Css/blue.less                          |  7 ++++
 src/UI/Store/TopPanelStore.ts                 |  2 +-
 9 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/UI/Components/Modal/ModalStyle/Modal.less b/src/UI/Components/Modal/ModalStyle/Modal.less
index 52586ec66..f2d89052e 100644
--- a/src/UI/Components/Modal/ModalStyle/Modal.less
+++ b/src/UI/Components/Modal/ModalStyle/Modal.less
@@ -122,6 +122,7 @@
 #modal .input-select{
     display: inline-block;
     width: @selectWidth;
+    vertical-align: bottom;
 }
 
 //select高度改变,调整切换符号位置
diff --git a/src/UI/Components/SourceManage/SpaceInfoBar.tsx b/src/UI/Components/SourceManage/SpaceInfoBar.tsx
index a77f12900..c0e4c0ddf 100644
--- a/src/UI/Components/SourceManage/SpaceInfoBar.tsx
+++ b/src/UI/Components/SourceManage/SpaceInfoBar.tsx
@@ -12,12 +12,6 @@ const BarStype: React.CSSProperties = {
     margin: 0,
     borderRadius: 5,
 }
-const SpaceProcessUseStyle: React.CSSProperties = {
-    transition: "all 0.2s",
-    height: "100%",
-    backgroundColor: "#428bca",
-    borderRadius: 5,
-}
 
 @inject('store')
 @observer
@@ -33,7 +27,12 @@ export class SpaceInfoBar extends React.Component<{ store?: TopPanelStore }, {}>
         return (
             <div style={{ width: 200 }}>
                 <div style={BarStype}>
-                    <div style={Object.assign(SpaceProcessUseStyle, { width: cloudInfo.used_percentage })}></div>
+                    <div
+                        className="space-process"
+                        style={{
+                            width: cloudInfo.used_percentage,
+                            backgroundColor: parseFloat(cloudInfo.used_percentage) > 80 ? "#db3737" : "#428bca"
+                        }} />
                 </div>
                 <div className="flex-between" style={{ alignItems: "center" }}>
                     <span>{cloudInfo.used_size}/{cloudInfo.zone_size}</span>
diff --git a/src/UI/Components/Template/Template.less b/src/UI/Components/Template/Template.less
index 1126dff77..556ed7101 100644
--- a/src/UI/Components/Template/Template.less
+++ b/src/UI/Components/Template/Template.less
@@ -211,30 +211,34 @@
         width: auto;
     }
 
-    &>.bp3-dialog-body>div:first-child {
+    &>.bp3-dialog-body>div {
+        height: 100%;
 
-        input {
-            width: 100px;
-            height: 20px;
+        &>div:first-child {
+            width: 60%;
         }
 
-        button {
-            height: 20px;
-            min-height: 20px;
-            padding: 2px 8px;
+        &>div:last-child {
+            width: 40%;
         }
-    }
 
-    &>.bp3-dialog-body>div:last-child {
-        height: 100%;
+    }
 
-        &>div:first-child {
-            width: 60%;
+    .buttons {
 
+        &>button {
+            margin-right: 3px;
+            margin-bottom: 3px;
+            border-radius: 5px;
         }
 
-        &>div:last-child {
-            width: 40%;
+        &>span {
+            margin-right: 3px;
+
+            & button {
+                margin-bottom: 3px;
+                border-radius: 5px;
+            }
         }
     }
 }
diff --git a/src/UI/Components/Template/TemplateActionList.tsx b/src/UI/Components/Template/TemplateActionList.tsx
index 4467bcfad..ca9ea78a3 100644
--- a/src/UI/Components/Template/TemplateActionList.tsx
+++ b/src/UI/Components/Template/TemplateActionList.tsx
@@ -63,7 +63,7 @@ export default class TempalteActionList extends React.Component<ITempalteActionL
                     onNodeClick={this.handleNodeClick}
                     onNodeCollapse={(node) => this.handleNodeCollapse(node)}
                 />
-                <div>
+                <div className="buttons">
                     <Button
                         text="增加动作"
                         onClick={() => this.handleAddAction(EEditorActionType.Add)}
diff --git a/src/UI/Components/Template/TemplateEditor.tsx b/src/UI/Components/Template/TemplateEditor.tsx
index 1289819c5..fe3568c0f 100644
--- a/src/UI/Components/Template/TemplateEditor.tsx
+++ b/src/UI/Components/Template/TemplateEditor.tsx
@@ -78,15 +78,6 @@ export class TemplateEditor extends React.Component<ITemplateEditorProps, any> {
                     <div
                         className={Classes.DIALOG_BODY + " " + Classes.CARD}
                     >
-                        <div>
-                            <Label className={Classes.INLINE}>
-                                <span>模板名称</span>
-                                <input className={Classes.INPUT}
-                                    defaultValue={template.Name}
-                                    onChange={e => template.Name = e.target.value}
-                                />
-                            </Label>
-                        </div>
                         <div className="flex">
                             <TemplateParamList
                                 store={this.props.store}
@@ -102,6 +93,13 @@ export class TemplateEditor extends React.Component<ITemplateEditorProps, any> {
                             store={this.props.store}
                         />
                         <div className={Classes.DIALOG_FOOTER_ACTIONS}>
+                            <Label className={Classes.INLINE}>
+                                <span style={{ fontWeight: 550 }}>模板名称:</span>
+                                <input className={Classes.INPUT}
+                                    defaultValue={template.Name}
+                                    onChange={e => template.Name = e.target.value}
+                                />
+                            </Label>
                             {
                                 this.props.tid ?
                                     <>
diff --git a/src/UI/Components/Template/TemplateParamList.tsx b/src/UI/Components/Template/TemplateParamList.tsx
index 04cac50d2..4042f63d4 100644
--- a/src/UI/Components/Template/TemplateParamList.tsx
+++ b/src/UI/Components/Template/TemplateParamList.tsx
@@ -111,7 +111,7 @@ export default class TemplateParamList extends React.Component<ITemplateParamLis
                         })
                     }
                 </ul>
-                <div>
+                <div className="buttons">
                     <Button
                         text="增加变量"
                         onClick={() => this.startAddParam.set(true)}
diff --git a/src/UI/Components/Template/TemplateSaveDir.tsx b/src/UI/Components/Template/TemplateSaveDir.tsx
index ca835a005..bc54941f6 100644
--- a/src/UI/Components/Template/TemplateSaveDir.tsx
+++ b/src/UI/Components/Template/TemplateSaveDir.tsx
@@ -37,7 +37,7 @@ export class TemplateSaveDir extends React.Component<ITemplateSaveDirProps, { no
                 }
                 target={
                     <Button
-                        text="保存到"
+                        text="保存"
                         intent={Intent.SUCCESS}
                     />}
             />
diff --git a/src/UI/Css/blue.less b/src/UI/Css/blue.less
index 45f55bbe0..8745dd4e1 100644
--- a/src/UI/Css/blue.less
+++ b/src/UI/Css/blue.less
@@ -181,3 +181,10 @@
         }
     }
 }
+
+.space-process{
+    transition: all 0.2s;
+    height: 100%;
+    background-color: #428bca;
+    border-radius: 5;
+}
\ No newline at end of file
diff --git a/src/UI/Store/TopPanelStore.ts b/src/UI/Store/TopPanelStore.ts
index 43b3e689d..b0f65f243 100644
--- a/src/UI/Store/TopPanelStore.ts
+++ b/src/UI/Store/TopPanelStore.ts
@@ -91,7 +91,7 @@ export class TopPanelStore extends Singleton
             });
             let zoneSize = sizeInfoToNumber(info.zone_size);
             let usedSize = sizeInfoToNumber(info.used_size);
-            this.cloudInfo.used_percentage = usedSize / zoneSize * 100 + "%";
+            this.cloudInfo.used_percentage = usedSize <= zoneSize ? usedSize / zoneSize * 100 + "%" : "100%";
         }
     }
 }