@smart100/spu-web-plugin 0.0.32 → 0.0.33

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.33";
 
 /** 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.call(this);
+    _this = _super.apply(this, arguments);
     _this.displaytype = 'mobile';
     _this.ismulselect = false;
     _this.issearch = true;
@@ -13315,44 +13315,51 @@ 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;
@@ -13420,7 +13427,7 @@ var WxworksuiteOrganizationpickMobile = /*#__PURE__*/function (_LitElement) {
   }, {
     key: "render",
     value: function render() {
-      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);
+      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);
     }
   }], [{
     key: "register",
@@ -13457,6 +13464,7 @@ __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;
@@ -13495,7 +13503,7 @@ var WxworksuiteMemberpickMobile = /*#__PURE__*/function (_LitElement) {
   function WxworksuiteMemberpickMobile() {
     var _this;
     _classCallCheck(this, WxworksuiteMemberpickMobile);
-    _this = _super.call(this);
+    _this = _super.apply(this, arguments);
     _this.displaytype = 'mobile';
     _this.ismulselect = false;
     _this.issearch = true;
@@ -13511,57 +13519,72 @@ 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;
@@ -13629,7 +13652,7 @@ var WxworksuiteMemberpickMobile = /*#__PURE__*/function (_LitElement) {
   }, {
     key: "render",
     value: function render() {
-      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);
+      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);
     }
   }], [{
     key: "register",
@@ -13665,6 +13688,7 @@ __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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "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",