test.html fixing...

Marty · Marty · commit 113761be6cea · 2024-11-04T16:59:59.000+08:00
diff --git a/prod/coms/wa-run-python.js b/prod/coms/wa-run-python.js
@@ -50,10 +50,16 @@ export class RunPython extends LitElement {
 
   async runPythonCode(code) {
     try {
-      var self = this;
       window.mqtt = MQTTAppV2;
       mqtt.disconnectAll();
-      await this.pyodide.runPythonAsync(code);
+
+      let lines = code.split('\n');
+      for (let line of lines) {
+        line = line.trim();
+        if (line) {
+          await this.pyodide.runPythonAsync(line);
+        }
+      }
       return null;
     } catch (err) {
       if (this.pyodide && err.constructor.name === 'PythonError') {
@@ -76,26 +82,35 @@ export class RunPython extends LitElement {
     this.run = run;
 
     function stdout_func(msg) {
-      output.show(msg);
+      output.show(msg + "\n");
       output.scrollBottom();
     }
 
     function stderr_func(msg) {
-      output.show(msg);
+      output.show(msg + "\n");
       output.scrollBottom();
     }
 
     function stdin_func() {
-      var rtn = prompt("Python input() 请输入:") || "";
-      console.log("rtn:", rtn);
+      var rtn = prompt("请输入：") || "";
       return rtn;
     }
 
     run.addEventListener("click", async function () {
       output.cls();
       var newCode = editor.getCode();
-      //await self.runPythonCode(newCode);
-      await pyodide.runPythonAsync(newCode);
+      
+      await self.pyodide.runPython(`
+        import sys
+        from js import prompt
+        
+        def custom_input(*args):
+            return prompt("请输入：")
+            
+        input = custom_input
+      `);
+      
+      await self.runPythonCode(newCode);
     });
 
     let pyodide;
@@ -105,13 +120,12 @@ export class RunPython extends LitElement {
       stdout: stdout_func,
       stderr: stderr_func,
     });
+    
     run.style["color"] = "#eee";
     icon.style["fill"] = "#eee";
 
     this.pyodide = pyodide;
     this.output = output;
-    // Pyodide is now ready to use...
-    // console.log("pyodide ready !");
     run.removeAttribute("disabled");
   }
 
diff --git a/test.html b/test.html
@@ -36,7 +36,38 @@
 </head>
 <body>
     <h1>Pyodide Python 執行器</h1>
-    <textarea id="python-code" placeholder="在此輸入您的 Python 程式碼，例如：&#10;print('Hello, Pyodide!')">print(input())</textarea>
+    <textarea id="python-code" placeholder="在此輸入您的 Python 程式碼，例如：&#10;print('Hello, Pyodide!')">
+import random
+def guess_number_game():
+    while True:
+        # 顯示遊戲開始的提示
+        print("遊戲開始，請從1到50中，隨意輸入一個數字。")
+        
+        # 隨機生成1到50的數字
+        correct_number = random.randint(1, 50)
+        
+        while True:
+            # 玩家輸入數字
+            player_guess = int(input("請輸入你的猜測: "))
+            
+            # 比較玩家的猜測與正確答案
+            if player_guess > correct_number:
+                print("再小一點")
+            elif player_guess < correct_number:
+                print("再大一點")
+            else:
+                print("恭喜你答對")
+                break  # 猜對了，跳出內部迴圈
+        
+        # 詢問玩家是否要繼續遊戲
+        continue_game = input("是否要繼續遊戲? (是/否): ")
+        if continue_game.lower() != '是':
+            print("感謝遊玩，遊戲結束！")
+            break  # 結束遊戲
+# 開始遊戲
+guess_number_game()
+        
+        </textarea>
     <br>
     <button id="run-button">執行程式碼</button>
     <h2>輸出結果：</h2>
@@ -48,25 +79,37 @@ <h2>輸出結果：</h2>
         let pyodideReadyPromise = loadPyodide();
 
         async function runPython() {
-            // 等待 Pyodide 加載完成
             let pyodide = await pyodideReadyPromise;
             let code = document.getElementById("python-code").value;
             let outputElement = document.getElementById("output");
             outputElement.textContent = "";
 
-            // 捕捉 Python 的標準輸出
+            // 修改输出处理，添加换行符
+            let printOutput = (text) => {
+                outputElement.textContent += text + "\n";  // 在每次输出后添加换行符
+                outputElement.scrollTop = outputElement.scrollHeight;
+            };
+
             pyodide.setStdout({
-                batched: (text) => {
-                    outputElement.textContent += text;
-                }
+                batched: printOutput
             });
             pyodide.setStderr({
-                batched: (text) => {
-                    outputElement.textContent += text;
-                }
+                batched: printOutput
             });
 
+            // 实现交互式输入
+            pyodide.runPython(`
+                import sys
+                from js import prompt
+                
+                def custom_input(*args):
+                    return prompt("请输入：")
+                    
+                input = custom_input
+            `);
+
             try {
+                // 修改执行代码逻辑，直接执行整个代码块
                 await pyodide.runPythonAsync(code);
             } catch (err) {
                 outputElement.textContent += err;
