更新为使用byte[]

Author: j4587698

src/components/BootstrapBlazor.Term/Components/Term/Term.razor.cs

@@ -27,7 +27,7 @@ public partial class Term
     /// 获得/设置 收到数据回调
     /// </summary>
     [Parameter]
-    public Func<string, Task>? OnData { get; set; }
+    public Func<byte[], Task>? OnData { get; set; }
 
     /// <summary>
     /// 获得/设置 终端 Resize 回调
@@ -132,7 +132,8 @@ private async Task ReadStreamAsync()
             {
                 var read = await _stream.ReadAsync(buffer, _cancellationTokenSource.Token);
                 if (read == 0) break;
-                var data = System.Text.Encoding.UTF8.GetString(buffer, 0, read);
+                var data = new byte[read];
+                Array.Copy(buffer, data, read);
                 await Write(data);
             }
         }
@@ -147,18 +148,27 @@ private async Task ReadStreamAsync()
         }
     }
 
+    /// <summary>
+    /// 写入数据 (Byte[])
+    /// </summary>
+    /// <param name="data"></param>
+    /// <returns></returns>
+    public async Task Write(byte[] data)
+    {
+        await InvokeVoidAsync("write", Id, data);
+    }
+
     /// <summary>
     /// 收到数据 JSInvoke
     /// </summary>
     /// <param name="data"></param>
     /// <returns></returns>
     [JSInvokable]
-    public async Task OnDataAsync(string data)
+    public async Task OnDataAsync(byte[] data)
     {
         if (_stream != null && _stream.CanWrite)
         {
-            var buffer = System.Text.Encoding.UTF8.GetBytes(data);
-            await _stream.WriteAsync(buffer);
+            await _stream.WriteAsync(data);
             await _stream.FlushAsync();
         }
 
@@ -180,12 +190,12 @@ protected override async ValueTask DisposeAsync(bool disposing)
     }
 
     /// <summary>
-    /// 获得/设置 终端行数
+    /// 获得 终端行数
     /// </summary>
     public int Rows { get; private set; }
 
     /// <summary>
-    /// 获得/设置 终端列数
+    /// 获得 终端列数
     /// </summary>
     public int Columns { get; private set; }
 

src/components/BootstrapBlazor.Term/Components/Term/Term.razor.js

@@ -22,7 +22,8 @@ export function init(id, invoke, options) {
         fontSize: options.fontSize || 14,
         cursorBlink: options.cursorBlink,
         lineHeight: options.lineHeight || 1.0,
-        theme: options.theme || {}
+        theme: options.theme || {},
+        convertEol: options.convertEol
     });
 
     const fitAddon = new FitAddon.FitAddon();
@@ -31,8 +32,9 @@ export function init(id, invoke, options) {
     term.open(el);
     fitAddon.fit();
 
+    const encoder = new TextEncoder();
     term.onData(data => {
-        invoke.invokeMethodAsync("OnDataAsync", data);
+        invoke.invokeMethodAsync("OnDataAsync", encoder.encode(data));
     });
 
     term.onResize(size => {
@@ -50,7 +52,7 @@ export function init(id, invoke, options) {
             fitAddon.fit();
             const dims = fitAddon.proposeDimensions();
             if (dims) {
-               invoke.invokeMethodAsync("OnResizeAsync", dims.rows, dims.cols);
+                invoke.invokeMethodAsync("OnResizeAsync", dims.rows, dims.cols);
             }
         } catch (e) { }
     };

src/components/BootstrapBlazor.Term/Components/Term/TermOptions.cs

@@ -33,6 +33,11 @@ public class TermOptions
     /// 获得/设置 行高 默认 1.0
     /// </summary>
     public double LineHeight { get; set; } = 1.0;
+
+    /// <summary>
+    /// 获得/设置 是否将 \n 转换为 \r\n 默认 false
+    /// </summary>
+    public bool ConvertEol { get; set; }
 }
 
 /// <summary>