@smart100/spu-web-plugin 0.0.23 → 0.0.25

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "description": "",
   "scripts": {
-    "dev": "rollup -c -w",
-    "build": "rollup -c && npm run build:types",
+    "dev": "npm run build:types && rollup -c -w",
+    "build": "npm run build:types && rollup -c",
     "build:types": "node script/build-types.js",
     "docs": "cd ./docs && npm run docs"
   },
@@ -21,6 +21,7 @@
   "devDependencies": {
     "@babel/core": "^7.23.2",
     "@babel/preset-env": "^7.23.2",
+    "@rollup/plugin-alias": "^5.1.0",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-image": "^3.0.3",
@@ -37,11 +38,12 @@
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@smart100/wxworksuite-plugin": "^0.0.3",
+    "@smart100/wxworksuite-plugin": "^0.0.5",
     "axios": "^1.6.0",
     "co": "^4.6.0",
     "dayjs": "^1.11.10",
     "jwt-decode": "^3.1.2",
+    "lit": "^3.1.4",
     "lodash-es": "^4.17.21",
     "uuid": "^9.0.1",
     "vconsole": "^3.15.1"

package/src/apaasSpuTrack.ts

@@ -1,11 +1,12 @@
-import { globalOptions } from './install'
+import { globalOptions, getUser, Module } from './index'
 import { cloneDeep, merge } from 'lodash-es'
+
+// @ts-ignore
 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()
+  const user = getUser()
+  const envname = await Module.getEnvname()
   return {
     project: globalOptions.modulename,
     appid: globalOptions.modulekey,

package/src/axios.ts

@@ -7,7 +7,7 @@ import type {
 import { get } from 'lodash-es'
 // import { Message } from 'element-ui'
 import { loadding } from './components/loadding'
-import login from './login'
+import { getUser, getToken } from './index'
 import core from './core'
 
 interface Response {
@@ -16,7 +16,7 @@ interface Response {
   msg: string
 }
 
-const createAxiosInstance = (type: 'spu' | 'apaas' = 'spu', options: SPUWebPluginOptions) => {
+const createAxiosInstance = (type: 'spu' | 'normal' = 'spu', options: any) => {
   const axiosInstance: AxiosInstance = axios.create({
     baseURL: type === 'spu' ? `/api/${options.modulekey}/${options.moduleversion}` : '',
     // baseURL: '',
@@ -35,7 +35,7 @@ const createAxiosInstance = (type: 'spu' | 'apaas' = 'spu', options: SPUWebPlugi
 
     const isSendToken = get(config, 'isSendToken', true)
     if (isSendToken) {
-      const token = login.getToken()
+      const token = getToken()
       if (config?.headers && token) {
         config.headers.token = token
       }
@@ -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) {
+function initAxios (options: any) {
   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

@@ -1,13 +1,11 @@
+import { Module, axios, getUser, wxworkSuite, spuAxios } from '../../index'
+import { cloneDeep, merge } from 'lodash-es'
+import { downloadService } from '../../oss'
+import { apaasSpuTrackSendLog } from '../../apaasSpuTrack'
 import { getAttributes } from '../common/index'
 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 core, { Module } from '../../core'
-import login from '../../login'
-import { downloadService } from '../../oss'
-import { apaasSpuTrackSendLog } from '../../apaasSpuTrack'
 
 export default class SpuExpandexp extends HTMLElement {
 
@@ -67,9 +65,10 @@ export default class SpuExpandexp extends HTMLElement {
       fileName: '',
       fileSize: '',
       runningTaskCount: 0,
-      isOldVersionService: false
+      isOldVersionService: false,
+      isWxworkSuiteTenant: wxworkSuite.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 +88,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' || key === 'stepName') {
+        this.vIf($exportWxworkTip, isWxworkSuiteTenant && stepName === 'initial')
+      }
 
       if (key === 'exportConfigInit') {
         this.vIf($exportSelCon, exportConfigInit)
@@ -324,8 +329,6 @@ export default class SpuExpandexp extends HTMLElement {
       this.handleCencel()
     })
 
-
-
     this.shadow.querySelector('.export-btn')!.addEventListener('click', () => {
       // console.log('导出')
       this.handleExport()
@@ -338,7 +341,7 @@ export default class SpuExpandexp extends HTMLElement {
   }
 
   async getExpandexpConfig () {
-    let isInstallexpandexp = await core.checkModule('expandexp')
+    let isInstallexpandexp = await Module.checkModule('expandexp')
     // isInstallexpandexp = false
     console.log('isInstallexpandexp', isInstallexpandexp)
 
@@ -348,42 +351,46 @@ export default class SpuExpandexp extends HTMLElement {
       this.data.iscompress = '1'
 
       // 这个单个查询接口返回的filewatermark已经结合了全局水印开关 因此不需要查询全局水印
-      Module.apiRequest({
-        modulekey: 'expandexp',
-        apitag: 'imageConfig-getByPageCode',
-        body: {
-          pagecode: this.props.pagecode
-        },
-        complete: (code: any, data: any, msg: any) => {
+      spuAxios
+        .post(
+          '/imageConfig/getByPageCode',
+          {
+            pagecode: this.props.pagecode
+          },
+          {
+            modulekey: 'expandexp'
+          }
+        )
+        .then((res: any) => {
           // console.log('imageConfig', code, data, msg)
-          if (code === 200) {
-            this.data.exportcontentArray = data.exportcontent
+          if (res.code === 200 && res.data) {
+            this.data.exportcontentArray = res.data.exportcontent
             // this.data.exportcontentArray = ['photo']
             if (this.data.exportcontentArray?.length > 0) {
               this.data.exportcontent = this.data.exportcontentArray[0]
             } else {
               this.data.exportcontent = 'excel'
             }
-            this.data.filewatermarkGlobalConfig = data.filewatermark.toString()
-            this.data.filewatermark = data.filewatermark.toString()
-            this.data.iscompress = data.iscompress.toString()
-            this.data.imagesizepercolumn = data.imagesizepercolumn.toString()
-            this.data.imageheightcm = data.imageheightcm.toString()
+            this.data.filewatermarkGlobalConfig = res.data.filewatermark.toString()
+            this.data.filewatermark = res.data.filewatermark.toString()
+            this.data.iscompress = res.data.iscompress.toString()
+            this.data.imagesizepercolumn = res.data.imagesizepercolumn.toString()
+            this.data.imageheightcm = res.data.imageheightcm.toString()
 
             this.data.exportConfigInit = true
           }
-        }
-      })
+        })
+
       this.sendLog({
         types: 'exportopenmodal',
         event: 'exportopenmodal'
       })
     } else {
-      apaasAxios
+      axios
         .post('/api/expandexp/global/searchExpGloConfig', {
           key: 'export-config-switch',
-          tenantcode: login.getUser('tenantcode'),
-          productcode: login.getUser('productcode')
+          tenantcode: getUser('tenantcode'),
+          productcode: getUser('productcode')
         }, {}, {
           isShowLoading: false
         })
@@ -416,7 +423,7 @@ export default class SpuExpandexp extends HTMLElement {
             this.data.iscompress = '1'
 
             // 获取文件水印开关
-            apaasAxios
+            axios
               .post('/api/expandexp/global/searchWatermarkConfig', '', {
                 isShowLoading: false
               })
@@ -486,7 +493,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 +613,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 +660,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,7 +1,5 @@
-import { globalOptions } from './install'
-import { get, cloneDeep } from 'lodash-es'
-import { apaasAxios as axios } from './axios'
-import login from './login'
+import { globalOptions, axios, getUser, Module } from './index'
+import { get } from 'lodash-es'
 
 const urlIsIp = (url) => {
   const hostname = url.split('://')[1].split(':')[0].split('/')[0]
@@ -53,8 +51,8 @@ class Core {
 
   // 请求实时G3数据
   async requestData () {
-    const nowEnvname = await login.getEnvname()
-    const nowTenantCode = login.getUser('tenantcode') || ''
+    const nowEnvname = await Module.getEnvname()
+    const nowTenantCode = getUser('tenantcode') || ''
     this.cache.envName = nowEnvname
     this.cache.tenantCode = nowTenantCode
     this.cache.envData = await this.requestEnvData(nowEnvname)
@@ -107,7 +105,7 @@ class Core {
       }
       // console.log(res)
       // debugger
-      const list = get(res, 'data.list')
+      const list = res?.data?.list || []
       if (list && list.length) {
         const usedList = list.filter((item) => item.status === 1)
         usedList.forEach((item) => {
@@ -132,11 +130,10 @@ class Core {
     return result
   }
 
-
   requestDataPromise = null
   async getData () {
-    const nowEnvname = await login.getEnvname()
-    const nowTenantCode = login.getUser('tenantcode') || ''
+    const nowEnvname = await Module.getEnvname()
+    const nowTenantCode = getUser('tenantcode') || ''
     // console.log(tenantCode)
     if (this.cache.envName === nowEnvname && this.cache.tenantCode === nowTenantCode && this.loadStatus === 2) {
       return this.cache
@@ -249,228 +246,8 @@ class Core {
     const moduleData = await this.getModuleData(modulekey)
     return !!moduleData.data
   }
-
-  // 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 = await 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}${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
-    }
-  }
-
-  // pagecode: 'modulekey:indextag'
-  async createRouteUrl (modulekey, indextag, queryvalue) {
-    // &moduletype=${category === '1000' ? 'scene' : 'spu'}
-    // console.log(modulekey, indextag, queryvalue)
-    // debugger
-    if (!queryvalue) {
-      return `/module?modulekey=${modulekey}&indextag=${indextag}`
-    } else {
-      return `/module?modulekey=${modulekey}&indextag=${indextag}&queryvalue=${encodeURIComponent(JSON.stringify(queryvalue))}`
-    }
-  }
-
-  async getQueryUrl (query, queryvalue = {}) {
-    const data = await this.getData()
-    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}': data.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
-  }
-
-  async createApi (modulekey, apitag) {
-    let apiUrl = ''
-    let errorMsg = ''
-    let apitagData
-
-    const moduleData = await this.getModuleData(modulekey)
-    if (moduleData.data) {
-      if (!apitag) {
-        errorMsg = '缺少 apitag，请检查。'
-      } else {
-        apitagData = (moduleData.data.apiprotocol.apis || []).find((item) => item.apitag === apitag)
-        if (apitagData) {
-          if (apitagData.status === '1') {
-            const moduleBusiness = await this.getModuleBusiness(modulekey)
-            apiUrl = `${moduleBusiness}/api/${moduleData.data.modulekey}/${moduleData.data.moduleversion}/${apitagData.path}`
-          } else {
-            errorMsg = `apitag = ${apitag} 的 api 已停用。`
-          }
-        } else {
-          errorMsg = `找不到 apitag = ${apitag} 的 api 信息。`
-        }
-      }
-    } else {
-      errorMsg = moduleData.errorMsg
-    }
-
-    return {
-      apiUrl,
-      apitagData,
-      errorMsg
-    }
-  }
-
-  // async getApiOrigin (modulekey) {
-  //   let apiOrigin = ''
-  //   let errorMsg = ''
-  //   const moduleData = await this.getModuleData(modulekey)
-  //   if (moduleData.data) {
-  //     const moduleBusiness = await this.getModuleBusiness(modulekey)
-  //     apiOrigin = `${moduleBusiness}/api/${moduleData.data.modulekey}/${moduleData.data.moduleversion}/`
-  //   } else {
-  //     errorMsg = moduleData.errorMsg
-  //   }
-  //   return {
-  //     apiOrigin,
-  //     errorMsg
-  //   }
-  // }
-
-
-  // Module.apiRequest({
-  //   modulekey: 'demospu',
-  //   apitag: 'pagelist',
-  //   body: {
-  //     pageindex: '1',
-  //     pagesize: '1',
-  //     status: '',
-  //     name: ''
-  //   },
-  //   complete: (code, data, msg) => {
-  //     if (code === 200) {
-  //       console.log(data)
-  //     } else {
-  //       throw Error(msg)
-  //     }
-  //   }
-  // })
-  async apiRequest (params) {
-    // debugger
-    // params.modulekey = 'ss'
-
-    const result = {
-      code: '',
-      msg: '',
-      data: null
-    }
-
-    const apiData = await this.createApi(params.modulekey, params.apitag)
-    // if (apiData.errorMsg) throw new Error(apiData.errorMsg)
-    if (apiData.errorMsg) {
-      result.code = 404
-      result.msg = apiData.errorMsg
-    } else {
-      if (apiData.apitagData.method === 'POST') {
-        // todo 校验 body
-        try {
-          const res = await axios.post(`${apiData.apiUrl}`, params.body, {
-            isShowErrorMessage: false
-          })
-          if (res?.data?.code === 200) {
-            result.code = 200
-            result.msg = res?.data?.msg || '请求成功。'
-            result.data = res?.data?.data
-          } else {
-            result.code = res?.data?.code || 404
-            result.msg = res?.data?.msg || '网络异常，请稍后重试。'
-          }
-        } catch (err) {
-          result.code = err?.response?.data?.code || err?.response?.status || 404
-          result.msg = err?.response?.data?.msg || err?.response?.statusText || '网络异常，请稍后重试。'
-        }
-      } else {
-        result.code = 404
-        result.msg = '暂不支持除了 POST 以外的其他方法'
-      }
-    }
-
-    params.complete && params.complete(result.code, result.data, result.msg)
-    return result
-  }
 }
 
 const core = new Core()
 
-const Module = {
-  // getContextSync () {
-  //   return core.getContext(modulekey)
-  // },
-  // linkToPage: core.linkToPage.bind(core),
-  // linkToModule: core.linkToModule.bind(core),
-  getModuleData: core.getModuleData.bind(core),
-  getContext: core.getContext.bind(core),
-  getEnvData: core.getEnvData.bind(core),
-  apiRequest: core.apiRequest.bind(core),
-  checkModule: core.checkModule.bind(core)
-}
-
 export default core
-
-export {
-  Module
-}
-