Merge branch 'main' of https://github.com/dataease/SQLBot

backend/apps/system/api/workspace.py

@@ -205,6 +205,8 @@ async def get_one(session: SessionDep, trans: Trans, id: int):
 
 @router.delete("/{id}")  
 async def single_delete(session: SessionDep, id: int):
+    if id == 1:
+        raise HTTPException(f"Can not delete default workspace")
     db_model = session.get(WorkspaceModel, id)
     if not db_model:
         raise HTTPException(f"WorkspaceModel with id {id} not found")

frontend/src/views/system/workspace/index.vue

@@ -358,7 +358,7 @@ const handleCurrentChange = (val: number) => {
                   </el-icon>
                   {{ $t('dashboard.rename') }}
                 </div>
-                <div class="item" @click.stop="delWorkspace(ele)">
+                <div v-if="ele.id !== 1" class="item" @click.stop="delWorkspace(ele)">
                   <el-icon size="16">
                     <delIcon></delIcon>
                   </el-icon>