diff --git a/frontend/src/api/user.ts b/frontend/src/api/user.ts index ded09a9f..72624b17 100644 --- a/frontend/src/api/user.ts +++ b/frontend/src/api/user.ts @@ -22,6 +22,7 @@ export const userApi = { edit: (data: any) => request.put('/user', data), clearErrorApi: (key: string) => request.get(`/user/clearErrorRecord/${key}`), delete: (key: string) => request.delete(`/user/${key}`), + deleteBatch: (data: any) => request.delete(`/user`, { data }), get: (key: string) => request.get(`/user/${key}`), pwd: (data: any) => request.put('/user/pwd', data), } diff --git a/frontend/src/api/workspace.ts b/frontend/src/api/workspace.ts index 25b8d6e7..729d57c9 100644 --- a/frontend/src/api/workspace.ts +++ b/frontend/src/api/workspace.ts @@ -3,7 +3,14 @@ import { request } from '@/utils/request' export const workspaceUserList = (params: any, pageNum: number, pageSize: number) => request.get(`/system/workspace/uws/pager/${pageNum}/${pageSize}`, { params }) -export const workspaceCreate = (data: any) => request.post('/system/workspace/uws', data) -export const workspaceDelete = (data: any) => request.delete('/system/workspace/uws', data) +export const workspaceOptionUserList = (params: any, pageNum: number, pageSize: number) => + request.get(`/system/workspace/uws/option/pager/${pageNum}/${pageSize}`, { params }) + +export const workspaceUwsCreate = (data: any) => request.post('/system/workspace/uws', data) +export const workspaceUwsUpdate = (data: any) => request.put('/system/workspace/uws', data) +export const workspaceCreate = (data: any) => request.post('/system/workspace', data) +export const workspaceUpdate = (data: any) => request.put('/system/workspace', data) +export const workspaceUwsDelete = (data: any) => request.delete('/system/workspace/uws', { data }) +export const workspaceDelete = (data: any) => request.delete('/system/workspace', { data }) export const workspaceList = () => request.get('/system/workspace') export const workspaceDetail = (id: any) => request.get(`/system/workspace/${id}`) diff --git a/frontend/src/assets/svg/avatar_personal.svg b/frontend/src/assets/svg/avatar_personal.svg new file mode 100644 index 00000000..34de8b7f --- /dev/null +++ b/frontend/src/assets/svg/avatar_personal.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/frontend/src/assets/svg/icon_close_outlined_w.svg b/frontend/src/assets/svg/icon_close_outlined_w.svg new file mode 100644 index 00000000..a0ac3230 --- /dev/null +++ b/frontend/src/assets/svg/icon_close_outlined_w.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json index b1f023fe..7f1a8df9 100644 --- a/frontend/src/i18n/en.json +++ b/frontend/src/i18n/en.json @@ -80,7 +80,7 @@ "type": "Data Source Type", "status": "Status", "actions": "Actions", - "pieces_in_total": "Showing {ms} records out of {msg}", + "pieces_in_total": "Showing {ms} records", "test_connection": "Test Connection", "check": "check", "connection_success": "Connection Successful", diff --git a/frontend/src/i18n/zh-CN.json b/frontend/src/i18n/zh-CN.json index 15d2bf59..42e94d89 100644 --- a/frontend/src/i18n/zh-CN.json +++ b/frontend/src/i18n/zh-CN.json @@ -87,7 +87,7 @@ "name": "数据源名称", "type": "数据源类型", "status": "状态", - "pieces_in_total": "显示 {ms} 条数据，共 {msg} 条", + "pieces_in_total": "显示 {ms} 条数据", "actions": "操作", "test_connection": "测试连接", "check": "校验", diff --git a/frontend/src/views/system/model/Card.vue b/frontend/src/views/system/model/Card.vue index b85ee346..274a4af6 100644 --- a/frontend/src/views/system/model/Card.vue +++ b/frontend/src/views/system/model/Card.vue @@ -6,16 +6,16 @@ import { computed } from 'vue' const props = withDefaults( defineProps<{ name: string - modleType: string - baseModle: string + modelType: string + baseModel: string id?: string isDefault?: boolean supplier?: number }>(), { name: '-', - modleType: '-', - baseModle: '-', + modelType: '-', + baseModel: '-', id: '-', isDefault: false, supplier: 0, @@ -47,11 +47,11 @@ const handleDel = () => {
{{ $t('model.model_type') }} - {{ modleType }} + {{ modelType }}
{{ $t('model.basic_model') }} - {{ baseModle }} + {{ baseModel }}
diff --git a/frontend/src/views/system/model/Model.vue b/frontend/src/views/system/model/Model.vue index 4c9b9f88..95c2fb91 100644 --- a/frontend/src/views/system/model/Model.vue +++ b/frontend/src/views/system/model/Model.vue @@ -172,7 +172,7 @@ const preStep = () => { } const saveModel = () => { - modelFormRef.value.submitModle() + modelFormRef.value.submitModel() } const search = () => { @@ -287,8 +287,8 @@ const submit = (item: any) => { :key="ele.id" :name="ele.name" :supplier="ele.supplier" - :modle-type="getModelTypeName(ele['model_type'])" - :base-modle="ele['base_model']" + :model-type="getModelTypeName(ele['model_type'])" + :base-model="ele['base_model']" :is-default="ele['default_model']" @edit="handleEditModel(ele)" @del="deleteHandler" diff --git a/frontend/src/views/system/model/ModelForm.vue b/frontend/src/views/system/model/ModelForm.vue index d19960a2..41a3403f 100644 --- a/frontend/src/views/system/model/ModelForm.vue +++ b/frontend/src/views/system/model/ModelForm.vue @@ -147,7 +147,7 @@ const initForm = (item?: any) => { } const emits = defineEmits(['submit']) -const submitModle = () => { +const submitModel = () => { modelRef.value.validate((res: any) => { if (res) { emits('submit', { @@ -160,7 +160,7 @@ const submitModle = () => { defineExpose({ initForm, - submitModle, + submitModel, supplierChang, }) diff --git a/frontend/src/views/system/user/User.vue b/frontend/src/views/system/user/User.vue index 2f2387e3..c39b23fc 100644 --- a/frontend/src/views/system/user/User.vue +++ b/frontend/src/views/system/user/User.vue @@ -504,6 +504,7 @@ const statusHandler = (row: any) => { } const cancelDelete = () => { + handleToggleRowSelection(false) multipleSelectionAll.value = [] checkAll.value = false isIndeterminate.value = false @@ -515,9 +516,14 @@ const deleteBatchUser = () => { cancelButtonText: t('common.cancel'), customClass: 'confirm-no_icon', autofocus: false, - callback: (val: string) => { - console.log(val) - }, + }).then(() => { + userApi.deleteBatch(multipleSelectionAll.value.map((ele) => ele.id)).then(() => { + ElMessage({ + type: 'success', + message: t('dashboard.delete_success'), + }) + search() + }) }) } const deleteHandler = (row: any) => { @@ -532,7 +538,7 @@ const deleteHandler = (row: any) => { userApi.delete(row.id).then(() => { ElMessage({ type: 'success', - message: 'Delete completed', + message: t('dashboard.delete_success'), }) search() }) diff --git a/frontend/src/views/system/workspace/AuthorizedWorkspaceDialog.vue b/frontend/src/views/system/workspace/AuthorizedWorkspaceDialog.vue index 9ce704f4..69786e6e 100644 --- a/frontend/src/views/system/workspace/AuthorizedWorkspaceDialog.vue +++ b/frontend/src/views/system/workspace/AuthorizedWorkspaceDialog.vue @@ -7,8 +7,8 @@ >

{{ $t('workspace.member_type') }}

- {{ $t('workspace.ordinary_member') }} - {{ $t('workspace.administrator') }} + {{ $t('workspace.ordinary_member') }} + {{ $t('workspace.administrator') }}

{{ $t('workspace.select_member') }}

@@ -48,8 +48,11 @@ :value="space" >
- + + + {{ space.name }} +
@@ -67,11 +70,14 @@
- + + + {{ ele.name }} +
- +
@@ -89,16 +95,16 @@