@smart100/spu-web-plugin 1.0.25-beta.5 → 1.0.25-beta.7

package/src/oss/uploadService.ts

@@ -6,6 +6,8 @@ import { getUser } from '../login'
 import cloudServ from './cloudServ'
 import { getServToken } from './servtoken'
 import { obsMultiUpload } from './multiUpload'
+import { globalOptions } from '../index'
+import { defaultCachetime, generateCacheobj, setCache, setCacheByFile } from './cache'
 
 interface IUpload {
   type?: 'att' | 'img'
@@ -45,6 +47,8 @@ const upload = async ({
   // console.log(storageConfig)
   // debugger
   const promise = new Promise(async (resolve, reject) => {
+    let uploadflag = false
+    let rejectV: any = null
     if (provider?.isAliyun) {
       const ossClient = new AliClient({
         // region: storageConfig.cloudserv_storage_storageendpoint,
@@ -64,22 +68,13 @@ const upload = async ({
             // console.log('httpUploadProgress', p)
             onprogress && onprogress(p, _checkpoint)
             if (p === 1) {
-              resolve({
-                key: osskey,
-                source,
-                filename: file.name,
-                type: type,
-                date: date,
-                datetime: datetime,
-                storage: storagetype,
-                file
-              })
+              uploadflag = true
             }
           }
         })
       }).catch((error: any) => {
         console.error(error)
-        reject(error)
+        rejectV = error
       })
     } else if (provider?.isHuawei) {
       const obs = new ObsClient({
@@ -104,31 +99,12 @@ const upload = async ({
           }
         })
         if (uploadRes) {
-          resolve({
-            key: osskey,
-            source,
-            filename: file.name,
-            type: type,
-            date: date,
-            datetime: datetime,
-            storage: storagetype,
-            file
-          })
+          uploadflag = true
         }
       } catch (e) {
         console.error(e)
-        reject(e)
+        rejectV = e
       }
-      // obs.putObject({
-      //   Bucket: cloudServ.cloudserv_storage_storagebucket,
-      //   Key: osskey,
-      //   SourceFile: file
-      // }, (err, result) => {
-      //   result.CommonMsg.Status
-      //   console.error(err)
-      //   console.log(result)
-      //   debugger
-      // })
     } else if (provider?.isMinio || provider?.isAwss3) {
       // debugger
       // debugger
@@ -156,29 +132,43 @@ const upload = async ({
       upload.send((err: any, data: any) => {
         if (err) {
           console.error(err)
-          reject(err)
+          rejectV = err
         } else {
-          resolve({
-            key: osskey,
-            source,
-            filename: file.name,
-            type: type,
-            date: date,
-            datetime: datetime,
-            storage: storagetype,
-            file
-          })
+          uploadflag = true
         }
       })
     } else {
-      throw Error(`暂不支持${provider?.name}存储类型`)
+      rejectV = new Error(`暂不支持${provider?.name}存储类型`)
+      // throw Error(`暂不支持${provider?.name}存储类型`)
+    }
+
+    if (uploadflag) {
+      resolve({
+        key: osskey,
+        source,
+        filename: file.name,
+        type: type,
+        date: date,
+        datetime: datetime,
+        storage: storagetype,
+        file
+      })
+      // 暂时只作用于图片
+      setCacheByFile({
+        type,
+        source,
+        datetime,
+        storagetype,
+        file
+      })
+    } else {
+      reject(rejectV)
     }
   })
 
   return promise
 }
 
-
 const createTargetObj = (copykey: string, storagetype: StorageType = 'storage') => {
   const uuid = uuidv4()
   const datetime = Date.now().toString()
@@ -195,14 +185,11 @@ const createTargetObj = (copykey: string, storagetype: StorageType = 'storage')
     datetime,
     date,
     type: arr[1],
-    storage: storagetype,
+    storage: storagetype
   }
 }
 
-const copy = async ({
-  copykey = '',
-  storagetype = 'storage'
-}: any) => {
+const copy = async ({ copykey = '', storagetype = 'storage' }: any) => {
   const storageConfig = cloudServ.get(storagetype)
   if (!storageConfig) throw Error('无可用存储设置')
   const servToken = await getServToken()
@@ -247,23 +234,24 @@ const copy = async ({
         server: storageConfig.cloudserv_storage_storageendpoint,
         security_token: servToken.securitytoken
       })
-      obs.copyObject({
-        Bucket: storageConfig.cloudserv_storage_storagebucket,
-        Key: targetObj.key,
-        CopySource: `${storageConfig.cloudserv_storage_storagebucket}/${copykey}`
-      })
-      .then((res: any) => {
-        if (res?.CommonMsg?.Status === 200 && res?.InterfaceResult) {
-          resolve(targetObj)
-        } else {
-          console.error(res)
-          reject(res)
-        }
-      })
-      .catch((e: any) => {
-        console.error(e)
-        reject(e)
-      })
+      obs
+        .copyObject({
+          Bucket: storageConfig.cloudserv_storage_storagebucket,
+          Key: targetObj.key,
+          CopySource: `${storageConfig.cloudserv_storage_storagebucket}/${copykey}`
+        })
+        .then((res: any) => {
+          if (res?.CommonMsg?.Status === 200 && res?.InterfaceResult) {
+            resolve(targetObj)
+          } else {
+            console.error(res)
+            reject(res)
+          }
+        })
+        .catch((e: any) => {
+          console.error(e)
+          reject(e)
+        })
     } else if (provider?.isMinio || provider?.isAwss3) {
       // debugger
       // debugger
@@ -278,28 +266,31 @@ const copy = async ({
       })
       // console.log(s3)
       // debugger
-      s3.copyObject({
-        Bucket: storageConfig.cloudserv_storage_storagebucket,
-        CopySource: `${storageConfig.cloudserv_storage_storagebucket}/${copykey}`,
-        Key: targetObj.key
-      }, (err: any, data: any) => {
-        if (err) {
-          console.error(err)
-          reject(err)
-        } else {
-          // console.log(data)
-          resolve(targetObj)
+      s3.copyObject(
+        {
+          Bucket: storageConfig.cloudserv_storage_storagebucket,
+          CopySource: `${storageConfig.cloudserv_storage_storagebucket}/${copykey}`,
+          Key: targetObj.key
+        },
+        (err: any, data: any) => {
+          if (err) {
+            console.error(err)
+            reject(err)
+          } else {
+            // console.log(data)
+            resolve(targetObj)
+          }
         }
-      })
+      )
     } else {
       throw Error(`暂不支持${provider?.name}存储类型`)
     }
   })
 }
 
-
-
 export default {
   upload,
   copy
 }
+
+export type { IUpload }

package/src/spuConfig.ts

@@ -1,4 +1,5 @@
 import { spuAxios } from './axios'
+import { axiosCache } from './axiosCache'
 import { cloneDeep } from 'lodash-es'
 
 let modulekey = ''
@@ -13,12 +14,32 @@ class SpuConfig {
   public async getFun(): Promise<any> {
     if (!this.isload) {
       try {
-        const res = await spuAxios.post('/lifecycle/getconfigdata', {
-          // modulekey: 'litheformspu'
-          modulekey: modulekey,
-          customerid: customerid,
-          customertype: customertype
-        })
+        // const res = await spuAxios.post('/lifecycle/getconfigdata', {
+        //   // modulekey: 'litheformspu'
+        //   modulekey: modulekey,
+        //   customerid: customerid,
+        //   customertype: customertype
+        // })
+
+        const res = await axiosCache(
+          {
+            strategy: 'default',
+            async checkcachesave(res: any) {
+              return !!(res.code === 200 && res?.data?.configs)
+            }
+          },
+          spuAxios,
+          {
+            url: '/lifecycle/getconfigdata',
+            method: 'post',
+            data: {
+              // modulekey: 'litheformspu'
+              modulekey: modulekey,
+              customerid: customerid,
+              customertype: customertype
+            }
+          }
+        )
 
         // TODO 9.3.3后 res.data中增加extend字段记录额外的数据，也需要返回，这里需要做一个兼容的数据格式
         if (!res?.data?.configs) {
@@ -57,7 +78,9 @@ class SpuConfig {
 
     if (dataid) {
       if (Array.isArray(dataid)) {
-        return cloneDeep(this.cache.filter((item: any) => dataid.some((item2) => item2 === item.dataid)))
+        return cloneDeep(
+          this.cache.filter((item: any) => dataid.some((item2) => item2 === item.dataid))
+        )
       } else {
         return cloneDeep(this.cache.find((item: any) => item.dataid === dataid))
       }

package/src/tenantSetting.ts

@@ -1,11 +1,11 @@
-import { axios } from './axios'
+import { apaasAxios } from './axios'
 import { decrypt } from './crypt'
 import { lsProxy } from './storageProxy'
 
 class TenantSetting {
   async requestAndSetTenantSetting(tenantcode?: string) {
     try {
-      const res = await axios.post(
+      const res = await apaasAxios.post(
         '/api/auth/tenantsettings',
         {
           tenantcode: tenantcode || ''

package/src/types/index.d.ts

@@ -53,6 +53,8 @@ interface IDownload {
 
 interface IDownloadService {
   getUrl: (options: IDownload) => Promise<any>
+  getBlob: (options: IDownload) => Promise<any>
+  getObjectURL: (options: IDownload) => Promise<string>
   downloadFile: (options: IDownload) => Promise<any>
 }
 
@@ -75,14 +77,16 @@ interface IUploadService {
   copy: (options: ICopy) => Promise<any>
 }
 
-// interface ISPUWebPluginOptions {
-//   modulekey: string
-//   modulename: string
-//   moduleversion: string
-//   storageproxyprefix?: string
-//   isfixapptokenexpired?: boolean
-//   router?: any
-// }
+export interface IAxiosCacheConfig {
+  // 缓存策略 cachestrategy：
+  // network-only: 不缓存：仅使用联网数据
+  // network-first: 网络优先，缓存数据后，下次请求优先使用联网数据，离线才使用缓存数据
+  // cache-first: 缓存优先，缓存数据后，下次请求优先使用缓存数据，使用缓存后如果有联网则依然请求最新数据替换旧缓存【比如剑哥需求文档中的表单协议缓存，则属于此策略】【这个策略下需第二次请求接口才能拿到最新数据】
+  // d.如果是 b c，支持配置缓存过期时间
+  strategy: 'network-only' | 'cache-first' | 'network-first' | 'default'
+  checkcachesave?: any
+  cachetime?: number
+}
 
 interface ISPUWebPlugin {
   // install (app: App, option: ISPUWebPluginOptions): void
@@ -110,11 +114,13 @@ export const getAddress: (location: {
   latitude: string
   [propName: string]: any
 }) => Promise<string>
+export const normalAxios: any
 export const spuAxios: any
 export const apaasAxios: any
 export const axios: any
 export const decryptAxiosResponseData: any
 export const spuConfig: any
+export const axiosCache: any
 export const globalConfig: any
 export const downloadService: IDownloadService
 export const uploadService: IUploadService
@@ -129,6 +135,7 @@ export const getUniqueid: () => string
 export const getUuid: () => string
 export const functionCheck: (functioncode?: string) => boolean
 export const getServerTime: () => Promise<string>
+export const isOnline: (pingUrl?: string) => Promise<boolean>
 export const encrypt: (str: string) => string
 export const decrypt: (str: string) => string
 export const setTitle: (pagetitle?: string) => void

package/src/utils.ts

@@ -1,7 +1,7 @@
 import { getUser } from './login'
 import { urlquery } from './urlquery'
 import { get } from 'lodash-es'
-import { axios } from './axios'
+import { apaasAxios } from './axios'
 
 function isIOS() {
   const ua = navigator.userAgent
@@ -140,7 +140,7 @@ const getServerTime = () => {
         }
       })
     } else {
-      axios
+      apaasAxios
         .get(
           '/api/teapi/offline/servertime',
           {},
@@ -162,6 +162,40 @@ const getServerTime = () => {
   })
 }
 
+// 精准判断是否能访问业务服务器（结合 navigator.onLine + 接口请求）
+const isOnline = async (pingUrl = './') => {
+  return navigator.onLine
+  // // 先判断基础状态，离线则直接返回 false
+  // console.log('navigator.onLine', navigator.onLine)
+  // if (!navigator.onLine) {
+  //   return false
+  // }
+
+  // try {
+  //   // 发送轻量 GET 请求
+  //   const response = await fetch(pingUrl, {
+  //     method: 'GET',
+  //     credentials: 'omit', // 不携带cookies
+  //     mode: 'cors', // 允许跨域请求，需后端配置 CORS 头部
+  //     cache: 'no-store' // 禁用缓存，保证实时性
+  //     // cache: 'default'
+  //     // signal: AbortSignal.timeout(3000) // 超时取消
+  //   })
+  //   console.log('fetch.onLine', response.ok)
+  //   // console.log(response)
+  //   // debugger
+  //   // 只要响应成功（状态码 200-299），则认为在线
+  //   return response.ok
+  // } catch (error) {
+  //   // 网络错误/超时，认为离线
+  //   return false
+  // }
+}
+// setInterval(async () => {
+//   // const a = await isOnline('https://www.baidu.com/')
+//   const a = await isOnline()
+//   console.log(a)
+// }, 2000)
 
 export {
   isIOS,
@@ -175,5 +209,6 @@ export {
   toggleHttpOrHttps,
   importJS,
   delay,
-  getServerTime
+  getServerTime,
+  isOnline
 }