diff --git a/DataRoom/dataroom-core/pom.xml b/DataRoom/dataroom-core/pom.xml
index 7f92d9c2..397dcd93 100644
--- a/DataRoom/dataroom-core/pom.xml
+++ b/DataRoom/dataroom-core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId>
- <version>1.0.0.RELEASE</version>
+ <version>0.0.1.2023071101.Alpha</version>
</parent>
<artifactId>dataroom-core</artifactId>
diff --git a/DataRoom/dataroom-server/pom.xml b/DataRoom/dataroom-server/pom.xml
index 24745edc..6d61b7dd 100644
--- a/DataRoom/dataroom-server/pom.xml
+++ b/DataRoom/dataroom-server/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId>
- <version>1.0.0.RELEASE</version>
+ <version>0.0.1.2023071101.Alpha</version>
</parent>
<artifactId>dataroom-server</artifactId>
@@ -22,7 +22,7 @@
<dependency>
<groupId>com.gccloud</groupId>
<artifactId>dataroom-core</artifactId>
- <version>1.0.0.RELEASE</version>
+ <version>0.0.1.2023071101.Alpha</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
diff --git a/DataRoom/pom.xml b/DataRoom/pom.xml
index 41dec144..516e6d93 100644
--- a/DataRoom/pom.xml
+++ b/DataRoom/pom.xml
@@ -12,7 +12,7 @@
<groupId>com.gccloud</groupId>
<artifactId>dataroom</artifactId>
- <version>1.0.0.RELEASE</version>
+ <version>0.0.1.2023071101.Alpha</version>
<packaging>pom</packaging>
<description>基于G2Plot、Echarts的大屏设计服务端，具备设计、预览能力，支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入
@@ -60,7 +60,7 @@
<clickhouse.version>0.3.2</clickhouse.version>
<commons-io.version>2.2</commons-io.version>
<okhttp3.version>4.9.1</okhttp3.version>
- <dataset.core.version>1.0.0.RELEASE</dataset.core.version>
+ <dataset.core.version>0.0.1.2023071101.Alpha</dataset.core.version>
</properties>
<dependencyManagement>
diff --git a/data-room-ui/package.json b/data-room-ui/package.json
index 77011e41..78511ac0 100644
--- a/data-room-ui/package.json
+++ b/data-room-ui/package.json
@@ -2,14 +2,16 @@
"name": "@gcpaas/data-room-ui",
"version": "1.0.1-2023071801-Alpha",
"description": "自定义大屏",
- "author": "gc-starter",
+ "author": "gcpaas",
"license": "MIT",
"main": "packages/index.js",
"keywords": [
"dataRoom",
+ "bigScreen",
+ "low code",
+ "自定义大屏",
"大屏设计器",
- "低代码",
- "low code"
+ "低代码"
],
"repository": {
"type": "github",
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
index 34a5ee2e..5349b9d4 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue
@@ -30,8 +30,11 @@
:ds-id="config.dataSource.businessKey"
@getDsId="dsId => { getDataSetDetailsById(dsId, 'treeTable');}"
>
- <template #dataSetSelect>
- <slot name="dataSetSelect" />
+ <template #dataSetSelect="{value}">
+ <slot
+ name="dataSetSelect"
+ :value="value"
+ />
</template>
</data-set-select>
</el-form-item>
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue
index e15ff3df..a344adaa 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/index.vue
@@ -16,8 +16,11 @@
ref="dataSetting"
:key="config.code"
>
- <template #dataSetSelect>
- <slot name="dataSetSelect" />
+ <template #dataSetSelect="{value}">
+ <slot
+ name="dataSetSelect"
+ :value="value"
+ />
</template>
</DataSetting>
</el-tab-pane>
diff --git a/data-room-ui/packages/BigScreenDesign/SettingPanel.vue b/data-room-ui/packages/BigScreenDesign/SettingPanel.vue
index 58bfe618..e4c82b24 100644
--- a/data-room-ui/packages/BigScreenDesign/SettingPanel.vue
+++ b/data-room-ui/packages/BigScreenDesign/SettingPanel.vue
@@ -14,8 +14,11 @@
@updateSetting="updateSetting"
@updateDataSetting="updateDataSetting"
>
- <template #dataSetSelect>
- <slot name="dataSetSelect" />
+ <template #dataSetSelect="{value}">
+ <slot
+ name="dataSetSelect"
+ :value="value"
+ />
</template>
</RightSetting>
<OverallSetting
diff --git a/data-room-ui/packages/BigScreenDesign/index.vue b/data-room-ui/packages/BigScreenDesign/index.vue
index e5b8c7dd..1a81edbc 100644
--- a/data-room-ui/packages/BigScreenDesign/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/index.vue
@@ -87,8 +87,11 @@
@updateDataSetting="updateDataSetting"
@updatePage="updatePage"
>
- <template #dataSetSelect>
- <slot name="dataSetSelect" />
+ <template #dataSetSelect="{ value }">
+ <slot
+ name="dataSetSelect"
+ :value="value"
+ />
</template>
</SettingPanel>
<!-- 添加资源面板 -->
diff --git a/data-room-ui/packages/DataSetSetting/dataSetSetting.vue b/data-room-ui/packages/DataSetSetting/dataSetSetting.vue
index 18cb881f..2a41f947 100644
--- a/data-room-ui/packages/DataSetSetting/dataSetSetting.vue
+++ b/data-room-ui/packages/DataSetSetting/dataSetSetting.vue
@@ -6,6 +6,7 @@
:visible.sync="dataSetVisible"
width="80%"
class="bs-dialog-wrap data-set-wrap bs-el-dialog"
+ @opened="openedInit"
>
<el-tabs
v-if="isUseSlot"
@@ -27,7 +28,10 @@
:ds-value="DataDsValue"
/>
</el-tab-pane>
- <slot name="dataSetSelect" />
+ <slot
+ name="dataSetSelect"
+ :value="DataDsValue"
+ />
</el-tabs>
<DataSetManagement
v-else
@@ -86,6 +90,7 @@ export default {
return {
dataSetVisible: false,
dataSetId: null,
+ newDataDsValue: '',
tabsActiveName: 'dataSet',
// 组件实例
componentInstance: null,
@@ -106,8 +111,6 @@ 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
@@ -116,6 +119,11 @@ export default {
}
},
methods: {
+ openedInit () {
+ // 将内置的组件实例赋值给componentInstance
+ this.componentInstance = this.$refs.dataSetSetting
+ this.newDataDsValue = this.DataDsValue
+ },
handleClickTabs (vueComponent, event) {
this.componentInstance = vueComponent.$children[0]
},
@@ -140,7 +148,8 @@ export default {
::v-deep .big-screen-router-view-wrap {
padding-left: 16px !important;
}
-::v-deep .el-tabs__header{
+
+::v-deep .el-tabs__header {
margin-bottom: 0;
}
diff --git a/data-room-ui/packages/DataSetSetting/index.vue b/data-room-ui/packages/DataSetSetting/index.vue
index 0b12251f..306105ce 100644
--- a/data-room-ui/packages/DataSetSetting/index.vue
+++ b/data-room-ui/packages/DataSetSetting/index.vue
@@ -20,8 +20,11 @@
@getDsId="getDsId"
@getSelectDs="getSelectDs"
>
- <template #dataSetSelect>
- <slot name="dataSetSelect" />
+ <template #dataSetSelect="{value}">
+ <slot
+ name="dataSetSelect"
+ :value="value"
+ />
</template>
</DataSetDialog>
</div>