[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 <shenglm840722@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 <438044805@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 <acm_master@163.com> Co-authored-by: kyoty <echohlne@gmail.com> Co-authored-by: ji04xiaogang <ji04xiaogang@163.com> Co-authored-by: shenglm <shenglm840722@126.com> Co-authored-by: wangxj3 <857234426@qq.com> Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com> Co-authored-by: chenxingchun <438044805@qq.com> Co-authored-by: Shiwen Cheng <chengshiwen0103@gmail.com> Co-authored-by: Jianchao Wang <akingchao@qq.com> Co-authored-by: JinyLeeChina <297062848@qq.com>
This commit is contained in:
parent
14035c03e2
commit
654fa39789
|
|
@ -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, '.');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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 () {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -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': '定时管理',
|
||||
|
|
|
|||
Loading…
Reference in New Issue