diff --git a/backend/form/src/main/resources/template/form/pc/fieldControl.ftl b/backend/form/src/main/resources/template/form/pc/fieldControl.ftl
index 4c54f7d..bd8e056 100644
--- a/backend/form/src/main/resources/template/form/pc/fieldControl.ftl
+++ b/backend/form/src/main/resources/template/form/pc/fieldControl.ftl
@@ -1,19 +1,19 @@
 
 <#function getNgModel field type>
-    <#assign rtn><#if type!=1>item.${field.name}<#else>data.${field.fieldPath}</#if></#assign>
-    <#return rtn>
+	<#assign rtn><#if type!=1>item.${field.name}<#else>data.${field.fieldPath}</#if></#assign>
+	<#return rtn>
 </#function>
 <#function getSubNgModel field type>
-    <#assign rtn><#if type!=1>data.${field.boDefAlias}.${field.parentNodeType}_${field.tableName}.${field.name}</#if></#assign>
-    <#return rtn>
+	<#assign rtn><#if type!=1>data.${field.boDefAlias}.${field.parentNodeType}_${field.tableName}.${field.name}</#if></#assign>
+	<#return rtn>
 </#function>
 <#function getPermissionLine field type hasLinkage>
- 	<#assign rtn>
- 		<#if type!=1 && hasLinkage==true>v-permission-line="'${field.parentNodeType}_${field.tableName}_${field.name}'"<#else></#if></#assign>
+	<#assign rtn>
+		<#if type!=1 && hasLinkage==true>v-permission-line="'${field.parentNodeType}_${field.tableName}_${field.name}'"<#else></#if></#assign>
 	<#return rtn>
 </#function>
 <#function getAtter field type>
- 	<#assign rtn><#if type!=1>item.${field.name}<#else>data.${field.tableName}.${field.name}</#if></#assign>
+	<#assign rtn><#if type!=1>item.${field.name}<#else>data.${field.tableName}.${field.name}</#if></#assign>
 	<#return rtn>
 </#function>
 <#function getPermission field type>
@@ -50,188 +50,188 @@
 <#function getInput field type hasLinkage >
 	<#assign configAttr = util.getInputAdvancedAttributes(field.options)>
 	<#assign rtn>
-        <ht-input <#if field.options.showCondition.fieldPath?if_exists>v-if="${field.options.showCondition.fieldPath}=='${field.options.showCondition.value}'"</#if>
+		<ht-input <#if field.options.showCondition.fieldPath?if_exists>v-if="${field.options.showCondition.fieldPath}=='${field.options.showCondition.value}'"</#if>
 				  v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-                  <#if field.options.placeholder?if_exists>
-					   <#if field.placeholderI18nKey?if_exists>
-						   :placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-					   <#else>
-				   		placeholder="${field.options.placeholder}"
-					   </#if>
-				   </#if>
-                  :permission="${getPermission(field,type)}"
-                  ${getPermissionLine(field,type,hasLinkage)}
-                  <#if field.options.isReadonly ?if_exists>readonly</#if>
-									<#if field.options.isInputEdit ?if_exists>:disabled="${field.options.isInputEdit}"</#if>
-									<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
-									
-									<#if field.options.inputType ?if_exists>:showPassword="${field.options.inputType}"</#if>
-                  <#if field.options.validate?if_exists && field.options.validate?length gt 0 >:validate="${field.options.validate}"</#if>
-				  <#if configAttr != "{}">:config-attributes="${configAttr}"</#if>
-                  <#if field.options.mathExp?if_exists>math-exp="${field.options.mathExp}"</#if>
-				  <#if field.options.isCountDate> :date-calc-exp="{start:'${field.options.isStartDate}',end:'${field.options.isEndDate}',diffType:'${field.options.countFormat}'}"</#if>
-				  <#if field.options.formulasDiyJs?if_exists > v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field,type)}}"</#if>
-					<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
-        		  <#if field.options.mapping?if_exists>v-mapping="data.${field.options.mapping}"</#if>
-             	<#if field.options.width?if_exists>
-              		style="width: ${field.options.width};"
-              	</#if>
+				<#if field.options.placeholder?if_exists>
+					<#if field.placeholderI18nKey?if_exists>
+						:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+					<#else>
+						placeholder="${field.options.placeholder}"
+					</#if>
+				</#if>
+				  :permission="${getPermission(field,type)}"
+				${getPermissionLine(field,type,hasLinkage)}
+				<#if field.options.isReadonly ?if_exists>readonly</#if>
+				<#if field.options.isInputEdit ?if_exists>:disabled="${field.options.isInputEdit}"</#if>
+				<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
+
+				<#if field.options.inputType ?if_exists>:showPassword="${field.options.inputType}"</#if>
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0 >:validate="${field.options.validate}"</#if>
+				<#if configAttr != "{}">:config-attributes="${configAttr}"</#if>
+				<#if field.options.mathExp?if_exists>math-exp="${field.options.mathExp}"</#if>
+				<#if field.options.isCountDate> :date-calc-exp="{start:'${field.options.isStartDate}',end:'${field.options.isEndDate}',diffType:'${field.options.countFormat}'}"</#if>
+				<#if field.options.formulasDiyJs?if_exists > v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field,type)}}"</#if>
+				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
+				<#if field.options.mapping?if_exists>v-mapping="data.${field.options.mapping}"</#if>
+				<#if field.options.width?if_exists>
+					style="width: ${field.options.width};"
+				</#if>
 				${getHyperlink(field)}
-        >
-				 <#if field.options.bindPreAndSufFixjson.preFix?if_exists><template slot="prepend">${field.options.bindPreAndSufFixjson.preFix}</template> </#if>
-        <#if field.options.bindPreAndSufFixjson.sufSix?if_exists> <template slot="append">${field.options.bindPreAndSufFixjson.sufSix}</template></#if>
-        </ht-input>
+		>
+			<#if field.options.bindPreAndSufFixjson.preFix?if_exists><template slot="prepend">${field.options.bindPreAndSufFixjson.preFix}</template> </#if>
+			<#if field.options.bindPreAndSufFixjson.sufSix?if_exists> <template slot="append">${field.options.bindPreAndSufFixjson.sufSix}</template></#if>
+		</ht-input>
 	</#assign>
 	<#return rtn>
 </#function>
 <#function getNumberInput field type hasLinkage>
 	<#assign rtn>
-        <ht-input v-model="${getNgModel(field,type)}" name="${field.desc}" ctrlType="${field.ctrlType}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-				   type="number" company="${field.options.company}" :permission="${getPermission(field,type)}"
-				  	controlsPosition="${field.options.controlsPosition}"
-				  	contentAlign="${field.options.contentAlign}"
-				  	showCompanys="${field.options.showCompanys}"
+		<ht-input v-model="${getNgModel(field,type)}" name="${field.desc}" ctrlType="${field.ctrlType}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+				  type="number" company="${field.options.company}" :permission="${getPermission(field,type)}"
+				  controlsPosition="${field.options.controlsPosition}"
+				  contentAlign="${field.options.contentAlign}"
+				  showCompanys="${field.options.showCompanys}"
 				<#if field.options.controls> :controls="${field.options.controls}"<#else> :controls="false"</#if>
-				   <#if field.options.placeholder?if_exists>
+				<#if field.options.placeholder?if_exists>
 					<#if field.placeholderI18nKey?if_exists>
 						:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
 					<#else>
 						placeholder="${field.options.placeholder}"
 					</#if>
 				</#if>
-                   ${getPermissionLine(field,type,hasLinkage)}
-				   <#if field.options.mathExp?if_exists>math-exp="${field.options.mathExp}"</#if>
-                   <#if field.options.validate?if_exists && field.options.validate?length gt 0 >:validate="${field.options.validate}"</#if>
-				   <#if field.options.min?if_exists>:min=${field.options.min?c}</#if>
-				   <#if field.options.max?if_exists>:max=${field.options.max?c}</#if>
-				   <#if field.options.step?if_exists>:step=${field.options.step?c}</#if>
-				   <#if field.options.decimalDigits>:precision=${field.options.decimalDigits}
-					
-					 </#if>
-                   <#if field.options.filterthousandBit?if_exists>filterthousand-bit</#if> <#--千分位-->
-                   <#if field.options.filtercurrency?if_exists>filtercurrency</#if> <#--货币大写-->
-                   <#if field.options.formulasDiyJs?if_exists>v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
-									 <#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
-        		   <#if field.options.mapping?if_exists>v-mapping="data.${field.options.mapping}"</#if>
-        		   <#if field.options.isCountDate>:date-calc-exp="{start:'${field.options.isStartDate}',end:'${field.options.isEndDate}',diffType:'${field.options.countFormat}'}"</#if>
-               <#if field.options.width?if_exists>
-              style="width: ${field.options.width};"
-              </#if>
+				${getPermissionLine(field,type,hasLinkage)}
+				<#if field.options.mathExp?if_exists>math-exp="${field.options.mathExp}"</#if>
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0 >:validate="${field.options.validate}"</#if>
+				  <#if field.options.min?if_exists>:min=${field.options.min?c}</#if>
+				  <#if field.options.max?if_exists>:max=${field.options.max?c}</#if>
+				  <#if field.options.step?if_exists>:step=${field.options.step?c}</#if>
+				  <#if field.options.decimalDigits>:precision=${field.options.decimalDigits}
+
+				</#if>
+				<#if field.options.filterthousandBit?if_exists>filterthousand-bit</#if> <#--千分位-->
+				<#if field.options.filtercurrency?if_exists>filtercurrency</#if> <#--货币大写-->
+				<#if field.options.formulasDiyJs?if_exists>v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
+				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
+				<#if field.options.mapping?if_exists>v-mapping="data.${field.options.mapping}"</#if>
+				<#if field.options.isCountDate>:date-calc-exp="{start:'${field.options.isStartDate}',end:'${field.options.isEndDate}',diffType:'${field.options.countFormat}'}"</#if>
+				<#if field.options.width?if_exists>
+					style="width: ${field.options.width};"
+				</#if>
 				${getHyperlink(field)}
 				<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
 				<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
-        >
-        </ht-input>
+		>
+		</ht-input>
 	</#assign>
 	<#return rtn>
 </#function>
 <#function getRadio field type hasLinkage>
 	<#assign rtn>
-        <ht-radio v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-                   <#if field.options.inline >option-layout="vertical"<#else>option-layout="horizontal"</#if>
-                   <#if field.options.validate?if_exists && field.options.validate?length gt 0 > :validate="${field.options.validate}"</#if>
-                   ${util.getLinkage(field.options)}
-                   :ganged="${util.getSelectQuery(field.options,type!=1)}"
-                   :permission="${getPermission(field,type)}"
-                   rdlist='${util.getJsonByPath(field.options,'options')}'
-                   :style='${util.getMapString(field,"controlstyle")}'
-                   ${getPermissionLine(field,type,hasLinkage)}
-                    <#if field.options.formulasDiyJs?if_exists > v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
-					<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
-					<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
-					<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
-        >
-        </ht-radio>
+		<ht-radio v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+				<#if field.options.inline >option-layout="vertical"<#else>option-layout="horizontal"</#if>
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0 > :validate="${field.options.validate}"</#if>
+				${util.getLinkage(field.options)}
+				  :ganged="${util.getSelectQuery(field.options,type!=1)}"
+				  :permission="${getPermission(field,type)}"
+				  rdlist='${util.getJsonByPath(field.options,'options')}'
+				  :style='${util.getMapString(field,"controlstyle")}'
+				${getPermissionLine(field,type,hasLinkage)}
+				<#if field.options.formulasDiyJs?if_exists > v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
+				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
+				<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
+				<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
+		>
+		</ht-radio>
 	</#assign>
 	<#return rtn>
 </#function>
 <#function getCheckbox field type hasLinkage>
-    <#assign rtn>
-        <ht-checkbox v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-                      <#if field.options.inline >option-layout="vertical"<#else>option-layout="horizontal"</#if>
-                      :ganged="${util.getSelectQuery(field.options,type!=1)}"
-                      :permission="${getPermission(field,type)}"
-											:max="${field.options.checkboxMax}"
-                      <#if field.options.validate?if_exists && field.options.validate?length gt 0 > :validate="${field.options.validate}"</#if>
-                      ${util.getLinkage(field.options)}
-                      cklist='${util.getJsonByPath(field.options,'options')}'
-                      :style='${util.getMapString(field,"controlstyle")}'
-                      ${getPermissionLine(field,type,hasLinkage)}
-					  <#if field.options.formulasDiyJs?if_exists > v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
-					  <#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
-					  <#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
-						<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
-        >
-        </ht-checkbox>
-    </#assign>
-    <#return rtn>
+	<#assign rtn>
+		<ht-checkbox v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+				<#if field.options.inline >option-layout="vertical"<#else>option-layout="horizontal"</#if>
+					 :ganged="${util.getSelectQuery(field.options,type!=1)}"
+					 :permission="${getPermission(field,type)}"
+					 :max="${field.options.checkboxMax}"
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0 > :validate="${field.options.validate}"</#if>
+				${util.getLinkage(field.options)}
+					 cklist='${util.getJsonByPath(field.options,'options')}'
+					 :style='${util.getMapString(field,"controlstyle")}'
+				${getPermissionLine(field,type,hasLinkage)}
+				<#if field.options.formulasDiyJs?if_exists > v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
+				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
+				<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
+				<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
+		>
+		</ht-checkbox>
+	</#assign>
+	<#return rtn>
 </#function>
 <#function getSelect field type hasLinkage>
-    <#assign customQuery  = util.getStringConf(field.options.customQuery)>
-    <#assign rtn>
-        <ht-select v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-                    <#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
-						</#if>
+	<#assign customQuery  = util.getStringConf(field.options.customQuery)>
+	<#assign rtn>
+		<ht-select v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+				<#if field.options.placeholder?if_exists>
+					<#if field.placeholderI18nKey?if_exists>
+						:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+					<#else>
+						placeholder="${field.options.placeholder}"
 					</#if>
-                    :ganged="${util.getSelectQuery(field.options,type!=1)}"
-				    <#if field.options.validate?if_exists && field.options.validate?length gt 0 >:validate="${field.options.validate}"</#if>
-					${util.getLinkage(field.options)}
-                    ${util.getAttrs(':multiple,:filterable,:allowCreate,:related-query',field)}
-                    :permission="${getPermission(field,type)}"
-					:limit-count="${field.options.limitCount!1}"
-                    :selectlist='${util.getJsonByPath(field.options,'options')}'
-					${getPermissionLine(field,type,hasLinkage)}
-                    <#if field.options.formulasDiyJs?if_exists >v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
-										<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
-                    <#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
-                    <#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
-										<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
+				</#if>
+				   :ganged="${util.getSelectQuery(field.options,type!=1)}"
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0 >:validate="${field.options.validate}"</#if>
+				${util.getLinkage(field.options)}
+				${util.getAttrs(':multiple,:filterable,:allowCreate,:related-query',field)}
+				   :permission="${getPermission(field,type)}"
+				   :limit-count="${field.options.limitCount!1}"
+				   :selectlist='${util.getJsonByPath(field.options,'options')}'
+				${getPermissionLine(field,type,hasLinkage)}
+				<#if field.options.formulasDiyJs?if_exists >v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
+				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
+				<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
+				<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
+				<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
 		>
-        </ht-select>
-    </#assign>
-    <#return rtn>
+		</ht-select>
+	</#assign>
+	<#return rtn>
 </#function>
 
 <#function getCustomChart field type hasLinkage>
 	<#assign rtn>
-	<ht-chart alias="${field.options.alias}" id="${field.options.chartId}" width="${field.options.chartWidth}" height="${field.options.chartHeight}" chart-key="${field.key}"
-			<#if field.options.selectList?if_exists > selectList="${util.toJsonStr(field.options.selectList)}"</#if>
-      <#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
-	></ht-chart>
+		<ht-chart alias="${field.options.alias}" id="${field.options.chartId}" width="${field.options.chartWidth}" height="${field.options.chartHeight}" chart-key="${field.key}"
+				<#if field.options.selectList?if_exists > selectList="${util.toJsonStr(field.options.selectList)}"</#if>
+				<#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
+		></ht-chart>
 	</#assign>
 	<#return rtn>
 </#function>
 
 <#function getDialog field type hasLinkage>
-    <#assign name  = util.getJsonByPath(field.customDialogjson,'name')>
-    <#assign icon  = util.getJsonByPath(field.customDialogjson,'icon')>
-    <#assign custdialogConf  = util.getStringConf(field.options.customDialogjson)>
-    <#assign rtn>
+	<#assign name  = util.getJsonByPath(field.customDialogjson,'name')>
+	<#assign icon  = util.getJsonByPath(field.customDialogjson,'icon')>
+	<#assign custdialogConf  = util.getStringConf(field.options.customDialogjson)>
+	<#assign rtn>
 		<ht-custom-dialog v-model="${getNgModel(field,type)}"  model-name="${getNgModel(field,type)}"
-										name="${field.desc}"
-                    :custdialog='${custdialogConf}'
-                    placeholder="${field.options.placeholder}"
-                    :permission="${getPermission(field,type)}"
-					style="width: ${field.options.width?default('100%')}"
-                    atter="${getAtter(field,type)}"
-                    ${util.getAttrs('tooltipplacement',field)}
-                    ${getPermissionLine(field,type,hasLinkage)}
-                    <#if type?if_exists && (type==2 || type == 3)>:subIndex="getPageOffset('data.${subListPath}') + $index"</#if>
-										<#if type?if_exists&&type==3>:sunIndex="sunIndex" subPath="data.${subListPath}" :currentSubData="data.${subListPath}"</#if>
-					<#if field.options.validate?if_exists && field.options.validate?length gt 0> :validate="${field.options.validate}"</#if>
-                    :style='${util.getMapString(field,"controlstyle")}'
+						  name="${field.desc}"
+						  :custdialog='${custdialogConf}'
+						  placeholder="${field.options.placeholder}"
+						  :permission="${getPermission(field,type)}"
+						  style="width: ${field.options.width?default('100%')}"
+						  atter="${getAtter(field,type)}"
+				${util.getAttrs('tooltipplacement',field)}
+				${getPermissionLine(field,type,hasLinkage)}
+				<#if type?if_exists && (type==2 || type == 3)>:subIndex="getPageOffset('data.${subListPath}') + $index"</#if>
+				<#if type?if_exists&&type==3>:sunIndex="sunIndex" subPath="data.${subListPath}" :currentSubData="data.${subListPath}"</#if>
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0> :validate="${field.options.validate}"</#if>
+						  :style='${util.getMapString(field,"controlstyle")}'
 				${getHyperlink(field)}
 				<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
 				<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
 		>
-            <span slot="labeldesc">${field.desc}</span>
-        </ht-custom-dialog>
-    </#assign>
-    <#return rtn>
+			<span slot="labeldesc">${field.desc}</span>
+		</ht-custom-dialog>
+	</#assign>
+	<#return rtn>
 </#function>
 <#function getEipButton field type hasLinkage>
 	<#assign name  = util.getJsonByPath(field.options.bindEventjson,'name')>
@@ -239,35 +239,35 @@
 	<#assign isShowInput  = util.getJsonByPath(field.options.bindEventjson,'isShowInput')>
 	<#assign alias  = util.getJsonByPath(field.options.bindEventjson,'alias')>
 	<#assign rtn>
-			<ht-button
-					<#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-					icon="${icon}"
-					btn-name="${name}"
-					<#if field.tableName?if_exists && field.name?if_exists && !field.options.bindEventjson.isShowInput>:permission="${getPermission(field,type)}"</#if>
-					<#if field.options.bindEventjson.isShowInput>
+		<ht-button
+				<#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+				icon="${icon}"
+				btn-name="${name}"
+				<#if field.tableName?if_exists && field.name?if_exists && !field.options.bindEventjson.isShowInput>:permission="${getPermission(field,type)}"</#if>
+				<#if field.options.bindEventjson.isShowInput>
 					v-model="${getNgModel(field,type)}"
-					is-show-input 
+					is-show-input
 					:permission="${getPermission(field,type)}"
-					</#if>
-					<#if field.options.formulasDiyJs?if_exists>v-formula="{value:'${field.options.formulasDiyJs}',bindPath:${getFormula(field, type)}}"</#if>
-					<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
-					<#if field.options.showCondition.fieldPath?if_exists>v-if="${field.options.showCondition.fieldPath}=='${field.options.showCondition.value}'"</#if>
-					${getPermissionLine(field,type,hasLinkage)}
-					script="${field.options.script}">
-			</ht-button>
+				</#if>
+				<#if field.options.formulasDiyJs?if_exists>v-formula="{value:'${field.options.formulasDiyJs}',bindPath:${getFormula(field, type)}}"</#if>
+				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
+				<#if field.options.showCondition.fieldPath?if_exists>v-if="${field.options.showCondition.fieldPath}=='${field.options.showCondition.value}'"</#if>
+				${getPermissionLine(field,type,hasLinkage)}
+				script="${field.options.script}">
+		</ht-button>
 	</#assign>
 	<#return rtn>
 </#function>
 <#function getEipDivider field type>
 	<#assign rtn>
-			<ht-divider
-					<#if field.options.position?if_exists>content-position="${field.options.position}"</#if>
-					 <#if field.options.color?if_exists>color="${field.options.color}"</#if>
-					 >
-					 <template>
-					  <i <#if field.options.customDialogjson.icon?if_exists>class="${field.options.customDialogjson.icon}"</#if>><#if field.options.content?if_exists>${field.options.content}</#if></i>
-					</template>
-			</ht-divider>
+		<ht-divider
+				<#if field.options.position?if_exists>content-position="${field.options.position}"</#if>
+				<#if field.options.color?if_exists>color="${field.options.color}"</#if>
+		>
+			<template>
+				<i <#if field.options.customDialogjson.icon?if_exists>class="${field.options.customDialogjson.icon}"</#if>><#if field.options.content?if_exists>${field.options.content}</#if></i>
+			</template>
+		</ht-divider>
 	</#assign>
 	<#return rtn>
 </#function>
@@ -297,12 +297,12 @@
 					${getPermissionLine(field,type,hasLinkage)}
 					<#if field.options.noToolbar?if_exists>noToolbar="${field.options.noToolbar}"</#if>
 					<#if field.options.textValue?if_exists>
-					textValue="${util.toJsonStr(field.options.textValue)}"
+						textValue="${util.toJsonStr(field.options.textValue)}"
 					</#if>
 					<#if field.options.isShowBorder == 1>
 						:showBorder="true"
 					</#if>
-						<#if field.options.isShowBorder == 0>
+					<#if field.options.isShowBorder == 0>
 						:showBorder="false"
 					</#if>
 					borderColor="${util.toJsonStr(field.options.borderColor)}"
@@ -322,7 +322,7 @@
 					name="${field.desc}"
 					<#if field.options.showWordLimit?if_exists>:show-word-limit="${field.options.showWordLimit}"</#if>
 					<#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-				<#if field.options.placeholder?if_exists>
+					<#if field.options.placeholder?if_exists>
 						<#if field.placeholderI18nKey?if_exists>
 							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
 						<#else>
@@ -338,11 +338,11 @@
 					<#if field.options.formulasDiyJs?if_exists >v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
 					<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
 					<#if field.options.mapping?if_exists>v-mapping="data.${field.options.mapping}"</#if>
-				   <#if field.options.width?if_exists>
-					  style="width: ${field.options.width};"
-				   </#if>
+					<#if field.options.width?if_exists>
+						style="width: ${field.options.width};"
+					</#if>
 					${getHyperlink(field)}
-				>
+			>
 			</ht-input>
 		</#assign>
 	</#if>
@@ -351,8 +351,8 @@
 <#function getFont field type >
 	<#assign rtn>
 		<#if field.options.textValue?if_exists>
-            <ht-editor <#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
-            		   text-value="${util.toJsonStr(field.options.textValue)}"
+			<ht-editor <#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
+					   text-value="${util.toJsonStr(field.options.textValue)}"
 					<#if field.options.isShowBorder && field.options.isShowBorder == "0">show-border</#if>
 					<#if field.options.isShowBorder && field.options.isShowBorder == "0">border-color="${util.toJsonStr(field.options.borderColor)}"</#if>
 					${getHyperlink(field)}
@@ -364,7 +364,7 @@
 <#function getQRcode field type >
 	<#assign rtn>
 		<ht-qrcode :inst-id="instId" :def-id="defId" :is-support-mobile="isSupportMobile"
-    <#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>></ht-qrcode>
+				   <#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>></ht-qrcode>
 	</#assign>
 	<#return rtn>
 </#function>
@@ -372,94 +372,94 @@
 	<#assign rtn>
 		<#assign allowPreview = util.getJsonByPath(field.options.file,'allowPreview','false')>
 		<#assign allowDownload = util.getJsonByPath(field.options.file,'allowDownload','false')>
-        <ht-file v-model="${getNgModel(field,type)}" name="${field.desc}"
-			      <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-                  :permission="${getPermission(field,type)}"
-                  <#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
-				  ${util.getAttrs('propConf,accept',field)}
-                  :limit="${field.options.file.limit}"
-                  :allow-preview="${allowPreview}"
-                  :allow-download="${allowDownload}"
-                  :size="${util.getToString(field.options.file.size)}"
-                  ${getPermissionLine(field,type,hasLinkage)}
-				  :multiple="${util.getJsonByPath(field.options.file,'multiple','false')}"
-                  :simplicity="${util.getJsonByPath(field.options.file,'simplicity','false')}"
-                  :flow-data="extendProp">
-        </ht-file>
+		<ht-file v-model="${getNgModel(field,type)}" name="${field.desc}"
+				 <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+				 :permission="${getPermission(field,type)}"
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
+				${util.getAttrs('propConf,accept',field)}
+				 :limit="${field.options.file.limit}"
+				 :allow-preview="${allowPreview}"
+				 :allow-download="${allowDownload}"
+				 :size="${util.getToString(field.options.file.size)}"
+				${getPermissionLine(field,type,hasLinkage)}
+				 :multiple="${util.getJsonByPath(field.options.file,'multiple','false')}"
+				 :simplicity="${util.getJsonByPath(field.options.file,'simplicity','false')}"
+				 :flow-data="extendProp">
+		</ht-file>
 	</#assign>
 	<#return rtn>
 </#function>
 <#function getDic field type hasLinkage >
 	<#assign rtn>
-        <ht-dictionary v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-                 :permission="${getPermission(field,type)}"
-				 <#if field.options.validate?if_exists && field.options.validate?length gt 0 > :validate="${field.options.validate}"</#if>
-				 dickey="${field.options.dic}"
-				 ${util.getAttrs(':filterable',field)}
-				 ${getPermissionLine(field,type,hasLinkage)}
-				 <#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
-						</#if>
+		<ht-dictionary v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+					   :permission="${getPermission(field,type)}"
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0 > :validate="${field.options.validate}"</#if>
+					   dickey="${field.options.dic}"
+				${util.getAttrs(':filterable',field)}
+				${getPermissionLine(field,type,hasLinkage)}
+				<#if field.options.placeholder?if_exists>
+					<#if field.placeholderI18nKey?if_exists>
+						:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+					<#else>
+						placeholder="${field.options.placeholder}"
 					</#if>
+				</#if>
 				<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
 				<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
 				${getHyperlink(field)}
 		>
-        </ht-dictionary>
+		</ht-dictionary>
 	</#assign>
 	<#return rtn>
 </#function>
 <#function getTag field type hasLinkage>
 	<#assign rtn>
 		<ht-tag
-			v-model="${getNgModel(field,type)}"
-			name="${field.desc}"
-			:permission="${getPermission(field,type)}"
-			<#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
-			tag-key="${field.options.tag}"
-			<#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
-						</#if>
+				v-model="${getNgModel(field,type)}"
+				name="${field.desc}"
+				:permission="${getPermission(field,type)}"
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
+				tag-key="${field.options.tag}"
+				<#if field.options.placeholder?if_exists>
+					<#if field.placeholderI18nKey?if_exists>
+						:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+					<#else>
+						placeholder="${field.options.placeholder}"
 					</#if>
-			${getPermissionLine(field,type,hasLinkage)}
-			${util.getAttrs(':filterable',field)}
-			${util.getAttrs(':expand',field)}
-			${util.getAttrs(':multiple',field)}>
+				</#if>
+				${getPermissionLine(field,type,hasLinkage)}
+				${util.getAttrs(':filterable',field)}
+				${util.getAttrs(':expand',field)}
+				${util.getAttrs(':multiple',field)}>
 		</ht-tag>
 	</#assign>
 	<#return rtn>
 </#function>
 <#function getDropdown field type hasLinkage >
-    <#assign customQuery  = util.getStringConf(field.options.customQuery)>
+	<#assign customQuery  = util.getStringConf(field.options.customQuery)>
 	<#assign rtn>
 		<ht-select-tree :ganged="${util.getSelectQuery(field.options,type!=1)}"
-                        v-model="${getNgModel(field,type)}"
+						v-model="${getNgModel(field,type)}"
 						name="${field.desc}"
-						<#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
-						</#if>
+				<#if field.options.placeholder?if_exists>
+					<#if field.placeholderI18nKey?if_exists>
+						:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+					<#else>
+						placeholder="${field.options.placeholder}"
 					</#if>
-                        <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-                        ${util.getAttrs(':multiple,:filterable,:allowCreate',field)}
-                        :permission="${getPermission(field,type)}"
-                        ${getPermissionLine(field,type,hasLinkage)}
-		 				<#if field.options.validate?if_exists && field.options.validate?length gt 0 >:validate="${field.options.validate}"</#if>
-						<#if field.options.formulasDiyJs?if_exists >v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
-						<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
-						<#if field.options.limitCount?if_exists>:limit-count="${field.options.limitCount}"</#if>
-						<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
-						<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
-						 <#if field.options.customQuery.treeDataMode ?if_exists>:treeDataMode="${field.options.customQuery.treeDataMode}"</#if>
-				       <#if field.options.customQuery.pvalue?if_exists >	:pvalue="getPvalue('${field.options.customQuery.pvalue}')"</#if>
+				</#if>
+				<#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+				${util.getAttrs(':multiple,:filterable,:allowCreate',field)}
+						:permission="${getPermission(field,type)}"
+				${getPermissionLine(field,type,hasLinkage)}
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0 >:validate="${field.options.validate}"</#if>
+				<#if field.options.formulasDiyJs?if_exists >v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
+				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
+				<#if field.options.limitCount?if_exists>:limit-count="${field.options.limitCount}"</#if>
+				<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
+				<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
+				<#if field.options.customQuery.treeDataMode ?if_exists>:treeDataMode="${field.options.customQuery.treeDataMode}"</#if>
+				<#if field.options.customQuery.pvalue?if_exists >	:pvalue="getPvalue('${field.options.customQuery.pvalue}')"</#if>
 		>
 		</ht-select-tree>
 	</#assign>
@@ -474,12 +474,12 @@
 				:ganged="${util.getSelectQuery(field.options,type!=1)}"
 				:style='${util.getMapString(field,"controlstyle")}'
 				<#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
-						</#if>
+					<#if field.placeholderI18nKey?if_exists>
+						:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+					<#else>
+						placeholder="${field.options.placeholder}"
 					</#if>
+				</#if>
 				${getPermissionLine(field,type,hasLinkage)}
 				<#if field.options.validate?if_exists && field.options.validate?length gt 0> :validate="${field.options.validate}"</#if>
 				<#if field.options.mapping?if_exists>v-mapping="data.${field.options.mapping}"</#if>
@@ -496,13 +496,13 @@
 				<#if field.options.validate?if_exists && field.options.validate?length gt 0 >:validate="${field.options.validate}"</#if>
 				:permission="${getPermission(field,type)}"
 				:ganged="${util.getSelectQuery(field.options,type!=1)}"
-			<#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
-						</#if>
+				<#if field.options.placeholder?if_exists>
+					<#if field.placeholderI18nKey?if_exists>
+						:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+					<#else>
+						placeholder="${field.options.placeholder}"
 					</#if>
+				</#if>
 				${getPermissionLine(field,type,hasLinkage)}
 				<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
 				<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
@@ -513,88 +513,88 @@
 </#function>
 <#function getEipDate field type hasLinkage >
 	<#assign day  = util.getJsonByPath(field.options,'day','0')>
-    <#assign showDate  = util.getJsonByPath(field.options,'showCurrentDate','false')>
+	<#assign showDate  = util.getJsonByPath(field.options,'showCurrentDate','false')>
 	<#switch field.options.type>
-	<#case 'date' >
-		<#assign rtn>
-		<ht-date
-				v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-                <#if field.options.isServerDate>is-server-date</#if>
-				:permission="${getPermission(field,type)}"
-				${getPermissionLine(field,type,hasLinkage)}
-                <#if field.options.validate?if_exists && field.options.validate?length gt 0 > :validate="${field.options.validate}"</#if>
-                <#if showDate == 'true'>show-date</#if>
-								<#if field.options.isInputEdit ?if_exists>:disabled="${field.options.isInputEdit}"</#if>
-							
-				<#if day != '0'&& day ?if_exists>:day="${day}"</#if>
-				<#if field.options.inputFormat?if_exists && field.options.inputFormat?length gt 0>format="${field.options.inputFormat}"</#if>
-				<#if field.options.format?if_exists && field.options.format?length gt 0>value-format="${field.options.format}"</#if>
-				<#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
+		<#case 'date' >
+			<#assign rtn>
+				<ht-date
+						v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+						<#if field.options.isServerDate>is-server-date</#if>
+						:permission="${getPermission(field,type)}"
+						${getPermissionLine(field,type,hasLinkage)}
+						<#if field.options.validate?if_exists && field.options.validate?length gt 0 > :validate="${field.options.validate}"</#if>
+						<#if showDate == 'true'>show-date</#if>
+						<#if field.options.isInputEdit ?if_exists>:disabled="${field.options.isInputEdit}"</#if>
+
+						<#if day != '0'&& day ?if_exists>:day="${day}"</#if>
+						<#if field.options.inputFormat?if_exists && field.options.inputFormat?length gt 0>format="${field.options.inputFormat}"</#if>
+						<#if field.options.format?if_exists && field.options.format?length gt 0>value-format="${field.options.format}"</#if>
+						<#if field.options.placeholder?if_exists>
+							<#if field.placeholderI18nKey?if_exists>
+								:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+							<#else>
+								placeholder="${field.options.placeholder}"
+							</#if>
 						</#if>
-					</#if>
-				<#if field.options.mapping?if_exists>v-mapping="data.${field.options.mapping}"</#if>
-				<#if field.options.formulasDiyJs?if_exists>v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)},format:'${field.options.format}'}"</#if>
-				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},format:'${field.options.format}',type:'default'}"</#if>
-         		<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
-				${getHyperlink(field)}
-				<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
-				<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
-		>
-		</ht-date>
-		</#assign>
-	<#break>
-	<#case 'picker' >
-	<#assign rtn>
-		<ht-time-picker
-				v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-				:permission="${getPermission(field,type)}"
-        ${getPermissionLine(field,type,hasLinkage)}
-			<#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
+						<#if field.options.mapping?if_exists>v-mapping="data.${field.options.mapping}"</#if>
+						<#if field.options.formulasDiyJs?if_exists>v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)},format:'${field.options.format}'}"</#if>
+						<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},format:'${field.options.format}',type:'default'}"</#if>
+						<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
+						${getHyperlink(field)}
+						<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
+						<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
+				>
+				</ht-date>
+			</#assign>
+			<#break>
+		<#case 'picker' >
+			<#assign rtn>
+				<ht-time-picker
+						v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+						:permission="${getPermission(field,type)}"
+						${getPermissionLine(field,type,hasLinkage)}
+						<#if field.options.placeholder?if_exists>
+							<#if field.placeholderI18nKey?if_exists>
+								:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+							<#else>
+								placeholder="${field.options.placeholder}"
+							</#if>
 						</#if>
-					</#if>
-        <#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
-        <#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
-				<#if field.options.formulasDiyJs?if_exists>v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)},format:'${field.options.format}'}"</#if>
-				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},format:'${field.options.format}',type:'default'}"</#if>
-		 <#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
-		 <#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
-		>
-		</ht-time-picker>
-	</#assign>
-	<#break>
-	<#case 'select' >
-		<#assign rtn>
-		<ht-time-select
-				v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-				:permission="${getPermission(field,type)}"
-        ${getPermissionLine(field,type,hasLinkage)}
-        <#if field.options.validate?if_exists && field.options.validate?length gt 0> :validate="${field.options.validate}"</#if>
-				<#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
+						<#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
+						<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
+						<#if field.options.formulasDiyJs?if_exists>v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)},format:'${field.options.format}'}"</#if>
+						<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},format:'${field.options.format}',type:'default'}"</#if>
+						<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
+						<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
+				>
+				</ht-time-picker>
+			</#assign>
+			<#break>
+		<#case 'select' >
+			<#assign rtn>
+				<ht-time-select
+						v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+						:permission="${getPermission(field,type)}"
+						${getPermissionLine(field,type,hasLinkage)}
+						<#if field.options.validate?if_exists && field.options.validate?length gt 0> :validate="${field.options.validate}"</#if>
+						<#if field.options.placeholder?if_exists>
+							<#if field.placeholderI18nKey?if_exists>
+								:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+							<#else>
+								placeholder="${field.options.placeholder}"
+							</#if>
 						</#if>
-					</#if>
-				<#if field.options.mapping?if_exists>v-mapping="data.${field.options.mapping}"</#if>
-				<#if field.options.formulasDiyJs?if_exists>v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)},format:'${(field.options.type =='select')?string('HH:mm:ss','HH:mm')}'}"</#if>
-				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},format:'${(field.options.type =='select')?string('HH:mm:ss','HH:mm')}',type:'default'}"</#if>
-        		<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
-				${getHyperlink(field)}
-				<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
-				<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
-		>
-		</ht-time-select>
-		</#assign>
-	<#break>
+						<#if field.options.mapping?if_exists>v-mapping="data.${field.options.mapping}"</#if>
+						<#if field.options.formulasDiyJs?if_exists>v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)},format:'${(field.options.type =='select')?string('HH:mm:ss','HH:mm')}'}"</#if>
+						<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},format:'${(field.options.type =='select')?string('HH:mm:ss','HH:mm')}',type:'default'}"</#if>
+						<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
+						${getHyperlink(field)}
+						<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
+						<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
+				>
+				</ht-time-select>
+			</#assign>
+			<#break>
 	</#switch>
 	<#return rtn>
 </#function>
@@ -604,18 +604,18 @@
 		<ht-date-picker
 				v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
 				:permission="${getPermission(field,type)}"
-        ${getPermissionLine(field,type,hasLinkage)}
+				${getPermissionLine(field,type,hasLinkage)}
 				<#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
-						</#if>
+					<#if field.placeholderI18nKey?if_exists>
+						:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+					<#else>
+						placeholder="${field.options.placeholder}"
 					</#if>
-                <#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
+				</#if>
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
 				<#if field.options.inputFormat?if_exists && field.options.inputFormat?length gt 0>format="${field.options.inputFormat}"<#else>format="yyyy-MM-dd"</#if>
 				<#if field.options.inputFormat?if_exists && field.options.inputFormat?length gt 0>value-format="${field.options.inputFormat}"<#else>value-format="yyyy-MM-dd"</#if>
-        		<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
+				<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
 				${getHyperlink(field)}
 		>
 		</ht-date-picker>
@@ -626,18 +626,18 @@
 <#function getEipTimePicker field type hasLinkage >
 	<#assign rtn>
 		<ht-time-picker is-range
-				v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-				:permission="${getPermission(field,type)}"
+						v-model="${getNgModel(field,type)}" name="${field.desc}" <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+						:permission="${getPermission(field,type)}"
 				${getPermissionLine(field,type,hasLinkage)}
 				<#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
-						</#if>
+					<#if field.placeholderI18nKey?if_exists>
+						:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+					<#else>
+						placeholder="${field.options.placeholder}"
 					</#if>
-                <#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
-                 <#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
+				</#if>
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
+				<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
 		>
 		</ht-time-picker>
 	</#assign>
@@ -647,85 +647,85 @@
 <#function getEipRelFlow field type hasLinkage >
 	<#assign rtn>
 		<ht-relevant-flow v-model="${getNgModel(field,type)}" name="${field.desc}"
-      <#if field.options.flowRangeKey?if_exists>flowRangeKey="${field.options.flowRangeKey}"</#if>
-						  <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-		                  :permission="${getPermission(field,type)}"
-		                  :search-config="{isPaging:${field.options.isPaging},pageSize:${field.options.pageSize}}"
-                 ></ht-relevant-flow>
+						  <#if field.options.flowRangeKey?if_exists>flowRangeKey="${field.options.flowRangeKey}"</#if>
+				<#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+						  :permission="${getPermission(field,type)}"
+						  :search-config="{isPaging:${field.options.isPaging},pageSize:${field.options.pageSize}}"
+		></ht-relevant-flow>
 	</#assign>
 	<#return rtn>
 </#function>
 <#function getEipImg field type >
-    <#assign rtn>
-        <ht-image
-                <#if field.options.isDisplay?if_exists>:is-display="${field.options.isDisplay?default(false)}"</#if>
-                <#if field.options.imgSrc?if_exists>img-src="${field.options.imgSrc}" :is-display="false"</#if>
-                file-json='${field.options.fileJson}'
-                :img-height='${field.options.size.height?default(0)}'
-                :img-width='${field.options.size.width?default(0)}'
-                <#if field.options.openUrl?if_exists>open-url="${field.options.openUrl}"</#if>
-                <#if field.options.openType?if_exists>open-type="${field.options.openType}"</#if>
-                <#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
-                 />
-    </#assign>
-    <#return rtn>
+	<#assign rtn>
+		<ht-image
+				<#if field.options.isDisplay?if_exists>:is-display="${field.options.isDisplay?default(false)}"</#if>
+				<#if field.options.imgSrc?if_exists>img-src="${field.options.imgSrc}" :is-display="false"</#if>
+				file-json='${field.options.fileJson}'
+				:img-height='${field.options.size.height?default(0)}'
+				:img-width='${field.options.size.width?default(0)}'
+				<#if field.options.openUrl?if_exists>open-url="${field.options.openUrl}"</#if>
+				<#if field.options.openType?if_exists>open-type="${field.options.openType}"</#if>
+				<#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
+		/>
+	</#assign>
+	<#return rtn>
 </#function>
 <#function getEipViewer field type hasLinkage>
 	<#assign rtn>
 		<#assign allowPreview = util.getJsonByPath(field.options.file,'allowPreview','true')>
 		<#assign allowDownload = util.getJsonByPath(field.options.file,'allowDownload','false')>
-			<ht-picture v-model="${getNgModel(field,type)}" name="${field.desc}"
-			      <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-                  :permission="${getPermission(field,type)}"
-                  <#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
-                  :limit="${field.options.file.limit}"
-				  <#if field.options.imgHeight?if_exists>img-height="${field.options.imgHeight}"</#if>
-				  <#if field.options.imgWidth?if_exists>img-width="${field.options.imgWidth}"</#if>
-				  upload-type="${field.options.uploadType}"
-                  :allow-preview="${allowPreview}"
-                  :allow-download="${allowDownload}"
-				  openUrl="${field.options.openUrl}"
-                  ${getPermissionLine(field,type,hasLinkage)}
-				  :multiple="${util.getJsonByPath(field.options.file,'multiple','false')}"
-           <#if field.options.file.compress?if_exists>:compress="${field.options.file.compress}"</#if>
-				  :flow-data="extendProp">
-        </ht-picture>
+		<ht-picture v-model="${getNgModel(field,type)}" name="${field.desc}"
+					<#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+					:permission="${getPermission(field,type)}"
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
+					:limit="${field.options.file.limit}"
+				<#if field.options.imgHeight?if_exists>img-height="${field.options.imgHeight}"</#if>
+				<#if field.options.imgWidth?if_exists>img-width="${field.options.imgWidth}"</#if>
+					upload-type="${field.options.uploadType}"
+					:allow-preview="${allowPreview}"
+					:allow-download="${allowDownload}"
+					openUrl="${field.options.openUrl}"
+				${getPermissionLine(field,type,hasLinkage)}
+					:multiple="${util.getJsonByPath(field.options.file,'multiple','false')}"
+				<#if field.options.file.compress?if_exists>:compress="${field.options.file.compress}"</#if>
+					:flow-data="extendProp">
+		</ht-picture>
 	</#assign>
 	<#return rtn>
 </#function>
 <#function getSwitch field type hasLinkage>
-    <#assign rtn>
-        <ht-switch v-model="${getNgModel(field,type)}"
+	<#assign rtn>
+		<ht-switch v-model="${getNgModel(field,type)}"
 				   <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-            	   :permission="${getPermission(field,type)}"
-				   ${getPermissionLine(field,type,hasLinkage)}
-				   <#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
+				   :permission="${getPermission(field,type)}"
+				${getPermissionLine(field,type,hasLinkage)}
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
 				   active-value="${field.options.activeValue}"
 				   inactive-value="${field.options.inactiveValue}"
 				   active-text="${field.options.activeText}"
 				   inactive-text="${field.options.inactiveText}"
-				   <#if field.options.formulasDiyJs?if_exists >v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
-					 <#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
-				>
-        </ht-switch>
-    </#assign>
-    <#return rtn>
+				<#if field.options.formulasDiyJs?if_exists >v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
+				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
+		>
+		</ht-switch>
+	</#assign>
+	<#return rtn>
 </#function>
 
 <#function getUrlParameter field type hasLinkage>
-    <#assign rtn>
-        <ht-url-parameter v-model="${getNgModel(field,type)}"
-				   <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-            	   :permission="${getPermission(field,type)}"
-				   ${getPermissionLine(field,type,hasLinkage)}
-				   <#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
-				  bindKey="${field.options.bindKey}"
-				   <#if field.options.formulasDiyJs?if_exists >v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
-					 <#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)}}"</#if>
-				>
-        </ht-url-parameter>
-    </#assign>
-    <#return rtn>
+	<#assign rtn>
+		<ht-url-parameter v-model="${getNgModel(field,type)}"
+						  <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+						  :permission="${getPermission(field,type)}"
+				${getPermissionLine(field,type,hasLinkage)}
+				<#if field.options.validate?if_exists && field.options.validate?length gt 0>:validate="${field.options.validate}"</#if>
+						  bindKey="${field.options.bindKey}"
+				<#if field.options.formulasDiyJs?if_exists >v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field, type)}}"</#if>
+				<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)}}"</#if>
+		>
+		</ht-url-parameter>
+	</#assign>
+	<#return rtn>
 </#function>
 
 <#function getHistoricalApproval field type >
@@ -738,36 +738,43 @@
 	<#return rtn>
 </#function>
 <#function getEipMap field type >
-    <#assign rtn>
-        <ht-map v-model="${getNgModel(field,type)}"
-        		:permission="${getPermission(field,type)}"
-            heightMap="${field.options.heightMap}"
-            widthMap="${field.options.widthMap}"
-            showEffect="${field.options.showEffect}"
-            <#if field.options.locationPath> locationPath="data.${field.options.locationPath}"</#if>
-						<#if formSetting.display>displayStyle=${formSetting.display}</#if>
-        		name="${field.desc}"
-                <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+	<#assign rtn>
+		<ht-map v-model="${getNgModel(field,type)}"
+				:permission="${getPermission(field,type)}"
+				heightMap="${field.options.heightMap}"
+				widthMap="${field.options.widthMap}"
+				showEffect="${field.options.showEffect}"
+				<#if field.options.locationPath> locationPath="data.${field.options.locationPath}"</#if>
+				<#if field.options.longitudePath> longitudePath="data.${field.options.longitudePath}"</#if>
+				<#if field.options.latitudePath> latitudePath="data.${field.options.latitudePath}"</#if>
+				<#if field.options.provincePath> provincePath="data.${field.options.provincePath}"</#if>
+				<#if field.options.cityPath> cityPath="data.${field.options.cityPath}"</#if>
+				<#if field.options.districtPath> districtPath="data.${field.options.districtPath}"</#if>
+				<#if field.options.streetPath> streetPath="data.${field.options.streetPath}"</#if>
+				<#if formSetting.display>displayStyle=${formSetting.display}</#if>
+				name="${field.desc}"
+
+				<#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
 				<#if field.options.isAddPosition>:append-position="${field.options.isAddPosition}"</#if>
 		></ht-map>
-    </#assign>
-    <#return rtn>
+	</#assign>
+	<#return rtn>
 </#function>
 <#function getOffice field type hasLinkage>
 	<#assign rtn>
-<#--		<span>office组件尚未实现...</span>-->
+	<#--		<span>office组件尚未实现...</span>-->
 	</#assign>
 	<#return rtn>
 </#function>
 <#function getSignature field type hasLinkage>
 	<#assign rtn>
-<#--		<span>签名组件尚未实现...</span>-->
+	<#--		<span>签名组件尚未实现...</span>-->
 	</#assign>
 	<#return rtn>
 </#function>
 <#function getFlowChart field type>
 	<#assign rtn>
-<#--		<span>流程图组件尚未实现...</span>-->
+	<#--		<span>流程图组件尚未实现...</span>-->
 	</#assign>
 	<#return rtn>
 </#function>
@@ -779,67 +786,67 @@
 </#function>
 <#-- 子表关联查询回填 -->
 <#function getSubtableCustomQueryBackfill layout >
-    <#assign queryConfig  = util.getStringConf(layout.customQuery)>
-    <#assign rtn>
-    	<ht-subtable-backfill
-    	  :customQuery='${queryConfig}'
-        :max-row="${util.getNumber(layout.options.maxRow, 0)}"
-        init-fill-data="${layout.initTemplateData}"
-    	  init-fill-data-type="${layout.initTemplateDataType}"
-        :extend-prop="extendProp"
-        />
-    </#assign>
-    <#return rtn>
+	<#assign queryConfig  = util.getStringConf(layout.customQuery)>
+	<#assign rtn>
+		<ht-subtable-backfill
+				:customQuery='${queryConfig}'
+				:max-row="${util.getNumber(layout.options.maxRow, 0)}"
+				init-fill-data="${layout.initTemplateData}"
+				init-fill-data-type="${layout.initTemplateDataType}"
+				:extend-prop="extendProp"
+		/>
+	</#assign>
+	<#return rtn>
 </#function>
 <#-- 标题 简单文字方法 -->
 <#function getText field>
-    <#assign rtn>
-     <ht-text fontSize="${field.options.fontSize}" fontWeight="${field.options.fontWeight}" ctrlType="${field.ctrlType}"
-			textValue="${util.getBase64(field.options.textValue)}" textAlign="${field.options.textAlign}" paddingTop="${field.options.paddingTop}"
-      <#if field.options.color>color="${field.options.color}"<#else>color="${formSetting.fontColor?replace('\"','')}"</#if>
-      <#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
-      paddingBottom="${field.options.paddingBottom}" paddingLeft="${field.options.paddingLeft}" paddingRight="${field.options.paddingRight}">
-				<template #tip>
-					<#if field.options.tip?default("")?trim?length gt 1>
-						<el-tooltip placement="top">
-							<div slot="content" >${field.options.tip}</div>
-							<i class="el-icon-question" />
-						</el-tooltip>
-					</#if>
+	<#assign rtn>
+		<ht-text fontSize="${field.options.fontSize}" fontWeight="${field.options.fontWeight}" ctrlType="${field.ctrlType}"
+				 textValue="${util.getBase64(field.options.textValue)}" textAlign="${field.options.textAlign}" paddingTop="${field.options.paddingTop}"
+				 <#if field.options.color>color="${field.options.color}"<#else>color="${formSetting.fontColor?replace('\"','')}"</#if>
+				<#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
+				 paddingBottom="${field.options.paddingBottom}" paddingLeft="${field.options.paddingLeft}" paddingRight="${field.options.paddingRight}">
+			<template #tip>
+				<#if field.options.tip?default("")?trim?length gt 1>
+					<el-tooltip placement="top">
+						<div slot="content" >${field.options.tip}</div>
+						<i class="el-icon-question" />
+					</el-tooltip>
+				</#if>
 			</template>
-			</ht-text>
-    </#assign>
-    <#return rtn>
+		</ht-text>
+	</#assign>
+	<#return rtn>
 </#function>
 <#-- 说明 方法 -->
 <#function getExplain field>
-    <#assign rtn>
-     <ht-explain
-			<#if field.options.textValue?if_exists>
-				textValue="${field.options.textValue}"
-			</#if>
-			marginTop="${field.options.marginTop}" marginBottom="${field.options.marginBottom}"
-     fontColor="${formSetting.fontColor?replace('\"','')}"
-     	<#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
-     	<#if field.options.isLabelShow?if_exists>isLabelShow</#if>
-			 ${getHyperlink(field)}
-     >
-		 <template #tip>
-		 	<#if field.options.tip?default("")?trim?length gt 1>
-				<el-tooltip placement="top">
-					<div slot="content" >${field.options.tip}</div>
-					<i class="el-icon-question" />
-				</el-tooltip>
-			</#if>
-		 </template>
-	 </ht-explain>
-    </#assign>
-    <#return rtn>
+	<#assign rtn>
+		<ht-explain
+				<#if field.options.textValue?if_exists>
+					textValue="${field.options.textValue}"
+				</#if>
+				marginTop="${field.options.marginTop}" marginBottom="${field.options.marginBottom}"
+				fontColor="${formSetting.fontColor?replace('\"','')}"
+				<#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
+				<#if field.options.isLabelShow?if_exists>isLabelShow</#if>
+				${getHyperlink(field)}
+		>
+			<template #tip>
+				<#if field.options.tip?default("")?trim?length gt 1>
+					<el-tooltip placement="top">
+						<div slot="content" >${field.options.tip}</div>
+						<i class="el-icon-question" />
+					</el-tooltip>
+				</#if>
+			</template>
+		</ht-explain>
+	</#assign>
+	<#return rtn>
 </#function>
 
 <#function getOpinion field type>
 	<#assign rtn>
-    <ht-opinion :permission="${getPermission(field,type)}" :flow-data="extendProp"></ht-opinion>
+		<ht-opinion :permission="${getPermission(field,type)}" :flow-data="extendProp"></ht-opinion>
 	</#assign>
 	<#return rtn>
 </#function>
@@ -851,14 +858,14 @@
 				 :permission="${getPermission(field,type)}"
 				 name="${field.desc}"
 				 <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-				 <#if field.options.allowHalf?if_exists>allow-half</#if>
-				 <#if field.options.max?if_exists>:max="${field.options.max}"</#if>
-				 <#if field.options.defaultValue?if_exists>:default-value="${field.options.defaultValue}"</#if>
-				 <#if field.options.showScore?if_exists>show-score</#if>
-				 <#if field.options.iconClass?if_exists>icon-class="${field.options.iconClass}"</#if>
-				 <#if field.options.activeColor?if_exists>active-color="${field.options.activeColor}"</#if>
+				<#if field.options.allowHalf?if_exists>allow-half</#if>
+				<#if field.options.max?if_exists>:max="${field.options.max}"</#if>
+				<#if field.options.defaultValue?if_exists>:default-value="${field.options.defaultValue}"</#if>
+				<#if field.options.showScore?if_exists>show-score</#if>
+				<#if field.options.iconClass?if_exists>icon-class="${field.options.iconClass}"</#if>
+				<#if field.options.activeColor?if_exists>active-color="${field.options.activeColor}"</#if>
 
-        		 ></ht-rate>
+		></ht-rate>
 	</#assign>
 	<#return rtn>
 </#function>
@@ -867,17 +874,17 @@
 <#function getSlider field type>
 	<#assign rtn>
 		<ht-slider v-model="${getNgModel(field,type)}"
-				 :permission="${getPermission(field,type)}"
-				 :is-preview="isPreview"
-				 name="${field.desc}"
-				 <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-				 <#if field.options.showInput?if_exists>show-input</#if>
-				 <#if field.options.max?if_exists>:max="${field.options.max}"</#if>
-          <#if field.options.min?if_exists>:min="${field.options.min}"</#if>
-				 <#if field.options.step?if_exists>:step="${field.options.step}"</#if>
-         <#if field.options.validate?if_exists>:validate="${field.options.validate}" </#if>
-				 <#if field.options.defaultValue?if_exists>:default-value="${field.options.defaultValue}"</#if>
-        		 ></ht-slider>
+				   :permission="${getPermission(field,type)}"
+				   :is-preview="isPreview"
+				   name="${field.desc}"
+				   <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+				<#if field.options.showInput?if_exists>show-input</#if>
+				<#if field.options.max?if_exists>:max="${field.options.max}"</#if>
+				<#if field.options.min?if_exists>:min="${field.options.min}"</#if>
+				<#if field.options.step?if_exists>:step="${field.options.step}"</#if>
+				<#if field.options.validate?if_exists>:validate="${field.options.validate}" </#if>
+				<#if field.options.defaultValue?if_exists>:default-value="${field.options.defaultValue}"</#if>
+		></ht-slider>
 	</#assign>
 	<#return rtn>
 </#function>
@@ -932,54 +939,54 @@
 <#function getIframe field type hasLinkage>
 	<#assign rtn>
 		<ht-iframe
-        v-if="${getPermission(field,type)}!='n'"
+				v-if="${getPermission(field,type)}!='n'"
 				src="${field.options.iframeSrc}"
 				height="${field.options.iframeSrcHeight}"
 				width="${field.options.iframeSrcWidth}"
 				style="border-color:${field.options.lableColor}"
-        		iframe-name="${field.options.iframeNmae}"
+				iframe-name="${field.options.iframeNmae}"
 				frameborder="${field.options.frameborder}"
-        iframeType="${field.options.iframeType}"
-        iframeSrcJs="${field.options.iframeSrcJs}"
+				iframeType="${field.options.iframeType}"
+				iframeSrcJs="${field.options.iframeSrcJs}"
 				:data="data"
 				:permission="permission"
 				:inst-id="instId"
 				:isBusinessForm="${field.options.isBusinessForm? string("true","false")}"
 				:urlParameter='${util.getMapString(field.options,"urlParameter")}'
 				:returnParameter='${util.getMapString(field.options,"returnParameter")}'
-				   ></ht-iframe>
+		></ht-iframe>
 	</#assign>
 	<#return rtn>
 </#function>
 <#-- 注意不能加空格  -->
 <#macro input field type hasLinkage>
-<#switch field.ctrlType>
-	<#case 'input' ><#--单行文本框-->${getInput(field,type,hasLinkage)}
-<#break>
-	<#case 'textarea'><#--多行文本框-->${getTextarea(field,type,hasLinkage)}
-<#break>
-	<#case 'richText'><#--多行文本框-->${getTextarea(field,type,hasLinkage)}
-<#break>
-    <#case 'property-text'><#--属性文本-->${getTextarea(field,type,hasLinkage)}
-<#break>
-	<#case 'text'>${getFont(field,type)}
-<#break>
-	<#case 'QRcode'>${getQRcode(field,type)}
-<#break>
-	<#case 'number'><#--数字框-->${getNumberInput(field,type,hasLinkage)}
-<#break>
-    <#case 'currency'><#--数字框-->${getNumberInput(field,type,hasLinkage)}
-<#break>
-	<#case 'radio'><#--单选框-->${getRadio(field,type,hasLinkage)}
-<#break>
-	<#case 'checkbox'><#--多选框-->${getCheckbox(field,type,hasLinkage)}
-<#break>
-	<#case 'select'><#--下拉框-->${getSelect(field,type,hasLinkage)}
-<#break>
-	<#case 'dialog'><#--对话框-->${getDialog(field,type,hasLinkage)}
-<#break>
-	<#case 'selector'><#--选择器(包括组织，岗位，角色，用户选择器等控件组合)-->
-		<${util.getHtSelectorType(field.options,type!=1)}
+	<#switch field.ctrlType>
+		<#case 'input' ><#--单行文本框-->${getInput(field,type,hasLinkage)}
+			<#break>
+		<#case 'textarea'><#--多行文本框-->${getTextarea(field,type,hasLinkage)}
+			<#break>
+		<#case 'richText'><#--多行文本框-->${getTextarea(field,type,hasLinkage)}
+			<#break>
+		<#case 'property-text'><#--属性文本-->${getTextarea(field,type,hasLinkage)}
+			<#break>
+		<#case 'text'>${getFont(field,type)}
+			<#break>
+		<#case 'QRcode'>${getQRcode(field,type)}
+			<#break>
+		<#case 'number'><#--数字框-->${getNumberInput(field,type,hasLinkage)}
+			<#break>
+		<#case 'currency'><#--数字框-->${getNumberInput(field,type,hasLinkage)}
+			<#break>
+		<#case 'radio'><#--单选框-->${getRadio(field,type,hasLinkage)}
+			<#break>
+		<#case 'checkbox'><#--多选框-->${getCheckbox(field,type,hasLinkage)}
+			<#break>
+		<#case 'select'><#--下拉框-->${getSelect(field,type,hasLinkage)}
+			<#break>
+		<#case 'dialog'><#--对话框-->${getDialog(field,type,hasLinkage)}
+			<#break>
+		<#case 'selector'><#--选择器(包括组织，岗位，角色，用户选择器等控件组合)-->
+			<${util.getHtSelectorType(field.options,type!=1)}
 			v-model="${getNgModel(field,type)}"
 			${util.getAttrs(':validate',field)}
 			name="${field.desc}"
@@ -995,124 +1002,124 @@
 			<#if field.options.selector.isSingle>single</#if>
 			<#if field.options.validate?if_exists >:validate="${field.options.validate}" </#if>
 			<#if field.options.placeholder?if_exists>
-						<#if field.placeholderI18nKey?if_exists>
-							:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
-						<#else>
-							placeholder="${field.options.placeholder}"
-						</#if>
-					</#if>
-      <#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
-			 ${getPermissionLine(field,type,hasLinkage)}
-			 <#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
-			 <#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
-        ${getHyperlink(field)}
+				<#if field.placeholderI18nKey?if_exists>
+					:placeholder="$td('${field.placeholderI18nKey}','${field.options.placeholder}')"
+				<#else>
+					placeholder="${field.options.placeholder}"
+				</#if>
+			</#if>
+			<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
+			${getPermissionLine(field,type,hasLinkage)}
+			<#if field.options.disabled ?if_exists>:disabled="${field.options.disabled}"</#if>
+			<#if field.options.isValidate ?if_exists>:isValidate="${field.options.isValidate}"</#if>
+			${getHyperlink(field)}
 			>
-	</${util.getHtSelectorType(field.options,type!=1)}>
-<#break>
-<#case 'immediate-single'><#-- 表单实时控件  单行 -->
-	<ht-readonly-input type="text" ${util.getAttrs('inputType,placeholder,tooltipplacement', field)} name="${field.desc}"
-	                   <#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
-					   style="font-weight:${util.getStyleBold(field,'boldValue')};${util.getStyles(field,'color','valueColor')}"
-					   :style='${util.getMapString(field,"controlstyle")}'
-					   <#if field.options.script?if_exists>script="${field.options.script}"</#if>
-					   v-model="${getNgModel(field,type)}"
-					   <#if field.options.formulasDiyJs?if_exists > v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field,type)}}"</#if>
-						 <#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
-            <#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
-					>
-	</ht-readonly-input>
-<#break>
-<#case 'immediate-textarea'><#-- 表单实时控件  多行  -->
-	<ht-readonly-input type="text" ${util.getAttrs('inputType,placeholder,tooltipplacement',field)} name="${field.desc}"
-					   <#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"
-					   </#if> style="font-weight:${util.getStyleBold(field,'boldValue')};${util.getStyles(field,'color','valueColor')}"
-					   :style='${util.getMapString(field,"controlstyle")}'
-					   <#if field.options.script?if_exists>script="${field.options.script}"</#if>
-					   v-model="${getNgModel(field,type)}"
-					   <#if field.options.formulasDiyJs?if_exists > v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field,type)}}"</#if>
-						 <#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
-             <#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
-					>
-	</ht-readonly-input>
-<#break>
-<#case 'milepost'><#-- 里程碑 -->
-		<ht-milepost v-model="${getNgModel(field,type)}"
-					direction='${field.options.direction}'
-     			  	<#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
-				  	:permission="${getPermission(field,type)}"
-     			  	content='${util.objectToJsonString(field.options.steps)}'></ht-milepost>
-<#break>
-        <#case 'attachment'><#--附件上传-->${getAttachment(field,type,hasLinkage)}
-<#break>
-        <#case 'dic'><#--数据字典-->${getDic(field,type,hasLinkage)}
-	<#break>
+			</${util.getHtSelectorType(field.options,type!=1)}>
+			<#break>
+		<#case 'immediate-single'><#-- 表单实时控件  单行 -->
+			<ht-readonly-input type="text" ${util.getAttrs('inputType,placeholder,tooltipplacement', field)} name="${field.desc}"
+					<#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"</#if>
+							   style="font-weight:${util.getStyleBold(field,'boldValue')};${util.getStyles(field,'color','valueColor')}"
+							   :style='${util.getMapString(field,"controlstyle")}'
+					<#if field.options.script?if_exists>script="${field.options.script}"</#if>
+							   v-model="${getNgModel(field,type)}"
+					<#if field.options.formulasDiyJs?if_exists > v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field,type)}}"</#if>
+					<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
+					<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
+			>
+			</ht-readonly-input>
+			<#break>
+		<#case 'immediate-textarea'><#-- 表单实时控件  多行  -->
+			<ht-readonly-input type="text" ${util.getAttrs('inputType,placeholder,tooltipplacement',field)} name="${field.desc}"
+					<#if field.tableName?if_exists && field.name?if_exists>:permission="${getPermission(field,type)}"
+					</#if> style="font-weight:${util.getStyleBold(field,'boldValue')};${util.getStyles(field,'color','valueColor')}"
+							   :style='${util.getMapString(field,"controlstyle")}'
+					<#if field.options.script?if_exists>script="${field.options.script}"</#if>
+							   v-model="${getNgModel(field,type)}"
+					<#if field.options.formulasDiyJs?if_exists > v-formula="{value:${field.options.formulasDiyJs},bindPath:${getFormula(field,type)}}"</#if>
+					<#if field.options.customInput?if_exists> v-formula="{value:'${field.options.customInput}',bindPath:${getFormula(field,type)},type:'default'}"</#if>
+					<#if field.options.width?if_exists>style="width: ${field.options.width};"</#if>
+			>
+			</ht-readonly-input>
+			<#break>
+		<#case 'milepost'><#-- 里程碑 -->
+			<ht-milepost v-model="${getNgModel(field,type)}"
+						 direction='${field.options.direction}'
+						 <#if type!=1>model-name="${getSubNgModel(field,type)}"<#else>model-name="${getNgModel(field,type)}"</#if>
+						 :permission="${getPermission(field,type)}"
+						 content='${util.objectToJsonString(field.options.steps)}'></ht-milepost>
+			<#break>
+		<#case 'attachment'><#--附件上传-->${getAttachment(field,type,hasLinkage)}
+			<#break>
+		<#case 'dic'><#--数据字典-->${getDic(field,type,hasLinkage)}
+			<#break>
 		<#case 'tag'>${getTag(field,type,hasLinkage)}
-<#break>
-        <#case 'dropdown'><#--下拉树-->${getDropdown(field,type,hasLinkage)}
-<#break>
-<#break>
-	<#case 'autocomplete'><#--自动完成-->${getAutocomplete(field,type,hasLinkage)}
-<#break>
-<#break>
-	<#case 'eip-cascader'><#--级联-->${getEipCascader(field,type,hasLinkage)}
-<#break>
-	<#case 'button'>${getEipButton(field,type,hasLinkage)}
-<#break>
-	<#case 'divider'>${getEipDivider(field,type)} <#--分割线-->
-<#break>
-	<#case 'date'>${getEipDate(field,type,hasLinkage)} <#--日期-->
-<#break>
-	<#case 'time'>${getEipDate(field,type,hasLinkage)} <#--时间-->
-<#break>
-	<#case 'date-picker'>${getEipDatePicker(field,type,hasLinkage)} <#--日期范围-->
-<#break>
-	<#case 'time-picker'>${getEipTimePicker(field,type,hasLinkage)} <#--时间范围-->
-<#break>
-	<#case 'related-process'>${getEipRelFlow(field,type,hasLinkage)} <#--相关流程控件-->
-<#break>
-    <#case 'image'>${getEipImg(field,type)} <#--图片控件-->
-<#break>
-	<#case 'imageViewer'>${getEipViewer(field,type,hasLinkage)} <#--图片控件-->
-<#break>
-    <#case 'switch'>${getSwitch(field,type,hasLinkage)} <#-- 开关控件 -->
-<#break>
-    <#case 'amap'>${getEipMap(field,type)} <#-- 地图控件 -->
-<#break>
-	<#case 'signature'>${getSignature(field,type,hasLinkage)} <#-- 签章控件 -->
-<#break>
-	<#case 'handSignature'>${getHandSignature(field,type,hasLinkage)} <#-- 手动签章控件 -->
-<#break>
-	<#case 'processForecast'>${getProcessForecast(field,type,hasLinkage)} <#-- 审批预测 -->
-<#break>
-	<#case 'htCustomComponent'>${getCustomComponent(field,type)} <#--DIV组件控件-->
-<#break>
-	<#case 'office'>${getOffice(field,type,hasLinkage)} <#-- office控件 -->
-<#break>
-	<#case 'customChart'><#--自定义视图-->${getCustomChart(field,type,hasLinkage)}
-<#break>
-<#case 'flowChart'>${getFlowChart(field,type)} <#-- 流程图控件 -->
-<#break>
-<#case 'approvalHistory'>${getApprovalHistory(field,type)} <#-- 审批历史控件 -->
-<#break>
-<#case 'big-title'>${getText(field)} <#-- 大标题 -->
-<#break>
-<#case 'small-title'>${getText(field)} <#-- 小标题 -->
-<#break>
-<#case 'simple-text'>${getText(field)} <#-- 文字 -->
-<#break>
-<#case 'explain'>${getExplain(field)} <#-- 说明 -->
-<#break>
-<#case 'opinion'>${getOpinion(field, type)} <#-- 审批意见 -->
-<#break>
-<#case 'rate'>${getRate(field, type)}
-<#break>
-<#case 'slider'>${getSlider(field, type)}
-<#break>
-<#case 'iframe'>${getIframe(field, type)}
-<#break>
-<#case 'historicalApproval'>${getHistoricalApproval(field,type)}
-<#break>
-<#case 'urlParameter'>${getUrlParameter(field, type)}
-<#break>
-</#switch>
+			<#break>
+		<#case 'dropdown'><#--下拉树-->${getDropdown(field,type,hasLinkage)}
+			<#break>
+			<#break>
+		<#case 'autocomplete'><#--自动完成-->${getAutocomplete(field,type,hasLinkage)}
+			<#break>
+			<#break>
+		<#case 'eip-cascader'><#--级联-->${getEipCascader(field,type,hasLinkage)}
+			<#break>
+		<#case 'button'>${getEipButton(field,type,hasLinkage)}
+			<#break>
+		<#case 'divider'>${getEipDivider(field,type)} <#--分割线-->
+			<#break>
+		<#case 'date'>${getEipDate(field,type,hasLinkage)} <#--日期-->
+			<#break>
+		<#case 'time'>${getEipDate(field,type,hasLinkage)} <#--时间-->
+			<#break>
+		<#case 'date-picker'>${getEipDatePicker(field,type,hasLinkage)} <#--日期范围-->
+			<#break>
+		<#case 'time-picker'>${getEipTimePicker(field,type,hasLinkage)} <#--时间范围-->
+			<#break>
+		<#case 'related-process'>${getEipRelFlow(field,type,hasLinkage)} <#--相关流程控件-->
+			<#break>
+		<#case 'image'>${getEipImg(field,type)} <#--图片控件-->
+			<#break>
+		<#case 'imageViewer'>${getEipViewer(field,type,hasLinkage)} <#--图片控件-->
+			<#break>
+		<#case 'switch'>${getSwitch(field,type,hasLinkage)} <#-- 开关控件 -->
+			<#break>
+		<#case 'amap'>${getEipMap(field,type)} <#-- 地图控件 -->
+			<#break>
+		<#case 'signature'>${getSignature(field,type,hasLinkage)} <#-- 签章控件 -->
+			<#break>
+		<#case 'handSignature'>${getHandSignature(field,type,hasLinkage)} <#-- 手动签章控件 -->
+			<#break>
+		<#case 'processForecast'>${getProcessForecast(field,type,hasLinkage)} <#-- 审批预测 -->
+			<#break>
+		<#case 'htCustomComponent'>${getCustomComponent(field,type)} <#--DIV组件控件-->
+			<#break>
+		<#case 'office'>${getOffice(field,type,hasLinkage)} <#-- office控件 -->
+			<#break>
+		<#case 'customChart'><#--自定义视图-->${getCustomChart(field,type,hasLinkage)}
+			<#break>
+		<#case 'flowChart'>${getFlowChart(field,type)} <#-- 流程图控件 -->
+			<#break>
+		<#case 'approvalHistory'>${getApprovalHistory(field,type)} <#-- 审批历史控件 -->
+			<#break>
+		<#case 'big-title'>${getText(field)} <#-- 大标题 -->
+			<#break>
+		<#case 'small-title'>${getText(field)} <#-- 小标题 -->
+			<#break>
+		<#case 'simple-text'>${getText(field)} <#-- 文字 -->
+			<#break>
+		<#case 'explain'>${getExplain(field)} <#-- 说明 -->
+			<#break>
+		<#case 'opinion'>${getOpinion(field, type)} <#-- 审批意见 -->
+			<#break>
+		<#case 'rate'>${getRate(field, type)}
+			<#break>
+		<#case 'slider'>${getSlider(field, type)}
+			<#break>
+		<#case 'iframe'>${getIframe(field, type)}
+			<#break>
+		<#case 'historicalApproval'>${getHistoricalApproval(field,type)}
+			<#break>
+		<#case 'urlParameter'>${getUrlParameter(field, type)}
+			<#break>
+	</#switch>
 </#macro>
--
libgit2 0.21.2