@smart100/spu-web-plugin 0.0.23 → 0.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "",
   "scripts": {
     "dev": "rollup -c -w",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@smart100/wxworksuite-plugin": "^0.0.3",
+    "@smart100/wxworksuite-plugin": "^0.0.4",
     "axios": "^1.6.0",
     "co": "^4.6.0",
     "dayjs": "^1.11.10",

package/src/axios.ts

@@ -16,7 +16,7 @@ interface Response {
   msg: string
 }
 
-const createAxiosInstance = (type: 'spu' | 'apaas' = 'spu', options: SPUWebPluginOptions) => {
+const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: SPUWebPluginOptions) => {
   const axiosInstance: AxiosInstance = axios.create({
     baseURL: type === 'spu' ? `/api/${options.modulekey}/${options.moduleversion}` : '',
     // baseURL: '',
@@ -88,7 +88,7 @@ const createAxiosInstance = (type: 'spu' | 'apaas' = 'spu', options: SPUWebPlugi
         }
         return Promise.reject(realRes) as any
       }
-    } else if (type === 'apaas') {
+    } else if (type === 'normal') {
       realRes = {
         code: res.status || 200,
         data: res.data?.resp_data || res.data,
@@ -118,7 +118,7 @@ const createAxiosInstance = (type: 'spu' | 'apaas' = 'spu', options: SPUWebPlugi
         } else {
           return false
         }
-      } else if (type === 'apaas') {
+      } else if (type === 'normal') {
         if (msg.indexOf('token is invalid(decode).') !== -1 || msg.indexOf('token is invalid(null).') !== -1 || msg === 'token无效，请重新登录' || msg === 'jwt token无效') {
           return true
         } else {
@@ -139,19 +139,16 @@ const createAxiosInstance = (type: 'spu' | 'apaas' = 'spu', options: SPUWebPlugi
   return axiosInstance
 }
 
-// const spuAxios: AxiosInstance = createAxiosInstance('spu')
-// const apaasAxios: AxiosInstance = createAxiosInstance('apaas')
-
 let spuAxios: any = null
-let apaasAxios: any = null
+let normalAxios: any = null
 
 function initAxios (options: SPUWebPluginOptions) {
   spuAxios = createAxiosInstance('spu', options)
-  apaasAxios = createAxiosInstance('apaas', options)
+  normalAxios = createAxiosInstance('normal', options)
 }
 
 export {
   initAxios,
   spuAxios,
-  apaasAxios
+  normalAxios as axios
 }

package/src/cloudServ.ts

@@ -1,63 +1,5 @@
 import { lsProxy } from './storageProxy'
 
-// let cacheStorage: NormalizedCloudServ | null = null
-
-// const CLOUDSERVE = 'cloudserv'
-
-// const set = (storage: NormalizedCloudServ | string) => {
-//   if (typeof storage === 'object') {
-//     cacheStorage = storage
-//     storage = JSON.stringify(storage)
-//   }
-//   lsProxy.setItem(CLOUDSERVE, storage)
-// }
-
-// const get = (key: StorageType = 'storage'): NormalizedCloudServItem | null => {
-//   if (cacheStorage) {
-//     return cacheStorage[key as StorageType] || null
-//   }
-//   const storageStr = lsProxy.getItem(CLOUDSERVE)
-//   if (!storageStr) {
-//     return null
-//   }
-//   const storage = JSON.parse(storageStr)
-//   cacheStorage = storage
-//   return storage[key]
-// }
-
-// const getProvider = (sign: StorageType = 'storage') => {
-//   const storage: NormalizedCloudServItem | null = get(sign)
-//   if (!storage) {
-//     return false
-//   }
-//   return storage.cloudserv_storage_provider
-// }
-
-// const isAliyun = (sign: StorageType = 'storage') => {
-//   return getProvider(sign) === 'aliyun'
-// }
-
-// const isAzure = (sign: StorageType = 'storage') => {
-//   return getProvider(sign) === 'azure'
-// }
-
-// const isAwss3 = (sign: StorageType = 'storage') => {
-//   return getProvider(sign) === 'awss3'
-// }
-
-// const isHuawei = (sign: StorageType = 'storage') => {
-//   return getProvider(sign) === 'huawei'
-// }
-
-// export default {
-//   set,
-//   get,
-//   isAliyun,
-//   isAzure,
-//   isAwss3,
-//   isHuawei
-// }
-
 class CloudServ {
   CLOUD_SERVE_KEY = 'cloudserv'
 

package/src/components/expandexp/index.ts

@@ -3,11 +3,12 @@ import renderTemplate from './template'
 import { Step } from './step'
 import { cloneDeep, merge } from 'lodash-es'
 import { fixFileName, dealFileSize, dealResultMessage } from './util'
-import { apaasAxios } from '../../axios'
+import { axios } from '../../axios'
 import core, { Module } from '../../core'
 import login from '../../login'
 import { downloadService } from '../../oss'
 import { apaasSpuTrackSendLog } from '../../apaasSpuTrack'
+import { isWxworkSuiteTenant } from '@smart100/wxworksuite-plugin'
 
 export default class SpuExpandexp extends HTMLElement {
 
@@ -67,9 +68,10 @@ export default class SpuExpandexp extends HTMLElement {
       fileName: '',
       fileSize: '',
       runningTaskCount: 0,
-      isOldVersionService: false
+      isOldVersionService: false,
+      isWxworkSuiteTenant: isWxworkSuiteTenant()
     }, (key: string, value: any) => {
-      const { exportConfigInit, stepName, stepText, exportcontentArray, exportcontent, isOldVersionService, runningTaskCount, fileName, filetype, fileSize, exportDataItem, percentage, resultMessage } = this.data
+      const { exportConfigInit, stepName, stepText, exportcontentArray, exportcontent, isOldVersionService, runningTaskCount, fileName, filetype, fileSize, exportDataItem, percentage, resultMessage, isWxworkSuiteTenant } = this.data
 
       // debugger
       const $exportSel = this.shadow.querySelector('.export-sel') as any
@@ -89,6 +91,12 @@ export default class SpuExpandexp extends HTMLElement {
       const $filesize = this.shadow.querySelector('.export-file-l-filesize') as any
       const $wait = this.shadow.querySelector('.export-wait') as any
       const $waitSpan = this.shadow.querySelector('.export-wait span') as any
+      const $exportWxworkTip = this.shadow.querySelector('.export-wxwork-tip') as any
+
+
+      if (key === 'isWxworkSuiteTenant') {
+        this.vIf($exportWxworkTip, isWxworkSuiteTenant)
+      }
 
       if (key === 'exportConfigInit') {
         this.vIf($exportSelCon, exportConfigInit)
@@ -324,8 +332,6 @@ export default class SpuExpandexp extends HTMLElement {
       this.handleCencel()
     })
 
-
-
     this.shadow.querySelector('.export-btn')!.addEventListener('click', () => {
       // console.log('导出')
       this.handleExport()
@@ -379,7 +385,7 @@ export default class SpuExpandexp extends HTMLElement {
         event: 'exportopenmodal'
       })
     } else {
-      apaasAxios
+      axios
         .post('/api/expandexp/global/searchExpGloConfig', {
           key: 'export-config-switch',
           tenantcode: login.getUser('tenantcode'),
@@ -416,7 +422,7 @@ export default class SpuExpandexp extends HTMLElement {
             this.data.iscompress = '1'
 
             // 获取文件水印开关
-            apaasAxios
+            axios
               .post('/api/expandexp/global/searchWatermarkConfig', '', {
                 isShowLoading: false
               })
@@ -486,7 +492,7 @@ export default class SpuExpandexp extends HTMLElement {
       }
     }
     const finallyPost = mergedata ? merge(mergedata, post) : post
-    apaasAxios
+    axios
       .post(this.props.exportapi, finallyPost)
       .then((res: any) => {
         // console.log(res)
@@ -606,7 +612,7 @@ export default class SpuExpandexp extends HTMLElement {
     // console.log(this.data)
     // console.log(this.data.exportDataItem)
 
-    apaasAxios
+    axios
       .post('/api/teapi/queue/impexp/cancel', {
         dynamicid: this.data.exportId
       })
@@ -653,7 +659,7 @@ export default class SpuExpandexp extends HTMLElement {
   }
 
   async updateStatus () {
-    apaasAxios
+    axios
       .post(`/api/teapi/queue/impexp/expStatus?dynamicid=${this.data.exportId}`, {}, {
         isShowLoading: false
       })

package/src/components/expandexp/template.ts

@@ -173,6 +173,11 @@ export default (ele: SpuExpandexp) => {
   height: 32px;
 }
 
+.export-wxwork-tip {
+  margin-bottom: 12px;
+  font-size: 14px;
+}
+
 .export-sel {
   margin-bottom: 12px;
 }
@@ -420,6 +425,8 @@ export default (ele: SpuExpandexp) => {
               导出等待队列中：还有<span></span>位，请耐心稍等...
             </div>
 
+            <div class="export-wxwork-tip hide">提醒：导出前请联系管理员确认已在人员管理模块进行了同步企微端人员和组织名称的操作，否则导出字段将会显示异常！</div>
+
             <div class="export-sel hide">
               <div class="export-sel-title">请选择导出内容</div>
               <div class="export-sel-con hide"></div>

package/src/core.js

@@ -1,6 +1,6 @@
 import { globalOptions } from './install'
 import { get, cloneDeep } from 'lodash-es'
-import { apaasAxios as axios } from './axios'
+import { axios } from './axios'
 import login from './login'
 
 const urlIsIp = (url) => {
@@ -462,7 +462,7 @@ const Module = {
   // linkToPage: core.linkToPage.bind(core),
   // linkToModule: core.linkToModule.bind(core),
   getModuleData: core.getModuleData.bind(core),
-  getContext: core.getContext.bind(core),
+  // getContext: core.getContext.bind(core),
   getEnvData: core.getEnvData.bind(core),
   apiRequest: core.apiRequest.bind(core),
   checkModule: core.checkModule.bind(core)

package/src/index.ts

@@ -2,18 +2,17 @@ import { version } from '../package.json'
 import { install } from './install'
 import { lsProxy, ssProxy } from './storageProxy'
 import { getLocation, getDistance } from './location'
-import { spuAxios, apaasAxios } from './axios'
+import { spuAxios, axios } from './axios'
 import { spuConfig } from './spuConfig'
 import { downloadService, uploadService } from './oss'
-import { getUniqueid, functionCheck, isWxwork, isWxworkPc, isWxworkApp } from './utils'
+import { getUniqueid, functionCheck } from './utils'
 import AMapLoader from './AMapLoader'
 import login from './login'
 import { v4 as getUuid } from 'uuid'
 import { Module } from './core'
 import components from './components'
 import { expandexp } from './components/expandexp'
-import { jssdk } from '@smart100/wxworksuite-plugin'
-
+import { jssdk, isWxworkSuiteTenant, isWxwork, isWxworkPc, isWxworkApp } from '@smart100/wxworksuite-plugin'
 
 // class SPUWebPlugin {
 //   static install = install
@@ -34,7 +33,7 @@ const getUser = login.getUser.bind(login)
 const checkLogin = login.checkLogin.bind(login)
 const wxworkSuite = {
   JSSDK: jssdk,
-  isWxworkSuiteTenant: jssdk.checkData,
+  isWxworkSuiteTenant,
   isWxwork,
   isWxworkPc,
   isWxworkApp
@@ -47,7 +46,8 @@ export {
   getLocation,
   getDistance,
   spuAxios,
-  apaasAxios,
+  axios,
+  axios as apaasAxios,
   spuConfig,
   downloadService,
   uploadService,

package/src/install.ts

@@ -12,6 +12,7 @@ const globalOptions: SPUWebPluginOptions = {
   modulekey: 'demospu',
   modulename: 'demospu',
   moduleversion: 'v1.0',
+  storageproxyprefix: '',
   router: null
 }
 

package/src/login.ts

@@ -1,6 +1,6 @@
 import { cloneDeep } from 'lodash-es'
 import jwtDecode from 'jwt-decode'
-import { apaasAxios } from './axios'
+import { axios } from './axios'
 import tenantInfo from './tenantInfo'
 import { lsProxy } from './storageProxy'
 // import { functionCheck } from './utils'
@@ -99,7 +99,7 @@ class Login {
   }
 
   private updateToken () {
-    return apaasAxios.get('/api/auth/refreshtoken', {
+    return axios.get('/api/auth/refreshtoken', {
       params: {
         refreshtoken: this.getRefreshToken()
       },
@@ -211,7 +211,7 @@ class Login {
 
   // 接口请求回来的 userInfo 有 functioncodes 以便做权限校验
   async getAndSetUserInfo () {
-    // return apaasAxios.post('/api/teapi/rolepermission/account/getaccountinfo', {
+    // return axios.post('/api/teapi/rolepermission/account/getaccountinfo', {
     //   positionid: this.getUser('positioncode'),
     //   deviceinfo: '',
     //   sysversion: '',
@@ -228,7 +228,7 @@ class Login {
     // })
 
     try {
-      const accountinfo: null | any = await apaasAxios.post('/api/teapi/rolepermission/account/getaccountinfo', {
+      const accountinfo: null | any = await axios.post('/api/teapi/rolepermission/account/getaccountinfo', {
         positionid: this.getUser('positioncode'),
         deviceinfo: '',
         sysversion: '',

package/src/oss/downloadService.ts

@@ -8,7 +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 { axios } from '../axios'
 // import { get } from 'lodash-es'
 // import qs from 'qs'
 
@@ -245,7 +245,7 @@ const downloadFile = async ({
     filename: realFilename,
     cope
   })
-  // apaasAxios.get(url, {
+  // axios.get(url, {
   //   responseType: 'blob',
   //   isSendToken: false,
   //   isShowErrorMessage: false
@@ -263,7 +263,7 @@ const downloadFile = async ({
   if (isAliYun) {
     downloadFileByUrl(url, filename)
   } else {
-    apaasAxios.get(url, {
+    axios.get(url, {
       responseType: 'blob',
       isSendToken: false,
       isShowErrorMessage: false

package/src/oss/servtoken.ts

@@ -1,5 +1,5 @@
 // import { noBaseRequest } from '@/service/http'
-import { apaasAxios } from '../axios'
+import { axios } from '../axios'
 
 export type ServToken = {
   accesskeyid: string
@@ -21,7 +21,7 @@ let xhr: Promise<ServToken> | null = null
 
 const getServToken = async () => {
   try {
-    const response: ServToken = await apaasAxios.get('/api/teapi/auth/servtoken', {}).then((res: any) => res.data)
+    const response: ServToken = await axios.get('/api/teapi/auth/servtoken', {}).then((res: any) => res.data)
     // debugger
     return response
   } catch (e) {

package/src/storageProxy.ts

@@ -39,7 +39,7 @@ const lsProxy: StorageProxy = new StorageProxy('local')
 const ssProxy: StorageProxy = new StorageProxy('session')
 
 function initStorageProxy (options: SPUWebPluginOptions) {
-  STORAGENAMESPACE = options.modulekey
+  STORAGENAMESPACE = options.storageproxyprefix || options.modulekey
 }
 
 export {

package/src/tenantInfo.ts

@@ -1,11 +1,11 @@
-import { apaasAxios } from './axios'
+import { axios } from './axios'
 import cloudServ from './cloudServ'
 import { lsProxy } from './storageProxy'
 
 class TenantInfo {
   async get (tenantCode?: string) {
     try {
-      const tenants: null | ITenantInfo[] = await apaasAxios.get('/api/auth/tenantlist', {}).then((res: any) => {
+      const tenants: null | ITenantInfo[] = await axios.get('/api/auth/tenantlist', {}).then((res: any) => {
         // debugger
         return res?.data?.tenants
       })

package/src/types/global.d.ts

@@ -6,6 +6,7 @@ interface SPUWebPluginOptions {
   modulekey: string;
   modulename: string;
   moduleversion: string;
+  storageproxyprefix?: string
   router?: any;
 }
 

package/src/utils.ts

@@ -5,21 +5,6 @@ const isIOS = () => {
   return /(iPhone|iPad|iPod|IOS)/i.test(ua)
 }
 
-// 是否企微软件内 包括电脑端和APP端
-const isWxwork = () => {
-  return navigator.userAgent.indexOf('wxwork') >= 0
-}
-
-// 是否在电脑端企微软件内
-const isWxworkPc = () => {
-  return isWxwork() && navigator.userAgent.indexOf('Mobile') === -1
-}
-
-// 是否在企微APP内
-const isWxworkApp = () => {
-  return isWxwork() && navigator.userAgent.indexOf('Mobile') >= 0
-}
-
 // 生成唯一id
 const getUniqueid = () => {
   const random = Math.ceil(Math.random() * 100000)
@@ -40,9 +25,6 @@ const functionCheck = (functioncode?: string): boolean => {
 
 export {
   isIOS,
-  isWxwork,
-  isWxworkPc,
-  isWxworkApp,
   getUniqueid,
   functionCheck
 }