From 793f6a8a7547769db61609ee7224f48e323d59ef Mon Sep 17 00:00:00 2001
From: libo <libo_at@163.com>
Date: Tue, 7 Feb 2023 16:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8E=88=E6=9D=83=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=8A=A0=E8=BD=BD=E5=AE=8C=E6=88=90=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Authorize/Form.cshtml               |  2 +-
 .../Views/Authorize/Form.js                   | 36 +++++++++++++------
 .../Views/LR_Content/plugin/grid/jfgrid.js    |  1 +
 3 files changed, 28 insertions(+), 11 deletions(-)

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 fae581f81..a38baed9e 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	
@@ -29,7 +29,7 @@
 
     <div class="lr-form-bottom-button" id="wizard-actions">
         <a id="btn_prev" class="btn btn-default btn-prev" disabled>上一步</a>
-        <a id="btn_next" class="btn btn-default btn-next">下一步</a>
+        <a id="btn_next" class="btn btn-default btn-next" disabled>下一步</a>
         <a id="btn_finish" disabled class="btn btn-success">完成</a>
     </div>
 </div>
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 82827cd7a..7eeb05722 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	
@@ -68,18 +68,24 @@ var bootstrap = function ($, learun) {
             learun.loading(true, '正在获取数据');
             learun.httpAsyncGet(top.$.rootUrl + '/LR_SystemModule/Module/GetCheckTreeForModuleList', function (res) {
                 if (res.code == 200) {
+                    setTimeout(function () {
+                        learun.loading(false);
+                    });
                     treeData = res.data;
                     $('#step-1').lrtree({
                         data: treeData.moduleList,
-                        isAllExpand:false
+                        isAllExpand: false
                     });
                     if (!!objectId) {
                         setTreeData1();
                     }
+                    
+                } else {
+                    setTimeout(function () {
+                        learun.loading(false);
+                    });
                 }
-                setTimeout(function () {
-                    learun.loading(false);
-                });
+                
             });
             learun.httpAsyncGet(top.$.rootUrl + '/LR_SystemModule/Module/GetCheckTreeForButtonList', function (res) {
                 if (res.code == 200) {
@@ -90,10 +96,16 @@ var bootstrap = function ($, learun) {
                     if (!!objectId) {
                         setTreeData2();
                     }
+                    setTimeout(function () {
+                        learun.loading(false);
+                    });
+                    $("#btn_next").removeAttr('disabled');
+                } else {
+                    setTimeout(function () {
+                        learun.loading(false);
+                    });
                 }
-                setTimeout(function () {
-                    learun.loading(false);
-                });
+                
             });
             learun.httpAsyncGet(top.$.rootUrl + '/LR_SystemModule/Module/GetCheckTreeForColumnList', function (res) {
                 if (res.code == 200) {
@@ -104,10 +116,14 @@ var bootstrap = function ($, learun) {
                     if (!!objectId) {
                         setTreeData3();
                     }
+                    setTimeout(function () {
+                        learun.loading(false);
+                    });
+                } else {
+                    setTimeout(function () {
+                        learun.loading(false);
+                    });
                 }
-                setTimeout(function () {
-                    learun.loading(false);
-                });
             });
             //learun.httpAsyncGet(top.$.rootUrl + '/LR_SystemModule/Module/GetCheckTree', function (res) {
             //    if (res.code == 200) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js
index 0b5fc2ada..030636b1f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/plugin/grid/jfgrid.js	
@@ -2215,6 +2215,7 @@
 
                 _jfgrid.dataRender($self, dfop, dfop.rowdatas);
                 //liang解决刷新后选择的行不能清除的问题
+                $self.find('#jfgrid_left_' + dfop.id + ' .jfgrid-selected,#jfgrid_right_' + dfop.id + ' .jfgrid-selected').removeClass('jfgrid-selected');
                 dfop.running.rowSelected = undefined;
                 break;
             case 'addRow':