Merge branch 'master' of github.com:gcpaas/DataRoom

data-room-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcpaas/data-room-ui",
-  "version": "2.0.0-RELEASE",
+  "version": "2.0.1-2023101601-Alpha",
   "description": "自定义大屏",
   "author": "gcpaas",
   "license": "MIT",

data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue

@@ -45,7 +45,7 @@
               <data-set-select
                 :dataset-name="datasetName"
                 :ds-id="config.dataSource.businessKey"
-                @getDsId="dsId => { getDataSetDetailsById(dsId, 'treeTable');}"
+                @getDsId="changeDsid"
               >
                 <template #dataSetSelect="{value}">
                   <slot
@@ -764,6 +764,12 @@ export default {
     }
   },
   methods: {
+    changeDsid(dsId){
+       this.clearVerify()
+      this.config.customize.columnConfig=[]
+      this.getDataSetDetailsById(dsId, 'treeTable')
+
+    },
     // 打开表达式弹窗
     openExpression () {
       this.$refs.expressionDialog.init()
@@ -792,8 +798,6 @@ export default {
     },
     // 根据数据集来获取数据集详情
     getDataSetDetailsById (id, type) {
-      this.clearVerify()
-      this.config.customize.columnConfig=[]
       if (id) {
         this.config.dataSource.businessKey = id
         getDataSetDetails(id).then(res => {

data-room-ui/packages/BorderSelect/index.vue

@@ -29,7 +29,7 @@
             @click="chooseComponent(component)"
           >
             <div
-            v-if="component.title!='GcBorder16'"
+              v-if="component.title!='GcBorder16'"
               :class="component.title == focus.title ? 'focus' : ''"
               class="big-screen-card-inner"
             >