kailong321200875 пре 1 година
родитељ
комит
92d436b8bb

+ 1 - 1
.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",

+ 1 - 5
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
     }
   },
   {

+ 1 - 3
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()

+ 0 - 4
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'),

+ 0 - 5
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'),

+ 11 - 2
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

+ 1 - 4
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()

+ 11 - 0
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 }) => {