Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pre Merge pull request !483 from ZG4vin/master

Browse Source
This commit is contained in:
ZG4vin 2022-05-05 16:19:19 +00:00 committed by Gitee
commit 1b5866f407
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,7 @@
#else
#set($comment=$column.columnComment)
#end
#if($column.pk)
#if($column.pkColumn)
#elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
<template slot-scope="scope">
@ -169,7 +169,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns)
#set($field=$column.javaField)
#if($column.insert && !$column.pk)
#if($column.insert && !$column.pkColumn)
#if(($column.usableColumn) || (!$column.superColumn))
#set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1)

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

@ -123,7 +123,7 @@
#else
#set($comment=$column.columnComment)
#end
#if($column.pk)
#if($column.pkColumn)
<el-table-column label="${comment}" align="center" prop="${javaField}" />
#elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
@ -184,7 +184,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns)
#set($field=$column.javaField)
#if($column.insert && !$column.pk)
#if($column.insert && !$column.pkColumn)
#if(($column.usableColumn) || (!$column.superColumn))
#set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1)
@ -299,7 +299,7 @@
#else
#set($comment=$column.columnComment)
#end
#if($column.pk || $javaField == ${subTableFkclassName})
#if($column.pkColumn || $javaField == ${subTableFkclassName})
#elseif($column.list && $column.htmlType == "input")
<el-table-column label="$comment" prop="${javaField}" width="150">
<template slot-scope="scope">
@ -563,7 +563,7 @@ export default {
handleAdd${subClassName}() {
let obj = {};
#foreach($column in $subTable.columns)
#if($column.pk || $column.javaField == ${subTableFkclassName})
#if($column.pkColumn || $column.javaField == ${subTableFkclassName})
#elseif($column.list && "" != $javaField)
obj.$column.javaField = "";
#end

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

@ -103,7 +103,7 @@
#else
#set($comment=$column.columnComment)
#end
#if($column.pk)
#if($column.pkColumn)
#elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
<template #default="scope">
@ -163,7 +163,7 @@
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns)
#set($field=$column.javaField)
#if($column.insert && !$column.pk)
#if($column.insert && !$column.pkColumn)
#if(($column.usableColumn) || (!$column.superColumn))
#set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1)

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

@ -118,7 +118,7 @@
#else
#set($comment=$column.columnComment)
#end
#if($column.pk)
#if($column.pkColumn)
<el-table-column label="${comment}" align="center" prop="${javaField}" />
#elseif($column.list && $column.htmlType == "datetime")
<el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
@ -177,7 +177,7 @@
<el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
#foreach($column in $columns)
#set($field=$column.javaField)
#if($column.insert && !$column.pk)
#if($column.insert && !$column.pkColumn)
#if(($column.usableColumn) || (!$column.superColumn))
#set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1)
@ -292,7 +292,7 @@
#else
#set($comment=$column.columnComment)
#end
#if($column.pk || $javaField == ${subTableFkclassName})
#if($column.pkColumn || $javaField == ${subTableFkclassName})
#elseif($column.list && $column.htmlType == "input")
<el-table-column label="$comment" prop="${javaField}" width="150">
<template #default="scope">
@ -558,7 +558,7 @@ function row${subClassName}Index({ row, rowIndex }) {
function handleAdd${subClassName}() {
let obj = {};
#foreach($column in $subTable.columns)
#if($column.pk || $column.javaField == ${subTableFkclassName})
#if($column.pkColumn || $column.javaField == ${subTableFkclassName})
#elseif($column.list && "" != $javaField)
obj.$column.javaField = "";
#end