@titaui/pc 1.10.6 → 1.10.8-2.beta-1

package/lib/pages/new-okr-list/header/index.js

@@ -154,7 +154,8 @@ function Header(props, ref) {
       annualNum: annualNum,
       yqmNum: yqmNum
     })), "rootNode=".concat(JSON.stringify(rootNode)), "level2Selected=".concat(JSON.stringify(level2Selected))].join("&");
-    window.location.href = "".concat(window.location.origin, "/#okr/map?").concat(urlQuery);
+    var origin = window.location.href.split('#')[0];
+    window.location.href = "".concat(origin, "/#okr/map?").concat(urlQuery);
   };
 
   var getTitle = function getTitle() {

package/lib/pages/new-okr-list/index.js

@@ -178,7 +178,12 @@ var NewOkrList = function NewOkrList(props) {
 
   (0, _react.useEffect)(function () {
     setPageNum(1);
-  }, [relation, toUserId, departmentId, query]); // 记录访问者数据
+  }, [relation, toUserId, departmentId, query]);
+  (0, _react.useEffect)(function () {
+    handleOnSearch({
+      keyWords: ""
+    });
+  }, [relation, toUserId, departmentId]); // 记录访问者数据
 
   var recordVisitUser = function recordVisitUser() {
     if (toUserId) {
@@ -205,21 +210,13 @@ var NewOkrList = function NewOkrList(props) {
       params.Searchpage = 2;
     }
 
-    if (departmentId != 0) {
-      params.keyWords = '';
-    }
-
-    var request;
-
-    if (!relation) {
-      request = (0, _requestApi.okrSearch)(params);
-    } else {
-      request = (0, _requestApi.okrList)(params);
+    if (departmentId !== 0 && departmentId !== "0") {
+      params.keyWords = "";
     }
 
     setLoading(true);
     recordVisitUser();
-    request.then(function (res) {
+    (0, _requestApi.okrSearch)(params).then(function (res) {
       setOkrs(res.works || []);
       setTotal(res.total);
       setLoading(false);
@@ -363,7 +360,7 @@ var NewOkrList = function NewOkrList(props) {
     className: "okr-list__check-filter-btn",
     onClick: triggerAnimation
   }, (0, _getLocale.getLocale)("OKR_MyO_Text_Check")), (0, _getLocale.getLocale)("OKR_MyO_Text_Topfiltercriteria")), /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
-    zIndex: 99999,
+    zIndex: 1200,
     noHeadLine: true,
     visible: casesVisible,
     onClose: onCasesCloseHandler,

package/lib/pages/okr-map/export-modules/share-okr-page/header/index.js

@@ -59,11 +59,6 @@ function _default(props) {
       return setShowKr(checked);
     }
   })), /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])("".concat(_precls["default"], "-share-okr__header-dark")),
-    onClick: function onClick() {
-      return setDarkTheme(!darkTheme);
-    }
-  }, "\u5207\u6362", darkTheme ? "浅色" : "深色", "\u6A21\u5F0F"), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "-share-okr__header-direction"))
   }, /*#__PURE__*/_react["default"].createElement(_iconButtonList["default"], {
     items: iconButtons,

package/lib/pages/pay/index.css

@@ -0,0 +1,79 @@
+.tita-pay-page {
+  width: 100vw;
+  height: 100vh;
+  background: linear-gradient(180deg, #e9f1ff 0%, rgba(233, 241, 255, 0) 100%);
+  position: relative;
+}
+
+.tita-pay-page-layout {
+  position: absolute;
+  top: calc(50% - 40px);
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.tita-pay-page__title {
+  display: flex;
+  justify-content: center;
+}
+
+.tita-pay-page__card {
+  width: 444px;
+  height: 469px;
+  background: #ffffff;
+  box-shadow: 0px 12px 20px 0px rgba(127, 145, 180, 0.2);
+  border-radius: 24px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-top: 21px;
+}
+
+.tita-pay-page__card__success-image {
+  width: 194px;
+  height: 194px;
+  margin-top: 76px;
+}
+
+.tita-pay-page__card__success-message {
+  font-weight: 600;
+  margin-top: 28px;
+  font-size: 20px;
+  color: #3f4755;
+  line-height: 32px;
+}
+
+.tita-pay-page__card__success-promptMes {
+  font-size: 14px;
+  font-weight: 400;
+  color: #3f4755;
+  line-height: 22px;
+  margin-top: 12px;
+}
+
+.tita-pay-page__card-title {
+  font-size: 20px;
+  color: #141c28;
+  line-height: 30px;
+  margin-top: 44px;
+}
+
+.tita-pay-page__card-price {
+  margin: 12px 0 17px;
+}
+
+.tita-pay-page__card-qrcode {
+  width: 240px;
+}
+
+.tita-pay-page__card-qrcode > img {
+  width: 100%;
+}
+
+.tita-pay-page__card-promptMes {
+  margin-top: 20px;
+  font-size: 16px;
+  font-weight: 400;
+  color: #3f4755;
+  line-height: 22px;
+}

package/lib/pages/pay/index.js

@@ -0,0 +1,66 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _success = _interopRequireDefault(require("./image/success.png"));
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var preCls = "tita-pay-page";
+
+var payPage = function payPage(_ref) {
+  var title = _ref.title,
+      cardTitle = _ref.cardTitle,
+      price = _ref.price,
+      qrcode = _ref.qrcode,
+      promptMes = _ref.promptMes,
+      isSuccessPay = _ref.isSuccessPay,
+      successMes = _ref.successMes;
+
+  var renderSuccessCard = function renderSuccessCard() {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("img", {
+      className: "".concat(preCls, "__card__success-image"),
+      src: _success["default"],
+      alt: ""
+    }), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card__success-message")
+    }, "\u606D\u559C\u60A8\uFF0C\u652F\u4ED8\u6210\u529F"), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card__success-promptMes")
+    }, successMes));
+  };
+
+  var renderCard = function renderCard() {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card-title")
+    }, cardTitle), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card-price")
+    }, price), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card-qrcode")
+    }, /*#__PURE__*/_react["default"].createElement("img", {
+      src: qrcode,
+      alt: ""
+    })), /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(preCls, "__card-promptMes")
+    }, qrcode ? promptMes : "订单获取失败，请返回重试"));
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls)
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "-layout")
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__title")
+  }, title), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(preCls, "__card")
+  }, isSuccessPay ? renderSuccessCard() : renderCard())));
+};
+
+var _default = payPage;
+exports["default"] = _default;

package/lib/pages/personal-info/request-api.js

@@ -21,7 +21,7 @@ exports.getUserInfoFun = getUserInfoFun;
 
 var saveUserInfo = function saveUserInfo(_ref) {
   var data = _ref.data;
-  return (0, _request.rput)("v1")("manage/user/update", data, {
+  return (0, _request.rput)("v1")("manage/user/updatebasic", data, {
     headers: {
       "Content-Type": "application/x-www-form-urlencoded"
     },

package/lib/utils/auth.js

@@ -92,8 +92,10 @@ var OAuth = /*#__PURE__*/function (_BaseAuth) {
   }, {
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
+      var _this$principalUser;
+
       // console.log('o isp', this.userId, this.principalUser.userId)
-      return this.userId == this.principalUser.userId;
+      return this.userId == ((_this$principalUser = this.principalUser) === null || _this$principalUser === void 0 ? void 0 : _this$principalUser.userId);
     } // 有操作OKR的權限
 
   }, {
@@ -139,8 +141,10 @@ var KRAuth = /*#__PURE__*/function (_BaseAuth2) {
   }, {
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
+      var _this$user;
+
       // console.log('kr isp', this.userId, this.user.userId)
-      return this.userId == this.user.userId;
+      return this.userId == ((_this$user = this.user) === null || _this$user === void 0 ? void 0 : _this$user.userId);
     } // 有操作KR的權限
 
   }, {
@@ -178,15 +182,19 @@ var EAuth = /*#__PURE__*/function (_BaseAuth3) {
   _createClass(EAuth, [{
     key: "isCreater",
     value: function isCreater() {
+      var _this$user2;
+
       // console.log('e iscreater', this.userId, this.user.userId)
-      return this.userId == this.user.userId;
+      return this.userId == ((_this$user2 = this.user) === null || _this$user2 === void 0 ? void 0 : _this$user2.userId);
     } // 負責人
 
   }, {
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
+      var _this$principalUser2;
+
       // console.log('e isp', this.userId, this.principalUser.userId)
-      return this.userId == this.principalUser.userId;
+      return this.userId == ((_this$principalUser2 = this.principalUser) === null || _this$principalUser2 === void 0 ? void 0 : _this$principalUser2.userId);
     } // 有操作KR的權限
 
   }, {
@@ -268,7 +276,9 @@ var ChildAuth = /*#__PURE__*/function (_BaseAuth5) {
   _createClass(ChildAuth, [{
     key: "isPrincipalUser",
     value: function isPrincipalUser() {
-      return this.userId == this.principalUser.userId;
+      var _this$principalUser3;
+
+      return this.userId == ((_this$principalUser3 = this.principalUser) === null || _this$principalUser3 === void 0 ? void 0 : _this$principalUser3.userId);
     } // 超管、助理、目标管理员以及目标负责人可以修改此目标下对齐子目标的权重；
 
   }, {

package/lib/utils/bs-global.js

@@ -95,15 +95,15 @@ exports.formatNum = formatNum;
 
 var hasWebHead = function hasWebHead(webHeadName) {
   var webHeadMap = {
-    task: 1,
-    okr: 113,
-    project: 112,
-    apply: 907,
-    kaohe: 403
+    task: '1',
+    okr: '113',
+    project: '112',
+    apply: '907',
+    kaohe: '403'
   };
-  var webHead = window.BSGlobal.newNavigation;
-  return webHead.findIndex(function (v) {
-    return v.appId === webHeadMap[webHeadName];
+  var webHead = window.BSGlobal.WebHead.AppHead;
+  return webHead.findIndex(function (a) {
+    return a.AppId === webHeadMap[webHeadName];
   }) !== -1;
 };
 

package/lib/utils/helpers.js

@@ -8,7 +8,7 @@ exports.escapeHtml = escapeHtml;
 exports.getLoginUserInfo = void 0;
 exports.getTenantInfo = getTenantInfo;
 exports.getUploadMaxSize = getUploadMaxSize;
-exports.isTencentHr = exports.isLocal = exports.isDingDing = void 0;
+exports.isTencentHr = exports.isLocal = exports.isFeishu = exports.isDingDing = void 0;
 
 var _bsGlobal = require("./bs-global");
 
@@ -43,6 +43,12 @@ var isDingDing = function isDingDing() {
 
 exports.isDingDing = isDingDing;
 
+var isFeishu = function isFeishu() {
+  return getTenantInfo().Source === 862;
+};
+
+exports.isFeishu = isFeishu;
+
 var isLocal = function isLocal() {
   return !!getTenantInfo().isLocal;
 };

package/lib/utils/open-data.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parseTag = exports.parseString = exports.isWxTrial = exports.isWechat = exports.isPlatform = exports.getSource = exports.getOpenId = exports["default"] = exports.OpenUserName = exports.OpenDepartmentName = void 0;
+exports.parseTag = exports.parseString = exports.parseHtmlAndTextTag = exports.isWxTrial = exports.isWechat = exports.isPlatform = exports.getSource = exports.getOpenId = exports["default"] = exports.OpenUserName = exports.OpenDepartmentName = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -178,7 +178,8 @@ var parseTag = function parseTag(str) {
     } else {
       openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
         style: {
-          color: "#1890ff"
+          color: "#1890ff",
+          margin: '0 4px'
         },
         onClick: function onClick(e) {
           return e.stopPropagation();
@@ -253,6 +254,85 @@ var parseString = function parseString(str) {
 };
 
 exports.parseString = parseString;
+
+var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
+  var reg = /<\w+[\w\W]*?(userId|departmentId)=["'](\S+?)["'][\w\W]*?>@([\w\W]*?)<\/\w+>/g;
+  var strReg = /<\w+[\w\s"'\/=\:\.]*?(?:userId|departmentId)=["']\S+?["'][\w\s"'\/=\:\.]*?>[\w\W]*?<\/\w+?>/;
+  var openDatas = [];
+  var matchStr = reg.exec(str);
+  var openDatareg = /\[(\w+?)\:(\w+?)\]/g;
+  var openDataStrReg = /\[\w+?\:\w+?\]/;
+  var openDataMatchStr = openDatareg.exec(str);
+
+  while (matchStr != null || openDataMatchStr != null) {
+    if (matchStr) {
+      var OpenDataCompoent = matchStr[1] == "userId" ? OpenUserName : OpenDepartmentName;
+
+      if (!OpenDataCompoent) {
+        openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
+          dangerouslySetInnerHTML: {
+            __html: matchStr[0]
+          },
+          onClick: function onClick(e) {
+            return e.stopPropagation();
+          }
+        }));
+      } else {
+        openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
+          style: {
+            color: "#1890ff",
+            margin: '0 4px'
+          },
+          onClick: function onClick(e) {
+            return e.stopPropagation();
+          }
+        }, "@", /*#__PURE__*/_react["default"].createElement(OpenDataCompoent, {
+          id: matchStr[2],
+          name: matchStr[3]
+        })));
+      }
+
+      matchStr = reg.exec(str);
+    } else if (openDataMatchStr) {
+      var _OpenDataCompoent = openDataMap[openDataMatchStr[2]];
+
+      if (!_OpenDataCompoent) {
+        openDatas.push(openDataMatchStr[0]);
+      } else {
+        openDatas.push( /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_OpenDataCompoent, {
+          id: openDataMatchStr[1]
+        })));
+      }
+
+      openDataMatchStr = reg.exec(str);
+    }
+  }
+
+  var commonStrs = str.split(strReg);
+  var tempStrs = [];
+  commonStrs && commonStrs.forEach(function (item) {
+    tempStrs.push(item.split(openDataStrReg).filter(function (item) {
+      return item !== '';
+    }));
+  });
+  var renderData = [];
+
+  for (var i = 0; i < tempStrs.length; i++) {
+    renderData.push( /*#__PURE__*/_react["default"].createElement("span", {
+      style: {
+        verticalAlign: 'middle'
+      },
+      dangerouslySetInnerHTML: {
+        __html: tempStrs[i]
+      }
+    }));
+    renderData.push(openDatas[i]);
+  }
+
+  return renderData;
+};
+
+exports.parseHtmlAndTextTag = parseHtmlAndTextTag;
 var _default = {
   OpenUserName: OpenUserName,
   OpenDepartmentName: OpenDepartmentName,

package/lib/utils/tools.js

@@ -10,7 +10,7 @@ exports.htmlDecodeByHtmlRegExp = htmlDecodeByHtmlRegExp;
 exports.htmlDecodeByRegExp = htmlDecodeByRegExp;
 exports.htmlEncodeByRegExp = htmlEncodeByRegExp;
 exports.htmlEncodeToHtmlByRegExp = htmlEncodeToHtmlByRegExp;
-exports.unHighLight = exports.openPage = void 0;
+exports.unHighLight = exports.openPage = exports.htmlToText = void 0;
 
 var _platform = require("./platform");
 
@@ -274,4 +274,13 @@ function htmlDecodeByHtmlRegExp(str) {
   temp = temp.replace(/"/g, "\"");
   temp = temp.replace(/<br\/>/g, "\n");
   return temp;
-}
+}
+
+var htmlToText = function htmlToText(text) {
+  var div = document.createElement("div");
+  div.innerHTML = text;
+  var newtext = div.innerText || div.textContent;
+  return newtext;
+};
+
+exports.htmlToText = htmlToText;