fix(user): user manage

Author: dataeaseShu

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),
 }

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}`)

frontend/src/assets/svg/avatar_personal.svg

@@ -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",

frontend/src/assets/svg/icon_close_outlined_w.svg

@@ -87,7 +87,7 @@
     "name": "数据源名称",
     "type": "数据源类型",
     "status": "状态",
-    "pieces_in_total": "显示 {ms} 条数据，共 {msg} 条",
+    "pieces_in_total": "显示 {ms} 条数据",
     "actions": "操作",
     "test_connection": "测试连接",
     "check": "校验",

frontend/src/i18n/en.json

@@ -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 = () => {
     </div>
     <div class="type-value">
       <span class="type">{{ $t('model.model_type') }}</span>
-      <span class="value"> {{ modleType }}</span>
+      <span class="value"> {{ modelType }}</span>
     </div>
     <div class="type-value">
       <span class="type">{{ $t('model.basic_model') }}</span>
-      <span class="value"> {{ baseModle }}</span>
+      <span class="value"> {{ baseModel }}</span>
     </div>
     <div class="methods">
       <el-tooltip :offset="14" effect="dark" :content="$t('datasource.edit')" placement="top">

frontend/src/i18n/zh-CN.json

@@ -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"

frontend/src/views/system/model/Card.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,
 })
 </script>

frontend/src/views/system/model/Model.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()
       })