From 1113198a9f02c4e050a0bafbbfc0a0063066c8c3 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 7 Apr 2023 19:14:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3CMS=E7=9A=84ViewConfig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/modules/cms/utils/CmsUtils.java   | 10 +++++-----
 .../main/resources/views/modules/cms/categoryForm.html |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java b/modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java
index af1a031c..7fd33240 100644
--- a/modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java
+++ b/modules/cms/src/main/java/com/jeesite/modules/cms/utils/CmsUtils.java
@@ -327,7 +327,7 @@ public class CmsUtils {
 		// 如果试图配置里配置了管理路径，则使用视图中的管理路径
 		if (StringUtils.isNotBlank(category.getViewConfig())) {
 			@SuppressWarnings("rawtypes")
-			Map map = JsonMapper.fromJson("{" + category.getViewConfig().trim() + "}", Map.class);
+			Map map = JsonMapper.fromJson(category.getViewConfig(), Map.class);
 			if (map != null) {
 				// 管理地址
 				String adminUrl = ObjectUtils.toString(map.get("adminUrl"));
@@ -465,11 +465,11 @@ public class CmsUtils {
 	public static void addViewConfigAttribute(Model model, String params) {
 		if (StringUtils.isNotBlank(params)) {
 			@SuppressWarnings("rawtypes")
-			Map map = JsonMapper.fromJson("{" + params.trim() + "}", Map.class);
+			Map map = JsonMapper.fromJson(params, Map.class);
 			if (map != null) {
-				for (Object o : map.keySet()) {
-					model.addAttribute("viewConfig_" + o.toString(), map.get(o));
-				}
+				map.forEach((k, v) -> {
+					model.addAttribute("viewConfig_" + k, v);
+				});
 			}
 		}
 	}
diff --git a/modules/cms/src/main/resources/views/modules/cms/categoryForm.html b/modules/cms/src/main/resources/views/modules/cms/categoryForm.html
index 9a60e3d8..48751ddf 100644
--- a/modules/cms/src/main/resources/views/modules/cms/categoryForm.html
+++ b/modules/cms/src/main/resources/views/modules/cms/categoryForm.html
@@ -213,8 +213,8 @@
 							<#form:input path="viewConfig" maxlength="1000" class="form-control"
 								placeholder="视图参数例如: {count:2, title_show:'yes'} 则在视图文件中的获取方法是：${'${'}viewConfig_count}、${'${'}viewConfig_titleShow}" />
 							<br />
-							<ul class="text-muted  well well-lg no-shadow">
-								<li>例如视图参数设置为：count:2,titleShow:'yes'则在视图文件中的获取方法是：\${viewConfig_count}、\${viewConfig_titleShow}。</li>
+							<ul class="text-muted well well-lg no-shadow m0 pt10 pb10">
+								<li>例如视图参数设置为：{count:2,titleShow:'yes'} 则在视图文件中的获取方法是：\${viewConfig_count}、\${viewConfig_titleShow}。</li>
 								<li>设置栏目的管理地址：若设置【adminUrl:false】表示无管理地址，在内容发布栏目列表中不显示该栏目；</li>
 								<li>设置【adminUrl:'/cms/guestbook'】表示有管理地址，在内容发布栏目列表中点击该栏目链接到该地址。</li>
 								<!-- <li>管理地址参数：若设置【adminUrlParam:'fileDownload=true'】则代表链接模型为文件下载的栏目，新增链接的时候出现文件上传对话框。</li>