feat:合并代码

DataRoom/dataroom-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>1.0.1.2023071901.Alpha</version>
+        <version>1.0.1.2023072001.Alpha</version>
     </parent>
 
     <artifactId>dataroom-core</artifactId>

DataRoom/dataroom-server/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>1.0.1.2023071901.Alpha</version>
+        <version>1.0.1.2023072001.Alpha</version>
     </parent>
 
     <artifactId>dataroom-server</artifactId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.gccloud</groupId>
             <artifactId>dataroom-core</artifactId>
-            <version>1.0.1.2023071901.Alpha</version>
+            <version>1.0.1.2023072001.Alpha</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>

DataRoom/pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.gccloud</groupId>
     <artifactId>dataroom</artifactId>
-    <version>1.0.1.2023071901.Alpha</version>
+    <version>1.0.1.2023072001.Alpha</version>
 
     <packaging>pom</packaging>
     <description>基于G2Plot、Echarts的大屏设计服务端，具备设计、预览能力，支持MySQL、Oracle、PostgreSQL、Groovy等数据集接入

data-room-ui/.gitignore

@@ -368,5 +368,6 @@ GitHub.sublime-settings
 
 lib
 data-room-ui
+dataRoomUi
 bigScreen
 bigScreen.zip

data-room-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcpaas/data-room-ui",
-  "version": "1.0.1-2023071901-Alpha",
+  "version": "1.0.1-2023072001-Alpha",
   "description": "自定义大屏",
   "author": "gcpaas",
   "license": "MIT",
@@ -53,6 +53,7 @@
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@antv/g2plot": "2.4.0",
     "@jiaminghi/data-view": "2.10.0",
+    "@wjjj/utils": "^0.1.2",
     "axios": "0.18.1",
     "babel-polyfill": "6.26.0",
     "echarts": "^5.2.2",

data-room-ui/packages/DataSetManagement/src/index.vue

@@ -234,8 +234,8 @@
     />
     <checkDatasource
       ref="checkDatasource"
-      :reasonList="reasonList"
-      />
+      :reason-list="reasonList"
+    />
     <component
       :is="componentData.component"
       v-if="datasetType"
@@ -312,7 +312,7 @@ export default {
   },
   data () {
     return {
-      reasonList:[],
+      reasonList: [],
       datasetType: null,
       isEdit: false,
       categoryData: [],
@@ -463,12 +463,11 @@ export default {
             })
           }).catch(() => {
           })
-        }else{
-          this.reasonList=res.reasons
+        } else {
+          this.reasonList = res.reasons
           this.$refs.checkDatasource.checkDatasourceVisible = true
         }
       })
-
     },
     // 详情
     toPreview (id, type, name, typeId) {

data-room-ui/packages/DataSourceManagement/src/checkDatasource.vue

@@ -8,11 +8,13 @@
     :before-close="handleClose"
     class="bs-dialog-wrap bs-el-dialog"
   >
-    <div
-      style="padding-right: 80px;"
-    >
-      <div class="item" v-for="(item,index) in reasonList" :key="index">
-        <span v-if="reasonList.length>1"> {{index+1}}、</span>{{item}}
+    <div class="text-style">
+      <div
+        v-for="(item,index) in reasonList"
+        :key="index"
+        class="item"
+      >
+        <span v-if="reasonList.length>1"> {{ index+1 }}、</span>{{ item }}
       </div>
     </div>
     <span
@@ -34,21 +36,21 @@ export default {
   props: {
     reasonList: {
       type: Array,
-      default: ()=>[]
+      default: () => []
     }
   },
   data () {
     return {
-      checkDatasourceVisible: false,
+      checkDatasourceVisible: false
     }
   },
   methods: {
-    handleClose(){
-      this.checkDatasourceVisible=false
+    handleClose () {
+      this.checkDatasourceVisible = false
     }
 
-    }
   }
+}
 </script>
 
 <style lang="scss" scoped>
@@ -59,4 +61,8 @@ export default {
 .item{
   padding: 8px 0;
 }
+.text-style{
+  padding-right: 80px;
+  color: var(--bs-el-text);
+}
 </style>

data-room-ui/packages/DataSourceManagement/src/index.vue

@@ -129,10 +129,10 @@
       :app-code="appCode"
       @refreshTable="init"
     />
-     <checkDatasource
+    <checkDatasource
       ref="checkDatasource"
-      :reasonList="reasonList"
-      />
+      :reason-list="reasonList"
+    />
   </div>
 </template>
 
@@ -186,7 +186,7 @@ export default {
   },
   data () {
     return {
-      reasonList:[],
+      reasonList: [],
       testBtnLoading: [],
       loadingText: '',
       deling:false,
@@ -287,22 +287,21 @@ export default {
         row.loading=false
         if(res.canDelete){
           this.$confirm('确定删除当前数据源吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-          customClass: 'bs-el-message-box'
-        }).then(() => {
-          sourceRemove(row.id).then((r) => {
-            this.$message.success('删除成功')
-            this.init()
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            customClass: 'bs-el-message-box'
+          }).then(() => {
+            sourceRemove(row.id).then((r) => {
+              this.$message.success('删除成功')
+              this.init()
+            })
           })
-        })
-        }else{
-          this.reasonList=res.reasons
+        } else {
+          this.reasonList = res.reasons
           this.$refs.checkDatasource.checkDatasourceVisible = true
         }
       })
-
     },
     sourceLinkTest (row) {
       this.testBtnLoading.push(row.id)