Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 项目成员管理 #9620 #10853

Merged
merged 6 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/frontend/devops-atomstore/src/views/edit_atom.vue
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@
const message = this.checkJobType()
this.$validator.validate().then(valid => {
if (isCheckValid && !message && valid) resolve()
// else reject(new Error(message || this.$t('store.校验不通过,请修改后再试')))
else reject(new Error(message || this.$t('store.校验不通过,请修改后再试')))
})
})
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const route = useRoute();
const emits = defineEmits(['change', 'removeAll']);
const userList = ref([]);
const tagInputRef = ref(null);
const projectId = computed(() => route.params?.projectCode);
const projectId = computed(() => route.params?.projectCode || route.query?.projectCode);
const searchKeyArr = computed(() => ['id', 'name']);
const searchValue = ref();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ export default {
},
handleMessage(event) {
const { data } = event;
if (data.type === 'IAM') {
if (data?.type === 'IAM') {
switch (data.code) {
case 'create_user_group_submit':
this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ const { t } = useI18n();
const route = useRoute();
const formRef = ref(null);
const renewalRef = ref(null);
const projectId = computed(() => route.params?.projectCode);
const projectId = computed(() => route.params?.projectCode || route.query?.projectCode);
const expiredAt = ref(30);
const isShowSlider = ref(false);
const sliderTitle = ref();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ const {
memberPagination,
} = storeToRefs(manageAsideStore);

const projectId = computed(() => route.params?.projectCode);
const projectId = computed(() => route.params?.projectCode || route.query?.projectCode);
const removeUser = ref(null);
const isChecking = ref(false);
const overTable = ref([]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ const TOOLTIPS_CONTENT = {
UNIQUE_OWNER: t('唯一拥有者,不可移出。请添加新的拥有者后再移出'),
TEMPLATE: t('通过用户组加入,不可直接移出。如需调整,请编辑用户组')
}
const projectId = computed(() => route.params?.projectCode);
const projectId = computed(() => route.params?.projectCode || route.query?.projectCode);
const tableList = computed(() => props.data.map(item => ({
...item,
unableMessage: getUnableMessage(item),
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/devops-manage/src/store/userGroupTable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default defineStore('userGroupTable', () => {
const route = useRoute();
const isLoading = ref(true);

const projectId = computed(() => route.params?.projectCode as string);
const projectId = computed(() => (route.params?.projectCode || route.query?.projectCode) as string) ;
const paginations = ref({})

const sourceList = ref<SourceType[]>([]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ const isResetFailure = ref(false);
const isResetSuccess = ref(false);
const isChecking = ref(false);
const canLoading = ref(true);
const projectId = computed(() => route.params?.projectCode);
const projectId = computed(() => route.params?.projectCode || route.query?.projectCode);
const userId = computed(() => route.query?.userId);
const initialResourceType = computed(() => route.query?.resourceType || 'repertory');
const resourceType = ref(initialResourceType.value);
Expand Down
Loading