@smart100/spu-web-plugin 0.0.15 → 0.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "0.0.15",
+  "version": "0.0.17",
   "description": "",
   "scripts": {
     "dev": "rollup -c -w",

package/src/apaasSpuTrack.ts

@@ -0,0 +1,194 @@
+import { globalOptions } from './install'
+import { cloneDeep, merge } from 'lodash-es'
+import ApaasSpuTrack from './package/apaas-track/apaas-spu/index.umd.js'
+import login from './login'
+
+const getWebInitParams = async () => {
+  const user = login.getUser()
+  const envname = await login.getEnvname()
+  return {
+    project: globalOptions.modulename,
+    appid: globalOptions.modulekey,
+    clientver: globalOptions.moduleversion,
+    // anonymousid: '',
+    // distinctid: '',
+    accountcode: user.accountcode,
+    envname: envname,
+    tenantcode: user.tenantcode,
+    tenantname: user.tenantname,
+    positionname: user.positionname,
+    mbcode: user.mbcode,
+    username: `${user.username1 || ''}|${user.username2 || ''}|${user.username3 || ''}`,
+    userinfoname: user.userinfoname
+  }
+}
+
+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 = '解析成功。'
+    } else {
+      result.code = 404
+      result.msg = '不存在该 url 的 indextag。'
+    }
+  } 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 = () => {
+  setTimeout(() => {
+    if (ApaasSpuTrack && !window.apaasSpuTrack && !window?.aPaaS?.getWebInitParams && !window?.Module?.getIndextagSync) {
+      window.aPaaS = {
+        getWebInitParams
+      }
+      window.Module = {
+        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
+      }).then((apaasSpuTrack: ApaasSpuTrack) => {
+        console.log('apaasSpuTrack', apaasSpuTrack)
+        window.apaasSpuTrack = apaasSpuTrack
+
+        // // 监听关闭事件
+        // window.addEventListener('beforeunload', (e) => {
+        //   // console.log(e)
+        //   // debugger
+        //   // window.dispatchEvent(new Event('pagehide'))
+        //   let beforeunloadCount = window.localStorage.getItem('beforeunloadCount')
+        //   if (!beforeunloadCount) {
+        //     beforeunloadCount = 0
+        //   }
+        //   window.localStorage.setItem('beforeunloadCount', (Number(beforeunloadCount) + 1).toString())
+        // })
+
+        // // 监听关闭事件
+        // window.addEventListener('pagehide', () => {
+        //   // debugger
+        //   let pagehideCount = window.localStorage.getItem('pagehideCount')
+        //   if (!pagehideCount) {
+        //     pagehideCount = 0
+        //   }
+        //   window.localStorage.setItem('pagehideCount', (Number(pagehideCount) + 1).toString())
+        // })
+
+        // 重写 transformLog 底层方法
+        let initindextag = ''
+        apaasSpuTrack.transformLog = (log: any) => {
+          if (log.properties) {
+            // 发送所有类型的日志前统一在 properties 对象属性下增加SPU相关属性值：modulekey、modulename、moduleversion、indextag、initindextag、toindextag、fromindextag。
+            log.properties.modulekey = log.appid
+            log.properties.modulename = log.project
+            log.properties.moduleversion = log.clientver
+            // debugger
+
+            const urlParseRes = window.Module.getIndextagSync({
+              url: log.url
+            })
+            log.properties.indextag = urlParseRes.indextag
+
+            // 初始化时记录 initindextag 之后为每个日志都添加 initindextag
+            if (log.types === 'init') {
+              initindextag = log.properties.indextag
+            }
+            log.properties.initindextag = initindextag
+
+            if (log.types === 'pageview' && log.properties.to) {
+              const toParseRes = window.Module.getIndextagSync({
+                url: log.properties.to
+              })
+              log.properties.toindextag = toParseRes.indextag
+            }
+            if (log.types === 'pageview' && log.properties.from) {
+              const fromParseRes = window.Module.getIndextagSync({
+                url: log.properties.from
+              })
+              log.properties.fromindextag = fromParseRes.indextag
+            }
+          }
+          return log
+        }
+
+        apaasSpuTrack.start()
+      })
+    }
+  }, 2500)
+}
+
+const apaasSpuTrackSendLog = (data: any, end: 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 (!end) {
+      console.warn('window.apaasSpuTrack 不存在，导出日志延迟3秒后再次发送。')
+      setTimeout(() => {
+        apaasSpuTrackSendLog(data, true)
+      }, 3000)
+    } else {
+      console.error('apaasTrack 不存在，导出日志发送失败。')
+    }
+  }
+}
+
+export {
+  initApaasSpuTrack,
+  apaasSpuTrackSendLog
+}

package/src/components/expandexp/index.ts

@@ -7,6 +7,7 @@ import { apaasAxios } from '../../axios'
 import core, { Module } from '../../core'
 import login from '../../login'
 import { downloadService } from '../../oss'
+import { apaasSpuTrackSendLog } from '../../apaasSpuTrack'
 
 export default class SpuExpandexp extends HTMLElement {
 
@@ -340,6 +341,10 @@ export default class SpuExpandexp extends HTMLElement {
           }
         }
       })
+      this.sendLog({
+        types: 'exportopenmodal',
+        event: 'exportopenmodal'
+      })
     } else {
       apaasAxios
         .post('/api/expandexp/global/searchExpGloConfig', {
@@ -361,6 +366,11 @@ export default class SpuExpandexp extends HTMLElement {
         .catch((err: Error) => {
           this.data.expandStatus = '1'
         }).finally(() => {
+          // 发送日志
+          this.sendLog({
+            types: 'exportopenmodal',
+            event: 'exportopenmodal'
+          })
 
           if (this.data.expandStatus === '1') {
             this.data.exportcontentArray = ['excel']
@@ -468,11 +478,22 @@ export default class SpuExpandexp extends HTMLElement {
         this.data.resultMessage = '网络连接错误'
         this.stopInterval()
       })
+
+    this.sendLog({
+      types: 'exportclickbutton',
+      event: 'exportclickbutton',
+      properties: {
+        bizdata: {
+          exportapi: this.props.exportapi,
+          params: finallyPost
+        }
+      }
+    })
   }
 
   handleDownload () {
-    console.log(this.data)
-    console.log(this.data.exportDataItem)
+    // console.log(this.data)
+    // console.log(this.data.exportDataItem)
 
     let fixExportFileUrl = this.data.exportDataItem.exportfileurl[0] === '/' ? this.data.exportDataItem.exportfileurl : '/' + this.data.exportDataItem.exportfileurl
     let exportFileName = this.data.exportDataItem.filename
@@ -486,12 +507,25 @@ export default class SpuExpandexp extends HTMLElement {
     //   filename: exportFileName
     // })
 
-    downloadService.downloadFile({
+    const params = {
       type: 'att',
       source: fixExportFileUrl,
       datetime: date,
       storagetype: 'storage-1d',
       filename: exportFileName
+    }
+
+    downloadService.downloadFile(params as any)
+
+    // 发送日志
+    this.sendLog({
+      types: 'exportdownloadfile',
+      event: 'exportdownloadfile',
+      properties: {
+        bizdata: {
+          params: params
+        }
+      }
     })
   }
 
@@ -614,20 +648,19 @@ export default class SpuExpandexp extends HTMLElement {
           // this.stopInterval()
         } else if (currentData.exportstate === 'ext_readyrun') {
           this.updateStep('ext_readyrun')
-          if (currentData) {
-            this.data.percentage = +currentData.finishRate * 0.5 + 50
-          }
+          currentData && (this.data.percentage = +currentData.finishRate * 0.5 + 50)
         } else if (currentData.exportstate === 'ext_running') {
           this.updateStep('ext_running')
-          // debugger
-          if (currentData) {
-            this.data.percentage = +currentData.finishRate * 0.5 + 50
-          }
+          currentData && (this.data.percentage = +currentData.finishRate * 0.5 + 50)
         } else {
           this.updateStep('running')
           if (currentData) {
-            this.data.percentage = +currentData.finishRate * 0.5
-            // state.percentage = +currentData.finishRate
+            this.data.percentage = +currentData.finishRate
+            // if (this.data.expandStatus = '1') {
+            //   this.data.percentage = +currentData.finishRate
+            // } else {
+            //   this.data.percentage = +currentData.finishRate * 0.5
+            // }
           }
         }
       })
@@ -649,6 +682,18 @@ export default class SpuExpandexp extends HTMLElement {
     }
   }
 
+  sendLog (data: any) {
+    apaasSpuTrackSendLog(merge({
+      // types: 'exportdownloadfile',
+      // event: 'exportdownloadfile',
+      properties: {
+        formtype: 'spu',
+        exporttype: this.data.expandStatus,
+        pagecode: this.props.pagecode
+      }
+    }, data))
+  }
+
   removeSelf () {
     this.parentNode!.removeChild(this)
   }

package/src/components/expandexp/template.ts

@@ -159,8 +159,9 @@ export default (ele: SpuExpandexp) => {
 }
 .export-file-r {
   display: flex;
-  width: 80px;
+  width: 90px;
   flex-direction: row-reverse;
+  align-items: center;
 }
 .export-file-r-download {
   line-height: 26px;
@@ -177,8 +178,8 @@ export default (ele: SpuExpandexp) => {
   border-color: #85ce61;
 }
 .export-file-r-cancel {
-  line-height: 26px;
-  width: 26px;
+  line-height: 20px;
+  width: 20px;
   border-radius: 14px;
   color: #f56c6c;
   background: #fef0f0;

package/src/install.ts

@@ -3,12 +3,9 @@ import login from './login'
 import { initAxios } from './axios'
 import urlquery from './urlquery'
 import { initSpuConfig } from './spuConfig'
+import { initApaasSpuTrack } from './apaasSpuTrack'
 import { merge } from 'lodash-es'
-
 import { initTest } from './test'
-// import tenantInfo from './tenantInfo'
-// import { downloadService } from './oss'
-
 
 const globalOptions: SPUWebPluginOptions = {
   modulekey: 'demospu',
@@ -17,14 +14,13 @@ const globalOptions: SPUWebPluginOptions = {
   router: null
 }
 
-let isInstall = false
-
 const install = (app: any, options: SPUWebPluginOptions) => {
   // console.log(app)
   // console.log(app.version)
-  console.log('@smart100/spu-web-plugin options', options)
   merge(globalOptions, options)
-  console.log('@smart100/spu-web-plugin globalOptions', globalOptions)
+  console.log('@smart100/spu-web-plugin start!')
+  console.log('options', options)
+  console.log('globalOptions', globalOptions)
 
   // if (install.installed) return
   // install.installed = true
@@ -40,31 +36,13 @@ const install = (app: any, options: SPUWebPluginOptions) => {
   //   console.error('This plugin requires Vue App Instance')
   // }
 
-
   initStorageProxy(globalOptions)
   initAxios(globalOptions)
   initSpuConfig(globalOptions)
+  initApaasSpuTrack()
   urlquery.init()
   login.startRefreshtoken()
-
-  // setTimeout(async () => {
-  //   const a = await downloadService.getUrl({
-  //     // source: 'a1b9954a-fb39-4bb2-aa0b-501f4af0d99e.jpeg',
-  //     // datetime: '1698832693257',
-  //     // source: '2f7dfe47-1827-4db1-9d99-3ddb08bb7e21.jpg',
-  //     // datetime: '1698832697897',
-  //     source: 'e3befbe5-8954-46d2-a368-5f812a5530e5.jpg',
-  //     datetime: '1699527237567',
-  //     // cope: {
-  //     //   width: 100
-  //     // }
-  //   })
-  //   console.log(a)
-  //   console.log(71117)
-  // }, 1000)
-
-
-  // tenantInfo.getAndSave()
+  initTest(globalOptions)
 
   if (globalOptions.router) {
     globalOptions.router.beforeEach(async (to: any, from: any, next: any) => {
@@ -86,29 +64,11 @@ const install = (app: any, options: SPUWebPluginOptions) => {
       }
     })
   } else {
-    console.error('请传入 router 实例。')
+    console.error('@smart100/spu-web-plugin require a vue-router instance.')
   }
-
-
-  initTest(globalOptions)
-
-  isInstall = true
-
-  // Vue.component('xt-engine', components.engine)
-  // Vue.prototype.$xtEngine = () => {
-  //   console.log('$xtEngine')
-  // }
-
-  // const component = options?.component
-  // if (component) {
-  //   for (const x in component) {
-  //     register(x, component[x])
-  //   }
-  // }
 }
 
 export {
   install,
-  isInstall,
   globalOptions
 }

package/src/oss/downloadService.ts

@@ -8,6 +8,7 @@ import ObsClient from '../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.
 // const ObsClient = require('../package/huaweicloud-obs/esdk-obs-browserjs.3.22.3.min.js')
 import dayjs from 'dayjs'
 import login from '../login'
+import { apaasAxios } from '../axios'
 // import { get } from 'lodash-es'
 // import qs from 'qs'
 
@@ -193,27 +194,25 @@ const getUrl = async ({
 }
 
 
-const callDownloadManager = (url: string, filename: string) => {
-  let aElm = document.createElement('a')
-  aElm.innerHTML = filename + ''
+const downloadFileByUrl = (url: string, filename: string) => {
+  const aElm = document.createElement('a')
+  aElm.innerHTML = filename
   aElm.download = filename
-  let href = url
-  aElm.href = href
-  document.body.appendChild(aElm)
   aElm.target = '_blank'
+  aElm.href = url
+  document.body.appendChild(aElm)
   let evt = document.createEvent('MouseEvents')
   evt.initEvent('click', false, false)
   aElm.dispatchEvent(evt)
   document.body.removeChild(aElm)
 }
 
-const deal = (response: any, filename: string) => {
-  let aElm = document.createElement('a')
-  aElm.innerHTML = filename + ''
+const downloadFileByBlob = (blob: any, filename: string) => {
+  const aElm = document.createElement('a')
+  aElm.innerHTML = filename
   aElm.download = filename
   aElm.target = '_blank'
-  let href = window.URL.createObjectURL(response.bodyBlob)
-  aElm.href = href
+  aElm.href = window.URL.createObjectURL(blob)
   document.body.appendChild(aElm)
   let evt = document.createEvent('MouseEvents')
   evt.initEvent('click', false, false)
@@ -233,23 +232,50 @@ const downloadFile = async ({
   if (!filename) {
     filename = source
   }
+
   const suffix = filename.slice(filename.lastIndexOf('.'))
-  filename = filename.replace(suffix, '') + dayjs(+datetime).format('_YYYYMMDDHHmmssS') + String(Math.floor(Math.random() * 9000) + 1000) + suffix
+  const realFilename = filename.replace(suffix, '') + dayjs(+datetime).format('_YYYYMMDDHHmmssS') + String(Math.floor(Math.random() * 9000) + 1000) + suffix
 
   // console.log(filename)
-
   const url = await getUrl({
     type,
     source,
     datetime,
     storagetype,
-    filename,
+    filename: realFilename,
     cope
   })
+  // apaasAxios.get(url, {
+  //   responseType: 'blob',
+  //   isSendToken: false,
+  //   isShowErrorMessage: false
+  // }).then((response: any) => {
+  //   // console.log(response)
+  //   // debugger
+  //   downloadFileByBlob(response.data, filename)
+  // }).catch((e) => {
+  //   console.log(e)
+  //   throw Error(e)
+  // })
 
-  // console.log(url)
-
-  callDownloadManager(url, filename)
+  const isAliYun = CloudServ.isAliyun(storagetype)
+  // const isHuawei = CloudServ.isHuawei(storagetype)
+  if (isAliYun) {
+    downloadFileByUrl(url, filename)
+  } else {
+    apaasAxios.get(url, {
+      responseType: 'blob',
+      isSendToken: false,
+      isShowErrorMessage: false
+    }).then((response: any) => {
+      // console.log(response)
+      // debugger
+      downloadFileByBlob(response.data, filename)
+    }).catch((e: any) => {
+      console.log(e)
+      throw Error(e)
+    })
+  }
 }
 
 export default {