From 98bed41673fb1b7b48ff8cc53fd782137cc33fd0 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Sun, 28 Apr 2024 14:29:19 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=9C=80=E8=BF=91=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB=E5=8F=AF=E4=BB=A5=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/hooks/web/useFilter.ts | 2 +- .../src/layout/components/AiTips.vue | 2 +- .../visualized/data/datasource/index.vue | 10 +++++--- .../src/views/workbranch/ShortcutTable.vue | 25 ++++++++++++++++++- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/core/core-frontend/src/hooks/web/useFilter.ts b/core/core-frontend/src/hooks/web/useFilter.ts index 4116247b81..33f2580726 100644 --- a/core/core-frontend/src/hooks/web/useFilter.ts +++ b/core/core-frontend/src/hooks/web/useFilter.ts @@ -42,7 +42,7 @@ const forMatterValue = ( : getRange(selectValue, timeGranularity) } -const getRange = (selectValue, timeGranularity) => { +export const getRange = (selectValue, timeGranularity) => { switch (timeGranularity) { case 'year': return getYearEnd(selectValue) diff --git a/core/core-frontend/src/layout/components/AiTips.vue b/core/core-frontend/src/layout/components/AiTips.vue index b419cb3723..ef01cf88a1 100644 --- a/core/core-frontend/src/layout/components/AiTips.vue +++ b/core/core-frontend/src/layout/components/AiTips.vue @@ -22,7 +22,7 @@ onMounted(() => {

DataEase 智能客服

- 你好，我是DataEase智能客服
点击一下，开启高效解答模式~
  + 你好，我是 DataEase 智能客服
点击一下，开启高效解答模式~
 

我知道了 diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue index 9e32c34fdd..e1c3e1c681 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/index.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue @@ -13,7 +13,7 @@ import CreatDsGroup from './form/CreatDsGroup.vue' import type { Tree } from '../dataset/form/CreatDsGroup.vue' import { previewData, getById } from '@/api/datasource' import { useI18n } from '@/hooks/web/useI18n' -import { useRouter } from 'vue-router' +import { useRoute, useRouter } from 'vue-router' import DatasetDetail from '@/views/visualized/data/dataset/DatasetDetail.vue' import { timestampFormatDate } from '@/views/visualized/data/dataset/form/util' import EmptyBackground from '@/components/empty-background/src/EmptyBackground.vue' @@ -42,6 +42,7 @@ import { useMoveLine } from '@/hooks/web/useMoveLine' import { cloneDeep } from 'lodash-es' import { interactiveStoreWithOut } from '@/store/modules/interactive' import treeSort from '@/utils/treeSortUtils' +const route = useRoute() const interactiveStore = interactiveStoreWithOut() interface Field { fieldShortName: string @@ -401,6 +402,9 @@ const listDs = () => { if (!!id) { Object.assign(nodeInfo, cloneDeep(defaultInfo)) dfsDatasourceTree(state.datasourceTree, id) + nextTick(() => { + dsListTree.value.setCurrentKey(id, true) + }) } }) } @@ -418,8 +422,6 @@ const dfsDatasourceTree = (ds, id) => { }) } -listDs() - const creatDsFolder = ref() const sortList = [ { @@ -690,6 +692,8 @@ const defaultProps = { label: 'name' } onMounted(() => { + nodeInfo.id = (route.params.id as string) || '' + listDs() const { opt } = router.currentRoute.value.query if (opt && opt === 'create') { datasourceEditor.value.init(null, null) diff --git a/core/core-frontend/src/views/workbranch/ShortcutTable.vue b/core/core-frontend/src/views/workbranch/ShortcutTable.vue index 20afb45742..6c3dc68b8a 100644 --- a/core/core-frontend/src/views/workbranch/ShortcutTable.vue +++ b/core/core-frontend/src/views/workbranch/ShortcutTable.vue @@ -3,7 +3,7 @@ import { useI18n } from '@/hooks/web/useI18n' import { ref, reactive, onMounted, computed } from 'vue' import type { TabsPaneContext } from 'element-plus-secondary' import GridTable from '@/components/grid-table/src/GridTable.vue' -import { useRouter } from 'vue-router' +import { useRoute, useRouter } from 'vue-router' import dayjs from 'dayjs' import { shortcutOption } from './ShortcutOption' /* import { XpackComponent } from '@/components/plugin' */ @@ -13,11 +13,17 @@ import { useCache } from '@/hooks/web/useCache' import { useUserStoreWithOut } from '@/store/modules/user' import ShareGrid from '@/views/share/share/ShareGrid.vue' import ShareHandler from '@/views/share/share/ShareHandler.vue' +import { useAppStoreWithOut } from '@/store/modules/app' +import { useEmbedded } from '@/store/modules/embedded' const userStore = useUserStoreWithOut() const { resolve } = useRouter() const { t } = useI18n() const interactiveStore = interactiveStoreWithOut() const { wsCache } = useCache() +const appStore = useAppStoreWithOut() +const embeddedStore = useEmbedded() +const route = useRoute() +const { push } = useRouter() defineProps({ expand: { type: Boolean, @@ -161,9 +167,26 @@ const handleCellClick = row => { window.open('#/panel/index?dvId=' + row.id, '_self') } else if (['dataV', 'screen'].includes(row.type)) { window.open('#/screen/index?dvId=' + row.id, '_self') + } else if (['dataset'].includes(row.type)) { + const routeName = + embeddedStore.getToken && appStore.getIsIframe ? 'dataset-embedded' : 'dataset' + push({ + name: routeName, + params: { + id: row.id + } + }) + } else if (['datasource'].includes(row.type)) { + push({ + name: 'datasource', + params: { + id: row.id + } + }) } } } + const setLoading = (val: boolean) => { loading.value = val }