@smart100/spu-web-plugin 1.0.0 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "1.0.0",
+  "version": "1.0.4",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",
@@ -49,4 +49,4 @@
     "uuid": "^9.0.1",
     "vconsole": "^3.15.1"
   }
-}
+}

package/src/apaasSpuTrack.ts

@@ -1,6 +1,8 @@
-import { globalOptions, getUser, Module } from './index'
+import { globalOptions } from './index'
+import { Module } from './core'
 import { cloneDeep, merge, set } from 'lodash-es'
-import login from './login'
+import { getUser, checkLogin } from './login'
+import core from './core'
 
 // @ts-ignore
 import ApaasSpuTrack from './package/apaas-track/apaas-spu/index.umd.js'
@@ -30,43 +32,54 @@ const getWebInitParams = async () => {
   }
 }
 
-const getIndextagSync = (params: any) => {
-  const result: any = {
-    code: '',
-    msg: '',
-    indextag: ''
-  }
-
-  if (params.url) {
-    const a = params.url.split('indextag=')
-    if (a.length > 1) {
-      const b = a[1].split('&')
-      result.code = 200
-      result.indextag = b[0]
-      result.msg = '解析成功。'
+const apaasSpuTrackSendLog = (data: any, isnotretry: boolean = false) => {
+  if (window.apaasSpuTrack) {
+    const logtime = Date.now().toString()
+    const baselog = cloneDeep({
+      ...window.apaasSpuTrack.baseLog,
+      logtime: logtime,
+      epochnanos: logtime + '000000',
+      types: '',
+      event: '',
+      url: location.href,
+      properties: {
+        // // 图片导出相关信息
+        // // formtype: apaas | litheform | spu
+        // formtype: 'spu',
+        // // exporttype: 1=普通导出 | 2=后端图片扩展导出 | 3=图片导出SPU
+        // exporttype: '3',
+        // // pagecode
+        // // 当 formtype = apaas 表示低码表单code
+        // // 当 formtype = litheform 表示超表表单code
+        // // 当 formtype = spu 表示配置的spu页面pagecode
+        // pagecode: ''
+      }
+    })
+    const mergedata = merge(baselog, data)
+    // console.log(mergedata)
+    // debugger
+    window.apaasSpuTrack.addLogToQueue(mergedata, true)
+  } else {
+    if (!isnotretry) {
+      console.warn('window.apaasSpuTrack 不存在，导出日志延迟3秒后再次发送。')
+      setTimeout(() => {
+        apaasSpuTrackSendLog(data, true)
+      }, 3000)
     } else {
-      result.code = 404
-      result.msg = '不存在该 url 的 indextag。'
+      console.error('window.apaasSpuTrack 不存在，导出日志发送失败。')
     }
-  } else {
-    result.code = 404
-    result.msg = '传入 url 为空。'
   }
-  // console.log(result)
-  // debugger
-  // params.complete && params.complete(result.code, result.indextag, result.msg)
-  return result
 }
 
 // 兼容开启SPU日志
-const initApaasSpuTrack = () => {
+const installApaasSpuTrack = () => {
   setTimeout(() => {
-    if (ApaasSpuTrack && !window.apaasSpuTrack && login.checkLogin() && getUser()) {
+    if (ApaasSpuTrack && !window.apaasSpuTrack && checkLogin() && getUser()) {
       if (!window?.aPaaS?.getWebInitParams) {
         set(window, 'aPaaS.getWebInitParams', getWebInitParams)
       }
       if (!window?.Module?.getIndextagSync) {
-        set(window, 'Module.getIndextagSync', getIndextagSync)
+        set(window, 'Module.getIndextagSync', core.getIndextagSync.bind(core))
       }
 
       ApaasSpuTrack.getApaasSpuTrack({
@@ -146,47 +159,4 @@ const initApaasSpuTrack = () => {
   }, 3000)
 }
 
-const apaasSpuTrackSendLog = (data: any, isnotretry: boolean = false) => {
-  if (window.apaasSpuTrack) {
-    const logtime = Date.now().toString()
-    const baselog = cloneDeep({
-      ...window.apaasSpuTrack.baseLog,
-      logtime: logtime,
-      epochnanos: logtime + '000000',
-      types: '',
-      event: '',
-      url: location.href,
-      properties: {
-        // // 图片导出相关信息
-        // // formtype: apaas | litheform | spu
-        // formtype: 'spu',
-        // // exporttype: 1=普通导出 | 2=后端图片扩展导出 | 3=图片导出SPU
-        // exporttype: '3',
-        // // pagecode
-        // // 当 formtype = apaas 表示低码表单code
-        // // 当 formtype = litheform 表示超表表单code
-        // // 当 formtype = spu 表示配置的spu页面pagecode
-        // pagecode: ''
-      }
-    })
-    const mergedata = merge(baselog, data)
-    // console.log(mergedata)
-    // debugger
-    window.apaasSpuTrack.addLogToQueue(mergedata, true)
-  } else {
-    if (!isnotretry) {
-      console.warn('window.apaasSpuTrack 不存在，导出日志延迟3秒后再次发送。')
-      setTimeout(() => {
-        apaasSpuTrackSendLog(data, true)
-      }, 3000)
-    } else {
-      console.error('window.apaasSpuTrack 不存在，导出日志发送失败。')
-    }
-  }
-}
-
-export {
-  getIndextagSync,
-  initApaasSpuTrack,
-  apaasSpuTrackSendLog
-}
+export { installApaasSpuTrack, apaasSpuTrackSendLog }

package/src/axios.ts

@@ -1,15 +1,10 @@
 import axios from 'axios'
-import type {
-  AxiosInstance,
-  AxiosError,
-  AxiosResponse
-} from 'axios'
+import type { AxiosInstance, AxiosResponse } from 'axios'
 import { get } from 'lodash-es'
-// import { Message } from 'element-ui'
 import { loadding } from './components/loadding'
-import login from './login'
+import { getToken, updateToken, getLoginState } from './login'
 import core from './core'
-import urlquery from './urlquery'
+import { urlquery } from './urlquery'
 
 interface Response {
   code: number | string
@@ -20,7 +15,7 @@ interface Response {
 
 const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
   const axiosInstance: AxiosInstance = axios.create({
-    baseURL: type === 'spu' ? `/api/${options.modulekey}/${options.moduleversion}` : '',
+    baseURL: type === 'spu' ? `/api/${options.modulekey}/${options.moduleversion}` : ''
     // baseURL: '',
     // timeout: 36000000
     // withCredentials: true, // 不能开启 影响ali oss
@@ -30,151 +25,164 @@ 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) {
-
-      // 请求接口前校验是否过期 如果过期先刷新token
-      if (config.url !== '/api/auth/refreshtoken') {
-        if (!login.checkLogin() && login.getRole() !== 'center') {
+  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) {
+        // 请求接口前校验是否过期 如果过期先刷新token
+        const loginState = getLoginState()
+        if (
+          config.url !== '/api/auth/refreshtoken' &&
+          !loginState.islogin &&
+          loginState.type === 2 &&
+          loginState.role !== 'center'
+        ) {
           try {
-            await login.updateToken()
+            await updateToken()
           } catch (err) {
             console.error(err)
           }
         }
-      }
 
-      const token = login.getToken()
-      if (config?.headers && token) {
-        config.headers.token = token
+        const token = getToken()
+        if (config?.headers && token) {
+          config.headers.token = token
+        }
       }
-    }
 
-    if (type === 'spu' && config.modulekey) {
-      const moduleData: any = await core.getModuleData(config.modulekey)
-      if (moduleData.data) {
-        config.baseURL = `/api/${config.modulekey}/${moduleData.data.moduleversion}`
-      } else {
-        console.error(moduleData.errorMsg)
-        config.baseURL = `/api/${config.modulekey}/v?.?`
+      if (type === 'spu' && config.modulekey) {
+        const moduleData: any = await core.getModuleData(config.modulekey)
+        if (moduleData.data) {
+          config.baseURL = `/api/${config.modulekey}/${moduleData.data.moduleversion}`
+        } else {
+          console.error(moduleData.errorMsg)
+          config.baseURL = `/api/${config.modulekey}/v?.?`
+        }
       }
-    }
 
-    // 平台的业务接口开了开发者模式后，header带上debug方便查看接口的ide日志
-    if (type !== 'spu' && urlquery.isdebugger && config.url.indexOf('api/teapi/dy-biz/') > -1) {
-      if (config?.headers) {
-        config.headers.debug = 'true'
+      // 平台的业务接口开了开发者模式后，header带上debug方便查看接口的ide日志
+      if (type !== 'spu' && urlquery.isdebugger && config.url.indexOf('api/teapi/dy-biz/') > -1) {
+        if (config?.headers) {
+          config.headers.debug = 'true'
+        }
       }
-    }
 
-    return config
-  }, error => {
-    return Promise.reject(error)
-  })
+      return config
+    },
+    (error) => {
+      return Promise.reject(error)
+    }
+  )
+
+  axiosInstance.interceptors.response.use(
+    (res: AxiosResponse) => {
+      // debugger
+      const isShowLoading = get(res, 'config.isShowLoading', true)
+      isShowLoading && loadding.close()
+
+      let realRes: Response = {
+        code: 404,
+        data: '',
+        msg: '',
+        message: ''
+      }
 
-  axiosInstance.interceptors.response.use((res: AxiosResponse) => {
-    // debugger
-    const isShowLoading = get(res, 'config.isShowLoading', true)
-    isShowLoading && loadding.close()
+      if (type === 'spu') {
+        if (res.data.code === 200) {
+          // return res.data
+          realRes = {
+            code: res.data.code,
+            data: res.data.data,
+            msg: res.data.msg,
+            message: res.data.msg
+          }
+          return realRes
+        } else {
+          realRes = {
+            code: res.data.code,
+            data: res.data.data,
+            msg: res.data.msg || '网络异常，请稍后重试。',
+            message: res.data.msg || '网络异常，请稍后重试。'
+          }
 
-    let realRes: Response = {
-      code: 404,
-      data: '',
-      msg: '',
-      message: ''
-    }
+          // const isShowErrorMessage = get(res, 'config.isShowErrorMessage', true)
+          // isShowErrorMessage && Message.error(realRes.msg)
 
-    if (type === 'spu') {
-      if (res.data.code === 200) {
-        // return res.data
-        realRes = {
-          code: res.data.code,
-          data: res.data.data,
-          msg: res.data.msg,
-          message: res.data.msg
+          return Promise.reject(realRes) as any
         }
-        return realRes
-      } else {
+      } else if (type === 'normal') {
         realRes = {
-          code: res.data.code,
-          data: res.data.data,
-          msg: res.data.msg || '网络异常，请稍后重试。',
-          message: res.data.msg || '网络异常，请稍后重试。'
+          code: res.status || 200,
+          data: res.data?.resp_data || res.data,
+          msg: res.data?.error_code || '',
+          message: res.data?.error_code || ''
         }
-
-        // const isShowErrorMessage = get(res, 'config.isShowErrorMessage', true)
-        // isShowErrorMessage && Message.error(realRes.msg)
-
-        return Promise.reject(realRes) as any
+        return realRes
       }
-    } else if (type === 'normal') {
-      realRes = {
-        code: res.status || 200,
-        data: res.data?.resp_data || res.data,
-        msg: res.data?.error_code || '',
-        message: res.data?.error_code || ''
+    },
+    (err: any) => {
+      // err: AxiosError
+      // console.log(err)
+      // debugger
+      const isShowLoading = get(err, 'config.isShowLoading', true)
+      isShowLoading && loadding.close()
+
+      // console.log(err)
+      // debugger
+
+      let msg = ''
+      if (type === 'spu') {
+        msg = get(err, 'response.data.msg', '')
+      } else {
+        msg = get(err, 'response.data.error_code', '')
       }
-      return realRes
-    }
-  }, (err: any) => {
-    // err: AxiosError
-    // console.log(err)
-    // debugger
-    const isShowLoading = get(err, 'config.isShowLoading', true)
-    isShowLoading && loadding.close()
-
-    // console.log(err)
-    // debugger
-
-    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
+      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 isShowErrorMessage = get(err, 'config.isShowErrorMessage', true)
+      // isShowErrorMessage && Message.error(msg)
 
-    const isNoLogin = () => {
-      if (type === 'spu') {
-        if (err.message === '未授权' && get(err, 'response.data.code') === 401) {
-          return true
-        } else {
-          return false
-        }
-      } else if (type === 'normal') {
-        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
+      const isNoLogin = () => {
+        if (type === 'spu') {
+          if (err.message === '未授权' && get(err, 'response.data.code') === 401) {
+            return true
+          } else {
+            return false
+          }
+        } else if (type === 'normal') {
+          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
+          }
         }
       }
-    }
-
-    const noLoginFn = () => {
-      if (isNoLogin()) {
 
+      const noLoginFn = () => {
+        if (isNoLogin()) {
+        }
       }
-    }
 
-    return Promise.reject(err)
-  })
+      return Promise.reject(err)
+    }
+  )
 
   return axiosInstance
 }
@@ -182,13 +190,9 @@ const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
 let spuAxios: any = null
 let normalAxios: any = null
 
-function initAxios (options: any) {
+function installAxios(options: any) {
   spuAxios = createAxiosInstance('spu', options)
   normalAxios = createAxiosInstance('normal', options)
 }
 
-export {
-  initAxios,
-  spuAxios,
-  normalAxios as axios
-}
+export { installAxios, spuAxios, normalAxios as axios }

package/src/cloudServ.ts

@@ -5,7 +5,7 @@ class CloudServ {
 
   cacheStorage: NormalizedCloudServ | null = null
 
-  public get (key: StorageType = 'storage'): NormalizedCloudServItem | null {
+  public get(key: StorageType = 'storage'): NormalizedCloudServItem | null {
     if (this.cacheStorage) {
       return this.cacheStorage[key] || null
     }
@@ -18,7 +18,7 @@ class CloudServ {
     return storage[key]
   }
 
-  public set (storage: NormalizedCloudServ | string) {
+  public set(storage: NormalizedCloudServ | string) {
     if (typeof storage === 'object') {
       this.cacheStorage = storage
       storage = JSON.stringify(storage)
@@ -26,11 +26,11 @@ class CloudServ {
     lsProxy.setItem(this.CLOUD_SERVE_KEY, storage)
   }
 
-  public remove () {
+  public remove() {
     lsProxy.removeItem(this.CLOUD_SERVE_KEY)
   }
 
-  public getProvider (sign: StorageType = 'storage'): IAny | null {
+  public getProvider(sign: StorageType = 'storage'): IAny | null {
     const storage: NormalizedCloudServItem | null = this.get(sign)
     if (!storage) {
       return null