From 8432eef4cf1031d777c8cffd62ba3be93d82ea08 Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Fri, 14 Oct 2022 10:47:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=80=E6=9C=89=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E7=9A=84=E6=9C=80=E5=A4=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/article/column/edit.vue              |  2 +-
 admin/src/views/article/lists/edit.vue               |  2 +-
 admin/src/views/channel/wx_oa/menu_com/useMenuOa.ts  |  8 ++++++--
 admin/src/views/channel/wx_oa/reply/edit.vue         |  2 +-
 admin/src/views/consumer/lists/detail.vue            | 12 ++++++++++--
 admin/src/views/organization/department/edit.vue     |  2 +-
 admin/src/views/organization/post/edit.vue           |  2 +-
 admin/src/views/permission/menu/edit.vue             |  2 +-
 admin/src/views/setting/dict/data/edit.vue           |  2 +-
 .../src/main/resources/vue/edit.vue.vm               |  2 +-
 10 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/admin/src/views/article/column/edit.vue b/admin/src/views/article/column/edit.vue
index 7f7abbd3..54ddf382 100644
--- a/admin/src/views/article/column/edit.vue
+++ b/admin/src/views/article/column/edit.vue
@@ -14,7 +14,7 @@
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <div>
-                        <el-input-number v-model="formData.sort" :min="0" />
+                        <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                         <div class="form-tips">默认为0， 数值越大越排前</div>
                     </div>
                 </el-form-item>
diff --git a/admin/src/views/article/lists/edit.vue b/admin/src/views/article/lists/edit.vue
index 716c22a9..fe338b9f 100644
--- a/admin/src/views/article/lists/edit.vue
+++ b/admin/src/views/article/lists/edit.vue
@@ -81,7 +81,7 @@
                         </el-form-item>
                         <el-form-item label="排序" prop="sort">
                             <div>
-                                <el-input-number v-model="formData.sort" :min="0" />
+                                <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                                 <div class="form-tips">默认为0， 数值越大越排前</div>
                             </div>
                         </el-form-item>
diff --git a/admin/src/views/channel/wx_oa/menu_com/useMenuOa.ts b/admin/src/views/channel/wx_oa/menu_com/useMenuOa.ts
index 334a4bd4..f86ba91b 100644
--- a/admin/src/views/channel/wx_oa/menu_com/useMenuOa.ts
+++ b/admin/src/views/channel/wx_oa/menu_com/useMenuOa.ts
@@ -44,6 +44,12 @@ export const rules = reactive<FormRules>({
             required: true,
             message: '必填项不能为空',
             trigger: ['blur', 'change']
+        },
+        {
+            pattern:
+                /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+)\.)+([A-Za-z0-9-~\/])+$/,
+            message: '请输入合法的网址链接',
+            trigger: ['blur', 'change']
         }
     ],
     appId: [
@@ -121,7 +127,6 @@ export const useMenuOa = (ref: any) => {
                 await refs[i].menuFormRef.validate()
             } catch (error) {
                 menuIndex.value = i
-                feedback.msgError(`菜单${i + 1}必填项不能为空～`)
                 return
             }
         }
@@ -137,7 +142,6 @@ export const useMenuOa = (ref: any) => {
                 await refs[i].menuFormRef.validate()
             } catch (error) {
                 menuIndex.value = i
-                feedback.msgError(`菜单${i + 1}必填项不能为空～`)
                 return
             }
         }
diff --git a/admin/src/views/channel/wx_oa/reply/edit.vue b/admin/src/views/channel/wx_oa/reply/edit.vue
index 3fb3eef0..6241b895 100644
--- a/admin/src/views/channel/wx_oa/reply/edit.vue
+++ b/admin/src/views/channel/wx_oa/reply/edit.vue
@@ -71,7 +71,7 @@
                 </el-form-item> -->
                 <el-form-item label="排序">
                     <div class="flex-1">
-                        <el-input-number v-model="formData.sort" :min="0"/>
+                        <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                     </div>
                 </el-form-item>
                 <el-form-item label="启用状态">
diff --git a/admin/src/views/consumer/lists/detail.vue b/admin/src/views/consumer/lists/detail.vue
index 0600f9e7..969df850 100644
--- a/admin/src/views/consumer/lists/detail.vue
+++ b/admin/src/views/consumer/lists/detail.vue
@@ -15,7 +15,11 @@
                 </el-form-item>
                 <el-form-item label="账号：">
                     {{ formData.username }}
-                    <popover-input class="ml-[10px]" @confirm="handleEdit($event, 'username')" limit="32">
+                    <popover-input
+                        class="ml-[10px]"
+                        :limit="32"
+                        @confirm="handleEdit($event, 'username')"
+                    >
                         <el-button type="primary" link v-perms="['user:edit']">
                             <icon name="el-icon-EditPen" />
                         </el-button>
@@ -23,7 +27,11 @@
                 </el-form-item>
                 <el-form-item label="真实姓名：">
                     {{ formData.realName || '-' }}
-                    <popover-input class="ml-[10px]" @confirm="handleEdit($event, 'realName')" limit="32">
+                    <popover-input
+                        class="ml-[10px]"
+                        :limit="32"
+                        @confirm="handleEdit($event, 'realName')"
+                    >
                         <el-button type="primary" link v-perms="['user:edit']">
                             <icon name="el-icon-EditPen" />
                         </el-button>
diff --git a/admin/src/views/organization/department/edit.vue b/admin/src/views/organization/department/edit.vue
index 70b5e584..fda66d72 100644
--- a/admin/src/views/organization/department/edit.vue
+++ b/admin/src/views/organization/department/edit.vue
@@ -36,7 +36,7 @@
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <div>
-                        <el-input-number v-model="formData.sort" :min="0" />
+                        <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                         <div class="form-tips">默认为0， 数值越大越排前</div>
                     </div>
                 </el-form-item>
diff --git a/admin/src/views/organization/post/edit.vue b/admin/src/views/organization/post/edit.vue
index 7cee7026..fd2e30bd 100644
--- a/admin/src/views/organization/post/edit.vue
+++ b/admin/src/views/organization/post/edit.vue
@@ -17,7 +17,7 @@
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <div>
-                        <el-input-number v-model="formData.sort" :min="0" />
+                        <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                         <div class="form-tips">默认为0， 数值越大越排前</div>
                     </div>
                 </el-form-item>
diff --git a/admin/src/views/permission/menu/edit.vue b/admin/src/views/permission/menu/edit.vue
index c7789ab9..4686a10b 100644
--- a/admin/src/views/permission/menu/edit.vue
+++ b/admin/src/views/permission/menu/edit.vue
@@ -166,7 +166,7 @@
                 </el-form-item>
                 <el-form-item label="菜单排序" prop="menuSort">
                     <div>
-                        <el-input-number v-model="formData.menuSort" />
+                        <el-input-number v-model="formData.menuSort" :max="9999" />
                         <div class="form-tips">数值越大越排前</div>
                     </div>
                 </el-form-item>
diff --git a/admin/src/views/setting/dict/data/edit.vue b/admin/src/views/setting/dict/data/edit.vue
index 0abf899e..8620e7e1 100644
--- a/admin/src/views/setting/dict/data/edit.vue
+++ b/admin/src/views/setting/dict/data/edit.vue
@@ -31,7 +31,7 @@
                 </el-form-item>
                 <el-form-item label="排序" prop="sort">
                     <div>
-                        <el-input-number v-model="formData.sort" :min="0" />
+                        <el-input-number v-model="formData.sort" :min="0" :max="9999" />
                         <div class="form-tips">数值越大越排前</div>
                     </div>
                 </el-form-item>
diff --git a/server/like-generator/src/main/resources/vue/edit.vue.vm b/server/like-generator/src/main/resources/vue/edit.vue.vm
index 15ff64ab..8e62ff4d 100644
--- a/server/like-generator/src/main/resources/vue/edit.vue.vm
+++ b/server/like-generator/src/main/resources/vue/edit.vue.vm
@@ -32,7 +32,7 @@
                 </el-form-item>
             #elseif($column.htmlType=="number")
                 <el-form-item label="${column.columnComment}" prop="${column.javaField}">
-                    <el-input-number v-model="formData.${column.javaField}" />
+                    <el-input-number v-model="formData.${column.javaField}" :max="9999" />
                 </el-form-item>
             #elseif($column.htmlType=="textarea")
                 <el-form-item label="${column.columnComment}" prop="${column.javaField}">