{{$t('Main jar package')}}
-
+
{{ node.raw.fullName }}
@@ -606,4 +606,12 @@
}
}
}
+ .vue-treeselect--disabled {
+ .vue-treeselect__control {
+ background-color: #ecf3f8;
+ .vue-treeselect__single-value {
+ color: #6d859e;
+ }
+ }
+ }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
index 843c1eaf1f..9e7f3305e5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
@@ -37,7 +37,7 @@
- {{$t('Table')}}
+ {{$t('TableMode')}}
{{$t('Attachment')}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
index 22acfba408..daa30d7c44 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
@@ -43,7 +43,7 @@
props: {},
methods: {
...mapMutations('dag', ['setIsDetails', 'resetParams']),
- ...mapActions('dag', ['getProcessList','getProjectList', 'getResourcesList', 'getInstancedetail']),
+ ...mapActions('dag', ['getProcessList','getProjectList', 'getResourcesList', 'getInstancedetail','getResourcesListJar']),
...mapActions('security', ['getTenantList','getWorkerGroupsAll']),
/**
* init
@@ -62,6 +62,8 @@
this.getProjectList(),
// get resources
this.getResourcesList(),
+ // get jar
+ this.getResourcesListJar(),
// get worker group list
this.getWorkerGroupsAll(),
this.getTenantList()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index 53939f3f7b..95bdc2930c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -46,7 +46,7 @@
{{$t('Timing state')}}
|
-
+ |
{{$t('Operation')}}
|
@@ -90,6 +90,7 @@
+
v.code === code)[0].desc
},
@@ -306,6 +307,21 @@
releaseState: 1
})
},
+ /**
+ * copy
+ */
+ _copyProcess (item) {
+ this.copyProcess({
+ processId: item.id
+ }).then(res => {
+ this.$message.success(res.msg)
+ $('body').find('.tooltip.fade.top.in').remove()
+ this._onUpdate()
+ }).catch(e => {
+ this.$message.error(e.msg || '')
+ })
+ },
+
_export (item) {
this.exportDefinition({
processDefinitionId: item.id,
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
index ff56de53e5..e47d8c757f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
@@ -193,6 +193,7 @@
runMode: 'RUN_MODE_SERIAL',
processInstancePriority: 'MEDIUM',
workerGroup: 'default'
+
}
},
props: {
@@ -277,6 +278,18 @@
this.workflowName = this.item.name
this._getReceiver()
+ let stateWorkerGroupsList = this.store.state.security.workerGroupsListAll || []
+ if (stateWorkerGroupsList.length) {
+ this.workerGroup = stateWorkerGroupsList[0].id
+ } else {
+ this.store.dispatch('security/getWorkerGroupsAll').then(res => {
+ this.$nextTick(() => {
+ if(res.length>0) {
+ this.workerGroup = res[0].id
+ }
+ })
+ })
+ }
},
mounted () {
this._getNotifyGroupList().then(() => {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
index 1f28578504..5dd12b4355 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
@@ -35,7 +35,7 @@
-
+
@@ -64,7 +64,8 @@
pageNo: 1,
searchVal: '',
userId: ''
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -98,6 +99,11 @@
* get data list
*/
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getProcessListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -133,6 +139,9 @@
mounted() {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
index b95d4ed720..891dc2e281 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
@@ -30,7 +30,7 @@
-
+
@@ -74,7 +74,8 @@
endDate: '',
// Exectuor Name
executorName: ''
- }
+ },
+ isLeft: true
}
},
props: {},
@@ -136,6 +137,11 @@
* @desc Prevent functions from being called multiple times
*/
_debounceGET: _.debounce(function (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this._getProcessInstanceListP(flag)
}, 100, {
'leading': false,
@@ -183,6 +189,7 @@
beforeDestroy () {
// Destruction wheel
clearInterval(this.setIntervalP)
+ sessionStorage.setItem('isLeft',1)
},
components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
index 4cb166647e..594ffad14e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
@@ -30,7 +30,7 @@
-
+
@@ -71,7 +71,8 @@
endDate: '',
// Exectuor Name
executorName: ''
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -118,6 +119,11 @@
* @desc Prevent functions from being called multiple times
*/
_debounceGET: _.debounce(function (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this._getList(flag)
}, 100, {
'leading': false,
@@ -146,6 +152,7 @@
beforeDestroy () {
// Destruction wheel
clearInterval(this.setIntervalP)
+ sessionStorage.setItem('isLeft',1)
},
components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
index 73ce023ee7..5cf343ddda 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
@@ -38,7 +38,7 @@
-
+
@@ -67,7 +67,8 @@
pageNo: 1,
searchVal: '',
type: 'FILE'
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -91,6 +92,11 @@
this.searchParams.pageSize = val
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -125,6 +131,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
index 12be6b0bc8..dac5cc0a86 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
@@ -42,7 +42,7 @@
-
+
@@ -73,6 +73,7 @@
searchVal: '',
type: 'FILE'
},
+ isLeft: true,
breadList: []
}
},
@@ -97,6 +98,11 @@
this.searchParams.pageSize = val
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -159,6 +165,9 @@
this.breadList = dir
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
index d6c79bd258..74b789fe93 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
@@ -36,8 +36,7 @@
-
-
+
@@ -64,7 +63,8 @@
pageSize: 10,
pageNo: 1,
searchVal: ''
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -110,6 +110,11 @@
this._debounceGET()
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getUdfFuncListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -137,6 +142,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mListConstruction, mConditions, mList, mSpin, mCreateUdf, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
index b87b17800a..4058f267b7 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
@@ -37,8 +37,7 @@
-
-
+
@@ -66,7 +65,8 @@
pageNo: 1,
searchVal: '',
type: 'UDF'
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -98,6 +98,11 @@
this._debounceGET()
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -125,6 +130,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
index dd39716f9a..ea8c4d838f 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
@@ -41,7 +41,7 @@
-
+
@@ -72,6 +72,7 @@
searchVal: '',
type: 'UDF'
},
+ isLeft: true,
breadList: []
}
},
@@ -106,6 +107,11 @@
this._debounceGET()
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -160,6 +166,9 @@
this.breadList = dir
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
index 47ce14abd7..8e559e45a7 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
@@ -38,7 +38,7 @@
-
+
@@ -66,6 +66,7 @@
pageNo: 1,
searchVal: ''
},
+ isLeft: true,
isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER'
}
},
@@ -116,6 +117,11 @@
})
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getQueueListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -143,6 +149,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mList, mListConstruction, mConditions, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
index 0c38f0a911..ca180b1718 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
@@ -39,7 +39,7 @@
-
+
@@ -67,6 +67,7 @@
pageNo: 1,
searchVal: ''
},
+ isLeft: true,
isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER'
}
},
@@ -120,6 +121,11 @@
})
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getTenantListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -147,6 +153,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mList, mListConstruction, mConditions, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
index f8ad40df85..b09b08bcf6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
@@ -39,7 +39,7 @@
-
+
@@ -65,7 +65,8 @@
pageSize: 10,
pageNo: 1,
searchVal: ''
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -118,6 +119,11 @@
})
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getUsersListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -145,6 +151,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mList, mListConstruction, mConditions, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
index e70ead46ce..ad604ba3a6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
@@ -39,7 +39,7 @@
-
+
@@ -67,6 +67,7 @@
pageNo: 1,
searchVal: ''
},
+ isLeft: true,
isADMIN: store.state.user.userInfo.userType === 'ADMIN_USER'
}
},
@@ -120,6 +121,11 @@
})
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getAlertgroupP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -147,6 +153,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mList, mListConstruction, mConditions, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
index 21d2becd32..3398acca13 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
@@ -40,7 +40,7 @@
-
+
@@ -67,7 +67,8 @@
pageSize: 10,
pageNo: 1,
searchVal: ''
- }
+ },
+ isLeft: true
}
},
mixins: [listUrlParamHandle],
@@ -120,6 +121,11 @@
})
},
_getList (flag) {
+ if(sessionStorage.getItem('isLeft')==0) {
+ this.isLeft = false
+ } else {
+ this.isLeft = true
+ }
this.isLoading = !flag
this.getTokenListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -147,6 +153,9 @@
mounted () {
this.$modal.destroy()
},
+ beforeDestroy () {
+ sessionStorage.setItem('isLeft',1)
+ },
components: { mSecondaryMenu, mList, mListConstruction, mConditions, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
index a63c9edb8c..f282c8e30a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
@@ -90,6 +90,7 @@ export default {
})
})
},
+
/**
* Get process definition DAG diagram details
*/
@@ -127,6 +128,22 @@ export default {
})
})
},
+
+/**
+ * Get process definition DAG diagram details
+ */
+ copyProcess ({ state }, payload) {
+ return new Promise((resolve, reject) => {
+ io.post(`projects/${state.projectName}/process/copy`, {
+ processId: payload.processId
+ }, res => {
+ resolve(res)
+ }).catch(e => {
+ reject(e)
+ })
+ })
+ },
+
/**
* Get the process instance DAG diagram details
*/
diff --git a/dolphinscheduler-ui/src/js/conf/login/App.vue b/dolphinscheduler-ui/src/js/conf/login/App.vue
index a79743a262..8d065920a8 100644
--- a/dolphinscheduler-ui/src/js/conf/login/App.vue
+++ b/dolphinscheduler-ui/src/js/conf/login/App.vue
@@ -84,6 +84,7 @@
this._gLogin().then(res => {
setTimeout(() => {
this.spinnerLoading = false
+ sessionStorage.setItem('isLeft',1);
if (res.data.hasOwnProperty("sessionId")) {
let sessionId=res.data.sessionId
sessionStorage.setItem("sessionId", sessionId)
diff --git a/dolphinscheduler-ui/src/js/module/components/nav/m_logo.png b/dolphinscheduler-ui/src/js/module/components/nav/m_logo.png
deleted file mode 100644
index d597f2d0bf..0000000000
Binary files a/dolphinscheduler-ui/src/js/module/components/nav/m_logo.png and /dev/null differ
diff --git a/dolphinscheduler-ui/src/js/module/components/nav/nav.vue b/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
index a46ff6fe74..7c82dc660e 100644
--- a/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
+++ b/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
@@ -387,7 +387,6 @@
.logo-m {
width: 36px;
height: 36px;
- background: url("./m_logo.png");
margin: 0 auto;
position: relative;
top: 12px;
diff --git a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
index 102df8f910..5336555c21 100644
--- a/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
+++ b/dolphinscheduler-ui/src/js/module/components/secondaryMenu/secondaryMenu.vue
@@ -63,7 +63,8 @@
menuList: menu(this.type),
index: 0,
id: this.$route.params.id,
- isTogHide: false
+ isTogHide: false,
+ isLeft: true
}
},
props: {
@@ -82,6 +83,11 @@
},
_toggleMenu () {
this.isTogHide = !this.isTogHide
+ if(this.isTogHide) {
+ sessionStorage.setItem('isLeft',0)
+ } else {
+ sessionStorage.setItem('isLeft',1)
+ }
}
},
mounted () {
diff --git a/dolphinscheduler-ui/src/js/module/components/spin/spin.vue b/dolphinscheduler-ui/src/js/module/components/spin/spin.vue
index 95fc8e924e..7c6a9c3acf 100644
--- a/dolphinscheduler-ui/src/js/module/components/spin/spin.vue
+++ b/dolphinscheduler-ui/src/js/module/components/spin/spin.vue
@@ -47,7 +47,7 @@
#spin-model {
position: fixed;
left: 20px;
- top: 80px;
+ top: 60px;
background: #fff;
z-index: 99;
border-radius: 3px;
@@ -69,11 +69,11 @@
}
&.spin-sp1 {
width: calc(100% - 40px);
- height: calc(100% - 100px);
+ height: calc(100% - 60px);
}
&.spin-sp2 {
- width: calc(100% - 240px);
- height: calc(100% - 100px);
+ width: calc(100% - 220px);
+ height: calc(100% - 60px);
left: 220px;
}
}
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index db19e1fc0e..0e83689149 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -115,6 +115,7 @@ export default {
'Title': 'Title',
'Please enter the title of email': 'Please enter the title of email',
'Table': 'Table',
+ 'TableMode': 'Table',
'Attachment': 'Attachment',
'SQL Parameter': 'SQL Parameter',
'SQL Statement': 'SQL Statement',
@@ -538,7 +539,6 @@ export default {
'Whether directory': 'Whether directory',
'Yes': 'Yes',
'No': 'No',
- 'Modify User': 'Modify User',
'Please enter Mysql Database(required)': 'Please enter Mysql Database(required)',
'Please enter Mysql Table(required)': 'Please enter Mysql Table(required)',
'Please enter Columns (Comma separated)': 'Please enter Columns (Comma separated)',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 80b45c7a11..134ca84a58 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -116,6 +116,7 @@ export default {
'Title': '主题',
'Please enter the title of email': '请输入邮件主题',
'Table': '表名',
+ 'TableMode': '表格',
'Attachment': '附件',
'SQL Parameter': 'sql参数',
'SQL Statement': 'sql语句',
@@ -538,7 +539,6 @@ export default {
'Whether directory' : '是否文件夹',
'Yes': '是',
'No': '否',
- 'Modify User': '修改用户',
'Please enter Mysql Database(required)': '请输入Mysql数据库(必填)',
'Please enter Mysql Table(required)': '请输入Mysql表名(必填)',
'Please enter Columns (Comma separated)': '请输入列名,用 , 隔开',
diff --git a/dolphinscheduler-ui/src/sass/conf/home/index.scss b/dolphinscheduler-ui/src/sass/conf/home/index.scss
index 76b9f6da01..16f588363d 100644
--- a/dolphinscheduler-ui/src/sass/conf/home/index.scss
+++ b/dolphinscheduler-ui/src/sass/conf/home/index.scss
@@ -24,8 +24,13 @@ body {
.ans-message-box,.ans-message-wrapper {
z-index: 121 !important;
}
+ &::-webkit-scrollbar {
+ width: 0;
+ height: 0;
+ }
}
+
@media screen and (max-width: 960px){
.nav-model {
.logo-box,
diff --git a/dolphinscheduler-ui/src/view/home/index.html b/dolphinscheduler-ui/src/view/home/index.html
index 70f528216c..2a18be212d 100644
--- a/dolphinscheduler-ui/src/view/home/index.html
+++ b/dolphinscheduler-ui/src/view/home/index.html
@@ -21,7 +21,9 @@
-
+
+
+
diff --git a/pom.xml b/pom.xml
index 053652fc92..0647724ed0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -695,6 +695,7 @@
**/api/enums/testGetEnum.java
**/api/enums/StatusTest.java
**/api/exceptions/ApiExceptionHandlerTest.java
+ **/api/exceptions/ServiceExceptionTest.java
**/api/interceptor/LoginHandlerInterceptorTest.java
**/api/security/PasswordAuthenticatorTest.java
**/api/security/SecurityConfigTest.java
@@ -763,6 +764,7 @@
**/common/utils/HadoopUtilsTest.java
**/common/utils/HttpUtilsTest.java
**/common/ConstantsTest.java
+ **/common/utils/HadoopUtils.java
**/dao/mapper/AccessTokenMapperTest.java
**/dao/mapper/AlertGroupMapperTest.java
**/dao/mapper/CommandMapperTest.java