@titaui/pc 1.15.82 → 1.15.84-beta.1

package/lib/utils/platform.js

@@ -11,8 +11,10 @@ var _react = _interopRequireDefault(require("react"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var isPlatform = function isPlatform(name) {
+  var _window$BSGlobal$tena;
+
   // @ts-ignore
-  var source = window.BSGlobal.tenantInfo.Source;
+  var source = (_window$BSGlobal$tena = window.BSGlobal.tenantInfo) === null || _window$BSGlobal$tena === void 0 ? void 0 : _window$BSGlobal$tena.Source;
   var ua = navigator.userAgent.toLowerCase();
 
   switch (name) {
@@ -39,8 +41,10 @@ var getPlatformConfig = function getPlatformConfig() {
 exports.getPlatformConfig = getPlatformConfig;
 
 var isDD = function isDD(res) {
+  var _window$BSGlobal$tena2;
+
   // @ts-ignore
-  var source = window.BSGlobal.tenantInfo.Source;
+  var source = (_window$BSGlobal$tena2 = window.BSGlobal.tenantInfo) === null || _window$BSGlobal$tena2 === void 0 ? void 0 : _window$BSGlobal$tena2.Source;
   if (source == 861) return res;
   return undefined;
 };
@@ -48,8 +52,10 @@ var isDD = function isDD(res) {
 exports.isDD = isDD;
 
 var isFeishu = function isFeishu(res) {
+  var _window$BSGlobal$tena3;
+
   // @ts-ignore
-  var source = window.BSGlobal.tenantInfo.Source;
+  var source = (_window$BSGlobal$tena3 = window.BSGlobal.tenantInfo) === null || _window$BSGlobal$tena3 === void 0 ? void 0 : _window$BSGlobal$tena3.Source;
   if (source == 862) return res;
   return undefined;
 };
@@ -57,6 +63,8 @@ var isFeishu = function isFeishu(res) {
 exports.isFeishu = isFeishu;
 
 function PlatformItem(props) {
+  var _window$BSGlobal$tena4;
+
   var children = props.children,
       _props$hidden = props.hidden,
       hidden = _props$hidden === void 0 ? [] : _props$hidden;
@@ -65,7 +73,7 @@ function PlatformItem(props) {
     lark: 862
   }; // @ts-ignore
 
-  var sourceId = window.BSGlobal.tenantInfo.Source;
+  var sourceId = (_window$BSGlobal$tena4 = window.BSGlobal.tenantInfo) === null || _window$BSGlobal$tena4 === void 0 ? void 0 : _window$BSGlobal$tena4.Source;
   var isShowSource = true;
   hidden.forEach(function (item) {
     if (sourceMap[item] == sourceId) {
@@ -81,7 +89,9 @@ function PlatformItem(props) {
 }
 
 var isOfficialSite = function isOfficialSite() {
-  var source = window.BSGlobal.tenantInfo.Source;
+  var _window$BSGlobal$tena5;
+
+  var source = (_window$BSGlobal$tena5 = window.BSGlobal.tenantInfo) === null || _window$BSGlobal$tena5 === void 0 ? void 0 : _window$BSGlobal$tena5.Source;
   return source !== 860 && source !== 861 && source !== 862;
 };
 

package/lib/utils/request-v1.js

@@ -98,22 +98,28 @@ function _taker() {
 }
 
 function getApiUrl(url) {
+  var _getTenantInfo;
+
   var uid = (0, _bsGlobal.getUserInfo)().Id;
-  var tid = (0, _bsGlobal.getTenantInfo)().Id;
+  var tid = (_getTenantInfo = (0, _bsGlobal.getTenantInfo)()) === null || _getTenantInfo === void 0 ? void 0 : _getTenantInfo.Id;
   var apiServer = (0, _bsGlobal.getBSGlobal)("apiPath");
   return "".concat(apiServer, "/api/v1/").concat(tid, "/").concat(uid, "/").concat(url);
 }
 
 function getApiUrl3(url) {
+  var _getTenantInfo2;
+
   var uid = (0, _bsGlobal.getUserInfo)().Id;
-  var tid = (0, _bsGlobal.getTenantInfo)().Id;
+  var tid = (_getTenantInfo2 = (0, _bsGlobal.getTenantInfo)()) === null || _getTenantInfo2 === void 0 ? void 0 : _getTenantInfo2.Id;
   var apiServer = (0, _bsGlobal.getBSGlobal)("apiPath");
   return "".concat(apiServer, "/api/v3/").concat(tid, "/").concat(uid, "/").concat(url);
 }
 
 function getApiUrl2(url) {
+  var _getTenantInfo3;
+
   var uid = (0, _bsGlobal.getUserInfo)().Id;
-  var tid = (0, _bsGlobal.getTenantInfo)().Id;
+  var tid = (_getTenantInfo3 = (0, _bsGlobal.getTenantInfo)()) === null || _getTenantInfo3 === void 0 ? void 0 : _getTenantInfo3.Id;
   var apiServer = (0, _bsGlobal.getBSGlobal)("apiPath");
   return "".concat(apiServer, "/api/v2/").concat(tid, "/").concat(uid, "/").concat(url);
 }

package/lib/utils/request.js

@@ -9,7 +9,7 @@ exports.rput = exports.rpost = exports.rget = exports.rdelete = exports.postForT
 
 var _axios = _interopRequireDefault(require("axios"));
 
-var _window$BSGlobal, _window$BSGlobal2;
+var _window$BSGlobal, _window$BSGlobal$tena, _window$BSGlobal2, _window$BSGlobal2$log;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -19,8 +19,8 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-var tenantId = ((_window$BSGlobal = window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : _window$BSGlobal.tenantInfo.Id) || 0;
-var userId = ((_window$BSGlobal2 = window.BSGlobal) === null || _window$BSGlobal2 === void 0 ? void 0 : _window$BSGlobal2.loginUserInfo.Id) || 0; // 开启mock
+var tenantId = ((_window$BSGlobal = window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$tena = _window$BSGlobal.tenantInfo) === null || _window$BSGlobal$tena === void 0 ? void 0 : _window$BSGlobal$tena.Id) || 0;
+var userId = ((_window$BSGlobal2 = window.BSGlobal) === null || _window$BSGlobal2 === void 0 ? void 0 : (_window$BSGlobal2$log = _window$BSGlobal2.loginUserInfo) === null || _window$BSGlobal2$log === void 0 ? void 0 : _window$BSGlobal2$log.Id) || 0; // 开启mock
 
 var mockEnabled = false;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.15.82",
+  "version": "1.15.84-beta.1",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -83,8 +83,8 @@
     "@titaui/rc-tree2": "4.1.23",
     "@titaui/rc-trigger": "5.2.5",
     "@titaui/react-flow-renderer": "9.5.4",
-    "@titaui/request": "^1.1.5",
-    "@titaui/rich-editor": "0.1.73",
+    "@titaui/request": "1.1.8",
+    "@titaui/rich-editor": "0.1.75",
     "@titaui/toast": "1.0.0",
     "@types/color": "3.0.3",
     "@types/prosemirror-commands": "1.0.4",