From 86c975eccaaae4166e97e41c812e1e9735a9d0a4 Mon Sep 17 00:00:00 2001
From: Zoe <lizhou1021@qq.com>
Date: Mon, 23 Jul 2018 17:50:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=9C=E5=AD=90=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=94=A8=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UI/Components/Board/BehindBoardModal.tsx |  5 +-
 src/UI/Components/Board/BoardCommon.tsx      | 70 +++++++++++++++++++-
 src/UI/Components/Board/BoardModal.tsx       |  1 -
 src/UI/Components/Board/LayerBoardModal.tsx  |  6 +-
 src/UI/Components/Modal/Modal.css            |  3 +
 src/UI/Components/SourceManage/FilePanel.tsx |  2 +-
 6 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/src/UI/Components/Board/BehindBoardModal.tsx b/src/UI/Components/Board/BehindBoardModal.tsx
index d60f3fec2..92c50e321 100644
--- a/src/UI/Components/Board/BehindBoardModal.tsx
+++ b/src/UI/Components/Board/BehindBoardModal.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { Classes, Radio, RadioGroup } from '../../../../node_modules/@blueprintjs/core';
 import { observable } from '../../../../node_modules/mobx';
 import { BehindBoardStore, BehindHeightPositon, BoardRelativePositon } from '../../Store/BoardStore';
-import { BoardConfigBlock, BoardModel, SetBoardDataBlock, SetBoardDataItem, SetBoardDataItem2 } from './BoardCommon';
+import { BoardConfigBlock, BoardModel, SetBoardDataBlock, SetBoardDataItem, SetBoardDataItem2, BoardInfo } from './BoardCommon';
 
 @inject("store")
 @observer
@@ -101,6 +101,9 @@ export class BehindBoardModal extends React.Component<{ store?: BehindBoardStore
                         opt1={new Map([[BoardRelativePositon.ForFront, "靠前"], [BoardRelativePositon.ForBack, "靠后"]])}
                     />
                 </div>
+                <div className="bp3-card">
+                    <BoardInfo />
+                </div>
             </div>
         )
     }
diff --git a/src/UI/Components/Board/BoardCommon.tsx b/src/UI/Components/Board/BoardCommon.tsx
index d115e0195..fefd48fc4 100644
--- a/src/UI/Components/Board/BoardCommon.tsx
+++ b/src/UI/Components/Board/BoardCommon.tsx
@@ -1,6 +1,6 @@
 import { observer } from 'mobx-react';
 import * as React from 'react';
-import { RadioGroup, Radio, Classes } from '../../../../node_modules/@blueprintjs/core';
+import { RadioGroup, Radio, Classes, InputGroup, Popover, Menu, MenuItem, Button, Checkbox } from '../../../../node_modules/@blueprintjs/core';
 import { BoardRelativePositon } from '../../Store/BoardStore';
 
 //设置板件数据组件
@@ -61,7 +61,6 @@ export const BoardModel = () =>
         </label>
     )
 }
-
 export const BoardConfigBlock = observer(({ opt, pars, opt1 }: { opt: any, pars: Map<string, string>, opt1: Map<BoardRelativePositon, string> }) =>
     <div>
         <div>
@@ -99,3 +98,70 @@ export const BoardConfigBlock = observer(({ opt, pars, opt1 }: { opt: any, pars:
         </div>
     </div>
 );
+
+export const BoardInfo = (props: { store?: any }) =>
+{
+    let pars = new Map([
+        ["rootName", "房间名"], ["cupboardName", "柜名"], ["matName", "板材名"], ["mat", "材料"], ["color", "颜色"]
+    ])
+    return (
+        <div className="boardSize center">
+            <SetBoardDataBlock pars={pars} opt={{}} />
+            <label className="bp3-label .modifier">
+                纹路
+                <div className="bp3-select bp3-inline  .modifier">
+                    <select>
+                        <option value="0">正纹</option>
+                        <option value="1">反纹</option>
+                        <option value="1">可翻转</option>
+                    </select>
+                </div>
+            </label>
+            <label className="bp3-label .modifier">
+                打孔面
+                <div className="bp3-select bp3-inline .modifier">
+                    <select>
+                        <option value="0">正</option>
+                        <option value="1">反</option>
+                        <option value="1">不排</option>
+                    </select>
+                </div>
+            </label>
+            <label className="bp3-label .modifier">
+                排钻
+                <div className="bp3-select bp3-inline .modifier">
+                    <select>
+                        <option value="0">三合一</option>
+                        <option value="1">二合一</option>
+                    </select>
+                </div>
+            </label>
+            <label className="bp3-label .modifier">
+                排版面
+                <div className="bp3-select bp3-inline .modifier">
+                    <select>
+                        <option value="0">正面</option>
+                        <option value="1">反面</option>
+                        <option value="1">随意面</option>
+                    </select>
+                </div>
+            </label>
+            <div>
+                <label htmlFor="">排孔面</label>
+                <Checkbox checked={true} label="正" />
+                <Checkbox checked={true} label="反" />
+            </div>
+            <h6 className={Classes.HEADING}>材料封边</h6>
+            <div>
+                <input type="text" className="bp3-input" />
+                <div>
+                    <input type="text" className="bp3-input" />
+                    <BoardModel />
+                    <input type="text" className="bp3-input" />
+                </div>
+                <input type="text" className="bp3-input" />
+            </div>
+        </div>
+    )
+}
+
diff --git a/src/UI/Components/Board/BoardModal.tsx b/src/UI/Components/Board/BoardModal.tsx
index e8df83f3a..e4f820c3b 100644
--- a/src/UI/Components/Board/BoardModal.tsx
+++ b/src/UI/Components/Board/BoardModal.tsx
@@ -213,7 +213,6 @@ export class BoardModal extends React.Component<BoardModalProps, BoardModalState
                                                 keepTogether: { enabled: true },
                                                 preventOverflow: { enabled: true, boundariesElement: "scrollParent" }
                                             }}
-                                            // position="bottom"
                                             content={
                                                 <Menu>
                                                     {
diff --git a/src/UI/Components/Board/LayerBoardModal.tsx b/src/UI/Components/Board/LayerBoardModal.tsx
index dbcba682c..260c29233 100644
--- a/src/UI/Components/Board/LayerBoardModal.tsx
+++ b/src/UI/Components/Board/LayerBoardModal.tsx
@@ -16,10 +16,10 @@ export const LayerBoardModal =
             let nailOpt = props.store.layerNailOption;
             return (
                 <div>
-                    <label className="pt-label pt-inline">
+                    <label className="bp3-label bp3-inline">
                         板名称:
                         <input
-                            className="pt-input"
+                            className="bp3-input"
                             value={props.store.name}
                             onChange={e =>
                             {
@@ -29,7 +29,7 @@ export const LayerBoardModal =
                     </label>
                     <div>
                         <h6 className={Classes.HEADING}>板件尺寸</h6>
-                        <div className="flex" style={{ alignItems: "center" }}>
+                        <div className="flex" style={{ alignItems: "center", justifyContent: "flex-start" }}>
                             <div className="flexWrap">
                                 {
                                     Array.from(scalePars.keys()).map(k =>
diff --git a/src/UI/Components/Modal/Modal.css b/src/UI/Components/Modal/Modal.css
index b6e7ce6cc..5a2d5c7bf 100644
--- a/src/UI/Components/Modal/Modal.css
+++ b/src/UI/Components/Modal/Modal.css
@@ -122,3 +122,6 @@
 #boardModal .input-select>input #boardModal .input-select span {
     margin: 0;
 }
+#boardModal .behind-board{
+    display: flex;
+}
diff --git a/src/UI/Components/SourceManage/FilePanel.tsx b/src/UI/Components/SourceManage/FilePanel.tsx
index 74cc3fe1e..2782842e7 100644
--- a/src/UI/Components/SourceManage/FilePanel.tsx
+++ b/src/UI/Components/SourceManage/FilePanel.tsx
@@ -237,7 +237,7 @@ export class FilePanel extends React.Component<FileProps, FileState>
                     style={
                         {
                             overflow: "auto",
-                            height: 580
+                            height: "80%"
                         }
                     }
                 >