@smart100/spu-web-plugin 0.0.32 → 0.0.34

package/dist/index.d.ts

@@ -83,6 +83,7 @@ export const getUniqueid: () => string
 export const getUuid: () => string
 export const functionCheck: (functioncode?: string) => boolean
 export const setTitle: (pagetitle?: string) => void
+export const isInApp: () => boolean
 export const AMapLoader: IAMapLoader
 export const getToken: () => string
 export const getTokenExpires: () => string

package/dist/spu-web-plugin.mjs

@@ -708,7 +708,7 @@ function _toPropertyKey$1(arg) {
   return typeof key === "symbol" ? key : String(key);
 }
 
-var version = "0.0.32";
+var version = "0.0.34";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -14047,7 +14047,7 @@ var getSpuLocation = /*#__PURE__*/function () {
             var isload = false;
             setTimeout(function () {
               if (!isload) {
-                console.error('getSpuLocation timeout 100000');
+                console.error('getSpuLocation timeout 10000');
                 resolve(null);
               }
             }, 10000);
@@ -52702,6 +52702,43 @@ var setTitle = function setTitle(pagetitle) {
   // 父级spu容器 且 是APP
   ((_window = window) === null || _window === void 0 || (_window = _window.Native) === null || _window === void 0 ? void 0 : _window.setNavigationBarTitle) && window.Native.setNavigationBarTitle(pagetitle);
 };
+var getSpuContainerType = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee() {
+    var _window2, _window3;
+    return _regeneratorRuntime$1().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!((_window2 = window) !== null && _window2 !== void 0 && (_window2 = _window2.aPaaS) !== null && _window2 !== void 0 && _window2.getPhoto)) {
+            _context.next = 4;
+            break;
+          }
+          return _context.abrupt("return", 'app');
+        case 4:
+          if (!((_window3 = window) !== null && _window3 !== void 0 && (_window3 = _window3.Module) !== null && _window3 !== void 0 && _window3.spuContainerType)) {
+            _context.next = 8;
+            break;
+          }
+          return _context.abrupt("return", window.Module.spuContainerType);
+        case 8:
+          return _context.abrupt("return", '');
+        case 9:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getSpuContainerType() {
+    return _ref.apply(this, arguments);
+  };
+}();
+var isInApp = function isInApp() {
+  var _window4, _window5;
+  if ((_window4 = window) !== null && _window4 !== void 0 && (_window4 = _window4.aPaaS) !== null && _window4 !== void 0 && _window4.getPhoto || (_window5 = window) !== null && _window5 !== void 0 && (_window5 = _window5.top) !== null && _window5 !== void 0 && (_window5 = _window5.aPaaS) !== null && _window5 !== void 0 && _window5.getPhoto) {
+    return true;
+  } else {
+    return false;
+  }
+};
 
 function e(e){this.message=e;}e.prototype=new Error,e.prototype.name="InvalidCharacterError";var r="undefined"!=typeof window&&window.atob&&window.atob.bind(window)||function(r){var t=String(r).replace(/=+$/,"");if(t.length%4==1)throw new e("'atob' failed: The string to be decoded is not correctly encoded.");for(var n,o,a=0,i=0,c="";o=t.charAt(i++);~o&&(n=a%4?64*n+o:o,a++%4)?c+=String.fromCharCode(255&n>>(-2*a&6)):0)o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".indexOf(o);return c};function t(e){var t=e.replace(/-/g,"+").replace(/_/g,"/");switch(t.length%4){case 0:break;case 2:t+="==";break;case 3:t+="=";break;default:throw "Illegal base64url string!"}try{return function(e){return decodeURIComponent(r(e).replace(/(.)/g,(function(e,r){var t=r.charCodeAt(0).toString(16).toUpperCase();return t.length<2&&(t="0"+t),"%"+t})))}(t)}catch(e){return r(t)}}function n(e){this.message=e;}function o(e,r){if("string"!=typeof e)throw new n("Invalid token specified");var o=!0===(r=r||{}).header?0:1;try{return JSON.parse(t(e.split(".")[o]))}catch(e){throw new n("Invalid token specified: "+e.message)}}n.prototype=new Error,n.prototype.name="InvalidTokenError";
 
@@ -60650,7 +60687,8 @@ var Module = {
   getModuleData: core.getModuleData.bind(core),
   getEnvname: login.getEnvname.bind(login),
   getEnvData: core.getEnvData.bind(core),
-  checkModule: core.checkModule.bind(core)
+  checkModule: core.checkModule.bind(core),
+  getSpuContainerType: getSpuContainerType
 };
 
-export { AMapLoader, Module, normalAxios as apaasAxios, normalAxios as axios, checkLogin, index as components, SPUWebPlugin as default, downloadService, expandexp, functionCheck, getDistance, getLocation, getRefreshToken, getToken, getTokenExpires, getUniqueid, getUser, v4 as getUuid, globalConfig, globalOptions, lsProxy, setTitle, singleLogin, spuAxios, spuConfig, ssProxy, startRefreshtoken, uploadService, wxworkSuite };
+export { AMapLoader, Module, normalAxios as apaasAxios, normalAxios as axios, checkLogin, index as components, SPUWebPlugin as default, downloadService, expandexp, functionCheck, getDistance, getLocation, getRefreshToken, getToken, getTokenExpires, getUniqueid, getUser, v4 as getUuid, globalConfig, globalOptions, isInApp, lsProxy, setTitle, singleLogin, spuAxios, spuConfig, ssProxy, startRefreshtoken, uploadService, wxworkSuite };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@smart100/wxworksuite-plugin": "^0.0.11",
+    "@smart100/wxworksuite-plugin": "^0.0.12",
     "axios": "^1.6.0",
     "co": "^4.6.0",
     "dayjs": "^1.11.10",

package/src/index.ts

@@ -9,7 +9,7 @@ import { initAxios, spuAxios, axios } from './axios'
 import { initSpuConfig, spuConfig } from './spuConfig'
 import { globalConfig } from './globalConfig'
 import { downloadService, uploadService } from './oss'
-import { getUniqueid, functionCheck, setTitle } from './utils'
+import { getUniqueid, functionCheck, setTitle, getSpuContainerType, isInApp } from './utils'
 import urlquery from './urlquery'
 import AMapLoader from './AMapLoader'
 import login from './login'
@@ -142,7 +142,8 @@ const Module = {
   getModuleData: core.getModuleData.bind(core),
   getEnvname: login.getEnvname.bind(login),
   getEnvData: core.getEnvData.bind(core),
-  checkModule: core.checkModule.bind(core)
+  checkModule: core.checkModule.bind(core),
+  getSpuContainerType: getSpuContainerType
 }
 
 
@@ -164,6 +165,7 @@ export {
   getUuid,
   functionCheck,
   setTitle,
+  isInApp,
   AMapLoader,
   getToken,
   getTokenExpires,

package/src/location.ts

@@ -59,7 +59,7 @@ const getSpuLocation = async (): Promise<Location> => {
     let isload = false
     setTimeout(() => {
       if (!isload) {
-        console.error('getSpuLocation timeout 100000')
+        console.error('getSpuLocation timeout 10000')
         resolve(null)
       }
     }, 10000)

package/src/types/index.d.ts

@@ -83,6 +83,7 @@ export const getUniqueid: () => string
 export const getUuid: () => string
 export const functionCheck: (functioncode?: string) => boolean
 export const setTitle: (pagetitle?: string) => void
+export const isInApp: () => boolean
 export const AMapLoader: IAMapLoader
 export const getToken: () => string
 export const getTokenExpires: () => string

package/src/utils.ts

@@ -42,13 +42,30 @@ const setTitle = (pagetitle?: string) => {
   window?.Native?.setNavigationBarTitle && window.Native.setNavigationBarTitle(pagetitle)
 }
 
+const getSpuContainerType = async (): Promise<'h5' | 'web' | 'app' | 'smartcenter' | 'smartconfigurationcenter' | ''> => {
+  // 只有app端才提供原生拍照能力
+  if (window?.aPaaS?.getPhoto) {
+    return 'app'
+  } else if (window?.Module?.spuContainerType) {
+    return window.Module.spuContainerType
+  } else {
+    return ''
+  }
+}
 
-// const inWhichSPU = () => {
-// }
+const isInApp = (): boolean => {
+  if (window?.aPaaS?.getPhoto || window?.top?.aPaaS?.getPhoto) {
+    return true
+  } else {
+    return false
+  }
+}
 
 export {
   isIOS,
   getUniqueid,
   functionCheck,
-  setTitle
+  setTitle,
+  getSpuContainerType,
+  isInApp
 }