From 99a55f28623d9344af744aa3fe98aeca3b339703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=A5=E6=B5=B7?= <wang@rehiy.com>
Date: Wed, 20 Mar 2024 12:09:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8C=87=E4=BB=A4=E7=BA=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wclient/robot/handler.go             |  3 ++
 webview/src/apps/keyword/create.html | 64 +++++++++++++++-------------
 webview/src/apps/keyword/create.ts   |  5 +++
 webview/src/apps/keyword/update.html | 64 +++++++++++++++-------------
 webview/src/apps/keyword/update.ts   |  5 +++
 5 files changed, 81 insertions(+), 60 deletions(-)

diff --git a/wclient/robot/handler.go b/wclient/robot/handler.go
index 843dfdc..5dcca88 100644
--- a/wclient/robot/handler.go
+++ b/wclient/robot/handler.go
@@ -68,6 +68,9 @@ func ResetHandlers() {
 		for _, v := range kws {
 			if hmap[v.Target] != nil {
 				hmap[v.Phrase+"@"+v.Roomid] = hmap[v.Target]
+				if v.Roomid == "*" {
+					hmap[v.Target].Level = v.Level
+				}
 			}
 		}
 	}
diff --git a/webview/src/apps/keyword/create.html b/webview/src/apps/keyword/create.html
index 26ef059..95fa75f 100644
--- a/webview/src/apps/keyword/create.html
+++ b/webview/src/apps/keyword/create.html
@@ -18,8 +18,8 @@
             </div>
         </div>
         <div class="col-12">
-            <label class="form-label">分组</label>
-            <select name="group" class="form-select" [(ngModel)]="formdata.group">
+            <label class="form-label">分组 *</label>
+            <select name="group" class="form-select" [(ngModel)]="formdata.group" required >
                 @for (item of keywordGroups | keyvalue; track item.key) {
                 <option [value]="item.key">{{item.value.name}}</option>
                 }
@@ -28,31 +28,6 @@
                 关键词分组，标记短语的作用
             </div>
         </div>
-        @if (formdata.group == 'badword') {
-        <div class="col-12">
-            <label class="form-label">级别</label>
-            <select name="level" class="form-select" [(ngModel)]="formdata.level">
-                @for (item of badwordLevels | keyvalue; track item.key) {
-                <option [value]="item.key">{{item.value.name}}</option>
-                }
-            </select>
-            <div class="form-text">
-                用于违规积分累计，当前计 {{formdata.level}} 分
-            </div>
-        </div>
-        } @else {
-        <div class="col-12">
-            <label class="form-label">级别</label>
-            <select name="level" class="form-select" [(ngModel)]="formdata.level">
-                @for (item of userLevels | keyvalue; track item.key) {
-                <option [value]="item.key">{{item.value.name}}</option>
-                }
-            </select>
-            <div class="form-text">
-                用于限制指令使用权限，对指令别名无效
-            </div>
-        </div>
-        }
         <div class="col-12">
             <label class="form-label">场景 *</label>
             <select name="roomid" class="form-select" [(ngModel)]="formdata.roomid" required>
@@ -69,7 +44,7 @@
         </div>
         @if (formdata.group == 'command') {
         <div class="col-12">
-            <label class="form-label">命令</label>
+            <label class="form-label">命令 *</label>
             <textarea name="target" class="form-control" rows="3" [(ngModel)]="formdata.target" required></textarea>
             <div class="form-text">
                 填写可执行程序的绝对路径及参数，如：<i>node.exe D:\wrest\app.js</i><br />
@@ -79,8 +54,8 @@
         }
         @if (formdata.group == 'handler') {
         <div class="col-12">
-            <label class="form-label">指令</label>
-            <select name="target" class="form-select" [(ngModel)]="formdata.target">
+            <label class="form-label">指令 *</label>
+            <select name="target" class="form-select" [(ngModel)]="formdata.target" (change)="changeHandler()" required>
                 @for (item of robotHandler; track item.command) {
                 <option [value]="item.command">{{item.command}} {{item.describe}}</option>
                 }
@@ -90,6 +65,35 @@
             </div>
         </div>
         }
+        @if (formdata.group == 'badword') {
+        <div class="col-12">
+            <label class="form-label">级别 *</label>
+            <select name="level" class="form-select" [(ngModel)]="formdata.level" required>
+                @for (item of badwordLevels | keyvalue; track item.key) {
+                <option [value]="item.key">{{item.value.name}}</option>
+                }
+            </select>
+            <div class="form-text">
+                用于违规积分累计，当前计 {{formdata.level}} 分
+            </div>
+        </div>
+        } @else {
+        <div class="col-12">
+            <label class="form-label">级别 *</label>
+            <select name="level" class="form-select" [(ngModel)]="formdata.level" required>
+                @for (item of userLevels | keyvalue; track item.key) {
+                <option [value]="item.key">{{item.value.name}}</option>
+                }
+            </select>
+            <div class="form-text">
+                @if (formdata.group == 'handler') {
+                全局别名级别设置将重写原指令级别，其他场景则忽略
+                } @else {
+                用于限制外部指令的使用权限
+                }
+            </div>
+        </div>
+        }
         <div class="col-12">
             <label class="form-label">备注</label>
             <input type="text" name="remark" class="form-control" [(ngModel)]="formdata.remark" />
diff --git a/webview/src/apps/keyword/create.ts b/webview/src/apps/keyword/create.ts
index ed8a2d2..d4b2a1d 100644
--- a/webview/src/apps/keyword/create.ts
+++ b/webview/src/apps/keyword/create.ts
@@ -43,6 +43,11 @@ export class KeywordCreateComponent {
         });
     }
 
+    public changeHandler() {
+        const h = this.robotHandler.find((h) => h.command === this.formdata.target);
+        this.formdata.level = h ? h.level : -1;
+    }
+
     public getRobotHandlers() {
         return SundryApi.handlerList({}).then((data) => {
             this.robotHandler = data || [];
diff --git a/webview/src/apps/keyword/update.html b/webview/src/apps/keyword/update.html
index e75d310..9214f97 100644
--- a/webview/src/apps/keyword/update.html
+++ b/webview/src/apps/keyword/update.html
@@ -18,8 +18,8 @@
             </div>
         </div>
         <div class="col-12">
-            <label class="form-label">分组</label>
-            <select name="group" class="form-select" [(ngModel)]="formdata.group">
+            <label class="form-label">分组 *</label>
+            <select name="group" class="form-select" [(ngModel)]="formdata.group" required >
                 @for (item of keywordGroups | keyvalue; track item.key) {
                 <option [value]="item.key">{{item.value.name}}</option>
                 }
@@ -28,31 +28,6 @@
                 关键词分组，标记短语的作用
             </div>
         </div>
-        @if (formdata.group == 'badword') {
-        <div class="col-12">
-            <label class="form-label">级别</label>
-            <select name="level" class="form-select" [(ngModel)]="formdata.level">
-                @for (item of badwordLevels | keyvalue; track item.key) {
-                <option [value]="item.key">{{item.value.name}}</option>
-                }
-            </select>
-            <div class="form-text">
-                用于违规积分累计，当前计 {{formdata.level}} 分
-            </div>
-        </div>
-        } @else {
-        <div class="col-12">
-            <label class="form-label">级别</label>
-            <select name="level" class="form-select" [(ngModel)]="formdata.level">
-                @for (item of userLevels | keyvalue; track item.key) {
-                <option [value]="item.key">{{item.value.name}}</option>
-                }
-            </select>
-            <div class="form-text">
-                用于限制指令使用权限，对指令别名无效
-            </div>
-        </div>
-        }
         <div class="col-12">
             <label class="form-label">场景 *</label>
             <select name="roomid" class="form-select" [(ngModel)]="formdata.roomid" required>
@@ -69,7 +44,7 @@
         </div>
         @if (formdata.group == 'command') {
         <div class="col-12">
-            <label class="form-label">命令</label>
+            <label class="form-label">命令 *</label>
             <textarea name="target" class="form-control" rows="3" [(ngModel)]="formdata.target" required></textarea>
             <div class="form-text">
                 填写可执行程序的绝对路径及参数，如：<i>node.exe D:\wrest\app.js</i><br />
@@ -79,8 +54,8 @@
         }
         @if (formdata.group == 'handler') {
         <div class="col-12">
-            <label class="form-label">指令</label>
-            <select name="target" class="form-select" [(ngModel)]="formdata.target">
+            <label class="form-label">指令 *</label>
+            <select name="target" class="form-select" [(ngModel)]="formdata.target" (change)="changeHandler()" required>
                 @for (item of robotHandler; track item.command) {
                 <option [value]="item.command">{{item.command}} {{item.describe}}</option>
                 }
@@ -90,6 +65,35 @@
             </div>
         </div>
         }
+        @if (formdata.group == 'badword') {
+        <div class="col-12">
+            <label class="form-label">级别 *</label>
+            <select name="level" class="form-select" [(ngModel)]="formdata.level" required>
+                @for (item of badwordLevels | keyvalue; track item.key) {
+                <option [value]="item.key">{{item.value.name}}</option>
+                }
+            </select>
+            <div class="form-text">
+                用于违规积分累计，当前计 {{formdata.level}} 分
+            </div>
+        </div>
+        } @else {
+        <div class="col-12">
+            <label class="form-label">级别 *</label>
+            <select name="level" class="form-select" [(ngModel)]="formdata.level" required>
+                @for (item of userLevels | keyvalue; track item.key) {
+                <option [value]="item.key">{{item.value.name}}</option>
+                }
+            </select>
+            <div class="form-text">
+                @if (formdata.group == 'handler') {
+                全局别名级别设置将重写原指令级别，其他场景则忽略
+                } @else {
+                用于限制外部指令的使用权限
+                }
+            </div>
+        </div>
+        }
         <div class="col-12">
             <label class="form-label">备注</label>
             <input type="text" name="remark" class="form-control" [(ngModel)]="formdata.remark" />
diff --git a/webview/src/apps/keyword/update.ts b/webview/src/apps/keyword/update.ts
index df47a45..9ef6daf 100644
--- a/webview/src/apps/keyword/update.ts
+++ b/webview/src/apps/keyword/update.ts
@@ -51,6 +51,11 @@ export class KeywordUpdateComponent implements OnInit {
         });
     }
 
+    public changeHandler() {
+        const h = this.robotHandler.find((h) => h.command === this.formdata.target);
+        this.formdata.level = h ? h.level : -1;
+    }
+
     public getRobotHandlers() {
         return SundryApi.handlerList({}).then((data) => {
             this.robotHandler = data || [];