You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/07/05 15:22:20 UTC
[dolphinscheduler] branch json_split_two updated:
[Feature][JsonSplit-api]merge code from dev to json_split_two (#5750)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch json_split_two
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/json_split_two by this push:
new 654fa39 [Feature][JsonSplit-api]merge code from dev to json_split_two (#5750)
654fa39 is described below
commit 654fa397891e16cfe541fb62a82017735842ff33
Author: JinyLeeChina <42...@users.noreply.github.com>
AuthorDate: Mon Jul 5 23:21:57 2021 +0800
[Feature][JsonSplit-api]merge code from dev to json_split_two (#5750)
* [BUG-#5678][Registry]fix registry init node miss (#5686)
* [Improvement][UI] Update the update time after the user information is successfully modified (#5684)
* improve
edit the userinfo success, but the updatetime is not the latest.
* Improved shell task execution result log information, adding process.waitFor() and process.exitValue() information to the original log (#5691)
Co-authored-by: shenglm <sh...@126.com>
* [Feature-#5565][Master Worker-Server] Global Param passed by sense dependencies (#5603)
* add globalParams new plan with varPool
* add unit test
* add python task varPoolParams
Co-authored-by: wangxj <wangxj31>
* Issue robot translation judgment changed to Chinese (#5694)
Co-authored-by: chenxingchun <43...@qq.com>
* the update function should use post instead of get (#5703)
* enhance form verify (#5696)
* checkState only supports %s not {} (#5711)
* [Fix-5701]When deleting a user, the accessToken associated with the user should also be deleted (#5697)
* update
* fix the codestyle error
* fix the compile error
* support rollback
* [Fix-5699][UI] Fix update user error in user information (#5700)
* [Improvement] the automatically generated spi service name in alert-plugin is wrong (#5676)
* bug fix
the auto generated spi service can't be recongized
* include a new method
* [Improvement-5622][project management] Modify the title (#5723)
Co-authored-by: Kirs <ac...@163.com>
Co-authored-by: kyoty <ec...@gmail.com>
Co-authored-by: ji04xiaogang <ji...@163.com>
Co-authored-by: shenglm <sh...@126.com>
Co-authored-by: wangxj3 <85...@qq.com>
Co-authored-by: xingchun-chen <55...@users.noreply.github.com>
Co-authored-by: chenxingchun <43...@qq.com>
Co-authored-by: Shiwen Cheng <ch...@gmail.com>
Co-authored-by: Jianchao Wang <ak...@qq.com>
Co-authored-by: JinyLeeChina <29...@qq.com>
---
.../dolphinscheduler/spi/plugin/DolphinPluginDiscovery.java | 6 +++++-
.../conf/home/pages/security/pages/users/_source/createUser.vue | 9 ++++++---
.../src/js/conf/home/pages/security/pages/users/index.vue | 6 ++++--
.../src/js/conf/home/pages/user/pages/account/_source/info.vue | 9 ++-------
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 2 +-
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 2 +-
6 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/DolphinPluginDiscovery.java b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/DolphinPluginDiscovery.java
index 00927eb..92e6878 100644
--- a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/DolphinPluginDiscovery.java
+++ b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/DolphinPluginDiscovery.java
@@ -97,7 +97,7 @@ final class DolphinPluginDiscovery {
public FileVisitResult visitFile(Path file, BasicFileAttributes attributes) {
if (file.getFileName().toString().endsWith(JAVA_CLASS_FILE_SUFFIX)) {
String name = file.subpath(base.getNameCount(), file.getNameCount()).toString();
- list.add(javaName(name.substring(0, name.length() - JAVA_CLASS_FILE_SUFFIX.length())));
+ list.add(convertClassName(name.substring(0, name.length() - JAVA_CLASS_FILE_SUFFIX.length())));
}
return FileVisitResult.CONTINUE;
}
@@ -135,4 +135,8 @@ final class DolphinPluginDiscovery {
private static String javaName(String binaryName) {
return binaryName.replace('/', '.');
}
+
+ private static String convertClassName(String pathName) {
+ return pathName.replace(File.separatorChar, '.');
+ }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
index e53128b..53db31c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue
@@ -138,7 +138,8 @@
}
},
props: {
- item: Object
+ item: Object,
+ fromUserInfo: Boolean
},
methods: {
_ok () {
@@ -292,8 +293,9 @@
this.userPassword = ''
this.email = this.item.email
this.phone = this.item.phone
+ this.state = this.item.state
this.userState = this.item.state + '' || '1'
- if (this.item.tenantId) {
+ if (this.fromUserInfo || this.item.tenantId) {
this.tenantId = this.item.tenantId
}
this.$nextTick(() => {
@@ -310,8 +312,9 @@
this.userPassword = ''
this.email = this.item.email
this.phone = this.item.phone
+ this.state = this.item.state
this.userState = this.state + '' || '1'
- if (this.item.tenantId) {
+ if (this.fromUserInfo || this.item.tenantId) {
this.tenantId = this.item.tenantId
}
if (this.queueList.length > 0) {
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 220346b..f078901 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
@@ -60,7 +60,7 @@
</template>
<script>
import _ from 'lodash'
- import { mapActions } from 'vuex'
+ import { mapActions, mapMutations } from 'vuex'
import mList from './_source/list'
import mCreateUser from './_source/createUser'
import mSpin from '@/module/components/spin/spin'
@@ -89,6 +89,7 @@
mixins: [listUrlParamHandle],
props: {},
methods: {
+ ...mapMutations('user', ['setUserInfo']),
...mapActions('security', ['getUsersListP']),
/**
* Query
@@ -113,8 +114,9 @@
this.item = item
this.createUserDialog = true
},
- onUpdate () {
+ onUpdate (param) {
this._debounceGET('false')
+ this.setUserInfo(param)
this.createUserDialog = false
},
close () {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
index 5f30ed8..3a48b53 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
@@ -73,7 +73,7 @@
v-if="createUserDialog"
:visible.sync="createUserDialog"
width="auto">
- <m-create-user :item="item" @onUpdate="onUpdate" @close="close"></m-create-user>
+ <m-create-user :item="item" :from-user-info="true" @onUpdate="onUpdate" @close="close"></m-create-user>
</el-dialog>
</template>
</m-list-box-f>
@@ -104,12 +104,7 @@
this.createUserDialog = true
},
onUpdate (param) {
- this.setUserInfo({
- userName: param.userName,
- userPassword: param.userPassword,
- email: param.email,
- phone: param.phone
- })
+ this.setUserInfo(param)
this.getUserInfo().finally(() => {
this.createUserDialog = false
})
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 d3f0582..c158ba6 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -69,7 +69,7 @@ export default {
Add: 'Add',
'DAG graph name cannot be empty': 'DAG graph name cannot be empty',
'Create Datasource': 'Create Datasource',
- 'Project Home': 'Project Home',
+ 'Project Home': 'Workflow Monitor',
'Project Manage': 'Project',
'Create Project': 'Create Project',
'Cron Manage': 'Cron Manage',
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 7065d73..5f13494 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -69,7 +69,7 @@ export default {
Add: '添加',
'DAG graph name cannot be empty': 'DAG图名称不能为空',
'Create Datasource': '创建数据源',
- 'Project Home': '项目首页',
+ 'Project Home': '工作流监控',
'Project Manage': '项目管理',
'Create Project': '创建项目',
'Cron Manage': '定时管理',