diff --git a/src/components/generator/config.js b/src/components/generator/config.js
index 9ddddbf..14a53a0 100644
--- a/src/components/generator/config.js
+++ b/src/components/generator/config.js
@@ -665,3 +665,115 @@ export const assistComponents = [
style: {width: '100%'}
}
]
+
+// 个人信息组件
+export const personalInfoComponents = [
+ {
+ typeId: 'INPUT',
+ __config__: {
+ label: '手机号',
+ labelWidth: null,
+ showLabel: true,
+ changeTag: false,
+ tag: 'el-input',
+ tagIcon: 'input',
+ defaultValue: undefined,
+ required: true,
+ layout: 'colFormItem',
+ span: 24,
+ showRegList: false,
+ document: 'https://element.eleme.cn/#/zh-CN/component/input',
+ // 正则校验规则
+ regList: [{
+ pattern: '/^1(3|4|5|7|8|9)\\d{9}$/',
+ message: '手机号格式错误'
+ }]
+ },
+ // 组件的插槽属性
+ __slot__: {
+ prepend: '',
+ append: ''
+ },
+ placeholder: '请输入手机号',
+ style: { width: '100%' },
+ clearable: true,
+ 'prefix-icon': 'el-icon-mobile',
+ 'suffix-icon': '',
+ maxlength: 11,
+ 'show-word-limit': true,
+ readonly: false,
+ disabled: false
+ },
+ {
+ typeId: 'INPUT',
+ __config__: {
+ label: '邮箱',
+ labelWidth: null,
+ showLabel: true,
+ changeTag: false,
+ tag: 'el-input',
+ tagIcon: 'input',
+ defaultValue: undefined,
+ required: true,
+ layout: 'colFormItem',
+ span: 24,
+ showRegList: false,
+ document: 'https://element.eleme.cn/#/zh-CN/component/input',
+ // 正则校验规则
+ regList: [{
+ pattern: '/^\\w+((-\\w+)|(\\.\\w+))*\\@[A-Za-z0-9]+((\\.|-)[A-Za-z0-9]+)*\\.[A-Za-z0-9]+$/',
+ message: '邮箱格式错误'
+ }]
+ },
+ // 组件的插槽属性
+ __slot__: {
+ prepend: '',
+ append: ''
+ },
+ placeholder: '请输入邮箱',
+ style: { width: '100%' },
+ clearable: true,
+ 'prefix-icon': 'el-icon-message',
+ 'suffix-icon': '',
+ maxlength: 24,
+ 'show-word-limit': true,
+ readonly: false,
+ disabled: false
+ },
+ {
+ typeId: 'INPUT',
+ __config__: {
+ label: '身份证',
+ labelWidth: null,
+ showLabel: true,
+ changeTag: false,
+ tag: 'el-input',
+ tagIcon: 'input',
+ defaultValue: undefined,
+ required: true,
+ layout: 'colFormItem',
+ span: 24,
+ showRegList: false,
+ document: 'https://element.eleme.cn/#/zh-CN/component/input',
+ // 正则校验规则
+ regList: [{
+ pattern: '/(^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$)|(^[1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}$)/',
+ message: '身份证格式错误'
+ }]
+ },
+ // 组件的插槽属性
+ __slot__: {
+ prepend: '',
+ append: ''
+ },
+ placeholder: '请输入身份证',
+ style: { width: '100%' },
+ clearable: true,
+ 'prefix-icon': 'el-icon-postcard',
+ 'suffix-icon': '',
+ maxlength: 20,
+ 'show-word-limit': true,
+ readonly: false,
+ disabled: false
+ }
+]
diff --git a/src/components/parser/Parser.vue b/src/components/parser/Parser.vue
index 89bffa9..f0e3675 100644
--- a/src/components/parser/Parser.vue
+++ b/src/components/parser/Parser.vue
@@ -34,7 +34,12 @@ const layouts = {
if (formConfCopy.showNumber) {
label = scheme.serialNumber + ': ' + label
}
- this.$set(this[this.formConf.formModel], scheme.__vModel__, [])
+ // 分页返回上一页时把值设置回表单
+ let value = _.get(this[this.formConf.formModel], scheme.__vModel__)
+ if (value) {
+ config.defaultValue = value
+ }
+ // 控制逻辑显示隐藏
let colStyle = scheme.logicShow ? '' : 'display:none'
let cidAttr = config.formId
return (
@@ -165,6 +170,9 @@ function setValue(event, config, scheme) {
this.$set(this[this.formConf.formModel], scheme.__vModel__, event)
setValueLabel.call(this, event, config, scheme)
let logicShowRule = this.formConfCopy.logicShowRule
+ if (!logicShowRule) {
+ return
+ }
// 找到该问题需要触发显示的问题 判断逻辑是否成立
let rules = _.get(logicShowRule, config.formId)
if (rules && Array.isArray(rules)) {
@@ -180,6 +188,36 @@ function setValue(event, config, scheme) {
}
}
+/**
+ * 分页下一页
+ */
+function nextPage(page) {
+ switchPage.call(this, 'next', page)
+}
+/**
+ * 分页上一页
+ */
+function prevPage(page) {
+ switchPage.call(this, 'prev', page)
+}
+/**
+ * 切换页
+ */
+function switchPage(eventName, page) {
+ this.$refs[this.formConf.formRef].validate(valid => {
+ if (!valid) {
+ setTimeout(() => {
+ let isError = document.getElementsByClassName('is-error')
+ isError[0].querySelector('input').focus()
+ }, 100)
+ return false
+ } else {
+ this.$emit(eventName, {page: page, formModel: this[this.formConf.formModel], labelFormModel: this[this.formConf.labelFormModel]})
+ }
+ return true
+ })
+}
+
/**
* radio checkbox 其他输入框值处理
*/
@@ -252,6 +290,8 @@ function buildListeners(scheme) {
listeners.upload = (response, file, fileList) => setUpload.call(this, config, scheme, response, file, fileList)
listeners.deleteUpload = (file, fileList) => deleteUpload.call(this, config, scheme, file, fileList)
listeners.selectOtherChange = (event, config) => setOtherValueLabel.call(this, event, config)
+ listeners.prev = page => prevPage.call(this, page)
+ listeners.next = page => nextPage.call(this, page)
return listeners
}
@@ -263,13 +303,21 @@ export default {
formConf: {
type: Object,
required: true
+ },
+ formModel: {
+ type: Object,
+ required: false
+ },
+ labelFormModel: {
+ type: Object,
+ required: false
}
},
data() {
const data = {
formConfCopy: deepClone(this.formConf),
- [this.formConf.formModel]: {},
- [this.formConf.labelFormModel]: {},
+ [this.formConf.formModel]: deepClone(this.formModel),
+ [this.formConf.labelFormModel]: deepClone(this.labelFormModel),
[this.formConf.formRules]: {}
}
this.initFormData(data.formConfCopy.fields, data[this.formConf.formModel])
@@ -277,23 +325,12 @@ export default {
this.buildRules(data.formConfCopy.fields, data[this.formConf.formRules])
return data
},
- watch: {
- formConf: {
- handler(val) {
- this.formConfCopy = val
- this.initFormData(this.data.formConfCopy.fields, this.data[this.formConf.formModel])
- this.initLabelFormData(this.data.formConfCopy.fields, this.data[this.formConf.labelFormModel])
- this.buildRules(this.data.formConfCopy.fields, this.data[this.formConf.formRules])
- },
- deep: true
- }
- },
methods: {
initLabelFormData(componentList, formData) {
- // 设置默认值
+ // 获取选择项选中的显示的值
componentList.forEach(cur => {
let temConfig = cur.__config__
- if (cur.__vModel__) {
+ if (cur.__vModel__ && !formData[cur.__vModel__]) {
let tagOptionKey = processType[temConfig.tag]
let defaultValue = temConfig.defaultValue
let labelStr = ''
@@ -317,9 +354,12 @@ export default {
},
initFormData(componentList, formData) {
// 设置默认值
+ // eslint-disable-next-line no-debugger
+ debugger
componentList.forEach(cur => {
const config = cur.__config__
- if (cur.__vModel__) {
+ if (cur.__vModel__ && !formData[cur.__vModel__]) {
+ // 如果存在分页带回的数据 则不再设置默认
formData[cur.__vModel__] = config.defaultValue
}
if (config.children) this.initFormData(config.children, formData)
diff --git a/src/components/render/render.js b/src/components/render/render.js
index 9c23dc0..f05fb80 100644
--- a/src/components/render/render.js
+++ b/src/components/render/render.js
@@ -51,12 +51,13 @@ function vModel(dataObject, defaultValue) {
return false
}
}
+ // 分页组件
} else if (config.tag === 'pagination') {
dataObject.on.prev = val => {
- console.log(val)
+ this.$emit('prev', val)
}
dataObject.on.next = val => {
- console.log(val)
+ this.$emit('next', val)
}
} else {
dataObject.props.value = defaultValue
diff --git a/src/views/form/ProjectForm.vue b/src/views/form/ProjectForm.vue
index 782701f..f7ece41 100644
--- a/src/views/form/ProjectForm.vue
+++ b/src/views/form/ProjectForm.vue
@@ -23,7 +23,12 @@
class="form-name-text" v-html="formConf.description"
/>
-
+