.gitignore
@@ -25,6 +25,9 @@ *.iml *.ipr ### JRebel ### rebel.xml ### NetBeans ### nbproject/private/ build/* ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -182,6 +182,11 @@ String QUERY_LIKE = "LIKE"; /** * ç¸çæ¥è¯¢ */ String QUERY_EQ = "EQ"; /** * éè¦ */ String REQUIRE = "1"; ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
@@ -44,6 +44,6 @@ * å¯ä¸æ è¯ */ @ApiModelProperty(value = "å¯ä¸æ è¯") private String uuid = ""; private String uuid; } ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
@@ -97,9 +97,8 @@ * * @param response 渲æ对象 * @param string å¾ æ¸²æçå符串 * @return null */ public static String renderString(HttpServletResponse response, String string) { public static void renderString(HttpServletResponse response, String string) { try { response.setStatus(HttpStatus.HTTP_OK); response.setContentType(MediaType.APPLICATION_JSON_VALUE); @@ -108,7 +107,6 @@ } catch (IOException e) { e.printStackTrace(); } return null; } /** @@ -119,12 +117,12 @@ public static boolean isAjaxRequest(HttpServletRequest request) { String accept = request.getHeader("accept"); if (accept != null && accept.indexOf("application/json") != -1) { if (accept != null && accept.contains("application/json")) { return true; } String xRequestedWith = request.getHeader("X-Requested-With"); if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) { if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) { return true; } @@ -134,10 +132,7 @@ } String ajax = request.getParameter("__ajax"); if (StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml")) { return true; } return false; return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml"); } public static String getClientIP() { ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
@@ -56,6 +56,6 @@ log.error("è·åå°çä½ç½®å¼å¸¸ {}", ip); } } return address; return UNKNOWN; } } ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -294,8 +294,17 @@ GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName()); column.setColumnId(prevColumn.getColumnId()); if (column.isList()) { // å¦ææ¯å表ï¼ç»§ç»ä¿çåå ¸ç±»å // å¦ææ¯å表ï¼ç»§ç»ä¿çæ¥è¯¢æ¹å¼/åå ¸ç±»åé项 column.setDictType(prevColumn.getDictType()); column.setQueryType(prevColumn.getQueryType()); } if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk() && (column.isInsert() || column.isEdit()) && ((column.isUsableColumn()) || (!column.isSuperColumn()))) { // å¦ææ¯(æ°å¢/ä¿®æ¹&é主é®/é忽ç¥åç¶å±æ§)ï¼ç»§ç»ä¿çå¿ å¡«/æ¾ç¤ºç±»åé项 column.setIsRequired(prevColumn.getIsRequired()); column.setHtmlType(prevColumn.getHtmlType()); } genTableColumnMapper.updateById(column); } else { ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -41,6 +41,7 @@ column.setJavaField(StringUtils.toCamelCase(columnName)); // 设置é»è®¤ç±»å column.setJavaType(GenConstants.TYPE_STRING); column.setQueryType(GenConstants.QUERY_EQ); if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) { // å符串é¿åº¦è¶ è¿500设置为ææ¬å @@ -136,8 +137,7 @@ public static String getModuleName(String packageName) { int lastIndex = packageName.lastIndexOf("."); int nameLength = packageName.length(); String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength); return moduleName; return StringUtils.substring(packageName, lastIndex + 1, nameLength); } /** ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -207,8 +207,7 @@ */ public static String getPackagePrefix(String packageName) { int lastIndex = packageName.lastIndexOf("."); String basePackage = StringUtils.substring(packageName, 0, lastIndex); return basePackage; return StringUtils.substring(packageName, 0, lastIndex); } /** ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -35,7 +35,7 @@ List<SysUser> selectUserList(SysUser sysUser); /** * æ ¹æ®æ¡ä»¶å页æ¥è¯¢æªå·²é ç¨æ·è§è²å表 * æ ¹æ®æ¡ä»¶å页æ¥è¯¢å·²é ç¨æ·è§è²å表 * * @param user ç¨æ·ä¿¡æ¯ * @return ç¨æ·ä¿¡æ¯éåä¿¡æ¯ ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
@@ -67,7 +67,6 @@ * æ¹éå é¤åæ°ä¿¡æ¯ * * @param configIds éè¦å é¤çåæ°ID * @return ç»æ */ void deleteConfigByIds(Long[] configIds);
@@ -45,7 +45,6 @@ * æ¹éå é¤åå ¸æ°æ®ä¿¡æ¯ * * @param dictCodes éè¦å é¤çåå ¸æ°æ®ID * @return ç»æ */ void deleteDictDataByIds(Long[] dictCodes);
@@ -60,7 +60,6 @@ * æ¹éå é¤åå ¸ä¿¡æ¯ * * @param dictIds éè¦å é¤çåå ¸ID * @return ç»æ */ void deleteDictTypeByIds(Long[] dictIds);
@@ -35,7 +35,7 @@ * æ¹éå é¤ç³»ç»ç»å½æ¥å¿ * * @param infoIds éè¦å é¤çç»å½æ¥å¿ID * @return * @return ç»æ */ int deleteLogininforByIds(Long[] infoIds);
@@ -84,7 +84,6 @@ * * @param postIds éè¦å é¤çå²ä½ID * @return ç»æ * @throws Exception å¼å¸¸ */ int deletePostByIds(Long[] postIds);
@@ -153,7 +153,6 @@ * æ¹éå é¤åæ°ä¿¡æ¯ * * @param configIds éè¦å é¤çåæ°ID * @return ç»æ */ @Override public void deleteConfigByIds(Long[] configIds) { ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
@@ -83,7 +83,6 @@ * æ¹éå é¤åå ¸æ°æ®ä¿¡æ¯ * * @param dictCodes éè¦å é¤çåå ¸æ°æ®ID * @return ç»æ */ @Override public void deleteDictDataByIds(Long[] dictCodes) { ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -123,7 +123,6 @@ * æ¹éå é¤åå ¸ç±»åä¿¡æ¯ * * @param dictIds éè¦å é¤çåå ¸ID * @return ç»æ */ @Override public void deleteDictTypeByIds(Long[] dictIds) { ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
@@ -140,7 +140,7 @@ * æ¹éå é¤ç³»ç»ç»å½æ¥å¿ * * @param infoIds éè¦å é¤çç»å½æ¥å¿ID * @return * @return ç»æ */ @Override public int deleteLogininforByIds(Long[] infoIds) { ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
@@ -148,7 +148,6 @@ * * @param postIds éè¦å é¤çå²ä½ID * @return ç»æ * @throws Exception å¼å¸¸ */ @Override public int deletePostByIds(Long[] postIds) { ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -374,7 +374,7 @@ * æ¹ééæ©ææç¨æ·è§è² * * @param roleId è§è²ID * @param userIds éè¦å é¤çç¨æ·æ°æ®ID * @param userIds éè¦ææçç¨æ·æ°æ®ID * @return ç»æ */ @Override ruoyi-ui/src/components/FileUpload/index.vue
@@ -26,7 +26,7 @@ <!-- æ件å表 --> <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul"> <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList"> <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList"> <el-link :href="`${file.url}`" :underline="false" target="_blank"> <span class="el-icon-document"> {{ getFileName(file.name) }} </span> </el-link> ruoyi-ui/src/router/index.js
@@ -155,7 +155,7 @@ permissions: ['tool:gen:edit'], children: [ { path: 'index', path: 'index/:tableId(\\d+)', component: () => import('@/views/tool/gen/editTable'), name: 'GenEdit', meta: { title: 'ä¿®æ¹çæé ç½®', activeMenu: '/tool/gen' } ruoyi-ui/src/utils/generator/drawingDefault.js
ÎļþÃû´Ó ruoyi-ui/src/utils/generator/drawingDefalut.js ÐÞ¸Ä @@ -1,29 +1,29 @@ export default [ { layout: 'colFormItem', tagIcon: 'input', label: 'ææºå·', vModel: 'mobile', formId: 6, tag: 'el-input', placeholder: '请è¾å ¥ææºå·', defaultValue: '', span: 24, style: { width: '100%' }, clearable: true, prepend: '', append: '', 'prefix-icon': 'el-icon-mobile', 'suffix-icon': '', maxlength: 11, 'show-word-limit': true, readonly: false, disabled: false, required: true, changeTag: true, regList: [{ pattern: '/^1(3|4|5|7|8|9)\\d{9}$/', message: 'ææºå·æ ¼å¼é误' }] } ] export default [ { layout: 'colFormItem', tagIcon: 'input', label: 'ææºå·', vModel: 'mobile', formId: 6, tag: 'el-input', placeholder: '请è¾å ¥ææºå·', defaultValue: '', span: 24, style: { width: '100%' }, clearable: true, prepend: '', append: '', 'prefix-icon': 'el-icon-mobile', 'suffix-icon': '', maxlength: 11, 'show-word-limit': true, readonly: false, disabled: false, required: true, changeTag: true, regList: [{ pattern: '/^1(3|4|5|7|8|9)\\d{9}$/', message: 'ææºå·æ ¼å¼é误' }] } ] ruoyi-ui/src/utils/generator/html.js
@@ -1,359 +1,359 @@ /* eslint-disable max-len */ import { trigger } from './config' let confGlobal let someSpanIsNot24 export function dialogWrapper(str) { return `<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Titile"> ${str} <div slot="footer"> <el-button @click="close">åæ¶</el-button> <el-button type="primary" @click="handelConfirm">ç¡®å®</el-button> </div> </el-dialog>` } export function vueTemplate(str) { return `<template> <div> ${str} </div> </template>` } export function vueScript(str) { return `<script> ${str} </script>` } export function cssStyle(cssStr) { return `<style> ${cssStr} </style>` } function buildFormTemplate(conf, child, type) { let labelPosition = '' if (conf.labelPosition !== 'right') { labelPosition = `label-position="${conf.labelPosition}"` } const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : '' let str = `<el-form ref="${conf.formRef}" :model="${conf.formModel}" :rules="${conf.formRules}" size="${conf.size}" ${disabled} label-width="${conf.labelWidth}px" ${labelPosition}> ${child} ${buildFromBtns(conf, type)} </el-form>` if (someSpanIsNot24) { str = `<el-row :gutter="${conf.gutter}"> ${str} </el-row>` } return str } function buildFromBtns(conf, type) { let str = '' if (conf.formBtns && type === 'file') { str = `<el-form-item size="large"> <el-button type="primary" @click="submitForm">æ交</el-button> <el-button @click="resetForm">éç½®</el-button> </el-form-item>` if (someSpanIsNot24) { str = `<el-col :span="24"> ${str} </el-col>` } } return str } // spanä¸ä¸º24çç¨el-colå 裹 function colWrapper(element, str) { if (someSpanIsNot24 || element.span !== 24) { return `<el-col :span="${element.span}"> ${str} </el-col>` } return str } const layouts = { colFormItem(element) { let labelWidth = '' if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) { labelWidth = `label-width="${element.labelWidth}px"` } const required = !trigger[element.tag] && element.required ? 'required' : '' const tagDom = tags[element.tag] ? tags[element.tag](element) : null let str = `<el-form-item ${labelWidth} label="${element.label}" prop="${element.vModel}" ${required}> ${tagDom} </el-form-item>` str = colWrapper(element, 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)) let str = `<el-row ${type} ${justify} ${align} ${gutter}> ${children.join('\n')} </el-row>` str = colWrapper(element, str) return str } } const tags = { 'el-button': el => { const { tag, disabled } = attrBuilder(el) const type = el.type ? `type="${el.type}"` : '' const icon = el.icon ? `icon="${el.icon}"` : '' const size = el.size ? `size="${el.size}"` : '' let child = buildElButtonChild(el) if (child) child = `\n${child}\n` // æ¢è¡ return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}</${el.tag}>` }, 'el-input': el => { const { disabled, vModel, clearable, placeholder, width } = attrBuilder(el) const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : '' const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : '' const readonly = el.readonly ? 'readonly' : '' const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : '' const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : '' const showPassword = el['show-password'] ? 'show-password' : '' const type = el.type ? `type="${el.type}"` : '' const autosize = el.autosize && el.autosize.minRows ? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"` : '' 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}</${el.tag}>` }, 'el-input-number': el => { const { 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}'` : '' const step = el.step ? `:step='${el.step}'` : '' 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}></${el.tag}>` }, 'el-select': el => { const { 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}</${el.tag}>` }, 'el-radio-group': el => { const { 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}</${el.tag}>` }, 'el-checkbox-group': el => { const { 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}</${el.tag}>` }, 'el-switch': el => { const { 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']}"` : '' const inactiveColor = el['inactive-color'] ? `inactive-color="${el['inactive-color']}"` : '' 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}></${el.tag}>` }, 'el-cascader': el => { const { disabled, vModel, clearable, placeholder, width } = attrBuilder(el) 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}></${el.tag}>` }, 'el-slider': el => { const { 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}></${el.tag}>` }, 'el-time-picker': el => { const { 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']}"` : '' const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' const isRange = el['is-range'] ? 'is-range' : '' const format = el.format ? `format="${el.format}"` : '' 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}></${el.tag}>` }, 'el-date-picker': el => { const { 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']}"` : '' const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' const format = el.format ? `format="${el.format}"` : '' const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' 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}></${el.tag}>` }, 'el-rate': el => { const { 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}></${el.tag}>` }, 'el-color-picker': el => { const { 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}></${el.tag}>` }, 'el-upload': el => { const disabled = el.disabled ? ':disabled=\'true\'' : '' 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}"` let child = buildElUploadChild(el) if (child) child = `\n${child}\n` // æ¢è¡ return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}</${el.tag}>` } } function attrBuilder(el) { return { 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%\'}"' : '', disabled: el.disabled ? ':disabled=\'true\'' : '' } } // el-buttin å级 function buildElButtonChild(conf) { const children = [] if (conf.default) { children.push(conf.default) } return children.join('\n') } // el-input innerHTML function buildElInputChild(conf) { const children = [] if (conf.prepend) { children.push(`<template slot="prepend">${conf.prepend}</template>`) } if (conf.append) { children.push(`<template slot="append">${conf.append}</template>`) } return children.join('\n') } function buildElSelectChild(conf) { const children = [] if (conf.options && conf.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>`) } return children.join('\n') } function buildElRadioGroupChild(conf) { 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}}</${tag}>`) } return children.join('\n') } function buildElCheckboxGroupChild(conf) { 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}}</${tag}>`) } return children.join('\n') } function buildElUploadChild(conf) { const list = [] 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>`) if (conf.showTip) list.push(`<div slot="tip" class="el-upload__tip">åªè½ä¸ä¼ ä¸è¶ è¿ ${conf.fileSize}${conf.sizeUnit} ç${conf.accept}æ件</div>`) return list.join('\n') } export function makeUpHtml(conf, type) { const htmlList = [] confGlobal = conf someSpanIsNot24 = conf.fields.some(item => item.span !== 24) conf.fields.forEach(el => { htmlList.push(layouts[el.layout](el)) }) const htmlStr = htmlList.join('\n') let temp = buildFormTemplate(conf, htmlStr, type) if (type === 'dialog') { temp = dialogWrapper(temp) } confGlobal = null return temp } /* eslint-disable max-len */ import { trigger } from './config' let confGlobal let someSpanIsNot24 export function dialogWrapper(str) { return `<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Title"> ${str} <div slot="footer"> <el-button @click="close">åæ¶</el-button> <el-button type="primary" @click="handleConfirm">ç¡®å®</el-button> </div> </el-dialog>` } export function vueTemplate(str) { return `<template> <div> ${str} </div> </template>` } export function vueScript(str) { return `<script> ${str} </script>` } export function cssStyle(cssStr) { return `<style> ${cssStr} </style>` } function buildFormTemplate(conf, child, type) { let labelPosition = '' if (conf.labelPosition !== 'right') { labelPosition = `label-position="${conf.labelPosition}"` } const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : '' let str = `<el-form ref="${conf.formRef}" :model="${conf.formModel}" :rules="${conf.formRules}" size="${conf.size}" ${disabled} label-width="${conf.labelWidth}px" ${labelPosition}> ${child} ${buildFromBtns(conf, type)} </el-form>` if (someSpanIsNot24) { str = `<el-row :gutter="${conf.gutter}"> ${str} </el-row>` } return str } function buildFromBtns(conf, type) { let str = '' if (conf.formBtns && type === 'file') { str = `<el-form-item size="large"> <el-button type="primary" @click="submitForm">æ交</el-button> <el-button @click="resetForm">éç½®</el-button> </el-form-item>` if (someSpanIsNot24) { str = `<el-col :span="24"> ${str} </el-col>` } } return str } // spanä¸ä¸º24çç¨el-colå 裹 function colWrapper(element, str) { if (someSpanIsNot24 || element.span !== 24) { return `<el-col :span="${element.span}"> ${str} </el-col>` } return str } const layouts = { colFormItem(element) { let labelWidth = '' if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) { labelWidth = `label-width="${element.labelWidth}px"` } const required = !trigger[element.tag] && element.required ? 'required' : '' const tagDom = tags[element.tag] ? tags[element.tag](element) : null let str = `<el-form-item ${labelWidth} label="${element.label}" prop="${element.vModel}" ${required}> ${tagDom} </el-form-item>` str = colWrapper(element, 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)) let str = `<el-row ${type} ${justify} ${align} ${gutter}> ${children.join('\n')} </el-row>` str = colWrapper(element, str) return str } } const tags = { 'el-button': el => { const { tag, disabled } = attrBuilder(el) const type = el.type ? `type="${el.type}"` : '' const icon = el.icon ? `icon="${el.icon}"` : '' const size = el.size ? `size="${el.size}"` : '' let child = buildElButtonChild(el) if (child) child = `\n${child}\n` // æ¢è¡ return `<${el.tag} ${type} ${icon} ${size} ${disabled}>${child}</${el.tag}>` }, 'el-input': el => { const { disabled, vModel, clearable, placeholder, width } = attrBuilder(el) const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : '' const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : '' const readonly = el.readonly ? 'readonly' : '' const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : '' const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : '' const showPassword = el['show-password'] ? 'show-password' : '' const type = el.type ? `type="${el.type}"` : '' const autosize = el.autosize && el.autosize.minRows ? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"` : '' 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}</${el.tag}>` }, 'el-input-number': el => { const { 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}'` : '' const step = el.step ? `:step='${el.step}'` : '' 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}></${el.tag}>` }, 'el-select': el => { const { 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}</${el.tag}>` }, 'el-radio-group': el => { const { 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}</${el.tag}>` }, 'el-checkbox-group': el => { const { 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}</${el.tag}>` }, 'el-switch': el => { const { 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']}"` : '' const inactiveColor = el['inactive-color'] ? `inactive-color="${el['inactive-color']}"` : '' 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}></${el.tag}>` }, 'el-cascader': el => { const { disabled, vModel, clearable, placeholder, width } = attrBuilder(el) 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}></${el.tag}>` }, 'el-slider': el => { const { 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}></${el.tag}>` }, 'el-time-picker': el => { const { 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']}"` : '' const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' const isRange = el['is-range'] ? 'is-range' : '' const format = el.format ? `format="${el.format}"` : '' 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}></${el.tag}>` }, 'el-date-picker': el => { const { 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']}"` : '' const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : '' const format = el.format ? `format="${el.format}"` : '' const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : '' 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}></${el.tag}>` }, 'el-rate': el => { const { 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}></${el.tag}>` }, 'el-color-picker': el => { const { 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}></${el.tag}>` }, 'el-upload': el => { const disabled = el.disabled ? ':disabled=\'true\'' : '' 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}"` let child = buildElUploadChild(el) if (child) child = `\n${child}\n` // æ¢è¡ return `<${el.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}</${el.tag}>` } } function attrBuilder(el) { return { 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%\'}"' : '', disabled: el.disabled ? ':disabled=\'true\'' : '' } } // el-buttin å级 function buildElButtonChild(conf) { const children = [] if (conf.default) { children.push(conf.default) } return children.join('\n') } // el-input innerHTML function buildElInputChild(conf) { const children = [] if (conf.prepend) { children.push(`<template slot="prepend">${conf.prepend}</template>`) } if (conf.append) { children.push(`<template slot="append">${conf.append}</template>`) } return children.join('\n') } function buildElSelectChild(conf) { const children = [] if (conf.options && conf.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>`) } return children.join('\n') } function buildElRadioGroupChild(conf) { 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}}</${tag}>`) } return children.join('\n') } function buildElCheckboxGroupChild(conf) { 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}}</${tag}>`) } return children.join('\n') } function buildElUploadChild(conf) { const list = [] 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>`) if (conf.showTip) list.push(`<div slot="tip" class="el-upload__tip">åªè½ä¸ä¼ ä¸è¶ è¿ ${conf.fileSize}${conf.sizeUnit} ç${conf.accept}æ件</div>`) return list.join('\n') } export function makeUpHtml(conf, type) { const htmlList = [] confGlobal = conf someSpanIsNot24 = conf.fields.some(item => item.span !== 24) conf.fields.forEach(el => { htmlList.push(layouts[el.layout](el)) }) const htmlStr = htmlList.join('\n') let temp = buildFormTemplate(conf, htmlStr, type) if (type === 'dialog') { temp = dialogWrapper(temp) } confGlobal = null return temp } ruoyi-ui/src/utils/generator/js.js
@@ -1,236 +1,236 @@ import { isArray } from 'util' import { exportDefault, titleCase } from '@/utils/index' import { trigger } from './config' const units = { KB: '1024', MB: '1024 / 1024', GB: '1024 / 1024 / 1024' } let confGlobal const inheritAttrs = { file: '', dialog: 'inheritAttrs: false,' } export function makeUpJs(conf, type) { confGlobal = conf = JSON.parse(JSON.stringify(conf)) const dataList = [] const ruleList = [] const optionsList = [] const propsList = [] const methodList = mixinMethod(type) const uploadVarList = [] conf.fields.forEach(el => { buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) }) const script = buildexport( conf, type, dataList.join('\n'), ruleList.join('\n'), optionsList.join('\n'), uploadVarList.join('\n'), propsList.join('\n'), methodList.join('\n') ) confGlobal = null return script } function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) { buildData(el, dataList) buildRules(el, ruleList) if (el.options && el.options.length) { buildOptions(el, optionsList) if (el.dataType === 'dynamic') { const model = `${el.vModel}Options` const options = titleCase(model) buildOptionMethod(`get${options}`, model, methodList) } } if (el.props && el.props.props) { buildProps(el, propsList) } if (el.action && el.tag === 'el-upload') { uploadVarList.push( `${el.vModel}Action: '${el.action}', ${el.vModel}fileList: [],` ) methodList.push(buildBeforeUpload(el)) if (!el['auto-upload']) { methodList.push(buildSubmitUpload(el)) } } if (el.children) { el.children.forEach(el2 => { buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) }) } } function mixinMethod(type) { const list = []; const minxins = { file: confGlobal.formBtns ? { submitForm: `submitForm() { this.$refs['${confGlobal.formRef}'].validate(valid => { if(!valid) return // TODO æ交表å }) },`, resetForm: `resetForm() { this.$refs['${confGlobal.formRef}'].resetFields() },` } : null, dialog: { onOpen: 'onOpen() {},', onClose: `onClose() { this.$refs['${confGlobal.formRef}'].resetFields() },`, close: `close() { this.$emit('update:visible', false) },`, handelConfirm: `handelConfirm() { this.$refs['${confGlobal.formRef}'].validate(valid => { if(!valid) return this.close() }) },` } } const methods = minxins[type] if (methods) { Object.keys(methods).forEach(key => { list.push(methods[key]) }) } 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},`) } function buildRules(conf, ruleList) { if (conf.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 (conf.regList && isArray(conf.regList)) { conf.regList.forEach(item => { if (item.pattern) { rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.tag]}' }`) } }) } ruleList.push(`${conf.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)},` 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)},` propsList.push(str) } function buildBeforeUpload(conf) { const unitNum = units[conf.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const returnList = [] if (conf.fileSize) { rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize} if(!isRightSize){ this.$message.error('æ件大å°è¶ è¿ ${conf.fileSize}${conf.sizeUnit}') }` returnList.push('isRightSize') } if (conf.accept) { acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type) if(!isAccept){ this.$message.error('åºè¯¥éæ©${conf.accept}ç±»åçæ件') }` returnList.push('isAccept') } const str = `${conf.vModel}BeforeUpload(file) { ${rightSizeCode} ${acceptCode} return ${returnList.join('&&')} },` return returnList.length ? str : '' } function buildSubmitUpload(conf) { const str = `submitUpload() { this.$refs['${conf.vModel}'].submit() },` return str } function buildOptionMethod(methodName, model, methodList) { const str = `${methodName}() { // TODO å起请æ±è·åæ°æ® this.${model} },` methodList.push(str) } function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) { const str = `${exportDefault}{ ${inheritAttrs[type]} components: {}, props: [], data () { return { ${conf.formModel}: { ${data} }, ${conf.formRules}: { ${rules} }, ${uploadVar} ${selectOptions} ${props} } }, computed: {}, watch: {}, created () {}, mounted () {}, methods: { ${methods} } }` return str } import { isArray } from 'util' import { exportDefault, titleCase } from '@/utils/index' import { trigger } from './config' const units = { KB: '1024', MB: '1024 / 1024', GB: '1024 / 1024 / 1024' } let confGlobal const inheritAttrs = { file: '', dialog: 'inheritAttrs: false,' } export function makeUpJs(conf, type) { confGlobal = conf = JSON.parse(JSON.stringify(conf)) const dataList = [] const ruleList = [] const optionsList = [] const propsList = [] const methodList = mixinMethod(type) const uploadVarList = [] conf.fields.forEach(el => { buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) }) const script = buildexport( conf, type, dataList.join('\n'), ruleList.join('\n'), optionsList.join('\n'), uploadVarList.join('\n'), propsList.join('\n'), methodList.join('\n') ) confGlobal = null return script } function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) { buildData(el, dataList) buildRules(el, ruleList) if (el.options && el.options.length) { buildOptions(el, optionsList) if (el.dataType === 'dynamic') { const model = `${el.vModel}Options` const options = titleCase(model) buildOptionMethod(`get${options}`, model, methodList) } } if (el.props && el.props.props) { buildProps(el, propsList) } if (el.action && el.tag === 'el-upload') { uploadVarList.push( `${el.vModel}Action: '${el.action}', ${el.vModel}fileList: [],` ) methodList.push(buildBeforeUpload(el)) if (!el['auto-upload']) { methodList.push(buildSubmitUpload(el)) } } if (el.children) { el.children.forEach(el2 => { buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) }) } } function mixinMethod(type) { const list = []; const minxins = { file: confGlobal.formBtns ? { submitForm: `submitForm() { this.$refs['${confGlobal.formRef}'].validate(valid => { if(!valid) return // TODO æ交表å }) },`, resetForm: `resetForm() { this.$refs['${confGlobal.formRef}'].resetFields() },` } : null, dialog: { onOpen: 'onOpen() {},', onClose: `onClose() { this.$refs['${confGlobal.formRef}'].resetFields() },`, close: `close() { this.$emit('update:visible', false) },`, handleConfirm: `handleConfirm() { this.$refs['${confGlobal.formRef}'].validate(valid => { if(!valid) return this.close() }) },` } } const methods = minxins[type] if (methods) { Object.keys(methods).forEach(key => { list.push(methods[key]) }) } 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},`) } function buildRules(conf, ruleList) { if (conf.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 (conf.regList && isArray(conf.regList)) { conf.regList.forEach(item => { if (item.pattern) { rules.push(`{ pattern: ${eval(item.pattern)}, message: '${item.message}', trigger: '${trigger[conf.tag]}' }`) } }) } ruleList.push(`${conf.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)},` 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)},` propsList.push(str) } function buildBeforeUpload(conf) { const unitNum = units[conf.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const returnList = [] if (conf.fileSize) { rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize} if(!isRightSize){ this.$message.error('æ件大å°è¶ è¿ ${conf.fileSize}${conf.sizeUnit}') }` returnList.push('isRightSize') } if (conf.accept) { acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type) if(!isAccept){ this.$message.error('åºè¯¥éæ©${conf.accept}ç±»åçæ件') }` returnList.push('isAccept') } const str = `${conf.vModel}BeforeUpload(file) { ${rightSizeCode} ${acceptCode} return ${returnList.join('&&')} },` return returnList.length ? str : '' } function buildSubmitUpload(conf) { const str = `submitUpload() { this.$refs['${conf.vModel}'].submit() },` return str } function buildOptionMethod(methodName, model, methodList) { const str = `${methodName}() { // TODO å起请æ±è·åæ°æ® this.${model} },` methodList.push(str) } function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) { const str = `${exportDefault}{ ${inheritAttrs[type]} components: {}, props: [], data () { return { ${conf.formModel}: { ${data} }, ${conf.formRules}: { ${rules} }, ${uploadVar} ${selectOptions} ${props} } }, computed: {}, watch: {}, created () {}, mounted () {}, methods: { ${methods} } }` return str } ruoyi-ui/src/views/tool/build/CodeTypeDialog.vue
@@ -1,106 +1,106 @@ <template> <div> <el-dialog v-bind="$attrs" width="500px" :close-on-click-modal="false" :modal-append-to-body="false" v-on="$listeners" @open="onOpen" @close="onClose" > <el-row :gutter="15"> <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" > <el-col :span="24"> <el-form-item label="çæç±»å" prop="type"> <el-radio-group v-model="formData.type"> <el-radio-button v-for="(item, index) in typeOptions" :key="index" :label="item.value" :disabled="item.disabled" > {{ item.label }} </el-radio-button> </el-radio-group> </el-form-item> <el-form-item v-if="showFileName" label="æ件å" prop="fileName"> <el-input v-model="formData.fileName" placeholder="请è¾å ¥æ件å" clearable /> </el-form-item> </el-col> </el-form> </el-row> <div slot="footer"> <el-button @click="close"> åæ¶ </el-button> <el-button type="primary" @click="handelConfirm"> ç¡®å® </el-button> </div> </el-dialog> </div> </template> <script> export default { inheritAttrs: false, props: ['showFileName'], data() { return { formData: { fileName: undefined, type: 'file' }, rules: { fileName: [{ required: true, message: '请è¾å ¥æ件å', trigger: 'blur' }], type: [{ required: true, message: 'çæç±»åä¸è½ä¸ºç©º', trigger: 'change' }] }, typeOptions: [{ label: '页é¢', value: 'file' }, { label: 'å¼¹çª', value: 'dialog' }] } }, computed: { }, watch: {}, mounted() {}, methods: { onOpen() { if (this.showFileName) { this.formData.fileName = `${+new Date()}.vue` } }, onClose() { }, close(e) { this.$emit('update:visible', false) }, handelConfirm() { this.$refs.elForm.validate(valid => { if (!valid) return this.$emit('confirm', { ...this.formData }) this.close() }) } } } </script> <template> <div> <el-dialog v-bind="$attrs" width="500px" :close-on-click-modal="false" :modal-append-to-body="false" v-on="$listeners" @open="onOpen" @close="onClose" > <el-row :gutter="15"> <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px" > <el-col :span="24"> <el-form-item label="çæç±»å" prop="type"> <el-radio-group v-model="formData.type"> <el-radio-button v-for="(item, index) in typeOptions" :key="index" :label="item.value" :disabled="item.disabled" > {{ item.label }} </el-radio-button> </el-radio-group> </el-form-item> <el-form-item v-if="showFileName" label="æ件å" prop="fileName"> <el-input v-model="formData.fileName" placeholder="请è¾å ¥æ件å" clearable /> </el-form-item> </el-col> </el-form> </el-row> <div slot="footer"> <el-button @click="close"> åæ¶ </el-button> <el-button type="primary" @click="handleConfirm"> ç¡®å® </el-button> </div> </el-dialog> </div> </template> <script> export default { inheritAttrs: false, props: ['showFileName'], data() { return { formData: { fileName: undefined, type: 'file' }, rules: { fileName: [{ required: true, message: '请è¾å ¥æ件å', trigger: 'blur' }], type: [{ required: true, message: 'çæç±»åä¸è½ä¸ºç©º', trigger: 'change' }] }, typeOptions: [{ label: '页é¢', value: 'file' }, { label: 'å¼¹çª', value: 'dialog' }] } }, computed: { }, watch: {}, mounted() {}, methods: { onOpen() { if (this.showFileName) { this.formData.fileName = `${+new Date()}.vue` } }, onClose() { }, close(e) { this.$emit('update:visible', false) }, handleConfirm() { this.$refs.elForm.validate(valid => { if (!valid) return this.$emit('confirm', { ...this.formData }) this.close() }) } } } </script> ruoyi-ui/src/views/tool/build/TreeNodeDialog.vue
@@ -1,149 +1,149 @@ <template> <div> <el-dialog v-bind="$attrs" :close-on-click-modal="false" :modal-append-to-body="false" v-on="$listeners" @open="onOpen" @close="onClose" > <el-row :gutter="0"> <el-form ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px" > <el-col :span="24"> <el-form-item label="é项å" prop="label" > <el-input v-model="formData.label" placeholder="请è¾å ¥é项å" clearable /> </el-form-item> </el-col> <el-col :span="24"> <el-form-item label="é项å¼" prop="value" > <el-input v-model="formData.value" placeholder="请è¾å ¥é项å¼" clearable > <el-select slot="append" v-model="dataType" :style="{width: '100px'}" > <el-option v-for="(item, index) in dataTypeOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled" /> </el-select> </el-input> </el-form-item> </el-col> </el-form> </el-row> <div slot="footer"> <el-button type="primary" @click="handelConfirm" > ç¡®å® </el-button> <el-button @click="close"> åæ¶ </el-button> </div> </el-dialog> </div> </template> <script> import { isNumberStr } from '@/utils/index' export default { components: {}, inheritAttrs: false, props: [], data() { return { id: 100, formData: { label: undefined, value: undefined }, rules: { label: [ { required: true, message: '请è¾å ¥é项å', trigger: 'blur' } ], value: [ { required: true, message: '请è¾å ¥é项å¼', trigger: 'blur' } ] }, dataType: 'string', dataTypeOptions: [ { label: 'å符串', value: 'string' }, { label: 'æ°å', value: 'number' } ] } }, computed: {}, watch: { // eslint-disable-next-line func-names 'formData.value': function (val) { this.dataType = isNumberStr(val) ? 'number' : 'string' } }, created() {}, mounted() {}, methods: { onOpen() { this.formData = { label: undefined, value: undefined } }, onClose() {}, close() { this.$emit('update:visible', false) }, handelConfirm() { this.$refs.elForm.validate(valid => { if (!valid) return if (this.dataType === 'number') { this.formData.value = parseFloat(this.formData.value) } this.formData.id = this.id++ this.$emit('commit', this.formData) this.close() }) } } } </script> <template> <div> <el-dialog v-bind="$attrs" :close-on-click-modal="false" :modal-append-to-body="false" v-on="$listeners" @open="onOpen" @close="onClose" > <el-row :gutter="0"> <el-form ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px" > <el-col :span="24"> <el-form-item label="é项å" prop="label" > <el-input v-model="formData.label" placeholder="请è¾å ¥é项å" clearable /> </el-form-item> </el-col> <el-col :span="24"> <el-form-item label="é项å¼" prop="value" > <el-input v-model="formData.value" placeholder="请è¾å ¥é项å¼" clearable > <el-select slot="append" v-model="dataType" :style="{width: '100px'}" > <el-option v-for="(item, index) in dataTypeOptions" :key="index" :label="item.label" :value="item.value" :disabled="item.disabled" /> </el-select> </el-input> </el-form-item> </el-col> </el-form> </el-row> <div slot="footer"> <el-button type="primary" @click="handleConfirm" > ç¡®å® </el-button> <el-button @click="close"> åæ¶ </el-button> </div> </el-dialog> </div> </template> <script> import { isNumberStr } from '@/utils/index' export default { components: {}, inheritAttrs: false, props: [], data() { return { id: 100, formData: { label: undefined, value: undefined }, rules: { label: [ { required: true, message: '请è¾å ¥é项å', trigger: 'blur' } ], value: [ { required: true, message: '请è¾å ¥é项å¼', trigger: 'blur' } ] }, dataType: 'string', dataTypeOptions: [ { label: 'å符串', value: 'string' }, { label: 'æ°å', value: 'number' } ] } }, computed: {}, watch: { // eslint-disable-next-line func-names 'formData.value': function (val) { this.dataType = isNumberStr(val) ? 'number' : 'string' } }, created() {}, mounted() {}, methods: { onOpen() { this.formData = { label: undefined, value: undefined } }, onClose() {}, close() { this.$emit('update:visible', false) }, handleConfirm() { this.$refs.elForm.validate(valid => { if (!valid) return if (this.dataType === 'number') { this.formData.value = parseFloat(this.formData.value) } this.formData.id = this.id++ this.$emit('commit', this.formData) this.close() }) } } } </script> ruoyi-ui/src/views/tool/build/index.vue
@@ -146,7 +146,7 @@ import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html' import { makeUpJs } from '@/utils/generator/js' import { makeUpCss } from '@/utils/generator/css' import drawingDefalut from '@/utils/generator/drawingDefalut' import drawingDefault from '@/utils/generator/drawingDefault' import logo from '@/assets/logo/logo.png' import CodeTypeDialog from './CodeTypeDialog' import DraggableItem from './DraggableItem' @@ -171,15 +171,15 @@ selectComponents, layoutComponents, labelWidth: 100, drawingList: drawingDefalut, drawingList: drawingDefault, drawingData: {}, activeId: drawingDefalut[0].formId, activeId: drawingDefault[0].formId, drawerVisible: false, formData: {}, dialogVisible: false, generateConf: null, showFileName: false, activeData: drawingDefalut[0] activeData: drawingDefault[0] } }, created() { ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -159,7 +159,7 @@ }; }, created() { const tableId = this.$route.query && this.$route.query.tableId; const tableId = this.$route.params && this.$route.params.tableId; if (tableId) { // è·å表详ç»ä¿¡æ¯ getGenTable(tableId).then(res => { ruoyi-ui/src/views/tool/gen/index.vue
@@ -321,7 +321,7 @@ /** ä¿®æ¹æé®æä½ */ handleEditTable(row) { const tableId = row.tableId || this.ids[0]; this.$router.push({ path: '/tool/gen-edit/index', query: { tableId: tableId, pageNum: this.queryParams.pageNum } }); this.$router.push({ path: '/tool/gen-edit/index/' + tableId, query: { pageNum: this.queryParams.pageNum } }); }, /** å é¤æé®æä½ */ handleDelete(row) {
