Merge branch 'fixbug-dataGovernance' into 'develop'

修复数据治理的bug

See merge request luban/dataspherestudio!261

Author: 汪鸣峰

web/src/apps/dataGovernance/module/dataGovernance/assetsIndex.vue

@@ -114,17 +114,18 @@ export default {
 
       const removeAction = () => {
         if (that.currentTab.guid === modal.guid) {
-          const { guid } = that.currentTab;
           const workspaceId = that.$route.query.workspaceId;
           if (len > 1 && idx < len - 1) {
             that.currentTab = topTapList[idx + 1];
+            let guid = that.currentTab.guid;
             that.$router.push({
               name: "dataGovernance/assets/info",
               params: { guid },
               query: { workspaceId }
             });
           } else if (len > 1 && idx == len - 1) {
             that.currentTab = topTapList[idx - 1];
+            let guid = that.currentTab.guid;
             that.$router.push({
               name: "dataGovernance/assets/info",
               params: { guid },

web/src/apps/dataGovernance/module/dataGovernance/index.vue

@@ -43,7 +43,7 @@ export default {
             { id: 12, name: "数据资产目录", pathName: "dataGovernance/assets" }
           ]
         },
-        {
+        /*{
           id: 2,
           name: "元数据管理",
           children: [{ id: 21, name: "元数据采集" }]
@@ -52,7 +52,7 @@ export default {
           id: 3,
           name: "数据权限",
           children: [{ id: 31, name: "数据权限管理" }]
-        },
+        },*/
         {
           id: 4,
           name: "数仓规划",
@@ -65,8 +65,8 @@ export default {
             { id: 42, name: "分层配置", pathName: "dataGovernance/layered" }
           ]
         },
-        { id: 5, name: "数据质量", children: [] },
-        { id: 6, name: "数据安全", children: [] }
+        /*{ id: 5, name: "数据质量", children: [] },
+        { id: 6, name: "数据安全", children: [] }*/
       ],
       currentTreeId: 1,
       title: this.$t("message.dataGovernance.dataOverview")

web/src/apps/dataGovernance/view/layered/editModal.vue

@@ -7,7 +7,7 @@
       label-position="top"
     >
       <FormItem label="名称" prop="name">
-        <Input v-model="formState.name" placeholder="名称" :maxlength="30" :disabled="mode === 'edit'" /><span>最多30字</span>
+        <Input v-model="formState.name" placeholder="名称" :disabled="mode === 'edit'" />
       </FormItem>
       <!--<FormItem label="英文名" prop="enName">
         <Input v-model="formState.enName" placeholder="英文名"></Input>
@@ -104,11 +104,16 @@ export default {
   data() {
     const validateName = (rule, value, callback) => {
       if (value) {
-        const valid = /\ /.test(value);
-        if (!valid) {
+        const invalid = /\ /.test(value) || !(/^[a-z|A-Z]/.test(value))
+        if (value.length > 30) {
+          this.formState.name = value.substring(0, 30)
+          callback(new Error('最多30字'))
+          return
+        }
+        if (!invalid) {
           callback();
         } else {
-          callback(new Error('不能包含空格'));
+          callback(new Error('不能包含空格,且必须以字母开头'))
         }
       } else {
         callback(new Error('不能为空'));

web/src/apps/dataGovernance/view/subjectDomain/editModal.vue

@@ -7,7 +7,7 @@
       label-position="top"
     >
       <FormItem label="名称" prop="name">
-        <Input v-model="formState.name" placeholder="名称" :disabled="mode === 'edit'" :maxlength="30" /><span>最多30字</span>
+        <Input v-model="formState.name" placeholder="名称" :disabled="mode === 'edit'"/>
       </FormItem>
       <!--<FormItem label="英文名" prop="enName">
         <Input v-model="formState.enName" placeholder="英文名"></Input>
@@ -91,14 +91,19 @@ export default {
   data() {
     const validateName = (rule, value, callback) => {
       if (value) {
-        const valid = /\ /.test(value);
-        if (!valid) {
+        const invalid = /\ /.test(value) || !(/^[a-z|A-Z]/.test(value))
+        if (value.length > 30) {
+          this.formState.name = value.substring(0, 30)
+          callback(new Error('最多30字'))
+          return
+        }
+        if (!invalid) {
           callback();
         } else {
-          callback(new Error('不能包含空格'));
+          callback(new Error('不能包含空格,且必须以字母开头'))
         }
       } else {
-        callback(new Error('不能为空'));
+        callback(new Error('不能为空'))
       }
     };
     return {

web/src/apps/workflows/assets/styles/process.scss

@@ -46,7 +46,7 @@
 .process-tabs {
     position: $relative;
     height: calc(100%);
-    overflow: hidden;
+    //overflow: hidden;
     &.no-tab{
         .process-tab{
             display: none;

web/src/apps/workflows/module/dispatch/dashboard/index.vue

@@ -17,7 +17,7 @@
               <div class="time-model">
                 <template>
                   <Date-picker
-                    style="width: 250px"
+                    style="width: 430px"
                     v-model="dataTime"
                     type="datetimerange"
                     @on-change="_datepicker"
@@ -380,6 +380,7 @@ export default {
     padding: 0;
     position: relative;
     margin-bottom: 24px;
+    min-width: 570px;
     .dashboard-module-content {
       padding: 30px;
       position: relative;

web/vue.config.js

@@ -247,10 +247,10 @@ module.exports = {
   devServer: {
     proxy: {
       "/api": {
-        target: "http://***REMOVED***:8088",
+        //target: "http://***REMOVED***:8088",
         //target: 'http://***REMOVED***:9202', //yichao
         // target: "http://***REMOVED***:9202", //jiawei
-        // target: "http://luban.ctyun.cn:8088",
+        target: "http://luban.ctyun.cn:8088",
         //target: "http://devluban.ctyun.cn:8088",
         changeOrigin: true,
         pathRewrite: {