fix(系统工具): 修复 表单构建导出文件和复制代码报错的问题[I6OAUN](https://gitee.com/KonBAI-Q/ruoyi-flowable-plus/issues/I6OAUN) @gu-yang
This commit is contained in:
@@ -4,10 +4,10 @@ const styles = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function addCss(cssList, el) {
|
function addCss(cssList, el) {
|
||||||
const css = styles[el.tag]
|
const css = styles[el.__config__.tag]
|
||||||
css && cssList.indexOf(css) === -1 && cssList.push(css)
|
css && cssList.indexOf(css) === -1 && cssList.push(css)
|
||||||
if (el.children) {
|
if (el.__config__.children) {
|
||||||
el.children.forEach(el2 => addCss(cssList, el2))
|
el.__config__.children.forEach(el2 => addCss(cssList, el2))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/* eslint-disable max-len */
|
/* eslint-disable max-len */
|
||||||
import { trigger } from './config'
|
import trigger from './ruleTrigger'
|
||||||
|
|
||||||
let confGlobal
|
let confGlobal
|
||||||
let someSpanIsNot24
|
let someSpanIsNot24
|
||||||
@@ -70,8 +70,8 @@ function buildFromBtns(conf, type) {
|
|||||||
|
|
||||||
// span不为24的用el-col包裹
|
// span不为24的用el-col包裹
|
||||||
function colWrapper(element, str) {
|
function colWrapper(element, str) {
|
||||||
if (someSpanIsNot24 || element.span !== 24) {
|
if (someSpanIsNot24 || element.__config__.span !== 24) {
|
||||||
return `<el-col :span="${element.span}">
|
return `<el-col :span="${element.__config__.span}">
|
||||||
${str}
|
${str}
|
||||||
</el-col>`
|
</el-col>`
|
||||||
}
|
}
|
||||||
@@ -81,12 +81,12 @@ function colWrapper(element, str) {
|
|||||||
const layouts = {
|
const layouts = {
|
||||||
colFormItem(element) {
|
colFormItem(element) {
|
||||||
let labelWidth = ''
|
let labelWidth = ''
|
||||||
if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) {
|
if (element.__config__.labelWidth && element.__config__.labelWidth !== confGlobal.labelWidth) {
|
||||||
labelWidth = `label-width="${element.labelWidth}px"`
|
labelWidth = `label-width="${element.__config__.labelWidth}px"`
|
||||||
}
|
}
|
||||||
const required = !trigger[element.tag] && element.required ? 'required' : ''
|
const required = !trigger[element.__config__.tag] && element.__config__.required ? 'required' : ''
|
||||||
const tagDom = tags[element.tag] ? tags[element.tag](element) : null
|
const tagDom = tags[element.__config__.tag] ? tags[element.__config__.tag](element) : null
|
||||||
let str = `<el-form-item ${labelWidth} label="${element.label}" prop="${element.vModel}" ${required}>
|
let str = `<el-form-item ${labelWidth} label="${element.__config__.label}" prop="${element.__vModel__}" ${required}>
|
||||||
${tagDom}
|
${tagDom}
|
||||||
</el-form-item>`
|
</el-form-item>`
|
||||||
str = colWrapper(element, str)
|
str = colWrapper(element, str)
|
||||||
@@ -97,7 +97,7 @@ const layouts = {
|
|||||||
const justify = element.type === 'default' ? '' : `justify="${element.justify}"`
|
const justify = element.type === 'default' ? '' : `justify="${element.justify}"`
|
||||||
const align = element.type === 'default' ? '' : `align="${element.align}"`
|
const align = element.type === 'default' ? '' : `align="${element.align}"`
|
||||||
const gutter = element.gutter ? `gutter="${element.gutter}"` : ''
|
const gutter = element.gutter ? `gutter="${element.gutter}"` : ''
|
||||||
const children = element.children.map(el => layouts[el.layout](el))
|
const children = element.__config__.children.map(el => layouts[el.__config__.layout](el))
|
||||||
let str = `<el-row ${type} ${justify} ${align} ${gutter}>
|
let str = `<el-row ${type} ${justify} ${align} ${gutter}>
|
||||||
${children.join('\n')}
|
${children.join('\n')}
|
||||||
</el-row>`
|
</el-row>`
|
||||||
@@ -117,7 +117,7 @@ const tags = {
|
|||||||
let child = buildElButtonChild(el)
|
let child = buildElButtonChild(el)
|
||||||
|
|
||||||
if (child) child = `\n${child}\n` // 换行
|
if (child) child = `\n${child}\n` // 换行
|
||||||
return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}</${el.tag}>`
|
return `<${el.__config__.tag} ${type} ${icon} ${size} ${disabled}>${child}</${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-input': el => {
|
'el-input': el => {
|
||||||
const {
|
const {
|
||||||
@@ -136,7 +136,7 @@ const tags = {
|
|||||||
let child = buildElInputChild(el)
|
let child = buildElInputChild(el)
|
||||||
|
|
||||||
if (child) child = `\n${child}\n` // 换行
|
if (child) child = `\n${child}\n` // 换行
|
||||||
return `<${el.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}</${el.tag}>`
|
return `<${el.__config__.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}</${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-input-number': el => {
|
'el-input-number': el => {
|
||||||
const { disabled, vModel, placeholder } = attrBuilder(el)
|
const { disabled, vModel, placeholder } = attrBuilder(el)
|
||||||
@@ -147,7 +147,7 @@ const tags = {
|
|||||||
const stepStrictly = el['step-strictly'] ? 'step-strictly' : ''
|
const stepStrictly = el['step-strictly'] ? 'step-strictly' : ''
|
||||||
const precision = el.precision ? `:precision='${el.precision}'` : ''
|
const precision = el.precision ? `:precision='${el.precision}'` : ''
|
||||||
|
|
||||||
return `<${el.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}></${el.tag}>`
|
return `<${el.__config__.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}></${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-select': el => {
|
'el-select': el => {
|
||||||
const {
|
const {
|
||||||
@@ -158,7 +158,7 @@ const tags = {
|
|||||||
let child = buildElSelectChild(el)
|
let child = buildElSelectChild(el)
|
||||||
|
|
||||||
if (child) child = `\n${child}\n` // 换行
|
if (child) child = `\n${child}\n` // 换行
|
||||||
return `<${el.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}</${el.tag}>`
|
return `<${el.__config__.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}</${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-radio-group': el => {
|
'el-radio-group': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
@@ -166,7 +166,7 @@ const tags = {
|
|||||||
let child = buildElRadioGroupChild(el)
|
let child = buildElRadioGroupChild(el)
|
||||||
|
|
||||||
if (child) child = `\n${child}\n` // 换行
|
if (child) child = `\n${child}\n` // 换行
|
||||||
return `<${el.tag} ${vModel} ${size} ${disabled}>${child}</${el.tag}>`
|
return `<${el.__config__.tag} ${vModel} ${size} ${disabled}>${child}</${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-checkbox-group': el => {
|
'el-checkbox-group': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
@@ -176,7 +176,7 @@ const tags = {
|
|||||||
let child = buildElCheckboxGroupChild(el)
|
let child = buildElCheckboxGroupChild(el)
|
||||||
|
|
||||||
if (child) child = `\n${child}\n` // 换行
|
if (child) child = `\n${child}\n` // 换行
|
||||||
return `<${el.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}</${el.tag}>`
|
return `<${el.__config__.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}</${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-switch': el => {
|
'el-switch': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
@@ -187,19 +187,19 @@ const tags = {
|
|||||||
const activeValue = el['active-value'] !== true ? `:active-value='${JSON.stringify(el['active-value'])}'` : ''
|
const activeValue = el['active-value'] !== true ? `:active-value='${JSON.stringify(el['active-value'])}'` : ''
|
||||||
const inactiveValue = el['inactive-value'] !== false ? `:inactive-value='${JSON.stringify(el['inactive-value'])}'` : ''
|
const inactiveValue = el['inactive-value'] !== false ? `:inactive-value='${JSON.stringify(el['inactive-value'])}'` : ''
|
||||||
|
|
||||||
return `<${el.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}></${el.tag}>`
|
return `<${el.__config__.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}></${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-cascader': el => {
|
'el-cascader': el => {
|
||||||
const {
|
const {
|
||||||
disabled, vModel, clearable, placeholder, width
|
disabled, vModel, clearable, placeholder, width
|
||||||
} = attrBuilder(el)
|
} = attrBuilder(el)
|
||||||
const options = el.options ? `:options="${el.vModel}Options"` : ''
|
const options = el.options ? `:options="${el.__vModel__}Options"` : ''
|
||||||
const props = el.props ? `:props="${el.vModel}Props"` : ''
|
const props = el.props ? `:props="${el.__vModel__}Props"` : ''
|
||||||
const showAllLevels = el['show-all-levels'] ? '' : ':show-all-levels="false"'
|
const showAllLevels = el['show-all-levels'] ? '' : ':show-all-levels="false"'
|
||||||
const filterable = el.filterable ? 'filterable' : ''
|
const filterable = el.filterable ? 'filterable' : ''
|
||||||
const separator = el.separator === '/' ? '' : `separator="${el.separator}"`
|
const separator = el.separator === '/' ? '' : `separator="${el.separator}"`
|
||||||
|
|
||||||
return `<${el.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}></${el.tag}>`
|
return `<${el.__config__.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}></${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-slider': el => {
|
'el-slider': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
@@ -209,7 +209,7 @@ const tags = {
|
|||||||
const range = el.range ? 'range' : ''
|
const range = el.range ? 'range' : ''
|
||||||
const showStops = el['show-stops'] ? `:show-stops="${el['show-stops']}"` : ''
|
const showStops = el['show-stops'] ? `:show-stops="${el['show-stops']}"` : ''
|
||||||
|
|
||||||
return `<${el.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}></${el.tag}>`
|
return `<${el.__config__.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}></${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-time-picker': el => {
|
'el-time-picker': el => {
|
||||||
const {
|
const {
|
||||||
@@ -223,7 +223,7 @@ const tags = {
|
|||||||
const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : ''
|
const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : ''
|
||||||
const pickerOptions = el['picker-options'] ? `:picker-options='${JSON.stringify(el['picker-options'])}'` : ''
|
const pickerOptions = el['picker-options'] ? `:picker-options='${JSON.stringify(el['picker-options'])}'` : ''
|
||||||
|
|
||||||
return `<${el.tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}></${el.tag}>`
|
return `<${el.__config__.tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}></${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-date-picker': el => {
|
'el-date-picker': el => {
|
||||||
const {
|
const {
|
||||||
@@ -237,7 +237,7 @@ const tags = {
|
|||||||
const type = el.type === 'date' ? '' : `type="${el.type}"`
|
const type = el.type === 'date' ? '' : `type="${el.type}"`
|
||||||
const readonly = el.readonly ? 'readonly' : ''
|
const readonly = el.readonly ? 'readonly' : ''
|
||||||
|
|
||||||
return `<${el.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}></${el.tag}>`
|
return `<${el.__config__.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}></${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-rate': el => {
|
'el-rate': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
@@ -246,7 +246,7 @@ const tags = {
|
|||||||
const showText = el['show-text'] ? 'show-text' : ''
|
const showText = el['show-text'] ? 'show-text' : ''
|
||||||
const showScore = el['show-score'] ? 'show-score' : ''
|
const showScore = el['show-score'] ? 'show-score' : ''
|
||||||
|
|
||||||
return `<${el.tag} ${vModel} ${allowHalf} ${showText} ${showScore} ${disabled}></${el.tag}>`
|
return `<${el.__config__.tag} ${vModel} ${max} ${allowHalf} ${showText} ${showScore} ${disabled}></${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-color-picker': el => {
|
'el-color-picker': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
@@ -254,29 +254,29 @@ const tags = {
|
|||||||
const showAlpha = el['show-alpha'] ? 'show-alpha' : ''
|
const showAlpha = el['show-alpha'] ? 'show-alpha' : ''
|
||||||
const colorFormat = el['color-format'] ? `color-format="${el['color-format']}"` : ''
|
const colorFormat = el['color-format'] ? `color-format="${el['color-format']}"` : ''
|
||||||
|
|
||||||
return `<${el.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}></${el.tag}>`
|
return `<${el.__config__.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}></${el.__config__.tag}>`
|
||||||
},
|
},
|
||||||
'el-upload': el => {
|
'el-upload': el => {
|
||||||
const disabled = el.disabled ? ':disabled=\'true\'' : ''
|
const disabled = el.disabled ? ':disabled=\'true\'' : ''
|
||||||
const action = el.action ? `:action="${el.vModel}Action"` : ''
|
const action = el.action ? `:action="${el.__vModel__}Action"` : ''
|
||||||
const multiple = el.multiple ? 'multiple' : ''
|
const multiple = el.multiple ? 'multiple' : ''
|
||||||
const listType = el['list-type'] !== 'text' ? `list-type="${el['list-type']}"` : ''
|
const listType = el['list-type'] !== 'text' ? `list-type="${el['list-type']}"` : ''
|
||||||
const accept = el.accept ? `accept="${el.accept}"` : ''
|
const accept = el.accept ? `accept="${el.accept}"` : ''
|
||||||
const name = el.name !== 'file' ? `name="${el.name}"` : ''
|
const name = el.name !== 'file' ? `name="${el.name}"` : ''
|
||||||
const autoUpload = el['auto-upload'] === false ? ':auto-upload="false"' : ''
|
const autoUpload = el['auto-upload'] === false ? ':auto-upload="false"' : ''
|
||||||
const beforeUpload = `:before-upload="${el.vModel}BeforeUpload"`
|
const beforeUpload = `:before-upload="${el.__vModel__}BeforeUpload"`
|
||||||
const fileList = `:file-list="${el.vModel}fileList"`
|
const fileList = `:file-list="${el.__vModel__}fileList"`
|
||||||
const ref = `ref="${el.vModel}"`
|
const ref = `ref="${el.__vModel__}"`
|
||||||
let child = buildElUploadChild(el)
|
let child = buildElUploadChild(el)
|
||||||
|
|
||||||
if (child) child = `\n${child}\n` // 换行
|
if (child) child = `\n${child}\n` // 换行
|
||||||
return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}</${el.tag}>`
|
return `<${el.__config__.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}</${el.__config__.tag}>`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function attrBuilder(el) {
|
function attrBuilder(el) {
|
||||||
return {
|
return {
|
||||||
vModel: `v-model="${confGlobal.formModel}.${el.vModel}"`,
|
vModel: `v-model="${confGlobal.formModel}.${el.__vModel__}"`,
|
||||||
clearable: el.clearable ? 'clearable' : '',
|
clearable: el.clearable ? 'clearable' : '',
|
||||||
placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '',
|
placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '',
|
||||||
width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '',
|
width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '',
|
||||||
@@ -287,8 +287,8 @@ function attrBuilder(el) {
|
|||||||
// el-buttin 子级
|
// el-buttin 子级
|
||||||
function buildElButtonChild(conf) {
|
function buildElButtonChild(conf) {
|
||||||
const children = []
|
const children = []
|
||||||
if (conf.default) {
|
if (conf.__config__.defaultValue) {
|
||||||
children.push(conf.default)
|
children.push(conf.__config__.defaultValue)
|
||||||
}
|
}
|
||||||
return children.join('\n')
|
return children.join('\n')
|
||||||
}
|
}
|
||||||
@@ -296,39 +296,39 @@ function buildElButtonChild(conf) {
|
|||||||
// el-input innerHTML
|
// el-input innerHTML
|
||||||
function buildElInputChild(conf) {
|
function buildElInputChild(conf) {
|
||||||
const children = []
|
const children = []
|
||||||
if (conf.prepend) {
|
if (conf.__slot__ && conf.__slot__.prepend) {
|
||||||
children.push(`<template slot="prepend">${conf.prepend}</template>`)
|
children.push(`<template slot="prepend">${conf.__slot__.prepend}</template>`)
|
||||||
}
|
}
|
||||||
if (conf.append) {
|
if (conf.__slot__ && conf.__slot__.append) {
|
||||||
children.push(`<template slot="append">${conf.append}</template>`)
|
children.push(`<template slot="append">${conf.__slot__.append}</template>`)
|
||||||
}
|
}
|
||||||
return children.join('\n')
|
return children.join('\n')
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildElSelectChild(conf) {
|
function buildElSelectChild(conf) {
|
||||||
const children = []
|
const children = []
|
||||||
if (conf.options && conf.options.length) {
|
if (conf.__slot__.options && conf.__slot__.options.length) {
|
||||||
children.push(`<el-option v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>`)
|
children.push(`<el-option v-for="(item, index) in ${conf.__vModel__}Options" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled"></el-option>`)
|
||||||
}
|
}
|
||||||
return children.join('\n')
|
return children.join('\n')
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildElRadioGroupChild(conf) {
|
function buildElRadioGroupChild(conf) {
|
||||||
const children = []
|
const children = []
|
||||||
if (conf.options && conf.options.length) {
|
if (conf.__slot__.options && conf.__slot__.options.length) {
|
||||||
const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio'
|
const tag = conf.__config__.optionType === 'button' ? 'el-radio-button' : 'el-radio'
|
||||||
const border = conf.border ? 'border' : ''
|
const border = conf.__config__.border ? 'border' : ''
|
||||||
children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}</${tag}>`)
|
children.push(`<${tag} v-for="(item, index) in ${conf.__vModel__}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}</${tag}>`)
|
||||||
}
|
}
|
||||||
return children.join('\n')
|
return children.join('\n')
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildElCheckboxGroupChild(conf) {
|
function buildElCheckboxGroupChild(conf) {
|
||||||
const children = []
|
const children = []
|
||||||
if (conf.options && conf.options.length) {
|
if (conf.__slot__.options && conf.__slot__.options.length) {
|
||||||
const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox'
|
const tag = conf.__config__.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox'
|
||||||
const border = conf.border ? 'border' : ''
|
const border = conf.__config__.border ? 'border' : ''
|
||||||
children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}</${tag}>`)
|
children.push(`<${tag} v-for="(item, index) in ${conf.__vModel__}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}</${tag}>`)
|
||||||
}
|
}
|
||||||
return children.join('\n')
|
return children.join('\n')
|
||||||
}
|
}
|
||||||
@@ -336,8 +336,8 @@ function buildElCheckboxGroupChild(conf) {
|
|||||||
function buildElUploadChild(conf) {
|
function buildElUploadChild(conf) {
|
||||||
const list = []
|
const list = []
|
||||||
if (conf['list-type'] === 'picture-card') list.push('<i class="el-icon-plus"></i>')
|
if (conf['list-type'] === 'picture-card') list.push('<i class="el-icon-plus"></i>')
|
||||||
else list.push(`<el-button size="small" type="primary" icon="el-icon-upload">${conf.buttonText}</el-button>`)
|
else list.push(`<el-button size="small" type="primary" icon="el-icon-upload">${conf.__config__.buttonText}</el-button>`)
|
||||||
if (conf.showTip) list.push(`<div slot="tip" class="el-upload__tip">只能上传不超过 ${conf.fileSize}${conf.sizeUnit} 的${conf.accept}文件</div>`)
|
if (conf.__config__.showTip) list.push(`<div slot="tip" class="el-upload__tip">只能上传不超过 ${conf.__config__.fileSize}${conf.__config__.sizeUnit} 的${conf.accept}文件</div>`)
|
||||||
return list.join('\n')
|
return list.join('\n')
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -346,7 +346,7 @@ export function makeUpHtml(conf, type) {
|
|||||||
confGlobal = conf
|
confGlobal = conf
|
||||||
someSpanIsNot24 = conf.fields.some(item => item.span !== 24)
|
someSpanIsNot24 = conf.fields.some(item => item.span !== 24)
|
||||||
conf.fields.forEach(el => {
|
conf.fields.forEach(el => {
|
||||||
htmlList.push(layouts[el.layout](el))
|
htmlList.push(layouts[el.__config__.layout](el))
|
||||||
})
|
})
|
||||||
const htmlStr = htmlList.join('\n')
|
const htmlStr = htmlList.join('\n')
|
||||||
|
|
||||||
@@ -357,3 +357,5 @@ export function makeUpHtml(conf, type) {
|
|||||||
confGlobal = null
|
confGlobal = null
|
||||||
return temp
|
return temp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { isArray } from 'util'
|
import { isArray } from 'util'
|
||||||
import { exportDefault, titleCase } from '@/utils/index'
|
import { exportDefault, titleCase } from '@/utils/index'
|
||||||
import { trigger } from './config'
|
import trigger from './ruleTrigger'
|
||||||
|
|
||||||
const units = {
|
const units = {
|
||||||
KB: '1024',
|
KB: '1024',
|
||||||
@@ -45,23 +45,29 @@ function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsL
|
|||||||
buildData(el, dataList)
|
buildData(el, dataList)
|
||||||
buildRules(el, ruleList)
|
buildRules(el, ruleList)
|
||||||
|
|
||||||
|
if (el.__slot__) {
|
||||||
|
if (el.__slot__.options && el.__slot__.options.length) {
|
||||||
|
buildOptions(el, optionsList)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
if (el.options && el.options.length) {
|
if (el.options && el.options.length) {
|
||||||
buildOptions(el, optionsList)
|
buildOptions(el, optionsList)
|
||||||
if (el.dataType === 'dynamic') {
|
if (el.__config__.dataType === 'dynamic') {
|
||||||
const model = `${el.vModel}Options`
|
const model = `${el.__vModel__}Options`
|
||||||
const options = titleCase(model)
|
const options = titleCase(model)
|
||||||
buildOptionMethod(`get${options}`, model, methodList)
|
buildOptionMethod(`get${options}`, model, methodList)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (el.props && el.props.props) {
|
if (el.props && el.props.props) {
|
||||||
buildProps(el, propsList)
|
buildProps(el, propsList)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (el.action && el.tag === 'el-upload') {
|
if (el.action && el.__config__.tag === 'el-upload') {
|
||||||
uploadVarList.push(
|
uploadVarList.push(
|
||||||
`${el.vModel}Action: '${el.action}',
|
`${el.__vModel__}Action: '${el.action}',
|
||||||
${el.vModel}fileList: [],`
|
${el.__vModel__}fileList: [],`
|
||||||
)
|
)
|
||||||
methodList.push(buildBeforeUpload(el))
|
methodList.push(buildBeforeUpload(el))
|
||||||
if (!el['auto-upload']) {
|
if (!el['auto-upload']) {
|
||||||
@@ -69,8 +75,8 @@ function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsL
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (el.children) {
|
if (el.__config__.children) {
|
||||||
el.children.forEach(el2 => {
|
el.__config__.children.forEach(el2 => {
|
||||||
buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList)
|
buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -118,61 +124,62 @@ function mixinMethod(type) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function buildData(conf, dataList) {
|
function buildData(conf, dataList) {
|
||||||
if (conf.vModel === undefined) return
|
if (conf.__vModel__ === undefined) return
|
||||||
let defaultValue
|
let defaultValue
|
||||||
if (typeof (conf.defaultValue) === 'string' && !conf.multiple) {
|
if (typeof (conf.__config__.defaultValue) === 'string' && !conf.multiple) {
|
||||||
defaultValue = `'${conf.defaultValue}'`
|
defaultValue = `'${conf.__config__.defaultValue}'`
|
||||||
} else {
|
} else {
|
||||||
defaultValue = `${JSON.stringify(conf.defaultValue)}`
|
defaultValue = `${JSON.stringify(conf.__config__.defaultValue)}`
|
||||||
}
|
}
|
||||||
dataList.push(`${conf.vModel}: ${defaultValue},`)
|
dataList.push(`${conf.__vModel__}: ${defaultValue},`)
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildRules(conf, ruleList) {
|
function buildRules(conf, ruleList) {
|
||||||
if (conf.vModel === undefined) return
|
if (conf.__vModel__ === undefined) return
|
||||||
const rules = []
|
const rules = []
|
||||||
if (trigger[conf.tag]) {
|
if (trigger[conf.__config__.tag]) {
|
||||||
if (conf.required) {
|
if (conf.__config__.required) {
|
||||||
const type = isArray(conf.defaultValue) ? 'type: \'array\',' : ''
|
const type = isArray(conf.__config__.defaultValue) ? 'type: \'array\',' : ''
|
||||||
let message = isArray(conf.defaultValue) ? `请至少选择一个${conf.vModel}` : conf.placeholder
|
let message = isArray(conf.__config__.defaultValue) ? `请至少选择一个${conf.__vModel__}` : conf.placeholder
|
||||||
if (message === undefined) message = `${conf.label}不能为空`
|
if (message === undefined) message = `${conf.__config__.label}不能为空`
|
||||||
rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`)
|
rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.__config__.tag]}' }`)
|
||||||
}
|
}
|
||||||
if (conf.regList && isArray(conf.regList)) {
|
if (conf.__config__.regList && isArray(conf.__config__.regList)) {
|
||||||
conf.regList.forEach(item => {
|
conf.__config__.regList.forEach(item => {
|
||||||
if (item.pattern) {
|
if (item.pattern) {
|
||||||
rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.tag]}' }`)
|
rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.__config__.tag]}' }`)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
ruleList.push(`${conf.vModel}: [${rules.join(',')}],`)
|
ruleList.push(`${conf.__vModel__}: [${rules.join(',')}],`)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildOptions(conf, optionsList) {
|
function buildOptions(conf, optionsList) {
|
||||||
if (conf.vModel === undefined) return
|
if (conf.__vModel__ === undefined) return
|
||||||
if (conf.dataType === 'dynamic') { conf.options = [] }
|
if (conf.__config__.dataType === 'dynamic') { conf.options = [] }
|
||||||
const str = `${conf.vModel}Options: ${JSON.stringify(conf.options)},`
|
const options = conf.__config__.tag ==='el-cascader'?conf.options:conf.__slot__.options;
|
||||||
|
const str = `${conf.__vModel__}Options: ${JSON.stringify(options)},`
|
||||||
optionsList.push(str)
|
optionsList.push(str)
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildProps(conf, propsList) {
|
function buildProps(conf, propsList) {
|
||||||
if (conf.dataType === 'dynamic') {
|
if (conf.__config__.dataType === 'dynamic') {
|
||||||
conf.valueKey !== 'value' && (conf.props.props.value = conf.valueKey)
|
conf.valueKey !== 'value' && (conf.props.props.value = conf.valueKey)
|
||||||
conf.labelKey !== 'label' && (conf.props.props.label = conf.labelKey)
|
conf.labelKey !== 'label' && (conf.props.props.label = conf.labelKey)
|
||||||
conf.childrenKey !== 'children' && (conf.props.props.children = conf.childrenKey)
|
conf.childrenKey !== 'children' && (conf.props.props.children = conf.childrenKey)
|
||||||
}
|
}
|
||||||
const str = `${conf.vModel}Props: ${JSON.stringify(conf.props.props)},`
|
const str = `${conf.__vModel__}Props: ${JSON.stringify(conf.props.props)},`
|
||||||
propsList.push(str)
|
propsList.push(str)
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildBeforeUpload(conf) {
|
function buildBeforeUpload(conf) {
|
||||||
const unitNum = units[conf.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const
|
const unitNum = units[conf.__config__.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const
|
||||||
returnList = []
|
returnList = []
|
||||||
if (conf.fileSize) {
|
if (conf.__config__.fileSize) {
|
||||||
rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize}
|
rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.__config__.fileSize}
|
||||||
if(!isRightSize){
|
if(!isRightSize){
|
||||||
this.$message.error('文件大小超过 ${conf.fileSize}${conf.sizeUnit}')
|
this.$message.error('文件大小超过 ${conf.__config__.fileSize}${conf.__config__.sizeUnit}')
|
||||||
}`
|
}`
|
||||||
returnList.push('isRightSize')
|
returnList.push('isRightSize')
|
||||||
}
|
}
|
||||||
@@ -183,7 +190,7 @@ function buildBeforeUpload(conf) {
|
|||||||
}`
|
}`
|
||||||
returnList.push('isAccept')
|
returnList.push('isAccept')
|
||||||
}
|
}
|
||||||
const str = `${conf.vModel}BeforeUpload(file) {
|
const str = `${conf.__vModel__}BeforeUpload(file) {
|
||||||
${rightSizeCode}
|
${rightSizeCode}
|
||||||
${acceptCode}
|
${acceptCode}
|
||||||
return ${returnList.join('&&')}
|
return ${returnList.join('&&')}
|
||||||
@@ -193,7 +200,7 @@ function buildBeforeUpload(conf) {
|
|||||||
|
|
||||||
function buildSubmitUpload(conf) {
|
function buildSubmitUpload(conf) {
|
||||||
const str = `submitUpload() {
|
const str = `submitUpload() {
|
||||||
this.$refs['${conf.vModel}'].submit()
|
this.$refs['${conf.__vModel__}'].submit()
|
||||||
},`
|
},`
|
||||||
return str
|
return str
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user