@smart100/spu-web-plugin 0.0.33 → 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.33";
+var version = "0.0.34";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -12532,7 +12532,7 @@ var WxworksuiteTree = /*#__PURE__*/function (_LitElement) {
     // 判断是否开启企微通信录支持，默认不开启
     _this.iswwopendata = false;
     // 控制通信录转移类型
-    _this.wwopendatatype = ''; // userName | departmentName | expression | ''
+    _this.wwopendatatype = ''; // userName | departmentName | expression
     _this.valuekey = 'id'; // 默认id 也可定义别的属性值比如 codepath（被定义的属性值必须唯一）
     _this.ismulselect = false;
     _this.displaytype = 'mobile'; // web | mobile
@@ -13298,7 +13298,7 @@ var WxworksuiteOrganizationpickMobile = /*#__PURE__*/function (_LitElement) {
   function WxworksuiteOrganizationpickMobile() {
     var _this;
     _classCallCheck(this, WxworksuiteOrganizationpickMobile);
-    _this = _super.apply(this, arguments);
+    _this = _super.call(this);
     _this.displaytype = 'mobile';
     _this.ismulselect = false;
     _this.issearch = true;
@@ -13315,51 +13315,44 @@ var WxworksuiteOrganizationpickMobile = /*#__PURE__*/function (_LitElement) {
     // disable 不能选非末级节点 只能选末级节点 暂不实现
     _this.singleselectmode = 'normal';
     _this._expandicon = 'organization';
-    _this._isWxworkSuiteTenant = true;
     _this._list = [];
+    // axios.post('/api/teapi/dy-biz/100000000000000000/110000000000000000', {
+    //   pl_orgstruct: {
+    //     status: '1'
+    //   }
+    // }).then((res: any) => {
+    //   // console.log(res)
+    //   const list = res?.data?.pl_orgstruct || []
+    //   list.forEach((item: any) => {
+    //     item.name = item.orgname
+    //     // item.name = '1'
+    //     item.id = item.orgstructid
+    //     item.pid = item.parentorgstructid
+    //   })
+    //   this._list = list
+    // })
+    normalAxios$1.post('/api/system/v1.0/org/page', {
+      showchild: true,
+      orgstructtypeid: 1,
+      useRule: _this.userule,
+      pageindex: 1,
+      pagesize: 99999,
+      getAllStatus: false // 是否获取全部数据（即包含禁用）
+    }).then(function (res) {
+      var _res$data;
+      // console.log(res)
+      var list = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
+      list.forEach(function (item) {
+        item.name = item.orgname;
+        // item.name = '1'
+        item.id = item.orgstructid;
+        item.pid = item.parentorgstructid;
+      });
+      _this._list = list;
+    });
     return _this;
   }
   _createClass(WxworksuiteOrganizationpickMobile, [{
-    key: "connectedCallback",
-    value: function connectedCallback() {
-      var _this2 = this;
-      _get(_getPrototypeOf(WxworksuiteOrganizationpickMobile.prototype), "connectedCallback", this).call(this);
-      // axios.post('/api/teapi/dy-biz/100000000000000000/110000000000000000', {
-      //   pl_orgstruct: {
-      //     status: '1'
-      //   }
-      // }).then((res: any) => {
-      //   // console.log(res)
-      //   const list = res?.data?.pl_orgstruct || []
-      //   list.forEach((item: any) => {
-      //     item.name = item.orgname
-      //     // item.name = '1'
-      //     item.id = item.orgstructid
-      //     item.pid = item.parentorgstructid
-      //   })
-      //   this._list = list
-      // })
-      normalAxios$1.post('/api/system/v1.0/org/page', {
-        showchild: true,
-        orgstructtypeid: 1,
-        useRule: this.userule,
-        pageindex: 1,
-        pagesize: 99999,
-        getAllStatus: false // 是否获取全部数据（即包含禁用）
-      }).then(function (res) {
-        var _res$data;
-        // console.log(res)
-        var list = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
-        list.forEach(function (item) {
-          item.name = item.orgname;
-          // item.name = '1'
-          item.id = item.orgstructid;
-          item.pid = item.parentorgstructid;
-        });
-        _this2._list = list;
-      });
-    }
-  }, {
     key: "treeRef",
     get: function get() {
       var _this$renderRoot$quer, _this$renderRoot;
@@ -13427,7 +13420,7 @@ var WxworksuiteOrganizationpickMobile = /*#__PURE__*/function (_LitElement) {
   }, {
     key: "render",
     value: function render() {
-      return x(_templateObject$1 || (_templateObject$1 = _taggedTemplateLiteral(["\n      <wxworksuite-tree\n        wwopendatatype=\"", "\"\n        displaytype=\"", "\"\n        expandicon=\"", "\"\n        searchplaceholder=\"", "\"\n        .issearch=\"", "\"\n        .iswwopendata=\"", "\"\n        .list=\"", "\"\n        .ismulselect=\"", "\"\n        singleselectmode=\"", "\"\n        mulselectmode=\"", "\"\n        @select=\"", "\"\n        @check=\"", "\"\n      ></wxworksuite-tree>\n    "])), this._isWxworkSuiteTenant ? 'departmentName' : '', this.displaytype, this._expandicon, this.searchplaceholder, this.issearch, this._isWxworkSuiteTenant, this._list, this.ismulselect, this.singleselectmode, this.mulselectmode, this._handleSelect, this._handleCheck);
+      return x(_templateObject$1 || (_templateObject$1 = _taggedTemplateLiteral(["\n      <wxworksuite-tree\n        wwopendatatype=\"departmentName\"\n        displaytype=\"", "\"\n        expandicon=\"", "\"\n        searchplaceholder=\"", "\"\n        .issearch=\"", "\"\n        .iswwopendata=\"", "\"\n        .list=\"", "\"\n        .ismulselect=\"", "\"\n        singleselectmode=\"", "\"\n        mulselectmode=\"", "\"\n        @select=\"", "\"\n        @check=\"", "\"\n      ></wxworksuite-tree>\n    "])), this.displaytype, this._expandicon, this.searchplaceholder, this.issearch, true, this._list, this.ismulselect, this.singleselectmode, this.mulselectmode, this._handleSelect, this._handleCheck);
     }
   }], [{
     key: "register",
@@ -13464,7 +13457,6 @@ __decorate([n$1({
   type: String
 })], WxworksuiteOrganizationpickMobile.prototype, "singleselectmode", void 0);
 __decorate([r$1()], WxworksuiteOrganizationpickMobile.prototype, "_expandicon", void 0);
-__decorate([r$1()], WxworksuiteOrganizationpickMobile.prototype, "_isWxworkSuiteTenant", void 0);
 __decorate([r$1()], WxworksuiteOrganizationpickMobile.prototype, "_list", void 0);
 
 var _class$2;
@@ -13503,7 +13495,7 @@ var WxworksuiteMemberpickMobile = /*#__PURE__*/function (_LitElement) {
   function WxworksuiteMemberpickMobile() {
     var _this;
     _classCallCheck(this, WxworksuiteMemberpickMobile);
-    _this = _super.apply(this, arguments);
+    _this = _super.call(this);
     _this.displaytype = 'mobile';
     _this.ismulselect = false;
     _this.issearch = true;
@@ -13519,72 +13511,57 @@ var WxworksuiteMemberpickMobile = /*#__PURE__*/function (_LitElement) {
     // normal 正常选中取值
     // disable 不能选非末级节点 只能选末级节点 暂不实现
     _this.singleselectmode = 'normal';
-    _this._isWxworkSuiteTenant = true;
     _this._list = [];
+    // axios.post('/api/teapi/dy-biz/1032470355689738336/1273067686762516579', {
+    //   member: {
+    //     searchkey: '',
+    //     orglimit: '',
+    //     orgstructid: '',
+    //     email: '',
+    //     includechild: '1'
+    //   }
+    // }).then((res: any) => {
+    //   // console.log(res)
+    //   const list = res?.data?.member || []
+    //   list.forEach((item: any, index: number) => {
+    //     item.name = `__$$wwopendata(${item.userinfoname}, userName)(${item.positionname})`
+    //     // item.name = `__$$wwopendata(${item.userinfoname}, userName)(${item.positionname})__$$wwopendata(哈哈+${index}, departmentName)`
+    //     item.id = item.memberid
+    //     item.pid = ''
+    //     item.iswwopendata = true
+    //     item.wwopendatatype = 'expression'
+    //   })
+    //   this._list = list
+    // })
+    normalAxios$1.post('/api/system/v1.0/member/getMemberList', {
+      name: '',
+      phoneNumber: '',
+      saleAreaCodePath: '',
+      positionName: '',
+      pageindex: 1,
+      pagesize: 99999,
+      // useRule: false, // 使用数据权限
+      // useRule: this.userule, // 使用数据权限
+      appcode: 'sales',
+      belongDistributorId: ''
+    }).then(function (res) {
+      var _res$data;
+      // console.log(res)
+      // debugger
+      var list = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
+      list.forEach(function (item, index) {
+        item.name = "__$$wwopendata(".concat(item.userName, ", userName)(").concat(item.positionName, ")");
+        // item.name = `__$$wwopendata(${item.userName}, userName)(${item.positionName})__$$wwopendata(哈哈+${index}, departmentName)`
+        item.id = item.memberId;
+        item.pid = '';
+        item.iswwopendata = true;
+        item.wwopendatatype = 'expression';
+      });
+      _this._list = list;
+    });
     return _this;
   }
   _createClass(WxworksuiteMemberpickMobile, [{
-    key: "connectedCallback",
-    value: function connectedCallback() {
-      var _this2 = this;
-      _get(_getPrototypeOf(WxworksuiteMemberpickMobile.prototype), "connectedCallback", this).call(this);
-      // axios.post('/api/teapi/dy-biz/1032470355689738336/1273067686762516579', {
-      //   member: {
-      //     searchkey: '',
-      //     orglimit: '',
-      //     orgstructid: '',
-      //     email: '',
-      //     includechild: '1'
-      //   }
-      // }).then((res: any) => {
-      //   // console.log(res)
-      //   const list = res?.data?.member || []
-      //   list.forEach((item: any, index: number) => {
-      //     item.name = `__$$wwopendata(${item.userinfoname}, userName)(${item.positionname})`
-      //     // item.name = `__$$wwopendata(${item.userinfoname}, userName)(${item.positionname})__$$wwopendata(哈哈+${index}, departmentName)`
-      //     item.id = item.memberid
-      //     item.pid = ''
-      //     item.iswwopendata = true
-      //     item.wwopendatatype = 'expression'
-      //   })
-      //   this._list = list
-      // })
-      // console.log('issearch', this.issearch)
-      // console.log('userule', this.userule)
-      // debugger
-      this._isWxworkSuiteTenant = isWxworkSuiteTenant();
-      // debugger
-      normalAxios$1.post('/api/system/v1.0/member/getMemberList', {
-        name: '',
-        phoneNumber: '',
-        saleAreaCodePath: '',
-        positionName: '',
-        pageindex: 1,
-        pagesize: 99999,
-        notUseRule: !this.userule,
-        appcode: 'sales',
-        belongDistributorId: ''
-      }).then(function (res) {
-        var _res$data;
-        // console.log(res)
-        // debugger
-        var list = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
-        list.forEach(function (item, index) {
-          item.id = item.memberId;
-          item.pid = '';
-          if (_this2._isWxworkSuiteTenant) {
-            item.name = "__$$wwopendata(".concat(item.userName, ", userName)(").concat(item.positionName, ")");
-            // item.name = `__$$wwopendata(${item.userName}, userName)(${item.positionName})__$$wwopendata(哈哈+${index}, departmentName)`
-            item.iswwopendata = true;
-            item.wwopendatatype = 'expression';
-          } else {
-            item.name = "".concat(item.userName, "(").concat(item.positionName, ")");
-          }
-        });
-        _this2._list = list;
-      });
-    }
-  }, {
     key: "treeRef",
     get: function get() {
       var _this$renderRoot$quer, _this$renderRoot;
@@ -13652,7 +13629,7 @@ var WxworksuiteMemberpickMobile = /*#__PURE__*/function (_LitElement) {
   }, {
     key: "render",
     value: function render() {
-      return x(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      <wxworksuite-tree\n        wwopendatatype=\"", "\"\n        displaytype=\"", "\"\n        expandicon=\"normal\"\n        searchplaceholder=\"", "\"\n        .issearch=\"", "\"\n        .iswwopendata=\"", "\"\n        .list=\"", "\"\n        .ismulselect=\"", "\"\n        singleselectmode=\"", "\"\n        mulselectmode=\"", "\"\n        @select=\"", "\"\n        @check=\"", "\"\n      ></wxworksuite-tree>\n    "])), this._isWxworkSuiteTenant ? 'expression' : '', this.displaytype, this.searchplaceholder, this.issearch, this._isWxworkSuiteTenant, this._list, this.ismulselect, this.singleselectmode, this.mulselectmode, this._handleSelect, this._handleCheck);
+      return x(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      <wxworksuite-tree\n        wwopendatatype=\"expression\"\n        displaytype=\"", "\"\n        expandicon=\"normal\"\n        searchplaceholder=\"", "\"\n        .issearch=\"", "\"\n        .iswwopendata=\"", "\"\n        .list=\"", "\"\n        .ismulselect=\"", "\"\n        singleselectmode=\"", "\"\n        mulselectmode=\"", "\"\n        @select=\"", "\"\n        @check=\"", "\"\n      ></wxworksuite-tree>\n    "])), this.displaytype, this.searchplaceholder, this.issearch, true, this._list, this.ismulselect, this.singleselectmode, this.mulselectmode, this._handleSelect, this._handleCheck);
     }
   }], [{
     key: "register",
@@ -13688,7 +13665,6 @@ __decorate([n$1({
 __decorate([n$1({
   type: String
 })], WxworksuiteMemberpickMobile.prototype, "singleselectmode", void 0);
-__decorate([r$1()], WxworksuiteMemberpickMobile.prototype, "_isWxworkSuiteTenant", void 0);
 __decorate([r$1()], WxworksuiteMemberpickMobile.prototype, "_list", void 0);
 
 var _class;
@@ -14071,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);
@@ -52726,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";
 
@@ -60674,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.33",
+  "version": "0.0.34",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",

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)