修正bug

ChayCai · Mar 11, 2022 · 47ecbf9 · 47ecbf9
1 parent 5b9625d
commit 47ecbf9
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,11 @@
 | --------------------|--------| --------------------------|-------------------------------|
 | Windows             |  x64   | [.exe][rl-windows_112]    |  [.7z][rl-pkg-windows_112]    |
 | macOS 10.15         |  x64   | [.dmg][rl-macos_112]      |  [.7z][rl-pkg-macos_112]      |
+<<<<<<< HEAD
 | Ubuntu 20.04        |  x64   | [.deb][rl-ubuntu_112]     |  [.7z][rl-pkg-ubuntu_112]     |
+=======
+| Ubuntu 20.04        |  x64   | [.deb][rl-ubuntu_112]    |   [.7z][rl-pkg-ubuntu_112]    |
+>>>>>>> cd827d4254923b34880933963740d50f3f105d5d
 
 [rl-windows_112]: https://github.com/Hi2129/Wonton_master/releases/download/v1.1.2/Wonton-1.1.2-win-setup.exe
 [rl-pkg-windows_112]: https://github.com/Hi2129/Wonton_master/releases/download/v1.1.2/Wonton-1.1.2-win-x64.7z
@@ -49,7 +53,10 @@
 [rl-ubuntu_112]: https://github.com/Hi2129/Wonton_master/releases/download/v1.1.2/Wonton-1.1.2-linux-amd64.deb
 [rl-pkg-ubuntu_112]: https://github.com/Hi2129/Wonton_master/releases/download/v1.1.2/Wonton-1.1.2-linux-x64.7z
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> cd827d4254923b34880933963740d50f3f105d5d
 
 你可以为以下任意一个平台下载 Wonton1.1.1 安装包
 
@@ -226,4 +233,4 @@
     </tr>
 </table>
 
-<!-- https://api.github.com/repos/WangyuHello/Wonton/contributors?page=1&per_page=100 -->
+<!-- https://api.github.com/repos/WangyuHello/Wonton/contributors?page=1&per_page=100 -->
diff --git a/Wonton.CrossUI.Web/ClientApp/src/components/MainPanel/MainPanel.js b/Wonton.CrossUI.Web/ClientApp/src/components/MainPanel/MainPanel.js
@@ -27,10 +27,16 @@ export class MainPanel extends PureComponent {
 
     componentWillReceiveProps(nextProps) {
         let data = nextProps.panelData;
+        let counts = [];
+        let maxCount;
+        for (var ins in data.layout) {
+            counts.push(data.layout[ins].i.slice(1,));
+        }
+        maxCount = Math.max(...counts);
         if (data != null && this.state.layout == null) {
             this.setState({
                 layout: data.layout,
-                instanceCounter: data.layout.length
+                instanceCounter: maxCount
             }, () => {
                 this.layoutChangeFlag = true;
                 // console.log("state callback2")

diff --git a/Wonton.CrossUI.Web/ClientApp/src/components/Title.js b/Wonton.CrossUI.Web/ClientApp/src/components/Title.js
@@ -24,6 +24,7 @@ export class Title extends Component {
         isFileModalOpen: false,
         isNewModalOpen: false,
         isOpenModalOpen: false,
+        isWarnModalOpen: false,
         isMaximized: false,
         isSettingDropdownOpen: false,
         titlePjName: '',
@@ -165,7 +166,9 @@ export class Title extends Component {
     }
 
     FreqChange = (event) => {
-        this.setState({runHz: event.target.value});
+        if (!this.state.isRunning) {
+            this.setState({ runHz: event.target.value });
+        }
     }
 
     ClickRun = async () => {
@@ -237,7 +240,13 @@ export class Title extends Component {
     }
 
     ClickProgram = async () => {
-        await manager.Program(this.state.bitfile);
+        if (!this.state.isRunning) {
+            await manager.Program(this.state.bitfile);
+        } else {
+            this.setState({
+                isWarnModalOpen: true,
+            });
+        }
     }
 
     ClickProgrammToggle = () => {
@@ -268,11 +277,17 @@ export class Title extends Component {
     }
 
     NewPjToggle = (event) => {
-        this.setState((prevState) => {
-            return {
-                isNewModalOpen: !prevState.isNewModalOpen
-            }
-        })
+        if (!this.state.isRunning) {
+            this.setState((prevState) => {
+                return {
+                    isNewModalOpen: !prevState.isNewModalOpen
+                }
+            })
+        } else {
+            this.setState({
+                isWarnModalOpen: true,
+            });
+        }
     }
 
     NewPj = async (event) => {
@@ -335,17 +350,22 @@ export class Title extends Component {
     }
 
     OpenPjToggle = async (event) => {
+        if (!this.state.isRunning) {
+            if (isElectron()) {
+                ipcRenderer.send('open-project-file');
+            } else {
+                await this.onOpenProjectCallback({}, "F:\\Repo\\Wonton\\Wonton.Test\\haha4.hwproj")
+            }
+        } else {
+            this.setState({
+                isWarnModalOpen: true,
+            });
+        }
         // this.setState((prevState) => {
         //     return {
         //         isOpenModalOpen: !prevState.isOpenModalOpen
         //     }
         // })
-        if (isElectron()) {
-            ipcRenderer.send('open-project-file');
-        } else {
-            await this.onOpenProjectCallback({}, "F:\\Repo\\Wonton\\Wonton.Test\\haha4.hwproj")
-        }
-
     }
 
     // Open = (event) => {
@@ -435,10 +455,18 @@ export class Title extends Component {
         shell.openExternal("https://github.com/Hi2129/Wonton_master");
     }
 
+    CloseWarn = () => {
+        this.setState({
+            isWarnModalOpen: false,
+        });
+    }
+
     CloseApp = () => {
         if (this.state.isRunning)
         {
-
+            this.setState({
+                isWarnModalOpen: true,
+            });
         }
         else if (this.state.modified) {
             ipcRenderer.send('show-unsave-prompt');
@@ -467,7 +495,8 @@ export class Title extends Component {
                     <ModalBody>
                         <Start onOpen={this.OpenPjToggle} onNew={this.NewPjToggle} recentProjects={this.state.recentProjects}></Start>
                     </ModalBody>
-                </Modal>
+                    </Modal>
+
 
                 <div className="myTitle">
                     <div style={{ display: 'flex', alignItems: 'top', marginLeft: titleLeftMargin, marginTop: '8px'}}>
@@ -527,6 +556,9 @@ export class Title extends Component {
                                 <Button color="secondary" onClick={this.OpenPjToggle}>关闭</Button>
                             </ModalFooter>
                         </Modal> */}
+                        <Modal isOpen={this.state.isWarnModalOpen} toggle={this.CloseWarn}>
+                            <ModalBody>Warning: 请先停止当前项目运行</ModalBody>
+                        </Modal>
                         <Modal isOpen={this.state.isNewModalOpen} toggle={this.NewPjToggle} className="SquareModal" >
                             <ModalHeader >新建工程</ModalHeader>
                             <ModalBody>