Merge remote-tracking branch 'origin/master'

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) {
             //  当前工程路径

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>

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'