From 5245f0fb25d49f9c6cffbc704a27fd64df87c56a Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Mon, 28 Sep 2020 09:07:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=AC=E6=96=87=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/Sys_ReceiveFile/Form.cshtml | 6 +- .../Views/Sys_ReceiveFile/Form.js | 6 + ...e.config.49266.17.2020-01-06.17-54-33.6315 | 28 ---- ...e.config.50042.25.2020-01-17.15-24-12.7808 | 28 ---- ...e.config.70131.30.2020-04-17.13-34-11.6306 | 34 ----- ...e.config.73081.31.2020-05-25.09-50-16.1906 | 34 ----- ...e.config.73164.32.2020-07-30.11-01-55.8521 | 34 ----- ....config.107241.23.2020-08-14.16-11-33.0902 | 135 ------------------ ...m.config.49102.11.2020-01-06.17-54-33.6375 | 124 ---------------- .../XmlConfig/database.config | 8 +- .../Sys_ReceiveDocumentEntity.cs | 1 - .../Learun.Workflow.Engine/NWFEngine.cs | 11 +- 12 files changed, 21 insertions(+), 428 deletions(-) delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.49266.17.2020-01-06.17-54-33.6315 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.50042.25.2020-01-17.15-24-12.7808 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.70131.30.2020-04-17.13-34-11.6306 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73081.31.2020-05-25.09-50-16.1906 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73164.32.2020-07-30.11-01-55.8521 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.107241.23.2020-08-14.16-11-33.0902 delete mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.49102.11.2020-01-06.17-54-33.6375 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml index 79f2cb5e8..3fe7da42e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.cshtml @@ -5,16 +5,12 @@
发送人
- +
主题
-
-
接收对象
-
-
发送时间
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js index 22b6ce1ae..fbadefa2a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveFile/Form.js @@ -16,6 +16,12 @@ var bootstrap = function ($, learun) { page.initData(); }, bind: function () { + $('#SenderId').lrformselect({ + layerUrl: top.$.rootUrl + '/LR_OrganizationModule/User/SelectOnlyForm', + layerUrlW: 400, + layerUrlH: 300, + dataUrl: top.$.rootUrl + '/LR_OrganizationModule/User/GetListByUserIds' + }); $('#SendType').lrDataItemSelect({ code: 'FileSendType' }); if (selectedRow.ReadFlag == true) {//已读 $('#Url').lrUploader(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.49266.17.2020-01-06.17-54-33.6315 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.49266.17.2020-01-06.17-54-33.6315 deleted file mode 100644 index f979c8be4..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.49266.17.2020-01-06.17-54-33.6315 +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.50042.25.2020-01-17.15-24-12.7808 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.50042.25.2020-01-17.15-24-12.7808 deleted file mode 100644 index 07106d733..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.50042.25.2020-01-17.15-24-12.7808 +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.70131.30.2020-04-17.13-34-11.6306 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.70131.30.2020-04-17.13-34-11.6306 deleted file mode 100644 index 02b271a32..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.70131.30.2020-04-17.13-34-11.6306 +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73081.31.2020-05-25.09-50-16.1906 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73081.31.2020-05-25.09-50-16.1906 deleted file mode 100644 index b28aeca65..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73081.31.2020-05-25.09-50-16.1906 +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73164.32.2020-07-30.11-01-55.8521 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73164.32.2020-07-30.11-01-55.8521 deleted file mode 100644 index b28aeca65..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/database.config.73164.32.2020-07-30.11-01-55.8521 +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.107241.23.2020-08-14.16-11-33.0902 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.107241.23.2020-08-14.16-11-33.0902 deleted file mode 100644 index 6f165e9d7..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.107241.23.2020-08-14.16-11-33.0902 +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.49102.11.2020-01-06.17-54-33.6375 b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.49102.11.2020-01-06.17-54-33.6375 deleted file mode 100644 index e2a16adbb..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/_sgbak/system.config.49102.11.2020-01-06.17-54-33.6375 +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config index 4c61d0f2b..be6bbb201 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/database.config @@ -16,17 +16,17 @@ - + - + - + - + - - - - - - - 搜索更多应用 - - - - - - - - - - - - - - - - - - {{ item.F_Name }} - - - - 更多应用 - - - - 统计数据 - - - {{ item.title || '(未命名)' }} - {{ item.value || '-' }} - - - - - - - {{ block.title }} - - - {{ item.f_title || '(无标题)' }} - {{ postDateTime(item.f_time) }} - - - - - - - {{ item.title }} - - - - - - - - - + + + + + + + + 搜索更多应用 + + + + + + + + + + + + + + + + + + {{ item.F_Name }} + + + + 更多应用 + + + + 统计数据 + + + {{ item.title || '(未命名)' }} + {{ item.value || '-' }} + + + + + + + {{ block.title }} + + + {{ item.f_title || '(无标题)' }} + {{ postDateTime(item.f_time) }} + + + + + + + {{ item.title }} + + + + + + + + + - + - - - - + :canvas-id="item.id" :id="item.id" class="charts"> + + + +