Merge branch 'main' of github.com:dataease/dataease into main

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%;

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: {},

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] },