From c68d92502303197f3dfed9bd157f9a66f61b88a8 Mon Sep 17 00:00:00 2001
From: Aaron <427787340@qq.com>
Date: Tue, 17 Dec 2019 18:40:26 +0800
Subject: [PATCH] 新增预览版表单组件

---
 examples/views/layout/component.vue      |   2 +-
 examples/views/page/form/form-render.vue |  56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 examples/views/page/form/index.vue       | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 examples/views/page/other.vue            | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------
 4 files changed, 227 insertions(+), 38 deletions(-)
 create mode 100644 examples/views/page/form/form-render.vue
 create mode 100644 examples/views/page/form/index.vue

diff --git a/examples/views/layout/component.vue b/examples/views/layout/component.vue
index 602e1e3..565347f 100644
--- a/examples/views/layout/component.vue
+++ b/examples/views/layout/component.vue
@@ -58,7 +58,7 @@ export default {
           rangeIndex = index
         }
       }
-      this.currentAnchor = this.anchorList[rangeIndex].hash;
+      this.currentAnchor = this.anchorList[rangeIndex] ? this.anchorList[rangeIndex].hash : {};
     };
     // 初次加载时根据url hash跳转到指定锚点
     if (this.$route.hash) {
diff --git a/examples/views/page/form/form-render.vue b/examples/views/page/form/form-render.vue
new file mode 100644
index 0000000..c17e420
--- /dev/null
+++ b/examples/views/page/form/form-render.vue
@@ -0,0 +1,56 @@
+<template>
+  <el-row :gutter="15" type="flex" style="flex-wrap: wrap;">
+    <template v-for="(item, index) in list">
+      <el-col v-if="item.group && item.list" :key="index" :span="item.group.span || 24">
+        <el-row :gutter="15" type="flex" style="flex-wrap: wrap;">
+          <el-col v-if="item.group.title" :span="24">{{ item.group.title || item.group }}</el-col>
+          <form-render :list="item.list" :model="itemKey ? model[itemKey] || {} : model" @item-change="onItemChange" @form-item-change="onFormItemChange" :itemKey="item.group.key"></form-render>
+        </el-row>
+      </el-col>
+      <el-col v-else :span="item.span || 12" :key="index">
+        <el-form-item :label="item.label" :label-width="item.labelWidth || '120px'" :prop="item.fullKey" :rules="item.rules">
+          <component :is="item.type" :value="itemValue({ item })" @input="v => handleInput({ value: v, item })"></component>
+        </el-form-item>
+      </el-col>
+    </template>
+  </el-row>
+</template>
+
+<script>
+export default {
+  name: 'form-render',
+  props: {
+    list: Array,
+    model: Object,
+    itemKey: String,
+  },
+  methods: {
+    itemValue({ item }) {
+      if (this.itemKey) {
+        const groupItem = this.model[this.itemKey] || {};
+        return groupItem[item.key];
+      } else {
+        return this.model[item.key];
+      }
+    },
+    handleInput({ value, item }) {
+      if (this.itemKey) {
+        this.$emit('item-change', { [this.itemKey]: { ...this.model[this.itemKey], [item.key]: value } });
+      } else {
+        this.$emit('item-change', { [item.key]: value });
+      }
+      this.$emit('form-item-change', { [item.fullKey]: value });
+    },
+    onItemChange(value) {
+      if (this.itemKey) {
+        this.$emit('item-change', { [this.itemKey]: { ...this.model[this.itemKey], ...value } });
+      } else {
+        this.$emit('item-change', value);
+      }
+    },
+    onFormItemChange(value) {
+      this.$emit('form-item-change', value);
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/examples/views/page/form/index.vue b/examples/views/page/form/index.vue
new file mode 100644
index 0000000..336ee41
--- /dev/null
+++ b/examples/views/page/form/index.vue
@@ -0,0 +1,102 @@
+<template>
+  <el-form ref="form" size="small" :model="formModel">
+    {{ formModel }}
+    <form-render :list="formList" :model="model" @item-change="onItemChange" @form-item-change="onFormItemChange"></form-render>
+  </el-form>
+</template>
+
+<script>
+import FormRender from './form-render';
+
+export default {
+  components: { FormRender },
+  props: {
+    value: Object,
+    list: Array,
+  },
+  data() {
+    return {
+      model: {},
+      formModel: {}
+    }
+  },
+  watch: {
+    value(val) {
+      const data = val || {};
+      this.model = data;
+      let formModel = {};
+      const setFormModelValue = (list, parentKey) => {
+        list.forEach(item => {
+          item.fullKey = `${parentKey ? `${parentKey}-${item.key}` : item.key}`;
+          if (item.value instanceof Object) {
+            setFormModelValue(Object.keys(item.value).map(key => ({ key, value: item.value[key] })), item.fullKey);
+          } else {
+            if (item.fullKey) {
+              formModel[item.fullKey] = item.value;
+            }
+          }
+        });
+      };
+      setFormModelValue(Object.keys(data).map(key => ({ key, value: data[key] })));
+      // console.log(formModel);
+      // Object.keys(formModel).forEach(key => {
+      //   this.formModel[key] = formModel[key];
+      // });
+      if (Object.keys(formModel).length > 0) {
+        console.log(formModel);
+        this.formModel = formModel;
+      }
+    },
+  },
+  computed: {
+    formList() {
+      const newList = [...new Set(this.list)]
+      const generateFullKey = (list, parentKey) => {
+        list.forEach(item => {
+          if (item.group && item.list) {
+            if (item.group.key) {
+              item.fullKey = `${parentKey ? `${parentKey}-${item.group.key}` : item.group.key}`;
+              // if (item.fullKey) {
+              //   this.formModel[item.fullKey] = '';
+              // }
+            } else {
+              item.fullKey = item.key;
+              // if (item.fullKey) {
+              //   this.formModel[item.fullKey] = '';
+              // }
+            }
+            generateFullKey(item.list, item.fullKey);
+          } else {
+            item.fullKey = `${parentKey ? `${parentKey}-${item.key}` : item.key}`;
+            // if (item.fullKey) {
+            //   this.formModel[item.fullKey] = '';
+            // }
+          }
+        });
+      };
+      generateFullKey(newList);
+      return newList;
+    }
+  },
+  methods: {
+    // 表单项值变化
+    onItemChange(item) {
+      this.$emit('input', { ...this.model, ...item });
+    },
+    // 表单相校验值变化
+    onFormItemChange(item) {
+      this.formModel = { ...this.formModel, ...item };
+    },
+    // 校验表单
+    validate() {
+      this.$refs.form.validate(valid => {
+        this.$emit("validate", valid);
+      });
+    },
+  }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/examples/views/page/other.vue b/examples/views/page/other.vue
index d43c1cd..7704acc 100644
--- a/examples/views/page/other.vue
+++ b/examples/views/page/other.vue
@@ -1,67 +1,98 @@
 <template>
   <div>
     <p>这是一个非markdown页面</p>
-    <el-form size="small">
-      <el-row :gutter="15" type="flex" style="flex-wrap: wrap;">
-        <template v-for="(item, index) in option.list2">
-          <el-col v-if="item.group && item.list" :key="index" :span="item.group.span || 24">
-            <el-row :gutter="15" type="flex" style="flex-wrap: wrap;">
-              <el-col :span="24">{{ item.group.title || item.group }}</el-col>
-              <el-col v-for="(comp, idx) in item.list" :key="idx" :span="comp.span || 12">
-                <el-form-item :label="comp.label" :label-width="comp.labelWidth || '120px'" :prop="comp.key" :rules="comp.rules">
-                  <component :is="comp.type"></component>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-col>
-          <el-col v-else :span="item.span || 12" :key="index">
-            <el-form-item :label="item.label" :label-width="item.labelWidth || '120px'" :prop="item.key" :rules="item.rules">
-              <component :is="item.type"></component>
-            </el-form-item>
-          </el-col>
-        </template>
-      </el-row>
-    </el-form>
+    <pre>{{ model }}</pre>
+    <el-button size="mini" @click="handleGetValue">校验</el-button>
+    <eg-form ref="form" v-model="model" :list="option.list" @validate="onValidate"></eg-form>
   </div>
 </template>
 
 <script>
+import EgForm from './form';
+
 export default {
   name: 'other',
+  components: { EgForm },
   data() {
     return {
+      model: {},
       option: {
-        groups: ['basic', 'location'],
         list: [
-          { type: 'el-input', label: '名称', key: 'name' },
-          { type: 'el-input', label: '地址', key: 'location' },
-        ],
-        list2: [
           {
-            group: { title: 'basic', span: 12 },
+            group: { title: '基础信息', span: 12 },
             list: [
               { type: 'el-input', label: '名称', key: 'name' },
-              { type: 'el-input-number', label: '名称1', key: 'name1' },
-              { type: 'el-switch', label: '名称2', key: 'name2' },
-              { type: 'el-input', label: '名称3', key: 'name3' },
+              { type: 'el-input-number', label: '年龄', key: 'age' },
             ],
           },
           {
-            group: 'location',
+            group: { title: '住址', span: 24, key: 'location' },
             list: [
-              { type: 'el-input', label: '地址', key: 'location' },
+              { type: 'el-input', label: '地址简称', key: 'locationMin' },
+              {
+                group: { span: 12, key: 'district' },
+                list: [
+                  { type: 'el-input', label: '省', key: 'province', span: 24, rules: [{ required: true, message: '请输入省' }] },
+                  { type: 'el-input', label: '市', key: 'city', span: 24 },
+                ],
+              },
+              {
+                group: { title: '小区信息', span: 24 },
+                list: [
+                  { type: 'el-input', label: '小区名', key: 'areaName', span: 24 },
+                  { type: 'el-input', label: '门牌号', key: 'homeNum', span: 24 },
+                  {
+                    group: { title: 'A栋', span: 24 },
+                    list: [
+                      { type: 'el-input', label: '人数', key: 'anumber', span: 24 },
+                    ],
+                  },
+                  {
+                    group: { title: 'B栋', span: 24, key: 'bside' },
+                    list: [
+                      { type: 'el-input', label: '人数', key: 'bnumber', span: 24 },
+                    ],
+                  }
+                ],
+              }
             ],
           },
-          { type: 'el-input', label: '名称', key: 'name' },
-          { type: 'el-input', label: '地址', key: 'location' },
-          { type: 'el-input-number', label: '名称1', key: 'name1' },
-          { type: 'el-switch', label: '名称2', key: 'name2' },
-          { type: 'el-input', label: '名称3', key: 'name3' },
+          { type: 'el-input', label: '身高', key: 'height' },
+          { type: 'el-input', label: '体重', key: 'weight' },
         ]
       }
     }
   },
+  mounted() {
+    setTimeout(() => {
+      this.model = {
+        age: 7,
+        name: '1',
+        location: {
+          locationMin: 'a',
+          district: {
+            province: 'p',
+            city: 'c'
+          },
+          areaName: 'a',
+          homeNum: 'n',
+          anumber: '1',
+          bside: {
+            bnumber: '2'
+          }
+        },
+        height: '3',
+        weight: '4'
+      }
+    }, 3000);
+  },
   methods: {
+    onValidate(v) {
+      console.log(v);
+    },
+    handleGetValue() {
+      this.$refs.form.validate();
+    }
   }
 }
 </script>
\ No newline at end of file
--
libgit2 0.21.0