From 22e87971e1a0067e9df4dae37fc1d0632fe276c1 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 23 Jun 2021 15:41:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E3=80=90ID1004560=E3=80=91=20?=
 =?UTF-8?q?=E3=80=90=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E3=80=91=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA/=E7=BC=96=E8=BE=91=E7=BB=84=E7=BB=87=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=82=B9=E9=80=89=E6=8B=A9=E7=BB=84=E7=BB=87=E4=BC=9A?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=BB=9A=E5=8A=A8=E6=9D=A1=EF=BC=8C=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E4=B8=8B=E6=8B=89=E6=A1=86=E5=B1=95=E7=A4=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/layout/components/AppMain.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/layout/components/AppMain.vue b/frontend/src/layout/components/AppMain.vue
index 68235f7d8f..eaf39b016c 100644
--- a/frontend/src/layout/components/AppMain.vue
+++ b/frontend/src/layout/components/AppMain.vue
@@ -23,6 +23,7 @@ export default {
     @import "~@/styles/variables.scss";
 
     .app-main {
+        height: 100%;
         /* topbar 56  */
         // min-height: calc(100vh - 56px);
         // width: 100%;

From 33a221dc30224a3631c36d9e11eacc534a2db565 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 23 Jun 2021 15:43:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E6=A8=A1=E7=89=88=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B650?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/template/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/panel/template/index.vue b/frontend/src/views/panel/template/index.vue
index 01ec18bf26..5c88d5c3cf 100644
--- a/frontend/src/views/panel/template/index.vue
+++ b/frontend/src/views/panel/template/index.vue
@@ -84,7 +84,8 @@ export default {
       currentTemplateType: 'system',
       templateEditFormRules: {
         name: [
-          { required: true, message: this.$t('commons.input_content'), trigger: 'change' }
+          { required: true, message: this.$t('commons.input_content'), trigger: 'change' },
+          { max: 50, message: this.$t('commons.char_can_not_more_50'), trigger: 'change' }
         ]
       },
       templateEditForm: {},

From 5cb0267304d406b24683a9da85cde23198d74ca5 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 23 Jun 2021 15:56:04 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=EF=BC=8C=E6=80=A7=E5=88=AB=E3=80=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E3=80=81=E7=BB=84=E7=BB=87=E6=94=AF=E6=8C=81=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/user/form.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue
index 2fddc7d438..113cb40964 100644
--- a/frontend/src/views/system/user/form.vue
+++ b/frontend/src/views/system/user/form.vue
@@ -20,19 +20,19 @@
         <el-input v-model="form.confirmPassword" autocomplete="off" show-password />
       </el-form-item>
 
-      <el-form-item :label="$t('commons.gender')">
+      <el-form-item :label="$t('commons.gender')" prop="gender">
         <el-radio-group v-model="form.gender" style="width: 178px">
           <el-radio :label="$t('commons.man')">{{ $t('commons.man') }}</el-radio>
           <el-radio :label="$t('commons.woman')">{{ $t('commons.woman') }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item :label="$t('commons.status')">
+      <el-form-item :label="$t('commons.status')" prop="enabled">
         <el-radio-group v-model="form.enabled" :disabled="formType !== 'add' && form.isAdmin" style="width: 140px">
           <el-radio :label="1">{{ $t('commons.enable') }}</el-radio>
           <el-radio :label="0">{{ $t('commons.disable') }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item :label="$t('commons.organization')" prop="dept">
+      <el-form-item :label="$t('commons.organization')" prop="deptId">
         <treeselect
           ref="deptTreeSelect"
           v-model="form.deptId"
@@ -148,7 +148,10 @@ export default {
             trigger: 'blur'
           }
         ],
-        roleIds: [{ required: true, message: this.$t('user.input_roles'), trigger: 'change' }]
+        roleIds: [{ required: true, message: this.$t('user.input_roles'), trigger: 'change' }],
+        deptId: [],
+        gender: [],
+        enable: []
 
       },
       defaultForm: { id: null, username: null, nickName: null, gender: '男', email: null, enabled: 1, deptId: null, phone: null, roleIds: [2] },