From bc7888b5a2de8c93c2b9b2bca0828783234bfa76 Mon Sep 17 00:00:00 2001
From: ZG4vin <doggod0102@163.com>
Date: Fri, 6 May 2022 00:15:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=97=B6?=
=?UTF-8?q?=EF=BC=8Cvue=E9=A1=B5=E9=9D=A2=E4=B8=BB=E9=94=AE=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E4=B8=8D=E7=AD=9B=E9=80=89=E6=98=AF=E5=90=A6=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=EF=BC=8C=E9=9C=80=E5=B0=86=E6=89=80=E6=9C=89vue?=
=?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=AD=E7=9A=84column.pk=20->=20column.pkC?=
=?UTF-8?q?olumn=20=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/vm/vue/index-tree.vue.vm | 4 ++--
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 8 ++++----
.../src/main/resources/vm/vue/v3/index-tree.vue.vm | 4 ++--
ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index 9d29aceed..8fac7cbdb 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -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)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 8daa05ecc..9de637b35 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -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
diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
index 862297c79..41eb4e348 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
@@ -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)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
index a363ef364..eadb181ca 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
@@ -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