From 332c9c0593be6331c2802fe482c29282d2293bb4 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 1 Apr 2024 18:16:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20=E9=A1=B6?=
 =?UTF-8?q?=E9=83=A8=E9=9D=A2=E5=8C=85=E5=B1=91-=E5=B1=82=E7=BA=A7?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E5=B1=95=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v-query/QueryConditionConfiguration.vue      |  3 ++-
 .../src/views/mobile/personal/index.vue          | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index 867ed78df4..6a8884d7e6 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -798,7 +798,8 @@ const relativeToCurrentList = computed(() => {
 })
 
 const dynamicTime = computed(() => {
-  return curComponent.value.timeType === 'dynamic'
+  const { displayType, timeType } = curComponent.value
+  return timeType === 'dynamic' && [1, 7].includes(+displayType)
 })
 
 const relativeToCurrentTypeList = computed(() => {
diff --git a/core/core-frontend/src/views/mobile/personal/index.vue b/core/core-frontend/src/views/mobile/personal/index.vue
index db60c608cc..9bd135346f 100644
--- a/core/core-frontend/src/views/mobile/personal/index.vue
+++ b/core/core-frontend/src/views/mobile/personal/index.vue
@@ -20,7 +20,7 @@ interface OrgTreeNode {
 }
 const userStore = useUserStoreWithOut()
 const { push } = useRouter()
-const navBarTitle = ref('请选择')
+const navBarTitle = ref('组织')
 const name = ref('')
 const showNavBar = ref(true)
 const logout = async () => {
@@ -110,6 +110,13 @@ const onClickLeft = () => {
   }
 }
 
+const clearOrg = () => {
+  if (!directName.value.length) return
+  directName.value = []
+  activeDirectName.value = ''
+  directId.value = []
+}
+
 const orgCellClick = (type, val) => {
   if (type !== 'right') {
     switchHandler(val.id)
@@ -177,6 +184,12 @@ const activeTableData = computed(() => {
         @click-left="onClickLeft"
       />
       <div class="grey">
+        <div @click="clearOrg" class="flex-align-center">
+          <span class="ellipsis" :class="!!directName.length && 'active'">组织</span>
+          <el-icon v-if="!!directName.length">
+            <Icon name="icon_right_outlined"></Icon>
+          </el-icon>
+        </div>
         <div
           @click="handleDir(index)"
           class="flex-align-center"
@@ -188,7 +201,6 @@ const activeTableData = computed(() => {
             <Icon name="icon_right_outlined"></Icon>
           </el-icon>
         </div>
-        <span v-if="!directName.length">请选择组织</span>
       </div>
       <OrgCell
         @click="type => orgCellClick(type, ele)"