Merge remote-tracking branch 'origin/dev-0.4.0-webank' into dev-0.4.0-webank

Author: Alexkun

web/src/apps/scriptis/module/workbench/container.vue

@@ -1079,7 +1079,7 @@ export default {
 <style lang="scss" scoped>
 @import '@/common/style/variables.scss';
 .workbench {
-    ::v-deep.ivu-tabs.ivu-tabs-card {
+    ::v-deep .ivu-tabs.ivu-tabs-card {
         border-top: $border-width-base $border-style-base #dcdee2;
         .ivu-tabs-bar .ivu-tabs-tab {
             margin-right: 0px;

web/src/apps/scriptis/module/workbench/script/intelligentDiagnosis.vue

@@ -47,7 +47,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .we-intelligent-diagnosis {
-    ::v-deep.ivu-table-wrapper {
+    ::v-deep .ivu-table-wrapper {
         border: none;
     }
 }

web/src/apps/streamis/module/jarDetail/index.vue

@@ -424,7 +424,7 @@ export default {
   }
 }
 .full {
-  ::v-deep.ivu-modal{
+  ::v-deep .ivu-modal{
     width: 100vw !important;
     height: 100vh;
     min-height: 430px;
@@ -433,7 +433,7 @@ export default {
       height: 100%;
     }
   }
-  ::v-deeptextarea{
+  ::v-deep textarea{
    height: calc(100vh - 200px) !important;
    min-height: 200px;
    max-height: calc(100vh - 200px) !important;

web/src/apps/streamis/module/jobAlert/index.vue

@@ -100,8 +100,9 @@ export default {
   },
   methods: {
     getDatas() {
-      const { id, version } = this.$route.params || {}
-      const queries = `?jobId=${id}&version=${version}&pageNow=${this.page.current}&pageSize=${this.page.size}`
+      const { id, version, lastVersion, status } = this.$route.params
+      const useVersion = [5, 8, 9].includes(status) ? version : lastVersion
+      const queries = `?jobId=${id}&version=${useVersion || version}&pageNow=${this.page.current}&pageSize=${this.page.size}`
       this.loading = true
       api
         .fetch('streamis/streamJobManager/job/alert' + queries, 'get')

web/src/apps/streamis/module/jobDetail/index.vue

@@ -32,8 +32,9 @@ export default {
   },
   methods: {
     getDetail() {
-      const { id, version, status } = this.$route.params
-      const query = status === 5 ? `jobId=${id}&version=${version}` : `jobId=${id}`
+      const { id, version, lastVersion, status } = this.$route.params
+      const useVersion = [5, 8, 9].includes(status) ? version : lastVersion
+      const query = `jobId=${id}&version=${useVersion || version}`
       api
         .fetch(`streamis/streamJobManager/job/jobContent?${query}`, 'get')
         .then(res => {

web/src/apps/streamis/module/jobHistory/index.vue

@@ -202,8 +202,9 @@ export default {
   },
   methods: {
     getDatas() {
-      const { id, version } = this.$route.params || {}
-      const queries = `?jobId=${id}&version=${version}&pageNow=${this.page.current}&pageSize=${this.page.size}`
+      const { id, version, lastVersion, status } = this.$route.params
+      const useVersion = [5, 8, 9].includes(status) ? version : lastVersion
+      const queries = `?jobId=${id}&version=${useVersion || version}&pageNow=${this.page.current}&pageSize=${this.page.size}`
       this.loading = true
       api
         .fetch('streamis/streamJobManager/job/execute/history' + queries, 'get')
@@ -339,7 +340,7 @@ export default {
   }
 }
 .full {
-  ::v-deep.ivu-modal{
+  ::v-deep .ivu-modal{
     width: 100vw !important;
     height: 100vh;
     min-height: 430px;
@@ -348,7 +349,7 @@ export default {
       height: 100%;
     }
   }
-  ::v-deeptextarea{
+  ::v-deep textarea{
    height: calc(100vh - 200px) !important;
    min-height: 200px;
    max-height: calc(100vh - 200px) !important;

web/src/apps/streamis/module/jobList/index.vue

@@ -1407,6 +1407,7 @@ export default {
             : 'jobSummary',
           name: rowData.name,
           version: rowData.version,
+          lastVersion: rowData.lastVersion,
           status: rowData.status,
           jobType: rowData.jobType,
           manageMode: rowData.manageMode,
@@ -1664,11 +1665,11 @@ export default {
   color: #ff9900;
 }
 
-::v-deep.ivu-table .warning-row td{
+::v-deep .ivu-table .warning-row td{
   background-color: #ff9900;
   border-right: none;
 }
-::v-deep.ivu-table .disabled-row td{
+::v-deep .ivu-table .disabled-row td{
   background-color: #eee;
   border-right: none;
 }

web/src/apps/streamis/module/jobSummary/index.vue

@@ -167,11 +167,12 @@ export default {
   },
   methods: {
     getDatas() {
-      const { id, version } = this.$route.params || {}
+      const { id, version, lastVersion, status } = this.$route.params
+      const useVersion = [5, 8, 9].includes(status) ? version : lastVersion
 
       api
         .fetch(
-          `streamis/streamJobManager/job/details?jobId=${id}&version=${version}`,
+          `streamis/streamJobManager/job/details?jobId=${id}&version=${useVersion || version}`,
           'get'
         )
         .then(res => {

web/src/apps/streamis/module/logDetail/index.vue

@@ -226,7 +226,7 @@ export default {
   }
 }
 .full {
-  ::v-deep.ivu-modal{
+  ::v-deep .ivu-modal{
     width: 100vw !important;
     height: 100vh;
     min-height: 430px;
@@ -235,7 +235,7 @@ export default {
       height: 100%;
     }
   }
-  ::v-deeptextarea{
+  ::v-deep textarea{
    height: calc(100vh - 200px) !important;
    min-height: 200px;
    max-height: calc(100vh - 200px) !important;

web/src/apps/streamis/module/versionDetail/index.vue

@@ -91,6 +91,7 @@ export default {
           module: 'jobHistory',
           name: rowData.name,
           version: rowData.version,
+          lastVersion: rowData.lastVersion,
           status: rowData.status,
           jobType: rowData.jobType,
           isHistory: true,