@smart100/spu-web-plugin 0.0.19 → 0.0.22

package/package.json

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

package/src/axios.ts

@@ -8,6 +8,7 @@ import { get } from 'lodash-es'
 // import { Message } from 'element-ui'
 import { loadding } from './components/loadding'
 import login from './login'
+import core from './core'
 
 interface Response {
   code: number | string
@@ -18,6 +19,7 @@ interface Response {
 const createAxiosInstance = (type: 'spu' | 'apaas' = 'spu', options: SPUWebPluginOptions) => {
   const axiosInstance: AxiosInstance = axios.create({
     baseURL: type === 'spu' ? `/api/${options.modulekey}/${options.moduleversion}` : '',
+    // baseURL: '',
     // timeout: 36000000
     // withCredentials: true, // 不能开启 影响ali oss
     // headers: {
@@ -26,7 +28,7 @@ const createAxiosInstance = (type: 'spu' | 'apaas' = 'spu', options: SPUWebPlugi
     // }
   })
 
-  axiosInstance.interceptors.request.use((config: any) => {
+  axiosInstance.interceptors.request.use(async (config: any) => {
     // const isShowLoading = typeof config?.isShowLoading !== 'undefined' ? config.isShowLoading : true
     const isShowLoading = get(config, 'isShowLoading', true)
     isShowLoading && loadding.open()
@@ -38,6 +40,17 @@ const createAxiosInstance = (type: 'spu' | 'apaas' = 'spu', options: SPUWebPlugi
         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?.?`
+      }
+    }
+
     return config
   }, error => {
     return Promise.reject(error)

package/src/components/expandexp/template.ts

@@ -390,7 +390,7 @@ export default (ele: SpuExpandexp) => {
   height: 30px;
   line-height: 30px;
   border: 1px solid #aaa;
-  background-color: #eee;
+  background-color: #fff;
   border-radius: 5px;
   color: #444;
   padding: 0 12px;
@@ -398,8 +398,9 @@ export default (ele: SpuExpandexp) => {
   cursor: pointer;
 }
 .btn2:hover {
-  border-color: #bbb;
+  border-color: #ccc;
   color: #777;
+  background-color: #fff;
 }
 </style>
 

package/src/core.js

@@ -183,6 +183,9 @@ class Core {
   }
 
   async getModuleData (modulekey) {
+    if (!modulekey) {
+      modulekey = globalOptions.modulekey
+    }
     const res = {
       errorMsg: '',
       data: null
@@ -208,6 +211,9 @@ class Core {
   }
 
   async getContext (modulekey) {
+    if (!modulekey) {
+      modulekey = globalOptions.modulekey
+    }
     let context
     const moduleData = await this.getModuleData(modulekey)
     if (moduleData?.data) {
@@ -237,6 +243,9 @@ class Core {
   }
 
   async checkModule (modulekey) {
+    if (!modulekey) {
+      modulekey = globalOptions.modulekey
+    }
     const moduleData = await this.getModuleData(modulekey)
     return !!moduleData.data
   }
@@ -365,21 +374,21 @@ class Core {
     }
   }
 
-  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
-    }
-  }
+  // 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({
@@ -444,30 +453,23 @@ class Core {
   }
 }
 
-
 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
 }

package/src/index.ts

@@ -12,6 +12,7 @@ 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'
 
 
 // class SPUWebPlugin {
@@ -31,6 +32,10 @@ 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 wxworkSuite = {
+  JSSDK: jssdk,
+  isWxworkSuiteTenant: jssdk.checkData
+}
 
 export {
   SPUWebPlugin as default,
@@ -54,5 +59,6 @@ export {
   checkLogin,
   Module,
   components,
-  expandexp
+  expandexp,
+  wxworkSuite
 }

package/src/install.ts

@@ -4,6 +4,7 @@ import { initAxios } from './axios'
 import urlquery from './urlquery'
 import { initSpuConfig } from './spuConfig'
 import { initApaasSpuTrack } from './apaasSpuTrack'
+import { WxworksuitePluginInstall } from '@smart100/wxworksuite-plugin'
 import { merge } from 'lodash-es'
 import { initTest } from './test'
 
@@ -42,6 +43,10 @@ const install = (app: any, options: SPUWebPluginOptions) => {
   initApaasSpuTrack()
   urlquery.init()
   login.startRefreshtoken()
+  // 安装企微第三方应用插件
+  WxworksuitePluginInstall({
+    getToken: login.getToken.bind(login)
+  })
   initTest(globalOptions)
 
   if (globalOptions.router) {

package/src/types/shims-lib.d.ts

@@ -7,6 +7,15 @@ declare module '*.vue' {
 declare module 'co'
 declare module 'uuid'
 
+
+declare module '*.svg'
+declare module '*.png'
+declare module '*.jpg'
+declare module '*.jpeg'
+declare module '*.gif'
+// declare module '*.bmp'
+// declare module '*.tiff'
+
 // declare module 'the-answer'
 
 interface Window {