{
? [...selectValue.value]
: selectValue.value
}
- setEmptyData()
})
}
@@ -211,8 +210,8 @@ watch(
)
const setEmptyData = () => {
- const { showEmpty, displayType } = config.value
- if (+displayType !== 0) return
+ const { showEmpty, displayType, optionValueSource } = config.value
+ if (+displayType !== 0 || optionValueSource === 1) return
const [s] = options.value
if (showEmpty) {
if (s?.value !== '_empty_$') {
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
index df2e47a85d..640471c702 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
@@ -108,6 +108,23 @@ const dfsNodeNameList = (list, arr) => {
})
}
+const dfsForDsId = (arr, datasourceId) => {
+ return arr.every(ele => {
+ if (arr.children?.length) {
+ return dfsForDsId(arr.children, datasourceId)
+ }
+ return ele.datasourceId === datasourceId
+ })
+}
+
+const crossDatasources = computed(() => {
+ const { datasourceId, children = [] } = state.nodeList[0] || {}
+ if (datasourceId && !!children.length) {
+ return dfsForDsId(children, datasourceId)
+ }
+ return false
+})
+
let isUpdate = false
watch(
@@ -838,7 +855,8 @@ defineExpose({
notConfirm,
dfsNodeFieldBack,
initState,
- setChangeStatus
+ setChangeStatus,
+ crossDatasources
})
const handleActiveNode = ele => {
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 632c036771..8896efcf36 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
@@ -815,6 +815,10 @@ const mouseupDrag = () => {
dom.removeEventListener('mousemove', calculateWidth)
dom.removeEventListener('mousemove', calculateHeight)
}
+
+const crossDatasources = computed(() => {
+ return datasetDrag.value?.crossDatasources
+})
const calculateWidth = (e: MouseEvent) => {
if (e.pageX < 240) {
LeftWidth.value = 240
@@ -1328,6 +1332,12 @@ const getDsIconName = data => {