From 41464a33e4f710526b14fa8180a1bbd8b7b11b8b Mon Sep 17 00:00:00 2001 From: wangchangdang Date: Thu, 4 Jun 2020 13:32:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 837c710d..2424158c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ -### master分支已升级为.NET Core 3.1 +###开始 + +### master分支已升级为.NET Core 3.1 ### CCFlowForNetcore的版本说明 ### 1. master分支:适配.Net Core 3.1环境。强烈建议采用此分支版本。 -- Gitee From 35b6922b3ad3d303271a5a1c7c31685997683b09 Mon Sep 17 00:00:00 2001 From: wangchangdang Date: Thu, 4 Jun 2020 13:41:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CCFlow/NetCore/CcHandlerMiddleware.cs | 2 +- .../Admin/FoolFormDesigner/ImpTableField.htm | 48 +++++++++---------- CCFlow/WF/Comm/RefFunc/EnOnly.htm | 1 - CCFlow/WF/MyFlowFree2017.js | 11 +++-- CCFlow/WF/MyFlowGener.js | 13 ++++- Components/BP.En30/En/Entity.cs | 13 +++-- 6 files changed, 52 insertions(+), 36 deletions(-) diff --git a/CCFlow/NetCore/CcHandlerMiddleware.cs b/CCFlow/NetCore/CcHandlerMiddleware.cs index 9e28a16e..9790a15d 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 e1d3e5e6..aeeb63f5 100644 --- a/CCFlow/WF/Admin/FoolFormDesigner/ImpTableField.htm +++ b/CCFlow/WF/Admin/FoolFormDesigner/ImpTableField.htm @@ -132,21 +132,21 @@ html += ""; @@ -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 += ""; - html += " " + o.colid + ""; + html += " " + o.COLID + ""; html += " "; - html += " "; - html += " "; + html += " "; + html += " "; html += " "; - html += " " + o.Name + ""; - html += " " + o.DBType + ""; - html += " " + o.DBLength + ""; + html += " " + o.NAME + ""; + html += " " + o.DBTYPE + ""; + html += " " + o.DBLENGTH + ""; html += ""; }); $("#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 += ""; html += " " + (i + 1) + ""; - html += " " + o.No + ""; + html += " " + o.NO + ""; html += " "; - html += " "; + html += " "; html += " "; html += " "; - html += " "; $.each(json.MyDataType, function (enumIndex, enum_) { html += " "; }); html += " "; html += " "; html += " "; - html += " "; $.each(json.LGType, function (enumIndex, enum_) { html += " "; }); html += " "; html += " "; html += " "; - html += " "; + html += " "; html += " "; html += " "; - html += " "; + html += " "; html += " "; html += " "; - html += " "; + html += " "; html += " "; html += "  "; html += " "; diff --git a/CCFlow/WF/Comm/RefFunc/EnOnly.htm b/CCFlow/WF/Comm/RefFunc/EnOnly.htm index f7a63020..ab90a111 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 767199f3..803d93df 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 b190414a..93ce1e9a 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 c7d7e81b..e57829f4 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; + } } } -- Gitee From 99fa1cabbd781dc6569882c863d3b680f78bd9d2 Mon Sep 17 00:00:00 2001 From: wangchangdang Date: Thu, 4 Jun 2020 13:42:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 2424158c..837c710d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -###开始 - -### master分支已升级为.NET Core 3.1 +### master分支已升级为.NET Core 3.1 ### CCFlowForNetcore的版本说明 ### 1. master分支:适配.Net Core 3.1环境。强烈建议采用此分支版本。 -- Gitee