Merge branch 'master' into master

WeBankFinTech · Mar 2, 2022 · 60cc625 · 60cc625
2 parents 7883d68 + 8a7f6da
commit 60cc625
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 210 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/docs/zh_CN/ch1/README.md b/docs/zh_CN/ch1/README.md
@@ -39,7 +39,7 @@ Qualitis基于Spring Boot，依赖于Linkis进行数据计算，提供数据质
 
 ## 文档列表
 [架构设计文档](架构设计文档.md)  
-[快速搭建手册](快速搭建手册——单机版.md)  
+[快速搭建手册](快速搭建手册.md)  
 [用户手册](用户手册.md)  
 
 <br/>

diff --git a/ui/fes.config.js b/ui/fes.config.js
@@ -27,11 +27,7 @@ export default {
         },
         // 生产环境 fes build默认使用prod环境 fes dev --env=prod 触发使用
         prod: {
-        },
-        sandbox: {
-            api: '/wds/qualitis/qualitis',
-            env: 'sandbox',
-            path: '/wds/qualitis'
+
         }
     },
     // 配置角色-路由访问权限，使用FesApp.setRole('unLogin')来修改当前用户的角色，控制路由访问权限

diff --git a/ui/package.json b/ui/package.json
@@ -42,5 +42,6 @@
     "chart.js": "^2.9.4",
     "vue-chartjs": "^3.5.1"
   },
+
   "gitHead": "357575247bde6d1d24a8d2e11d2bfe7adbe6abd6"
 }
diff --git a/ui/src/app.js b/ui/src/app.js
@@ -5,6 +5,7 @@ export default function() {
         // dqm 登录后检查登录并设置登录信息
         if (from.path === '/home') return next();
         if (to.path === '/home') return next();
+
         this.FesApi.fetch("api/v1/projector/role", "get").then(({roles,username}) => {
             if(Array.isArray(roles)){
                 roles = roles.map(item => item.toLowerCase())

diff --git a/ui/src/assets/styles/crossTable.scss b/ui/src/assets/styles/crossTable.scss
@@ -89,15 +89,17 @@
             .no-border{
                 border: 1px solid #d7dde4;
                 border-top: none;
-            }
+
         }
         .map-col {
             width: 92%;
         }
         .custom-input {
             width: 72%;
         }
+
         ::v-deep
+
         textarea {
             min-height: 44px;
         }
@@ -123,4 +125,6 @@
     .determine {
         margin-right: 20px;
     }
+
 }
+
diff --git a/ui/src/components/fesHeader.fes b/ui/src/components/fesHeader.fes
@@ -50,6 +50,7 @@
 
 import { getUserRole, sha256 } from "assets/js/utils";
 import bus from '../bus';
+
     export default {
         FesData() {
             return {

diff --git a/ui/src/pages/configureParameter/index.fes b/ui/src/pages/configureParameter/index.fes
@@ -302,3 +302,4 @@
         margin-left: 10px;
     }
 </style>
+
diff --git a/ui/src/pages/personnelManage/index.fes b/ui/src/pages/personnelManage/index.fes
@@ -278,6 +278,7 @@
                         chinese_name: this.chinese_name,
                         department: this.department
                     }
+
                     if (valid) {
                         this.FesApi.fetch(
                             "api/v1/admin/user",

diff --git a/ui/src/pages/taskQuery/index.fes b/ui/src/pages/taskQuery/index.fes
@@ -42,6 +42,7 @@
                     <Wb-select v-model="status" @on-change="changeStatus">
                         <Wb-option v-for="item in statusList" :key="item.status" :value="item.status" :label="item.type" />
                     </Wb-select>
+
                 </Cell>
                 <Cell v-if="searchType===3" span="4" offset="1">
                     <div>{{ $t('common.number') }}</div>
@@ -79,6 +80,7 @@
             </Row>
         </div>
     </pageContainer>
+
 </template>
 <script type="text/ecmascript-6">
     import { sizeList } from 'assets/js/sizeList';
@@ -371,6 +373,7 @@
                         }else {
                             return ''
                         }
+
                     }
                 })
             },
@@ -443,7 +446,8 @@
         .idlink {
             color: #2db7f5;
         }
-        ::v-deep .ui-table {
+
+        /deep/ .ui-table {
             overflow: auto;
         }
     }

diff --git a/ui/src/pages/verifyFailData/index.fes b/ui/src/pages/verifyFailData/index.fes
@@ -303,6 +303,7 @@
     .ruleTag:not(:last-child) {
         margin-right: 8px;
     }
+
     .ruleTag:not(:last-child)::after {
         content: ",";
     }
@@ -315,6 +316,7 @@
     .unVerified {
         background-color: #656060;
     }
+
     .field{
         position: relative;
         border: none;

diff --git a/web/app/src/main/resources/database/update/update_0.7.0-0.8.0.sql b/web/app/src/main/resources/database/update/update_0.7.0-0.8.0.sql
@@ -9,4 +9,4 @@ CREATE TABLE `qualitis_project_label` (
   PRIMARY KEY (`id`),
   CONSTRAINT `UK_project_id_label_name` UNIQUE KEY  (`label_name`, `project_id`),
   CONSTRAINT `FK_qualitis_project_label_project_id` FOREIGN KEY (`project_id`) REFERENCES `qualitis_project` (`id`)
- )
+)