为JSON数据集编辑页面引入JSON编辑器库

zjw1947 · Aug 10, 2020 · f7abcc8 · f7abcc8
1 parent 3a6fcc9
commit f7abcc8
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 2 deletions.
diff --git a/.../src/main/resources/org/datagear/web/webapp/static/script/ace-21.02.19/mode-javascript.js b/.../src/main/resources/org/datagear/web/webapp/static/script/ace-21.02.19/mode-javascript.js
diff --git a/...ar-web/src/main/resources/org/datagear/web/webapp/static/script/ace-21.02.19/mode-json.js b/...ar-web/src/main/resources/org/datagear/web/webapp/static/script/ace-21.02.19/mode-json.js
diff --git a/...rc/main/resources/org/datagear/web/webapp/static/script/ace-21.02.19/worker-javascript.js b/...rc/main/resources/org/datagear/web/webapp/static/script/ace-21.02.19/worker-javascript.js
diff --git a/...-web/src/main/resources/org/datagear/web/webapp/static/script/ace-21.02.19/worker-json.js b/...-web/src/main/resources/org/datagear/web/webapp/static/script/ace-21.02.19/worker-json.js
diff --git a/.../src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_grid.ftl b/.../src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_grid.ftl
@@ -79,6 +79,7 @@ boolean readonly 是否只读操作，默认为false
 	{
 		po.open(po.url("add"),
 		{
+			width: "85%",
 			<#if selectOperation>
 			pageParam:
 			{

diff --git a/...n/resources/org/datagear/web/webapp/view/freemarker/analysis/dashboard/dashboard_grid.ftl b/...n/resources/org/datagear/web/webapp/view/freemarker/analysis/dashboard/dashboard_grid.ftl
@@ -71,6 +71,7 @@ selectOperation 是否选择操作，允许为null
 	{
 		po.open(po.url("add"),
 		{
+			width: "85%",
 			<#if selectOperation>
 			pageParam:
 			{

diff --git a/...rces/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_form_JSON_VALUE.ftl b/...rces/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_form_JSON_VALUE.ftl
@@ -75,9 +75,9 @@ readonly 是否只读操作，允许为null
 	};
 	
 	var languageTools = ace.require("ace/ext/language_tools");
-	//var JsonMode = ace.require("ace/mode/json").Mode;
+	var JsonMode = ace.require("ace/mode/json").Mode;
 	po.jsonEditor = ace.edit("${pageId}-workspaceEditor");
-	//po.jsonEditor.session.setMode(new JsonMode());
+	po.jsonEditor.session.setMode(new JsonMode());
 	po.jsonEditor.setShowPrintMargin(false);
 	
 	po.initWorkspaceEditor(po.jsonEditor, po.element("textarea[name='value']").val());

diff --git a/.../main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_grid.ftl b/.../main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_grid.ftl
@@ -90,6 +90,7 @@ boolean readonly 是否只读操作，默认为false
 			
 			po.open(po.url(addURL),
 			{
+				width: "85%",
 				<#if selectOperation>
 				pageParam:
 				{

diff --git a/...gear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/include/html_head.ftl b/...gear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/include/html_head.ftl
@@ -37,6 +37,8 @@ var contextPath="${contextPath}";
 <script src="${contextPath}/static/script/ace-21.02.19/ace.js?v=${_hh_Version}" type="text/javascript"></script>
 <script src="${contextPath}/static/script/ace-21.02.19/mode-sql.js?v=${_hh_Version}" type="text/javascript"></script>
 <script src="${contextPath}/static/script/ace-21.02.19/mode-html.js?v=${_hh_Version}" type="text/javascript"></script>
+<script src="${contextPath}/static/script/ace-21.02.19/mode-json.js?v=${_hh_Version}" type="text/javascript"></script>
+<script src="${contextPath}/static/script/ace-21.02.19/mode-javascript.js?v=${_hh_Version}" type="text/javascript"></script>
 <script src="${contextPath}/static/script/ace-21.02.19/ext-language_tools.js?v=${_hh_Version}" type="text/javascript"></script>
 <script src="${contextPath}/static/script/cometd-2.9.1/cometd.js?v=${_hh_Version}" type="text/javascript"></script>
 <script src="${contextPath}/static/script/cometd-2.9.1/AckExtension.js?v=${_hh_Version}" type="text/javascript"></script>