!1148 优化:界面优化

src/UI/Components/BoardBatchCurtailModal.tsx

@@ -185,12 +185,12 @@ export class BoardBatchCurtailModal extends React.Component<IBoardBatchCurtailPr
                         onChange={() => this.props.store.m_Option.moveBrs = !this.props.store.m_Option.moveBrs}
                     />
                     <footer>
+                        <UserConfig store={this.props.store} type={this.CONFIG_CURTAIL as BoardModalType} />
+                        <Divider />
                         <div>
                             <Button intent={Intent.SUCCESS} text="确定" onClick={this.Ok} />
                             <Button intent={Intent.DANGER} text="取消" onClick={this.Close} />
                         </div>
-                        <Divider />
-                        <UserConfig store={this.props.store} type={this.CONFIG_CURTAIL as BoardModalType} />
                     </footer>
                 </div>
             </Card>

src/UI/Components/MaterialContainer.tsx

@@ -189,7 +189,7 @@ export class MaterialContainer extends React.Component<MaterialContainerProps, {
                         id={MATCONTENTID}
                         style={{
                             width: 1200,
-                            height: "85vh"
+                            height: 820
                         }}
                     >
                     </div>

src/UI/Components/Panel.tsx

@@ -28,7 +28,10 @@ enum ToggleBtnIcon
     MOON = "moon",
 }
 
-//顶部标题栏. TODO:Ajax请求，获得登录状态
+const MarginStyle: React.CSSProperties = {
+    marginRight: 5
+};
+
 @inject("store")
 @observer
 export class TopPanel extends React.Component<{ store?: TopPanelStore; }, {}>
@@ -82,7 +85,7 @@ export class TopPanel extends React.Component<{ store?: TopPanelStore; }, {}>
         return (
             <Navbar>
                 <Navbar.Group align={Alignment.LEFT}>
-                    <InputGroup small={true} leftIcon="search" type="search" placeholder="搜索文件..." dir="auto" />
+                    {/* <InputGroup small={true} leftIcon="search" type="search" placeholder="搜索文件..." dir="auto" /> */}
                 </Navbar.Group>
                 <Navbar.Group align={Alignment.RIGHT}>
                     <Button
@@ -96,12 +99,23 @@ export class TopPanel extends React.Component<{ store?: TopPanelStore; }, {}>
                         }}
                     />
                     <Button
+                        style={MarginStyle}
                         small={true}
                         icon="people"
                         text="加入售后群"
                         intent={Intent.PRIMARY}
                         onClick={() => window.open("https://jq.qq.com/?_wv=1027&k=5o7IHKm")}
                     />
+                    <Button
+                        style={MarginStyle}
+                        small={true}
+                        icon="home"
+                        text="主页"
+                        onClick={() =>
+                        {
+                            this.props.store.openMain = true;
+                        }}
+                    />
                     <Button
                         small={true}
                         icon="fullscreen"
@@ -115,15 +129,6 @@ export class TopPanel extends React.Component<{ store?: TopPanelStore; }, {}>
                             //     document.body.requestFullscreen();
                         }}
                     />
-                    <Button
-                        small={true}
-                        icon="home"
-                        text="主页"
-                        onClick={() =>
-                        {
-                            this.props.store.openMain = true;
-                        }}
-                    />
                     {this.props.store.isLogin && this.renderLogined()}
                     <Button
                         small={true}
@@ -145,7 +150,7 @@ export class TopPanel extends React.Component<{ store?: TopPanelStore; }, {}>
         return (
             <div className="bp3-navbar-group bp3-align-right info" style={{ height: this.state.isCollapse ? "auto" : 0 }}>
                 {
-                    !this.props.store.openMain && <Button small={true} intent={Intent.SUCCESS} icon="document" text="文件" onClick={this.openFileManage} />
+                    !this.props.store.openMain && <Button style={MarginStyle} small={true} intent={Intent.SUCCESS} icon="document" text="文件" onClick={this.openFileManage} />
                 }
                 {/* <Button small={true} icon="annotation" /> */}
                 <Button

src/UI/Css/style.less

@@ -631,3 +631,4 @@ img {
     .flex();
     flex-wrap: wrap;
 }
+

src/UI/Store/DoorDrawerStore/DoorDrawerStore.ts

@@ -430,6 +430,8 @@ export class DoorDrawerStore extends BoardStore<IDoorAndDrawerConfigOption>
             this.m_Option.depth = this.totalDepth;
             this.m_UiOption.depth = this.totalDepth.toString();
         }
+        let lockHeight = 0;
+        let lockWidth = 0;
         if (cof.doorsInfo && cof.doorsInfo.length > 0)
         {
             for (let info of cof.doorsInfo)
@@ -443,9 +445,20 @@ export class DoorDrawerStore extends BoardStore<IDoorAndDrawerConfigOption>
                             handleTemp: { id: "", name: "" },
                         };
                 }
+                if (!info.showHeight.includes("D"))
+                    lockHeight += info.height;
+                if (!info.showWidth.includes("D"))
+                    lockWidth += info.width;
+            }
+            if (lockHeight > this.totalHeight || lockWidth > this.totalWidth)
+            {
+                this.InitInfos();
+            }
+            else
+            {
+                observable(this.doorDrawersInfo).replace(cof.doorsInfo);
+                this.CalcInfos();
             }
-            observable(this.doorDrawersInfo).replace(cof.doorsInfo);
-            this.CalcInfos();
         }
         else
             this.InitInfos();