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" />