fix(系统设置): 修复项目管理筛选人下拉框选项数据问题
--bug=1033540 --user=王旭 [系统设置]github#27900项目管理列表中创建人筛选条件数据不对 https://www.tapd.cn/55049933/s/1443790
This commit is contained in:
parent
f8757ebd7d
commit
2e529d07f4
|
@ -380,6 +380,28 @@ export const CREATOR = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const WS_CREATOR = {
|
||||||
|
key: "creator",
|
||||||
|
name: 'MsTableSearchSelect',
|
||||||
|
label: 'api_test.creator',
|
||||||
|
operator: {
|
||||||
|
options: [OPERATORS.IN, OPERATORS.NOT_IN, OPERATORS.CURRENT_USER],
|
||||||
|
change: function (component, value) { // 运算符change事件
|
||||||
|
if (value === OPERATORS.CURRENT_USER.value) {
|
||||||
|
component.value = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
options: MS_USER_OPTIONS,
|
||||||
|
props: {
|
||||||
|
multiple: true
|
||||||
|
},
|
||||||
|
isShow: operator => {
|
||||||
|
return operator !== OPERATORS.CURRENT_USER.value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// 创建人(仅当前项目)
|
// 创建人(仅当前项目)
|
||||||
export const PROJECT_CREATOR = {
|
export const PROJECT_CREATOR = {
|
||||||
key: "creator",
|
key: "creator",
|
||||||
|
@ -952,6 +974,8 @@ export const TEST_CONFIGS = [ID, NAME, UPDATE_TIME, CREATE_TIME, STATUS, CREATOR
|
||||||
|
|
||||||
export const PROJECT_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, CREATOR];
|
export const PROJECT_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, CREATOR];
|
||||||
|
|
||||||
|
export const PROJECT_MANAGE_CONFIGS = [NAME, UPDATE_TIME, CREATE_TIME, WS_CREATOR];
|
||||||
|
|
||||||
export const REPORT_SCENARIO_CONFIGS = [NAME, TEST_NAME, CREATE_TIME, STATUS, CREATOR, TRIGGER_MODE];
|
export const REPORT_SCENARIO_CONFIGS = [NAME, TEST_NAME, CREATE_TIME, STATUS, CREATOR, TRIGGER_MODE];
|
||||||
|
|
||||||
export const REPORT_CONFIGS = [NAME, TEST_NAME, CREATE_TIME, PERFORMANCE_REPORT_STATUS, CREATOR, TRIGGER_MODE];
|
export const REPORT_CONFIGS = [NAME, TEST_NAME, CREATE_TIME, PERFORMANCE_REPORT_STATUS, CREATOR, TRIGGER_MODE];
|
||||||
|
|
|
@ -196,7 +196,7 @@ import MsTableOperatorButton from "metersphere-frontend/src/components/MsTableOp
|
||||||
import {GROUP_PROJECT, PROJECT_ID} from "metersphere-frontend/src/utils/constants";
|
import {GROUP_PROJECT, PROJECT_ID} from "metersphere-frontend/src/utils/constants";
|
||||||
import MsTableButton from "metersphere-frontend/src/components/MsTableButton";
|
import MsTableButton from "metersphere-frontend/src/components/MsTableButton";
|
||||||
import {_filter, _sort} from "metersphere-frontend/src/utils/tableUtils";
|
import {_filter, _sort} from "metersphere-frontend/src/utils/tableUtils";
|
||||||
import {PROJECT_CONFIGS} from "metersphere-frontend/src/components/search/search-components";
|
import {PROJECT_MANAGE_CONFIGS} from "metersphere-frontend/src/components/search/search-components";
|
||||||
import MsRolesTag from "metersphere-frontend/src/components/MsRolesTag";
|
import MsRolesTag from "metersphere-frontend/src/components/MsRolesTag";
|
||||||
import MsInstructionsIcon from "metersphere-frontend/src/components/MsInstructionsIcon";
|
import MsInstructionsIcon from "metersphere-frontend/src/components/MsInstructionsIcon";
|
||||||
import AddMember from "../../common/AddMember";
|
import AddMember from "../../common/AddMember";
|
||||||
|
@ -204,7 +204,7 @@ import {isSuperUser} from "metersphere-frontend/src/api/user.js";
|
||||||
import {
|
import {
|
||||||
addProjectMember,
|
addProjectMember,
|
||||||
delProjectMember,
|
delProjectMember,
|
||||||
getCurrentProjectUserList,
|
getWorkspaceMemberSpecial,
|
||||||
getProjectMemberPages,
|
getProjectMemberPages,
|
||||||
updateCurrentUser
|
updateCurrentUser
|
||||||
} from "../../../api/user";
|
} from "../../../api/user";
|
||||||
|
@ -244,7 +244,7 @@ export default {
|
||||||
memberTableLoading: false,
|
memberTableLoading: false,
|
||||||
btnTips: this.$t('project.create'),
|
btnTips: this.$t('project.create'),
|
||||||
title: this.$t('project.create'),
|
title: this.$t('project.create'),
|
||||||
condition: {components: PROJECT_CONFIGS},
|
condition: {components: PROJECT_MANAGE_CONFIGS},
|
||||||
items: [],
|
items: [],
|
||||||
form: {},
|
form: {},
|
||||||
currentPage: 1,
|
currentPage: 1,
|
||||||
|
@ -337,7 +337,7 @@ export default {
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getMaintainerOptions() {
|
getMaintainerOptions() {
|
||||||
getCurrentProjectUserList().then(res => {
|
getWorkspaceMemberSpecial({name: '', workspaceId: getCurrentWorkspaceId()}).then(res => {
|
||||||
this.userFilters = res.data.map(u => {
|
this.userFilters = res.data.map(u => {
|
||||||
return {text: u.name, value: u.id};
|
return {text: u.name, value: u.id};
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue