diff --git a/ruoyi-ui/public/preview.html b/ruoyi-ui/public/preview.html new file mode 100644 index 00000000..a20510bf --- /dev/null +++ b/ruoyi-ui/public/preview.html @@ -0,0 +1,37 @@ + + + + + + + + form-generator-preview + + + + + + + + +
+ + diff --git a/ruoyi-ui/src/components/parser/Parser.vue b/ruoyi-ui/src/components/parser/Parser.vue index ee76f7d2..78b7369d 100644 --- a/ruoyi-ui/src/components/parser/Parser.vue +++ b/ruoyi-ui/src/components/parser/Parser.vue @@ -1,6 +1,6 @@ diff --git a/ruoyi-ui/src/styles/index.scss b/ruoyi-ui/src/styles/index.scss index c659c11f..72a64249 100644 --- a/ruoyi-ui/src/styles/index.scss +++ b/ruoyi-ui/src/styles/index.scss @@ -1,4 +1,4 @@ -$editorTabsborderColor: #121315; +$editorTabsborderColor: #5a9d6d; body, html{ margin: 0; padding: 0; @@ -138,4 +138,4 @@ input, textarea{ } .el-upload__tip{ line-height: 1.2; -} \ No newline at end of file +} diff --git a/ruoyi-ui/src/styles/mixin.scss b/ruoyi-ui/src/styles/mixin.scss index d5d1bd61..803b9666 100644 --- a/ruoyi-ui/src/styles/mixin.scss +++ b/ruoyi-ui/src/styles/mixin.scss @@ -1,10 +1,10 @@ @mixin action-bar { .action-bar { - height: 33px; - background: #f2fafb; + height: 39px; + background: #f5f7fa; padding: 0 15px; box-sizing: border-box; - + .bar-btn { display: inline-block; padding: 0 6px; @@ -30,4 +30,4 @@ } } } -} \ No newline at end of file +} diff --git a/ruoyi-ui/src/utils/generator/css.js b/ruoyi-ui/src/utils/generator/css.js index 0d7f0752..7cb86e64 100644 --- a/ruoyi-ui/src/utils/generator/css.js +++ b/ruoyi-ui/src/utils/generator/css.js @@ -1,18 +1,18 @@ -const styles = { - 'el-rate': '.el-rate{display: inline-block; vertical-align: text-top;}', - 'el-upload': '.el-upload__tip{line-height: 1.2;}' -} - -function addCss(cssList, el) { - const css = styles[el.tag] - css && cssList.indexOf(css) === -1 && cssList.push(css) - if (el.children) { - el.children.forEach(el2 => addCss(cssList, el2)) - } -} - -export function makeUpCss(conf) { - const cssList = [] - conf.fields.forEach(el => addCss(cssList, el)) - return cssList.join('\n') -} +const styles = { + 'el-rate': '.el-rate{display: inline-block; vertical-align: text-top;}', + 'el-upload': '.el-upload__tip{line-height: 1.2;}' +} + +function addCss(cssList, el) { + const css = styles[el.__config__.tag] + css && cssList.indexOf(css) === -1 && cssList.push(css) + if (el.__config__.children) { + el.__config__.children.forEach(el2 => addCss(cssList, el2)) + } +} + +export function makeUpCss(conf) { + const cssList = [] + conf.fields.forEach(el => addCss(cssList, el)) + return cssList.join('\n') +} diff --git a/ruoyi-ui/src/utils/generator/html.js b/ruoyi-ui/src/utils/generator/html.js index 9bcc5361..6e9a32e6 100644 --- a/ruoyi-ui/src/utils/generator/html.js +++ b/ruoyi-ui/src/utils/generator/html.js @@ -1,15 +1,15 @@ /* eslint-disable max-len */ -import { trigger } from './config' +import ruleTrigger from './ruleTrigger' let confGlobal let someSpanIsNot24 export function dialogWrapper(str) { - return ` + return ` ${str}
取消 - 确定 + 确定
` } @@ -34,27 +34,27 @@ export function cssStyle(cssStr) { ` } -function buildFormTemplate(conf, child, type) { +function buildFormTemplate(scheme, child, type) { let labelPosition = '' - if (conf.labelPosition !== 'right') { - labelPosition = `label-position="${conf.labelPosition}"` + if (scheme.labelPosition !== 'right') { + labelPosition = `label-position="${scheme.labelPosition}"` } - const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : '' - let str = ` + const disabled = scheme.disabled ? `:disabled="${scheme.disabled}"` : '' + let str = ` ${child} - ${buildFromBtns(conf, type)} + ${buildFromBtns(scheme, type)} ` if (someSpanIsNot24) { - str = ` + str = ` ${str} ` } return str } -function buildFromBtns(conf, type) { +function buildFromBtns(scheme, type) { let str = '' - if (conf.formBtns && type === 'file') { + if (scheme.formBtns && type === 'file') { str = ` 提交 重置 @@ -69,9 +69,9 @@ function buildFromBtns(conf, type) { } // span不为24的用el-col包裹 -function colWrapper(element, str) { - if (someSpanIsNot24 || element.span !== 24) { - return ` +function colWrapper(scheme, str) { + if (someSpanIsNot24 || scheme.__config__.span !== 24) { + return ` ${str} ` } @@ -79,29 +79,36 @@ function colWrapper(element, str) { } const layouts = { - colFormItem(element) { + colFormItem(scheme) { + const config = scheme.__config__ let labelWidth = '' - if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) { - labelWidth = `label-width="${element.labelWidth}px"` + let label = `label="${config.label}"` + if (config.labelWidth && config.labelWidth !== confGlobal.labelWidth) { + labelWidth = `label-width="${config.labelWidth}px"` } - const required = !trigger[element.tag] && element.required ? 'required' : '' - const tagDom = tags[element.tag] ? tags[element.tag](element) : null - let str = ` + if (config.showLabel === false) { + labelWidth = 'label-width="0"' + label = '' + } + const required = !ruleTrigger[config.tag] && config.required ? 'required' : '' + const tagDom = tags[config.tag] ? tags[config.tag](scheme) : null + let str = ` ${tagDom} ` - str = colWrapper(element, str) + str = colWrapper(scheme, str) return str }, - rowFormItem(element) { - const type = element.type === 'default' ? '' : `type="${element.type}"` - const justify = element.type === 'default' ? '' : `justify="${element.justify}"` - const align = element.type === 'default' ? '' : `align="${element.align}"` - const gutter = element.gutter ? `gutter="${element.gutter}"` : '' - const children = element.children.map(el => layouts[el.layout](el)) + rowFormItem(scheme) { + const config = scheme.__config__ + const type = scheme.type === 'default' ? '' : `type="${scheme.type}"` + const justify = scheme.type === 'default' ? '' : `justify="${scheme.justify}"` + const align = scheme.type === 'default' ? '' : `align="${scheme.align}"` + const gutter = scheme.gutter ? `:gutter="${scheme.gutter}"` : '' + const children = config.children.map(el => layouts[el.__config__.layout](el)) let str = ` ${children.join('\n')} ` - str = colWrapper(element, str) + str = colWrapper(scheme, str) return str } } @@ -113,15 +120,18 @@ const tags = { } = attrBuilder(el) const type = el.type ? `type="${el.type}"` : '' const icon = el.icon ? `icon="${el.icon}"` : '' + const round = el.round ? 'round' : '' const size = el.size ? `size="${el.size}"` : '' + const plain = el.plain ? 'plain' : '' + const circle = el.circle ? 'circle' : '' let child = buildElButtonChild(el) if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}` + return `<${tag} ${type} ${icon} ${round} ${size} ${plain} ${disabled} ${circle}>${child}` }, 'el-input': el => { const { - disabled, vModel, clearable, placeholder, width + tag, disabled, vModel, clearable, placeholder, width } = attrBuilder(el) const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : '' const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : '' @@ -136,10 +146,12 @@ const tags = { let child = buildElInputChild(el) if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}` + return `<${tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}` }, 'el-input-number': el => { - const { disabled, vModel, placeholder } = attrBuilder(el) + const { + tag, disabled, vModel, placeholder + } = attrBuilder(el) const controlsPosition = el['controls-position'] ? `controls-position=${el['controls-position']}` : '' const min = el.min ? `:min='${el.min}'` : '' const max = el.max ? `:max='${el.max}'` : '' @@ -147,39 +159,39 @@ const tags = { const stepStrictly = el['step-strictly'] ? 'step-strictly' : '' const precision = el.precision ? `:precision='${el.precision}'` : '' - return `<${el.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}>` + return `<${tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}>` }, 'el-select': el => { const { - disabled, vModel, clearable, placeholder, width + tag, disabled, vModel, clearable, placeholder, width } = attrBuilder(el) const filterable = el.filterable ? 'filterable' : '' const multiple = el.multiple ? 'multiple' : '' let child = buildElSelectChild(el) if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}` + return `<${tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}` }, 'el-radio-group': el => { - const { disabled, vModel } = attrBuilder(el) + const { tag, disabled, vModel } = attrBuilder(el) const size = `size="${el.size}"` let child = buildElRadioGroupChild(el) if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${vModel} ${size} ${disabled}>${child}` + return `<${tag} ${vModel} ${size} ${disabled}>${child}` }, 'el-checkbox-group': el => { - const { disabled, vModel } = attrBuilder(el) + const { tag, disabled, vModel } = attrBuilder(el) const size = `size="${el.size}"` const min = el.min ? `:min="${el.min}"` : '' const max = el.max ? `:max="${el.max}"` : '' let child = buildElCheckboxGroupChild(el) if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}` + return `<${tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}` }, 'el-switch': el => { - const { disabled, vModel } = attrBuilder(el) + const { tag, disabled, vModel } = attrBuilder(el) const activeText = el['active-text'] ? `active-text="${el['active-text']}"` : '' const inactiveText = el['inactive-text'] ? `inactive-text="${el['inactive-text']}"` : '' const activeColor = el['active-color'] ? `active-color="${el['active-color']}"` : '' @@ -187,33 +199,33 @@ const tags = { 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'])}'` : '' - return `<${el.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}>` + return `<${tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}>` }, 'el-cascader': el => { const { - disabled, vModel, clearable, placeholder, width + tag, disabled, vModel, clearable, placeholder, width } = attrBuilder(el) - const options = el.options ? `:options="${el.vModel}Options"` : '' - const props = el.props ? `:props="${el.vModel}Props"` : '' + const options = el.options ? `:options="${el.__vModel__}Options"` : '' + const props = el.props ? `:props="${el.__vModel__}Props"` : '' const showAllLevels = el['show-all-levels'] ? '' : ':show-all-levels="false"' const filterable = el.filterable ? 'filterable' : '' const separator = el.separator === '/' ? '' : `separator="${el.separator}"` - return `<${el.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}>` + return `<${tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}>` }, 'el-slider': el => { - const { disabled, vModel } = attrBuilder(el) + const { tag, disabled, vModel } = attrBuilder(el) const min = el.min ? `:min='${el.min}'` : '' const max = el.max ? `:max='${el.max}'` : '' const step = el.step ? `:step='${el.step}'` : '' const range = el.range ? 'range' : '' const showStops = el['show-stops'] ? `:show-stops="${el['show-stops']}"` : '' - return `<${el.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}>` + return `<${tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}>` }, 'el-time-picker': el => { const { - disabled, vModel, clearable, placeholder, width + tag, disabled, vModel, clearable, placeholder, width } = attrBuilder(el) const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' @@ -223,11 +235,11 @@ const tags = { const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' 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}>` + return `<${tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}>` }, 'el-date-picker': el => { const { - disabled, vModel, clearable, placeholder, width + tag, disabled, vModel, clearable, placeholder, width } = attrBuilder(el) const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : '' const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : '' @@ -237,46 +249,54 @@ const tags = { const type = el.type === 'date' ? '' : `type="${el.type}"` const readonly = el.readonly ? 'readonly' : '' - return `<${el.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}>` + return `<${tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}>` }, 'el-rate': el => { - const { disabled, vModel } = attrBuilder(el) + const { tag, disabled, vModel } = attrBuilder(el) const max = el.max ? `:max='${el.max}'` : '' const allowHalf = el['allow-half'] ? 'allow-half' : '' const showText = el['show-text'] ? 'show-text' : '' const showScore = el['show-score'] ? 'show-score' : '' - return `<${el.tag} ${vModel} ${allowHalf} ${showText} ${showScore} ${disabled}>` + return `<${tag} ${vModel} ${max} ${allowHalf} ${showText} ${showScore} ${disabled}>` }, 'el-color-picker': el => { - const { disabled, vModel } = attrBuilder(el) + const { tag, disabled, vModel } = attrBuilder(el) const size = `size="${el.size}"` const showAlpha = el['show-alpha'] ? 'show-alpha' : '' const colorFormat = el['color-format'] ? `color-format="${el['color-format']}"` : '' - return `<${el.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}>` + return `<${tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}>` }, 'el-upload': el => { + const { tag } = el.__config__ 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 listType = el['list-type'] !== 'text' ? `list-type="${el['list-type']}"` : '' const accept = el.accept ? `accept="${el.accept}"` : '' const name = el.name !== 'file' ? `name="${el.name}"` : '' const autoUpload = el['auto-upload'] === false ? ':auto-upload="false"' : '' - const beforeUpload = `:before-upload="${el.vModel}BeforeUpload"` - const fileList = `:file-list="${el.vModel}fileList"` - const ref = `ref="${el.vModel}"` + const beforeUpload = `:before-upload="${el.__vModel__}BeforeUpload"` + const fileList = `:file-list="${el.__vModel__}fileList"` + const ref = `ref="${el.__vModel__}"` let child = buildElUploadChild(el) if (child) child = `\n${child}\n` // 换行 - return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}` + return `<${tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}` + }, + tinymce: el => { + const { tag, vModel, placeholder } = attrBuilder(el) + const height = el.height ? `:height="${el.height}"` : '' + const branding = el.branding ? `:branding="${el.branding}"` : '' + return `<${tag} ${vModel} ${placeholder} ${height} ${branding}>` } } function attrBuilder(el) { return { - vModel: `v-model="${confGlobal.formModel}.${el.vModel}"`, + tag: el.__config__.tag, + vModel: `v-model="${confGlobal.formModel}.${el.__vModel__}"`, clearable: el.clearable ? 'clearable' : '', placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '', width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '', @@ -285,72 +305,92 @@ function attrBuilder(el) { } // el-buttin 子级 -function buildElButtonChild(conf) { +function buildElButtonChild(scheme) { const children = [] - if (conf.default) { - children.push(conf.default) + const slot = scheme.__slot__ || {} + if (slot.default) { + children.push(slot.default) } return children.join('\n') } -// el-input innerHTML -function buildElInputChild(conf) { +// el-input 子级 +function buildElInputChild(scheme) { const children = [] - if (conf.prepend) { - children.push(``) + const slot = scheme.__slot__ + if (slot && slot.prepend) { + children.push(``) } - if (conf.append) { - children.push(``) + if (slot && slot.append) { + children.push(``) } return children.join('\n') } -function buildElSelectChild(conf) { +// el-select 子级 +function buildElSelectChild(scheme) { const children = [] - if (conf.options && conf.options.length) { - children.push(``) + const slot = scheme.__slot__ + if (slot && slot.options && slot.options.length) { + children.push(``) } return children.join('\n') } -function buildElRadioGroupChild(conf) { +// el-radio-group 子级 +function buildElRadioGroupChild(scheme) { const children = [] - if (conf.options && conf.options.length) { - const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio' - const border = conf.border ? 'border' : '' - children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) + const slot = scheme.__slot__ + const config = scheme.__config__ + if (slot && slot.options && slot.options.length) { + const tag = config.optionType === 'button' ? 'el-radio-button' : 'el-radio' + const border = config.border ? 'border' : '' + children.push(`<${tag} v-for="(item, index) in ${scheme.__vModel__}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) } return children.join('\n') } -function buildElCheckboxGroupChild(conf) { +// el-checkbox-group 子级 +function buildElCheckboxGroupChild(scheme) { const children = [] - if (conf.options && conf.options.length) { - const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox' - const border = conf.border ? 'border' : '' - children.push(`<${tag} v-for="(item, index) in ${conf.vModel}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) + const slot = scheme.__slot__ + const config = scheme.__config__ + if (slot && slot.options && slot.options.length) { + const tag = config.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox' + const border = config.border ? 'border' : '' + children.push(`<${tag} v-for="(item, index) in ${scheme.__vModel__}Options" :key="index" :label="item.value" :disabled="item.disabled" ${border}>{{item.label}}`) } return children.join('\n') } -function buildElUploadChild(conf) { +// el-upload 子级 +function buildElUploadChild(scheme) { const list = [] - if (conf['list-type'] === 'picture-card') list.push('') - else list.push(`${conf.buttonText}`) - if (conf.showTip) list.push(`
只能上传不超过 ${conf.fileSize}${conf.sizeUnit} 的${conf.accept}文件
`) + const config = scheme.__config__ + if (scheme['list-type'] === 'picture-card') list.push('') + else list.push(`${config.buttonText}`) + if (config.showTip) list.push(`
只能上传不超过 ${config.fileSize}${config.sizeUnit} 的${scheme.accept}文件
`) return list.join('\n') } -export function makeUpHtml(conf, type) { +/** + * 组装html代码。【入口函数】 + * @param {Object} formConfig 整个表单配置 + * @param {String} type 生成类型，文件或弹窗等 + */ +export function makeUpHtml(formConfig, type) { const htmlList = [] - confGlobal = conf - someSpanIsNot24 = conf.fields.some(item => item.span !== 24) - conf.fields.forEach(el => { - htmlList.push(layouts[el.layout](el)) + confGlobal = formConfig + // 判断布局是否都沾满了24个栅格，以备后续简化代码结构 + someSpanIsNot24 = formConfig.fields.some(item => item.__config__.span !== 24) + // 遍历渲染每个组件成html + formConfig.fields.forEach(el => { + htmlList.push(layouts[el.__config__.layout](el)) }) const htmlStr = htmlList.join('\n') - - let temp = buildFormTemplate(conf, htmlStr, type) + // 将组件代码放进form标签 + let temp = buildFormTemplate(formConfig, htmlStr, type) + // dialog标签包裹代码 if (type === 'dialog') { temp = dialogWrapper(temp) } diff --git a/ruoyi-ui/src/utils/generator/js.js b/ruoyi-ui/src/utils/generator/js.js index 35e3e21a..8c7df169 100644 --- a/ruoyi-ui/src/utils/generator/js.js +++ b/ruoyi-ui/src/utils/generator/js.js @@ -1,6 +1,6 @@ import { isArray } from 'util' -import { exportDefault, titleCase } from '@/utils/index' -import { trigger } from './config' +import { exportDefault, titleCase, deepClone } from '../../utils/index' +import ruleTrigger from './ruleTrigger' const units = { KB: '1024', @@ -13,69 +13,91 @@ const inheritAttrs = { dialog: 'inheritAttrs: false,' } - -export function makeUpJs(conf, type) { - confGlobal = conf = JSON.parse(JSON.stringify(conf)) +/** + * 组装js 【入口函数】 + * @param {Object} formConfig 整个表单配置 + * @param {String} type 生成类型，文件或弹窗等 + */ +export function makeUpJs(formConfig, type) { + confGlobal = formConfig = deepClone(formConfig) const dataList = [] const ruleList = [] const optionsList = [] const propsList = [] const methodList = mixinMethod(type) const uploadVarList = [] + const created = [] - conf.fields.forEach(el => { - buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) + formConfig.fields.forEach(el => { + buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList, created) }) const script = buildexport( - conf, + formConfig, type, dataList.join('\n'), ruleList.join('\n'), optionsList.join('\n'), uploadVarList.join('\n'), propsList.join('\n'), - methodList.join('\n') + methodList.join('\n'), + created.join('\n') ) confGlobal = null return script } -function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) { - buildData(el, dataList) - buildRules(el, ruleList) +// 构建组件属性 +function buildAttributes(scheme, dataList, ruleList, optionsList, methodList, propsList, uploadVarList, created) { + const config = scheme.__config__ + const slot = scheme.__slot__ + buildData(scheme, dataList) + buildRules(scheme, ruleList) - if (el.options && el.options.length) { - buildOptions(el, optionsList) - if (el.dataType === 'dynamic') { - const model = `${el.vModel}Options` + // 特殊处理options属性 + if (scheme.options || (slot && slot.options && slot.options.length)) { + buildOptions(scheme, optionsList) + if (config.dataType === 'dynamic') { + const model = `${scheme.__vModel__}Options` const options = titleCase(model) - buildOptionMethod(`get${options}`, model, methodList) + const methodName = `get${options}` + buildOptionMethod(methodName, model, methodList, scheme) + callInCreated(methodName, created) } } - if (el.props && el.props.props) { - buildProps(el, propsList) + // 处理props + if (scheme.props && scheme.props.props) { + buildProps(scheme, propsList) } - if (el.action && el.tag === 'el-upload') { + // 处理el-upload的action + if (scheme.action && config.tag === 'el-upload') { uploadVarList.push( - `${el.vModel}Action: '${el.action}', - ${el.vModel}fileList: [],` + `${scheme.__vModel__}Action: '${scheme.action}', + ${scheme.__vModel__}fileList: [],` ) - methodList.push(buildBeforeUpload(el)) - if (!el['auto-upload']) { - methodList.push(buildSubmitUpload(el)) + methodList.push(buildBeforeUpload(scheme)) + // 非自动上传时，生成手动上传的函数 + if (!scheme['auto-upload']) { + methodList.push(buildSubmitUpload(scheme)) } } - if (el.children) { - el.children.forEach(el2 => { - buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) + // 构建子级组件属性 + if (config.children) { + config.children.forEach(item => { + buildAttributes(item, dataList, ruleList, optionsList, methodList, propsList, uploadVarList, created) }) } } +// 在Created调用函数 +function callInCreated(methodName, created) { + created.push(`this.${methodName}()`) +} + +// 混入处理函数 function mixinMethod(type) { const list = []; const minxins = { @@ -98,7 +120,7 @@ function mixinMethod(type) { close: `close() { this.$emit('update:visible', false) },`, - handleConfirm: `handleConfirm() { + handelConfirm: `handelConfirm() { this.$refs['${confGlobal.formRef}'].validate(valid => { if(!valid) return this.close() @@ -117,73 +139,75 @@ function mixinMethod(type) { return list } -function buildData(conf, dataList) { - if (conf.vModel === undefined) return - let defaultValue - if (typeof (conf.defaultValue) === 'string' && !conf.multiple) { - defaultValue = `'${conf.defaultValue}'` - } else { - defaultValue = `${JSON.stringify(conf.defaultValue)}` - } - dataList.push(`${conf.vModel}: ${defaultValue},`) +// 构建data +function buildData(scheme, dataList) { + const config = scheme.__config__ + if (scheme.__vModel__ === undefined) return + const defaultValue = JSON.stringify(config.defaultValue) + dataList.push(`${scheme.__vModel__}: ${defaultValue},`) } -function buildRules(conf, ruleList) { - if (conf.vModel === undefined) return +// 构建校验规则 +function buildRules(scheme, ruleList) { + const config = scheme.__config__ + if (scheme.__vModel__ === undefined) return const rules = [] - if (trigger[conf.tag]) { - if (conf.required) { - const type = isArray(conf.defaultValue) ? 'type: \'array\',' : '' - let message = isArray(conf.defaultValue) ? `请至少选择一个${conf.vModel}` : conf.placeholder - if (message === undefined) message = `${conf.label}不能为空` - rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`) + if (ruleTrigger[config.tag]) { + if (config.required) { + const type = isArray(config.defaultValue) ? 'type: \'array\',' : '' + let message = isArray(config.defaultValue) ? `请至少选择一个${config.label}` : scheme.placeholder + if (message === undefined) message = `${config.label}不能为空` + rules.push(`{ required: true, ${type} message: '${message}', trigger: '${ruleTrigger[config.tag]}' }`) } - if (conf.regList && isArray(conf.regList)) { - conf.regList.forEach(item => { + if (config.regList && isArray(config.regList)) { + config.regList.forEach(item => { 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: '${ruleTrigger[config.tag]}' }` + ) } }) } - ruleList.push(`${conf.vModel}: [${rules.join(',')}],`) + ruleList.push(`${scheme.__vModel__}: [${rules.join(',')}],`) } } -function buildOptions(conf, optionsList) { - if (conf.vModel === undefined) return - if (conf.dataType === 'dynamic') { conf.options = [] } - const str = `${conf.vModel}Options: ${JSON.stringify(conf.options)},` +// 构建options +function buildOptions(scheme, optionsList) { + if (scheme.__vModel__ === undefined) return + // el-cascader直接有options属性，其他组件都是定义在slot中，所以有两处判断 + let { options } = scheme + if (!options) options = scheme.__slot__.options + if (scheme.__config__.dataType === 'dynamic') { options = [] } + const str = `${scheme.__vModel__}Options: ${JSON.stringify(options)},` optionsList.push(str) } -function buildProps(conf, propsList) { - if (conf.dataType === 'dynamic') { - conf.valueKey !== 'value' && (conf.props.props.value = conf.valueKey) - conf.labelKey !== 'label' && (conf.props.props.label = conf.labelKey) - conf.childrenKey !== 'children' && (conf.props.props.children = conf.childrenKey) - } - const str = `${conf.vModel}Props: ${JSON.stringify(conf.props.props)},` +function buildProps(scheme, propsList) { + const str = `${scheme.__vModel__}Props: ${JSON.stringify(scheme.props.props)},` propsList.push(str) } -function buildBeforeUpload(conf) { - const unitNum = units[conf.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const +// el-upload的BeforeUpload +function buildBeforeUpload(scheme) { + const config = scheme.__config__ + const unitNum = units[config.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const returnList = [] - if (conf.fileSize) { - rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize} + if (config.fileSize) { + rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${config.fileSize} if(!isRightSize){ - this.$message.error('文件大小超过 ${conf.fileSize}${conf.sizeUnit}') + this.$message.error('文件大小超过 ${config.fileSize}${config.sizeUnit}') }` returnList.push('isRightSize') } - if (conf.accept) { - acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type) + if (scheme.accept) { + acceptCode = `let isAccept = new RegExp('${scheme.accept}').test(file.type) if(!isAccept){ - this.$message.error('应该选择${conf.accept}类型的文件') + this.$message.error('应该选择${scheme.accept}类型的文件') }` returnList.push('isAccept') } - const str = `${conf.vModel}BeforeUpload(file) { + const str = `${scheme.__vModel__}BeforeUpload(file) { ${rightSizeCode} ${acceptCode} return ${returnList.join('&&')} @@ -191,22 +215,31 @@ function buildBeforeUpload(conf) { return returnList.length ? str : '' } -function buildSubmitUpload(conf) { +// el-upload的submit +function buildSubmitUpload(scheme) { const str = `submitUpload() { - this.$refs['${conf.vModel}'].submit() + this.$refs['${scheme.__vModel__}'].submit() },` return str } -function buildOptionMethod(methodName, model, methodList) { +function buildOptionMethod(methodName, model, methodList, scheme) { + const config = scheme.__config__ const str = `${methodName}() { - // TODO 发起请求获取数据 - this.${model} + // 注意：this.$axios是通过Vue.prototype.$axios = axios挂载产生的 + this.$axios({ + method: '${config.method}', + url: '${config.url}' + }).then(resp => { + var { data } = resp + this.${model} = data.${config.dataPath} + }) },` methodList.push(str) } -function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) { +// js整体拼接 +function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods, created) { const str = `${exportDefault}{ ${inheritAttrs[type]} components: {}, @@ -226,7 +259,9 @@ function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, m }, computed: {}, watch: {}, - created () {}, + created () { + ${created} + }, mounted () {}, methods: { ${methods} diff --git a/ruoyi-ui/src/utils/generator/ruleTrigger.js b/ruoyi-ui/src/utils/generator/ruleTrigger.js new file mode 100644 index 00000000..3c161b5d --- /dev/null +++ b/ruoyi-ui/src/utils/generator/ruleTrigger.js @@ -0,0 +1,16 @@ +/** + * 用于生成表单校验，指定正则规则的触发方式。 + * 未在此处声明无触发方式的组件将不生成rule！！ + */ +export default { + 'el-input': 'blur', + 'el-input-number': 'blur', + 'el-select': 'change', + 'el-radio-group': 'change', + 'el-checkbox-group': 'change', + 'el-cascader': 'change', + 'el-time-picker': 'change', + 'el-date-picker': 'change', + 'el-rate': 'change', + tinymce: 'blur' +} diff --git a/ruoyi-ui/src/views/tool/build/FormDrawer.vue b/ruoyi-ui/src/views/tool/build/FormDrawer.vue index 6fdde43a..22525454 100644 --- a/ruoyi-ui/src/views/tool/build/FormDrawer.vue +++ b/ruoyi-ui/src/views/tool/build/FormDrawer.vue @@ -9,7 +9,7 @@ - + @@ -32,9 +32,9 @@ -
-
-
+
+
+
@@ -60,9 +60,10 @@ ref="previewPage" class="result-wrapper" frameborder="0" - src="preview.html" + :src="url" @load="iframeLoad" /> +
@@ -76,6 +77,7 @@