Merge pull request #476 from jumpserver/pr@v2.4@add_tree_retry

fix: 添加Tree加载重试组件

package.json

@@ -20,6 +20,7 @@
   "dependencies": {
     "@ztree/ztree_v3": "3.5.44",
     "axios": "0.18.1",
+    "axios-retry": "^3.1.9",
     "deepmerge": "^4.2.2",
     "echarts": "^4.7.0",
     "element-ui": "2.13.2",

src/components/DataZTree/components/ZTree/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div>
-    <div class="treebox">
+    <ul v-show="loading" class="ztree">
+      {{ this.$t('common.tree.Loading') }}...
+    </ul>
+    <div v-show="!loading" class="treebox">
       <ul :id="iZTreeID" class="ztree">
         {{ this.$t('common.tree.Loading') }}...
       </ul>
@@ -22,6 +25,7 @@
 import $ from '@/utils/jquery-vendor.js'
 import '@ztree/ztree_v3/js/jquery.ztree.all.min.js'
 import '@/styles/ztree.css'
+import axiosRetry from 'axios-retry'
 
 const defaultObject = {
   type: Object,
@@ -40,7 +44,8 @@ export default {
       iRMenuID: `rMenu_${this._uid}`,
       zTree: '',
       rMenu: '',
-      init: false
+      init: false,
+      loading: false
     }
   },
   computed: {
@@ -57,14 +62,26 @@ export default {
   },
   methods: {
     initTree: function() {
+      const vm = this
       let treeUrl
+      if (this.init) {
+        this.loading = true
+      }
       if (this.init && this.treeSetting.treeUrl.indexOf('/perms/') !== -1 && this.treeSetting.treeUrl.indexOf('rebuild_tree') === -1) {
         treeUrl = (this.treeSetting.treeUrl.indexOf('?') === -1) ? `${this.treeSetting.treeUrl}?rebuild_tree=1` : `${this.treeSetting.treeUrl}&rebuild_tree=1`
       } else {
         treeUrl = this.treeSetting.treeUrl
-        this.init = true
       }
-      this.$axios.get(treeUrl).then(res => {
+      this.$axios.get(treeUrl, {
+        'axios-retry': {
+          retries: 20,
+          retryCondition: e => {
+            return axiosRetry.isNetworkOrIdempotentRequestError(e) || e.response.status === 409
+          },
+          shouldResetTimeout: true,
+          retryDelay: () => { return 5000 }
+        }
+      }).then(res => {
         if (!res) {
           res = []
         }
@@ -74,6 +91,9 @@ export default {
           })
         }
         this.treeSetting.treeUrl = treeUrl
+        if (this.init) {
+          vm.zTree.destroy()
+        }
         this.zTree = $.fn.zTree.init($(`#${this.iZTreeID}`), this.treeSetting, res)
         if (this.treeSetting.showRefresh) {
           this.rootNodeAddDom(
@@ -88,6 +108,9 @@ export default {
         if (this.treeSetting.otherMenu) {
           $('.menu-actions').append(this.otherMenu)
         }
+      }).finally(_ => {
+        vm.loading = false
+        vm.init = true
       })
     },
     rootNodeAddDom: function(ztree, callback) {
@@ -104,7 +127,6 @@ export default {
       }
       const refreshIconRef = $('#tree-refresh')
       refreshIconRef.bind('click', function() {
-        ztree.destroy()
         const result = callback()
         if (result && result.then) {
           result.finally(() => {

src/i18n/langs/cn.json

@@ -170,6 +170,7 @@
     "Auth": "认证",
     "BadRequestErrorMsg": "请求错误，请检查填写内容",
     "BadRoleErrorMsg": "请求错误，无该操作权限",
+    "BadConflictErrorMsg": "正在刷新中，请稍后再试",
     "Basic": "基本",
     "BasicInfo": "基本信息",
     "Cancel": "取消",

src/i18n/langs/en.json

@@ -170,6 +170,7 @@
     "Auth": "Authorization",
     "BadRequestErrorMsg": "Bad request, please check again",
     "BadRoleErrorMsg": "Bad request, no permission for this operation",
+    "BadConflictErrorMsg": "Refreshing, please try again later",
     "Basic": "Basic",
     "BasicInfo": "Basic info",
     "Cancel": "Cancel",

src/layout/components/Page/LicenseExpireTip.vue

@@ -24,7 +24,7 @@ export default {
       'currentUser'
     ]),
     isExpire() {
-      if (this.currentUser.role !== 'Admin') {
+      if (!this.publicSettings.XPACK_ENABLED || this.currentUser.role !== 'Admin') {
         return false
       }
       const intervalDays = this.getIntervalDays(this.licenseData.date_expired)

src/utils/request.js

@@ -4,6 +4,7 @@ import { getTokenFromCookie } from '@/utils/auth'
 import { refreshSessionIdAge } from '@/api/users'
 import { Message, MessageBox } from 'element-ui'
 import store from '@/store'
+import axiosRetry from 'axios-retry'
 
 // create an axios instance
 const service = axios.create({
@@ -75,6 +76,10 @@ function ifBadRequest({ response, error }) {
   if (response.status === 403) {
     error.message = i18n.t('common.BadRoleErrorMsg')
   }
+  if (response.status === 409) {
+    error.response.status = 409
+    error.message = i18n.t('common.BadConflictErrorMsg')
+  }
 }
 
 export function flashErrorMsg({ response, error }) {
@@ -141,4 +146,9 @@ service.interceptors.response.use(
   }
 )
 
+axiosRetry(service, {
+  // 默认不开启请求重试
+  retries: 0
+})
+
 export default service

src/views/perms/AssetPermission/AssetPermissionList.vue

@@ -85,7 +85,12 @@ export default {
           },
           actions: {
             formatterArgs: {
-              updateRoute: 'AssetPermissionUpdate'
+              updateRoute: 'AssetPermissionUpdate',
+              performDelete: ({ row, col }) => {
+                const id = row.id
+                const url = `/api/v1/perms/asset-permissions/${id}/`
+                return this.$axios.delete(url)
+              }
             }
           }
         }

src/views/xpack/Org/OrganizationDetail/OrganizationMembershipList.vue

@@ -46,7 +46,7 @@ export default {
         }
       ],
       tableConfig: {
-        url: `/api/v1/orgs/org-memeber-relation/?org_id=${this.object.id}`,
+        url: `/api/v1/orgs/org-member-relation/?org_id=${this.object.id}`,
         columns: [
           'user_display', 'role_display', 'delete_action'
         ],
@@ -65,7 +65,7 @@ export default {
             objects: 'all',
             formatter: DeleteActionFormatter,
             hasBackSlash: true,
-            deleteUrl: `/api/v1/orgs/org-memeber-relation/?id=`
+            deleteUrl: `/api/v1/orgs/org-member-relation/?id=`
           }
         },
         tableAttrs: {
@@ -96,7 +96,7 @@ export default {
         hasObjectsId: this.object.users,
         showHasObjects: false,
         performAdd: (items) => {
-          const relationUrl = `/api/v1/orgs/org-memeber-relation/`
+          const relationUrl = `/api/v1/orgs/org-member-relation/`
           const data = []
           for (const user of items) {
             data.push({ org: this.object.id, user: user.value, role: this.defaultOrgRole })