Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

Conflicts: ruoyi-ui/package.json ruoyi-ui/src/components/RuoYi/Git/index.vue ruoyi-ui/src/layout/components/Navbar.vue ruoyi-ui/src/main.js ruoyi-ui/src/utils/index.js ruoyi-ui/src/utils/permission.js ruoyi-ui/src/utils/ruoyi.js ruoyi-ui/src/views/system/dept/index.vue ruoyi-ui/src/views/system/menu/index.vue ruoyi-ui/src/views/tool/build/index.vue ruoyi-ui/src/views/tool/gen/genInfoForm.vue ruoyi/pom.xml ruoyi/src/main/java/com/ruoyi/common/constant/GenConstants.java ruoyi/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java ruoyi/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java ruoyi/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java ruoyi/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java ruoyi/src/main/resources/application.yml ruoyi/src/main/resources/mybatis/monitor/SysLogininforMapper.xml ruoyi/src/main/resources/mybatis/monitor/SysOperLogMapper.xml ruoyi/src/main/resources/vm/java/controller.java.vm ruoyi/src/main/resources/vm/java/domain.java.vm ruoyi/src/main/resources/vm/vue/index.vue.vm
2020-02-24 09:56:22 +08:00
parent c9527fcf42 cb0a4b78ee
commit 6687efd887
61 changed files with 4178 additions and 76 deletions
@@ -22,7 +22,7 @@
        />
      </el-form-item>
 #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-        <el-form-item label="${comment}" prop="${column.javaField}">
+      <el-form-item label="${comment}" prop="${column.javaField}">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
          <el-option
            v-for="dict in ${column.javaField}Options"
@@ -33,7 +33,7 @@
        </el-select>
      </el-form-item>
 #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-        <el-form-item label="${comment}" prop="${column.javaField}">
+      <el-form-item label="${comment}" prop="${column.javaField}">
        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
          <el-option label="请选择字典生成" value="" />
        </el-select>
@@ -230,6 +230,7 @@
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";

 export default {
+  name: "${BusinessName}",
  data() {
    return {
      // 遮罩层
@@ -288,6 +289,7 @@ export default {
        $column.javaField: [
          { required: true, message: "$comment不能为空", trigger: "blur" }
        ]#if($velocityCount != $columns.size()),#end
+
 #end
 #end
      }