From f962506e23ef346c19a0e5095e5affbcad62aca3 Mon Sep 17 00:00:00 2001
From: Gary Fu <xuebaiyouling@gmail.com>
Date: Sun, 31 Mar 2024 11:27:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E4=BA=9B=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E7=A9=BA=E7=99=BD=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/MockMenus.js                             |  32 +--
 src/route/AdminRoutes.js                      |  25 ++-
 src/route/ToolsRoutes.js                      |  25 +--
 src/views/admin/Groups.vue                    |  19 --
 src/views/admin/Tenants.vue                   |  19 --
 .../TableEdit.vue => admin/UserEdit.vue}      |   0
 src/views/admin/Users.vue                     | 186 ++++++++++++++++-
 src/views/tools/Tables.vue                    | 189 ------------------
 8 files changed, 201 insertions(+), 294 deletions(-)
 delete mode 100644 src/views/admin/Groups.vue
 delete mode 100644 src/views/admin/Tenants.vue
 rename src/views/{tools/TableEdit.vue => admin/UserEdit.vue} (100%)
 delete mode 100644 src/views/tools/Tables.vue

diff --git a/mock/MockMenus.js b/mock/MockMenus.js
index 9448110..4701d73 100644
--- a/mock/MockMenus.js
+++ b/mock/MockMenus.js
@@ -32,22 +32,6 @@ const allMenus = [
   {
     id: 14,
     parentId: 1,
-    iconCls: 'GroupsOutlined',
-    nameCn: '用户组管理',
-    nameEn: 'Groups',
-    menuUrl: '/admin/groups'
-  },
-  {
-    id: 15,
-    parentId: 1,
-    iconCls: 'SupervisedUserCircleOutlined',
-    nameCn: '租户管理',
-    nameEn: 'Tenants',
-    menuUrl: '/admin/tenants'
-  },
-  {
-    id: 16,
-    parentId: 1,
     iconCls: 'menu',
     nameCn: '菜单管理',
     nameEn: 'Menus',
@@ -78,10 +62,10 @@ const allMenus = [
   {
     id: 23,
     parentId: 2,
-    iconCls: 'Grid',
-    nameCn: '表格示例',
-    nameEn: 'Tables',
-    menuUrl: '/tables'
+    iconCls: 'DynamicFormFilled',
+    nameCn: '窗口表单示例',
+    nameEn: 'Window Forms',
+    menuUrl: '/window-forms'
   },
   {
     id: 24,
@@ -90,14 +74,6 @@ const allMenus = [
     nameCn: '其他示例',
     nameEn: 'Others',
     menuUrl: '/tests'
-  },
-  {
-    id: 25,
-    parentId: 2,
-    iconCls: 'DynamicFormFilled',
-    nameCn: '窗口表单示例',
-    nameEn: 'Window Forms',
-    menuUrl: '/window-forms'
   }
 ]
 
diff --git a/src/route/AdminRoutes.js b/src/route/AdminRoutes.js
index c789fda..3fc5e56 100644
--- a/src/route/AdminRoutes.js
+++ b/src/route/AdminRoutes.js
@@ -2,20 +2,25 @@ const BASE_PATH = '/admin'
 
 export default [{
   path: `${BASE_PATH}/users`,
-  name: 'Users',
-  component: () => import('@/views/admin/Users.vue')
+  name: 'UsersBase',
+  children: [{
+    path: '',
+    name: 'Users',
+    component: () => import('@/views/admin/Users.vue')
+  }, {
+    path: 'edit/:id',
+    name: 'UserEdit',
+    component: () => import('@/views/admin/UserEdit.vue'),
+    meta: {
+      replaceTabHistory: 'Users',
+      labelKey: 'common.label.edit',
+      icon: 'Edit'
+    }
+  }]
 }, {
   path: `${BASE_PATH}/roles`,
   name: 'Roles',
   component: () => import('@/views/admin/Roles.vue')
-}, {
-  path: `${BASE_PATH}/groups`,
-  name: 'Groups',
-  component: () => import('@/views/admin/Groups.vue')
-}, {
-  path: `${BASE_PATH}/tenants`,
-  name: 'Tenants',
-  component: () => import('@/views/admin/Tenants.vue')
 }, {
   path: `${BASE_PATH}/authority`,
   name: 'Authority',
diff --git a/src/route/ToolsRoutes.js b/src/route/ToolsRoutes.js
index 8f33213..d859e22 100644
--- a/src/route/ToolsRoutes.js
+++ b/src/route/ToolsRoutes.js
@@ -1,34 +1,17 @@
 export default [{
   path: '/icons',
-  name: 'icons',
+  name: 'Icons',
   component: () => import('@/views/tools/Icons.vue')
 }, {
   path: '/forms',
-  name: 'forms',
+  name: 'Forms',
   component: () => import('@/views/tools/Forms.vue')
 }, {
   path: '/tests',
-  name: 'tests',
+  name: 'TestPage',
   component: () => import('@/views/tools/TestPage.vue')
 }, {
   path: '/window-forms',
-  name: 'tests',
+  name: 'WindowForms',
   component: () => import('@/views/tools/WindowForms.vue')
-}, {
-  path: '/tables',
-  name: 'TablesBase',
-  children: [{
-    path: '',
-    name: 'Tables',
-    component: () => import('@/views/tools/Tables.vue')
-  }, {
-    path: 'edit/:id',
-    name: 'TableEdit',
-    component: () => import('@/views/tools/TableEdit.vue'),
-    meta: {
-      replaceTabHistory: 'Tables',
-      labelKey: 'common.label.edit',
-      icon: 'Edit'
-    }
-  }]
 }]
diff --git a/src/views/admin/Groups.vue b/src/views/admin/Groups.vue
deleted file mode 100644
index 4ad5ebd..0000000
--- a/src/views/admin/Groups.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<script setup>
-import { onMounted } from 'vue'
-import { useRoute } from 'vue-router'
-onMounted(() => {
-  console.info('=========mounted', useRoute().path)
-})
-</script>
-
-<template>
-  <div>
-    <strong>
-      {{ $t('menu.label.groupManagement') }}
-    </strong>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
diff --git a/src/views/admin/Tenants.vue b/src/views/admin/Tenants.vue
deleted file mode 100644
index 33d38b3..0000000
--- a/src/views/admin/Tenants.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<script setup>
-import { onMounted } from 'vue'
-import { useRoute } from 'vue-router'
-onMounted(() => {
-  console.info('=========mounted', useRoute().path)
-})
-</script>
-
-<template>
-  <div>
-    <strong>
-      {{ $t('menu.label.tenantManagement') }}
-    </strong>
-  </div>
-</template>
-
-<style scoped>
-
-</style>
diff --git a/src/views/tools/TableEdit.vue b/src/views/admin/UserEdit.vue
similarity index 100%
rename from src/views/tools/TableEdit.vue
rename to src/views/admin/UserEdit.vue
diff --git a/src/views/admin/Users.vue b/src/views/admin/Users.vue
index 944fee2..eedb283 100644
--- a/src/views/admin/Users.vue
+++ b/src/views/admin/Users.vue
@@ -1,17 +1,187 @@
 <script setup>
-import { onMounted } from 'vue'
-import { useRoute } from 'vue-router'
+import { computed, onMounted, ref } from 'vue'
+import { loadUsersResult, useUserFormOptions } from '@/services/user/UserService'
+import { useDefaultPage } from '@/config'
+import { useRouter } from 'vue-router'
+import { $i18nMsg } from '@/messages'
+
+const router = useRouter()
+
+const page = ref(useDefaultPage())
+
+const tableData = ref([])
+const loading = ref(true)
+const loadUsers = async () => {
+  loading.value = true
+  const usersResult = await loadUsersResult({ page: page.value }).finally(() => (loading.value = false))
+  if (usersResult.success && usersResult.resultData) {
+    const resultData = usersResult.resultData
+    tableData.value = resultData.userList
+    Object.assign(page.value, resultData.page)
+  }
+}
+
 onMounted(() => {
-  console.info('=========mounted', useRoute().path)
+  loadUsers()
 })
+
+/**
+ *
+ * @type {[CommonTableColumn]}
+ */
+const columns = [{
+  label: '中文名',
+  property: 'nameCn',
+  click (data) {
+    router.push(`users/edit/${data.id}`)
+  }
+}, {
+  label: '英文名',
+  property: 'nameEn',
+  click (data) {
+    router.push(`users/edit/${data.id}`)
+  }
+}, {
+  label: '性别',
+  property: 'gender',
+  slot: 'gender'
+}, {
+  label: '出生日期',
+  property: 'birthday',
+  click (item) {
+    console.info('=================', item)
+  }
+}, {
+  label: '地址',
+  property: 'address'
+}]
+const buttons = ref([{
+  labelKey: 'common.label.edit',
+  type: 'primary',
+  click: item => {
+    toEditUser(item)
+  },
+  buttonIf (item) {
+    return !!item.id
+  }
+}, {
+  labelKey: 'common.label.delete',
+  type: 'danger',
+  click: item => {
+    console.info('删除=============', item)
+  },
+  buttonIf (item) {
+    return !!item.id
+  }
+}])
+//* ************搜索框**************//
+const searchParam = ref({})
+const searchFormOptions = computed(() => {
+  return [
+    {
+      label: '用户名',
+      prop: 'nameCn'
+    },
+    {
+      label: '关键字',
+      prop: 'keywords'
+    },
+    {
+      label: '地址',
+      prop: 'address'
+    }, {
+      label: $i18nMsg('性别', 'Gender'),
+      type: 'select',
+      prop: 'gender',
+      children: [{
+        value: 'male',
+        label: $i18nMsg('男', 'Male')
+      }, {
+        value: 'female',
+        label: $i18nMsg('女', 'Female')
+      }]
+    }
+  ]
+})
+const doSearch = form => {
+  console.info('=================searchParam', form, searchParam.value)
+}
+/** *************用户编辑**************/
+const currentUser = ref(null)
+const showEdit = ref(false)
+const userFormOptions = computed(() => useUserFormOptions())
+const toEditUser = user => {
+  currentUser.value = { ...user }
+  showEdit.value = true
+}
+const formRef = ref()
+const submitForm = () => {
+  formRef.value.form.validate(valid => {
+    if (valid) {
+      console.log('submit', currentUser.value)
+      showEdit.value = false
+    }
+  })
+  return false
+}
+
 </script>
 
 <template>
-  <div>
-    <strong>
-      {{ $t('menu.label.userManagement') }}
-    </strong>
-  </div>
+  <el-container
+    class="flex-column"
+  >
+    <common-form
+      inline
+      :model="searchParam"
+      :options="searchFormOptions"
+      :submit-label="$t('common.label.search')"
+      @submit-form="doSearch"
+    />
+    <common-table
+      v-model:page="page"
+      :data="tableData"
+      :columns="columns"
+      :buttons="buttons"
+      buttons-slot="buttons"
+      :buttons-column-attrs="{width:'250px'}"
+      :loading="loading"
+      @page-size-change="loadUsers()"
+      @current-page-change="loadUsers()"
+    >
+      <template #gender="{item}">
+        <el-tag
+          :type="item.gender === 'male' ? 'primary' : 'success'"
+        >
+          {{ item.gender }}
+        </el-tag>
+      </template>
+      <template #buttons="{item}">
+        <el-button
+          size="small"
+          @click="console.info(item)"
+        >
+          测试
+        </el-button>
+      </template>
+    </common-table>
+    <common-window
+      v-model="showEdit"
+      :width="'600px'"
+      :ok-click="submitForm"
+      title="用户编辑"
+    >
+      <common-form
+        v-if="currentUser"
+        ref="formRef"
+        class="form-edit-width-100"
+        :model="currentUser"
+        :options="userFormOptions"
+        label-width="100px"
+        :show-buttons="false"
+      />
+    </common-window>
+  </el-container>
 </template>
 
 <style scoped>
diff --git a/src/views/tools/Tables.vue b/src/views/tools/Tables.vue
deleted file mode 100644
index 9acc28f..0000000
--- a/src/views/tools/Tables.vue
+++ /dev/null
@@ -1,189 +0,0 @@
-<script setup>
-import { computed, onMounted, ref } from 'vue'
-import { loadUsersResult, useUserFormOptions } from '@/services/user/UserService'
-import { useDefaultPage } from '@/config'
-import { useRouter } from 'vue-router'
-import { $i18nMsg } from '@/messages'
-
-const router = useRouter()
-
-const page = ref(useDefaultPage())
-
-const tableData = ref([])
-const loading = ref(true)
-const loadUsers = async () => {
-  loading.value = true
-  const usersResult = await loadUsersResult({ page: page.value }).finally(() => (loading.value = false))
-  if (usersResult.success && usersResult.resultData) {
-    const resultData = usersResult.resultData
-    tableData.value = resultData.userList
-    Object.assign(page.value, resultData.page)
-  }
-}
-
-onMounted(() => {
-  loadUsers()
-})
-
-/**
- *
- * @type {[CommonTableColumn]}
- */
-const columns = [{
-  label: '中文名',
-  property: 'nameCn',
-  click (data) {
-    router.push(`tables/edit/${data.id}`)
-  }
-}, {
-  label: '英文名',
-  property: 'nameEn',
-  click (data) {
-    router.push(`tables/edit/${data.id}`)
-  }
-}, {
-  label: '性别',
-  property: 'gender',
-  slot: 'gender'
-}, {
-  label: '出生日期',
-  property: 'birthday',
-  click (item) {
-    console.info('=================', item)
-  }
-}, {
-  label: '地址',
-  property: 'address'
-}]
-const buttons = ref([{
-  labelKey: 'common.label.edit',
-  type: 'primary',
-  click: item => {
-    toEditUser(item)
-  },
-  buttonIf (item) {
-    return !!item.id
-  }
-}, {
-  labelKey: 'common.label.delete',
-  type: 'danger',
-  click: item => {
-    console.info('删除=============', item)
-  },
-  buttonIf (item) {
-    return !!item.id
-  }
-}])
-//* ************搜索框**************//
-const searchParam = ref({})
-const searchFormOptions = computed(() => {
-  return [
-    {
-      label: '用户名',
-      prop: 'nameCn'
-    },
-    {
-      label: '关键字',
-      prop: 'keywords'
-    },
-    {
-      label: '地址',
-      prop: 'address'
-    }, {
-      label: $i18nMsg('性别', 'Gender'),
-      type: 'select',
-      prop: 'gender',
-      children: [{
-        value: 'male',
-        label: $i18nMsg('男', 'Male')
-      }, {
-        value: 'female',
-        label: $i18nMsg('女', 'Female')
-      }]
-    }
-  ]
-})
-const doSearch = form => {
-  console.info('=================searchParam', searchParam.value)
-}
-/** *************用户编辑**************/
-const currentUser = ref(null)
-const showEdit = ref(false)
-const userFormOptions = computed(() => useUserFormOptions())
-const toEditUser = user => {
-  currentUser.value = { ...user }
-  showEdit.value = true
-}
-const formRef = ref()
-const submitForm = () => {
-  formRef.value.form.validate(valid => {
-    if (valid) {
-      console.log('submit', currentUser.value)
-      showEdit.value = false
-    }
-  })
-  return false
-}
-
-</script>
-
-<template>
-  <el-container
-    class="flex-column"
-  >
-    <common-form
-      inline
-      :model="searchParam"
-      :options="searchFormOptions"
-      :submit-label="$t('common.label.search')"
-      @submit-form="doSearch"
-    />
-    <common-table
-      v-model:page="page"
-      :data="tableData"
-      :columns="columns"
-      :buttons="buttons"
-      buttons-slot="buttons"
-      :buttons-column-attrs="{width:'250px'}"
-      :loading="loading"
-      @page-size-change="loadUsers()"
-      @current-page-change="loadUsers()"
-    >
-      <template #gender="{item}">
-        <el-tag
-          :type="item.gender === 'male' ? '' : 'success'"
-        >
-          {{ item.gender }}
-        </el-tag>
-      </template>
-      <template #buttons="{item}">
-        <el-button
-          size="small"
-          @click="console.info(item)"
-        >
-          测试
-        </el-button>
-      </template>
-    </common-table>
-    <common-window
-      v-model="showEdit"
-      :width="'600px'"
-      :ok-click="submitForm"
-      title="用户编辑"
-    >
-      <common-form
-        v-if="currentUser"
-        ref="formRef"
-        class="form-edit-width-100"
-        :model="currentUser"
-        :options="userFormOptions"
-        label-width="100px"
-        :show-buttons="false"
-      />
-    </common-window>
-  </el-container>
-</template>
-
-<style scoped>
-
-</style>