diff --git a/src/components/Form/AutoDataForm/utils.js b/src/components/Form/AutoDataForm/utils.js
index 84ce2f5a7..231a075a4 100644
--- a/src/components/Form/AutoDataForm/utils.js
+++ b/src/components/Form/AutoDataForm/utils.js
@@ -173,7 +173,13 @@ export class FormFieldGenerator {
 
     let helpTextAsPlaceholder = field.helpTextAsPlaceholder
     const helpTextWordLength = helpText.split(' ').length
-    if ((helpTextWordLength <= 5 || helpText.length <= 10) && helpTextAsPlaceholder === undefined) {
+    const placeholderType = ['input', 'select', 'm2m_related_field']
+    const placeholderComponent = [ObjectSelect2]
+    if (helpTextAsPlaceholder !== undefined) {
+      helpTextAsPlaceholder = !!helpTextAsPlaceholder
+    } else if (placeholderType.indexOf(field.type) === -1 && placeholderComponent.indexOf(field.component) === -1) {
+      helpTextAsPlaceholder = false
+    } else if (helpTextWordLength <= 5 || helpText.length <= 10) {
       helpTextAsPlaceholder = true
     }
 
@@ -193,6 +199,16 @@ export class FormFieldGenerator {
     if (field.placeholder) {
       field.el.placeholder = field.placeholder
     }
+
+    // 设置 checkbox 的 tips
+    if (field.tips && ['checkbox-group', 'radio-group'].indexOf(field.type) !== -1) {
+      field.options.map(option => {
+        if (!option.tip && field.tips[option.value]) {
+          option.tip = field.tips[option.value]
+        }
+      })
+    }
+
     return field
   }
 
diff --git a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
index 8be3d8617..b5c35daed 100755
--- a/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
+++ b/src/components/Form/DataForm/components/el-form-renderer/components/render-form-item.vue
@@ -61,6 +61,9 @@
           v-bind="opt"
         >
           {{ opt.label }}
+          <el-tooltip v-if="opt.tip" :content="opt.tip" :open-delay="500" placement="top">
+            <i class="fa fa-question-circle-o" />
+          </el-tooltip>
         </el-checkbox>
         <!-- WARNING: radio 用 label 属性来表示 value 的含义 -->
         <!-- FYI: radio 的 value 属性可以在没有 radio-group 时用来关联到同一个 v-model -->
@@ -69,7 +72,11 @@
           :key="opt.label"
           :label="'value' in opt ? opt.value : opt.label"
           v-bind="opt"
-        >{{ opt.label }}
+        >
+          {{ opt.label }}
+          <el-tooltip v-if="opt.tip" :content="opt.tip" :open-delay="500" placement="top">
+            <i class="fa fa-question-circle-o" />
+          </el-tooltip>
         </el-radio>
       </template>
     </custom-component>
diff --git a/src/views/dashboard/components/RankTable.vue b/src/views/dashboard/components/RankTable.vue
index e44dcd23e..4e187f4d5 100644
--- a/src/views/dashboard/components/RankTable.vue
+++ b/src/views/dashboard/components/RankTable.vue
@@ -82,6 +82,10 @@ export default {
   }
 }
 
+>>> .el-table td, .el-table th {
+  padding: 5px 0;
+}
+
 >>> .el-table th, .el-table tr {
   background-color: #F5F6F7!important;
 
diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue
index 164f9895e..ca8bb2f72 100644
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@@ -46,7 +46,10 @@ export default {
           }
         },
         mfa_level: {
-          disabled: false
+          disabled: false,
+          tips: {
+            2: this.$t('If force enable, user can not disable by themselves')
+          }
         },
         email: {
           rules: [