From ea3ca04c2a1f5c848adf995bceed47f77df9183c Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Fri, 26 May 2023 16:10:53 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E7=9A=84=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=AF=B9=E8=B1=A1=E5=A2=9E=E5=8A=A0=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1026442 --user=王孝刚 【系统设置】-操作日志筛选条件中操作对象的筛选控件没有配置条件清空按钮
https://www.tapd.cn/55049933/s/1376250
---
 project-management/frontend/src/business/menu/log/Log.vue    | 5 ++++-
 .../frontend/src/business/system/log/OperatingLog.vue        | 3 +++
 .../frontend/src/business/workspace/log/OperatingLog.vue     | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/project-management/frontend/src/business/menu/log/Log.vue b/project-management/frontend/src/business/menu/log/Log.vue
index 2a9e141000..92a7377180 100644
--- a/project-management/frontend/src/business/menu/log/Log.vue
+++ b/project-management/frontend/src/business/menu/log/Log.vue
@@ -64,7 +64,8 @@
                                    :placeholder="$t('operating_log.object')"
                                    :props="props"
                                    class="ms-case"
-                                   @change="initTableData" ref="cascade"/>
+                                   clearable
+                                   @change="initTableData(condition.operModules)" ref="cascade"/>
                     </el-form-item>
                   </el-col>
 
@@ -292,6 +293,8 @@ export default {
     initTableData() {
       if (this.condition.operModules && this.condition.operModules.length > 0) {
         this.condition.operModule = this.condition.operModules[1];
+      } else {
+        this.condition.operModule = undefined;
       }
       this.condition.projectIds = [getCurrentProjectID()];
       this.condition.projectId = getCurrentProjectID();
diff --git a/system-setting/frontend/src/business/system/log/OperatingLog.vue b/system-setting/frontend/src/business/system/log/OperatingLog.vue
index 575be9d1c5..051f0d9d16 100644
--- a/system-setting/frontend/src/business/system/log/OperatingLog.vue
+++ b/system-setting/frontend/src/business/system/log/OperatingLog.vue
@@ -85,6 +85,7 @@
                                :placeholder="$t('operating_log.object')"
                                :props="props"
                                class="ms-case"
+                               clearable
                                @change="initTableData" ref="cascade" style="width: 95%"/>
                 </el-form-item>
               </el-col>
@@ -316,6 +317,8 @@ export default {
     initTableData() {
       if (this.condition.operModules && this.condition.operModules.length > 0) {
         this.condition.operModule = this.condition.operModules[1];
+      } else {
+        this.condition.operModule = undefined;
       }
       if (this.isSystem) {
         this.condition.projectIds = [];
diff --git a/system-setting/frontend/src/business/workspace/log/OperatingLog.vue b/system-setting/frontend/src/business/workspace/log/OperatingLog.vue
index 66eea5951e..b60eb4045d 100644
--- a/system-setting/frontend/src/business/workspace/log/OperatingLog.vue
+++ b/system-setting/frontend/src/business/workspace/log/OperatingLog.vue
@@ -85,6 +85,7 @@
                                :placeholder="$t('operating_log.object')"
                                :props="props"
                                class="ms-case"
+                               clearable
                                @change="initTableData" ref="cascade" style="width: 95%"/>
                 </el-form-item>
               </el-col>
@@ -315,6 +316,8 @@ export default {
     initTableData() {
       if (this.condition.operModules && this.condition.operModules.length > 0) {
         this.condition.operModule = this.condition.operModules[1];
+      } else {
+        this.condition.operModule = undefined;
       }
       if (this.isSystem) {
         this.condition.projectIds = [];