imatrix-ui 2.9.59-dw → 2.9.61-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.59-dw",
+  "version": "2.9.61-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/packages/plugins/export-data-new.js

@@ -233,11 +233,32 @@ function exportListData(excelName, listCode, data, functionCode, uuid, isAsync,
       param['isPermission'] = isPermission
       Vue.prototype.$http.post(Vue.prototype.baseURL + '/dsc/commons/export-list-data', param).then(data => {
         if (isAsync) {
-          Message({
-            message: getI18n().t('imatrixUIMessage.asyncExport'),
-            type: 'success',
-            showClose: true
-          })
+          const message = getI18n().t('imatrixUIMessage.asyncExport')
+          const exportPageUrl = getDcExportPageUrl()
+          let vnode
+          if (exportPageUrl) {
+            vnode = '<p><span>' + message + '</span>'
+            // 请点击进行权限申请
+            const asyncExportJumpMsg = getI18n().t('imatrixUIMessage.asyncExportJumpMsg')
+            vnode += '<a href="#" style="color: #1800ff;font-weight: bold;text-decoration:underline" onclick="window.open(\'' + exportPageUrl + '\')">' + asyncExportJumpMsg + '</a>'
+            vnode += '</p>'
+          }
+          if (vnode) {
+            Message({
+              showClose: true,
+              dangerouslyUseHTMLString: true,
+              message: vnode,
+              type: 'success',
+              duration: 10 * 1000
+            })
+          } else {
+            Message({
+              showClose: true,
+              message: message,
+              type: 'success',
+              duration: 5 * 1000
+            })
+          }
           localStorage.setItem(uuid, 'ok')
         } else {
           if (data.indexOf('~~') >= 0) {
@@ -258,6 +279,18 @@ function exportListData(excelName, listCode, data, functionCode, uuid, isAsync,
     }
   })
 }
+// 获得文件中心/导出任务菜单的路由地址
+function getDcExportPageUrl() {
+  let exportPageUrl
+  const baseAPI = Vue.prototype.baseAPI
+  if (baseAPI) {
+    // 获得平台的域名和端口
+    const baseUrls = baseAPI.split('/')
+    const baseUrlPrefix = baseUrls[0] + '//' + baseUrls[2]
+    exportPageUrl = baseUrlPrefix + '/document-center/#/file-task/file-export-task/list'
+  }
+  return exportPageUrl
+}
 /**
  * 根据uuid获取导出情况
  * @param {*} uuid

package/src/i18n/langs/cn.js

@@ -77,7 +77,8 @@ const cn = {
     asyncExport: '正在异步导出，请等待消息通知!',
     selectedWorkingGroup: '已选工作组',
     forbiddenExceptionLinkUrl: '请点击进行权限申请',
-    forbiddenExceptionLinkUser: '如有疑问请联系'
+    forbiddenExceptionLinkUser: '如有疑问请联系',
+    asyncExportJumpMsg: '或点击我跳转到下载页面'
   },
   // 列表组件
   superGrid: {

package/src/i18n/langs/en.js

@@ -77,7 +77,8 @@ const en = {
     asyncExport: 'Asynchronous export, please wait for message notification!',
     selectedWorkingGroup: 'Selected working group',
     forbiddenExceptionLinkUrl: 'please click to apply',
-    forbiddenExceptionLinkUser: 'if you have any questions,please contact'
+    forbiddenExceptionLinkUser: 'if you have any questions,please contact',
+    asyncExportJumpMsg: 'Or click me to jump to download page.'
   },
   superGrid: {
     columnConfig: 'Column Config',

package/src/utils/common-util.js

@@ -104,22 +104,43 @@ export function getLoginUrl() {
     let systemPath = href
     let routerPath = ''
     let param = ''
+    console.log('getLoginUrl---href=', href)
     if (href.indexOf('#/') > 0 && href.indexOf('#/login') < 0) {
       systemPath = href.substring(0, href.indexOf('#'))
       const suffix = href.substring(href.indexOf('#') + 1)
+      console.log('getLoginUrl---suffix=', suffix)
       routerPath = suffix
       if (suffix.indexOf('?') > 0) {
         // 如果包含参数，则需要截取参数
         routerPath = suffix.substring(0, suffix.indexOf('?'))
         param = suffix.substring(suffix.indexOf('?') + 1)
       }
+    } else {
+      systemPath = null
     }
+    console.log('getLoginUrl---param=', param)
     getPortalFrontendUrl().then(portalUrl => {
-      let loginUrl = portalUrl + '#/login?systemPath=' + systemPath + '&routerPath=' + routerPath
+      let loginUrl = portalUrl + '#/login'
+      if (systemPath) {
+        loginUrl = loginUrl + '?systemPath=' + systemPath
+      }
+      if (routerPath) {
+        if (loginUrl.indexOf('?') > 0) {
+          loginUrl = loginUrl + '&routerPath=' + routerPath
+        } else {
+          loginUrl = loginUrl + '?routerPath=' + routerPath
+        }
+      }
       if (param) {
-        loginUrl += '&' + param
+        if (loginUrl.indexOf('?') > 0) {
+          loginUrl = loginUrl + '&' + param
+        } else {
+          loginUrl = loginUrl + '?' + param
+        }
       }
+      console.log('getLoginUrl---loginUrl11=', loginUrl)
       loginUrl = replacePrefix(loginUrl)
+      console.log('getLoginUrl---loginUr222=', loginUrl)
       resolve(loginUrl)
     }).catch(error => {
       reject(error)
@@ -335,14 +356,3 @@ export function cacheCurrentLanguageUtil(http) {
     }
   })
 }
-
-// 刷新浏览器页面
-export function refreshLocationHref(url, locationObj) {
-  if (!locationObj) {
-    locationObj = window.location
-  }
-  if (!url) {
-    return
-  }
-  locationObj.href = url
-}