@smart100/spu-web-plugin 0.0.25 → 0.0.27

package/dist/index.d.ts

@@ -76,6 +76,7 @@ export const spuAxios: any
 export const apaasAxios: any
 export const axios: any
 export const spuConfig: any
+export const globalConfig: any
 export const downloadService: IDownloadService
 export const uploadService: IUploadService
 export const getUniqueid: () => 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.25";
+var version = "0.0.27";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -12353,7 +12353,8 @@ var WxworksuiteTree = /*#__PURE__*/function (_LitElement) {
     // 判断是否开启企微通信录支持，默认不开启
     _this.iswwopendata = false;
     // 控制通信录转移类型
-    _this.wwopendatatype = ''; // userName | departmentName | express
+    _this.wwopendatatype = ''; // userName | departmentName | expression
+    _this.valuekey = 'id'; // 默认id 也可定义别的属性值比如 codepath（被定义的属性值必须唯一）
     _this.ismulselect = false;
     _this.displaytype = 'mobile'; // web | mobile
     _this.issearch = true;
@@ -12601,7 +12602,7 @@ var WxworksuiteTree = /*#__PURE__*/function (_LitElement) {
         query_type = 1;
       } else if (this.wwopendatatype === 'departmentName') {
         query_type = 2;
-      } else if (this.wwopendatatype === 'express') {
+      } else if (this.wwopendatatype === 'expression') {
         query_type = 0;
       }
       return normalAxios$1.post('/api/wxwork/contact/search', {
@@ -12643,8 +12644,8 @@ var WxworksuiteTree = /*#__PURE__*/function (_LitElement) {
     }
   }, {
     key: "getValue",
-    value: function getValue() {
-      var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'id';
+    value: function getValue(type) {
+      var _this3 = this;
       if (this.ismulselect) {
         var arr = this._list.filter(function (item) {
           return item.checkstate === '1';
@@ -12670,63 +12671,99 @@ var WxworksuiteTree = /*#__PURE__*/function (_LitElement) {
             return !(item !== null && item !== void 0 && item.parent);
           });
         }
-        if (type === 'id') {
+        if (!type) {
           var _arr;
           return (_arr = arr) !== null && _arr !== void 0 && _arr.length ? arr.map(function (item) {
-            return item.id;
+            return item[_this3.valuekey];
           }) : [];
         } else if (type === 'name') {
           var _arr2;
           return (_arr2 = arr) !== null && _arr2 !== void 0 && _arr2.length ? arr.map(function (item) {
             return item.name;
           }) : [];
-        } else {
+        } else if (type === 'fullvalue') {
           var _arr3;
           return (_arr3 = arr) !== null && _arr3 !== void 0 && _arr3.length ? cloneDeep(arr) : [];
+        } else {
+          var _arr4;
+          return (_arr4 = arr) !== null && _arr4 !== void 0 && _arr4.length ? arr.map(function (item) {
+            return item[type];
+          }) : [];
         }
       } else {
         var obj = this._list.find(function (item) {
           return item.isselected;
         });
-        if (type === 'id') {
-          return obj ? obj.id : '';
+        if (!type) {
+          return obj ? obj[this.valuekey] : '';
         } else if (type === 'name') {
           return obj ? obj.name : '';
-        } else {
+        } else if (type === 'fullvalue') {
           return obj ? cloneDeep(obj) : null;
+        } else {
+          return obj ? obj[type] : '';
+        }
+      }
+    }
+  }, {
+    key: "_transValuekeyValueToIdValue",
+    value: function _transValuekeyValueToIdValue(value) {
+      var _this4 = this;
+      if (this.valuekey === 'id') {
+        return value;
+      } else {
+        if (Array.isArray(value)) {
+          return value.map(function (item) {
+            var a = _this4._list.find(function (item2) {
+              return item2[_this4.valuekey] === item;
+            });
+            return (a === null || a === void 0 ? void 0 : a.id) || '';
+          });
+        } else {
+          if (value) {
+            var a = this._list.find(function (item2) {
+              return item2[_this4.valuekey] === value;
+            });
+            return (a === null || a === void 0 ? void 0 : a.id) || '';
+          } else {
+            return value;
+          }
         }
       }
     }
   }, {
     key: "setValue",
     value: function setValue(value) {
-      var _this3 = this;
+      var _this5 = this;
+      var idValue = this._transValuekeyValueToIdValue(value);
       // debugger
       if (this.ismulselect) {
         this._list.forEach(function (item) {
           item.checkstate = '0';
         });
-        (value === null || value === void 0 ? void 0 : value.length) && value.forEach(function (item) {
-          _this3._setCheck(item, '1');
+        Array.isArray(idValue) && idValue.forEach(function (item) {
+          _this5._setCheck(item, '1');
         });
         this._updateTemplate();
       } else {
-        this._setSelect(value, true);
+        this._setSelect(idValue, true);
         this._updateTemplate();
       }
     }
   }, {
     key: "setCheck",
-    value: function setCheck(id) {
-      var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      this._setCheck(id, value ? '1' : '0');
+    value: function setCheck(value) {
+      var flag = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var idValue = this._transValuekeyValueToIdValue(value);
+      this._setCheck(idValue, flag ? '1' : '0');
       this._updateTemplate();
     }
   }, {
     key: "setSelect",
-    value: function setSelect(id) {
-      var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      this._setSelect(id, value);
+    value: function setSelect(value) {
+      var flag = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var idValue = this._transValuekeyValueToIdValue(value);
+      this._setSelect(idValue, flag);
       this._updateTemplate();
     }
   }, {
@@ -12735,7 +12772,7 @@ var WxworksuiteTree = /*#__PURE__*/function (_LitElement) {
       var _this$_data,
         _this$_data2,
         _this$_searchlist,
-        _this4 = this;
+        _this6 = this;
       return x(_templateObject$3 || (_templateObject$3 = _taggedTemplateLiteral(["\n      <div class=", ">\n        <!-- <button class=\"demo\" @click=\"", "\">\n          _test\n          ", "\n        </button> -->\n\n        ", "\n\n        ", "\n      </div>\n    "])), e$5({
         'tree': true,
         'tree-web': this.displaytype === 'web',
@@ -12745,11 +12782,11 @@ var WxworksuiteTree = /*#__PURE__*/function (_LitElement) {
       }), this._searchvalue ? x(_templateObject4$1 || (_templateObject4$1 = _taggedTemplateLiteral(["\n                  ", "\n                "])), this !== null && this !== void 0 && (_this$_searchlist = this._searchlist) !== null && _this$_searchlist !== void 0 && _this$_searchlist.length ? x(_templateObject5$1 || (_templateObject5$1 = _taggedTemplateLiteral(["\n                      ", "\n                    "])), c(this._searchlist, function (item) {
         return item.id;
       }, function (item, index) {
-        return x(_templateObject6$1 || (_templateObject6$1 = _taggedTemplateLiteral(["\n                            <wxworksuite-treenode\n                              displaytype=\"", "\"\n                              expandmode=\"", "\"\n                              expandicon=\"", "\"\n                              .node=\"", "\"\n                              .isonelevel=\"", "\"\n                              .isrenderchildren=\"", "\"\n                              .iswwopendata=\"", "\"\n                              wwopendatatype=\"", "\"\n                              .ismulselect=\"", "\"\n                              .updatepoint=\"", "\"\n                              @toggle=\"", "\"\n                            >\n                          </wxworksuite-treenode>\n                          "])), _this4.displaytype, _this4.expandmode, _this4.expandicon, item, true, false, _this4.iswwopendata, _this4.wwopendatatype, _this4.ismulselect, _this4._updatepoint, _this4._handleToggle);
+        return x(_templateObject6$1 || (_templateObject6$1 = _taggedTemplateLiteral(["\n                            <wxworksuite-treenode\n                              displaytype=\"", "\"\n                              expandmode=\"", "\"\n                              expandicon=\"", "\"\n                              .node=\"", "\"\n                              .isonelevel=\"", "\"\n                              .isrenderchildren=\"", "\"\n                              .iswwopendata=\"", "\"\n                              wwopendatatype=\"", "\"\n                              .ismulselect=\"", "\"\n                              .updatepoint=\"", "\"\n                              @toggle=\"", "\"\n                            >\n                          </wxworksuite-treenode>\n                          "])), _this6.displaytype, _this6.expandmode, _this6.expandicon, item, true, false, _this6.iswwopendata, _this6.wwopendatatype, _this6.ismulselect, _this6._updatepoint, _this6._handleToggle);
       })) : x(_templateObject7$1 || (_templateObject7$1 = _taggedTemplateLiteral(["\n                      <div class=\"tree-none\">\u6682\u65E0\u641C\u7D22\u7ED3\u679C</div>\n                    "])))) : x(_templateObject8$1 || (_templateObject8$1 = _taggedTemplateLiteral(["\n                  ", "\n                "])), c(this._data, function (item) {
         return item.id;
       }, function (item, index) {
-        return x(_templateObject9$1 || (_templateObject9$1 = _taggedTemplateLiteral(["\n                        <wxworksuite-treenode\n                          displaytype=\"", "\"\n                          expandmode=\"", "\"\n                          expandicon=\"", "\"\n                          .node=\"", "\"\n                          .isonelevel=\"", "\"\n                          .isrenderchildren=\"", "\"\n                          .iswwopendata=\"", "\"\n                          wwopendatatype=\"", "\"\n                          .ismulselect=\"", "\"\n                          .updatepoint=\"", "\"\n                          @toggle=\"", "\"\n                        >\n                      </wxworksuite-treenode>\n                      "])), _this4.displaytype, _this4.expandmode, _this4.expandicon, item, _this4._isonelevel, true, _this4.iswwopendata, _this4.wwopendatatype, _this4.ismulselect, _this4._updatepoint, _this4._handleToggle);
+        return x(_templateObject9$1 || (_templateObject9$1 = _taggedTemplateLiteral(["\n                        <wxworksuite-treenode\n                          displaytype=\"", "\"\n                          expandmode=\"", "\"\n                          expandicon=\"", "\"\n                          .node=\"", "\"\n                          .isonelevel=\"", "\"\n                          .isrenderchildren=\"", "\"\n                          .iswwopendata=\"", "\"\n                          wwopendatatype=\"", "\"\n                          .ismulselect=\"", "\"\n                          .updatepoint=\"", "\"\n                          @toggle=\"", "\"\n                        >\n                      </wxworksuite-treenode>\n                      "])), _this6.displaytype, _this6.expandmode, _this6.expandicon, item, _this6._isonelevel, true, _this6.iswwopendata, _this6.wwopendatatype, _this6.ismulselect, _this6._updatepoint, _this6._handleToggle);
       }))) : x(_templateObject10$1 || (_templateObject10$1 = _taggedTemplateLiteral(["<div class=\"tree-none\">\u6682\u65E0\u6570\u636E</div>"]))));
     }
   }], [{
@@ -12774,6 +12811,9 @@ __decorate([n$1({
 __decorate([n$1({
   type: String
 })], WxworksuiteTree.prototype, "wwopendatatype", void 0);
+__decorate([n$1({
+  type: String
+})], WxworksuiteTree.prototype, "valuekey", void 0);
 __decorate([n$1({
   type: Boolean
 })], WxworksuiteTree.prototype, "ismulselect", void 0);
@@ -13322,7 +13362,9 @@ var WxworksuitePluginInstall = function WxworksuitePluginInstall(options) {
   console.log('@smart100/wxworksuite-plugin install');
   console.log('@smart100/wxworksuite-plugin userOptions', options);
   console.log('@smart100/wxworksuite-plugin globalOptions', globalOptions$1);
-  // console.error('test')
+  // setTimeout(() => {
+  //   console.error('@smart100/wxworksuite-plugin change')
+  // }, 3000)
   initAxios$1(globalOptions$1);
   for (var x in components) {
     components[x].register();
@@ -17827,11 +17869,12 @@ var SpuConfig = /*#__PURE__*/function () {
     _classCallCheck$1(this, SpuConfig);
     _defineProperty$1(this, "isload", false);
     _defineProperty$1(this, "cache", []);
+    _defineProperty$1(this, "getPro", null);
   }
   _createClass$1(SpuConfig, [{
-    key: "get",
+    key: "getFun",
     value: function () {
-      var _get = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee(dataid) {
+      var _getFun = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee() {
         var res, _res$data;
         return _regeneratorRuntime$1().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -17862,33 +17905,61 @@ var SpuConfig = /*#__PURE__*/function () {
             case 11:
               this.isload = true;
             case 12:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[1, 8]]);
+      }));
+      function getFun() {
+        return _getFun.apply(this, arguments);
+      }
+      return getFun;
+    }()
+  }, {
+    key: "get",
+    value: function () {
+      var _get = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee2(dataid) {
+        return _regeneratorRuntime$1().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (this.isload) {
+                _context2.next = 4;
+                break;
+              }
+              // 兼容同时间发起多个
+              if (!this.getPro) {
+                this.getPro = this.getFun();
+              }
+              _context2.next = 4;
+              return this.getPro;
+            case 4:
               if (!dataid) {
-                _context.next = 20;
+                _context2.next = 12;
                 break;
               }
               if (!Array.isArray(dataid)) {
-                _context.next = 17;
+                _context2.next = 9;
                 break;
               }
-              return _context.abrupt("return", cloneDeep$1(this.cache.filter(function (item) {
+              return _context2.abrupt("return", cloneDeep$1(this.cache.filter(function (item) {
                 return dataid.some(function (item2) {
                   return item2 === item.dataid;
                 });
               })));
-            case 17:
-              return _context.abrupt("return", cloneDeep$1(this.cache.find(function (item) {
+            case 9:
+              return _context2.abrupt("return", cloneDeep$1(this.cache.find(function (item) {
                 return item.dataid === dataid;
               })));
-            case 18:
-              _context.next = 21;
+            case 10:
+              _context2.next = 13;
               break;
-            case 20:
-              return _context.abrupt("return", cloneDeep$1(this.cache));
-            case 21:
+            case 12:
+              return _context2.abrupt("return", cloneDeep$1(this.cache));
+            case 13:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this, [[1, 8]]);
+        }, _callee2, this);
       }));
       function get(_x) {
         return _get.apply(this, arguments);
@@ -17903,6 +17974,112 @@ function initSpuConfig(options) {
 }
 var spuConfig = new SpuConfig();
 
+var GlobalConfig = /*#__PURE__*/function () {
+  function GlobalConfig() {
+    _classCallCheck$1(this, GlobalConfig);
+    _defineProperty$1(this, "isload", false);
+    _defineProperty$1(this, "cache", []);
+    _defineProperty$1(this, "getPro", null);
+  }
+  _createClass$1(GlobalConfig, [{
+    key: "getFun",
+    value: function () {
+      var _getFun = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee() {
+        var res;
+        return _regeneratorRuntime$1().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (this.isload) {
+                _context.next = 12;
+                break;
+              }
+              _context.prev = 1;
+              _context.next = 4;
+              return normalAxios.post('/api/pemission/rolepermission/globalconfig/getglobalconfigbytype', {
+                configtype: '1'
+              });
+            case 4:
+              res = _context.sent;
+              // console.log(res)
+              // debugger
+              if (res.code === 200) {
+                this.cache = (res === null || res === void 0 ? void 0 : res.data) || [];
+              }
+              _context.next = 11;
+              break;
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](1);
+              console.error(_context.t0);
+            case 11:
+              this.isload = true;
+            case 12:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[1, 8]]);
+      }));
+      function getFun() {
+        return _getFun.apply(this, arguments);
+      }
+      return getFun;
+    }()
+  }, {
+    key: "get",
+    value: function () {
+      var _get = _asyncToGenerator$1( /*#__PURE__*/_regeneratorRuntime$1().mark(function _callee2(key) {
+        return _regeneratorRuntime$1().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              if (this.isload) {
+                _context2.next = 4;
+                break;
+              }
+              // 兼容同时间发起多个
+              if (!this.getPro) {
+                this.getPro = this.getFun();
+              }
+              _context2.next = 4;
+              return this.getPro;
+            case 4:
+              if (!key) {
+                _context2.next = 12;
+                break;
+              }
+              if (!Array.isArray(key)) {
+                _context2.next = 9;
+                break;
+              }
+              return _context2.abrupt("return", cloneDeep$1(this.cache.filter(function (item) {
+                return key.some(function (item2) {
+                  return item2 === item.key;
+                });
+              })));
+            case 9:
+              return _context2.abrupt("return", cloneDeep$1(this.cache.find(function (item) {
+                return item.key === key;
+              })));
+            case 10:
+              _context2.next = 13;
+              break;
+            case 12:
+              return _context2.abrupt("return", cloneDeep$1(this.cache));
+            case 13:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function get(_x) {
+        return _get.apply(this, arguments);
+      }
+      return get;
+    }()
+  }]);
+  return GlobalConfig;
+}();
+var globalConfig = new GlobalConfig();
+
 function commonjsRequire(path) {
 	throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
 }
@@ -60096,4 +60273,4 @@ var Module = {
   checkModule: core.checkModule.bind(core)
 };
 
-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, globalOptions, lsProxy, 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, lsProxy, singleLogin, spuAxios, spuConfig, ssProxy, startRefreshtoken, uploadService, wxworkSuite };

package/package.json

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

package/src/globalConfig.ts

@@ -0,0 +1,54 @@
+import { axios } from './index'
+import { cloneDeep } from 'lodash-es'
+
+class GlobalConfig {
+  private isload = false
+
+  cache: any[] = []
+
+  public async getFun (): Promise<any> {
+    if (!this.isload) {
+      try {
+        const res = await axios.post('/api/pemission/rolepermission/globalconfig/getglobalconfigbytype', {
+          configtype: '1'
+        })
+        // console.log(res)
+        // debugger
+        if (res.code === 200) {
+          this.cache = res?.data || []
+        }
+      } catch (err) {
+        console.error(err)
+      }
+      this.isload = true
+    }
+  }
+
+  private getPro: any = null
+
+  public async get (key?: string | string[]): Promise<any> {
+    if (!this.isload) {
+      // 兼容同时间发起多个
+      if (!this.getPro) {
+        this.getPro = this.getFun()
+      }
+      await this.getPro
+    }
+
+    if (key) {
+      if (Array.isArray(key)) {
+        return cloneDeep(this.cache.filter((item: any) => (key.some((item2) => item2 === item.key))))
+      } else {
+        return cloneDeep(this.cache.find((item: any) => item.key === key))
+      }
+    } else {
+      return cloneDeep(this.cache)
+    }
+  }
+}
+
+const globalConfig = new GlobalConfig()
+
+export {
+  globalConfig
+}

package/src/index.ts

@@ -7,6 +7,7 @@ import { initStorageProxy, lsProxy, ssProxy } from './storageProxy'
 import { getLocation, getDistance } from './location'
 import { initAxios, spuAxios, axios } from './axios'
 import { initSpuConfig, spuConfig } from './spuConfig'
+import { globalConfig } from './globalConfig'
 import { downloadService, uploadService } from './oss'
 import { getUniqueid, functionCheck } from './utils'
 import urlquery from './urlquery'
@@ -155,6 +156,7 @@ export {
   axios,
   axios as apaasAxios,
   spuConfig,
+  globalConfig,
   downloadService,
   uploadService,
   getUniqueid,

package/src/spuConfig.ts

@@ -8,7 +8,7 @@ class SpuConfig {
 
   cache: any[] = []
 
-  public async get (dataid?: string | string[]): Promise<any> {
+  public async getFun (): Promise<any> {
     if (!this.isload) {
       try {
         const res = await spuAxios.post('/lifecycle/getconfigdata', {
@@ -25,6 +25,18 @@ class SpuConfig {
       }
       this.isload = true
     }
+  }
+
+  private getPro: any = null
+
+  public async get (dataid?: string | string[]): Promise<any> {
+    if (!this.isload) {
+      // 兼容同时间发起多个
+      if (!this.getPro) {
+        this.getPro = this.getFun()
+      }
+      await this.getPro
+    }
 
     if (dataid) {
       if (Array.isArray(dataid)) {

package/src/types/index.d.ts

@@ -76,6 +76,7 @@ export const spuAxios: any
 export const apaasAxios: any
 export const axios: any
 export const spuConfig: any
+export const globalConfig: any
 export const downloadService: IDownloadService
 export const uploadService: IUploadService
 export const getUniqueid: () => string