From 7c86bdc5694288135c2bee7269e6163205313564 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Mon, 13 Mar 2023 14:48:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/Role/Detail/Permiss/index.vue      | 24 +++++++++++++----
 .../system/Role/components/AddDialog.vue      | 26 ++++++++++---------
 src/views/system/Role/index.vue               | 14 +++++++---
 3 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/views/system/Role/Detail/Permiss/index.vue b/src/views/system/Role/Detail/Permiss/index.vue
index 3fcbe584..8c1fe792 100644
--- a/src/views/system/Role/Detail/Permiss/index.vue
+++ b/src/views/system/Role/Detail/Permiss/index.vue
@@ -2,19 +2,26 @@
     <div class="role-permiss-container">
         <section class="card">
             <h5>基本信息</h5>
-            <j-form ref="formRef" class="basic-form" :model="form.data" layout="vertical">
+            <j-form
+                ref="formRef"
+                class="basic-form"
+                :model="form.data"
+                layout="vertical"
+            >
                 <j-form-item
                     name="name"
                     label="名称"
-                    :rules="[{ required: true, message: '请输入名称' }]"
+                    :rules="[
+                        { required: true, message: '请输入名称' },
+                        { max: 64, message: '最多可输入64个字符' },
+                    ]"
                 >
                     <j-input
                         v-model:value="form.data.name"
                         placeholder="请输入角色名称"
-                        :maxlength="64"
                     />
                 </j-form-item>
-                <j-form-item name="name" label="说明">
+                <j-form-item label="说明">
                     <j-textarea
                         v-model:value="form.data.description"
                         placeholder="请输入说明"
@@ -33,7 +40,7 @@
                 type="primary"
                 :disabled="form.loading"
                 @click="form.clickSave"
-                style="margin-top: 24px;"
+                style="margin-top: 24px"
                 >保存</j-button
             >
         </section>
@@ -113,6 +120,13 @@ form.getForm();
         }
 
         .basic-form {
+            :deep(.ant-form-item-required) {
+                padding-right: 12px;
+
+                &::before{
+                    right: 0;
+                }
+            }
             .ant-form-item {
                 display: block;
                 width: 60%;
diff --git a/src/views/system/Role/components/AddDialog.vue b/src/views/system/Role/components/AddDialog.vue
index b57c50e3..675a9063 100644
--- a/src/views/system/Role/components/AddDialog.vue
+++ b/src/views/system/Role/components/AddDialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <a-modal
+    <j-modal
         visible
         title="新增"
         width="670px"
@@ -7,29 +7,31 @@
         @ok="confirm"
         :confirm-loading="loading"
     >
-        <a-form ref="formRef" :model="form" layout="vertical">
-            <a-form-item
+        <j-form ref="formRef" :model="form" layout="vertical">
+            <j-form-item
                 name="name"
                 label="名称"
-                :rules="[{ required: true, message: '请输入名称' }]"
+                :rules="[
+                    { required: true, message: '请输入名称' },
+                    { max: 64, message: '最多可输入64个字符' },
+                ]"
             >
-                <a-input
+                <j-input
                     v-model:value="form.name"
                     placeholder="请输入角色名称"
                     allow-clear
-                    :maxlength="64"
                 />
-            </a-form-item>
-            <a-form-item name="name" label="说明">
-                <a-textarea
+            </j-form-item>
+            <j-form-item name="name" label="说明">
+                <j-textarea
                     v-model:value="form.description"
                     placeholder="请输入说明"
                     allow-clear
                     :maxlength="200"
                 />
-            </a-form-item>
-        </a-form>
-    </a-modal>
+            </j-form-item>
+        </j-form>
+    </j-modal>
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/system/Role/index.vue b/src/views/system/Role/index.vue
index ee75a296..2e272e87 100644
--- a/src/views/system/Role/index.vue
+++ b/src/views/system/Role/index.vue
@@ -1,6 +1,6 @@
 <template>
     <page-container>
-        <a-card class="role-container">
+        <div class="role-container">
             <j-advanced-search
                 :columns="columns"
                 @search="(params:any)=>queryParams = params"
@@ -12,6 +12,12 @@
                 :request="getRoleList_api"
                 model="TABLE"
                 :params="queryParams"
+                :defaultParams="{
+                    sorts: [
+                        { name: 'createTime', order: 'desc' },
+                        { name: 'id', order: 'desc' },
+                    ],
+                }"
             >
                 <template #headerTitle>
                     <PermissionButton
@@ -24,7 +30,7 @@
                 </template>
 
                 <template #action="slotProps">
-                    <a-space :size="16">
+                    <j-space :size="16">
                         <PermissionButton
                             :uhasPermission="`${permission}:update`"
                             type="link"
@@ -46,12 +52,12 @@
                         >
                             <AIcon type="DeleteOutlined" />
                         </PermissionButton>
-                    </a-space>
+                    </j-space>
                 </template>
             </j-pro-table>
 
             <AddDialog v-if="dialogVisible" v-model:visible="dialogVisible" />
-        </a-card>
+        </div>
     </page-container>
 </template>