From 2f558094d133549b7e1867c6f9d674ec04cef360 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 三月 2023 23:32:29 +0800
Subject: [PATCH] fix 修复 !pr292 相关问题 并优化写法
---
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
index 9ddcbc3..2a2deb4 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
@@ -315,6 +315,7 @@
},
rules: {
#foreach ($column in $columns)
+#if($column.isInsert || $column.isEdit)
#if($column.required)
#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
#if($parentheseIndex != -1)
@@ -325,6 +326,7 @@
$column.javaField: [
{ required: true, message: "$comment涓嶈兘涓虹┖", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
]#if($foreach.count != $columns.size()),#end
+#end
#end
#end
}
@@ -367,10 +369,12 @@
function reset() {
form.value = {
#foreach ($column in $columns)
+#if($column.isInsert || $column.isEdit)
#if($column.htmlType == "checkbox")
$column.javaField: []#if($foreach.count != $columns.size()),#end
#else
$column.javaField: null#if($foreach.count != $columns.size()),#end
+#end
#end
#end
};
@@ -461,7 +465,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
function handleDelete(row) {
const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
- proxy.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + ${pkColumn.javaField}s + '"鐨勬暟鎹」锛�').then(function() {
+ proxy.#[[$modal]]#.confirm('鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"' + _${pkColumn.javaField}s + '"鐨勬暟鎹」锛�').then(function() {
loading.value = true;
return del${BusinessName}(_${pkColumn.javaField}s);
}).then(() => {
--
Gitblit v1.9.3