From eb8127f38a4be21d01ce6ae1707e23d6be4a202a Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 7 Apr 2020 19:16:43 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=9F=BA=E6=9C=AC=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E5=92=8C=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataForm/index.vue         |  8 ++---
 src/components/formGroupHeader/index.vue      |  2 --
 .../GenericCreateUpdatePage/index.vue         | 29 +++++++++++++++++
 src/layout/components/index.js                |  1 +
 src/views/users/UserCreateUpdate.vue          | 31 ++++++-------------
 5 files changed, 44 insertions(+), 27 deletions(-)
 create mode 100644 src/layout/components/GenericCreateUpdatePage/index.vue

diff --git a/src/components/AutoDataForm/index.vue b/src/components/AutoDataForm/index.vue
index 09ac021db..3e849de78 100644
--- a/src/components/AutoDataForm/index.vue
+++ b/src/components/AutoDataForm/index.vue
@@ -1,7 +1,7 @@
 <template>
   <DataForm v-loading="loading" :fields="totalFields" v-bind="$attrs" v-on="$listeners">
-    <slot v-for="item in totalFields" :slot="`id:${item.id}`" :name="`id:${item.id}`" />
-    <slot v-for="item in totalFields" :slot="`$id:${item.id}`" :name="`$id:${item.id}`" />
+    <slot v-for="item in fields" :slot="`id:${item}`" :name="`id:${item}`" />
+    <slot v-for="item in fields" :slot="`$id:${item}`" :name="`$id:${item}`" />
   </DataForm>
 </template>
 
@@ -18,8 +18,7 @@ export default {
   props: {
     url: {
       type: String,
-      // required: true,
-      default: '/api/v1/users/users/'
+      required: true,
     },
     method: {
       type: String,
@@ -47,6 +46,7 @@ export default {
   },
   mounted() {
     this.optionUrlMeta()
+    console.log('auto data form', this.$attrs)
   },
   methods: {
     optionUrlMeta() {
diff --git a/src/components/formGroupHeader/index.vue b/src/components/formGroupHeader/index.vue
index 41efbef06..044159382 100644
--- a/src/components/formGroupHeader/index.vue
+++ b/src/components/formGroupHeader/index.vue
@@ -3,7 +3,6 @@
     <div v-if="line" class="hr-line-dashed" />
     <h3>{{ title }}</h3>
   </div>
-
 </template>
 
 <script>
@@ -17,7 +16,6 @@ export default {
       type: Boolean,
       default: true
     }
-
   }
 }
 </script>
diff --git a/src/layout/components/GenericCreateUpdatePage/index.vue b/src/layout/components/GenericCreateUpdatePage/index.vue
new file mode 100644
index 000000000..03e9b33c3
--- /dev/null
+++ b/src/layout/components/GenericCreateUpdatePage/index.vue
@@ -0,0 +1,29 @@
+<template>
+  <Page>
+    <IBox>
+      <AutoDataForm v-bind="$attrs" v-on="$listeners">
+        <slot v-for="item in $attrs.fields" :slot="`id:${item}`" :name="`id:${item}`" />
+        <slot v-for="item in $attrs.fields" :slot="`$id:${item}`" :name="`$id:${item}`" />
+      </AutoDataForm>
+    </IBox>
+  </Page>
+</template>
+<script>
+import { Page, IBox } from '@/layout/components'
+import AutoDataForm from '@/components/AutoDataForm'
+export default {
+  name: 'GenericCreateUpdatePage',
+  components: {
+    Page, IBox, AutoDataForm
+  },
+  mounted() {
+    console.log('generic', this.$attrs)
+    console.log(this.$data)
+    console.log(this.fields)
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/layout/components/index.js b/src/layout/components/index.js
index e47ec4fdc..62c228747 100644
--- a/src/layout/components/index.js
+++ b/src/layout/components/index.js
@@ -8,3 +8,4 @@ export { default as SubMenuPage } from './SubMenuPage'
 export { default as Footer } from './Footer'
 export { default as IBox } from './IBox'
 export { default as GenericListPage } from './GenericListPage'
+export { default as GenericCreateUpdatePage } from './GenericCreateUpdatePage'
diff --git a/src/views/users/UserCreateUpdate.vue b/src/views/users/UserCreateUpdate.vue
index 6d87a510b..cfa422cd8 100644
--- a/src/views/users/UserCreateUpdate.vue
+++ b/src/views/users/UserCreateUpdate.vue
@@ -1,31 +1,19 @@
 <template>
-  <Page>
-    <IBox>
-      <AutoDataForm :form="form" :fields="fields" :fields-meta="fieldsMeta">
-        <FormGroupHeader slot="id:name" title="账户" :line="false" />
-        <FormGroupHeader slot="id:password_strategy" title="认证" :line="true" />
-        <FormGroupHeader slot="id:role" title="角色安全" :line="true" />
-        <FormGroupHeader slot="id:phone" title="认证" :line="true" />
-      </AutoDataForm>
-    </IBox>
-  </Page>
+  <GenericCreateUpdatePage :fields="fields" :form="form" :fields-meta="fieldsMeta" :url="url">
+    <FormGroupHeader slot="id:name" title="账户" :line="false" />
+    <FormGroupHeader slot="id:password_strategy" title="认证" :line="true" />
+    <FormGroupHeader slot="id:role" title="角色安全" :line="true" />
+    <FormGroupHeader slot="id:phone" title="认证" :line="true" />
+  </GenericCreateUpdatePage>
 </template>
 
 <script>
-/* eslint-disable vue/no-unused-components */
 import FormGroupHeader from '@/components/formGroupHeader'
-import { Page, IBox } from '@/layout/components'
-import DataForm from '@/components/DataForm'
-import AutoDataForm from '@/components/AutoDataForm'
-import Select2 from '@/components/Select2'
+import { GenericCreateUpdatePage } from '@/layout/components'
 export default {
   components: {
-    Page,
-    IBox,
-    DataForm,
-    Select2,
-    FormGroupHeader,
-    AutoDataForm
+    GenericCreateUpdatePage,
+    FormGroupHeader
   },
   data() {
     return {
@@ -40,6 +28,7 @@ export default {
         'name', 'username', 'email', 'groups', 'password_strategy', 'password', 'mfa_level',
         'source', 'role', 'date_expired', 'phone', 'wechat', 'comment'
       ],
+      url: '/api/v1/users/users/',
       fieldsMeta: {
         password: {
           el: {