From 25366945cd355169b2f8131acc5e8b08c894847d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=A5=A5=E7=86=A0?= <caixiangyi@zoneland.net>
Date: Fri, 25 Feb 2022 10:21:07 +0000
Subject: [PATCH] Merge branch 'cherry-pick-a16dd9de' into 'develop'

Merge branch 'hotfix/formula_donot_inTable' into 'master'

See merge request o2oa/o2oa!282

(cherry picked from commit 73311f9bc4142c6e4f74a54d8d00e5df83a8d269)

34203cd7 Merge branch 'hotfix/formula_donot_inTable' into 'master'
---
 .../Module/Eldate/eldate.html                 |  10 +-
 .../Module/Eldatetime/eldatetime.html         |  10 +-
 .../Module/Eltime/eltime.html                 |  19 +-
 .../Module/Eltree/eltree.html                 | 243 +++++++++---------
 .../widget/ElCarouselContent.js               |   9 +-
 5 files changed, 132 insertions(+), 159 deletions(-)

diff --git a/o2web/source/x_component_process_FormDesigner/Module/Eldate/eldate.html b/o2web/source/x_component_process_FormDesigner/Module/Eldate/eldate.html
index 74e65e93b4..da2d40ecf7 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/Eldate/eldate.html
+++ b/o2web/source/x_component_process_FormDesigner/Module/Eldate/eldate.html
@@ -120,13 +120,11 @@
 					</select>
 				</td>
 			</tr>
-			<tr>
-				<td colspan="2">
-					<div>{{$.lp.disabledDateNote}}</div>
-					<div class="MWFFormulaArea" name="disabledDate" title="{{$.lp.disabledDateScript}}"></div>
-				</td>
-			</tr>
 		</table>
+		<div>
+			<div>{{$.lp.disabledDateNote}}</div>
+			<div class="MWFFormulaArea" name="disabledDate" title="{{$.lp.disabledDateScript}}"></div>
+		</div>
 <!--		<table id="text{$.pid}datePickTable">-->
 <!--			<tr>-->
 <!--				<td colspan="2">-->
diff --git a/o2web/source/x_component_process_FormDesigner/Module/Eldatetime/eldatetime.html b/o2web/source/x_component_process_FormDesigner/Module/Eldatetime/eldatetime.html
index 73c9453adc..e2e11e3d50 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/Eldatetime/eldatetime.html
+++ b/o2web/source/x_component_process_FormDesigner/Module/Eldatetime/eldatetime.html
@@ -91,13 +91,11 @@
 					<input type="radio" name="arrowControl" value="false" text{(!$.arrowControl)?'checked':''}/>{{$.lp.no}}
 				</td>
 			</tr>
-			<tr>
-				<td colspan="2">
-					<div>{{$.lp.disabledDateNote}}</div>
-					<div class="MWFFormulaArea" name="disabledDate" title="{{$.lp.disabledDateScript}}"></div>
-				</td>
-			</tr>
 		</table>
+		<div>
+			<div>{{$.lp.disabledDateNote}}</div>
+			<div class="MWFFormulaArea" name="disabledDate" title="{{$.lp.disabledDateScript}}"></div>
+		</div>
 <!--		<table id="text{$.pid}noRangeTable" style="display: text{(['datetimerange'].contains($.selectType)) ? 'none':''};">-->
 <!--			<tr>-->
 <!--				<td colspan="2">-->
diff --git a/o2web/source/x_component_process_FormDesigner/Module/Eltime/eltime.html b/o2web/source/x_component_process_FormDesigner/Module/Eltime/eltime.html
index a11da8a155..46dac6d815 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/Eltime/eltime.html
+++ b/o2web/source/x_component_process_FormDesigner/Module/Eltime/eltime.html
@@ -115,21 +115,10 @@
 					</td>
 				</tr>
 			</table>
-			<table id="text{$.pid}noRangeTable" style="display: text{(!$.isRange) ? '':'none'};">
-				<tr>
-					<td colspan="2">
-						<div>{{$.lp.selectableRangeNote}}</div>
-						<div class="MWFFormulaArea" name="selectableRange" title="{{$.lp.selectableRangeScript}}"></div>
-					</td>
-				</tr>
-<!--				<tr>-->
-<!--					<td class="editTableTitle">{{$.lp.selectableRange}}:</td>-->
-<!--					<td class="editTableValue">-->
-<!--						<input type="text" name="start_picker" value="text{$.start_picker}" class="editTableInputNoWidth"/> - -->
-<!--						<input type="text" name="end_picker" value="text{$.end_picker}" class="editTableInputNoWidth"/>-->
-<!--					</td>-->
-<!--				</tr>-->
-			</table>
+			<div id="text{$.pid}noRangeTable" style="display: text{(!$.isRange) ? '':'none'};">
+				<div>{{$.lp.selectableRangeNote}}</div>
+				<div class="MWFFormulaArea" name="selectableRange" title="{{$.lp.selectableRangeScript}}"></div>
+			</div>
 			<table id="text{$.pid}rangeTable" style="display: text{($.isRange) ? '':'none'};">
 <!--				<tr>-->
 <!--					<td class="editTableTitle">{{$.lp.endSelectableRange}}:</td>-->
diff --git a/o2web/source/x_component_process_FormDesigner/Module/Eltree/eltree.html b/o2web/source/x_component_process_FormDesigner/Module/Eltree/eltree.html
index 149b27ea20..565c5a89f6 100644
--- a/o2web/source/x_component_process_FormDesigner/Module/Eltree/eltree.html
+++ b/o2web/source/x_component_process_FormDesigner/Module/Eltree/eltree.html
@@ -1,14 +1,14 @@
 <div style="background-color: #FFF; overflow: hidden">
 	<div title="{{$.lp.base}}" class="MWFTab">
 		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-		  <tr>
-		    <td class="editTableTitle">{{$.lp.id}}:</td>
-		    <td class="editTableValue"><input type="text" name="id" value="text{$.id}" class="editTableInput"/></td>
-		  </tr>
-		  <tr>
-		    <td class="editTableTitle">{{$.lp.name}}:</td>
-		    <td class="editTableValue"><input type="text" name="name" value="text{$.name}" class="editTableInput"/></td>
-		  </tr>
+			<tr>
+				<td class="editTableTitle">{{$.lp.id}}:</td>
+				<td class="editTableValue"><input type="text" name="id" value="text{$.id}" class="editTableInput"/></td>
+			</tr>
+			<tr>
+				<td class="editTableTitle">{{$.lp.name}}:</td>
+				<td class="editTableValue"><input type="text" name="name" value="text{$.name}" class="editTableInput"/></td>
+			</tr>
 		</table>
 
 		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
@@ -38,12 +38,10 @@
 					<input type="text" name="nodeKey" value="text{$.nodeKey}" class="editTableInput"/>
 				</td>
 			</tr>
-			<tr>
-				<td colspan="2">
-					<div class="MWFFormulaArea" name="currentNodeKey" title="{{$.lp.currentNodeKey}}"></div>
-				</td>
-			</tr>
 		</table>
+		<div>
+			<div class="MWFFormulaArea" name="currentNodeKey" title="{{$.lp.currentNodeKey}}"></div>
+		</div>
 
 		<div style="height:24px; text-align: center; line-height: 24px; background-color: #EEE; border-top: 1px solid #999;">{{$.lp.expand}}</div>
 		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
@@ -51,10 +49,10 @@
 				<td class="editTableTitle">{{$.lp.defaultExpandAll}}:</td>
 				<td class="editTableValue">
 					<input type="radio" name="defaultExpandAll" value="true" text{($.defaultExpandAll)?'checked':''}
-						onclick="if (this.checked){ $('text{$.pid}expandDetail').setStyle('display', 'none')}"
+					onclick="if (this.checked){ $('text{$.pid}expandDetail').setStyle('display', 'none')}"
 					/>{{$.lp.yes}}
 					<input type="radio" name="defaultExpandAll" value="false" text{(!$.defaultExpandAll)?'checked':''}
-						onclick="if (this.checked){ $('text{$.pid}expandDetail').setStyle('display', '')}"
+					onclick="if (this.checked){ $('text{$.pid}expandDetail').setStyle('display', '')}"
 					/>{{$.lp.no}}
 				</td>
 			</tr>
@@ -80,14 +78,10 @@
 				</td>
 			</tr>
 		</table>
-		<table id="text{$.pid}expandDetail" style="display: text{($.defaultExpandAll)?'none':''}; " width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-			<tr>
-				<td colspan="2">
-					<div>{{$.lp.defaultExpandedkeysNote}}</div>
-					<div class="MWFFormulaArea" name="defaultExpandedKeys" title="{{$.lp.defaultExpandedkeys}}"></div>
-				</td>
-			</tr>
-		</table>
+		<div id="text{$.pid}expandDetail" style="display: text{($.defaultExpandAll)?'none':''}; ">
+			<div>{{$.lp.defaultExpandedkeysNote}}</div>
+			<div class="MWFFormulaArea" name="defaultExpandedKeys" title="{{$.lp.defaultExpandedkeys}}"></div>
+		</div>
 
 
 		<div style="height:24px; text-align: center; line-height: 24px; background-color: #EEE; border-top: 1px solid #999;">{{$.lp.select}}</div>
@@ -96,59 +90,60 @@
 				<td class="editTableTitle">{{$.lp.showCheckbox}}:</td>
 				<td class="editTableValue">
 					<input type="radio" name="showCheckbox" value="true" text{($.showCheckbox)?'checked':''}
-						onclick="if (this.checked){ $('text{$.pid}checkboxDetail').setStyle('display', '')}"
+					onclick="if (this.checked){ $('text{$.pid}checkboxDetail').setStyle('display', '')}"
 					/>{{$.lp.yes}}
 					<input type="radio" name="showCheckbox" value="false" text{(!$.showCheckbox)?'checked':''}
-						onclick="if (this.checked){ $('text{$.pid}checkboxDetail').setStyle('display', 'none')}"
+					onclick="if (this.checked){ $('text{$.pid}checkboxDetail').setStyle('display', 'none')}"
 					/>{{$.lp.no}}
 				</td>
 			</tr>
 		</table>
-		<table id="text{$.pid}checkboxDetail" style="display: text{($.showCheckbox)?'':'none'};" width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-			<tr>
-				<td class="editTableTitle">{{$.lp.checkOnClickNode}}:</td>
-				<td class="editTableValue">
-					<input type="radio" name="checkOnClickNode" value="true" text{($.checkOnClickNode)?'checked':''}/>{{$.lp.clickNode}}
-					<input type="radio" name="checkOnClickNode" value="false" text{(!$.checkOnClickNode)?'checked':''}/>{{$.lp.clickCheckbox}}
-				</td>
-			</tr>
-			<tr>
-				<td class="editTableTitle">{{$.lp.checkStrictly}}:</td>
-				<td class="editTableValue">
-					<input type="radio" name="checkStrictly" value="true" text{($.checkStrictly)?'checked':''}/>{{$.lp.yes}}
-					<input type="radio" name="checkStrictly" value="false" text{(!$.checkStrictly)?'checked':''}/>{{$.lp.no}}
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2">
-					<div>{{$.lp.defaultCheckedKeysNote}}</div>
-					<div class="MWFFormulaArea" name="defaultCheckedKeys" title="{{$.lp.defaultCheckedkeys}}"></div>
-				</td>
-			</tr>
-		</table>
 
-<!--		<div style="height:24px; text-align: center; line-height: 24px; background-color: #EEE; border-top: 1px solid #999;">{{$.lp.lazy}}</div>-->
-<!--		<table>-->
-<!--			<tr>-->
-<!--				<td class="editTableTitle">{{$.lp.lazy}}:</td>-->
-<!--				<td class="editTableValue">-->
-<!--					<input type="radio" name="lazy" value="true" text{($.lazy)?'checked':''}-->
-<!--						onclick="if (this.checked){ $('text{$.pid}lazyDetail').setStyle('display', '')}"-->
-<!--					/>{{$.lp.yes}}-->
-<!--					<input type="radio" name="lazy" value="false" text{(!$.lazy)?'checked':''}-->
-<!--						onclick="if (this.checked){ $('text{$.pid}lazyDetail').setStyle('display', 'none')}"-->
-<!--					/>{{$.lp.no}}-->
-<!--				</td>-->
-<!--			</tr>-->
-<!--		</table>-->
-<!--		<table id="text{$.pid}lazyDetail" style="display: text{($.lazy)?'':'none'};" width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">-->
-<!--			<tr>-->
-<!--				<td colspan="2">-->
-<!--					<div>{{$.lp.loadFunNote}}</div>-->
-<!--					<div class="MWFFormulaArea" name="loadFun" title="{{$.lp.loadFun}}"></div>-->
-<!--				</td>-->
-<!--			</tr>-->
-<!--		</table>-->
+		<div id="text{$.pid}checkboxDetail" style="display: text{($.showCheckbox)?'':'none'};">
+			<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+				<tr>
+					<td class="editTableTitle">{{$.lp.checkOnClickNode}}:</td>
+					<td class="editTableValue">
+						<input type="radio" name="checkOnClickNode" value="true" text{($.checkOnClickNode)?'checked':''}/>{{$.lp.clickNode}}
+						<input type="radio" name="checkOnClickNode" value="false" text{(!$.checkOnClickNode)?'checked':''}/>{{$.lp.clickCheckbox}}
+					</td>
+				</tr>
+				<tr>
+					<td class="editTableTitle">{{$.lp.checkStrictly}}:</td>
+					<td class="editTableValue">
+						<input type="radio" name="checkStrictly" value="true" text{($.checkStrictly)?'checked':''}/>{{$.lp.yes}}
+						<input type="radio" name="checkStrictly" value="false" text{(!$.checkStrictly)?'checked':''}/>{{$.lp.no}}
+					</td>
+				</tr>
+			</table>
+			<div>
+				<div>{{$.lp.defaultCheckedKeysNote}}</div>
+				<div class="MWFFormulaArea" name="defaultCheckedKeys" title="{{$.lp.defaultCheckedkeys}}"></div>
+			</div>
+		</div>
+
+		<!--		<div style="height:24px; text-align: center; line-height: 24px; background-color: #EEE; border-top: 1px solid #999;">{{$.lp.lazy}}</div>-->
+		<!--		<table>-->
+		<!--			<tr>-->
+		<!--				<td class="editTableTitle">{{$.lp.lazy}}:</td>-->
+		<!--				<td class="editTableValue">-->
+		<!--					<input type="radio" name="lazy" value="true" text{($.lazy)?'checked':''}-->
+		<!--						onclick="if (this.checked){ $('text{$.pid}lazyDetail').setStyle('display', '')}"-->
+		<!--					/>{{$.lp.yes}}-->
+		<!--					<input type="radio" name="lazy" value="false" text{(!$.lazy)?'checked':''}-->
+		<!--						onclick="if (this.checked){ $('text{$.pid}lazyDetail').setStyle('display', 'none')}"-->
+		<!--					/>{{$.lp.no}}-->
+		<!--				</td>-->
+		<!--			</tr>-->
+		<!--		</table>-->
+		<!--		<table id="text{$.pid}lazyDetail" style="display: text{($.lazy)?'':'none'};" width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">-->
+		<!--			<tr>-->
+		<!--				<td colspan="2">-->
+		<!--					<div>{{$.lp.loadFunNote}}</div>-->
+		<!--					<div class="MWFFormulaArea" name="loadFun" title="{{$.lp.loadFun}}"></div>-->
+		<!--				</td>-->
+		<!--			</tr>-->
+		<!--		</table>-->
 
 		<div style="height:24px; text-align: center; line-height: 24px; background-color: #EEE; border-top: 1px solid #999;">{{$.lp.dragdrop}}</div>
 		<table>
@@ -164,41 +159,37 @@
 				</td>
 			</tr>
 		</table>
-		<table id="text{$.pid}dragDetail" style="display: text{($.draggable)?'':'none'};" width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-			<tr>
-				<td colspan="2">
-					<div>{{$.lp.allowDragNote}}</div>
-					<div class="MWFFormulaArea" name="allowDrag" title="{{$.lp.allowDrag}}"></div>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="2">
-					<div>{{$.lp.allowDropNote}}</div>
-					<div class="MWFFormulaArea" name="allowDrop" title="{{$.lp.allowDrop}}"></div>
-				</td>
-			</tr>
-		</table>
+		<div id="text{$.pid}dragDetail" style="display: text{($.draggable)?'':'none'};" >
+			<div>
+				<div>{{$.lp.allowDragNote}}</div>
+				<div class="MWFFormulaArea" name="allowDrag" title="{{$.lp.allowDrag}}"></div>
+			</div>
+			<div>
+				<div>{{$.lp.allowDropNote}}</div>
+				<div class="MWFFormulaArea" name="allowDrop" title="{{$.lp.allowDrop}}"></div>
+			</div>
+		</div>
 
 
 		<div class="MWFMaplist" name="elStyles" title="{{$.lp.style}}"></div>
 		<div class="MWFMaplist" name="elProperties" title="{{$.lp.attribute}}"></div>
 
-<!--		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">-->
-<!--			<tr>-->
-<!--				<td class="editTableTitle">{{$.lp.compute}}:</td>-->
-<!--				<td class="editTableValue">-->
-<!--					<input type="radio" name="compute" value="create" text{(!$.compute || $.compute=='create')?'checked':''}/>{{$.lp.create}}-->
-<!--					<input type="radio" name="compute" value="save" text{($.compute=='save')?'checked':''}/>{{$.lp.save}}-->
-<!--					<input type="radio" name="compute" value="show" text{($.compute=='show')?'checked':''}/>{{$.lp.show}}-->
-<!--				</td>-->
-<!--			</tr>-->
-<!--		</table>-->
+		<!--		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">-->
+		<!--			<tr>-->
+		<!--				<td class="editTableTitle">{{$.lp.compute}}:</td>-->
+		<!--				<td class="editTableValue">-->
+		<!--					<input type="radio" name="compute" value="create" text{(!$.compute || $.compute=='create')?'checked':''}/>{{$.lp.create}}-->
+		<!--					<input type="radio" name="compute" value="save" text{($.compute=='save')?'checked':''}/>{{$.lp.save}}-->
+		<!--					<input type="radio" name="compute" value="show" text{($.compute=='show')?'checked':''}/>{{$.lp.show}}-->
+		<!--				</td>-->
+		<!--			</tr>-->
+		<!--		</table>-->
 
-<!--		<div class="MWFScriptArea" name="defaultValue" title="{{$.lp.defaultValue}} (S)"></div>-->
+		<!--		<div class="MWFScriptArea" name="defaultValue" title="{{$.lp.defaultValue}} (S)"></div>-->
+
+		<!--		<div class="MWFValidation" name="validationConfig"></div>-->
+		<!--		<div class="MWFScriptArea" name="validation" title="{{$.lp.verificationScript}} (S)"></div>-->
 
-<!--		<div class="MWFValidation" name="validationConfig"></div>-->
-<!--		<div class="MWFScriptArea" name="validation" title="{{$.lp.verificationScript}} (S)"></div>-->
-		
 	</div>
 	<div title="{{$.lp.data}}"  class="MWFTab">
 		<table>
@@ -206,7 +197,7 @@
 				<td class="editTableTitle"></td>
 				<td class="editTableValue">
 					<input type="radio" name="dataType" value="json" text{($.dataType!=='script')?'checked':''}
-						onclick="if (this.checked){
+						   onclick="if (this.checked){
 							$('text{$.pid}dataJson').setStyle('display', '');
 							$('text{$.pid}dataScript').setStyle('display', 'none');
 						}"
@@ -247,35 +238,35 @@
 			<div class="MWFHtmlEditorArea" name="vueSlot" title="Input Slot (HTML)"></div>
 		</div>
 	</div>
-<!--	<div title="{{$.lp.section}}" class="MWFTab">-->
-<!--		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">-->
-<!--			<tr>-->
-<!--				<td class="editTableTitle">{{$.lp.enableSection}}:</td>-->
-<!--				<td class="editTableValue">-->
-<!--					<input onclick="if (this.checked){ $('text{$.pid}sectionByEditArea').setStyle('display', 'block')}" type="radio" name="section" value="yes" text{($.section=='yes')?'checked':''}/>{{$.lp.yes}}-->
-<!--					<input onclick="if (this.checked){ $('text{$.pid}sectionByEditArea').setStyle('display', 'none')}" type="radio" name="section" value="no" text{($.section!='yes')?'checked':''}/>{{$.lp.no}}-->
-<!--				</td>-->
-<!--			</tr>-->
-<!--		</table>-->
+	<!--	<div title="{{$.lp.section}}" class="MWFTab">-->
+	<!--		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">-->
+	<!--			<tr>-->
+	<!--				<td class="editTableTitle">{{$.lp.enableSection}}:</td>-->
+	<!--				<td class="editTableValue">-->
+	<!--					<input onclick="if (this.checked){ $('text{$.pid}sectionByEditArea').setStyle('display', 'block')}" type="radio" name="section" value="yes" text{($.section=='yes')?'checked':''}/>{{$.lp.yes}}-->
+	<!--					<input onclick="if (this.checked){ $('text{$.pid}sectionByEditArea').setStyle('display', 'none')}" type="radio" name="section" value="no" text{($.section!='yes')?'checked':''}/>{{$.lp.no}}-->
+	<!--				</td>-->
+	<!--			</tr>-->
+	<!--		</table>-->
 
-<!--		<div id="text{$.pid}sectionByEditArea" style="display: text{($.section=='yes')?'block':'none'};">-->
-<!--			<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">-->
-<!--				<tr>-->
-<!--					<td class="editTableTitle">{{$.lp.sectionBy}}:</td>-->
-<!--					<td class="editTableValue">-->
-<!--						<input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}sectionByScriptEditArea').setStyle('display', 'none');}" name="sectionBy" text{(($.sectionBy=='person') || ($.sectionBy!='unit' && $.sectionBy!='activity' && $.sectionBy!='script'))?'checked':''} type="radio" value="person"/>{{$.lp.handler}}<br/>-->
-<!--						<input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}sectionByScriptEditArea').setStyle('display', 'none');}"  name="sectionBy" text{($.sectionBy=='unit')?'checked':''} type="radio" value="unit"/>{{$.lp.handlerUnit}}<br/>-->
-<!--						<input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}sectionByScriptEditArea').setStyle('display', 'none');}"  name="sectionBy" text{($.sectionBy=='activity')?'checked':''} type="radio" value="activity"/>{{$.lp.activityId}}<br/>-->
-<!--						<input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}sectionByScriptEditArea').setStyle('display', 'none');}"  name="sectionBy" text{($.sectionBy=='splitValue')?'checked':''} type="radio" value="splitValue"/>{{$.lp.splitValue}}<br/>-->
-<!--						<input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}sectionByScriptEditArea').setStyle('display', 'block');}"  name="sectionBy" text{($.sectionBy=='script')?'checked':''} type="radio" value="script"/>{{$.lp.script}}<br/>-->
-<!--					</td>-->
-<!--				</tr>-->
-<!--			</table>-->
-<!--			<div id="text{$.pid}sectionByScriptEditArea" style="display: text{($.sectionBy=='script')?'block':'none'};">-->
-<!--				<div class="MWFScriptArea" name="sectionByScript" title="{{$.lp.sectionBy}} (S)"></div>-->
-<!--			</div>-->
-<!--		</div>-->
-<!--	</div>-->
+	<!--		<div id="text{$.pid}sectionByEditArea" style="display: text{($.section=='yes')?'block':'none'};">-->
+	<!--			<table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">-->
+	<!--				<tr>-->
+	<!--					<td class="editTableTitle">{{$.lp.sectionBy}}:</td>-->
+	<!--					<td class="editTableValue">-->
+	<!--						<input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}sectionByScriptEditArea').setStyle('display', 'none');}" name="sectionBy" text{(($.sectionBy=='person') || ($.sectionBy!='unit' && $.sectionBy!='activity' && $.sectionBy!='script'))?'checked':''} type="radio" value="person"/>{{$.lp.handler}}<br/>-->
+	<!--						<input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}sectionByScriptEditArea').setStyle('display', 'none');}"  name="sectionBy" text{($.sectionBy=='unit')?'checked':''} type="radio" value="unit"/>{{$.lp.handlerUnit}}<br/>-->
+	<!--						<input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}sectionByScriptEditArea').setStyle('display', 'none');}"  name="sectionBy" text{($.sectionBy=='activity')?'checked':''} type="radio" value="activity"/>{{$.lp.activityId}}<br/>-->
+	<!--						<input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}sectionByScriptEditArea').setStyle('display', 'none');}"  name="sectionBy" text{($.sectionBy=='splitValue')?'checked':''} type="radio" value="splitValue"/>{{$.lp.splitValue}}<br/>-->
+	<!--						<input class="editTableRadio" onclick="if (this.checked){ $('text{$.pid}sectionByScriptEditArea').setStyle('display', 'block');}"  name="sectionBy" text{($.sectionBy=='script')?'checked':''} type="radio" value="script"/>{{$.lp.script}}<br/>-->
+	<!--					</td>-->
+	<!--				</tr>-->
+	<!--			</table>-->
+	<!--			<div id="text{$.pid}sectionByScriptEditArea" style="display: text{($.sectionBy=='script')?'block':'none'};">-->
+	<!--				<div class="MWFScriptArea" name="sectionByScript" title="{{$.lp.sectionBy}} (S)"></div>-->
+	<!--			</div>-->
+	<!--		</div>-->
+	<!--	</div>-->
 	<div title="{{$.lp.event}}"  class="MWFTab">
 		<div class="MWFEventsArea" name="events"></div>
 	</div>
diff --git a/o2web/source/x_component_process_FormDesigner/widget/ElCarouselContent.js b/o2web/source/x_component_process_FormDesigner/widget/ElCarouselContent.js
index a577e87c07..a2e1919807 100644
--- a/o2web/source/x_component_process_FormDesigner/widget/ElCarouselContent.js
+++ b/o2web/source/x_component_process_FormDesigner/widget/ElCarouselContent.js
@@ -293,8 +293,7 @@ MWF.xApplication.process.FormDesigner.widget.ElCarouselContent.Tree.Node = new C
 				}.bind(this));
 
 				//srcScript
-				var tr = new Element("tr").inject(this.propertyTable);
-				td = new Element("td", { "colspan": "2" }).inject(tr);
+				var tr = new Element("div").inject(this.propertyArea);
 				this.srcScriptTr = tr;
 				new Element("div", {
 					"text" : "通过this.event可以获得当前条目的数据，最终返回图片资源地址文本。" +
@@ -327,8 +326,7 @@ MWF.xApplication.process.FormDesigner.widget.ElCarouselContent.Tree.Node = new C
 					"code": "",
 					"html": ""
 				};
-				var tr = new Element("tr").inject(this.propertyTable);
-				td = new Element("td", { "colspan": "2" }).inject(tr);
+				var tr = new Element("div").inject(this.propertyArea);
 				this.textScriptTr = tr;
 				new Element("div", {
 					"text" : "通过this.event可以获得当前条目的数据，最终返回图片文本内容文本。"
@@ -356,8 +354,7 @@ MWF.xApplication.process.FormDesigner.widget.ElCarouselContent.Tree.Node = new C
 				}
 
 				//clickScript
-				var tr = new Element("tr").inject(this.propertyTable);
-				td = new Element("td", { "colspan": "2" }).inject(tr);
+				var tr = new Element("div").inject(this.propertyArea);
 				new Element("div", {
 					"text" : "通过this.event[0]可以获得当前条目的数据,通过this.event[1]可获取Event对象。"
 				}).inject( td );
-- 
GitLab