fix(系统设置): 修改模版bug去掉多余断点&修改切换组织不展示问题

This commit is contained in:
xinxin.wu 2024-02-02 12:13:25 +08:00 committed by 刘瑞斌
parent 535e5e06c4
commit 06579f0783
8 changed files with 13 additions and 12 deletions

View File

@ -5,6 +5,7 @@
:mask="true" :mask="true"
title-align="start" title-align="start"
class="ms-modal-upload ms-modal-medium" class="ms-modal-upload ms-modal-medium"
unmount-on-close
@close="cancelBatch" @close="cancelBatch"
> >
<template #title> <template #title>

View File

@ -2,6 +2,7 @@ import { defineStore } from 'pinia';
import { isLogin as userIsLogin, login as userLogin, logout as userLogout } from '@/api/modules/user'; import { isLogin as userIsLogin, login as userLogin, logout as userLogout } from '@/api/modules/user';
import { useI18n } from '@/hooks/useI18n'; import { useI18n } from '@/hooks/useI18n';
import useLicenseStore from '@/store/modules/setting/license';
import { getHashParameters } from '@/utils'; import { getHashParameters } from '@/utils';
import { clearToken, setToken } from '@/utils/auth'; import { clearToken, setToken } from '@/utils/auth';
import { composePermissions } from '@/utils/permission'; import { composePermissions } from '@/utils/permission';
@ -10,7 +11,6 @@ import { removeRouteListener } from '@/utils/route-listener';
import type { LoginData } from '@/models/user'; import type { LoginData } from '@/models/user';
import useAppStore from '../app'; import useAppStore from '../app';
import useLicenseStore from '../setting/license';
import { UserState } from './types'; import { UserState } from './types';
const useUserStore = defineStore('user', { const useUserStore = defineStore('user', {
@ -78,8 +78,11 @@ const useUserStore = defineStore('user', {
async login(loginForm: LoginData) { async login(loginForm: LoginData) {
try { try {
const res = await userLogin(loginForm); const res = await userLogin(loginForm);
setToken(res.sessionId, res.csrfToken); const licenseStore = useLicenseStore();
const appStore = useAppStore(); const appStore = useAppStore();
licenseStore.getValidateLicense();
setToken(res.sessionId, res.csrfToken);
appStore.setCurrentOrgId(res.lastOrganizationId || ''); appStore.setCurrentOrgId(res.lastOrganizationId || '');
appStore.setCurrentProjectId(res.lastProjectId || ''); appStore.setCurrentProjectId(res.lastProjectId || '');
this.setInfo(res); this.setInfo(res);

View File

@ -581,14 +581,15 @@
} }
} }
onMounted(() => { watchEffect(() => {
if (route.params.mode === 'edit' || route.params.mode === 'copy') { if (props.caseId) {
getCaseInfo(); getCaseInfo();
} else { } else {
initDefaultFields(); initDefaultFields();
} }
initSelectTree(); initSelectTree();
}); });
// //
function getFilesParams() { function getFilesParams() {
form.value.deleteFileMetaIds = deleteFileMetaIds.value; form.value.deleteFileMetaIds = deleteFileMetaIds.value;

View File

@ -16,7 +16,7 @@ export default {
'project.member.tableColumnStatus': '状态', 'project.member.tableColumnStatus': '状态',
'project.member.tableColumnActions': '操作', 'project.member.tableColumnActions': '操作',
'project.member.member': '成员', 'project.member.member': '成员',
'project.member.selectMemberScope': '请选择需要添加的成员支持多选', 'project.member.selectMemberScope': '请选择需要添加的成员支持多选',
'project.member.selectProjectScope': '请选择需要添加的项目支持多选', 'project.member.selectProjectScope': '请选择需要添加的项目支持多选',
'project.member.selectMemberEmptyTip': '成员不能为空', 'project.member.selectMemberEmptyTip': '成员不能为空',
'project.member.selectProjectEmptyTip': '项目不能为空', 'project.member.selectProjectEmptyTip': '项目不能为空',

View File

@ -351,14 +351,12 @@
// //
const setBreadText = () => { const setBreadText = () => {
debugger;
const { breadcrumbList } = appStore; const { breadcrumbList } = appStore;
const { firstBreadTitle, ThirdBreadTitle } = breadTitle.value; const { firstBreadTitle, ThirdBreadTitle } = breadTitle.value;
if (firstBreadTitle) { if (firstBreadTitle) {
breadcrumbList[0].locale = firstBreadTitle; breadcrumbList[0].locale = firstBreadTitle;
if (appStore.breadcrumbList.length > 2) { if (appStore.breadcrumbList.length > 2) {
breadcrumbList[2].locale = ThirdBreadTitle; breadcrumbList[2].locale = ThirdBreadTitle;
// breadcrumbList[1].query = ['type'];
} }
appStore.setBreadcrumbList(breadcrumbList); appStore.setBreadcrumbList(breadcrumbList);
} }
@ -385,7 +383,6 @@
); );
onMounted(() => { onMounted(() => {
debugger;
setBreadText(); setBreadText();
getClassifyField(); getClassifyField();
if (!isEdit.value) { if (!isEdit.value) {

View File

@ -16,7 +16,7 @@ export default {
'organization.member.tableColunmStatus': '状态', 'organization.member.tableColunmStatus': '状态',
'organization.member.tableColunmActions': '操作', 'organization.member.tableColunmActions': '操作',
'organization.member.member': '成员', 'organization.member.member': '成员',
'organization.member.selectMemberScope': '请选择需要添加的成员支持多选', 'organization.member.selectMemberScope': '请选择需要添加的成员支持多选',
'organization.member.selectProjectScope': '请选择需要添加的项目支持多选', 'organization.member.selectProjectScope': '请选择需要添加的项目支持多选',
'organization.member.selectMemberEmptyTip': '成员不能为空', 'organization.member.selectMemberEmptyTip': '成员不能为空',
'organization.member.selectProjectEmptyTip': '项目不能为空', 'organization.member.selectProjectEmptyTip': '项目不能为空',

View File

@ -251,7 +251,6 @@
// //
const updateBreadcrumbList = () => { const updateBreadcrumbList = () => {
debugger;
const { breadcrumbList } = appStore; const { breadcrumbList } = appStore;
const breadTitle = getCardList('organization').find((item: any) => item.key === route.query.type); const breadTitle = getCardList('organization').find((item: any) => item.key === route.query.type);
if (breadTitle) { if (breadTitle) {

View File

@ -37,7 +37,7 @@
<script setup lang="ts"> <script setup lang="ts">
/** /**
* @description 系统设置--组织-- * @description 系统设置--组织--
*/ */
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
@ -77,7 +77,7 @@
const fieldSetting = (key: string) => { const fieldSetting = (key: string) => {
router.push({ router.push({
name: SettingRouteEnum.SETTING_ORGANIZATION_TEMPLATE_FILED_SETTING, name: SettingRouteEnum.SETTING_ORGANIZATION_TEMPLATE_FILED_SETTING,
params: { query: {
type: key, type: key,
}, },
}); });