From b4ca580613eb06ce30541590f5709273fe23dd0f Mon Sep 17 00:00:00 2001 From: dyy <18335927079@163.com> Date: Fri, 11 Sep 2020 17:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8E=88=E6=9D=83=EF=BC=9A?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=A1=A8=E5=8D=95=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E6=8E=88=E6=9D=83=EF=BC=9B=E5=AD=A6=E7=B1=8D=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=8A=A8=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AuthorizeController.cs | 9 ++++--- .../Views/Authorize/Form.cshtml | 6 ++--- .../Views/Authorize/Form.js | 27 ++++++++++--------- .../Controllers/ModuleController.cs | 6 ++--- .../Views/LR_Content/plugin/tree/lr-tree.js | 13 ++++++++- .../Learun.Application.Website.csproj | 1 + .../PublishProfiles/FolderProfile.pubxml | 18 +++++++++++++ .../Authorize/AuthorizeService.cs | 20 +++++++------- .../SystemModule/Module/ModuleService.cs | 9 +------ .../StuInfoBasic/StuInfoBasicEntity.cs | 6 +++++ 10 files changed, 73 insertions(+), 42 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Website/Properties/PublishProfiles/FolderProfile.pubxml diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Controllers/AuthorizeController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Controllers/AuthorizeController.cs index e5f010bd6..884908451 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Controllers/AuthorizeController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Controllers/AuthorizeController.cs @@ -48,14 +48,14 @@ namespace Learun.Application.Web.Areas.LR_AuthorizeModule.Controllers var modules = authorizeIBLL.GetItemIdList(objectId, 1); var buttons = authorizeIBLL.GetItemIdList(objectId, 2); var columns = authorizeIBLL.GetItemIdList(objectId, 3); - var forms = authorizeIBLL.GetItemIdList(objectId, 4); + //var forms = authorizeIBLL.GetItemIdList(objectId, 4); var datajson = new { modules, buttons, - columns, - forms + columns + //forms }; return JsonResult(datajson); } @@ -92,7 +92,8 @@ namespace Learun.Application.Web.Areas.LR_AuthorizeModule.Controllers string[] moduleIds = strModuleId.Split(','); string[] moduleButtonIds = strModuleButtonId.Split(','); string[] moduleColumnIds = strModuleColumnId.Split(','); - string[] moduleFormIds = strModuleFormId.Split(','); + //string[] moduleFormIds = strModuleFormId.Split(','); + string[] moduleFormIds = new string[0]; authorizeIBLL.SaveAuthorize(objectType, objectId, moduleIds, moduleButtonIds, moduleColumnIds, moduleFormIds); return Success("保存成功！"); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/Authorize/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/Authorize/Form.cshtml index df017cce2..fae581f81 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/Authorize/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/Authorize/Form.cshtml @@ -9,7 +9,7 @@
  • 1系统功能
  • 2系统按钮
  • 3系统视图
    • -
  • 4系统表单
    • + @*
  • 4系统表单
    • *@
    @@ -22,9 +22,9 @@
    -
    + @*
    -
    +
    *@
    diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/Authorize/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/Authorize/Form.js index 1c052cb51..a95a4a8f2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/Authorize/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_AuthorizeModule/Views/Authorize/Form.js @@ -78,14 +78,14 @@ var bootstrap = function ($, learun) { $('#step-3').lrtree({ data: treeData.columnList }); - $('#step-4').lrtree({ - data: treeData.formList - }); + //$('#step-4').lrtree({ + // data: treeData.formList + //}); if (!!objectId) { setTreeData1(); setTreeData2(); setTreeData3(); - setTreeData4(); + //setTreeData4(); } } setTimeout(function () { @@ -101,13 +101,14 @@ var bootstrap = function ($, learun) { checkModuleIds = $('#step-1').lrtreeSet('getCheckNodeIds'); $('#step-2 .lr-tree-root [id$="_learun_moduleId"]').parent().hide(); $('#step-3 .lr-tree-root [id$="_learun_moduleId"]').parent().hide(); - $('#step-4 .lr-tree-root [id$="_learun_moduleId"]').parent().hide(); + //$('#step-4 .lr-tree-root [id$="_learun_moduleId"]').parent().hide(); $.each(checkModuleIds, function (id, item) { $('#step-2_' + item.replace(/-/g, '_') + '_learun_moduleId').parent().show(); $('#step-3_' + item.replace(/-/g, '_') + '_learun_moduleId').parent().show(); - $('#step-4_' + item.replace(/-/g, '_') + '_learun_moduleId').parent().show(); + //$('#step-4_' + item.replace(/-/g, '_') + '_learun_moduleId').parent().show(); }); - } else if (data.step == 3) { + //} else if (data.step == 3) { + } else if (data.step == 2) { $finish.removeAttr('disabled'); $next.attr('disabled', 'disabled'); @@ -140,7 +141,7 @@ var bootstrap = function ($, learun) { var buttonList = [], columnList = [], formList = []; var checkButtonIds = $('#step-2').lrtreeSet('getCheckNodeIds'); var checkColumnIds = $('#step-3').lrtreeSet('getCheckNodeIds'); - var checkFormIds = $('#step-4').lrtreeSet('getCheckNodeIds'); + //var checkFormIds = $('#step-4').lrtreeSet('getCheckNodeIds'); $.each(checkButtonIds, function (id, item) { @@ -153,11 +154,11 @@ var bootstrap = function ($, learun) { columnList.push(item); } }); - $.each(checkFormIds, function (id, item) { - if (item.indexOf('_learun_moduleId') == -1) { - formList.push(item); - } - }); + //$.each(checkFormIds, function (id, item) { + // if (item.indexOf('_learun_moduleId') == -1) { + // formList.push(item); + // } + //}); var postData = { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ModuleController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ModuleController.cs index 9234df662..d5ab12eaf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ModuleController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_SystemModule/Controllers/ModuleController.cs @@ -108,15 +108,15 @@ namespace Learun.Application.Web.Areas.LR_SystemModule.Controllers var moduleList = moduleIBLL.GetModuleCheckTree(); var buttonList = moduleIBLL.GetButtonCheckTree(); var columnList = moduleIBLL.GetColumnCheckTree(); - var formList = moduleIBLL.GetFormCheckTree(); + //var formList = moduleIBLL.GetFormCheckTree(); var jsonData = new { moduleList, buttonList, - columnList, - formList + columnList + //formList }; return this.JsonResult(jsonData); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/tree/lr-tree.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/tree/lr-tree.js index 43f381c1b..cad16583e 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/tree/lr-tree.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/tree/lr-tree.js @@ -226,6 +226,11 @@ if (!!dfop.nodeClick) { dfop.nodeClick(node, $this); } + if (dfop.isTextCheck) { + setTimeout(function () { + $this.find('.lr-tree-node-cb').trigger('click'); + }); + } } return false; }, @@ -529,7 +534,13 @@ setNoCheck(dfop.data); break; case 'allCheck': - $self.find('.lr-tree-node-cb[src$="checkbox_0.png"]').trigger('click'); + $self.find('.lr-tree-node-cb[src$="checkbox_0.png"]').each(function () { + var $this = $(this); + if ($this.parent().parent().find('.lr-tree-node-ct').length == 0) { + $this.trigger('click'); + } + $this = null; + }); break; case 'setCheck': var list = op; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Website/Learun.Application.Website.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Website/Learun.Application.Website.csproj index 5db75a8fe..3ce42a8bf 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Website/Learun.Application.Website.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Website/Learun.Application.Website.csproj @@ -295,6 +295,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Website/Properties/PublishProfiles/FolderProfile.pubxml b/Learun.Framework.Ultimate V7/Learun.Application.Website/Properties/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 000000000..2a10321c8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Website/Properties/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,18 @@ + + + + + FileSystem + FileSystem + Release + Any CPU + + True + False + D:\Job-release\DigitalCampusWebSite-release + True + + \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/Authorize/AuthorizeService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/Authorize/AuthorizeService.cs index 640570eaf..492d1fa85 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/Authorize/AuthorizeService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/AuthorizeModule/Authorize/AuthorizeService.cs @@ -161,16 +161,16 @@ namespace Learun.Application.Base.AuthorizeModule #endregion #region 表单 - foreach (string item in moduleForms) - { - AuthorizeEntity authorizeEntity = new AuthorizeEntity(); - authorizeEntity.Create(); - authorizeEntity.F_ObjectType = objectType; - authorizeEntity.F_ObjectId = objectId; - authorizeEntity.F_ItemType = 4; - authorizeEntity.F_ItemId = item; - db.Insert(authorizeEntity); - } + //foreach (string item in moduleForms) + //{ + // AuthorizeEntity authorizeEntity = new AuthorizeEntity(); + // authorizeEntity.Create(); + // authorizeEntity.F_ObjectType = objectType; + // authorizeEntity.F_ObjectId = objectId; + // authorizeEntity.F_ItemType = 4; + // authorizeEntity.F_ItemId = item; + // db.Insert(authorizeEntity); + //} #endregion db.Commit(); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleService.cs index 4ae4324f0..4293a573c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/SystemModule/Module/ModuleService.cs @@ -38,14 +38,7 @@ namespace Learun.Application.Base.SystemModule t.F_AllowDelete, t.F_SortCode, t.F_DeleteMark, - t.F_EnabledMark, - t.F_Description, - t.F_CreateDate, - t.F_CreateUserId, - t.F_CreateUserName, - t.F_ModifyDate, - t.F_ModifyUserId, - t.F_ModifyUserName + t.F_EnabledMark "; btnfieldSql = @" t.F_ModuleButtonId, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs index 00c0b9e46..88606a2b6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/StuInfoBasic/StuInfoBasicEntity.cs @@ -459,6 +459,12 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration [Column("STUDYMODALITY")] public string StudyModality { get; set; } /// + /// 学籍异动状态 + /// + /// + [Column("CHANGESTATUS")] + public int? ChangeStatus { get; set; } + /// /// SyncFlag /// [Column("SYNCFLAG")]