From b29b969bb5bc007cf4c0b341e39abd1a7640dcaf Mon Sep 17 00:00:00 2001
From: dataeaseShu
Date: Tue, 18 Jun 2024 10:32:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E5=8F=AF?=
=?UTF-8?q?=E4=BB=A5=E6=AD=A3=E5=B8=B8=E5=88=9B=E5=BB=BAoracle=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E6=BA=90=EF=BC=8C=E4=B8=94=E8=83=BD=E9=A2=84=E8=A7=88?=
=?UTF-8?q?=E8=A1=A8=E5=8F=8A=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BD=86=E5=88=9B?=
=?UTF-8?q?=E5=BB=BA=E6=95=B0=E6=8D=AE=E9=9B=86=E7=9A=84=E6=97=B6=E5=80=99?=
=?UTF-8?q?=E5=B0=B1=E5=B4=A9=E6=BA=83=E4=BA=86=20#9307?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../visualized/data/dataset/form/index.vue | 47 ++++++++++++++++---
1 file changed, 40 insertions(+), 7 deletions(-)
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
index 6c488faf6d..381fce9f60 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@@ -15,10 +15,12 @@ import {
import { useI18n } from '@/hooks/web/useI18n'
import { useEmitt } from '@/hooks/web/useEmitt'
import { ElIcon, ElMessageBox, ElMessage } from 'element-plus-secondary'
+import FixedSizeList from 'element-plus-secondary/es/components/virtual-list/src/components/fixed-size-list.mjs'
import type { Action } from 'element-plus-secondary'
import FieldMore from './FieldMore.vue'
import EmptyBackground from '@/components/empty-background/src/EmptyBackground.vue'
import { Icon } from '@/components/icon-custom'
+import { useWindowSize } from '@vueuse/core'
import CalcFieldEdit from './CalcFieldEdit.vue'
import { useRoute, useRouter } from 'vue-router'
import UnionEdit from './UnionEdit.vue'
@@ -201,6 +203,8 @@ const dfsName = (arr, id) => {
return name
}
+const { height } = useWindowSize()
+
const dfsChild = arr => {
return arr.filter(ele => {
if (ele.leaf) {
@@ -305,7 +309,9 @@ const confirmCustomTime = () => {
}
watch(searchTable, val => {
- state.tableData = tableList.filter(ele => ele.tableName.toLowerCase().includes(val.toLowerCase()))
+ datasourceTableData.value = tableList.filter(ele =>
+ ele.tableName.toLowerCase().includes(val.toLowerCase())
+ )
})
const editeSave = () => {
const union = []
@@ -560,7 +566,7 @@ const dsChange = (val: string) => {
return getTables({ datasourceId: val })
.then(res => {
tableList = res || []
- state.tableData = [...tableList]
+ datasourceTableData.value = [...tableList]
})
.finally(() => {
dsLoading.value = false
@@ -664,10 +670,10 @@ const state = reactive({
nodeNameList: [],
editArr: [],
dataSourceList: [],
- tableData: [],
fieldCollapse: ['dimension', 'quota']
})
+const datasourceTableData = shallowRef([])
const getIconName = (type: number) => {
if (type === 1) {
return 'time'
@@ -1281,7 +1287,7 @@ const getDsIconName = data => {
- {{ state.tableData.length }}
+ {{ datasourceTableData.length }}
{
-
+
{
自定义SQL
-
+
+
+ dragstart($event, datasourceTableData[index])"
+ @dragend="maskShow = false"
+ :draggable="true"
+ @click="setActiveName(datasourceTableData[index])"
+ >
+
+
+
+ {{ datasourceTableData[index].tableName }}
+
+
+
+