From e121ae9a815119e32a0c28a77785f80847fd4893 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Mon, 13 Mar 2023 16:27:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=B3=E7=B3=BB=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Relationship/components/EditDialog.vue    | 20 +++++++++----------
 src/views/system/Relationship/index.vue       |  6 +++---
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/views/system/Relationship/components/EditDialog.vue b/src/views/system/Relationship/components/EditDialog.vue
index 07750e5a..5b9bea43 100644
--- a/src/views/system/Relationship/components/EditDialog.vue
+++ b/src/views/system/Relationship/components/EditDialog.vue
@@ -21,7 +21,6 @@
                 <j-input
                     v-model:value="form.data.name"
                     placeholder="请输入名称"
-                    :maxlength="64"
                 />
             </j-form-item>
             <j-form-item
@@ -36,7 +35,6 @@
                 <j-input
                     v-model:value="form.data.relation"
                     placeholder="请输入标识"
-                    :maxlength="64"
                     :disabled="!!form.data.id"
                 />
             </j-form-item>
@@ -51,12 +49,14 @@
                         <j-select
                             v-model:value="form.data.objectType"
                             :disabled="!!form.data.id"
+                            @change="() => (form.data.targetType = undefined)"
                         >
                             <j-select-option
                                 v-for="item in form.objectList"
                                 :value="item.id"
-                                >{{ item.name }}</j-select-option
                             >
+                                {{ item.name }}.
+                            </j-select-option>
                         </j-select>
                     </j-form-item>
                 </j-col>
@@ -73,17 +73,14 @@
                             <j-select-option
                                 v-for="item in targetList"
                                 :value="item.id"
-                                >{{ item.name }}</j-select-option
                             >
+                                {{ item.name }}
+                            </j-select-option>
                         </j-select>
                     </j-form-item>
                 </j-col>
             </j-row>
-            <j-form-item
-                name="description"
-                label="说明"
-                :rules="[{ max: 200, message: '最多可输入200个字符' }]"
-            >
+            <j-form-item name="description" label="说明">
                 <j-textarea
                     v-model:value="form.data.description"
                     placeholder="请输入说明"
@@ -134,7 +131,8 @@ const form = reactive({
     data: props.data,
     rules: {
         checkRelation: (_rule: Rule, value: string): any => {
-            if (!value) return '';
+            if (!value) return Promise.reject('');
+            else if (value.length > 64) return Promise.reject('');
             const reg = new RegExp('^[0-9a-zA-Z_\\\\-]+$');
 
             return reg.test(value)
@@ -172,7 +170,7 @@ type formType = {
     name: string;
     relation: string;
     objectType: string;
-    targetType: string;
+    targetType: string | undefined;
     description: string;
     id?: string;
 };
diff --git a/src/views/system/Relationship/index.vue b/src/views/system/Relationship/index.vue
index 9dc868df..b16ecad7 100644
--- a/src/views/system/Relationship/index.vue
+++ b/src/views/system/Relationship/index.vue
@@ -19,7 +19,7 @@
                 <template #headerTitle>
                     <PermissionButton
                         type="primary"
-                        :uhasPermission="`${permission}:add`"
+                        :hasPermission="`${permission}:add`"
                         @click="table.openDialog(undefined)"
                     >
                         <AIcon type="PlusOutlined" />新增
@@ -28,7 +28,7 @@
                 <template #action="slotProps">
                     <j-space :size="16">
                         <PermissionButton
-                            :uhasPermission="`${permission}:update`"
+                            :hasPermission="`${permission}:update`"
                             type="link"
                             :tooltip="{
                                 title: '编辑',
@@ -39,7 +39,7 @@
                         </PermissionButton>
 
                         <PermissionButton
-                            :uhasPermission="`${permission}:delete`"
+                            :hasPermission="`${permission}:delete`"
                             type="link"
                             :tooltip="{ title: '删除' }"
                             :popConfirm="{