From bbef33c90b7ee919f10dafaa59ce3297dc9f779c Mon Sep 17 00:00:00 2001
From: zhangcheng <1679167928@qq.com>
Date: Fri, 26 May 2023 13:20:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=EF=BC=8Capi.js=20=E5=91=BD=E4=BB=A4=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4vue=E5=AF=BC=E5=85=A5=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/generator/util/GenUtils.java  | 8 +++++++-
 .../main/java/com/ruoyi/generator/util/VelocityUtils.java | 3 ++-
 ruoyi-generator/src/main/resources/vm/vue/index.vue.vm    | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index 9f047c5..911dc03 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -191,7 +191,13 @@ public class GenUtils {
      * @return 业务名
      */
     public static String getBusinessName(String tableName) {
-        return StrUtil.toCamelCase(tableName);
+        boolean autoRemovePre = genConfig.isAutoRemovePre();
+        String tablePrefix = genConfig.getTablePrefix();
+        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
+            String[] searchList = StringUtils.split(tablePrefix, ",");
+            tableName = replaceFirst(tableName, searchList);
+        }
+        return StringUtils.convertToCamelCase(tableName);
     }
 
     /**
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index b6fbb84..0f3b23e 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -1,5 +1,6 @@
 package com.ruoyi.generator.util;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.constant.GenConstants;
 import com.ruoyi.common.utils.DateUtils;
@@ -163,7 +164,7 @@ public class VelocityUtils {
         // 大写类名
         String className = genTable.getClassName();
         // 业务名称
-        String businessName = genTable.getBusinessName();
+        String businessName = StrUtil.lowerFirst(genTable.getBusinessName());
 
         String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
         String mybatisPath = MYBATIS_PATH + "/" + moduleName;
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 b237a0d..2e0fca6 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -200,7 +200,7 @@
         </template>
       </el-table-column>
     </WmsTable>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -337,7 +337,7 @@
 #elseif($column.list && "" != $javaField)
           <el-table-column label="$comment" prop="${javaField}">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
+              <el-input v-model.trim="scope.row.$javaField" placeholder="请输入$comment" />
             </template>
           </el-table-column>
 #end