移除示例项目初始化并修复前后端稳定性问题
This commit is contained in:
@@ -118,6 +118,7 @@
|
||||
</div>
|
||||
|
||||
<el-drawer
|
||||
v-if="detailVisible"
|
||||
v-model="detailVisible"
|
||||
direction="rtl"
|
||||
size="560px"
|
||||
|
||||
@@ -1390,7 +1390,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-dialog append-to="body" v-model="publishConfirmVisible" title="发布确认" width="920px" top="8vh" class="setup-publish-dialog">
|
||||
<el-dialog v-if="publishConfirmVisible" append-to="body" v-model="publishConfirmVisible" title="发布确认" width="920px" top="8vh" class="setup-publish-dialog">
|
||||
<div class="conflict-summary">
|
||||
<div>发布目标:立项配置草稿</div>
|
||||
<div>当前发布版本:{{ setupPublishedVersionText }}</div>
|
||||
@@ -1451,6 +1451,7 @@
|
||||
</template>
|
||||
</el-dialog>
|
||||
<el-dialog
|
||||
v-if="rollbackDialogVisible"
|
||||
append-to="body"
|
||||
v-model="rollbackDialogVisible"
|
||||
width="960px"
|
||||
@@ -1499,7 +1500,7 @@
|
||||
:key="`head-${lane.branch}`"
|
||||
class="rollback-axis-lane-head-item"
|
||||
:class="{ 'is-main': lane.branch === 'main' }"
|
||||
:style="{ left: `${lane.x}px` }"
|
||||
:style="getRollbackAxisLeftStyle(lane.x)"
|
||||
>
|
||||
{{ formatAxisLaneLabel(lane.branch) }}
|
||||
</span>
|
||||
@@ -1566,7 +1567,7 @@
|
||||
v-for="lane in rollbackAxisLanes.filter(l => l.branch === 'main')"
|
||||
:key="`${row.id}-${lane.branch}`"
|
||||
class="rollback-axis-lane-segment is-main-lane"
|
||||
:style="{ left: `${lane.x}px` }"
|
||||
:style="getRollbackAxisLeftStyle(lane.x)"
|
||||
/>
|
||||
<span
|
||||
class="rollback-axis-dot"
|
||||
@@ -1575,7 +1576,7 @@
|
||||
'is-current': row.is_current_published,
|
||||
'is-merge': row.mergeFromId !== null,
|
||||
}"
|
||||
:style="{ left: `${row.axisX}px` }"
|
||||
:style="getRollbackAxisLeftStyle(row.axisX)"
|
||||
/>
|
||||
</div>
|
||||
<div class="rollback-axis-content">
|
||||
@@ -1661,6 +1662,7 @@
|
||||
</el-dialog>
|
||||
|
||||
<el-drawer
|
||||
v-if="projectMilestoneEditorVisible"
|
||||
v-model="projectMilestoneEditorVisible"
|
||||
direction="rtl"
|
||||
size="480px"
|
||||
@@ -1763,6 +1765,7 @@
|
||||
</el-drawer>
|
||||
|
||||
<el-drawer
|
||||
v-if="siteMilestoneEditorVisible"
|
||||
v-model="siteMilestoneEditorVisible"
|
||||
direction="rtl"
|
||||
size="480px"
|
||||
@@ -1842,6 +1845,7 @@
|
||||
</el-drawer>
|
||||
|
||||
<el-drawer
|
||||
v-if="siteEnrollmentEditorVisible"
|
||||
v-model="siteEnrollmentEditorVisible"
|
||||
direction="rtl"
|
||||
size="480px"
|
||||
@@ -1911,6 +1915,7 @@
|
||||
</el-drawer>
|
||||
|
||||
<el-drawer
|
||||
v-if="monitoringStrategyEditorVisible"
|
||||
v-model="monitoringStrategyEditorVisible"
|
||||
direction="rtl"
|
||||
size="480px"
|
||||
@@ -4772,6 +4777,9 @@ const getDisplayVersionLabel = (rawVersion: number): string => {
|
||||
|
||||
const ROLLBACK_AXIS_LANE_GAP = 34;
|
||||
const ROLLBACK_AXIS_LANE_START = 18;
|
||||
const getRollbackAxisLeftStyle = (axisX?: number | null) => ({
|
||||
left: `${Number.isFinite(axisX) ? axisX : ROLLBACK_AXIS_LANE_START}px`,
|
||||
});
|
||||
const normalizeAxisBranch = (branchName?: string | null): string => (branchName || "main").trim() || "main";
|
||||
const formatAxisLaneLabel = (branchName: string): string =>
|
||||
branchName === "main" ? "main" : branchName.replace(/^release\//, "");
|
||||
@@ -6546,23 +6554,6 @@ onBeforeUnmount(() => {
|
||||
padding: 6px 0;
|
||||
}
|
||||
|
||||
.rollback-axis-scroll::-webkit-scrollbar {
|
||||
width: 5px;
|
||||
}
|
||||
|
||||
.rollback-axis-scroll::-webkit-scrollbar-track {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.rollback-axis-scroll::-webkit-scrollbar-thumb {
|
||||
background: #c8d6e5;
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.rollback-axis-scroll::-webkit-scrollbar-thumb:hover {
|
||||
background: #a0b4cc;
|
||||
}
|
||||
|
||||
/* SVG 覆盖层 */
|
||||
.rollback-axis-overlay {
|
||||
position: absolute;
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-dialog append-to=".layout-main .content-wrapper" :title="TEXT.modules.adminProjectMembers.newTitle" width="520px" v-model="addVisible" :close-on-click-modal="false">
|
||||
<el-dialog v-if="addVisible" append-to=".layout-main .content-wrapper" :title="TEXT.modules.adminProjectMembers.newTitle" width="520px" v-model="addVisible" :close-on-click-modal="false">
|
||||
<el-form :model="newMember" label-width="120px" ref="addFormRef" :rules="addRules">
|
||||
<el-form-item :label="TEXT.modules.adminProjectMembers.user" prop="user_id">
|
||||
<el-select v-model="newMember.user_id" filterable :placeholder="TEXT.modules.adminProjectMembers.userPlaceholder">
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
<ProjectForm v-model:visible="formVisible" :project="editingProject" @saved="loadProjects" />
|
||||
<ProjectForm v-if="formVisible" v-model:visible="formVisible" :project="editingProject" @saved="loadProjects" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -139,7 +139,11 @@ const handleDelete = async (study: Study) => {
|
||||
return;
|
||||
}
|
||||
|
||||
const isDeletingCurrentStudy = studyStore.currentStudy?.id === study.id;
|
||||
await deleteStudy(study.id);
|
||||
if (isDeletingCurrentStudy) {
|
||||
await studyStore.rehydrateStudyForLastUser({ preferActive: true });
|
||||
}
|
||||
ElMessage.success("项目已删除");
|
||||
await loadProjects();
|
||||
} catch (err: any) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<el-dialog append-to=".layout-main .content-wrapper" :title="TEXT.modules.adminSites.craBindTitle" width="520px" v-model="visibleProxy" :close-on-click-modal="false">
|
||||
<el-dialog v-if="visibleProxy" append-to=".layout-main .content-wrapper" :title="TEXT.modules.adminSites.craBindTitle" width="520px" v-model="visibleProxy" :close-on-click-modal="false">
|
||||
<div class="tip">{{ TEXT.modules.adminSites.sitePrefix }}{{ site?.name }}</div>
|
||||
<el-form label-width="120px">
|
||||
<el-form-item :label="TEXT.modules.adminSites.craSelect">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<el-dialog append-to=".layout-main .content-wrapper" :title="site ? TEXT.modules.adminSites.editTitle : TEXT.modules.adminSites.newTitle" width="520px" v-model="visibleProxy" :close-on-click-modal="false">
|
||||
<el-dialog v-if="visibleProxy" append-to=".layout-main .content-wrapper" :title="site ? TEXT.modules.adminSites.editTitle : TEXT.modules.adminSites.newTitle" width="520px" v-model="visibleProxy" :close-on-click-modal="false">
|
||||
<el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
|
||||
<el-form-item :label="TEXT.common.fields.siteName" prop="name">
|
||||
<el-input v-model="form.name" :placeholder="TEXT.common.placeholders.input + TEXT.common.fields.siteName" />
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<SiteForm
|
||||
v-if="projectId"
|
||||
v-if="projectId && formVisible"
|
||||
v-model:visible="formVisible"
|
||||
:study-id="projectId"
|
||||
:site="editingSite"
|
||||
|
||||
@@ -85,8 +85,8 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<UserForm v-model:visible="formVisible" :user="editingUser" :admin-count="activeAdminCount" @saved="loadUsers" />
|
||||
<UserResetPassword v-model:visible="resetVisible" :user="resetUser" @reset="loadUsers" />
|
||||
<UserForm v-if="formVisible" v-model:visible="formVisible" :user="editingUser" :admin-count="activeAdminCount" @saved="loadUsers" />
|
||||
<UserResetPassword v-if="resetVisible" v-model:visible="resetVisible" :user="resetUser" @reset="loadUsers" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user