@smart100/spu-web-plugin 1.0.23 → 1.0.25-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "1.0.23",
+  "version": "1.0.25-beta.1",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",
@@ -29,6 +29,7 @@
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.5",
+    "@rollup/rollup-darwin-x64": "^4.53.3",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.10",
     "@types/node": "^20.8.10",
@@ -52,4 +53,4 @@
     "uuid": "^9.0.1",
     "vconsole": "^3.15.1"
   }
-}
+}

package/src/axios.ts

@@ -18,9 +18,9 @@ interface Response {
 // _encrydata
 export const normalizeEncryData = (response: any) => {
   if (response.data && response.data._encrydata && typeof response.data._encrydata === 'string') {
-    let res = decrypt(response.data._encrydata)
+    const res = decrypt(response.data._encrydata)
     try {
-      let resJson = JSON.parse(res)
+      const resJson = JSON.parse(res)
       response.data = {
         ...resJson
       }
@@ -29,9 +29,9 @@ export const normalizeEncryData = (response: any) => {
     }
   }
   if (response.body && response.body._encrydata && typeof response.body._encrydata === 'string') {
-    let res = decrypt(response.body._encrydata)
+    const res = decrypt(response.body._encrydata)
     try {
-      let resJson = JSON.parse(res)
+      const resJson = JSON.parse(res)
       response.body = {
         ...resJson
       }

package/src/index.ts

@@ -86,7 +86,7 @@ const install = (app: any, options: any) => {
   console.log(globalOptions)
 
   // setTimeout(() => {
-  //   console.error('9999')
+  //   console.error('888')
   // }, 1000)
 
   // if (install.installed) return

package/src/login.ts

@@ -414,13 +414,18 @@ function startRefreshtoken() {
     return false
   }
 
+  if (!loginState.islogin) {
+    console.warn('当前未登录/token过期，不支持自动刷新token。')
+    return false
+  }
+
   // stopRefreshtoken()
   clearTimeout(refreshtokenTimer as number)
   refreshtokenTimer = null
 
-  // 如果有登录 但 refreshtoken 不是完整 token 则10秒后【需要等单点登录走完后才刷新不然会被覆盖】刷新一次取到完整 token
-  // 如果有登录 且 refreshtoken 是完整 token 如果剩余时间大于10分钟 则每隔10分钟刷一次 否则过期前15秒更新 token
-  // 如果没登录 每隔10秒走token更新逻辑(如果刚开始没登录 后面才登录【不需要再在登陆后写刷新token逻辑】)
+  // 如果有登录
+  // 1、refreshtoken 不是完整 token 则10秒后【需要等单点登录走完后才刷新不然会被覆盖】刷新一次取到完整 token
+  // 2、refreshtoken 是完整 token 如果剩余时间大于10分钟 则每隔10分钟刷一次 否则过期前15秒更新 token
   let time = 0
   if (loginState.islogin) {
     const user = getUserByToken(getRefreshToken())
@@ -435,13 +440,6 @@ function startRefreshtoken() {
     } else {
       time = 10000
     }
-  } else {
-    if (loginState.type === 2) {
-      time = 0
-    } else {
-      // console.error('未登录，10秒后尝试更新token')
-      time = 30000
-    }
   }
   // time = 5000
   refreshtokenTimer = window.setTimeout(async () => {
@@ -622,7 +620,11 @@ async function singleLogin(query: IAny) {
     envname ? setQueryEnvname(envname) : removeQueryEnvname()
     // context 上下文字段 产品运营中心安装 卸载 配置 和 产品配置中心业务配置 页面需要用到
     // web 端有传 app没传 需要做兼容
-    context && lsProxy.setItem('context', decodeURIComponent(context))
+    if (context) {
+      lsProxy.setItem('context', decodeURIComponent(context))
+    } else {
+      lsProxy.removeItem('context')
+    }
   }
 
   if (checkLoginByToken(token)) {
@@ -634,7 +636,6 @@ async function singleLogin(query: IAny) {
       // 之所以不强制校验 refreshtoken tokenexpires 是因为安装卸载配置页面有可能放在产品运营中心 没有这两字段
       if (checkLogin() && token === getToken()) {
         isneedlogin = false
-        flag = true
       }
     } else {
       // 如果本地已经登录 且 query 登录参数与本地一致 说明是刚登录没多久【token也没刷新过】 视为已经登录 不需再走单点登录流程
@@ -645,7 +646,6 @@ async function singleLogin(query: IAny) {
         tokenexpires === getTokenExpires()
       ) {
         isneedlogin = false
-        flag = true
       }
     }
     // isneedlogin = true
@@ -655,11 +655,11 @@ async function singleLogin(query: IAny) {
       setBaseInfo()
 
       // 单点登录写入 token 之后
-      // 1、如果 refreshtoken 不完整 则换取完整的 refreshtoken
       try {
         if (checkLogin()) {
           const refreshTokenUser = getUserByToken(getRefreshToken())
           const tokenUser = getUserByToken(getToken())
+          // 如果 refreshtoken 不完整【由于web端登录时 如果有选择租户或选择职位的情况 得到的 refreshtoken 是不完整】 则通过完整的 token 换取完整的 refreshtoken 如果不换的话 通过刷新 token 接口得到的 token 也变成不完整的了
           if (!refreshTokenUser?.tokenId && tokenUser?.tokenId) {
             await updateToken()
           }
@@ -667,8 +667,6 @@ async function singleLogin(query: IAny) {
       } catch (err) {
         console.error(err)
       }
-      // 2、重新计算刷新 token 时间 因为刚开始进入就 startRefreshtoken 检测到没有 token 会过10秒才执行刷新 token 操作
-      startRefreshtoken()
 
       // 获取环境信息和租户配置信息
       const nowEnvname = await getEnvname()
@@ -697,9 +695,8 @@ async function singleLogin(query: IAny) {
       await getAndSetTenant()
       await getAndSetUserInfo()
 
-      // 单点登录后 获取 web 开发者模式 如果是则设置 isdebugger
-      urlquery.dealWebDebugger()
-
+      flag = true
+    } else {
       flag = true
     }
   } else {
@@ -708,13 +705,15 @@ async function singleLogin(query: IAny) {
     console.error('单点登录失败，请检查链接所传 token/refreshtoken/tokenexpires 是否非法或过期。')
   }
 
-  // 登录成功之后 获取spu信息
+  // 单点登录成功
   if (flag) {
+    // 启动刷新token机制
+    startRefreshtoken()
+
+    // 获取spu 信息
     await core.initGetData()
-  }
 
-  if (flag) {
-    // 单点登录成功 需要删除 query 中相关参数
+    // 删除 query 中相关参数
     token && delete query.token
     refreshtoken && delete query.refreshtoken
     tokenexpires && delete query.tokenexpires
@@ -729,7 +728,13 @@ async function singleLogin(query: IAny) {
 }
 
 function installAuth(options: any) {
-  startRefreshtoken()
+  // 如果链接中没有带token 可能两种情况
+  // 1、已经是单点登陆过了 只是用户刷新页面
+  // 2、没登录过 用户直接访问链接
+  // 以上情况需要判断用户登陆过 才启动刷新token机制
+  if (location.href.indexOf('token=') === -1) {
+    startRefreshtoken()
+  }
 
   fixAppTokenExpired()
 

package/src/map/index.ts

@@ -1,10 +1,10 @@
 import { urlquery } from '../urlquery'
-import { cloneDeep } from 'lodash-es'
+import { cloneDeep, isObject } from 'lodash-es'
 import { mapService } from './MapService'
 import { getAMapKey } from './AMapKey'
 import { axios } from '../axios'
 import { delay } from '../utils'
-import { wgs84ToGcj02, BMapTransformBD09ToGCJ02Points } from './utils'
+import { wgs84ToGcj02, BMapTransformBD09ToGCJ02Points, getPoiPhoneNumber } from './utils'
 
 type Location = {
   longitude: string
@@ -39,7 +39,22 @@ const getLocationByNative = async (): Promise<Location> => {
         const result = {
           longitude: res.longitude.toString(),
           latitude: res.latitude.toString(),
-          address: res.address || ''
+          address: res.address || '',
+          poiname: res.poiname || '',
+          regionid: res.regionid || '',
+          country: res.country || '',
+          province: res.province || '',
+          city: res.city || '',
+          district: res.district || '',
+          street: res.street || '',
+          number: res.number || '',
+          detailaddr: res.detailaddr || '',
+          poiid: res.poiid || '',
+          poitypename: res.poitypename || '',
+          poitypecode: res.poitypecode || '',
+          phonenumber: res.phonenumber || '',
+          signboard: res.signboard || '',
+          maptype: res.maptype || '',
         }
         console.log(`getLocationByNative success: ${JSON.stringify(result)}`)
         resolve(result)
@@ -74,6 +89,7 @@ const getLocationByNavigator = async (): Promise<Location> => {
               latitude: Gcj02.lat.toString(),
               longitude: Gcj02.lng.toString()
             }
+
             console.log(`getLocationByNavigator success: ${JSON.stringify(result)}`)
             resolve(result)
           } else {
@@ -196,10 +212,54 @@ const getLocationByAMap = async (): Promise<Location> => {
         const { lng, lat } = res.position
         const result = {
           longitude: lng.toString(),
-          latitude: lat.toString()
+          latitude: lat.toString(),
+          address: '',
+          poiname: '',
+          regionid: '',
+          country: '',
+          province: '',
+          city: '',
+          district: '',
+          street: '',
+          number: '',
+          detailaddr: '',
+          poiid: '',   // 图商的id
+          poitypename: '', // 图商的poi类型名称
+          poitypecode: '', // 图商的poi类型code
+          phonenumber: '',
+          signboard: '',
+          maptype: "amap"
         }
-        console.log(`getLocationByAMap success: ${JSON.stringify(result)}`)
-        resolve(result)
+        // 通过经纬度获取详细地址信息
+        getAddressDetailByAMap({
+          longitude: lng.toString(),
+          latitude: lat.toString()
+        }).then((addrssDetail: IAddressDetail | null) => {
+          if (addrssDetail) {
+            result.address = addrssDetail.addressDetail.address
+            result.poiname = addrssDetail.addressDetail.poiname
+            result.regionid = addrssDetail.addressDetail.regionid
+            result.country = addrssDetail.addressDetail.country
+            result.province = addrssDetail.addressDetail.province
+            result.city = addrssDetail.addressDetail.city
+            result.district = addrssDetail.addressDetail.district
+            result.street = addrssDetail.addressDetail.street
+            result.number = addrssDetail.addressDetail.number
+            result.detailaddr = addrssDetail.addressDetail.detailaddr
+            result.poiid = addrssDetail.addressDetail.poiid
+            result.poitypename = addrssDetail.addressDetail.poitypename
+            result.poitypecode = addrssDetail.addressDetail.poitypecode
+            result.phonenumber = addrssDetail.addressDetail.phonenumber
+            result.signboard = addrssDetail.addressDetail.signboard
+          }
+          console.log(`getLocationByAMap success: ${JSON.stringify(result)}`)
+          resolve(result)
+        }).catch((err: any) => {
+          console.error(err)
+          console.error('getLocationByAMap fail')
+          resolve(null)
+        })
+
       } else {
         console.error('getLocationByAMap fail')
         resolve(null)
@@ -228,10 +288,55 @@ const getCityLocationByAMap = async (): Promise<Location> => {
         const lat = res.position[1].toString()
         const result = {
           longitude: lng.toString(),
-          latitude: lat.toString()
+          latitude: lat.toString(),
+          address: '',
+          poiname: '',
+          regionid: '',
+          country: '',
+          province: '',
+          city: '',
+          district: '',
+          street: '',
+          number: '',
+          detailaddr: '',
+          poiid: '',   // 图商的id
+          poitypename: '', // 图商的poi类型名称
+          poitypecode: '', // 图商的poi类型code
+          phonenumber: '',
+          signboard: '',
+          maptype: "amap"
         }
         console.log(`getCityLocationByAMap success: ${JSON.stringify(result)}`)
-        resolve(result)
+
+        // 通过经纬度获取详细地址信息
+        getAddressDetailByAMap({
+          longitude: lng.toString(),
+          latitude: lat.toString()
+        }).then((addrssDetail: IAddressDetail | null) => {
+          if (addrssDetail) {
+            result.address = addrssDetail.addressDetail.address
+            result.poiname = addrssDetail.addressDetail.poiname
+            result.regionid = addrssDetail.addressDetail.regionid
+            result.country = addrssDetail.addressDetail.country
+            result.province = addrssDetail.addressDetail.province
+            result.city = addrssDetail.addressDetail.city
+            result.district = addrssDetail.addressDetail.district
+            result.street = addrssDetail.addressDetail.street
+            result.number = addrssDetail.addressDetail.number
+            result.detailaddr = addrssDetail.addressDetail.detailaddr
+            result.poiid = addrssDetail.addressDetail.poiid
+            result.poitypename = addrssDetail.addressDetail.poitypename
+            result.poitypecode = addrssDetail.addressDetail.poitypecode
+            result.phonenumber = addrssDetail.addressDetail.phonenumber
+            result.signboard = addrssDetail.addressDetail.signboard
+          }
+          console.log(`getLocationByAMap success: ${JSON.stringify(result)}`)
+          resolve(result)
+        }).catch((err: any) => {
+          console.error(err)
+          console.error('getLocationByAMap fail')
+          resolve(null)
+        })
       } else {
         console.error('getCityLocationByAMap fail')
         resolve(null)
@@ -270,6 +375,127 @@ const getAddressByAMap = async (position: Location): Promise<string> => {
   })
 }
 
+interface IAddressDetail {
+  regeocode: IAny
+  addressDetail: {
+    longitude: string
+    latitude: string
+    address: string
+    poiname: string
+    regionid: string
+    country: string
+    province: string
+    city: string
+    district: string
+    street: string
+    number: string
+    detailaddr: string
+    poiid: string
+    poitypename: string
+    poitypecode: string
+    phonenumber: string
+    signboard: string
+    maptype: string
+  }
+}
+// 高德逆地址解析详细数据
+const getAddressDetailByAMap = async (position: Location): Promise<IAddressDetail | null> => {
+  console.log('getAddressDetailByAMap start...')
+  return new Promise((resolve, reject) => {
+    if (!window?.AMap) {
+      console.error('getAddressDetailByAMap fail: AMap is undefinded')
+      resolve(null)
+      return
+    }
+    if (position) {
+      new window.AMap.Geocoder({
+        radius: 500,
+        extensions: 'all'
+      }).getAddress([position.longitude, position.latitude], (status: string, result: any) => {
+        // console.log(status)
+        // console.log(result)
+        if (status === 'complete' && result.info === 'OK' && result?.regeocode) {
+          console.log(`getAddressByAMap success:`, result.regeocode)
+
+          const addressComponent = result.regeocode.addressComponent || {}
+
+          // 确保 country 字段被正确获取
+          // 直接从高德地图 API 返回的数据中获取 country 字段
+          const country = addressComponent.country || ''
+
+          let aois = result.regeocode.aois || []
+          let pois = result.regeocode.pois || []
+          if (Array.isArray(addressComponent.city)) {
+            addressComponent.city = addressComponent.city.join(',')
+          }
+          let street = addressComponent.street || (addressComponent.streetNumber && isObject(addressComponent.streetNumber) ? addressComponent.streetNumber.street : '')
+          let number = addressComponent.streetNumber && isObject(addressComponent.streetNumber) ? addressComponent.streetNumber.number : (addressComponent.streetNumber || '')
+          if (Array.isArray(street)) {
+            street = street.join(',')
+          }
+          if (Array.isArray(number)) {
+            number = number.join(',')
+          }
+          let poiname = (aois && aois[0] && aois[0].name) || ''
+
+          let detailAddr =
+            street + number + poiname || ''
+
+          let address =
+            (addressComponent.province || '') +
+            (addressComponent.city || '') +
+            (addressComponent.district || '') +
+            (detailAddr || '')
+          let tmpFullDistrinct =
+            (addressComponent.province || '') +
+            (addressComponent.city || '') +
+            (addressComponent.district || '')
+          if (!address.endsWith(poiname)) {
+            address = address + poiname
+          }
+          let selectedDetailAddr = detailAddr || ''
+          // 去除前面的行政区域
+          if (selectedDetailAddr.startsWith(tmpFullDistrinct)) {
+            selectedDetailAddr = selectedDetailAddr.slice(tmpFullDistrinct.length)
+          }
+          let poiid = pois && pois[0] && pois[0].id
+          let poitypename = pois && pois[0] && pois[0].type
+
+          const addressDetail: IAddressDetail = {
+            regeocode: result.regeocode,
+            addressDetail: {
+              longitude: position.longitude,
+              latitude: position.latitude,
+              address: address || '',
+              poiname: poiname || '',
+              regionid: addressComponent.adcode || '',
+              country: country || '',
+              province: addressComponent.province || '',
+              city: addressComponent.city || '',
+              district: addressComponent.district ||
+                addressComponent.township ||
+                '',
+              street: street || '',
+              number: number || '',
+              detailaddr: selectedDetailAddr || '',
+              poiid: poiid || '',
+              poitypename: poitypename || '',
+              poitypecode: '',
+              phonenumber: getPoiPhoneNumber(pois && pois[0] && pois[0].tel),
+              signboard: '',
+              maptype: 'amap',
+            }
+          }
+          resolve(addressDetail)
+        } else {
+          console.error(`getAddressByAMap fail: status = ${status}, result = ${result}`)
+          resolve(null)
+        }
+      })
+    }
+  })
+}
+
 // 腾讯ip定位：通过终端设备IP地址获取其当前所在地理位置，精确到市级，常用于显示当地城市天气预报、初始化用户城市等非精确定位场景。
 const getIPLocationByTMap = async (ip?: string): Promise<Location> => {
   console.log('getIPLocationByTMap start...')

package/src/map/utils.ts

@@ -1,4 +1,4 @@
-function transformLat (x: number, y: number) {
+function transformLat(x: number, y: number) {
   let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x))
   ret += (20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(2.0 * x * Math.PI)) * 2.0 / 3.0
   ret += (20.0 * Math.sin(y * Math.PI) + 40.0 * Math.sin(y / 3.0 * Math.PI)) * 2.0 / 3.0
@@ -6,7 +6,7 @@ function transformLat (x: number, y: number) {
   return ret
 }
 
-function transformLon (x: number, y: number) {
+function transformLon(x: number, y: number) {
   let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x))
   ret += (20.0 * Math.sin(6.0 * x * Math.PI) + 20.0 * Math.sin(2.0 * x * Math.PI)) * 2.0 / 3.0
   ret += (20.0 * Math.sin(x * Math.PI) + 40.0 * Math.sin(x / 3.0 * Math.PI)) * 2.0 / 3.0
@@ -14,11 +14,11 @@ function transformLon (x: number, y: number) {
   return ret
 }
 
-function outOfChina (lng: number, lat: number) {
+function outOfChina(lng: number, lat: number) {
   return (lng < 72.004 || lng > 137.8347) || (lat < 0.8293 || lat > 55.8271)
 }
 
-function delta (lng: number, lat: number) {
+function delta(lng: number, lat: number) {
   const a = 6378245.0 // 地球长半轴
   const ee = 0.00669342162296594323 // 扁率
   let dLat = transformLat(lng - 105.0, lat - 35.0)
@@ -35,7 +35,7 @@ function delta (lng: number, lat: number) {
   }
 }
 
-function wgs84ToGcj02 (lng: number, lat: number) {
+function wgs84ToGcj02(lng: number, lat: number) {
   if (outOfChina(lng, lat)) {
     return {
       lng: lng,
@@ -96,3 +96,19 @@ export {
   BMapTransformBD09ToGCJ02Points,
   BMapTransformGCJ02ToBD09Points
 }
+
+
+export const getPoiPhoneNumber = (tel: string | string[]) => {
+  if (Array.isArray(tel)) {
+    tel = tel.filter((item) => item).join(';')
+  }
+  // tel里面:020-84060333;13570071479 需要优先去除手机号，否则用电话
+  if (tel) {
+    const phoneReg = /1[3456789]\d{9}/
+    const phone = tel.match(phoneReg)
+    if (phone) {
+      return phone[0]
+    }
+  }
+  return tel
+}

package/src/urlquery.ts

@@ -31,20 +31,14 @@ class Urlquery {
     return flag
   }
 
-  // 单点登录后 获取 web 开发者模式 如果是则设置 isdebugger
-  public dealWebDebugger() {
-    if (!this.isdebugger && !isMobile() && this.getWebDevmodel()) {
-      ssProxy.setItem('isdebugger', '1')
-    }
-  }
-
   public init() {
     if (this.isinit) return false
 
     this.isinit = true
 
     // 调试
-    if (location.href.indexOf('isdebugger=1') >= 0 || ssProxy.getItem('isdebugger') === '1') {
+    // 如果开启了 web 开发者模式 也算
+    if (location.href.indexOf('isdebugger=1') >= 0 || ssProxy.getItem('isdebugger') === '1' || (!isMobile() && this.getWebDevmodel())) {
       ssProxy.setItem('isdebugger', '1')
       if (isMobile()) {
         new VConsole({ theme: 'dark' }) /* eslint-disable-line no-new */