From fb44ef0986ab92fd9b02ac54eb091ed95fbf1dbe Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Tue, 18 Dec 2018 18:50:02 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=20=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E6=8E=88=E6=9D=83/=E6=A0=87=E7=AD=BE=20=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E8=B5=84=E4=BA=A7=E6=97=B6=EF=BC=8Cinput=E6=A1=86?=
 =?UTF-8?q?=E5=86=85=E7=9A=84=E8=B5=84=E4=BA=A7=E5=92=8C=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7tabl=E6=98=BE=E7=A4=BA=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84bug=20(#2205)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Bugfix] 修复授权规则，选择资产时，输入框资产和弹出表格中资产显示不一致

* [Bugfix] 修复创建/更新资产标签，选择资产时，输入框资产和弹出表格中资产显示不一致的bug

* [Update] 修复标签/授权选择资产时, 2次初始化table的bug；资产input和弹出table统一的代码逻辑移到js中;
---
 .../templates/assets/_asset_list_modal.html   |  4 +++
 .../templates/assets/label_create_update.html |  1 +
 .../perms/asset_permission_create_update.html |  1 +
 apps/static/js/jumpserver.js                  | 29 +++++++++++++++++++
 4 files changed, 35 insertions(+)

diff --git a/apps/assets/templates/assets/_asset_list_modal.html b/apps/assets/templates/assets/_asset_list_modal.html
index 9c3cf0b1d..bb800ec04 100644
--- a/apps/assets/templates/assets/_asset_list_modal.html
+++ b/apps/assets/templates/assets/_asset_list_modal.html
@@ -57,6 +57,10 @@
 <script>
 var zTree2, asset_table2 = 0;
 function initTable2() {
+    if(asset_table2){
+        return
+    }
+
     var options = {
         ele: $('#asset_list_modal_table'),
         ajax_url: '{% url "api-assets:asset-list" %}?show_current_asset=1',
diff --git a/apps/assets/templates/assets/label_create_update.html b/apps/assets/templates/assets/label_create_update.html
index 47de64df4..0becb452e 100644
--- a/apps/assets/templates/assets/label_create_update.html
+++ b/apps/assets/templates/assets/label_create_update.html
@@ -32,6 +32,7 @@ $(document).ready(function () {
 }).on('click', '.select2-selection__rendered', function (e) {
     e.preventDefault();
     $("#asset_list_modal").modal();
+    initSelectedAssets2Table();
 })
 .on('click', '#btn_asset_modal_confirm', function () {
     var assets = asset_table2.selected;
diff --git a/apps/perms/templates/perms/asset_permission_create_update.html b/apps/perms/templates/perms/asset_permission_create_update.html
index 92d39c117..fe2250239 100644
--- a/apps/perms/templates/perms/asset_permission_create_update.html
+++ b/apps/perms/templates/perms/asset_permission_create_update.html
@@ -113,6 +113,7 @@ $(document).ready(function () {
             e.preventDefault();
             e.stopPropagation();
             $("#asset_list_modal").modal();
+            initSelectedAssets2Table();
         }
     })
 })
diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js
index b3cec3bd7..82990ac5b 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -812,3 +812,32 @@ function initPopover($container, $progress, $idPassword, $el, password_check_rul
     $idPassword.pwstrength(options);
     popoverPasswordRules(password_check_rules, $el);
 }
+
+// 解决input框中的资产和弹出表格中资产的显示不一致
+function initSelectedAssets2Table(){
+    var inputAssets = $('#id_assets').val();
+    var selectedAssets = asset_table2.selected.concat();
+
+    // input assets无，table assets选中，则取消勾选(再次click)
+    if (selectedAssets.length !== 0){
+        $.each(selectedAssets, function (index, assetId){
+            if ($.inArray(assetId, inputAssets) === -1){
+                $('#'+assetId).trigger('click');  // 取消勾选
+            }
+        });
+    }
+
+    // input assets有，table assets没选，则选中(click)
+    if (inputAssets !== null){
+        asset_table2.selected = inputAssets;
+        $.each(inputAssets, function(index, assetId){
+            var dom = document.getElementById(assetId);
+            if (dom !== null){
+                var selected = dom.parentElement.parentElement.className.indexOf('selected')
+            }
+            if (selected === -1){
+                $('#'+assetId).trigger('click');
+            }
+        });
+    }
+}