wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update 移除 基础类 字段生成判断

This commit is contained in:
疯狂的狮子li 2021-06-12 23:40:34 +08:00
parent 8349e631d2
commit a044519b21
2 changed files with 552 additions and 556 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
View File

@ -148,7 +148,6 @@
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert && !$column.pk) #if($column.insert && !$column.pk)
#if(($column.usableColumn) || (!$column.superColumn))
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex)) #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@ -243,7 +242,6 @@
</el-form-item> </el-form-item>
#end #end
#end #end
#end
#end #end
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -259,19 +257,19 @@ import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${Busin
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") #if($column.insert && !$column.pk && $column.htmlType == "imageUpload")
import ImageUpload from '@/components/ImageUpload'; import ImageUpload from '@/components/ImageUpload';
#break #break
#end #end
#end #end
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload") #if($column.insert && !$column.pk && $column.htmlType == "fileUpload")
import FileUpload from '@/components/FileUpload'; import FileUpload from '@/components/FileUpload';
#break #break
#end #end
#end #end
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") #if($column.insert && !$column.pk && $column.htmlType == "editor")
import Editor from '@/components/Editor'; import Editor from '@/components/Editor';
#break #break
#end #end
@ -281,19 +279,19 @@ export default {
name: "${BusinessName}", name: "${BusinessName}",
components: { components: {
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") #if($column.insert && !$column.pk && $column.htmlType == "imageUpload")
ImageUpload, ImageUpload,
#break #break
#end #end
#end #end
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload") #if($column.insert && !$column.pk && $column.htmlType == "fileUpload")
FileUpload, FileUpload,
#break #break
#end #end
#end #end
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") #if($column.insert && !$column.pk && $column.htmlType == "editor")
Editor, Editor,
#break #break
#end #end

14
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -174,7 +174,6 @@
#foreach($column in $columns) #foreach($column in $columns)
#set($field=$column.javaField) #set($field=$column.javaField)
#if($column.insert && !$column.pk) #if($column.insert && !$column.pk)
#if(($column.usableColumn) || (!$column.superColumn))
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex)) #set($comment=$column.columnComment.substring(0, $parentheseIndex))
@ -266,7 +265,6 @@
#end #end
#end #end
#end #end
#end
#if($table.sub) #if($table.sub)
<el-divider content-position="center">${subTable.functionName}信息</el-divider> <el-divider content-position="center">${subTable.functionName}信息</el-divider>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
@ -311,19 +309,19 @@
<script> <script>
import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}"; import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") #if($column.insert && !$column.pk && $column.htmlType == "imageUpload")
import ImageUpload from '@/components/ImageUpload'; import ImageUpload from '@/components/ImageUpload';
#break #break
#end #end
#end #end
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload") #if($column.insert && !$column.pk && $column.htmlType == "fileUpload")
import FileUpload from '@/components/FileUpload'; import FileUpload from '@/components/FileUpload';
#break #break
#end #end
#end #end
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") #if($column.insert && !$column.pk && $column.htmlType == "editor")
import Editor from '@/components/Editor'; import Editor from '@/components/Editor';
#break #break
#end #end
@ -333,19 +331,19 @@ export default {
name: "${BusinessName}", name: "${BusinessName}",
components: { components: {
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "imageUpload") #if($column.insert && !$column.pk && $column.htmlType == "imageUpload")
ImageUpload, ImageUpload,
#break #break
#end #end
#end #end
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "fileUpload") #if($column.insert && !$column.pk && $column.htmlType == "fileUpload")
FileUpload, FileUpload,
#break #break
#end #end
#end #end
#foreach($column in $columns) #foreach($column in $columns)
#if($column.insert && !$column.superColumn && !$column.pk && $column.htmlType == "editor") #if($column.insert && !$column.pk && $column.htmlType == "editor")
Editor, Editor,
#break #break
#end #end