diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index 97e71144..34a5ee2e 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -29,7 +29,11 @@
:dataset-name="datasetName"
:ds-id="config.dataSource.businessKey"
@getDsId="dsId => { getDataSetDetailsById(dsId, 'treeTable');}"
- />
+ >
+
+
+
+
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue
index 56a14a44..2ee6b440 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue
@@ -15,7 +15,11 @@
+ >
+
+
+
+
+ >
+
+
+
+
+ >
+
+
+
+
+
+
+
+
+
+
确定
+ >
+ 确定
+
@@ -61,7 +85,12 @@ export default {
data () {
return {
dataSetVisible: false,
- dataSetId: null
+ dataSetId: null,
+ tabsActiveName: 'dataSet',
+ // 组件实例
+ componentInstance: null,
+ // 是否使用了插槽
+ isUseSlot: false
}
},
computed: {
@@ -77,11 +106,23 @@ export default {
},
mounted () {
this.dataSetId = this.dsId
+ // 将内置的组件实例赋值给componentInstance
+ this.componentInstance = this.$refs.dataSetSetting
+ // 判断是否使用了插槽
+ if (this.$scopedSlots && this.$scopedSlots.dataSetSelect && this.$scopedSlots.dataSetSelect()) {
+ this.isUseSlot = true
+ } else {
+ this.isUseSlot = false
+ }
},
methods: {
+ handleClickTabs (vueComponent, event) {
+ this.componentInstance = vueComponent.$children[0]
+ },
sure () {
this.dataSetVisible = false
- const getSelectDs = this.$refs.dataSetSetting.getSelectDs()
+ const getSelectDs = this.componentInstance.getSelectDs()
+ console.log('getSelectDs', getSelectDs)
if (Object.prototype.hasOwnProperty.call(getSelectDs, 'id')) {
this.dataSetId = getSelectDs.id
}
@@ -96,9 +137,14 @@ export default {