diff --git a/CCFlow/NetCore/CcHandlerMiddleware.cs b/CCFlow/NetCore/CcHandlerMiddleware.cs
index 9e28a16e788cedfc8cb7267513f30689324ac31f..9790a15dca9ce3ae92bbc23bce6a854aa9d7e91f 100644
--- a/CCFlow/NetCore/CcHandlerMiddleware.cs
+++ b/CCFlow/NetCore/CcHandlerMiddleware.cs
@@ -99,7 +99,7 @@ namespace CCFlow
                     string data = ctrl.DoMethod(ctrl, ctrl.DoType);
 
                     //返回执行的结果.
-                    if (data.StartsWith("err@", StringComparison.OrdinalIgnoreCase))
+                    if (data != null && data.StartsWith("err@", StringComparison.OrdinalIgnoreCase))
                     {
                         _logger.LogError(data + Environment.NewLine + "请求的Url为：" + context.Request.Path.ToUriComponent() + context.Request.QueryString);
                     }
diff --git a/CCFlow/WF/Admin/FoolFormDesigner/ImpTableField.htm b/CCFlow/WF/Admin/FoolFormDesigner/ImpTableField.htm
index e1d3e5e6e7d9298af71c7e73619362326430d750..aeeb63f5dad29249dd1e3cd3e4c09b29a6cd8de3 100644
--- a/CCFlow/WF/Admin/FoolFormDesigner/ImpTableField.htm
+++ b/CCFlow/WF/Admin/FoolFormDesigner/ImpTableField.htm
@@ -132,21 +132,21 @@
             html += "<ul>";
             $.each(json.tables, function (i, o) {
 
-                if (o.Name.indexOf('Track') > 0)
+                if (o.NAME.indexOf('Track') > 0)
                     return true;
-                if (o.Name.indexOf('Pub_Day') > 0)
+                if (o.NAME.indexOf('Pub_Day') > 0)
                     return true;
-                if (o.Name.indexOf('Pub_ND') > 0)
+                if (o.NAME.indexOf('Pub_ND') > 0)
                     return true;
-                if (o.Name.indexOf('Pub_NY') > 0)
+                if (o.NAME.indexOf('Pub_NY') > 0)
                     return true;
-                if (o.Name.indexOf('Pub_YF') > 0)
+                if (o.NAME.indexOf('Pub_YF') > 0)
                     return true;
 
-                if ((STable || json.STable || "").toLowerCase() === (o.No || "").toLowerCase()) {
-                    html += "<li><font color=red><b>" + o.Name + "</font></b></li>";
+                if ((STable || json.STable || "").toLowerCase() === (o.NO || "").toLowerCase()) {
+                    html += "<li><font color=red><b>" + o.NAME + "</font></b></li>";
                 } else {
-                    html += "<li><a href='javascript: step2(\"" + FK_MapData + "\", \"" + FK_SFDBSrc + "\", \"" + o.No + "\");' >" + o.Name + "</a></li>";
+                    html += "<li><a href='javascript: step2(\"" + FK_MapData + "\", \"" + FK_SFDBSrc + "\", \"" + o.NO + "\");' >" + o.NAME + "</a></li>";
                 }
             });
             html += "</ul>";
@@ -157,20 +157,20 @@
             $.each(json.columns, function (i, o) {
                 var checkboxAttributes = "";
                 $.each(json.attrs, function (attrIndex, attr) {
-                    if (attr.KeyOfEn == o.No) {
+                    if (attr.KeyOfEn == o.NO) {
                         checkboxAttributes = " disabled='disabled' onclick='return false' ";
                         return false;
                     }
                 });
                 html += "<tr>";
-                html += "	<td nowrap>" + o.colid + "</td>";
+                html += "	<td nowrap>" + o.COLID + "</td>";
                 html += "	<td nowrap>";
-                html += "		<input type='checkbox' id='CB_Col_" + o.No + "' name='CB_Col_" + o.No + "' no='" + o.No + "' " + checkboxAttributes + ">";
-                html += "		<label for='CB_Col_" + o.No + "'>" + o.No + "</label>";
+                html += "		<input type='checkbox' id='CB_Col_" + o.NO + "' name='CB_Col_" + o.NO + "' no='" + o.NO + "' " + checkboxAttributes + ">";
+                html += "		<label for='CB_Col_" + o.NO + "'>" + o.NO + "</label>";
                 html += "	</td>";
-                html += "	<td nowrap>" + o.Name + "</td>";
-                html += "	<td nowrap>" + o.DBType + "</td>";
-                html += "	<td nowrap>" + o.DBLength + "</td>";
+                html += "	<td nowrap>" + o.NAME + "</td>";
+                html += "	<td nowrap>" + o.DBTYPE + "</td>";
+                html += "	<td nowrap>" + o.DBLENGTH + "</td>";
                 html += "</tr>";
             });
             $("#all_columns").html(html);
@@ -209,9 +209,9 @@
             json = JSON.parse(json);
             var html = "";
             $.each(json.selectedColumns, function (i, o) {
-                var typeString = o.DBType.toLowerCase();
+                var typeString = o.DBTYPE.toLowerCase();
                 var dataType = "1";
-                if (typeString.indexOf("int") != -1) {
+                if (typeString.indexOf("int") != -1 || typeString.indexOf("number") != -1) {
                     dataType = "2";
                 } else if (typeString.indexOf("float") != -1) {
                     dataType = "3";
@@ -220,32 +220,32 @@
                 }
                 html += "<tr>";
                 html += "	<td nowrap class='Idx'>" + (i + 1) + "</td>";
-                html += "	<td nowrap>" + o.No + "</td>";
+                html += "	<td nowrap>" + o.NO + "</td>";
                 html += "	<td nowrap>";
-                html += "		<input type='text' id='TB_Desc_" + o.No + "' name='TB_Desc_" + o.No + "' value='" + o.Name + "' size='20'>";
+                html += "		<input type='text' id='TB_Desc_" + o.NO + "' name='TB_Desc_" + o.NO + "' value='" + o.NAME + "' size='20'>";
                 html += "	</td>";
                 html += "	<td nowrap>";
-                html += "		<select id='DDL_DBType_" + o.No + "' name='DDL_DBType_" + o.No + "' style='min-width:90px;'>";
+                html += "		<select id='DDL_DBType_" + o.NO + "' name='DDL_DBType_" + o.NO + "' style='min-width:90px;'>";
                 $.each(json.MyDataType, function (enumIndex, enum_) {
                     html += "		<option value='" + enum_.IntKey + "' " + ((enum_.IntKey == dataType) ? "selected='selected'" : "") + ">" + enum_.Lab + "</option>";
                 });
                 html += "		</select>";
                 html += "	</td>";
                 html += "	<td nowrap>";
-                html += "		<select id='DDL_LogicType_" + o.No + "' name='DDL_LogicType_" + o.No + "' style='min-width:90px;'>";
+                html += "		<select id='DDL_LogicType_" + o.NO + "' name='DDL_LogicType_" + o.NO + "' style='min-width:90px;'>";
                 $.each(json.LGType, function (enumIndex, enum_) {
                     html += "		<option value='" + enum_.IntKey + "'>" + enum_.Lab + "</option>";
                 });
                 html += "		</select>";
                 html += "	</td>";
                 html += "	<td nowrap>";
-                html += "		<input type='text' id='TB_BindKey_" + o.No + "' name='TB_BindKey_" + o.No + "' ondblclick='OpenSelectBindKey(this)' size='30'>";
+                html += "		<input type='text' id='TB_BindKey_" + o.NO + "' name='TB_BindKey_" + o.NO + "' ondblclick='OpenSelectBindKey(this)' size='30'>";
                 html += "	</td>";
                 html += "	<td nowrap>";
-                html += "		<input type='text' id='TB_Len_" + o.No + "' name='TB_Len_" + o.No + "' value='" + o.DBLength + "' size='5'>";
+                html += "		<input type='text' id='TB_Len_" + o.NO + "' name='TB_Len_" + o.NO + "' value='" + o.DBLENGTH + "' size='5'>";
                 html += "	</td>";
                 html += "	<td nowrap style='style=\"text-align:center\"'>";
-                html += "		<input type='hidden' id='HID_Idx_" + o.No + "' name='HID_Idx_" + o.No + "' value='" + (i + 1) + "'>";
+                html += "		<input type='hidden' id='HID_Idx_" + o.NO + "' name='HID_Idx_" + o.NO + "' value='" + (i + 1) + "'>";
                 html += "		<a href='javascript:void(0);' onclick='up(this, 7)' class='easyui-linkbutton' data-options=\"iconCls:'icon-up'\"></a>";
                 html += "		&nbsp;";
                 html += "		<a href='javascript:void(0)' onclick='down(this, 7)' class='easyui-linkbutton' data-options=\"iconCls:'icon-down'\"></a>";
diff --git a/CCFlow/WF/Comm/RefFunc/EnOnly.htm b/CCFlow/WF/Comm/RefFunc/EnOnly.htm
index f7a630204c9c469ead0f63ccb5c3835151279663..ab90a111e1b996b672b551e9898c382b77f07d40 100644
--- a/CCFlow/WF/Comm/RefFunc/EnOnly.htm
+++ b/CCFlow/WF/Comm/RefFunc/EnOnly.htm
@@ -71,7 +71,6 @@
         var webUser = new WebUser();
         $(function () {
             pkVal = GetPKVal();
-            debugger
             //新增时En.htm页面隐藏
             if (window.parent && window.parent.$('#EnLayout').length == 1 && pkVal == null)
                 window.parent.$('#EnLayout').layout('remove', 'west');
diff --git a/CCFlow/WF/MyFlowFree2017.js b/CCFlow/WF/MyFlowFree2017.js
index 767199f33e783310760990cc1a36152ec13ffe34..803d93df05a8d2b5fd28ff2ac7335248bfde1edd 100644
--- a/CCFlow/WF/MyFlowFree2017.js
+++ b/CCFlow/WF/MyFlowFree2017.js
@@ -675,10 +675,13 @@ function figure_Template_Image(frmImage) {
         if (frmImage.ImgSrcType == 0) {
             //替换参数
             var frmPath = frmImage.ImgPath;
-            frmPath = frmPath.replace('＠', '@');
-            frmPath = frmPath.replace('@basePath', basePath);
-            frmPath = frmPath.replace('@basePath', basePath);
-            imgSrc = DealJsonExp(flowData.MainTable[0], frmPath);
+			if(frmPath !== null){
+				frmPath = frmPath.replace('＠', '@');
+				frmPath = frmPath.replace('@basePath', basePath);
+				frmPath = frmPath.replace('@basePath', basePath);
+				imgSrc = DealJsonExp(flowData.MainTable[0], frmPath);
+			}
+            
         }
 
         //数据来源为指定路径.
diff --git a/CCFlow/WF/MyFlowGener.js b/CCFlow/WF/MyFlowGener.js
index b190414a1d3b73681d9de5425bfbd65558c9fdfb..93ce1e9a05bf331a2190aa7d9525335749e5546d 100644
--- a/CCFlow/WF/MyFlowGener.js
+++ b/CCFlow/WF/MyFlowGener.js
@@ -168,7 +168,8 @@ function DtlFrm(ensName, refPKVal, pkVal, frmType, InitPage, FK_MapData, FK_Node
 }
 //单表单加载需要执行的函数
 function CCFormLoaded() {
-    if (parent != null && parent.document.getElementById('MainFrames') != undefined) {
+	try{
+		if (parent != null && parent.document.getElementById('MainFrames') != undefined) {
         //计算高度，展示滚动条
         var height = $(parent.document.getElementById('MainFrames')).height() - 110;
         //$('#topContentDiv').height(height);
@@ -193,6 +194,16 @@ function CCFormLoaded() {
     if (typeof FormOnLoadCheckIsNull != 'undefined' && FormOnLoadCheckIsNull instanceof Function) {
         FormOnLoadCheckIsNull();
     }
+	}catch{
+		//新加
+        //计算高度，展示滚动条
+        var height = $("#CCForm").height($(window).height() - 135 + "px").css("overflow-y", "auto");
+
+        $(window).resize(function () {
+            $("#CCForm").height($(window).height() - 135 + "px").css("overflow-y", "auto");
+        });
+	}
+    
 }
 
 //设置底部工具栏
diff --git a/Components/BP.En30/En/Entity.cs b/Components/BP.En30/En/Entity.cs
index c7d7e81b16baef5584e7c5eaa31cc06ee45b2796..e57829f4dca81de0998d50f25c53db7a90fc7345 100644
--- a/Components/BP.En30/En/Entity.cs
+++ b/Components/BP.En30/En/Entity.cs
@@ -1191,11 +1191,14 @@ namespace BP.En
             /*如果是没有放入缓存的实体. @wangyanyan */
             if (this.EnMap.DepositaryOfEntity == Depositary.Application)
             {
-                var row = BP.DA.Cash2019.GetRow(this.ToString(), this.PKVal.ToString());
-                if (row != null && row.Count > 2)
-                {
-                    this.Row = row;
-                    return 1;
+                //不知道为什么，组件信息没有放到缓存，所以如果是组件信息不从缓存中获取 @wangchangdang
+                if (this.ToString() != "BP.WF.Template.FrmNodeComponent") {
+                    var row = BP.DA.Cash2019.GetRow(this.ToString(), this.PKVal.ToString());
+                    if (row != null && row.Count > 2)
+                    {
+                        this.Row = row;
+                        return 1;
+                    }
                 }
             }