From 901b4a33bf2ec9040c24c5a76cb77dbdc40591f7 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 7 Apr 2020 10:45:37 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DataForm/index.vue             | 27 ++++++++------
 src/i18n/langs/cn.js                          |  5 ++-
 src/router/index.js                           |  8 ++---
 src/styles/element-ui.scss                    | 14 +++++++-
 .../{UserEdit.vue => UserCreateUpdate.vue}    | 36 +++++++++----------
 src/views/users/UserGroupUpdate.vue           |  4 +--
 6 files changed, 57 insertions(+), 37 deletions(-)
 rename src/views/users/{UserEdit.vue => UserCreateUpdate.vue} (87%)

diff --git a/src/components/DataForm/index.vue b/src/components/DataForm/index.vue
index 7629b10f5..77b10cdda 100644
--- a/src/components/DataForm/index.vue
+++ b/src/components/DataForm/index.vue
@@ -1,18 +1,20 @@
 <template>
   <elFormRender
     ref="dataForm"
-    :content="content"
+    :content="fields"
     v-bind="$attrs"
     :form="basicForm"
+    label-position="right"
+    label-width="17%"
     v-on="$listeners"
   >
     <!-- slot 透传 -->
-    <slot v-for="item in content" :slot="`id:${item.id}`" :name="`id:${item.id}`" />
-    <slot v-for="item in content" :slot="`$id:${item.id}`" :name="`$id:${item.id}`" />
+    <slot v-for="item in fields" :slot="`id:${item.id}`" :name="`id:${item.id}`" />
+    <slot v-for="item in fields" :slot="`$id:${item.id}`" :name="`$id:${item.id}`" />
 
     <el-form-item v-if="defaultButton">
-      <el-button size="small" type="primary" @click="submitForm('dataForm')">submit</el-button>
-      <el-button size="small" @click="resetForm('dataForm')">reset</el-button>
+      <el-button size="small" @click="resetForm('dataForm')">{{ $tc('Reset') }}</el-button>
+      <el-button size="small" type="primary" @click="submitForm('dataForm')">{{ $tc('Submit') }}</el-button>
     </el-form-item>
     <slot name="Actions" />
   </elFormRender>
@@ -29,7 +31,7 @@ export default {
       type: Boolean,
       default: true
     },
-    content: {
+    fields: {
       type: Array,
       default: () => []
     },
@@ -67,10 +69,15 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.el-form /deep/ .el-form-item {
+  .el-form /deep/ .el-form-item {
     margin-bottom: 12px;
+  }
 
-    margin-left:12%;
-    width:73%;
-}
+  .el-form /deep/ .el-form-item__content {
+    width: 75%;
+  }
+
+  .el-form /deep/ .el-form-item__label {
+    padding: 0 30px 0 0;
+  }
 </style>
diff --git a/src/i18n/langs/cn.js b/src/i18n/langs/cn.js
index 7220092bc..c226fc3ff 100644
--- a/src/i18n/langs/cn.js
+++ b/src/i18n/langs/cn.js
@@ -46,7 +46,9 @@ const cn = {
     'Run': '执行',
     'Are you sure to delete': '你确定要删除',
     'Info': '提示',
-    'More': '更多'
+    'More': '更多',
+    'Submit': '提交',
+    'Reset': '重置'
   },
   route: {
     'dashboard': '仪表盘',
@@ -87,6 +89,7 @@ const cn = {
     'OperateLog': '操作日志',
     'PasswordChangeLog': '改密日志',
     'Settings': '系统设置',
+    'UserCreate': '创建用户'
   },
   // 用户模块翻译
   users: {
diff --git a/src/router/index.js b/src/router/index.js
index 679372413..d7c11fda9 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -67,14 +67,14 @@ export const constantRoutes = [
       },
       {
         path: 'users/create',
-        component: () => import('@/views/users/UserEdit.vue'), // Parent router-view
+        component: () => import('@/views/users/UserCreateUpdate.vue'), // Parent router-view
         name: 'UserCreate',
         hidden: true,
-        meta: { title: 'UserCreate' }
+        meta: { title: 'UserCreate', activeMenu: '/users/users'}
       },
       {
         path: 'users/update/:id',
-        component: () => import('@/views/users/UserEdit.vue'), // Parent router-view
+        component: () => import('@/views/users/UserCreateUpdate.vue'), // Parent router-view
         name: 'UserEdit',
         hidden: true,
         meta: { title: 'UserEdit' }
@@ -108,7 +108,7 @@ export const constantRoutes = [
       },
       {
         path: 'groups/create',
-        component: () => import('@/views/users/UserEdit.vue'), // Parent router-view
+        component: () => import('@/views/users/UserCreateUpdate.vue'), // Parent router-view
         name: 'UserGroupCreate',
         hidden: true,
         meta: { title: 'UserGroupCreate' }
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 5bbe97fc1..f29b19d40 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -162,7 +162,15 @@ td .el-button.el-button--mini {
   width: 100%;
   font-size: 14px;
   line-height: 1.5;
-  height: 35px;
+  height: 34px;
+}
+
+.el-input--small .el-input__inner {
+  height: 34px;
+}
+
+.el-input--small .el-input__icon {
+  line-height: 34px;
 }
 
 .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
@@ -223,3 +231,7 @@ td .el-button.el-button--mini {
 .text-success {
   color: $--color-success;
 }
+
+.el-radio__input.is-checked+.el-radio__label {
+  color: inherit;
+}
diff --git a/src/views/users/UserEdit.vue b/src/views/users/UserCreateUpdate.vue
similarity index 87%
rename from src/views/users/UserEdit.vue
rename to src/views/users/UserCreateUpdate.vue
index cb5e3c1cf..284831a56 100644
--- a/src/views/users/UserEdit.vue
+++ b/src/views/users/UserCreateUpdate.vue
@@ -1,49 +1,47 @@
 <template>
   <Page>
-    <template>
-      <el-card>
-        <dataform :form="form" :content="content" label-position="left" label-width="140px">
-          <formgroupheader slot="id:name" title="账户" :line="false" style="margin:0 50px;" />
-          <formgroupheader slot="id:passwordrule" title="认证" :line="true" style="margin:0 50px;" />
-          <formgroupheader slot="id:role" title="角色安全" :line="true" style="margin:0 50px;" />
-          <formgroupheader slot="id:phone" title="认证" :line="true" style="margin:0 50px;" />
-        </dataform>
-      </el-card>
-    </template>
-    <el-button @click="debug" />
+    <IBox>
+      <DataForm :form="form" :fields="fields" label-position="left" label-width="140px">
+        <FormGroupHeader slot="id:name" title="账户" :line="false" style="margin:0 50px;" />
+        <FormGroupHeader slot="id:passwordrule" title="认证" :line="true" style="margin:0 50px;" />
+        <FormGroupHeader slot="id:role" title="角色安全" :line="true" style="margin:0 50px;" />
+        <FormGroupHeader slot="id:phone" title="认证" :line="true" style="margin:0 50px;" />
+      </DataForm>
+    </IBox>
   </page>
 </template>
 
 <script>
 /* eslint-disable vue/no-unused-components */
-import formgroupheader from '@/components/formGroupHeader'
-import { Page } from '@/layout/components'
-import dataform from '@/components/DataForm'
+import FormGroupHeader from '@/components/formGroupHeader'
+import { Page, IBox } from '@/layout/components'
+import DataForm from '@/components/DataForm'
 import select2 from '@/components/Select2'
 export default {
   components: {
     Page,
-    dataform,
+    IBox,
+    DataForm,
     select2,
-    formgroupheader
+    FormGroupHeader
   },
   data() {
     return {
       form: {
-        name: '姓名',
         passwordrule: '1',
         mfa_level: 0,
         source: 'local',
         role: 'Admin',
         date_expired: '2099-12-31 00:00:00 +0800'
       },
-      content: [
+      fields: [
         {
           type: 'input',
           id: 'name',
           label: this.$t('users.name'),
           el: {
-            size: 'small'
+            size: 'small',
+            placeholder: 'hello',
           },
           rules: [
             { required: true, message: 'miss name', trigger: 'blur' }
diff --git a/src/views/users/UserGroupUpdate.vue b/src/views/users/UserGroupUpdate.vue
index d89658bf9..5ac0da0e2 100644
--- a/src/views/users/UserGroupUpdate.vue
+++ b/src/views/users/UserGroupUpdate.vue
@@ -2,7 +2,7 @@
   <Page>
     <template>
       <el-card>
-        <dataform :content="content" label-position="right" label-width="100px" :form="form" />
+        <dataform fields="content" label-position="right" label-width="100px" :form="form" />
       </el-card>
     </template>
   </page>
@@ -11,7 +11,7 @@
 <script>
 /* eslint-disable vue/no-unused-components */
 import { Page } from '@/layout/components'
-import dataform from '@/components/DataForm'
+import DataForm from '@/components/DataForm'
 import select2 from '@/components/Select2'
 export default {
   components: {