Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts: .gitignore ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml ruoyi-ui/src/components/FileUpload/index.vue ruoyi-ui/src/views/tool/build/index.vue
This commit is contained in:
疯狂的狮子li
commit
ee2f74dc5e
3
.gitignore
vendored
3
.gitignore
vendored
@ -25,6 +25,9 @@ target/
|
|||||||
*.iml
|
*.iml
|
||||||
*.ipr
|
*.ipr
|
||||||
|
|
||||||
|
### JRebel ###
|
||||||
|
rebel.xml
|
||||||
|
|
||||||
### NetBeans ###
|
### NetBeans ###
|
||||||
nbproject/private/
|
nbproject/private/
|
||||||
build/*
|
build/*
|
||||||
|
|||||||
@ -181,6 +181,11 @@ public interface GenConstants {
|
|||||||
*/
|
*/
|
||||||
String QUERY_LIKE = "LIKE";
|
String QUERY_LIKE = "LIKE";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 相等查询
|
||||||
|
*/
|
||||||
|
String QUERY_EQ = "EQ";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 需要
|
* 需要
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -44,6 +44,6 @@ public class LoginBody {
|
|||||||
* 唯一标识
|
* 唯一标识
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "唯一标识")
|
@ApiModelProperty(value = "唯一标识")
|
||||||
private String uuid = "";
|
private String uuid;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -97,9 +97,8 @@ public class ServletUtils extends ServletUtil {
|
|||||||
*
|
*
|
||||||
* @param response 渲染对象
|
* @param response 渲染对象
|
||||||
* @param string 待渲染的字符串
|
* @param string 待渲染的字符串
|
||||||
* @return null
|
|
||||||
*/
|
*/
|
||||||
public static String renderString(HttpServletResponse response, String string) {
|
public static void renderString(HttpServletResponse response, String string) {
|
||||||
try {
|
try {
|
||||||
response.setStatus(HttpStatus.HTTP_OK);
|
response.setStatus(HttpStatus.HTTP_OK);
|
||||||
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
|
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
|
||||||
@ -108,7 +107,6 @@ public class ServletUtils extends ServletUtil {
|
|||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -119,12 +117,12 @@ public class ServletUtils extends ServletUtil {
|
|||||||
public static boolean isAjaxRequest(HttpServletRequest request) {
|
public static boolean isAjaxRequest(HttpServletRequest request) {
|
||||||
|
|
||||||
String accept = request.getHeader("accept");
|
String accept = request.getHeader("accept");
|
||||||
if (accept != null && accept.indexOf("application/json") != -1) {
|
if (accept != null && accept.contains("application/json")) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
String xRequestedWith = request.getHeader("X-Requested-With");
|
String xRequestedWith = request.getHeader("X-Requested-With");
|
||||||
if (xRequestedWith != null && xRequestedWith.indexOf("XMLHttpRequest") != -1) {
|
if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -134,10 +132,7 @@ public class ServletUtils extends ServletUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String ajax = request.getParameter("__ajax");
|
String ajax = request.getParameter("__ajax");
|
||||||
if (StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml")) {
|
return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml");
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getClientIP() {
|
public static String getClientIP() {
|
||||||
|
|||||||
@ -56,6 +56,6 @@ public class AddressUtils {
|
|||||||
log.error("获取地理位置异常 {}", ip);
|
log.error("获取地理位置异常 {}", ip);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return address;
|
return UNKNOWN;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -294,8 +294,17 @@ public class GenTableServiceImpl implements IGenTableService {
|
|||||||
GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
|
GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
|
||||||
column.setColumnId(prevColumn.getColumnId());
|
column.setColumnId(prevColumn.getColumnId());
|
||||||
if (column.isList()) {
|
if (column.isList()) {
|
||||||
// 如果是列表，继续保留字典类型
|
// 如果是列表，继续保留查询方式/字典类型选项
|
||||||
column.setDictType(prevColumn.getDictType());
|
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);
|
genTableColumnMapper.updateById(column);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -41,6 +41,7 @@ public class GenUtils {
|
|||||||
column.setJavaField(StringUtils.toCamelCase(columnName));
|
column.setJavaField(StringUtils.toCamelCase(columnName));
|
||||||
// 设置默认类型
|
// 设置默认类型
|
||||||
column.setJavaType(GenConstants.TYPE_STRING);
|
column.setJavaType(GenConstants.TYPE_STRING);
|
||||||
|
column.setQueryType(GenConstants.QUERY_EQ);
|
||||||
|
|
||||||
if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) {
|
if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) {
|
||||||
// 字符串长度超过500设置为文本域
|
// 字符串长度超过500设置为文本域
|
||||||
@ -136,8 +137,7 @@ public class GenUtils {
|
|||||||
public static String getModuleName(String packageName) {
|
public static String getModuleName(String packageName) {
|
||||||
int lastIndex = packageName.lastIndexOf(".");
|
int lastIndex = packageName.lastIndexOf(".");
|
||||||
int nameLength = packageName.length();
|
int nameLength = packageName.length();
|
||||||
String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
|
return StringUtils.substring(packageName, lastIndex + 1, nameLength);
|
||||||
return moduleName;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -207,8 +207,7 @@ public class VelocityUtils {
|
|||||||
*/
|
*/
|
||||||
public static String getPackagePrefix(String packageName) {
|
public static String getPackagePrefix(String packageName) {
|
||||||
int lastIndex = packageName.lastIndexOf(".");
|
int lastIndex = packageName.lastIndexOf(".");
|
||||||
String basePackage = StringUtils.substring(packageName, 0, lastIndex);
|
return StringUtils.substring(packageName, 0, lastIndex);
|
||||||
return basePackage;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -35,7 +35,7 @@ public interface SysUserMapper extends BaseMapperPlus<SysUserMapper, SysUser, Sy
|
|||||||
List<SysUser> selectUserList(SysUser sysUser);
|
List<SysUser> selectUserList(SysUser sysUser);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据条件分页查询未已配用户角色列表
|
* 根据条件分页查询已配用户角色列表
|
||||||
*
|
*
|
||||||
* @param user 用户信息
|
* @param user 用户信息
|
||||||
* @return 用户信息集合信息
|
* @return 用户信息集合信息
|
||||||
|
|||||||
@ -67,7 +67,6 @@ public interface ISysConfigService {
|
|||||||
* 批量删除参数信息
|
* 批量删除参数信息
|
||||||
*
|
*
|
||||||
* @param configIds 需要删除的参数ID
|
* @param configIds 需要删除的参数ID
|
||||||
* @return 结果
|
|
||||||
*/
|
*/
|
||||||
void deleteConfigByIds(Long[] configIds);
|
void deleteConfigByIds(Long[] configIds);
|
||||||
|
|
||||||
|
|||||||
@ -45,7 +45,6 @@ public interface ISysDictDataService {
|
|||||||
* 批量删除字典数据信息
|
* 批量删除字典数据信息
|
||||||
*
|
*
|
||||||
* @param dictCodes 需要删除的字典数据ID
|
* @param dictCodes 需要删除的字典数据ID
|
||||||
* @return 结果
|
|
||||||
*/
|
*/
|
||||||
void deleteDictDataByIds(Long[] dictCodes);
|
void deleteDictDataByIds(Long[] dictCodes);
|
||||||
|
|
||||||
|
|||||||
@ -60,7 +60,6 @@ public interface ISysDictTypeService {
|
|||||||
* 批量删除字典信息
|
* 批量删除字典信息
|
||||||
*
|
*
|
||||||
* @param dictIds 需要删除的字典ID
|
* @param dictIds 需要删除的字典ID
|
||||||
* @return 结果
|
|
||||||
*/
|
*/
|
||||||
void deleteDictTypeByIds(Long[] dictIds);
|
void deleteDictTypeByIds(Long[] dictIds);
|
||||||
|
|
||||||
|
|||||||
@ -35,7 +35,7 @@ public interface ISysLogininforService {
|
|||||||
* 批量删除系统登录日志
|
* 批量删除系统登录日志
|
||||||
*
|
*
|
||||||
* @param infoIds 需要删除的登录日志ID
|
* @param infoIds 需要删除的登录日志ID
|
||||||
* @return
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
int deleteLogininforByIds(Long[] infoIds);
|
int deleteLogininforByIds(Long[] infoIds);
|
||||||
|
|
||||||
|
|||||||
@ -84,7 +84,6 @@ public interface ISysPostService {
|
|||||||
*
|
*
|
||||||
* @param postIds 需要删除的岗位ID
|
* @param postIds 需要删除的岗位ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
* @throws Exception 异常
|
|
||||||
*/
|
*/
|
||||||
int deletePostByIds(Long[] postIds);
|
int deletePostByIds(Long[] postIds);
|
||||||
|
|
||||||
|
|||||||
@ -153,7 +153,6 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService {
|
|||||||
* 批量删除参数信息
|
* 批量删除参数信息
|
||||||
*
|
*
|
||||||
* @param configIds 需要删除的参数ID
|
* @param configIds 需要删除的参数ID
|
||||||
* @return 结果
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void deleteConfigByIds(Long[] configIds) {
|
public void deleteConfigByIds(Long[] configIds) {
|
||||||
|
|||||||
@ -83,7 +83,6 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
|
|||||||
* 批量删除字典数据信息
|
* 批量删除字典数据信息
|
||||||
*
|
*
|
||||||
* @param dictCodes 需要删除的字典数据ID
|
* @param dictCodes 需要删除的字典数据ID
|
||||||
* @return 结果
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void deleteDictDataByIds(Long[] dictCodes) {
|
public void deleteDictDataByIds(Long[] dictCodes) {
|
||||||
|
|||||||
@ -123,7 +123,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
|
|||||||
* 批量删除字典类型信息
|
* 批量删除字典类型信息
|
||||||
*
|
*
|
||||||
* @param dictIds 需要删除的字典ID
|
* @param dictIds 需要删除的字典ID
|
||||||
* @return 结果
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void deleteDictTypeByIds(Long[] dictIds) {
|
public void deleteDictTypeByIds(Long[] dictIds) {
|
||||||
|
|||||||
@ -140,7 +140,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService, Logininf
|
|||||||
* 批量删除系统登录日志
|
* 批量删除系统登录日志
|
||||||
*
|
*
|
||||||
* @param infoIds 需要删除的登录日志ID
|
* @param infoIds 需要删除的登录日志ID
|
||||||
* @return
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int deleteLogininforByIds(Long[] infoIds) {
|
public int deleteLogininforByIds(Long[] infoIds) {
|
||||||
|
|||||||
@ -148,7 +148,6 @@ public class SysPostServiceImpl implements ISysPostService {
|
|||||||
*
|
*
|
||||||
* @param postIds 需要删除的岗位ID
|
* @param postIds 需要删除的岗位ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
* @throws Exception 异常
|
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int deletePostByIds(Long[] postIds) {
|
public int deletePostByIds(Long[] postIds) {
|
||||||
|
|||||||
@ -374,7 +374,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
|
|||||||
* 批量选择授权用户角色
|
* 批量选择授权用户角色
|
||||||
*
|
*
|
||||||
* @param roleId 角色ID
|
* @param roleId 角色ID
|
||||||
* @param userIds 需要删除的用户数据ID
|
* @param userIds 需要授权的用户数据ID
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@ -26,7 +26,7 @@
|
|||||||
|
|
||||||
<!-- 文件列表 -->
|
<!-- 文件列表 -->
|
||||||
<transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
|
<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">
|
<el-link :href="`${file.url}`" :underline="false" target="_blank">
|
||||||
<span class="el-icon-document"> {{ getFileName(file.name) }} </span>
|
<span class="el-icon-document"> {{ getFileName(file.name) }} </span>
|
||||||
</el-link>
|
</el-link>
|
||||||
|
|||||||
@ -155,7 +155,7 @@ export const dynamicRoutes = [
|
|||||||
permissions: ['tool:gen:edit'],
|
permissions: ['tool:gen:edit'],
|
||||||
children: [
|
children: [
|
||||||
{
|
{
|
||||||
path: 'index',
|
path: 'index/:tableId(\\d+)',
|
||||||
component: () => import('@/views/tool/gen/editTable'),
|
component: () => import('@/views/tool/gen/editTable'),
|
||||||
name: 'GenEdit',
|
name: 'GenEdit',
|
||||||
meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
|
meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
|
||||||
|
|||||||
@ -1,29 +1,29 @@
|
|||||||
export default [
|
export default [
|
||||||
{
|
{
|
||||||
layout: 'colFormItem',
|
layout: 'colFormItem',
|
||||||
tagIcon: 'input',
|
tagIcon: 'input',
|
||||||
label: '手机号',
|
label: '手机号',
|
||||||
vModel: 'mobile',
|
vModel: 'mobile',
|
||||||
formId: 6,
|
formId: 6,
|
||||||
tag: 'el-input',
|
tag: 'el-input',
|
||||||
placeholder: '请输入手机号',
|
placeholder: '请输入手机号',
|
||||||
defaultValue: '',
|
defaultValue: '',
|
||||||
span: 24,
|
span: 24,
|
||||||
style: { width: '100%' },
|
style: { width: '100%' },
|
||||||
clearable: true,
|
clearable: true,
|
||||||
prepend: '',
|
prepend: '',
|
||||||
append: '',
|
append: '',
|
||||||
'prefix-icon': 'el-icon-mobile',
|
'prefix-icon': 'el-icon-mobile',
|
||||||
'suffix-icon': '',
|
'suffix-icon': '',
|
||||||
maxlength: 11,
|
maxlength: 11,
|
||||||
'show-word-limit': true,
|
'show-word-limit': true,
|
||||||
readonly: false,
|
readonly: false,
|
||||||
disabled: false,
|
disabled: false,
|
||||||
required: true,
|
required: true,
|
||||||
changeTag: true,
|
changeTag: true,
|
||||||
regList: [{
|
regList: [{
|
||||||
pattern: '/^1(3|4|5|7|8|9)\\d{9}$/',
|
pattern: '/^1(3|4|5|7|8|9)\\d{9}$/',
|
||||||
message: '手机号格式错误'
|
message: '手机号格式错误'
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -1,359 +1,359 @@
|
|||||||
/* eslint-disable max-len */
|
/* eslint-disable max-len */
|
||||||
import { trigger } from './config'
|
import { trigger } from './config'
|
||||||
|
|
||||||
let confGlobal
|
let confGlobal
|
||||||
let someSpanIsNot24
|
let someSpanIsNot24
|
||||||
|
|
||||||
export function dialogWrapper(str) {
|
export function dialogWrapper(str) {
|
||||||
return `<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Titile">
|
return `<el-dialog v-bind="$attrs" v-on="$listeners" @open="onOpen" @close="onClose" title="Dialog Title">
|
||||||
${str}
|
${str}
|
||||||
<div slot="footer">
|
<div slot="footer">
|
||||||
<el-button @click="close">取消</el-button>
|
<el-button @click="close">取消</el-button>
|
||||||
<el-button type="primary" @click="handelConfirm">确定</el-button>
|
<el-button type="primary" @click="handleConfirm">确定</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>`
|
</el-dialog>`
|
||||||
}
|
}
|
||||||
|
|
||||||
export function vueTemplate(str) {
|
export function vueTemplate(str) {
|
||||||
return `<template>
|
return `<template>
|
||||||
<div>
|
<div>
|
||||||
${str}
|
${str}
|
||||||
</div>
|
</div>
|
||||||
</template>`
|
</template>`
|
||||||
}
|
}
|
||||||
|
|
||||||
export function vueScript(str) {
|
export function vueScript(str) {
|
||||||
return `<script>
|
return `<script>
|
||||||
${str}
|
${str}
|
||||||
</script>`
|
</script>`
|
||||||
}
|
}
|
||||||
|
|
||||||
export function cssStyle(cssStr) {
|
export function cssStyle(cssStr) {
|
||||||
return `<style>
|
return `<style>
|
||||||
${cssStr}
|
${cssStr}
|
||||||
</style>`
|
</style>`
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildFormTemplate(conf, child, type) {
|
function buildFormTemplate(conf, child, type) {
|
||||||
let labelPosition = ''
|
let labelPosition = ''
|
||||||
if (conf.labelPosition !== 'right') {
|
if (conf.labelPosition !== 'right') {
|
||||||
labelPosition = `label-position="${conf.labelPosition}"`
|
labelPosition = `label-position="${conf.labelPosition}"`
|
||||||
}
|
}
|
||||||
const disabled = conf.disabled ? `:disabled="${conf.disabled}"` : ''
|
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}>
|
let str = `<el-form ref="${conf.formRef}" :model="${conf.formModel}" :rules="${conf.formRules}" size="${conf.size}" ${disabled} label-width="${conf.labelWidth}px" ${labelPosition}>
|
||||||
${child}
|
${child}
|
||||||
${buildFromBtns(conf, type)}
|
${buildFromBtns(conf, type)}
|
||||||
</el-form>`
|
</el-form>`
|
||||||
if (someSpanIsNot24) {
|
if (someSpanIsNot24) {
|
||||||
str = `<el-row :gutter="${conf.gutter}">
|
str = `<el-row :gutter="${conf.gutter}">
|
||||||
${str}
|
${str}
|
||||||
</el-row>`
|
</el-row>`
|
||||||
}
|
}
|
||||||
return str
|
return str
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildFromBtns(conf, type) {
|
function buildFromBtns(conf, type) {
|
||||||
let str = ''
|
let str = ''
|
||||||
if (conf.formBtns && type === 'file') {
|
if (conf.formBtns && type === 'file') {
|
||||||
str = `<el-form-item size="large">
|
str = `<el-form-item size="large">
|
||||||
<el-button type="primary" @click="submitForm">提交</el-button>
|
<el-button type="primary" @click="submitForm">提交</el-button>
|
||||||
<el-button @click="resetForm">重置</el-button>
|
<el-button @click="resetForm">重置</el-button>
|
||||||
</el-form-item>`
|
</el-form-item>`
|
||||||
if (someSpanIsNot24) {
|
if (someSpanIsNot24) {
|
||||||
str = `<el-col :span="24">
|
str = `<el-col :span="24">
|
||||||
${str}
|
${str}
|
||||||
</el-col>`
|
</el-col>`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return str
|
return str
|
||||||
}
|
}
|
||||||
|
|
||||||
// span不为24的用el-col包裹
|
// span不为24的用el-col包裹
|
||||||
function colWrapper(element, str) {
|
function colWrapper(element, str) {
|
||||||
if (someSpanIsNot24 || element.span !== 24) {
|
if (someSpanIsNot24 || element.span !== 24) {
|
||||||
return `<el-col :span="${element.span}">
|
return `<el-col :span="${element.span}">
|
||||||
${str}
|
${str}
|
||||||
</el-col>`
|
</el-col>`
|
||||||
}
|
}
|
||||||
return str
|
return str
|
||||||
}
|
}
|
||||||
|
|
||||||
const layouts = {
|
const layouts = {
|
||||||
colFormItem(element) {
|
colFormItem(element) {
|
||||||
let labelWidth = ''
|
let labelWidth = ''
|
||||||
if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) {
|
if (element.labelWidth && element.labelWidth !== confGlobal.labelWidth) {
|
||||||
labelWidth = `label-width="${element.labelWidth}px"`
|
labelWidth = `label-width="${element.labelWidth}px"`
|
||||||
}
|
}
|
||||||
const required = !trigger[element.tag] && element.required ? 'required' : ''
|
const required = !trigger[element.tag] && element.required ? 'required' : ''
|
||||||
const tagDom = tags[element.tag] ? tags[element.tag](element) : null
|
const tagDom = tags[element.tag] ? tags[element.tag](element) : null
|
||||||
let str = `<el-form-item ${labelWidth} label="${element.label}" prop="${element.vModel}" ${required}>
|
let str = `<el-form-item ${labelWidth} label="${element.label}" prop="${element.vModel}" ${required}>
|
||||||
${tagDom}
|
${tagDom}
|
||||||
</el-form-item>`
|
</el-form-item>`
|
||||||
str = colWrapper(element, str)
|
str = colWrapper(element, str)
|
||||||
return str
|
return str
|
||||||
},
|
},
|
||||||
rowFormItem(element) {
|
rowFormItem(element) {
|
||||||
const type = element.type === 'default' ? '' : `type="${element.type}"`
|
const type = element.type === 'default' ? '' : `type="${element.type}"`
|
||||||
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.children.map(el => layouts[el.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>`
|
||||||
str = colWrapper(element, str)
|
str = colWrapper(element, str)
|
||||||
return str
|
return str
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const tags = {
|
const tags = {
|
||||||
'el-button': el => {
|
'el-button': el => {
|
||||||
const {
|
const {
|
||||||
tag, disabled
|
tag, disabled
|
||||||
} = attrBuilder(el)
|
} = attrBuilder(el)
|
||||||
const type = el.type ? `type="${el.type}"` : ''
|
const type = el.type ? `type="${el.type}"` : ''
|
||||||
const icon = el.icon ? `icon="${el.icon}"` : ''
|
const icon = el.icon ? `icon="${el.icon}"` : ''
|
||||||
const size = el.size ? `size="${el.size}"` : ''
|
const size = el.size ? `size="${el.size}"` : ''
|
||||||
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.tag} ${type} ${icon} ${size} ${disabled}>${child}</${el.tag}>`
|
||||||
},
|
},
|
||||||
'el-input': el => {
|
'el-input': el => {
|
||||||
const {
|
const {
|
||||||
disabled, vModel, clearable, placeholder, width
|
disabled, vModel, clearable, placeholder, width
|
||||||
} = attrBuilder(el)
|
} = attrBuilder(el)
|
||||||
const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : ''
|
const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : ''
|
||||||
const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : ''
|
const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : ''
|
||||||
const readonly = el.readonly ? 'readonly' : ''
|
const readonly = el.readonly ? 'readonly' : ''
|
||||||
const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : ''
|
const prefixIcon = el['prefix-icon'] ? `prefix-icon='${el['prefix-icon']}'` : ''
|
||||||
const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : ''
|
const suffixIcon = el['suffix-icon'] ? `suffix-icon='${el['suffix-icon']}'` : ''
|
||||||
const showPassword = el['show-password'] ? 'show-password' : ''
|
const showPassword = el['show-password'] ? 'show-password' : ''
|
||||||
const type = el.type ? `type="${el.type}"` : ''
|
const type = el.type ? `type="${el.type}"` : ''
|
||||||
const autosize = el.autosize && el.autosize.minRows
|
const autosize = el.autosize && el.autosize.minRows
|
||||||
? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"`
|
? `:autosize="{minRows: ${el.autosize.minRows}, maxRows: ${el.autosize.maxRows}}"`
|
||||||
: ''
|
: ''
|
||||||
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.tag} ${vModel} ${type} ${placeholder} ${maxlength} ${showWordLimit} ${readonly} ${disabled} ${clearable} ${prefixIcon} ${suffixIcon} ${showPassword} ${autosize} ${width}>${child}</${el.tag}>`
|
||||||
},
|
},
|
||||||
'el-input-number': el => {
|
'el-input-number': el => {
|
||||||
const { disabled, vModel, placeholder } = attrBuilder(el)
|
const { disabled, vModel, placeholder } = attrBuilder(el)
|
||||||
const controlsPosition = el['controls-position'] ? `controls-position=${el['controls-position']}` : ''
|
const controlsPosition = el['controls-position'] ? `controls-position=${el['controls-position']}` : ''
|
||||||
const min = el.min ? `:min='${el.min}'` : ''
|
const min = el.min ? `:min='${el.min}'` : ''
|
||||||
const max = el.max ? `:max='${el.max}'` : ''
|
const max = el.max ? `:max='${el.max}'` : ''
|
||||||
const step = el.step ? `:step='${el.step}'` : ''
|
const step = el.step ? `:step='${el.step}'` : ''
|
||||||
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.tag} ${vModel} ${placeholder} ${step} ${stepStrictly} ${precision} ${controlsPosition} ${min} ${max} ${disabled}></${el.tag}>`
|
||||||
},
|
},
|
||||||
'el-select': el => {
|
'el-select': el => {
|
||||||
const {
|
const {
|
||||||
disabled, vModel, clearable, placeholder, width
|
disabled, vModel, clearable, placeholder, width
|
||||||
} = attrBuilder(el)
|
} = attrBuilder(el)
|
||||||
const filterable = el.filterable ? 'filterable' : ''
|
const filterable = el.filterable ? 'filterable' : ''
|
||||||
const multiple = el.multiple ? 'multiple' : ''
|
const multiple = el.multiple ? 'multiple' : ''
|
||||||
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.tag} ${vModel} ${placeholder} ${disabled} ${multiple} ${filterable} ${clearable} ${width}>${child}</${el.tag}>`
|
||||||
},
|
},
|
||||||
'el-radio-group': el => {
|
'el-radio-group': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
const size = `size="${el.size}"`
|
const size = `size="${el.size}"`
|
||||||
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.tag} ${vModel} ${size} ${disabled}>${child}</${el.tag}>`
|
||||||
},
|
},
|
||||||
'el-checkbox-group': el => {
|
'el-checkbox-group': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
const size = `size="${el.size}"`
|
const size = `size="${el.size}"`
|
||||||
const min = el.min ? `:min="${el.min}"` : ''
|
const min = el.min ? `:min="${el.min}"` : ''
|
||||||
const max = el.max ? `:max="${el.max}"` : ''
|
const max = el.max ? `:max="${el.max}"` : ''
|
||||||
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.tag} ${vModel} ${min} ${max} ${size} ${disabled}>${child}</${el.tag}>`
|
||||||
},
|
},
|
||||||
'el-switch': el => {
|
'el-switch': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
const activeText = el['active-text'] ? `active-text="${el['active-text']}"` : ''
|
const activeText = el['active-text'] ? `active-text="${el['active-text']}"` : ''
|
||||||
const inactiveText = el['inactive-text'] ? `inactive-text="${el['inactive-text']}"` : ''
|
const inactiveText = el['inactive-text'] ? `inactive-text="${el['inactive-text']}"` : ''
|
||||||
const activeColor = el['active-color'] ? `active-color="${el['active-color']}"` : ''
|
const activeColor = el['active-color'] ? `active-color="${el['active-color']}"` : ''
|
||||||
const inactiveColor = el['inactive-color'] ? `inactive-color="${el['inactive-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 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.tag} ${vModel} ${activeText} ${inactiveText} ${activeColor} ${inactiveColor} ${activeValue} ${inactiveValue} ${disabled}></${el.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.tag} ${vModel} ${options} ${props} ${width} ${showAllLevels} ${placeholder} ${separator} ${filterable} ${clearable} ${disabled}></${el.tag}>`
|
||||||
},
|
},
|
||||||
'el-slider': el => {
|
'el-slider': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
const min = el.min ? `:min='${el.min}'` : ''
|
const min = el.min ? `:min='${el.min}'` : ''
|
||||||
const max = el.max ? `:max='${el.max}'` : ''
|
const max = el.max ? `:max='${el.max}'` : ''
|
||||||
const step = el.step ? `:step='${el.step}'` : ''
|
const step = el.step ? `:step='${el.step}'` : ''
|
||||||
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.tag} ${min} ${max} ${step} ${vModel} ${range} ${showStops} ${disabled}></${el.tag}>`
|
||||||
},
|
},
|
||||||
'el-time-picker': el => {
|
'el-time-picker': el => {
|
||||||
const {
|
const {
|
||||||
disabled, vModel, clearable, placeholder, width
|
disabled, vModel, clearable, placeholder, width
|
||||||
} = attrBuilder(el)
|
} = attrBuilder(el)
|
||||||
const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : ''
|
const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : ''
|
||||||
const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : ''
|
const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : ''
|
||||||
const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : ''
|
const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : ''
|
||||||
const isRange = el['is-range'] ? 'is-range' : ''
|
const isRange = el['is-range'] ? 'is-range' : ''
|
||||||
const format = el.format ? `format="${el.format}"` : ''
|
const format = el.format ? `format="${el.format}"` : ''
|
||||||
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.tag} ${vModel} ${isRange} ${format} ${valueFormat} ${pickerOptions} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${disabled}></${el.tag}>`
|
||||||
},
|
},
|
||||||
'el-date-picker': el => {
|
'el-date-picker': el => {
|
||||||
const {
|
const {
|
||||||
disabled, vModel, clearable, placeholder, width
|
disabled, vModel, clearable, placeholder, width
|
||||||
} = attrBuilder(el)
|
} = attrBuilder(el)
|
||||||
const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : ''
|
const startPlaceholder = el['start-placeholder'] ? `start-placeholder="${el['start-placeholder']}"` : ''
|
||||||
const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : ''
|
const endPlaceholder = el['end-placeholder'] ? `end-placeholder="${el['end-placeholder']}"` : ''
|
||||||
const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : ''
|
const rangeSeparator = el['range-separator'] ? `range-separator="${el['range-separator']}"` : ''
|
||||||
const format = el.format ? `format="${el.format}"` : ''
|
const format = el.format ? `format="${el.format}"` : ''
|
||||||
const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : ''
|
const valueFormat = el['value-format'] ? `value-format="${el['value-format']}"` : ''
|
||||||
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.tag} ${type} ${vModel} ${format} ${valueFormat} ${width} ${placeholder} ${startPlaceholder} ${endPlaceholder} ${rangeSeparator} ${clearable} ${readonly} ${disabled}></${el.tag}>`
|
||||||
},
|
},
|
||||||
'el-rate': el => {
|
'el-rate': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
const max = el.max ? `:max='${el.max}'` : ''
|
const max = el.max ? `:max='${el.max}'` : ''
|
||||||
const allowHalf = el['allow-half'] ? 'allow-half' : ''
|
const allowHalf = el['allow-half'] ? 'allow-half' : ''
|
||||||
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.tag} ${vModel} ${allowHalf} ${showText} ${showScore} ${disabled}></${el.tag}>`
|
||||||
},
|
},
|
||||||
'el-color-picker': el => {
|
'el-color-picker': el => {
|
||||||
const { disabled, vModel } = attrBuilder(el)
|
const { disabled, vModel } = attrBuilder(el)
|
||||||
const size = `size="${el.size}"`
|
const size = `size="${el.size}"`
|
||||||
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.tag} ${vModel} ${size} ${showAlpha} ${colorFormat} ${disabled}></${el.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.tag} ${ref} ${fileList} ${action} ${autoUpload} ${multiple} ${beforeUpload} ${listType} ${accept} ${name} ${disabled}>${child}</${el.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%\'}"' : '',
|
||||||
disabled: el.disabled ? ':disabled=\'true\'' : ''
|
disabled: el.disabled ? ':disabled=\'true\'' : ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// el-buttin 子级
|
// el-buttin 子级
|
||||||
function buildElButtonChild(conf) {
|
function buildElButtonChild(conf) {
|
||||||
const children = []
|
const children = []
|
||||||
if (conf.default) {
|
if (conf.default) {
|
||||||
children.push(conf.default)
|
children.push(conf.default)
|
||||||
}
|
}
|
||||||
return children.join('\n')
|
return children.join('\n')
|
||||||
}
|
}
|
||||||
|
|
||||||
// el-input innerHTML
|
// el-input innerHTML
|
||||||
function buildElInputChild(conf) {
|
function buildElInputChild(conf) {
|
||||||
const children = []
|
const children = []
|
||||||
if (conf.prepend) {
|
if (conf.prepend) {
|
||||||
children.push(`<template slot="prepend">${conf.prepend}</template>`)
|
children.push(`<template slot="prepend">${conf.prepend}</template>`)
|
||||||
}
|
}
|
||||||
if (conf.append) {
|
if (conf.append) {
|
||||||
children.push(`<template slot="append">${conf.append}</template>`)
|
children.push(`<template slot="append">${conf.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.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>`)
|
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.options && conf.options.length) {
|
||||||
const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio'
|
const tag = conf.optionType === 'button' ? 'el-radio-button' : 'el-radio'
|
||||||
const border = conf.border ? 'border' : ''
|
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}>`)
|
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.options && conf.options.length) {
|
||||||
const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox'
|
const tag = conf.optionType === 'button' ? 'el-checkbox-button' : 'el-checkbox'
|
||||||
const border = conf.border ? 'border' : ''
|
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}>`)
|
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 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.buttonText}</el-button>`)
|
||||||
if (conf.showTip) list.push(`<div slot="tip" class="el-upload__tip">只能上传不超过 ${conf.fileSize}${conf.sizeUnit} 的${conf.accept}文件</div>`)
|
if (conf.showTip) list.push(`<div slot="tip" class="el-upload__tip">只能上传不超过 ${conf.fileSize}${conf.sizeUnit} 的${conf.accept}文件</div>`)
|
||||||
return list.join('\n')
|
return list.join('\n')
|
||||||
}
|
}
|
||||||
|
|
||||||
export function makeUpHtml(conf, type) {
|
export function makeUpHtml(conf, type) {
|
||||||
const htmlList = []
|
const htmlList = []
|
||||||
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.layout](el))
|
||||||
})
|
})
|
||||||
const htmlStr = htmlList.join('\n')
|
const htmlStr = htmlList.join('\n')
|
||||||
|
|
||||||
let temp = buildFormTemplate(conf, htmlStr, type)
|
let temp = buildFormTemplate(conf, htmlStr, type)
|
||||||
if (type === 'dialog') {
|
if (type === 'dialog') {
|
||||||
temp = dialogWrapper(temp)
|
temp = dialogWrapper(temp)
|
||||||
}
|
}
|
||||||
confGlobal = null
|
confGlobal = null
|
||||||
return temp
|
return temp
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,236 +1,236 @@
|
|||||||
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 './config'
|
||||||
|
|
||||||
const units = {
|
const units = {
|
||||||
KB: '1024',
|
KB: '1024',
|
||||||
MB: '1024 / 1024',
|
MB: '1024 / 1024',
|
||||||
GB: '1024 / 1024 / 1024'
|
GB: '1024 / 1024 / 1024'
|
||||||
}
|
}
|
||||||
let confGlobal
|
let confGlobal
|
||||||
const inheritAttrs = {
|
const inheritAttrs = {
|
||||||
file: '',
|
file: '',
|
||||||
dialog: 'inheritAttrs: false,'
|
dialog: 'inheritAttrs: false,'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export function makeUpJs(conf, type) {
|
export function makeUpJs(conf, type) {
|
||||||
confGlobal = conf = JSON.parse(JSON.stringify(conf))
|
confGlobal = conf = JSON.parse(JSON.stringify(conf))
|
||||||
const dataList = []
|
const dataList = []
|
||||||
const ruleList = []
|
const ruleList = []
|
||||||
const optionsList = []
|
const optionsList = []
|
||||||
const propsList = []
|
const propsList = []
|
||||||
const methodList = mixinMethod(type)
|
const methodList = mixinMethod(type)
|
||||||
const uploadVarList = []
|
const uploadVarList = []
|
||||||
|
|
||||||
conf.fields.forEach(el => {
|
conf.fields.forEach(el => {
|
||||||
buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList)
|
buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList)
|
||||||
})
|
})
|
||||||
|
|
||||||
const script = buildexport(
|
const script = buildexport(
|
||||||
conf,
|
conf,
|
||||||
type,
|
type,
|
||||||
dataList.join('\n'),
|
dataList.join('\n'),
|
||||||
ruleList.join('\n'),
|
ruleList.join('\n'),
|
||||||
optionsList.join('\n'),
|
optionsList.join('\n'),
|
||||||
uploadVarList.join('\n'),
|
uploadVarList.join('\n'),
|
||||||
propsList.join('\n'),
|
propsList.join('\n'),
|
||||||
methodList.join('\n')
|
methodList.join('\n')
|
||||||
)
|
)
|
||||||
confGlobal = null
|
confGlobal = null
|
||||||
return script
|
return script
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) {
|
function buildAttributes(el, dataList, ruleList, optionsList, methodList, propsList, uploadVarList) {
|
||||||
buildData(el, dataList)
|
buildData(el, dataList)
|
||||||
buildRules(el, ruleList)
|
buildRules(el, ruleList)
|
||||||
|
|
||||||
if (el.options && el.options.length) {
|
if (el.options && el.options.length) {
|
||||||
buildOptions(el, optionsList)
|
buildOptions(el, optionsList)
|
||||||
if (el.dataType === 'dynamic') {
|
if (el.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.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']) {
|
||||||
methodList.push(buildSubmitUpload(el))
|
methodList.push(buildSubmitUpload(el))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (el.children) {
|
if (el.children) {
|
||||||
el.children.forEach(el2 => {
|
el.children.forEach(el2 => {
|
||||||
buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList)
|
buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function mixinMethod(type) {
|
function mixinMethod(type) {
|
||||||
const list = []; const
|
const list = []; const
|
||||||
minxins = {
|
minxins = {
|
||||||
file: confGlobal.formBtns ? {
|
file: confGlobal.formBtns ? {
|
||||||
submitForm: `submitForm() {
|
submitForm: `submitForm() {
|
||||||
this.$refs['${confGlobal.formRef}'].validate(valid => {
|
this.$refs['${confGlobal.formRef}'].validate(valid => {
|
||||||
if(!valid) return
|
if(!valid) return
|
||||||
// TODO 提交表单
|
// TODO 提交表单
|
||||||
})
|
})
|
||||||
},`,
|
},`,
|
||||||
resetForm: `resetForm() {
|
resetForm: `resetForm() {
|
||||||
this.$refs['${confGlobal.formRef}'].resetFields()
|
this.$refs['${confGlobal.formRef}'].resetFields()
|
||||||
},`
|
},`
|
||||||
} : null,
|
} : null,
|
||||||
dialog: {
|
dialog: {
|
||||||
onOpen: 'onOpen() {},',
|
onOpen: 'onOpen() {},',
|
||||||
onClose: `onClose() {
|
onClose: `onClose() {
|
||||||
this.$refs['${confGlobal.formRef}'].resetFields()
|
this.$refs['${confGlobal.formRef}'].resetFields()
|
||||||
},`,
|
},`,
|
||||||
close: `close() {
|
close: `close() {
|
||||||
this.$emit('update:visible', false)
|
this.$emit('update:visible', false)
|
||||||
},`,
|
},`,
|
||||||
handelConfirm: `handelConfirm() {
|
handleConfirm: `handleConfirm() {
|
||||||
this.$refs['${confGlobal.formRef}'].validate(valid => {
|
this.$refs['${confGlobal.formRef}'].validate(valid => {
|
||||||
if(!valid) return
|
if(!valid) return
|
||||||
this.close()
|
this.close()
|
||||||
})
|
})
|
||||||
},`
|
},`
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const methods = minxins[type]
|
const methods = minxins[type]
|
||||||
if (methods) {
|
if (methods) {
|
||||||
Object.keys(methods).forEach(key => {
|
Object.keys(methods).forEach(key => {
|
||||||
list.push(methods[key])
|
list.push(methods[key])
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
return list
|
return list
|
||||||
}
|
}
|
||||||
|
|
||||||
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.defaultValue) === 'string' && !conf.multiple) {
|
||||||
defaultValue = `'${conf.defaultValue}'`
|
defaultValue = `'${conf.defaultValue}'`
|
||||||
} else {
|
} else {
|
||||||
defaultValue = `${JSON.stringify(conf.defaultValue)}`
|
defaultValue = `${JSON.stringify(conf.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.tag]) {
|
||||||
if (conf.required) {
|
if (conf.required) {
|
||||||
const type = isArray(conf.defaultValue) ? 'type: \'array\',' : ''
|
const type = isArray(conf.defaultValue) ? 'type: \'array\',' : ''
|
||||||
let message = isArray(conf.defaultValue) ? `请至少选择一个${conf.vModel}` : conf.placeholder
|
let message = isArray(conf.defaultValue) ? `请至少选择一个${conf.vModel}` : conf.placeholder
|
||||||
if (message === undefined) message = `${conf.label}不能为空`
|
if (message === undefined) message = `${conf.label}不能为空`
|
||||||
rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`)
|
rules.push(`{ required: true, ${type} message: '${message}', trigger: '${trigger[conf.tag]}' }`)
|
||||||
}
|
}
|
||||||
if (conf.regList && isArray(conf.regList)) {
|
if (conf.regList && isArray(conf.regList)) {
|
||||||
conf.regList.forEach(item => {
|
conf.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.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.dataType === 'dynamic') { conf.options = [] }
|
||||||
const str = `${conf.vModel}Options: ${JSON.stringify(conf.options)},`
|
const str = `${conf.vModel}Options: ${JSON.stringify(conf.options)},`
|
||||||
optionsList.push(str)
|
optionsList.push(str)
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildProps(conf, propsList) {
|
function buildProps(conf, propsList) {
|
||||||
if (conf.dataType === 'dynamic') {
|
if (conf.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.sizeUnit]; let rightSizeCode = ''; let acceptCode = ''; const
|
||||||
returnList = []
|
returnList = []
|
||||||
if (conf.fileSize) {
|
if (conf.fileSize) {
|
||||||
rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize}
|
rightSizeCode = `let isRightSize = file.size / ${unitNum} < ${conf.fileSize}
|
||||||
if(!isRightSize){
|
if(!isRightSize){
|
||||||
this.$message.error('文件大小超过 ${conf.fileSize}${conf.sizeUnit}')
|
this.$message.error('文件大小超过 ${conf.fileSize}${conf.sizeUnit}')
|
||||||
}`
|
}`
|
||||||
returnList.push('isRightSize')
|
returnList.push('isRightSize')
|
||||||
}
|
}
|
||||||
if (conf.accept) {
|
if (conf.accept) {
|
||||||
acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type)
|
acceptCode = `let isAccept = new RegExp('${conf.accept}').test(file.type)
|
||||||
if(!isAccept){
|
if(!isAccept){
|
||||||
this.$message.error('应该选择${conf.accept}类型的文件')
|
this.$message.error('应该选择${conf.accept}类型的文件')
|
||||||
}`
|
}`
|
||||||
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('&&')}
|
||||||
},`
|
},`
|
||||||
return returnList.length ? str : ''
|
return returnList.length ? str : ''
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildOptionMethod(methodName, model, methodList) {
|
function buildOptionMethod(methodName, model, methodList) {
|
||||||
const str = `${methodName}() {
|
const str = `${methodName}() {
|
||||||
// TODO 发起请求获取数据
|
// TODO 发起请求获取数据
|
||||||
this.${model}
|
this.${model}
|
||||||
},`
|
},`
|
||||||
methodList.push(str)
|
methodList.push(str)
|
||||||
}
|
}
|
||||||
|
|
||||||
function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) {
|
function buildexport(conf, type, data, rules, selectOptions, uploadVar, props, methods) {
|
||||||
const str = `${exportDefault}{
|
const str = `${exportDefault}{
|
||||||
${inheritAttrs[type]}
|
${inheritAttrs[type]}
|
||||||
components: {},
|
components: {},
|
||||||
props: [],
|
props: [],
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
${conf.formModel}: {
|
${conf.formModel}: {
|
||||||
${data}
|
${data}
|
||||||
},
|
},
|
||||||
${conf.formRules}: {
|
${conf.formRules}: {
|
||||||
${rules}
|
${rules}
|
||||||
},
|
},
|
||||||
${uploadVar}
|
${uploadVar}
|
||||||
${selectOptions}
|
${selectOptions}
|
||||||
${props}
|
${props}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {},
|
computed: {},
|
||||||
watch: {},
|
watch: {},
|
||||||
created () {},
|
created () {},
|
||||||
mounted () {},
|
mounted () {},
|
||||||
methods: {
|
methods: {
|
||||||
${methods}
|
${methods}
|
||||||
}
|
}
|
||||||
}`
|
}`
|
||||||
return str
|
return str
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,106 +1,106 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-dialog
|
<el-dialog
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
width="500px"
|
width="500px"
|
||||||
:close-on-click-modal="false"
|
:close-on-click-modal="false"
|
||||||
:modal-append-to-body="false"
|
:modal-append-to-body="false"
|
||||||
v-on="$listeners"
|
v-on="$listeners"
|
||||||
@open="onOpen"
|
@open="onOpen"
|
||||||
@close="onClose"
|
@close="onClose"
|
||||||
>
|
>
|
||||||
<el-row :gutter="15">
|
<el-row :gutter="15">
|
||||||
<el-form
|
<el-form
|
||||||
ref="elForm"
|
ref="elForm"
|
||||||
:model="formData"
|
:model="formData"
|
||||||
:rules="rules"
|
:rules="rules"
|
||||||
size="medium"
|
size="medium"
|
||||||
label-width="100px"
|
label-width="100px"
|
||||||
>
|
>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item label="生成类型" prop="type">
|
<el-form-item label="生成类型" prop="type">
|
||||||
<el-radio-group v-model="formData.type">
|
<el-radio-group v-model="formData.type">
|
||||||
<el-radio-button
|
<el-radio-button
|
||||||
v-for="(item, index) in typeOptions"
|
v-for="(item, index) in typeOptions"
|
||||||
:key="index"
|
:key="index"
|
||||||
:label="item.value"
|
:label="item.value"
|
||||||
:disabled="item.disabled"
|
:disabled="item.disabled"
|
||||||
>
|
>
|
||||||
{{ item.label }}
|
{{ item.label }}
|
||||||
</el-radio-button>
|
</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-if="showFileName" label="文件名" prop="fileName">
|
<el-form-item v-if="showFileName" label="文件名" prop="fileName">
|
||||||
<el-input v-model="formData.fileName" placeholder="请输入文件名" clearable />
|
<el-input v-model="formData.fileName" placeholder="请输入文件名" clearable />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<div slot="footer">
|
<div slot="footer">
|
||||||
<el-button @click="close">
|
<el-button @click="close">
|
||||||
取消
|
取消
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button type="primary" @click="handelConfirm">
|
<el-button type="primary" @click="handleConfirm">
|
||||||
确定
|
确定
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
inheritAttrs: false,
|
inheritAttrs: false,
|
||||||
props: ['showFileName'],
|
props: ['showFileName'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
formData: {
|
formData: {
|
||||||
fileName: undefined,
|
fileName: undefined,
|
||||||
type: 'file'
|
type: 'file'
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
fileName: [{
|
fileName: [{
|
||||||
required: true,
|
required: true,
|
||||||
message: '请输入文件名',
|
message: '请输入文件名',
|
||||||
trigger: 'blur'
|
trigger: 'blur'
|
||||||
}],
|
}],
|
||||||
type: [{
|
type: [{
|
||||||
required: true,
|
required: true,
|
||||||
message: '生成类型不能为空',
|
message: '生成类型不能为空',
|
||||||
trigger: 'change'
|
trigger: 'change'
|
||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
typeOptions: [{
|
typeOptions: [{
|
||||||
label: '页面',
|
label: '页面',
|
||||||
value: 'file'
|
value: 'file'
|
||||||
}, {
|
}, {
|
||||||
label: '弹窗',
|
label: '弹窗',
|
||||||
value: 'dialog'
|
value: 'dialog'
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
},
|
},
|
||||||
watch: {},
|
watch: {},
|
||||||
mounted() {},
|
mounted() {},
|
||||||
methods: {
|
methods: {
|
||||||
onOpen() {
|
onOpen() {
|
||||||
if (this.showFileName) {
|
if (this.showFileName) {
|
||||||
this.formData.fileName = `${+new Date()}.vue`
|
this.formData.fileName = `${+new Date()}.vue`
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onClose() {
|
onClose() {
|
||||||
},
|
},
|
||||||
close(e) {
|
close(e) {
|
||||||
this.$emit('update:visible', false)
|
this.$emit('update:visible', false)
|
||||||
},
|
},
|
||||||
handelConfirm() {
|
handleConfirm() {
|
||||||
this.$refs.elForm.validate(valid => {
|
this.$refs.elForm.validate(valid => {
|
||||||
if (!valid) return
|
if (!valid) return
|
||||||
this.$emit('confirm', { ...this.formData })
|
this.$emit('confirm', { ...this.formData })
|
||||||
this.close()
|
this.close()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -1,149 +1,149 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-dialog
|
<el-dialog
|
||||||
v-bind="$attrs"
|
v-bind="$attrs"
|
||||||
:close-on-click-modal="false"
|
:close-on-click-modal="false"
|
||||||
:modal-append-to-body="false"
|
:modal-append-to-body="false"
|
||||||
v-on="$listeners"
|
v-on="$listeners"
|
||||||
@open="onOpen"
|
@open="onOpen"
|
||||||
@close="onClose"
|
@close="onClose"
|
||||||
>
|
>
|
||||||
<el-row :gutter="0">
|
<el-row :gutter="0">
|
||||||
<el-form
|
<el-form
|
||||||
ref="elForm"
|
ref="elForm"
|
||||||
:model="formData"
|
:model="formData"
|
||||||
:rules="rules"
|
:rules="rules"
|
||||||
size="small"
|
size="small"
|
||||||
label-width="100px"
|
label-width="100px"
|
||||||
>
|
>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="选项名"
|
label="选项名"
|
||||||
prop="label"
|
prop="label"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="formData.label"
|
v-model="formData.label"
|
||||||
placeholder="请输入选项名"
|
placeholder="请输入选项名"
|
||||||
clearable
|
clearable
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24">
|
<el-col :span="24">
|
||||||
<el-form-item
|
<el-form-item
|
||||||
label="选项值"
|
label="选项值"
|
||||||
prop="value"
|
prop="value"
|
||||||
>
|
>
|
||||||
<el-input
|
<el-input
|
||||||
v-model="formData.value"
|
v-model="formData.value"
|
||||||
placeholder="请输入选项值"
|
placeholder="请输入选项值"
|
||||||
clearable
|
clearable
|
||||||
>
|
>
|
||||||
<el-select
|
<el-select
|
||||||
slot="append"
|
slot="append"
|
||||||
v-model="dataType"
|
v-model="dataType"
|
||||||
:style="{width: '100px'}"
|
:style="{width: '100px'}"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="(item, index) in dataTypeOptions"
|
v-for="(item, index) in dataTypeOptions"
|
||||||
:key="index"
|
:key="index"
|
||||||
:label="item.label"
|
:label="item.label"
|
||||||
:value="item.value"
|
:value="item.value"
|
||||||
:disabled="item.disabled"
|
:disabled="item.disabled"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-form>
|
</el-form>
|
||||||
</el-row>
|
</el-row>
|
||||||
<div slot="footer">
|
<div slot="footer">
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
@click="handelConfirm"
|
@click="handleConfirm"
|
||||||
>
|
>
|
||||||
确定
|
确定
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button @click="close">
|
<el-button @click="close">
|
||||||
取消
|
取消
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import { isNumberStr } from '@/utils/index'
|
import { isNumberStr } from '@/utils/index'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {},
|
components: {},
|
||||||
inheritAttrs: false,
|
inheritAttrs: false,
|
||||||
props: [],
|
props: [],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
id: 100,
|
id: 100,
|
||||||
formData: {
|
formData: {
|
||||||
label: undefined,
|
label: undefined,
|
||||||
value: undefined
|
value: undefined
|
||||||
},
|
},
|
||||||
rules: {
|
rules: {
|
||||||
label: [
|
label: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
message: '请输入选项名',
|
message: '请输入选项名',
|
||||||
trigger: 'blur'
|
trigger: 'blur'
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
value: [
|
value: [
|
||||||
{
|
{
|
||||||
required: true,
|
required: true,
|
||||||
message: '请输入选项值',
|
message: '请输入选项值',
|
||||||
trigger: 'blur'
|
trigger: 'blur'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
dataType: 'string',
|
dataType: 'string',
|
||||||
dataTypeOptions: [
|
dataTypeOptions: [
|
||||||
{
|
{
|
||||||
label: '字符串',
|
label: '字符串',
|
||||||
value: 'string'
|
value: 'string'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '数字',
|
label: '数字',
|
||||||
value: 'number'
|
value: 'number'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {},
|
computed: {},
|
||||||
watch: {
|
watch: {
|
||||||
// eslint-disable-next-line func-names
|
// eslint-disable-next-line func-names
|
||||||
'formData.value': function (val) {
|
'formData.value': function (val) {
|
||||||
this.dataType = isNumberStr(val) ? 'number' : 'string'
|
this.dataType = isNumberStr(val) ? 'number' : 'string'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {},
|
created() {},
|
||||||
mounted() {},
|
mounted() {},
|
||||||
methods: {
|
methods: {
|
||||||
onOpen() {
|
onOpen() {
|
||||||
this.formData = {
|
this.formData = {
|
||||||
label: undefined,
|
label: undefined,
|
||||||
value: undefined
|
value: undefined
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onClose() {},
|
onClose() {},
|
||||||
close() {
|
close() {
|
||||||
this.$emit('update:visible', false)
|
this.$emit('update:visible', false)
|
||||||
},
|
},
|
||||||
handelConfirm() {
|
handleConfirm() {
|
||||||
this.$refs.elForm.validate(valid => {
|
this.$refs.elForm.validate(valid => {
|
||||||
if (!valid) return
|
if (!valid) return
|
||||||
if (this.dataType === 'number') {
|
if (this.dataType === 'number') {
|
||||||
this.formData.value = parseFloat(this.formData.value)
|
this.formData.value = parseFloat(this.formData.value)
|
||||||
}
|
}
|
||||||
this.formData.id = this.id++
|
this.formData.id = this.id++
|
||||||
this.$emit('commit', this.formData)
|
this.$emit('commit', this.formData)
|
||||||
this.close()
|
this.close()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -146,7 +146,7 @@ import { beautifierConf, titleCase } from '@/utils/index'
|
|||||||
import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html'
|
import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/html'
|
||||||
import { makeUpJs } from '@/utils/generator/js'
|
import { makeUpJs } from '@/utils/generator/js'
|
||||||
import { makeUpCss } from '@/utils/generator/css'
|
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 logo from '@/assets/logo/logo.png'
|
||||||
import CodeTypeDialog from './CodeTypeDialog'
|
import CodeTypeDialog from './CodeTypeDialog'
|
||||||
import DraggableItem from './DraggableItem'
|
import DraggableItem from './DraggableItem'
|
||||||
@ -171,15 +171,15 @@ export default {
|
|||||||
selectComponents,
|
selectComponents,
|
||||||
layoutComponents,
|
layoutComponents,
|
||||||
labelWidth: 100,
|
labelWidth: 100,
|
||||||
drawingList: drawingDefalut,
|
drawingList: drawingDefault,
|
||||||
drawingData: {},
|
drawingData: {},
|
||||||
activeId: drawingDefalut[0].formId,
|
activeId: drawingDefault[0].formId,
|
||||||
drawerVisible: false,
|
drawerVisible: false,
|
||||||
formData: {},
|
formData: {},
|
||||||
dialogVisible: false,
|
dialogVisible: false,
|
||||||
generateConf: null,
|
generateConf: null,
|
||||||
showFileName: false,
|
showFileName: false,
|
||||||
activeData: drawingDefalut[0]
|
activeData: drawingDefault[0]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|||||||
@ -159,7 +159,7 @@ export default {
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
const tableId = this.$route.query && this.$route.query.tableId;
|
const tableId = this.$route.params && this.$route.params.tableId;
|
||||||
if (tableId) {
|
if (tableId) {
|
||||||
// 获取表详细信息
|
// 获取表详细信息
|
||||||
getGenTable(tableId).then(res => {
|
getGenTable(tableId).then(res => {
|
||||||
|
|||||||
@ -321,7 +321,7 @@ export default {
|
|||||||
/** 修改按钮操作 */
|
/** 修改按钮操作 */
|
||||||
handleEditTable(row) {
|
handleEditTable(row) {
|
||||||
const tableId = row.tableId || this.ids[0];
|
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) {
|
handleDelete(row) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user