@smart100/spu-web-plugin 0.0.34 → 0.0.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "0.0.34",
+  "version": "0.0.36",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",

package/src/apaasSpuTrack.ts

@@ -1,9 +1,14 @@
 import { globalOptions, getUser, Module } from './index'
-import { cloneDeep, merge } from 'lodash-es'
+import { cloneDeep, merge, set } from 'lodash-es'
 import login from './login'
 
 // @ts-ignore
 import ApaasSpuTrack from './package/apaas-track/apaas-spu/index.umd.js'
+// import ApaasSpuTrack from './package/apaas-track/apaas-spu/index.js'
+// import * as ApaasSpuTrack from './package/apaas-track/apaas-spu/index.mjs'
+
+// console.log(ApaasSpuTrack)
+// console.log(window.ApaasSpuTrack)
 
 const getWebInitParams = async () => {
   const user = getUser()
@@ -56,32 +61,21 @@ const getIndextagSync = (params: any) => {
 // 兼容开启SPU日志
 const initApaasSpuTrack = () => {
   setTimeout(() => {
-    if (ApaasSpuTrack && !window.apaasSpuTrack && !window?.aPaaS?.getWebInitParams && !window?.Module?.getIndextagSync && login.checkLogin() && getUser()) {
-      window.aPaaS = {
-        getWebInitParams
+    if (ApaasSpuTrack && !window.apaasSpuTrack && login.checkLogin() && getUser()) {
+      if (!window?.aPaaS?.getWebInitParams) {
+        set(window, 'aPaaS.getWebInitParams', getWebInitParams)
       }
-      window.Module = {
-        getIndextagSync
+      if (!window?.Module?.getIndextagSync) {
+        set(window, 'Module.getIndextagSync', getIndextagSync)
       }
-      // if (window.aPaaS && !window.aPaaS.getWebInitParams) {
-      //   window.aPaaS.getWebInitParams = getWebInitParams
-      // } else {
-      //   window.aPaaS = {
-      //     getWebInitParams
-      //   }
-      // }
-      // if (window.Module && !window.Module.getIndextagSync) {
-      //   window.Module.getIndextagSync = getIndextagSync
-      // } else {
-      //   window.Module = {
-      //     getIndextagSync
-      //   }
-      // }
 
       ApaasSpuTrack.getApaasSpuTrack({
         url: 'https://log.xtion.net/?project=xw_module',
         zip: false,
-        online: true
+        online: true,
+        http: {
+          trackRequesetData: true
+        }
       }).then((apaasSpuTrack: ApaasSpuTrack) => {
         console.log('apaasSpuTrack', apaasSpuTrack)
         window.apaasSpuTrack = apaasSpuTrack
@@ -111,6 +105,7 @@ const initApaasSpuTrack = () => {
         // 重写 transformLog 底层方法
         let initindextag = ''
         apaasSpuTrack.transformLog = (log: any) => {
+          // console.error(22222222222222)
           if (log.properties) {
             // 发送所有类型的日志前统一在 properties 对象属性下增加SPU相关属性值：modulekey、modulename、moduleversion、indextag、initindextag、toindextag、fromindextag。
             log.properties.modulekey = log.appid
@@ -191,6 +186,7 @@ const apaasSpuTrackSendLog = (data: any, isnotretry: boolean = false) => {
 }
 
 export {
+  getIndextagSync,
   initApaasSpuTrack,
   apaasSpuTrackSendLog
 }

package/src/axios.ts

@@ -7,13 +7,14 @@ import type {
 import { get } from 'lodash-es'
 // import { Message } from 'element-ui'
 import { loadding } from './components/loadding'
-import { getUser, getToken } from './index'
+import login from './login'
 import core from './core'
 
 interface Response {
   code: number | string
   data: any
   msg: string
+  message: string
 }
 
 const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
@@ -30,12 +31,27 @@ const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
 
   axiosInstance.interceptors.request.use(async (config: any) => {
     // const isShowLoading = typeof config?.isShowLoading !== 'undefined' ? config.isShowLoading : true
+    // console.error(444444)
+    // console.log(config)
+
     const isShowLoading = get(config, 'isShowLoading', true)
     isShowLoading && loadding.open()
 
     const isSendToken = get(config, 'isSendToken', true)
     if (isSendToken) {
-      const token = getToken()
+
+      // 请求接口前校验是否过期 如果过期先刷新token
+      if (config.url !== '/api/auth/refreshtoken') {
+        if (!login.checkLogin() && login.getRole() !== 'center') {
+          try {
+            await login.updateToken()
+          } catch (err) {
+            console.error(err)
+          }
+        }
+      }
+
+      const token = login.getToken()
       if (config?.headers && token) {
         config.headers.token = token
       }
@@ -64,7 +80,8 @@ const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
     let realRes: Response = {
       code: 404,
       data: '',
-      msg: ''
+      msg: '',
+      message: ''
     }
 
     if (type === 'spu') {
@@ -73,30 +90,34 @@ const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
         realRes = {
           code: res.data.code,
           data: res.data.data,
-          msg: res.data.msg
+          msg: res.data.msg,
+          message: res.data.msg
         }
         return realRes
       } else {
-        const msg = res?.data?.msg || '网络异常，请稍后重试。'
-        const isShowErrorMessage = get(res, 'config.isShowErrorMessage', true)
-        // isShowErrorMessage && Message.error(msg)
-
         realRes = {
           code: res.data.code,
           data: res.data.data,
-          msg: res.data.msg
+          msg: res.data.msg || '网络异常，请稍后重试。',
+          message: res.data.msg || '网络异常，请稍后重试。'
         }
+
+        // const isShowErrorMessage = get(res, 'config.isShowErrorMessage', true)
+        // isShowErrorMessage && Message.error(realRes.msg)
+
         return Promise.reject(realRes) as any
       }
     } else if (type === 'normal') {
       realRes = {
         code: res.status || 200,
         data: res.data?.resp_data || res.data,
-        msg: res.data?.error_code || ''
+        msg: res.data?.error_code || '',
+        message: res.data?.error_code || ''
       }
       return realRes
     }
-  }, (err: AxiosError) => {
+  }, (err: any) => {
+    // err: AxiosError
     // console.log(err)
     // debugger
     const isShowLoading = get(err, 'config.isShowLoading', true)
@@ -104,22 +125,33 @@ const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
 
     // console.log(err)
     // debugger
-    // 兼容处理接口新方案 通过传参配置区分 默认使用新方案
-    // 接口返回非 200 状态码 肯定是报错必须要提示
-    const msg = (type === 'spu' ? get(err, 'response.data.msg') : get(err, 'response.data.error_code')) || get(err, 'response.statusText') || get(err, 'message', '网络异常，请稍后重试。')
 
-    const isShowErrorMessage = get(err, 'config.isShowErrorMessage', true)
+    let msg = ''
+    if (type === 'spu') {
+      msg = get(err, 'response.data.msg', '')
+    } else {
+      msg = get(err, 'response.data.error_code', '')
+    }
+
+    if (msg) {
+      err.message = msg
+    } else {
+      err.message = err.response?.statusText || err.message || '网络异常，请稍后重试。'
+    }
+    err.msg = err.message
+
+    // const isShowErrorMessage = get(err, 'config.isShowErrorMessage', true)
     // isShowErrorMessage && Message.error(msg)
 
     const isNoLogin = () => {
       if (type === 'spu') {
-        if (msg === '未授权' && get(err, 'response.data.code') === 401) {
+        if (err.message === '未授权' && get(err, 'response.data.code') === 401) {
           return true
         } else {
           return false
         }
       } else if (type === 'normal') {
-        if (msg.indexOf('token is invalid(decode).') !== -1 || msg.indexOf('token is invalid(null).') !== -1 || msg === 'token无效，请重新登录' || msg === 'jwt token无效') {
+        if (err.message.indexOf('token is invalid(decode).') !== -1 || err.message.indexOf('token is invalid(null).') !== -1 || err.message === 'token无效，请重新登录' || err.message === 'jwt token无效') {
           return true
         } else {
           return false

package/src/core.js

@@ -1,5 +1,7 @@
 import { globalOptions, axios, getUser, Module } from './index'
-import { get } from 'lodash-es'
+import { get, cloneDeep } from 'lodash-es'
+import urlquery from './urlquery'
+import login from './login'
 
 const urlIsIp = (url) => {
   const hostname = url.split('://')[1].split(':')[0].split('/')[0]
@@ -131,7 +133,7 @@ class Core {
   }
 
   requestDataPromise = null
-  async getData () {
+  async initGetData () {
     const nowEnvname = await Module.getEnvname()
     const nowTenantCode = getUser('tenantcode') || ''
     // console.log(tenantCode)
@@ -159,7 +161,7 @@ class Core {
       errorMsg: '',
       data: null
     }
-    const data = await this.getData()
+    const data = await this.initGetData()
     if (!data.envName) {
       res.errorMsg = '找不到租户环境名称，请检查登录时是否有填写企业名称。'
     } else if (!data.envData) {
@@ -187,7 +189,35 @@ class Core {
       errorMsg: '',
       data: null
     }
-    const data = await this.getData()
+    const data = await this.initGetData()
+    if (!modulekey) {
+      res.errorMsg = '缺少 modulekey，请检查。'
+    } else if (!data.envName) {
+      res.errorMsg = '找不到租户环境名称，请检查登录时是否有填写企业名称。'
+    } else if (!data.envData) {
+      res.errorMsg = '找不到租户环境信息。'
+    } else if (!data.webDefineData) {
+      res.errorMsg = '该租户没有部署 G3。'
+    } else if (!data.webDefineData.length) {
+      res.errorMsg = '该租户没有授权场景模块/SPU模块。'
+    } else {
+      res.data = data.webDefineData.find((item) => item.modulekey === modulekey)
+      if (!res.data) {
+        res.errorMsg = `该租户没有授权 ${modulekey} 模块。`
+      }
+    }
+    return res
+  }
+
+  getModuleDataSync (modulekey) {
+    if (!modulekey) {
+      modulekey = globalOptions.modulekey
+    }
+    const res = {
+      errorMsg: '',
+      data: null
+    }
+    const data = this.cache
     if (!modulekey) {
       res.errorMsg = '缺少 modulekey，请检查。'
     } else if (!data.envName) {
@@ -229,6 +259,28 @@ class Core {
     return context
   }
 
+  getContextSync (modulekey) {
+    if (!modulekey) {
+      modulekey = globalOptions.modulekey
+    }
+    let context
+    const moduleData = this.getModuleDataSync(modulekey)
+    if (moduleData?.data) {
+      context = {
+        envid: moduleData.envid || '',
+        envname: this.cache.envName || '',
+        tenantcode: moduleData.tenantcode || '',
+        modulecode: moduleData.modulecode || '',
+        modulekey: moduleData.modulekey || '',
+        modulename: moduleData.modulename || '',
+        moduleversion: moduleData.moduleversion || '',
+        versioncode: moduleData.versioncode || '',
+        versionnum: moduleData.moduleversion || ''
+      }
+    }
+    return context
+  }
+
   async getModuleBusiness (modulekey) {
     let business = ''
     const moduleData = await this.getModuleData(modulekey)
@@ -246,6 +298,108 @@ class Core {
     const moduleData = await this.getModuleData(modulekey)
     return !!moduleData.data
   }
+
+  checkPermission (params) {
+    let modulekey = params?.modulekey || globalOptions.modulekey
+    const moduleData = this.getModuleDataSync(modulekey)
+    return !!moduleData.data
+  }
+
+  getQueryUrl (query, queryvalue = {}) {
+    query = cloneDeep(query)
+    if (urlquery.isdebugger) {
+      query.every((item) => item === '')
+      const isdebuggerQuery = query.find((item) => item.key === 'isdebugger')
+      if (isdebuggerQuery) {
+        isdebuggerQuery.value = '1'
+      } else {
+        query.push(
+          {
+            key: 'isdebugger',
+            value: '1',
+            field_type: ''
+          }
+        )
+      }
+      queryvalue && (queryvalue.isdebugger = '1')
+    }
+
+    const buildInMap = {
+      '${token}': login.getToken(), // eslint-disable-line no-template-curly-in-string
+      '${refreshtoken}': login.getRefreshToken(), // eslint-disable-line no-template-curly-in-string
+      '${tokenexpires}': login.getTokenExpires(), // eslint-disable-line no-template-curly-in-string
+      '${envname}': this.cache.envName || '' // eslint-disable-line no-template-curly-in-string
+    }
+
+    if (queryvalue) {
+      queryvalue = cloneDeep(queryvalue)
+      for (const x in queryvalue) {
+        if (x.indexOf('${') === 0) {
+          buildInMap[x] = queryvalue[x]
+          delete queryvalue[x]
+        }
+      }
+    }
+
+    let url = ''
+    query && query.length && query.forEach((item) => {
+      let value = ''
+      if (item.value.indexOf('${') === 0) {
+        const buildInValue = buildInMap[item.value]
+        value = typeof buildInValue !== 'undefined' ? buildInValue : ''
+      } else {
+        value = typeof item.value !== 'undefined' ? item.value : ''
+      }
+      if (queryvalue && typeof queryvalue[item.key] !== 'undefined') {
+        value = queryvalue[item.key]
+      }
+      url += `${item.key}=${value}&`
+    })
+    return url
+  }
+
+  // pagecode: 'modulekey:indextag'
+  async createWebUrl (modulekey, indextag, queryvalue = {}) {
+    let url = ''
+    let errorMsg = ''
+    let indextagData
+
+    const moduleData = await this.getModuleData(modulekey)
+    if (moduleData.data) {
+      if (!indextag) {
+        errorMsg = '缺少 indextag，请检查。'
+      } else {
+        indextagData = (moduleData.data.protocol.indexs || []).find((item) => item.indextag === indextag)
+        if (indextagData) {
+          const queryUrl = this.getQueryUrl(indextagData.query || [], queryvalue)
+          const context = await this.getContext(modulekey)
+          const moduleBusiness = await this.getModuleBusiness(modulekey)
+          if (indextagData.externalurl) {
+            url = `${indextagData.externalurl}`
+          } else if (indextagData.url) {
+            url = `${moduleBusiness}/${indextagData.url}`
+          } else {
+            url = `${moduleBusiness}/${moduleData.data.modulekey}/${moduleData.data.moduleversion}${indextagData.path.indexOf('/') === 0 ? '' : '/'}${indextagData.path}${indextagData.location}`
+          }
+
+          if (url.indexOf('?') === -1) {
+            url += `?${queryUrl}indextag=${indextag}&context=${encodeURIComponent(JSON.stringify(context))}`
+          } else {
+            url += `&${queryUrl}indextag=${indextag}&context=${encodeURIComponent(JSON.stringify(context))}`
+          }
+        } else {
+          errorMsg = `找不到 indextag = ${indextag} 的页面信息。`
+        }
+      }
+    } else {
+      errorMsg = moduleData.errorMsg
+    }
+    return {
+      url,
+      // indextagData,
+      errorMsg
+    }
+  }
 }
 
 const core = new Core()

package/src/index.ts

@@ -19,8 +19,6 @@ import { expandexp } from './components/expandexp'
 import { initApaasSpuTrack } from './apaasSpuTrack'
 import { initTest } from './test'
 
-
-
 // class SPUWebPlugin {
 //   static install = install
 //   static version = version
@@ -29,11 +27,12 @@ import { initTest } from './test'
 // // SPUWebPlugin.version = version
 
 
-
+// 基于部署路径查出 modulekey moduleversion
+const arr = location.pathname.split('/')
 const globalOptions: any = {
-  modulekey: 'demospu',
-  modulename: 'demospu',
-  moduleversion: 'v1.0',
+  modulename: '',
+  modulekey: arr[1] || '',
+  moduleversion: arr[2] || '',
   storageproxyprefix: '',
   router: null
 }
@@ -48,7 +47,9 @@ const install = (app: any, options: any) => {
   console.log('@smart100/spu-web-plugin start!')
   console.log('@smart100/spu-web-plugin userOptions: ', options)
   console.log('@smart100/spu-web-plugin globalOptions: ', globalOptions)
-  // console.error('test')
+  // setTimeout(() => {
+  //   console.error('test888')
+  // }, 1000)
 
   // if (install.installed) return
   // install.installed = true
@@ -88,6 +89,7 @@ const install = (app: any, options: any) => {
         if (singleLoginRes.flag) {
           // debugger
           // next()
+          await core.initGetData()
           next({
             path: to.path,
             params: to.params,
@@ -105,6 +107,9 @@ const install = (app: any, options: any) => {
     console.warn('@smart100/spu-web-plugin 需要传入一个 vue-router 实例以便执行单点登录逻辑，如果您没传 vue-router 实例则需要自行在合适的位置执行单点登录代码。')
   }
 
+  if (login.checkLogin()) {
+    core.initGetData()
+  }
 
   initApaasSpuTrack()
 
@@ -118,13 +123,13 @@ const SPUWebPlugin = {
 
 
 
+const updateToken = login.updateToken.bind(login)
 const getToken = login.getToken.bind(login)
 const getTokenExpires = login.getTokenExpires.bind(login)
 const getRefreshToken = login.getRefreshToken.bind(login)
 const getUser = login.getUser.bind(login)
 const checkLogin = login.checkLogin.bind(login)
 const singleLogin = login.singleLogin.bind(login)
-const startRefreshtoken = login.startRefreshtoken.bind(login)
 
 
 
@@ -143,6 +148,7 @@ const Module = {
   getEnvname: login.getEnvname.bind(login),
   getEnvData: core.getEnvData.bind(core),
   checkModule: core.checkModule.bind(core),
+  createWebUrl: core.createWebUrl.bind(core),
   getSpuContainerType: getSpuContainerType
 }
 
@@ -167,13 +173,13 @@ export {
   setTitle,
   isInApp,
   AMapLoader,
+  singleLogin,
+  updateToken,
   getToken,
   getTokenExpires,
   getRefreshToken,
   getUser,
   checkLogin,
-  singleLogin,
-  startRefreshtoken,
   Module,
   components,
   expandexp,