Dev beta2 (#3177)

* [Update] 添加loading

* [Update] stash

* [Update] 修改permission

apps/users/templates/users/_granted_assets.html

@@ -108,7 +108,7 @@ function onSelected(event, treeNode) {
 }
 
 
-function initTree() {
+function initTree(refresh) {
     var setting = {
         view: {
             dblClickExpand: false,
@@ -131,11 +131,13 @@ function initTree() {
     };
 
     $.get(treeUrl, function(data, status) {
-        $.fn.zTree.init($("#assetTree"), setting, data);
-        zTree = $.fn.zTree.getZTreeObj("assetTree");
+        zTree = $.fn.zTree.init($("#assetTree"), setting, data);
+        if (!refresh) {
+            initTable();
+        }
         rootNodeAddDom(zTree, function () {
             treeUrl = setUrlParam(treeUrl, 'cache_policy', '2');
-            initTree();
+            initTree(true);
         });
     });
 }

apps/users/templates/users/user_granted_asset.html

@@ -39,7 +39,6 @@ var systemUsersUrl = "{% url 'api-perms:user-asset-system-users' pk=object.id as
 
 $(document).ready(function () {
     initTree();
-    initTable();
 });
 </script>
 {% endblock %}

apps/users/templates/users/user_group_granted_asset.html

@@ -42,7 +42,6 @@ var showAssetHref = true; // Need input default true
 
 $(document).ready(function () {
     initTree();
-    initTable();
 });
 </script>
 {% endblock %}