@titaui/pc 1.7.52 → 1.7.56

package/lib/components/dialog-confirm/index.css

@@ -2,7 +2,7 @@
   display: inline-block;
   width: 360px;
   background: #ffffff;
-  border-radius: 24px;
+  border-radius: 6px;
 }
 
 .titaui-dialog-confirm__btn {
@@ -10,7 +10,7 @@
   width: 90px;
   height: 32px;
   line-height: 32px;
-  border-radius: 18px;
+  border-radius: 4px;
   text-align: center;
 }
 
@@ -69,7 +69,6 @@
 
 .titaui-dialog-confirm .rc-dialog-content {
   box-shadow: none;
-  border-radius: 24px;
 }
 
 .titaui-dialog-confirm .rc-dialog-body {
@@ -93,12 +92,11 @@
 
 .titaui-dialog-confirm__body {
   position: relative;
-  display: flex;
 }
 
 .titaui-dialog-confirm__body-icon {
   display: inline-block;
-  font-size: 14px;
+  font-size: 16px;
 }
 
 .titaui-dialog-confirm__body-title {

package/lib/components/error-boundary/index.js

@@ -58,13 +58,17 @@ var ErrorBoundary = /*#__PURE__*/function (_React$Component) {
   _createClass(ErrorBoundary, [{
     key: "componentDidCatch",
     value: function componentDidCatch(error, errorInfo) {
-      var scope = new Sentry.Scope();
-      scope.setTag("error-level", "P".concat(this.props.errorLevel || 0));
-      scope.setTag("error-type", "\u767D\u9875");
-      scope.setExtra("componentStack", errorInfo.componentStack);
-      var eventId = Sentry.captureException(new Error(error), scope);
-      this.setState({
-        eventId: eventId
+      var _this2 = this;
+
+      Sentry.withScope(function (scope) {
+        scope.setTag("error-level", "P".concat(_this2.props.errorLevel || 0));
+        scope.setTag("error-type", "\u767D\u9875");
+        scope.setExtra("componentStack", errorInfo.componentStack);
+        var eventId = Sentry.captureException(new Error(error), scope);
+
+        _this2.setState({
+          eventId: eventId
+        });
       });
     }
   }, {

package/lib/components/nav-top/components/user-message/components/todos/todo-item.js

@@ -15,6 +15,8 @@ var _tooltipText = _interopRequireDefault(require("../../../../../tooltip/toolti
 
 var _utils = require("../../utils");
 
+var _tools = require("../../../../../../utils/tools");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -31,6 +33,8 @@ var TodoItem = function TodoItem(props) {
 
     if (item.objType === 7) {
       window.Talent.app.vent.trigger('global-pull-screen', item.objId, 'task');
+    } else {
+      (0, _tools.openPage)(item.objUrl);
     }
   };
 
@@ -51,8 +55,6 @@ var TodoItem = function TodoItem(props) {
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__item-right"))
   }, /*#__PURE__*/_react["default"].createElement("a", {
-    href: item.objUrl,
-    target: "_blank",
     onClick: function onClick() {
       return handleTodosClick(item);
     }

package/lib/components/okr-detail/components/okr-tree/tree-node/o-child-node/index.css

@@ -11,11 +11,6 @@
   float: right;
 }
 
-.tita-okrdt-tree__o-child-node-weight {
-  margin-right: 16px;
-  width: 60px;
-}
-
 .tita-okrdt-tree__o-child-node-h1 .okr-drawer-header__classify {
   vertical-align: sub;
 }
@@ -70,80 +65,3 @@
   color: #3f4755;
   line-height: 22px;
 }
-
-.child-okrs-weight__content {
-  padding: 10px 32px 8px;
-  min-height: 90px;
-  box-sizing: border-box;
-}
-
-.child-okrs-weight__item {
-  margin-bottom: 18px;
-  display: flex;
-}
-
-.child-okrs-weight__item:last-child {
-  margin-bottom: 0;
-}
-
-.child-okrs-weight__item-precls {
-  height: 24px;
-  width: 24px;
-  padding: 6px;
-  box-sizing: border-box;
-  background: rgba(40, 121, 255, 0.1);
-  border-radius: 12px;
-  display: inline-flex;
-  justify-content: center;
-  align-items: center;
-  margin-right: 8px;
-  cursor: pointer;
-  position: relative;
-}
-
-.child-okrs-weight__item-precls:before {
-  content: "";
-  width: 10px;
-  height: 8px;
-  border-radius: 50%;
-  border: 2px solid #2879ff;
-}
-
-.child-okrs-weight__item-name {
-  width: 360px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  color: #3f4755;
-  margin-right: 26px;
-}
-
-.child-okrs-weight__item-weight {
-  display: flex;
-  flex: 1;
-}
-
-.child-okrs-weight__item-weight-label {
-  color: #89919f;
-  margin-right: 10px;
-}
-
-.child-okrs-weight__item-weight-content {
-  display: flex;
-  flex: 1;
-  border-bottom: 1px solid #e9ecf0;
-}
-
-.child-okrs-weight__item-weight-content--error {
-  border-color: #f05e5e;
-}
-
-.child-okrs-weight__item-weight-input {
-  flex: 1;
-  width: 50px;
-  border: none;
-}
-
-.child-okrs-weight__item-weight-suffix {
-  color: #89919f;
-}

package/lib/components/okr-detail/components/okr-tree/tree-node/o-child-node/index.js

@@ -11,30 +11,22 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _bsGlobal = require("../../../../../../utils/bs-global");
+var _okrType = _interopRequireDefault(require("../../../okr-type"));
 
-var _auth = require("../../../../../../utils/auth");
+var _iconText = _interopRequireDefault(require("../../../icon-text"));
 
-var _context = require("../../../../context");
+var _avatar = _interopRequireDefault(require("../../../../../avatar"));
+
+var _progress = _interopRequireDefault(require("../../../../../progress"));
 
 var _utils = require("../../../../../progress/utils");
 
 var _drawerManager = _interopRequireDefault(require("../../../../../drawer-manager"));
 
-var _progress = _interopRequireDefault(require("../../../../../progress"));
-
 var _oClassify = _interopRequireDefault(require("../../../o-classify"));
 
-var _avatar = _interopRequireDefault(require("../../../../../avatar"));
-
-var _iconText = _interopRequireDefault(require("../../../icon-text"));
-
-var _okrType = _interopRequireDefault(require("../../../okr-type"));
-
 var _precls = _interopRequireDefault(require("../../precls"));
 
-var _editChildOkrWeight = _interopRequireDefault(require("./edit-child-okr-weight"));
-
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -58,37 +50,24 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var SeasonTectMap = {
-  1: "一",
-  2: "二",
-  3: "三",
-  4: "四"
+  1: '一',
+  2: '二',
+  3: '三',
+  4: '四'
 };
 
 var _default = function _default(props) {
-  var _getBSGlobal, _getBSGlobal$KRSettin, _React$createElement;
+  var _React$createElement;
 
   var data = props.data,
       style = props.style,
       title = props.title;
 
-  var _useState = (0, _react.useState)(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      editVisible = _useState2[0],
-      setEditVisible = _useState2[1];
-
-  var _useContext = (0, _react.useContext)(_context.CommonContext),
-      refreshAll = _useContext.refreshAll,
-      okrInfo = _useContext.okrInfo;
-
-  var _useState3 = (0, _react.useState)(data.principalUser),
-      _useState4 = _slicedToArray(_useState3, 1),
-      user = _useState4[0];
+  var _useState = (0, _react.useState)(data.principalUser),
+      _useState2 = _slicedToArray(_useState, 1),
+      user = _useState2[0];
 
-  var _useState5 = (0, _react.useState)(((_getBSGlobal = (0, _bsGlobal.getBSGlobal)("OkrAdvancedSetting")) === null || _getBSGlobal === void 0 ? void 0 : (_getBSGlobal$KRSettin = _getBSGlobal.KRSetting) === null || _getBSGlobal$KRSettin === void 0 ? void 0 : _getBSGlobal$KRSettin.OKrWeight) || true),
-      _useState6 = _slicedToArray(_useState5, 1),
-      OKrWeightSetting = _useState6[0];
-
-  var _useState7 = (0, _react.useState)(function () {
+  var _useState3 = (0, _react.useState)(function () {
     // 时间周期
     var cycleType = data.cycleType,
         yqmnum = data.yqmnum,
@@ -110,28 +89,8 @@ var _default = function _default(props) {
         return "\u81EA\u5B9A\u4E49 ".concat(startDate, "-").concat(endDate);
     }
   }),
-      _useState8 = _slicedToArray(_useState7, 1),
-      cycleDateStr = _useState8[0]; // 权限 & 非结束目标
-
-
-  var _useState9 = (0, _react.useState)(function () {
-    var hasAuth = new _auth.ChildAuth({
-      principalUser: okrInfo.principalUser
-    }).hasAuth();
-    var livetime = okrInfo.status != 2;
-    return hasAuth && livetime;
-  }),
-      _useState10 = _slicedToArray(_useState9, 1),
-      canEdit = _useState10[0];
-
-  var openWeightEditModal = function openWeightEditModal() {
-    return setEditVisible(true);
-  };
-
-  var handleOk = function handleOk() {
-    setEditVisible(false);
-    refreshAll();
-  };
+      _useState4 = _slicedToArray(_useState3, 1),
+      cycleDateStr = _useState4[0];
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__o-child-node")),
@@ -143,7 +102,7 @@ var _default = function _default(props) {
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__o-child-node-title")),
     onClick: function onClick() {
-      _drawerManager["default"].open("okrDetail", {
+      _drawerManager["default"].open('okrDetail', {
         okrId: data.workId
       });
     }
@@ -156,11 +115,11 @@ var _default = function _default(props) {
   }, /*#__PURE__*/_react["default"].createElement(_okrType["default"], {
     editable: false,
     type: {
-      okrType: data.okrType,
-      departmentId: data.departmentId,
-      departmentName: data.departmentName,
-      groupId: data.groupId,
-      groupName: data.groupName
+      'okrType': data.okrType,
+      'departmentId': data.departmentId,
+      'departmentName': data.departmentName,
+      'groupId': data.groupId,
+      'groupName': data.groupName
     }
   }), /*#__PURE__*/_react["default"].createElement(_avatar["default"].Text, {
     name: user.name,
@@ -174,28 +133,13 @@ var _default = function _default(props) {
     icon: "tu-icon-deferred"
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__o-child-node-right"))
-  }, OKrWeightSetting && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(_precls["default"], "__o-child-node-weight")
-  }, /*#__PURE__*/_react["default"].createElement(_iconText["default"], {
-    width: 60,
-    editable: canEdit,
-    content: "".concat(data.pweight, "%"),
-    onTextClick: openWeightEditModal,
-    icon: "tu-icon-app-quanzhong"
-  })), /*#__PURE__*/_react["default"].createElement("div", {
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__o-child-node-progress"))
   }, /*#__PURE__*/_react["default"].createElement(_progress["default"], (_React$createElement = {
     percent: data.progress,
     width: 40,
     backgroundColor: "#F7F8FA"
-  }, _defineProperty(_React$createElement, "width", 40), _defineProperty(_React$createElement, "textColor", data.status === 2 ? "#89919f" : _utils.OkrRiskMapping[data.manualRiskLevel].textColor), _defineProperty(_React$createElement, "color", data.status === 2 ? "linear-gradient(270deg, #BFC7D5, #E1E5EC)" : _utils.OkrRiskMapping[data.manualRiskLevel].line), _React$createElement))))), /*#__PURE__*/_react["default"].createElement(_editChildOkrWeight["default"], {
-    okrId: okrInfo.workId,
-    visible: editVisible,
-    onCancel: function onCancel() {
-      return setEditVisible(false);
-    },
-    onOk: handleOk
-  }));
+  }, _defineProperty(_React$createElement, "width", 40), _defineProperty(_React$createElement, "textColor", data.status === 2 ? "#89919f" : _utils.OkrRiskMapping[data.manualRiskLevel].textColor), _defineProperty(_React$createElement, "color", data.status === 2 ? "linear-gradient(270deg, #BFC7D5, #E1E5EC)" : _utils.OkrRiskMapping[data.manualRiskLevel].line), _React$createElement))))));
 };
 
 exports["default"] = _default;

package/lib/components/okr-detail/request-apis.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.workDelete = exports.updateVisibility = exports.updateTaskStatus = exports.updateTaskPrincipal = exports.updateTaskDate = exports.updateProgressDesc = exports.updateProgress = exports.updateParentId = exports.updateOkrVisibility = exports.updateOkrPrincipal = exports.updateOkrName = exports.updateOCommitType = exports.updateOClassify = exports.updateKrProgressAndStatus = exports.updateKrPrincipal = exports.updateKrName = exports.updateKrDate = exports.updateConfidenceIndex = exports.updateClassify = exports.updateChildOkrWeight = exports.transferPrincipal = exports.start = exports.setTaskPriority = exports.saveODesc = exports.remindAction = exports.krChangeOrder = exports.getRelWorks = exports.getRelProgress = exports.getProgress = exports.getPraiseComments = exports.getOrg = exports.getOkrUsers = exports.getOkrDetail = exports.getKrsByCondition = exports.getKrs = exports.getFeedById = exports.deleteUser = exports.deleteProgressDesc = exports.deleteKr = exports.createNewKr = exports.close = exports.cancelRel = exports.cancelPraise = exports.cancelParentOkr = exports.addUserRelation = exports.addUser = exports.addPraise = exports.addComment = void 0;
+exports.workDelete = exports.updateVisibility = exports.updateTaskStatus = exports.updateTaskPrincipal = exports.updateTaskDate = exports.updateProgressDesc = exports.updateProgress = exports.updateParentId = exports.updateOkrVisibility = exports.updateOkrPrincipal = exports.updateOkrName = exports.updateOCommitType = exports.updateOClassify = exports.updateKrProgressAndStatus = exports.updateKrPrincipal = exports.updateKrName = exports.updateKrDate = exports.updateConfidenceIndex = exports.updateClassify = exports.transferPrincipal = exports.start = exports.setTaskPriority = exports.saveODesc = exports.remindAction = exports.krChangeOrder = exports.getRelWorks = exports.getRelProgress = exports.getProgress = exports.getPraiseComments = exports.getOrg = exports.getOkrUsers = exports.getOkrDetail = exports.getKrsByCondition = exports.getKrs = exports.getFeedById = exports.deleteUser = exports.deleteProgressDesc = exports.deleteKr = exports.createNewKr = exports.close = exports.cancelRel = exports.cancelPraise = exports.cancelParentOkr = exports.addUserRelation = exports.addUser = exports.addPraise = exports.addComment = void 0;
 
 var _qs = _interopRequireDefault(require("qs"));
 
@@ -11,18 +11,6 @@ var _request = require("../../utils/request");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 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); }); }; }
@@ -529,15 +517,4 @@ var getRelWorks = function getRelWorks(okrId) {
   return (0, _request.rget)("v1")("okr/detail/relWorks?okrId=".concat(okrId));
 };
 
-exports.getRelWorks = getRelWorks;
-
-var updateChildOkrWeight = function updateChildOkrWeight(data) {
-  return (0, _request.rpost)('v1')('okr/weight/save', {
-    OkrWeights: _toConsumableArray(data)
-  }, {
-    // "headers": { "Content-Type": "application/x-www-form-urlencoded" },
-    "transformRequest": _qs["default"].stringify
-  });
-};
-
-exports.updateChildOkrWeight = updateChildOkrWeight;
+exports.getRelWorks = getRelWorks;

package/lib/pages/personal-info/components/base-info/index.js

@@ -183,7 +183,7 @@ var BaseInfo = function BaseInfo() {
     placeholder: "请输入联系邮箱",
     verifies: [{
       "tip": "邮箱格式错误",
-      "test": /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
+      "test": /^([a-zA-Z0-9_-]|\.)+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
     }],
     onChange: handleEmailChange
   }))));

package/lib/utils/auth.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.hasSuperior = exports.OAuth = exports.KRAuth = exports.EAuth = exports.DynamicManagerAuth = exports.ChildAuth = exports.BaseAuth = void 0;
+exports.hasSuperior = exports.OAuth = exports.KRAuth = exports.EAuth = exports.DynamicManagerAuth = exports.BaseAuth = void 0;
 
 var _bsGlobal = require("./bs-global");
 
@@ -246,39 +246,4 @@ var DynamicManagerAuth = /*#__PURE__*/function (_BaseAuth4) {
   return DynamicManagerAuth;
 }(BaseAuth);
 
-exports.DynamicManagerAuth = DynamicManagerAuth;
-
-var ChildAuth = /*#__PURE__*/function (_BaseAuth5) {
-  _inherits(ChildAuth, _BaseAuth5);
-
-  var _super5 = _createSuper(ChildAuth);
-
-  function ChildAuth(props) {
-    var _this5;
-
-    _classCallCheck(this, ChildAuth);
-
-    _this5 = _super5.call(this, props);
-    var principalUser = props.principalUser;
-    _this5.userId = _this5.loginUserInfor.Id;
-    _this5.principalUser = principalUser;
-    return _this5;
-  }
-
-  _createClass(ChildAuth, [{
-    key: "isPrincipalUser",
-    value: function isPrincipalUser() {
-      return this.userId == this.principalUser.userId;
-    } // 超管、助理、目标管理员以及目标负责人可以修改此目标下对齐子目标的权重；
-
-  }, {
-    key: "hasAuth",
-    value: function hasAuth() {
-      return this.isManager() || this.isPrincipalUser();
-    }
-  }]);
-
-  return ChildAuth;
-}(BaseAuth);
-
-exports.ChildAuth = ChildAuth;
+exports.DynamicManagerAuth = DynamicManagerAuth;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@titaui/pc",
-  "version": "1.7.52",
+  "version": "1.7.56",
   "nameCN": "",
   "description": "",
-  "main": "src/index.js",
+  "main": "lib/index.js",
   "scripts": {
     "storybook": "start-storybook -p 6006 --no-dll",
     "start": "dev_server=on webpack-dev-server --disableHostCheck=true --progress --colors  --config webpack-stories.config.js",