e签宝模板 元数据新增两个字段：签署方（文本）、关联控件（F7）

metadata/com/kingdee/eas/custom/esign/ESignTemplate.bizunit

@@ -116,9 +116,9 @@
             <lang locale="zh_TW" value="com.kingdee.eas.custom.esign.client.ESignTemplateListUI" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.custom.esign.ESignTemplate].extendedProperty.maxFieldIndex">
-            <lang locale="en_US" value="28" />
-            <lang locale="zh_CN" value="28" />
-            <lang locale="zh_TW" value="28" />
+            <lang locale="en_US" value="30" />
+            <lang locale="zh_CN" value="30" />
+            <lang locale="zh_TW" value="30" />
         </rs>
         <rs key="bizUnit[com.kingdee.eas.custom.esign.ESignTemplate].extendedProperty.useTableEditUI">
             <lang locale="en_US" value="false" />

metadata/com/kingdee/eas/custom/esign/app/CT_ESI_ESignTemplateFields.table

@@ -217,6 +217,34 @@
             <scale>0</scale>
             <precision>0</precision>
         </column>
+        <column>
+            <name>CFRelatedControlID</name>
+            <alias>dataTable[com.kingdee.eas.custom.esign.app.CT_ESI_ESignTemplateFields].columns.column[CFRelatedControlID].alias</alias>
+            <description>dataTable[com.kingdee.eas.custom.esign.app.CT_ESI_ESignTemplateFields].columns.column[CFRelatedControlID].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>VARCHAR</sqlType>
+            <length>44</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
+        <column>
+            <name>CFSigningParty</name>
+            <alias>dataTable[com.kingdee.eas.custom.esign.app.CT_ESI_ESignTemplateFields].columns.column[CFSigningParty].alias</alias>
+            <description>dataTable[com.kingdee.eas.custom.esign.app.CT_ESI_ESignTemplateFields].columns.column[CFSigningParty].description</description>
+            <userDefined>true</userDefined>
+            <isMultilingual>false</isMultilingual>
+            <isEncoded>false</isEncoded>
+            <isNullable>true</isNullable>
+            <defaultValue />
+            <sqlType>NVARCHAR</sqlType>
+            <length>100</length>
+            <scale>0</scale>
+            <precision>0</precision>
+        </column>
     </columns>
     <primaryKey>
         <name>CPK_ESI_ESTFIDk2ft</name>
@@ -231,6 +259,27 @@
             </primaryKeyColumn>
         </primaryKeyColumns>
     </primaryKey>
+    <foreignKeys>
+        <foreignKey>
+            <name>CFK_ESI_ESIESTFE6e</name>
+            <userDefined>true</userDefined>
+            <refTable>
+                <key name="package" value="com.kingdee.eas.custom.esign.app" />
+                <key name="name" value="CT_ESI_ESignTemplate" />
+            </refTable>
+            <fkColumnPairs>
+                <fkColumnPair>
+                    <sequence>0</sequence>
+                    <refColumn>
+                        <key name="name" value="FID" />
+                    </refColumn>
+                    <fkColumn>
+                        <key name="name" value="CFRelatedControlID" />
+                    </fkColumn>
+                </fkColumnPair>
+            </fkColumnPairs>
+        </foreignKey>
+    </foreignKeys>
     <resource>
         <rs key="dataTable[com.kingdee.eas.custom.esign.app.CT_ESI_ESignTemplateFields].alias">
             <lang locale="en_US" value="null" />
@@ -322,6 +371,18 @@
             <lang locale="zh_HK" value="Y座標" />
             <lang locale="zh_TW" value="Y座標" />
         </rs>
+        <rs key="dataTable[com.kingdee.eas.custom.esign.app.CT_ESI_ESignTemplateFields].columns.column[CFRelatedControlID].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="关联控件" />
+            <lang locale="zh_HK" value="關聯控件" />
+            <lang locale="zh_TW" value="關聯控件" />
+        </rs>
+        <rs key="dataTable[com.kingdee.eas.custom.esign.app.CT_ESI_ESignTemplateFields].columns.column[CFRelatedControlID].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="关联控件" />
+            <lang locale="zh_HK" value="關聯控件" />
+            <lang locale="zh_TW" value="關聯控件" />
+        </rs>
         <rs key="dataTable[com.kingdee.eas.custom.esign.app.CT_ESI_ESignTemplateFields].columns.column[CFRequired].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="是否必填" />
@@ -345,6 +406,18 @@
             <lang locale="zh_CN" value="" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="dataTable[com.kingdee.eas.custom.esign.app.CT_ESI_ESignTemplateFields].columns.column[CFSigningParty].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="签署方" />
+            <lang locale="zh_HK" value="簽署方" />
+            <lang locale="zh_TW" value="簽署方" />
+        </rs>
+        <rs key="dataTable[com.kingdee.eas.custom.esign.app.CT_ESI_ESignTemplateFields].columns.column[CFSigningParty].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="签署方" />
+            <lang locale="zh_HK" value="簽署方" />
+            <lang locale="zh_TW" value="簽署方" />
+        </rs>
         <rs key="dataTable[com.kingdee.eas.custom.esign.app.CT_ESI_ESignTemplateFields].columns.column[CFTemplateFieldId].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="模板字段 id" />

metadata/com/kingdee/eas/custom/esign/app/ESignTemplateFileEntryField.entity

@@ -836,6 +836,40 @@
                 <key name="name" value="CFPageRange" />
             </mappingField>
         </ownProperty>
+        <linkProperty>
+            <name>relatedControl</name>
+            <alias>entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].alias</alias>
+            <description>entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <mappingField>
+                <key name="name" value="CFRelatedControlID" />
+            </mappingField>
+            <relationship>
+                <key name="package" value="com.kingdee.eas.custom.esign.app" />
+                <key name="name" value="R_ESignTemplateFileEntryField_ESignTemplate_relatedControl" />
+            </relationship>
+        </linkProperty>
+        <ownProperty>
+            <name>signingParty</name>
+            <alias>entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].alias</alias>
+            <description>entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].description</description>
+            <userDefined>true</userDefined>
+            <configured>false</configured>
+            <dataType>String</dataType>
+            <metadataRef />
+            <isMultilingual>false</isMultilingual>
+            <isNullable>false</isNullable>
+            <formula />
+            <length>100</length>
+            <precision>0</precision>
+            <decimalDigits>0</decimalDigits>
+            <defaultValue>entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].defaultValue</defaultValue>
+            <displayFormat />
+            <mappingField>
+                <key name="name" value="CFSigningParty" />
+            </mappingField>
+        </ownProperty>
     </properties>
     <logicalKey>
         <name>id</name>
@@ -849,6 +883,11 @@
             </baseProperty>
         </keyProperties>
     </logicalKey>
+    <defaultView>
+        <name />
+        <alias>entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].defaultViewalias</alias>
+        <description>entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].defaultViewdescription</description>
+    </defaultView>
     <resource>
         <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].alias">
             <lang locale="en_US" value="null" />
@@ -856,6 +895,28 @@
             <lang locale="zh_HK" value="電子簽文件範本字段" />
             <lang locale="zh_TW" value="電子簽文件範本字段" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].defaultViewalias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].defaultViewdescription">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].defaultViewextendedProperty.genBusinessImplCode">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].defaultViewextendedProperty.genImplementCode">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].description">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="" />
@@ -1279,6 +1340,63 @@
             <lang locale="zh_HK" value="null" />
             <lang locale="zh_TW" value="null" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="关联控件" />
+            <lang locale="zh_HK" value="關聯控件" />
+            <lang locale="zh_TW" value="關聯控件" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="关联控件" />
+            <lang locale="zh_HK" value="關聯控件" />
+            <lang locale="zh_TW" value="關聯控件" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].extendedProperty.ColWidthInKDTable">
+            <lang locale="en_US" value="50" />
+            <lang locale="zh_CN" value="50" />
+            <lang locale="zh_TW" value="50" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].extendedProperty.dataField">
+            <lang locale="en_US" value="state" />
+            <lang locale="zh_CN" value="state" />
+            <lang locale="zh_TW" value="state" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].extendedProperty.isAsstAcctType">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].extendedProperty.isForGrouping">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].extendedProperty.isForMapping">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].extendedProperty.isForMatching">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].extendedProperty.isForWrittenBack">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].extendedProperty.isInCode">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.linkProperty[relatedControl].extendedProperty.isVisibleForKDTable">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[componentType].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="字段类型" />
@@ -1828,6 +1946,74 @@
             <lang locale="zh_CN" value="true" />
             <lang locale="zh_TW" value="true" />
         </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="签署方" />
+            <lang locale="zh_HK" value="簽署方" />
+            <lang locale="zh_TW" value="簽署方" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].defaultValue">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="签署方" />
+            <lang locale="zh_HK" value="簽署方" />
+            <lang locale="zh_TW" value="簽署方" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].extendedProperty.ColWidthInKDTable">
+            <lang locale="en_US" value="50" />
+            <lang locale="zh_CN" value="50" />
+            <lang locale="zh_TW" value="50" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].extendedProperty.bizDataType">
+            <lang locale="en_US" value="STRING" />
+            <lang locale="zh_CN" value="STRING" />
+            <lang locale="zh_TW" value="STRING" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].extendedProperty.enableFieldPermission">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].extendedProperty.isAsstAcctType">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].extendedProperty.isForGrouping">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].extendedProperty.isForMapping">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].extendedProperty.isForMatching">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].extendedProperty.isForWrittenBack">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].extendedProperty.isInCode">
+            <lang locale="en_US" value="false" />
+            <lang locale="zh_CN" value="false" />
+            <lang locale="zh_TW" value="false" />
+        </rs>
+        <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[signingParty].extendedProperty.isVisibleForKDTable">
+            <lang locale="en_US" value="true" />
+            <lang locale="zh_CN" value="true" />
+            <lang locale="zh_TW" value="true" />
+        </rs>
         <rs key="entityObject[com.kingdee.eas.custom.esign.app.ESignTemplateFileEntryField].properties.ownProperty[templateFieldId].alias">
             <lang locale="en_US" value="null" />
             <lang locale="zh_CN" value="模板字段 id" />

metadata/com/kingdee/eas/custom/esign/app/R_ESignTemplateFileEntryField_ESignTemplate_relatedControl.relation

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<relationship xmlns="com.kingdee.bos.metadata">
+    <package>com.kingdee.eas.custom.esign.app</package>
+    <name>R_ESignTemplateFileEntryField_ESignTemplate_relatedControl</name>
+    <alias>relationship[com.kingdee.eas.custom.esign.app.R_ESignTemplateFileEntryField_ESignTemplate_relatedControl].alias</alias>
+    <description>relationship[com.kingdee.eas.custom.esign.app.R_ESignTemplateFileEntryField_ESignTemplate_relatedControl].description</description>
+    <userDefined>true</userDefined>
+    <type>Association</type>
+    <clientCardinality>1</clientCardinality>
+    <supplierCardinality>0..1</supplierCardinality>
+    <xmlNodeRelationship />
+    <clientObject>
+        <key name="package" value="com.kingdee.eas.custom.esign.app" />
+        <key name="name" value="ESignTemplateFileEntryField" />
+    </clientObject>
+    <supplierObject>
+        <key name="package" value="com.kingdee.eas.custom.esign.app" />
+        <key name="name" value="ESignTemplateFileEntryField" />
+    </supplierObject>
+    <resource>
+        <rs key="relationship[com.kingdee.eas.custom.esign.app.R_ESignTemplateFileEntryField_ESignTemplate_relatedControl].alias">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+        <rs key="relationship[com.kingdee.eas.custom.esign.app.R_ESignTemplateFileEntryField_ESignTemplate_relatedControl].description">
+            <lang locale="en_US" value="null" />
+            <lang locale="zh_CN" value="null" />
+            <lang locale="zh_HK" value="null" />
+            <lang locale="zh_TW" value="null" />
+        </rs>
+    </resource>
+</relationship>

src/com/kingdee/eas/custom/esign/AbstractESignTemplateFileEntryFieldInfo.java

@@ -151,6 +151,28 @@ public class AbstractESignTemplateFileEntryFieldInfo extends com.kingdee.eas.fra
     {
         setString("pageRange", item);
     }
+    /**
+     * Object: 电子签文件模板字段 's 关联控件 property 
+     */
+    public com.kingdee.eas.custom.esign.ESignTemplateFileEntryFieldInfo getRelatedControl()
+    {
+        return (com.kingdee.eas.custom.esign.ESignTemplateFileEntryFieldInfo)get("relatedControl");
+    }
+    public void setRelatedControl(com.kingdee.eas.custom.esign.ESignTemplateFileEntryFieldInfo item)
+    {
+        put("relatedControl", item);
+    }
+    /**
+     * Object:电子签文件模板字段's 签署方property 
+     */
+    public String getSigningParty()
+    {
+        return getString("signingParty");
+    }
+    public void setSigningParty(String item)
+    {
+        setString("signingParty", item);
+    }
     public BOSObjectType getBOSType()
     {
         return new BOSObjectType("F2377A0F");

src/com/kingdee/eas/custom/esign/app/ESignTemplateControllerBean.java

@@ -24,7 +24,6 @@ import com.kingdee.bos.*;
 import com.kingdee.bos.dao.IObjectPK;
 import com.kingdee.eas.common.EASBizException;
 
-import java.math.BigDecimal;
 import java.sql.Time;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -105,13 +104,14 @@ public class ESignTemplateControllerBean extends AbstractESignTemplateController
                 ESignTemplateFileEntryInfo entryInfo = entrys.get(i);
                 String entryId = entryInfo.getId().toString();
                 ESignTemplateFileEntryFieldCollection fields = entryInfo.getFields();
-                ESignTemplateFileEntryFieldCollection oldFields = entryFieldCollectionMap.get(entryId);
-                for (int x = 0; x < oldFields.size(); x++) {
-                    ESignTemplateFileEntryFieldInfo xInfo = oldFields.get(x);
-                    if (!fields.contains(xInfo)) {
-                        fields.add(xInfo);
-                    }
-                }
+                fields.clear();
+                fields.addCollection(entryFieldCollectionMap.get(entryId));
+//                for (int x = 0; x < oldFields.size(); x++) {
+//                    ESignTemplateFileEntryFieldInfo xInfo = oldFields.get(x);
+//                    if (!fields.contains(xInfo)) {
+//                        fields.add(xInfo);
+//                    }
+//                }
             }
         }
         super._update(ctx, pk, model);
@@ -227,17 +227,17 @@ public class ESignTemplateControllerBean extends AbstractESignTemplateController
                         //¿Ø¼þÊý¾Ý¸ñʽ
                         JSONObject componentSpecialAttribute = component.getJSONObject("componentSpecialAttribute");
                         fieldInfo.setDataFormat(componentSpecialAttribute.getString("dateFormat"));
-                        JSONObject componentPosition = component.getJSONObject("componentPosition");
-                        if (componentPosition != null) {
-                            BigDecimal componentPositionX = componentPosition.getBigDecimal("componentPositionX");
-                            BigDecimal componentPositionY = componentPosition.getBigDecimal("componentPositionY");
-                            if(null!=componentPositionX&&null!=componentPositionY) {
-                                fieldInfo.setPositionX(componentPositionX);
-                                fieldInfo.setPositionY(componentPositionY);
-                                fieldInfo.setPageNum(componentPosition.getInteger("componentPageNum"));
-                                fieldInfo.setPageRange(componentPosition.getString("componentPageRange"));
-                            }
-                        }
+//                        JSONObject componentPosition = component.getJSONObject("componentPosition");
+//                        if (componentPosition != null) {
+//                            BigDecimal componentPositionX = componentPosition.getBigDecimal("componentPositionX");
+//                            BigDecimal componentPositionY = componentPosition.getBigDecimal("componentPositionY");
+//                            if (null != componentPositionX && null != componentPositionY) {
+//                                fieldInfo.setPositionX(componentPositionX);
+//                                fieldInfo.setPositionY(componentPositionY);
+//                                fieldInfo.setPageNum(componentPosition.getInteger("componentPageNum"));
+//                                fieldInfo.setPageRange(componentPosition.getString("componentPageRange"));
+//                            }
+//                        }
                     }
                 }
                 if (!fieldMap.isEmpty()) {