From 56c6dc992fc55e06b0da7c068b4244e4deeccaa9 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Tue, 9 Nov 2021 15:38:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E7=9A=84=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=EF=BC=8C=E8=BE=93=E5=85=A5=E6=9F=A5=E8=AF=A2=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../${entityPackage}/vue/${entityName}List.vuei               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
index d0dc3bde..5364da4b 100644
--- a/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
@@ -58,10 +58,10 @@
 			<#elseif po.dictField?default("")?trim?length gt 1>
               <#if query_field_no gt 1>  </#if><j-dict-select-tag placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" dictCode="${po.dictField}"/>
 			<#else>
-              <#if query_field_no gt 1>  </#if><a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
+              <#if query_field_no gt 1>  </#if><j-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-input>
 			</#if>
 			<#else>
-              <#if query_field_no gt 1>  </#if><a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
+              <#if query_field_no gt 1>  </#if><j-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-input>
 			</#if>
             <#if query_field_no gt 1>  </#if></a-form-item>
           <#if query_field_no gt 1>  </#if></a-col>

From 5d4471274aadd73b63b286c3fda99921696c295a Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Tue, 9 Nov 2021 16:30:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91j-date?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8div=E5=87=BA=E7=8E=B0=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/jero/JDate.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/jero/JDate.vue b/jero-web/src/components/jero/JDate.vue
index e1bb7289..36b4657f 100644
--- a/jero-web/src/components/jero/JDate.vue
+++ b/jero-web/src/components/jero/JDate.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <span>
     <!--YYYY-MM-DD HH:mm:ss-->
     <a-date-picker
       v-if="showType === 'time'"
@@ -54,7 +54,7 @@
       @openChange="openChangeOne"
       @panelChange="panelChangeOne">
     </a-date-picker>
-  </div>
+  </span>
 </template>
 <script>
   import moment from 'moment'

From f99a7a019c4234b384fcb836e22518e40677a494 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Tue, 9 Nov 2021 17:45:14 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=9C=A8=E4=B8=AD=E6=96=87=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E4=B8=8B=E6=97=A0=E6=B3=95=E7=94=9F=E6=88=90=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../codegenerate/generate/config/CreateFileConfig.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/config/CreateFileConfig.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/config/CreateFileConfig.java
index 72bf3767..b40feacb 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/config/CreateFileConfig.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/generate/config/CreateFileConfig.java
@@ -3,6 +3,8 @@ package com.jero.codegenerate.generate.config;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -60,9 +62,11 @@ public class CreateFileConfig {
      * @param
      * @return java.util.List<java.io.File>
      */
-    public List<File> listTemplateRootDirs() {
+    public List<File> listTemplateRootDirs() throws UnsupportedEncodingException {
         String file = this.getClass().getResource(this.templatePath).getFile();
-        file = file.replaceAll("%20", " ");
+        // 对中文路径进行处理
+        file = URLDecoder.decode(file.replaceAll("%20", " "), "UTF-8");
+
         log.debug("-------classpath-------" + file);
         if (file.indexOf("/BOOT-INF/classes!") != -1 || file.indexOf("/BOOT-INF/lib/") != -1) {
             //  当前工程路径