From 92d436b8bb95c94831fcfe30678d384c3debc052 Mon Sep 17 00:00:00 2001
From: kailong321200875 <321200875@qq.com>
Date: Wed, 8 Nov 2023 15:24:56 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                               |  2 +-
 src/views/Authorization/Department/Department.vue   |  6 +-----
 .../Authorization/Department/components/Write.vue   |  4 +---
 src/views/Authorization/Role/Role.vue               |  4 ----
 src/views/Authorization/Role/components/Write.vue   |  5 -----
 src/views/Authorization/User/User.vue               | 13 +++++++++++--
 src/views/Authorization/User/components/Write.vue   |  5 +----
 uno.config.ts                                       | 11 +++++++++++
 8 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 63f2f0d..f0e4b08 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,7 +5,7 @@
     "source.fixAll.eslint": true
   },
   "[vue]": {
-    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "i18n-ally.localesPaths": ["src/locales"],
   "i18n-ally.keystyle": "nested",
diff --git a/src/views/Authorization/Department/Department.vue b/src/views/Authorization/Department/Department.vue
index 6d52381..4d15138 100644
--- a/src/views/Authorization/Department/Department.vue
+++ b/src/views/Authorization/Department/Department.vue
@@ -166,11 +166,7 @@ const crudSchemas = reactive<CrudSchema[]>([
       hidden: true
     },
     form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'YYYY-MM-DD HH:mm:ss'
-      }
+      hidden: true
     }
   },
   {
diff --git a/src/views/Authorization/Department/components/Write.vue b/src/views/Authorization/Department/components/Write.vue
index 512e651..2c3c527 100644
--- a/src/views/Authorization/Department/components/Write.vue
+++ b/src/views/Authorization/Department/components/Write.vue
@@ -20,9 +20,7 @@ const props = defineProps({
 
 const rules = reactive({
   id: [required()],
-  status: [required()],
-  createTime: [required()],
-  remark: [required()]
+  status: [required()]
 })
 
 const { formRegister, formMethods } = useForm()
diff --git a/src/views/Authorization/Role/Role.vue b/src/views/Authorization/Role/Role.vue
index 42a7923..a3c974f 100644
--- a/src/views/Authorization/Role/Role.vue
+++ b/src/views/Authorization/Role/Role.vue
@@ -36,10 +36,6 @@ const tableColumns = reactive<TableColumn[]>([
     field: 'roleName',
     label: t('role.roleName')
   },
-  {
-    field: 'role',
-    label: t('role.role')
-  },
   {
     field: 'status',
     label: t('menu.status'),
diff --git a/src/views/Authorization/Role/components/Write.vue b/src/views/Authorization/Role/components/Write.vue
index fddd811..8550fc0 100644
--- a/src/views/Authorization/Role/components/Write.vue
+++ b/src/views/Authorization/Role/components/Write.vue
@@ -28,11 +28,6 @@ const formSchema = ref<FormSchema[]>([
     label: t('role.roleName'),
     component: 'Input'
   },
-  {
-    field: 'role',
-    label: t('role.role'),
-    component: 'Input'
-  },
   {
     field: 'status',
     label: t('menu.status'),
diff --git a/src/views/Authorization/User/User.vue b/src/views/Authorization/User/User.vue
index 1077fe0..e512114 100644
--- a/src/views/Authorization/User/User.vue
+++ b/src/views/Authorization/User/User.vue
@@ -276,7 +276,7 @@ const save = async () => {
 
 <template>
   <div class="flex w-100% h-100%">
-    <ContentWrap class="flex-1">
+    <ContentWrap class="w-250px">
       <div class="flex justify-center items-center">
         <div class="flex-1">{{ t('userDemo.departmentList') }}</div>
         <ElInput
@@ -299,7 +299,16 @@ const save = async () => {
         }"
         :filter-node-method="filterNode"
         @current-change="currentChange"
-      />
+      >
+        <template #default="{ data }">
+          <div
+            :title="data.departmentName"
+            class="whitespace-nowrap overflow-ellipsis overflow-hidden"
+          >
+            {{ data.departmentName }}
+          </div>
+        </template>
+      </ElTree>
     </ContentWrap>
     <ContentWrap class="flex-[3] ml-20px">
       <Search
diff --git a/src/views/Authorization/User/components/Write.vue b/src/views/Authorization/User/components/Write.vue
index 030599e..ec60c8a 100644
--- a/src/views/Authorization/User/components/Write.vue
+++ b/src/views/Authorization/User/components/Write.vue
@@ -21,10 +21,7 @@ const props = defineProps({
 const rules = reactive({
   username: [required()],
   account: [required()],
-  'department.id': [required()],
-  role: [required()],
-  email: [required()],
-  createTime: [required()]
+  'department.id': [required()]
 })
 
 const { formRegister, formMethods } = useForm()
diff --git a/uno.config.ts b/uno.config.ts
index 0645fe6..383e1c3 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -4,6 +4,17 @@ import transformerVariantGroup from '@unocss/transformer-variant-group'
 export default defineConfig({
   // ...UnoCSS options
   rules: [
+    [
+      /^overflow-ellipsis$/,
+      ([], { rawSelector }) => {
+        const selector = e(rawSelector)
+        return `
+${selector} {
+  text-overflow: ellipsis;
+}
+`
+      }
+    ],
     [
       /^custom-hover$/,
       ([], { rawSelector }) => {