update

b08a0712 · 王鹏飞 · e2887abc · b08a0712 · b08a0712 · b08a0712
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -4,15 +4,15 @@
  </div>
 </template>
 <script>
-// import registerForm from './kelley-form'
-import sofiaForm from './sofia-form'
+import registerForm from './kelley-form'
+// import sofiaForm from './sofia-form'

 export default {
  name: 'app',
  data() {
    return {
-      menus: sofiaForm
-      // menus: registerForm
+      // menus: sofiaForm
+      menus: registerForm
    }
  },
  methods: {

--- a/examples/kelley-form/career.js
+++ b/examples/kelley-form/career.js
@@ -6,14 +6,40 @@ export default {
  get: {
    action: '/zws/v1/enrollment/careers?project_id=1001',
    callback(data) {
-      return data
+      return data.map(item => {
+        const { start_date: startDate, end_date: endDate } = item
+        if (startDate) {
+          item.times = [startDate + '', endDate + '']
+        }
+        return item
+      })
    }
  },
  update: {
-    action: '/zws/v1/enrollment/carrers/batch-upload',
+    action: '/zws/v1/enrollment/careers/batch-upload',
    data: { project_id: 1001 },
-    callback(data) {
-      return data
+    beforeRequest(data) {
+      const records = data.map(item => {
+        let [startDate, endDate] = item.times
+        item.start_date = startDate
+        item.end_date = endDate
+        return [
+          'start_date',
+          'end_date',
+          'company_name_cn',
+          'industry',
+          'dept_cn',
+          'position_cn',
+          'job_type',
+          'annual_salary',
+          'job_desc_cn',
+          'company_profile'
+        ].reduce((result, key) => {
+          result[key] = item[key]
+          return result
+        }, {})
+      })
+      return { records }
    }
  },
  form: {
@@ -21,24 +47,17 @@ export default {
      labelWidth: '140px'
    },
    hasAdd: true,
-    defaultModel: {
-      times: [],
-      start_date: null,
-      end_date: null,
-      school_name_cn: '',
-      school_city: '',
-      major_cn: '',
-      degree: 0
-    },
    items: [
      {
        type: 'date-picker-from-to-form',
        elemType: 'monthrange',
        label: '工作时间',
        model: 'times',
-        required: true,
-        attrs: { 'value-format': 'yyyy-MM' },
-        rules: [{ required: true, message: '请选择工作时间', trigger: 'blur' }]
+        rangeSeparator: '至',
+        startPlaceholder: '请选择开始时间',
+        endPlaceholder: '请选择结束时间',
+        attrs: { 'value-format': 'yyyyMM' },
+        rules: [{ required: true, message: '请选择教育时间', trigger: 'blur' }]
      },
      {
        type: 'input-form',

--- a/examples/kelley-form/education.js
+++ b/examples/kelley-form/education.js
@@ -9,7 +9,7 @@ export default {
      return data.map(item => {
        const { start_date: startDate, end_date: endDate } = item
        if (startDate) {
-          item.times = [startDate + '', endDate + '']
+          item.dates = [startDate + '', endDate + '']
        }
        return item
      })
@@ -20,10 +20,21 @@ export default {
    data: { project_id: 1001 },
    beforeRequest(data) {
      const records = data.map(item => {
-        let [startDate, endDate] = item.times
-        item.start_date = startDate.replace(/-/, '')
-        item.end_date = endDate.replace(/-/, '')
-        return item
+        let [startDate, endDate] = item.dates
+        item.start_date = startDate
+        item.end_date = endDate
+        return [
+          'start_date',
+          'end_date',
+          'school_name_cn',
+          'school_country',
+          'school_city',
+          'major_cn',
+          'degree'
+        ].reduce((result, key) => {
+          result[key] = item[key]
+          return result
+        }, {})
      })
      return { records }
    }
@@ -35,22 +46,16 @@ export default {
      labelWidth: '110px'
    },
    hasAdd: true,
-    defaultModel: {
-      times: [],
-      start_date: null,
-      end_date: null,
-      school_name_cn: '',
-      school_city: '',
-      major_cn: '',
-      degree: 0
-    },
    items: [
      {
-        type: 'date-picker-form',
+        type: 'date-picker-from-to-form',
        elemType: 'monthrange',
        label: '教育时间',
-        model: 'times',
-        attrs: { 'value-format': 'yyyy-MM' },
+        model: 'dates',
+        rangeSeparator: '至',
+        startPlaceholder: '请选择开始时间',
+        endPlaceholder: '请选择结束时间',
+        attrs: { 'value-format': 'yyyyMM' },
        rules: [{ required: true, message: '请选择教育时间', trigger: 'blur' }]
      },
      {

--- a/examples/kelley-form/honor.js
+++ b/examples/kelley-form/honor.js
@@ -10,7 +10,13 @@ export default {
    action: '/zws/v1/enrollment/honors/batch-upload',
    data: { project_id: 1001 },
    beforeRequest(data) {
-      return { records: data }
+      const records = data.map(item => {
+        return ['title', 'summary'].reduce((result, key) => {
+          result[key] = item[key]
+          return result
+        }, {})
+      })
+      return { records }
    }
  },
  form: {
@@ -18,10 +24,6 @@ export default {
      labelWidth: '180px'
    },
    hasAdd: true,
-    defaultModel: {
-      title: '',
-      summary: ''
-    },
    items: [
      {
        type: 'input-form',

--- a/examples/kelley-form/profile.js
+++ b/examples/kelley-form/profile.js
@@ -18,8 +18,31 @@ export default {
      let [province, city] = data.city.split('-')
      data.address_province = province
      data.address_city = city
-      delete data.city
-      return data
+      return [
+        'real_name_cn',
+        'real_name_en',
+        'id_type',
+        'id_number',
+        'birthday',
+        'gender',
+        'nationality',
+        'address_province',
+        'address_city',
+        'date_of_starting_to_work',
+        'phone_number',
+        'email',
+        'qq_account',
+        'we_chat_account',
+        'mailing_address',
+        'emergency_contact_name',
+        'emergency_contacts_phone',
+        'english_level',
+        'english_score',
+        'channel'
+      ].reduce((result, key) => {
+        result[key] = data[key]
+        return result
+      }, {})
    }
  },
  form: {

--- a/examples/kelley-form/training.js
+++ b/examples/kelley-form/training.js
@@ -6,14 +6,32 @@ export default {
  get: {
    action: '/zws/v1/enrollment/trainings?project_id=1001',
    callback(data) {
-      return data
+      return data.map(item => {
+        const { start_date: startDate, end_date: endDate } = item
+        if (startDate) {
+          item.dates = [startDate + '', endDate + '']
+        }
+        return item
+      })
    }
  },
  update: {
    action: '/zws/v1/enrollment/trainings/batch-upload',
    data: { project_id: 1001 },
-    callback(data) {
-      return { records: data }
+    beforeRequest(data) {
+      const records = data.map(item => {
+        let [startDate, endDate] = item.dates
+        item.start_date = startDate
+        item.end_date = endDate
+        return ['start_date', 'end_date', 'institute_cn', 'course_cn'].reduce(
+          (result, key) => {
+            result[key] = item[key]
+            return result
+          },
+          {}
+        )
+      })
+      return { records }
    }
  },
  form: {
@@ -21,33 +39,26 @@ export default {
      labelWidth: '80px'
    },
    hasAdd: true,
-    defaultModel: {
-      times: [],
-      start_date: null,
-      end_date: null,
-      school_name_cn: '',
-      school_country: ''
-    },
    items: [
      {
        type: 'date-picker-form',
        elemType: 'monthrange',
        label: '培训时间',
-        model: 'times',
+        model: 'dates',
        required: true,
-        attrs: { 'value-format': 'yyyy-MM' },
+        attrs: { 'value-format': 'yyyyMM' },
        rules: [{ required: true, message: '请选择培训时间', trigger: 'blur' }]
      },
      {
        type: 'input-form',
        label: '培训机构',
-        model: 'school_name_cn',
+        model: 'institute_cn',
        rules: [{ required: true, message: '请输入培训机构', trigger: 'blur' }]
      },
      {
        type: 'input-form',
        label: '课程名称',
-        model: 'school_country',
+        model: 'course_cn',
        rules: [
          {
            required: true,

--- a/src/components/layout/FormPane.vue
+++ b/src/components/layout/FormPane.vue
@@ -8,7 +8,7 @@
      <template v-if="isMultiple">
        <template v-for="(item, index) in model">
          <div class="ejz-form-pane_group" :key="index">
-            <div class="remove" @click="handleRemove(index)" v-if="index">
+            <div class="remove" @click="handleRemove(index)">
              <i class="el-icon-close"></i>
            </div>
            <form-form
@@ -21,7 +21,7 @@
          </div>
        </template>
        <el-button @click="handleAdd">增加一项</el-button>
-        <el-button @click="handleSubmit">保存</el-button>
+        <el-button type="primary" @click="handleSubmit">保存</el-button>
      </template>
    </template>