@smart100/spu-web-plugin 0.0.28 → 0.0.29

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.28";
+var version = "0.0.29";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -11574,11 +11574,37 @@ var Jssdk = /*#__PURE__*/function () {
       var whichWindow = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : window;
       return new Promise( /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve, reject) {
-          var script, x;
+          var whichDocument, allscript, isload, script, x;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                script = whichWindow.document.createElement('script');
+                whichDocument = whichWindow.document; // 判断顶部是否已经加载过js
+                allscript = whichDocument.head.getElementsByTagName('script');
+                isload = Array.from(allscript).some(function (item) {
+                  // 不判断相等是因为 //open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js 插入前不带 http | https 插入后会自动基于当前地址补全 https
+                  if (item.src.includes(url)) {
+                    var issameproperty = true;
+                    if (property) {
+                      for (var x in property) {
+                        if (item.getAttribute(x) !== property[x]) {
+                          issameproperty = false;
+                        }
+                      }
+                    }
+                    return issameproperty;
+                  } else {
+                    return false;
+                  }
+                });
+                if (!isload) {
+                  _context.next = 7;
+                  break;
+                }
+                console.warn("".concat(url, " \u6587\u4EF6\u5DF2\u52A0\u8F7D\u8FC7\uFF0C\u65E0\u9700\u91CD\u590D\u52A0\u8F7D\u3002"));
+                resolve('success');
+                return _context.abrupt("return");
+              case 7:
+                script = whichDocument.createElement('script');
                 script.setAttribute('type', 'text/javascript');
                 script.setAttribute('src', url);
                 if (property) {
@@ -11586,14 +11612,14 @@ var Jssdk = /*#__PURE__*/function () {
                     script.setAttribute(x, property[x]);
                   }
                 }
-                whichWindow.document.getElementsByTagName('head')[0].appendChild(script);
+                whichDocument.getElementsByTagName('head')[0].appendChild(script);
                 script.onload = script.onreadystatechange = function () {
                   var st = script.readyState;
                   if (st && st !== 'loaded' && st !== 'complete') return;
                   script.onload = script.onreadystatechange = null;
                   resolve('success');
                 };
-              case 6:
+              case 13:
               case "end":
                 return _context.stop();
             }
@@ -11652,20 +11678,21 @@ var Jssdk = /*#__PURE__*/function () {
                   console.error('wx.config fail', err);
                   reject(err);
                 });
-                setTimeout(function () {
-                  reject(new Error('wx.config fail timeout 3000'));
-                }, 3000);
+                // setTimeout(() => {
+                //   reject(new Error('wx.config fail timeout 3000'))
+                // }, 3000)
                 _context2.next = 16;
                 break;
-              case 13:
-                _context2.prev = 13;
+              case 12:
+                _context2.prev = 12;
                 _context2.t0 = _context2["catch"](0);
+                console.error('wx.config fail', _context2.t0);
                 reject(_context2.t0);
               case 16:
               case "end":
                 return _context2.stop();
             }
-          }, _callee2, null, [[0, 13]]);
+          }, _callee2, null, [[0, 12]]);
         }));
         return function (_x3, _x4) {
           return _ref2.apply(this, arguments);
@@ -11715,13 +11742,14 @@ var Jssdk = /*#__PURE__*/function () {
                     reject(error);
                   }
                 });
-                _context3.next = 13;
+                _context3.next = 14;
                 break;
               case 10:
                 _context3.prev = 10;
                 _context3.t0 = _context3["catch"](0);
+                console.error('wx.agentConfig fail', _context3.t0);
                 reject(_context3.t0);
-              case 13:
+              case 14:
               case "end":
                 return _context3.stop();
             }
@@ -11796,11 +11824,11 @@ var Jssdk = /*#__PURE__*/function () {
                           _this4.isHack = true;
                         }
                         if (_this4.isLoadJs) {
-                          _context5.next = 24;
+                          _context5.next = 26;
                           break;
                         }
                         if (!(window.top && window.top !== window)) {
-                          _context5.next = 14;
+                          _context5.next = 16;
                           break;
                         }
                         if (!isWxworkApp()) {
@@ -11823,64 +11851,68 @@ var Jssdk = /*#__PURE__*/function () {
                         _context5.next = 12;
                         return _this4.loadJsUrl('//open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js', {
                           referrerpolicy: 'origin'
-                        });
+                        }, window.top);
                       case 12:
-                        _context5.next = 23;
-                        break;
+                        _context5.next = 14;
+                        return _this4.loadJsUrl('//open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js', {
+                          referrerpolicy: 'origin'
+                        });
                       case 14:
+                        _context5.next = 25;
+                        break;
+                      case 16:
                         if (!isWxworkApp()) {
-                          _context5.next = 19;
+                          _context5.next = 21;
                           break;
                         }
-                        _context5.next = 17;
+                        _context5.next = 19;
                         return _this4.loadJsUrl('//res.wx.qq.com/wwopen/js/jsapi/jweixin-1.0.0.js', {
                           referrerpolicy: 'origin'
                         });
-                      case 17:
-                        _context5.next = 21;
-                        break;
                       case 19:
-                        _context5.next = 21;
+                        _context5.next = 23;
+                        break;
+                      case 21:
+                        _context5.next = 23;
                         return _this4.loadJsUrl('//res.wx.qq.com/open/js/jweixin-1.2.0.js', {
                           referrerpolicy: 'origin'
                         });
-                      case 21:
-                        _context5.next = 23;
+                      case 23:
+                        _context5.next = 25;
                         return _this4.loadJsUrl('//open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js', {
                           referrerpolicy: 'origin'
                         });
-                      case 23:
+                      case 25:
                         _this4.isLoadJs = true;
-                      case 24:
-                        _context5.prev = 24;
+                      case 26:
+                        _context5.prev = 26;
                         if (!/MicroMessenger/i.test(navigator.userAgent)) {
-                          _context5.next = 28;
+                          _context5.next = 30;
                           break;
                         }
-                        _context5.next = 28;
-                        return _this4.config(jsApiList, url);
-                      case 28:
                         _context5.next = 30;
-                        return _this4.agentConfig(jsApiList, url);
+                        return _this4.config(jsApiList, url);
                       case 30:
                         _context5.next = 32;
-                        return _this4.checkSession();
+                        return _this4.agentConfig(jsApiList, url);
                       case 32:
+                        _context5.next = 34;
+                        return _this4.checkSession();
+                      case 34:
                         res = _context5.sent;
                         resolve(res);
-                        _context5.next = 40;
+                        _context5.next = 42;
                         break;
-                      case 36:
-                        _context5.prev = 36;
-                        _context5.t0 = _context5["catch"](24);
-                        // this.isFail = true
+                      case 38:
+                        _context5.prev = 38;
+                        _context5.t0 = _context5["catch"](26);
                         _this4.reset();
                         reject(_context5.t0);
-                      case 40:
+                      case 42:
                       case "end":
                         return _context5.stop();
                     }
-                  }, _callee5, null, [[24, 36]]);
+                  }, _callee5, null, [[26, 38]]);
                 }));
                 return function (_x9, _x10) {
                   return _ref5.apply(this, arguments);
@@ -11919,7 +11951,8 @@ var Jssdk = /*#__PURE__*/function () {
               throw new Error('The current tenant is not a wxworksuite tenant.');
             case 3:
               jsApiList = _toConsumableArray(new Set([].concat(_toConsumableArray(this.lastAgentConfigJsApiList), _toConsumableArray(jsApiList))));
-              url = location.origin + location.pathname + location.search;
+              // const url = location.origin + location.pathname + location.search
+              url = this.getTopUrl();
               isin = jsApiList.every(function (item) {
                 return _this5.lastAgentConfigJsApiList.some(function (item2) {
                   return item2 === item;
@@ -11939,31 +11972,35 @@ var Jssdk = /*#__PURE__*/function () {
             case 14:
               _context7.prev = 14;
               _context7.t0 = _context7["catch"](7);
-              // this.isFail = true
               this.reset();
               throw _context7.t0;
             case 18:
-              _context7.next = 28;
+              _context7.next = 34;
               break;
             case 20:
+              _context7.prev = 20;
               if (!this.initPro) {
-                _context7.next = 22;
+                _context7.next = 23;
                 break;
               }
               return _context7.abrupt("return", this.initPro);
-            case 22:
+            case 23:
               this.initPro = this.initFun(jsApiList, url);
-              _context7.next = 25;
+              _context7.next = 26;
               return this.initPro;
-            case 25:
+            case 26:
               _res = _context7.sent;
               this.initPro = null;
               return _context7.abrupt("return", _res);
-            case 28:
+            case 31:
+              _context7.prev = 31;
+              _context7.t1 = _context7["catch"](20);
+              throw _context7.t1;
+            case 34:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[7, 14]]);
+        }, _callee7, this, [[7, 14], [20, 31]]);
       }));
       function init() {
         return _init.apply(this, arguments);
@@ -11981,6 +12018,12 @@ var Jssdk = /*#__PURE__*/function () {
     value: function getTopWindow() {
       return window.top || window;
     }
+  }, {
+    key: "getTopUrl",
+    value: function getTopUrl() {
+      var win = this.getTopWindow();
+      return win.location.origin + win.location.pathname + win.location.search;
+    }
   }, {
     key: "reset",
     value: function reset() {
@@ -12073,7 +12116,6 @@ var WxworksuiteBaseOpendata = /*#__PURE__*/function (_LitElement) {
                   }
                 }
               })["catch"](function (err) {
-                // console.error(err)
                 // console.error('jssdk.init() fail', err)
                 _this2._isCanUseWxworkSuite = false;
               });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "0.0.28",
+  "version": "0.0.29",
   "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.7",
+    "@smart100/wxworksuite-plugin": "^0.0.8",
     "axios": "^1.6.0",
     "co": "^4.6.0",
     "dayjs": "^1.11.10",