From 09ca6c68a9f720f19087801f26c297aba81c6d27 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 30 Nov 2021 17:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/utils/excel/fieldtype/PostListType.java        | 8 +++++---
 .../common/utils/excel/fieldtype/RoleListType.java        | 8 +++++---
 .../main/resources/templates/modules/gen/crud/vueForm.xml | 4 +++-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/PostListType.java b/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/PostListType.java
index cf2d0538..16504531 100644
--- a/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/PostListType.java
+++ b/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/PostListType.java
@@ -4,6 +4,7 @@
  */
 package com.jeesite.common.utils.excel.fieldtype;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.jeesite.common.collect.ListUtils;
@@ -31,14 +32,15 @@ public class PostListType implements FieldType {
 	 * 获取对象值（导入）
 	 */
 	public Object getValue(String val) {
+		List<String> list = new ArrayList<String>();
 		for (String s : StringUtils.split(val, ",")) {
 			for (Post e : postList) {
 				if (StringUtils.trimToEmpty(s).equals(e.getPostName())) {
-					postList.add(e);
+					list.add(e.getPostCode());
 				}
 			}
 		}
-		return postList.size() > 0 ? postList : null;
+		return list.size() > 0 ? list.toArray(new String[list.size()]) : null;
 	}
 
 	/**
@@ -50,7 +52,7 @@ public class PostListType implements FieldType {
 			List<Post> postList = (List<Post>) val;
 			return ListUtils.extractToString(postList, "postName", ", ");
 		}
-		return "";
+		return StringUtils.EMPTY;
 	}
 	
 }
diff --git a/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/RoleListType.java b/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/RoleListType.java
index 241f5252..64860c60 100644
--- a/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/RoleListType.java
+++ b/modules/core/src/main/java/com/jeesite/common/utils/excel/fieldtype/RoleListType.java
@@ -4,6 +4,7 @@
  */
 package com.jeesite.common.utils.excel.fieldtype;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.jeesite.common.collect.ListUtils;
@@ -31,14 +32,15 @@ public class RoleListType implements FieldType {
 	 * 获取对象值（导入）
 	 */
 	public Object getValue(String val) {
+		List<String> list = new ArrayList<String>();
 		for (String s : StringUtils.split(val, ",")) {
 			for (Role e : roleList) {
 				if (StringUtils.trimToEmpty(s).equals(e.getRoleName())) {
-					roleList.add(e);
+					list.add(e.getRoleCode());
 				}
 			}
 		}
-		return roleList.size() > 0 ? roleList : null;
+		return list.size() > 0 ? list.toArray(new String[list.size()]) : null;
 	}
 
 	/**
@@ -50,7 +52,7 @@ public class RoleListType implements FieldType {
 			List<Role> roleList = (List<Role>) val;
 			return ListUtils.extractToString(roleList, "roleName", ", ");
 		}
-		return "";
+		return StringUtils.EMPTY;
 	}
 	
 }
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml
index d1ab22c2..e4db6d1f 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml
@@ -83,7 +83,9 @@ for(c in table.columnList){
       component: 'TreeSelect',
       componentProps: {
         allowClear: true,
+        style: 'width: calc(50% - 60px)',
       },
+      colProps: { lg: 24, md: 24 },
     },
 <% }
 for (c in table.columnList){
@@ -108,7 +110,7 @@ for (c in table.columnList){
       field: '${c.attrName}',
   <% if(c.showType == 'input' || c.showType == 'textarea'){ %>
       <% if (c.simpleAttrType == 'Integer' && c.attrName == 'treeSort'){ %>
-      helpMessage: '升序${c.dataLength}',
+      helpMessage: '升序',
       component: 'InputNumber',
       defaultValue: '30',
       <% }else{ %>