From 970863f07f134faf536b14065c9ed9c41a3b5fcd Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 30 Jul 2024 11:55:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E9=80=89=E6=8B=A9=E6=97=B6=E5=A6=82=E6=9E=9C=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E7=BB=84=E7=BB=87=E5=88=99=E7=A6=81=E6=AD=A2=E9=80=89?= =?UTF-8?q?=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../editor/dataset-select/DatasetSelect.vue | 33 +++++++++++++++++-- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue index 119ae966ba..fc64608a80 100644 --- a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue +++ b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue @@ -8,6 +8,11 @@ import _ from 'lodash' import { getDatasetTree, getDatasourceList } from '@/api/dataset' import { ElFormItem, FormInstance } from 'element-plus-secondary' import { useEmitt } from '@/hooks/web/useEmitt' +import { useCache } from '@/hooks/web/useCache' +import { useUserStoreWithOut } from '@/store/modules/user' + +const { wsCache } = useCache('localStorage') +const userStore = useUserStoreWithOut() const props = withDefaults( defineProps<{ @@ -28,6 +33,8 @@ const datasetSelector = ref(null) const loadingDatasetTree = ref(false) +const orgCheck = ref(true) + const datasetTree = ref([]) const toolTip = computed(() => { return props.themes === 'dark' ? 'ndark' : 'dark' @@ -82,11 +89,17 @@ watch(searchStr, val => { }) const showTree = computed(() => { - return datasetTree.value && datasetTree.value.length > 0 && !loadingDatasetTree.value + return ( + datasetTree.value && datasetTree.value.length > 0 && !loadingDatasetTree.value && orgCheck.value + ) +}) + +const emptyMsg = computed(() => { + return orgCheck.value ? '暂无' + sourceName.value : '已切换至新组织,无权访问其他组织的资源' }) const showEmptyInfo = computed(() => { - return !showTree.value && !loadingDatasetTree.value + return !showTree.value && !loadingDatasetTree.value && !orgCheck.value }) const computedTree = computed(() => { @@ -187,6 +200,18 @@ function onPopoverHide() { function getNode(nodeId: number) { return datasetSelector?.value?.getNode(nodeId) } +const handleFocus = () => { + if ( + props.sourceType === 'dataset' && + userStore.getOid && + wsCache.get('user.oid') && + userStore.getOid !== wsCache.get('user.oid') + ) { + orgCheck.value = false + } else { + orgCheck.value = true + } +} defineExpose({ getNode }) const appStore = useAppStoreWithOut() @@ -223,6 +248,7 @@ onMounted(() => { v-model="selectedNodeName" readonly class="data-set-dark" + @focus="handleFocus" :placeholder="'请选择' + sourceName" >