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

DataRoom/dataroom-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.gccloud</groupId>
         <artifactId>dataroom</artifactId>
-        <version>1.0.1.2023072401.Alpha</version>
+        <version>1.0.1.2023072501.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.2023072401.Alpha</version>
+        <version>1.0.1.2023072501.Alpha</version>
     </parent>
 
     <artifactId>dataroom-server</artifactId>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.gccloud</groupId>
             <artifactId>dataroom-core</artifactId>
-            <version>1.0.1.2023072401.Alpha</version>
+            <version>1.0.1.2023072501.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.2023072401.Alpha</version>
+    <version>1.0.1.2023072501.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.1.2023072401.Alpha</dataset.core.version>
+        <dataset.core.version>1.0.1.2023072501.Alpha</dataset.core.version>
     </properties>
 
     <dependencyManagement>

data-room-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gcpaas/data-room-ui",
-  "version": "1.0.1-2023072501-Alpha",
+  "version": "1.0.1-2023072503-Alpha",
   "description": "自定义大屏",
   "author": "gcpaas",
   "license": "MIT",

data-room-ui/packages/BigScreenList/CatalogEditForm.vue

@@ -56,7 +56,7 @@
           />
           <el-table-column
             label="操作"
-            width="105"
+            width="150"
             align="center"
           >
             <template slot-scope="scope">

data-room-ui/packages/ComponentList/CatalogEditForm.vue

@@ -60,7 +60,7 @@
           />
           <el-table-column
             label="操作"
-            width="105"
+            width="150"
             align="center"
           >
             <template slot-scope="scope">

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

@@ -75,6 +75,8 @@
                     placeholder="请选择分组"
                     clearable
                     :disabled="!isEdit"
+                    filterable
+                    :filter-method="selectorFilter"
                     @clear="clearType"
                     @visible-change="setCurrentNode"
                   >
@@ -94,6 +96,7 @@
                           :highlight-current="true"
                           :expand-on-click-node="false"
                           class="bs-el-tree"
+                          :filter-node-method="treeFilter"
                           @node-click="selectParentCategory"
                         >
                           <span
@@ -1206,6 +1209,13 @@ export default {
         this.passTest = false
         this.saveLoading = false
       })
+    },
+    selectorFilter (value) {
+      this.$refs.categorySelectTree.filter(value)
+    },
+    treeFilter (value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
     }
   }
 }

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

@@ -73,6 +73,8 @@
                     placeholder="请选择分组"
                     clearable
                     :disabled="!isEdit"
+                    filterable
+                    :filter-method="selectorFilter"
                     @clear="clearType"
                     @visible-change="setCurrentNode"
                   >
@@ -92,6 +94,7 @@
                           :highlight-current="true"
                           :expand-on-click-node="false"
                           class="bs-el-tree"
+                          :filter-node-method="treeFilter"
                           @node-click="selectParentCategory"
                         >
                           <span
@@ -756,6 +759,13 @@ export default {
     },
     openNewWindow (url) {
       window.open(url, '_blank')
+    },
+    selectorFilter (value) {
+      this.$refs.categorySelectTree.filter(value)
+    },
+    treeFilter (value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
     }
   }
 }

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

@@ -74,6 +74,8 @@
                     placeholder="请选择分组"
                     clearable
                     :disabled="!isEdit"
+                    filterable
+                    :filter-method="selectorFilter"
                     @clear="clearType"
                     @visible-change="setCurrentNode"
                   >
@@ -93,6 +95,7 @@
                           :highlight-current="true"
                           :expand-on-click-node="false"
                           class="bs-el-tree"
+                          :filter-node-method="treeFilter"
                           @node-click="selectParentCategory"
                         >
                           <span
@@ -657,6 +660,13 @@ export default {
         fieldDesc[field.fieldName] = field.fieldDesc
       })
       this.dataForm.fieldDesc = fieldDesc
+    },
+    selectorFilter (value) {
+      this.$refs.categorySelectTree.filter(value)
+    },
+    treeFilter (value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
     }
   }
 }

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

@@ -73,7 +73,9 @@
                     popper-class="bs-el-select"
                     placeholder="请选择分组"
                     clearable
+                    filterable
                     :disabled="!isEdit"
+                    :filter-method="selectorFilter"
                     @clear="clearType"
                     @visible-change="setCurrentNode"
                   >
@@ -93,6 +95,7 @@
                           :highlight-current="true"
                           :expand-on-click-node="false"
                           class="bs-el-tree"
+                          :filter-node-method="treeFilter"
                           @node-click="selectParentCategory"
                         >
                           <span
@@ -761,7 +764,6 @@ export default {
         moduleCode: this.appCode
       }
       datasourceList(params).then(res => {
-        console.log(res)
         this.sourceList = res
       })
     },
@@ -918,6 +920,13 @@ export default {
     currentChangeHandle (value) {
       this.current = value
       this.getData()
+    },
+    selectorFilter (value) {
+      this.$refs.categorySelectTree.filter(value)
+    },
+    treeFilter (value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
     }
   }
 }

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

@@ -74,6 +74,8 @@
                     placeholder="请选择分组"
                     clearable
                     :disabled="!isEdit"
+                    filterable
+                    :filter-method="selectorFilter"
                     @clear="clearType"
                     @visible-change="setCurrentNode"
                   >
@@ -93,6 +95,7 @@
                           :highlight-current="true"
                           :expand-on-click-node="false"
                           class="bs-el-tree"
+                          :filter-node-method="treeFilter"
                           @node-click="selectParentCategory"
                         >
                           <span
@@ -849,6 +852,13 @@ export default {
         require: 0,
         remark: ''
       })
+    },
+    selectorFilter (value) {
+      this.$refs.categorySelectTree.filter(value)
+    },
+    treeFilter (value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
     }
   }
 }

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

@@ -75,6 +75,8 @@
                     placeholder="请选择分组"
                     clearable
                     :disabled="!isEdit"
+                    filterable
+                    :filter-method="selectorFilter"
                     @clear="clearType"
                     @visible-change="setCurrentNode"
                   >
@@ -94,6 +96,7 @@
                           :highlight-current="true"
                           :expand-on-click-node="false"
                           class="bs-el-tree"
+                          :filter-node-method="treeFilter"
                           @node-click="selectParentCategory"
                         >
                           <span
@@ -998,6 +1001,13 @@ export default {
         this.passTest = false
         this.saveLoading = false
       })
+    },
+    selectorFilter (value) {
+      this.$refs.categorySelectTree.filter(value)
+    },
+    treeFilter (value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
     }
   }
 }

data-room-ui/packages/assets/style/bsTheme.scss

@@ -67,6 +67,9 @@
   border-color: var(--bs-el-border) !important;
   background: var(--bs-background-2) !important;
   background-color: var(--bs-background-2) !important;
+  th.el-table__cell.is-leaf{
+    border-color: var(--bs-el-border) !important;
+  }
 
   th.gutter {
     background-color: var(--bs-el-background-3) !important;
@@ -599,9 +602,31 @@
 .bs-el-date-picker {
   left: -115px !important;
   background-color: var(--bs-background-1) !important;
+  .el-date-picker__time-header{
+    border-color: var(--bs-el-border) !important;
+  }
+  .el-picker-panel{
+     .el-date-picker__header{
+      color: var(--bs-el-text) !important;
+      background: var(--bs-background-2) !important;
+      background-color: var(--bs-background-2) !important;
+     }
+     .el-date-table{
+      background: var(--bs-background-2) !important;
+      background-color: var(--bs-background-2) !important;
+      th{
+        border-color: var(--bs-el-border) !important;
+      }
+      .el-button--text{
+        color: var(--bs-el-text) !important;
+        background: var(--bs-background-2) !important;
+        background-color: var(--bs-background-2) !important;
+      }
+     }
+  }
   .el-picker-panel__footer {
     background-color: var(--bs-background-1) !important;
-    border-top: 1px solid var(--bs-background-2);
+    border-top: 1px solid var(--bs-el-border) !important;
   }
   .el-date-table td.disabled div {
     background-color: var(--bs-background-2) !important;