From 781a821ac16a21c58eb2948136e84bb43eeaf624 Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Mon, 22 Aug 2022 09:30:42 +0800
Subject: [PATCH] * Fix issue

---
 internal/pkg/helper/exec/ztf.go            | 4 +++-
 ui/src/locales/en-US.ts                    | 1 +
 ui/src/locales/zh-CN.ts                    | 1 +
 ui/src/views/script/FilterModal.vue        | 2 +-
 ui/src/views/script/FormSyncFromZentao.vue | 1 +
 ui/src/views/script/WorkDirPanel.vue       | 1 +
 ui/src/views/site/FormSite.vue             | 1 +
 ui/src/views/workspace/FormWorkspace.vue   | 1 +
 8 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/internal/pkg/helper/exec/ztf.go b/internal/pkg/helper/exec/ztf.go
index 6bab1ca2..0e3b9053 100644
--- a/internal/pkg/helper/exec/ztf.go
+++ b/internal/pkg/helper/exec/ztf.go
@@ -179,7 +179,9 @@ func FilterCases(cases []string, conf commDomain.WorkspaceConf) (casesToRun, cas
 			interpreter := configHelper.GetFieldVal(conf, stringUtils.UcFirst(lang))
 			if interpreter == "-" || interpreter == "" {
 				interpreter = ""
-				casesToIgnore = append(casesToIgnore, cs)
+				if lang != "bat" {
+					casesToIgnore = append(casesToIgnore, cs)
+				}
 			}
 			if lang != "bat" && interpreter == "" { // ignore the ones with no interpreter set
 				continue
diff --git a/ui/src/locales/en-US.ts b/ui/src/locales/en-US.ts
index b9b49a67..a0e38a8a 100644
--- a/ui/src/locales/en-US.ts
+++ b/ui/src/locales/en-US.ts
@@ -90,6 +90,7 @@ export default {
     'execution.execTask': 'Execute By Task',
     'execution.execUnit': 'Execute UnitTest',
     'workspace': 'Work Dir',
+    'filter': 'Filter',
     'dir': 'Dir',
     'create_workspace': 'Create WorkDir',
     'edit_workspace': 'Edit WorkDir',
diff --git a/ui/src/locales/zh-CN.ts b/ui/src/locales/zh-CN.ts
index b908f153..daeb96e1 100644
--- a/ui/src/locales/zh-CN.ts
+++ b/ui/src/locales/zh-CN.ts
@@ -98,6 +98,7 @@ export default {
     'execution.execTask': '执行任务',
     'execution.execUnit': '执行单元测试',
     'workspace': '工作目录',
+    'filter': '筛选',
     'dir': '目录',
     'create_workspace': '新建工作目录',
     'edit_workspace': '编辑工作目录',
diff --git a/ui/src/views/script/FilterModal.vue b/ui/src/views/script/FilterModal.vue
index db899dbd..4ae8f5b3 100644
--- a/ui/src/views/script/FilterModal.vue
+++ b/ui/src/views/script/FilterModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="popper layer rounded" :style="menuFinalStyle" ref="menuRef">
+  <div class="popper layer rounded" :style="menuFinalStyle" ref="menuRef" id="filterModal">
     <template v-if="state.show">
       <div class="tab-group">
         <div
diff --git a/ui/src/views/script/FormSyncFromZentao.vue b/ui/src/views/script/FormSyncFromZentao.vue
index 260e027e..99eb2a99 100644
--- a/ui/src/views/script/FormSyncFromZentao.vue
+++ b/ui/src/views/script/FormSyncFromZentao.vue
@@ -1,5 +1,6 @@
 <template>
   <ZModal
+    id="syncFromZentaoFormModal"
     :showModal="showModalRef"
     @onCancel="cancel"
     @onOk="submit"
diff --git a/ui/src/views/script/WorkDirPanel.vue b/ui/src/views/script/WorkDirPanel.vue
index 261ca416..08add1b0 100644
--- a/ui/src/views/script/WorkDirPanel.vue
+++ b/ui/src/views/script/WorkDirPanel.vue
@@ -34,6 +34,7 @@
       </FilterModal>
       <Button
       id="filterBtn"
+      :hint="t('filter')"
       class="filter-btn"
       :label="filerLabel"
       v-show="currSite.id != 1"
diff --git a/ui/src/views/site/FormSite.vue b/ui/src/views/site/FormSite.vue
index 8faf10bf..c25bdea5 100644
--- a/ui/src/views/site/FormSite.vue
+++ b/ui/src/views/site/FormSite.vue
@@ -1,5 +1,6 @@
 <template>
   <ZModal
+    id="siteFormModal"
     :showModal="showModalRef"
     @onCancel="cancel"
     @onOk="submit"
diff --git a/ui/src/views/workspace/FormWorkspace.vue b/ui/src/views/workspace/FormWorkspace.vue
index cb9f80d3..c72c335e 100644
--- a/ui/src/views/workspace/FormWorkspace.vue
+++ b/ui/src/views/workspace/FormWorkspace.vue
@@ -1,5 +1,6 @@
 <template>
   <ZModal
+     id="workspaceFormModal"
     :showModal="showModalRef"
     @onCancel="cancel"
     @onOk="submit"
-- 
GitLab