From 1c5a56a9a59485f7a69899a59361770aada71033 Mon Sep 17 00:00:00 2001
From: fofolee <fofolee@qq.com>
Date: Sat, 1 Jan 2022 10:58:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/qccommands.js | 4 ++--
 src/assets/js/qcfeatures.js | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/assets/js/qccommands.js b/src/assets/js/qccommands.js
index 388a15d..7c30c0f 100644
--- a/src/assets/js/qccommands.js
+++ b/src/assets/js/qccommands.js
@@ -438,7 +438,7 @@ let SaveCurrentCommand = async () => {
             charset = $('#charset').data()
         var cmd = window.editor.getValue();
         if (tags && tags.includes("默认") && !isDev()) return
-        if (type != "window" && !rule) return quickcommand.showMessageBox(`${$('#ruleWord').text().replace("　", "")} 不能留空！`, 'error')
+        if (!rule) return quickcommand.showMessageBox(`${$('#ruleWord').text().replace("　", "")} 不能留空！`, 'error')
         if (!cmdCheck(type, cmd)) return
         if (!code) {
             // 生成唯一code
@@ -884,7 +884,7 @@ let typeCheck = () => {
             $("#ruleWord").html("进&#12288;程");
             $(".var.regex, .var.files").prop("disabled", true)
             $(".var.window").prop("disabled", false)
-            $("#rule").prop("placeholder", '多个窗口进程逗号隔开，留空匹配所有窗口');
+            $("#rule").prop("placeholder", '多个窗口进程逗号隔开');
             break;
         case 'professional':
             $("#ruleWord").html("配&#12288;置");
diff --git a/src/assets/js/qcfeatures.js b/src/assets/js/qcfeatures.js
index 0e48cae..1c825e6 100644
--- a/src/assets/js/qcfeatures.js
+++ b/src/assets/js/qcfeatures.js
@@ -132,9 +132,10 @@ let showCommandByType = features => {
             qcType = `<div class="topchild">正则</div><div><span class="keyword re">${window.htmlEncode(rules, true)}</span></div>`;
         } else if (type == 'window') {
             qcType += `<div class="topchild">窗口</div><div>`
-            if (!rules) {
-                qcType += `<span class="keyword win">所有窗口</span>`
-            } else if (rules.title || rules.class) {
+            // if (!rules) {
+            //     qcType += `<span class="keyword win">所有窗口</span>`
+            // } else if (rules.title || rules.class) {
+            if (rules.title || rules.class) {
                 qcType += `<span class="keyword win">${window.htmlEncode(JSON.stringify(rules).slice(0, 14), true) + '...'}</span>`;
             } else if (rules.app) {
                 rules = rules.app.join(",")