组件管理新增详情页面展示的两个属性控制

common/src/main/resources/template/js/dsFormComponent/dsFormComponentAdd.js

@@ -58,6 +58,33 @@ layui.config({
 		}
 	});
 
+	var detailHtmlContentEditor, detailJsContentEditor;
+	form.on('select(showType)', function (data) {
+		if (data.value == -1) {
+			$("#customerDom").html(`
+				<div class="layui-form-item layui-col-xs12">
+					<span class="hr-title">详情页面脚本信息</span><hr>
+				</div>
+				<div class="layui-form-item layui-col-xs12">
+					<label class="layui-form-label">HTML脚本</label>
+					<div class="layui-input-block">
+						<textarea id="detailHtmlContent"></textarea>
+					</div>
+				</div>
+				<div class="layui-form-item layui-col-xs12">
+					<label class="layui-form-label">JS脚本</label>
+					<div class="layui-input-block">
+						<textarea id="detailJsContent"></textarea>
+					</div>
+				</div>
+			`);
+			detailHtmlContentEditor = CodeMirror.fromTextArea(document.getElementById("detailHtmlContent"), codeUtil.getConfig('xml'));
+			detailJsContentEditor = CodeMirror.fromTextArea(document.getElementById("detailJsContent"), codeUtil.getConfig('text/javascript'));
+		} else {
+			$("#customerDom").html('');
+		}
+	});
+
 	var htmlEditor = CodeMirror.fromTextArea(document.getElementById("htmlContent"), codeUtil.getConfig('xml'));
 	var htmlDataFromEditor = CodeMirror.fromTextArea(document.getElementById("htmlDataFrom"), codeUtil.getConfig('xml'));
 	var jsEditor = CodeMirror.fromTextArea(document.getElementById("jsContent"), codeUtil.getConfig('text/javascript'));
@@ -99,6 +126,10 @@ layui.config({
 			if (!params["iconChooseResult"]) {
 				return false;
 			}
+			if (params.showType == -1) {
+				params["detailHtmlContent"] = encodeURIComponent(detailHtmlContentEditor.getValue());
+				params["detailJsContent"] = encodeURIComponent(detailJsContentEditor.getValue())
+			}
 			AjaxPostUtil.request({url: reqBasePath + "writeDsFormComponent", params: params, type: 'json', method: 'POST', callback: function(json) {
 				parent.layer.close(index);
 				parent.refreshCode = '0';

common/src/main/resources/template/js/dsFormComponent/dsFormComponentEdit.js

@@ -82,6 +82,39 @@ layui.config({
 				loadRange(data.value, null);
 			});
 
+			// 加载展示类型为【自定义】的脚本信息
+			loadDetailsPageDom(json.bean.showType, json.bean.detailHtmlContent, json.bean.detailJsContent);
+			var detailHtmlContentEditor, detailJsContentEditor;
+			form.on('select(showType)', function (data) {
+				loadDetailsPageDom(data.value, '', '');
+			});
+
+			function loadDetailsPageDom(value, detailHtmlContent, detailJsContent) {
+				if (value == -1) {
+					$("#customerDom").html(`
+						<div class="layui-form-item layui-col-xs12">
+							<span class="hr-title">详情页面脚本信息</span><hr>
+						</div>
+						<div class="layui-form-item layui-col-xs12">
+							<label class="layui-form-label">HTML脚本</label>
+							<div class="layui-input-block">
+								<textarea id="detailHtmlContent">${detailHtmlContent}</textarea>
+							</div>
+						</div>
+						<div class="layui-form-item layui-col-xs12">
+							<label class="layui-form-label">JS脚本</label>
+							<div class="layui-input-block">
+								<textarea id="detailJsContent">${detailJsContent}</textarea>
+							</div>
+						</div>
+					`);
+					detailHtmlContentEditor = CodeMirror.fromTextArea(document.getElementById("detailHtmlContent"), codeUtil.getConfig('xml'));
+					detailJsContentEditor = CodeMirror.fromTextArea(document.getElementById("detailJsContent"), codeUtil.getConfig('text/javascript'));
+				} else {
+					$("#customerDom").html('');
+				}
+			}
+
 			matchingLanguage();
 			form.render();
 			form.on('submit(formEditBean)', function (data) {
@@ -118,6 +151,11 @@ layui.config({
 							return false;
 						}
 
+						if (params.showType == -1) {
+							params["detailHtmlContent"] = encodeURIComponent(detailHtmlContentEditor.getValue());
+							params["detailJsContent"] = encodeURIComponent(detailJsContentEditor.getValue())
+						}
+
 						AjaxPostUtil.request({url: reqBasePath + "writeDsFormComponent", params: params, type: 'json', method: 'POST', callback: function (json) {
 							parent.layer.close(index);
 							parent.refreshCode = '0';

common/src/main/resources/template/tpl/dsFormComponent/dsFormComponentAdd.html

@@ -72,6 +72,11 @@
 				<div class="layui-input-block" id="applyObject">
 				</div>
 			</div>
+
+			<div class="layui-form-item layui-col-xs12" id="customerDom">
+
+			</div>
+
 			<div class="layui-form-item layui-col-xs12">
 				<span class="hr-title">基础脚本信息</span><hr>
 			</div>

common/src/main/resources/template/tpl/dsFormComponent/dsFormComponentEdit.html

@@ -78,6 +78,11 @@
 			<div class="layui-input-block" id="applyObject">
 			</div>
 		</div>
+
+		<div class="layui-form-item layui-col-xs12" id="customerDom">
+
+		</div>
+
 		<div class="layui-form-item layui-col-xs12">
 			<span class="hr-title">基础脚本信息</span><hr>
 		</div>

web/src/main/resources/template/assets/lib/layui/customer/skyeye/dsFormUtil.js

@@ -401,6 +401,13 @@ var dsFormUtil = {
             var html_js = getDataUseHandlebars('{{#bean}}' + component.jsContent + '{{/bean}}', jsonStr);
             var jsCon = `<script id="script${content.id}">${html_js}</script>`;
             $("#" + boxId).append(html + jsCon);
+        } else if (showType == -1) {
+            // 组件展示类型为【自定义】
+            var jsonStr = {bean: content};
+            var html = getDataUseHandlebars('{{#bean}}' + component.detailHtmlContent + '{{/bean}}', jsonStr);
+            var html_js = getDataUseHandlebars('{{#bean}}' + component.detailJsContent + '{{/bean}}', jsonStr);
+            var jsCon = `<script id="script${content.id}">${html_js}</script>`;
+            $("#" + boxId).append(html + jsCon);
         } else {
             content.value = dsFormUtil.getContentLinkedDataValue(content, value, data);
             if (showType == 4) { // 图片展示
@@ -421,7 +428,6 @@ var dsFormUtil = {
 
             if (showType == 5) { // 表格展示
                 var result = dsFormUtil.resetTableValue(value, content.attrTransformTableList);
-                console.log(result)
                 dsFormTableUtil.intStaticTable("messageTable" + content.orderBy, result, content.attrTransformTableList);
             } else  if (showType == 6) { // 凭证展示
                 var boxId = "showVoucher" + content.orderBy;
@@ -615,24 +621,6 @@ var dsFormUtil = {
         return key.replace("Id", "") + "Mation";
     },
 
-    /**
-     * 目前用于工作流详情展示
-     *
-     * @param customBoxId
-     * @param rows
-     */
-    initSequenceDataDetails: function (customBoxId, rows) {
-        $.each(rows, function (i, item) {
-            item.label = dsFormUtil.getLable(item);
-            var jsonStr = {
-                bean: item
-            };
-            var showType = dsFormUtil.getShowType(item.attrDefinition);
-            // todo 待删除
-
-        });
-    },
-
     // 获取属性的数据展示类型
     getShowType: function (attr) {
         if (!isNull(attr) && !isNull(attr.attrDefinitionCustom)) {