@smart100/spu-web-plugin 0.0.31 → 0.0.32

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.31";
+var version = "0.0.32";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -12106,6 +12106,7 @@ var WxworksuiteBaseOpendata = /*#__PURE__*/function (_LitElement) {
     _this.type = ''; // userName | departmentName
     _this.mode = 'close'; // open | close
     _this._isCanUseWxworkSuite = true;
+    _this._isRealOpenid = true;
     _this._topWWOpenData = null;
     return _this;
   }
@@ -12119,37 +12120,12 @@ var WxworksuiteBaseOpendata = /*#__PURE__*/function (_LitElement) {
     key: "connectedCallback",
     value: function () {
       var _connectedCallback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _this2 = this;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _get(_getPrototypeOf(WxworksuiteBaseOpendata.prototype), "connectedCallback", this).call(this);
               // console.log('connectedCallback')
-              jssdk.init().then(function (_ref) {
-                var topWWOpenData = _ref.topWWOpenData;
-                _this2._isCanUseWxworkSuite = true;
-                if (_this2.wwopendataRef) {
-                  if (topWWOpenData) {
-                    _this2._topWWOpenData = topWWOpenData;
-                    topWWOpenData.bind(_this2.wwopendataRef);
-                    // topWWOpenData.on('update', (event: any) => {
-                    //   const openid = event.detail.element.getAttribute('openid')
-                    //   console.log('渲染数据发生变更', event, openid)
-                    //   if (this.type === 'departmentName') {
-                    //     console.log('渲染数据发生变更', event)
-                    //     console.log('渲染数据发生变更', openid)
-                    //   }
-                    // })
-                    topWWOpenData.on('error', function (event) {
-                      // console.error('获取数据失败', event)
-                      _this2._isCanUseWxworkSuite = false;
-                    });
-                  }
-                }
-              })["catch"](function (err) {
-                // console.error('jssdk.init() fail', err)
-                _this2._isCanUseWxworkSuite = false;
-              });
+              this._deal();
             case 2:
             case "end":
               return _context.stop();
@@ -12166,10 +12142,8 @@ var WxworksuiteBaseOpendata = /*#__PURE__*/function (_LitElement) {
     value: function updated(changedProperties) {
       // 页面在浏览器，在 iOS，Mac，Android 上面的企业微信都表现正常，但是在 windows 企业微信下，会偶发不能渲染通讯录控件内容
       // 解答：由于 企业微信的 windows 客户端浏览器内核不支持 customElements，每次更新了 open-data 元素后，需要用 bind 或者 bindAll 接口对目标元素进行一次更新，这样才能保证 open-data 元素实时渲染正确的数据。遇到上面的情况，请检查一下页面代码，看看有没有可能出现时序问题：先执行了 bind，然后才渲染出对应的 open-data 元素
-      if (changedProperties.has('openid')) {
-        if (this.wwopendataRef && this._isCanUseWxworkSuite && this._topWWOpenData) {
-          this._topWWOpenData.bind(this.wwopendataRef);
-        }
+      if (changedProperties.has('openid') || changedProperties.has('type')) {
+        this._deal();
       }
     }
     // private test (e: Event) {
@@ -12182,6 +12156,45 @@ var WxworksuiteBaseOpendata = /*#__PURE__*/function (_LitElement) {
     //   console.log(value)
     //   this._isCanUseWxworkSuite = !this._isCanUseWxworkSuite
     // }
+  }, {
+    key: "_deal",
+    value: function _deal() {
+      var _this2 = this;
+      if (this.type === 'userName') {
+        this._isRealOpenid = this.openid.length >= 32 && !/[\u4e00-\u9fa5]/g.test(this.openid);
+      } else if (this.type === 'departmentName') {
+        this._isRealOpenid = Number.isInteger(Number(this.openid));
+      }
+      jssdk.init().then(function (_ref) {
+        var topWWOpenData = _ref.topWWOpenData;
+        _this2._isCanUseWxworkSuite = true;
+        setTimeout(function () {
+          if (_this2.wwopendataRef) {
+            if (topWWOpenData) {
+              _this2._topWWOpenData = topWWOpenData;
+              topWWOpenData.bind(_this2.wwopendataRef);
+              // topWWOpenData.on('update', (event: any) => {
+              //   const openid = event.detail.element.getAttribute('openid')
+              //   console.log('渲染数据发生变更', event, openid)
+              //   if (this.type === 'departmentName') {
+              //     console.log('渲染数据发生变更', event)
+              //     console.log('渲染数据发生变更', openid)
+              //   }
+              // })
+              topWWOpenData.on('error', function (event) {
+                // console.error('获取数据失败', event)
+                _this2._isCanUseWxworkSuite = false;
+                _this2._topWWOpenData = null;
+              });
+            }
+          }
+        }, 0);
+      })["catch"](function (err) {
+        // console.error('jssdk.init() fail', err)
+        _this2._isCanUseWxworkSuite = false;
+        _this2._topWWOpenData = null;
+      });
+    }
   }, {
     key: "getValue",
     value: function getValue() {
@@ -12217,7 +12230,7 @@ var WxworksuiteBaseOpendata = /*#__PURE__*/function (_LitElement) {
       // <button @click="${this.test}">test</button>
       // ${this._isCanUseWxworkSuite ? html`<ww-open-data type="${this.type}" openid="${this.openid}" mode="${this.mode}" />` : this.openid}
       // ${ this._isCanUseWxworkSuite ? html`true` : 'false' }
-      return x(_templateObject$5 || (_templateObject$5 = _taggedTemplateLiteral(["\n      ", "\n    "])), this._isCanUseWxworkSuite ? x(_templateObject2$5 || (_templateObject2$5 = _taggedTemplateLiteral(["<ww-open-data type=\"", "\" openid=\"", "\" mode=\"", "\" />"])), this.type, this.openid, this.mode) : this.openid);
+      return x(_templateObject$5 || (_templateObject$5 = _taggedTemplateLiteral(["\n      ", "\n    "])), this._isCanUseWxworkSuite && this._isRealOpenid ? x(_templateObject2$5 || (_templateObject2$5 = _taggedTemplateLiteral(["<ww-open-data type=\"", "\" openid=\"", "\" mode=\"", "\" />"])), this.type, this.openid, this.mode) : this.openid);
     }
   }], [{
     key: "register",
@@ -12242,6 +12255,7 @@ __decorate([n$1({
   type: String
 })], WxworksuiteBaseOpendata.prototype, "mode", void 0);
 __decorate([r$1()], WxworksuiteBaseOpendata.prototype, "_isCanUseWxworkSuite", void 0);
+__decorate([r$1()], WxworksuiteBaseOpendata.prototype, "_isRealOpenid", void 0);
 __decorate([r$1()], WxworksuiteBaseOpendata.prototype, "_topWWOpenData", void 0);
 
 /**
@@ -12574,9 +12588,25 @@ var WxworksuiteTree = /*#__PURE__*/function (_LitElement) {
               } else {
                 _this._searchlist = _this._list.filter(function (item) {
                   if (_this.wwopendatatype !== 'expression') {
-                    return searchOptions.some(function (item2) {
-                      return item2.id.toString() === item.name.toString();
-                    });
+                    if (_this.wwopendatatype === 'userName') {
+                      var isRealOpenid = item.name.length >= 32 && !/[\u4e00-\u9fa5]/g.test(item.name);
+                      if (isRealOpenid) {
+                        return searchOptions.some(function (item2) {
+                          return item2.id.toString() === item.name.toString();
+                        });
+                      } else {
+                        return item.name.indexOf(_this._searchvalue) !== -1;
+                      }
+                    } else if (_this.wwopendatatype === 'departmentName') {
+                      var _isRealOpenid = Number.isInteger(Number(item.name));
+                      if (_isRealOpenid) {
+                        return searchOptions.some(function (item2) {
+                          return item2.id.toString() === item.name.toString();
+                        });
+                      } else {
+                        return item.name.indexOf(_this._searchvalue) !== -1;
+                      }
+                    }
                   } else {
                     // return searchOptions.some((item2: any) => item.name.toString().indexOf(item2.id.toString()) !== -1)
                     var arr = getExpressionArr(item.name);
@@ -13272,6 +13302,7 @@ var WxworksuiteOrganizationpickMobile = /*#__PURE__*/function (_LitElement) {
     _this.displaytype = 'mobile';
     _this.ismulselect = false;
     _this.issearch = true;
+    _this.userule = true;
     _this.searchplaceholder = '请输入关键字搜索';
     // normal 父子有关联 共同取值 半选不取
     // individual 父子无关联 各自独立取值
@@ -13285,14 +13316,32 @@ var WxworksuiteOrganizationpickMobile = /*#__PURE__*/function (_LitElement) {
     _this.singleselectmode = 'normal';
     _this._expandicon = 'organization';
     _this._list = [];
-    normalAxios$1.post('/api/teapi/dy-biz/100000000000000000/110000000000000000', {
-      pl_orgstruct: {
-        status: '1'
-      }
+    // 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 ? void 0 : _res$data.pl_orgstruct) || [];
+      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'
@@ -13395,6 +13444,9 @@ __decorate([n$1({
 __decorate([n$1({
   type: Boolean
 })], WxworksuiteOrganizationpickMobile.prototype, "issearch", void 0);
+__decorate([n$1({
+  type: Boolean
+})], WxworksuiteOrganizationpickMobile.prototype, "userule", void 0);
 __decorate([n$1({
   type: String
 })], WxworksuiteOrganizationpickMobile.prototype, "searchplaceholder", void 0);
@@ -13447,6 +13499,7 @@ var WxworksuiteMemberpickMobile = /*#__PURE__*/function (_LitElement) {
     _this.displaytype = 'mobile';
     _this.ismulselect = false;
     _this.issearch = true;
+    _this.userule = true;
     _this.searchplaceholder = '请输入关键字搜索';
     // normal 父子有关联 共同取值 半选不取
     // individual 父子无关联 各自独立取值
@@ -13459,22 +13512,47 @@ var WxworksuiteMemberpickMobile = /*#__PURE__*/function (_LitElement) {
     // disable 不能选非末级节点 只能选末级节点 暂不实现
     _this.singleselectmode = 'normal';
     _this._list = [];
-    normalAxios$1.post('/api/teapi/dy-biz/1032470355689738336/1273067686762516579', {
-      member: {
-        searchkey: '',
-        orglimit: '',
-        orgstructid: '',
-        email: '',
-        includechild: '1'
-      }
+    // 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)
-      var list = (res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.member) || [];
+      // 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.userinfoname, ", userName)(").concat(item.positionname, ")");
-        // item.name = `__$$wwopendata(${item.userinfoname}, userName)(${item.positionname})__$$wwopendata(哈哈+${index}, departmentName)`
-        item.id = item.memberid;
+        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';
@@ -13575,6 +13653,9 @@ __decorate([n$1({
 __decorate([n$1({
   type: Boolean
 })], WxworksuiteMemberpickMobile.prototype, "issearch", void 0);
+__decorate([n$1({
+  type: Boolean
+})], WxworksuiteMemberpickMobile.prototype, "userule", void 0);
 __decorate([n$1({
   type: String
 })], WxworksuiteMemberpickMobile.prototype, "searchplaceholder", void 0);
@@ -59353,7 +59434,7 @@ var getIndextagSync = function getIndextagSync(params) {
 var initApaasSpuTrack = function initApaasSpuTrack() {
   setTimeout(function () {
     var _window, _window2;
-    if (ApaasSpuTrack && !window.apaasSpuTrack && !((_window = window) !== null && _window !== void 0 && (_window = _window.aPaaS) !== null && _window !== void 0 && _window.getWebInitParams) && !((_window2 = window) !== null && _window2 !== void 0 && (_window2 = _window2.Module) !== null && _window2 !== void 0 && _window2.getIndextagSync)) {
+    if (ApaasSpuTrack && !window.apaasSpuTrack && !((_window = window) !== null && _window !== void 0 && (_window = _window.aPaaS) !== null && _window !== void 0 && _window.getWebInitParams) && !((_window2 = window) !== null && _window2 !== void 0 && (_window2 = _window2.Module) !== null && _window2 !== void 0 && _window2.getIndextagSync) && login.checkLogin() && getUser()) {
       window.aPaaS = {
         getWebInitParams: getWebInitParams
       };
@@ -59437,10 +59518,10 @@ var initApaasSpuTrack = function initApaasSpuTrack() {
         apaasSpuTrack.start();
       });
     }
-  }, 2500);
+  }, 3000);
 };
 var apaasSpuTrackSendLog = function apaasSpuTrackSendLog(data) {
-  var end = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var isnotretry = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (window.apaasSpuTrack) {
     var logtime = Date.now().toString();
     var baselog = cloneDeep$1(_objectSpread2$1(_objectSpread2$1({}, window.apaasSpuTrack.baseLog), {}, {
@@ -59467,7 +59548,7 @@ var apaasSpuTrackSendLog = function apaasSpuTrackSendLog(data) {
     // debugger
     window.apaasSpuTrack.addLogToQueue(mergedata, true);
   } else {
-    if (!end) {
+    if (!isnotretry) {
       console.warn('window.apaasSpuTrack 不存在，导出日志延迟3秒后再次发送。');
       setTimeout(function () {
         apaasSpuTrackSendLog(data, true);

package/package.json

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

package/src/apaasSpuTrack.ts

@@ -1,5 +1,6 @@
 import { globalOptions, getUser, Module } from './index'
 import { cloneDeep, merge } from 'lodash-es'
+import login from './login'
 
 // @ts-ignore
 import ApaasSpuTrack from './package/apaas-track/apaas-spu/index.umd.js'
@@ -55,7 +56,7 @@ const getIndextagSync = (params: any) => {
 // 兼容开启SPU日志
 const initApaasSpuTrack = () => {
   setTimeout(() => {
-    if (ApaasSpuTrack && !window.apaasSpuTrack && !window?.aPaaS?.getWebInitParams && !window?.Module?.getIndextagSync) {
+    if (ApaasSpuTrack && !window.apaasSpuTrack && !window?.aPaaS?.getWebInitParams && !window?.Module?.getIndextagSync && login.checkLogin() && getUser()) {
       window.aPaaS = {
         getWebInitParams
       }
@@ -147,10 +148,10 @@ const initApaasSpuTrack = () => {
         apaasSpuTrack.start()
       })
     }
-  }, 2500)
+  }, 3000)
 }
 
-const apaasSpuTrackSendLog = (data: any, end: boolean = false) => {
+const apaasSpuTrackSendLog = (data: any, isnotretry: boolean = false) => {
   if (window.apaasSpuTrack) {
     const logtime = Date.now().toString()
     const baselog = cloneDeep({
@@ -178,7 +179,7 @@ const apaasSpuTrackSendLog = (data: any, end: boolean = false) => {
     // debugger
     window.apaasSpuTrack.addLogToQueue(mergedata, true)
   } else {
-    if (!end) {
+    if (!isnotretry) {
       console.warn('window.apaasSpuTrack 不存在，导出日志延迟3秒后再次发送。')
       setTimeout(() => {
         apaasSpuTrackSendLog(data, true)