@titaui/pc 1.11.20 → 1.11.21-beta.13

package/lib/components/okr-detail/index.js

@@ -27,6 +27,8 @@ var _schedule = _interopRequireDefault(require("./schedule"));
 
 var _requestApis = require("./request-apis");
 
+var _helper = require("./helper");
+
 var _okrReview = _interopRequireDefault(require("../okr-review"));
 
 var _reportList = _interopRequireDefault(require("../eReport/eReportLists/reportList"));
@@ -173,7 +175,14 @@ function OkrDetail(props) {
   var _useState23 = (0, _react.useState)(),
       _useState24 = _slicedToArray(_useState23, 2),
       generalRoleType = _useState24[0],
-      setGeneralRoleType = _useState24[1]; // 计算元素的ref，用于实现 tabs 吸顶，点赞吸底
+      setGeneralRoleType = _useState24[1];
+
+  var _useState25 = (0, _react.useState)({
+    isOpen: false
+  }),
+      _useState26 = _slicedToArray(_useState25, 2),
+      approvalSetting = _useState26[0],
+      setApprovalSetting = _useState26[1]; // 计算元素的ref，用于实现 tabs 吸顶，点赞吸底
 
 
   var tabRef = (0, _react.useRef)();
@@ -203,9 +212,18 @@ function OkrDetail(props) {
     getData();
   };
 
+  var getApprovalShow = function getApprovalShow() {
+    (0, _requestApis.getOkrApprovalSettingInfo)().then(function (resp) {
+      if (resp.Code === 1) {
+        setApprovalSetting((0, _helper.getApprovalOpenItem)(resp.Data));
+      }
+    });
+  };
+
   (0, _react.useEffect)(function () {
     setLoading(true);
     getData();
+    getApprovalShow();
   }, []);
   (0, _react.useEffect)(function () {
     if (!okrInfo || !okrInfo.workId) return;
@@ -276,7 +294,8 @@ function OkrDetail(props) {
       changeTabActive: changeTabActive,
       refreshAll: refreshAll,
       setOkrInfo: setOkrInfo,
-      refreshKrs: refreshKrs
+      refreshKrs: refreshKrs,
+      approvalSetting: approvalSetting
     })
   }, /*#__PURE__*/_react["default"].createElement(_context.GeneralDataContext.Provider, {
     value: {

package/lib/components/okr-detail/okr-list/index.js

@@ -43,6 +43,8 @@ var _auth = require("../../../utils/auth");
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _helper = require("../helper");
+
 require("./index.css");
 
 var _excluded = ["mileStoneId"];
@@ -151,7 +153,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       setShowOkrEvalute = _useContext.setShowOkrEvalute;
 
   var _useContext2 = (0, _react.useContext)(_context2.CommonContext),
-      refreshAll = _useContext2.refreshAll;
+      refreshAll = _useContext2.refreshAll,
+      approvalSetting = _useContext2.approvalSetting;
 
   var parentId = generalParent.parentId,
       parentOkr = generalParent.parentOkr,
@@ -440,9 +443,11 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       padding: "0 32px 0 18px"
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
       data: krs,
-      draggable: canEditOkr,
+      approvalSetting: approvalSetting,
+      okrInfo: okrInfo,
+      draggable: canEditOkr && (okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) === _helper.EApproveStatus.UnderApproval,
       onDrop: onOkrItemDropHandler
-    }))), (canEditOkr || isInnerUser) && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalIsShow)(approvalSetting, "createOkr", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes) && /*#__PURE__*/_react["default"].createElement("div", {
       ref: wrapperRef,
       className: (0, _classnames["default"])("".concat(preCls, "__addkr"))
     }, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, createKrShow ? /*#__PURE__*/_react["default"].createElement(_createKrItem["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.updateOScore = 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.updateOScore = 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.getOkrApprovalSettingInfo = 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"));
 
@@ -110,6 +110,12 @@ var getOkrDetail = function getOkrDetail(_ref5) {
 
 exports.getOkrDetail = getOkrDetail;
 
+var getOkrApprovalSettingInfo = function getOkrApprovalSettingInfo() {
+  return (0, _request.rget)("v1")("WorkManageSetting/GetOkrApproval");
+};
+
+exports.getOkrApprovalSettingInfo = getOkrApprovalSettingInfo;
+
 var updateClassify = function updateClassify(_ref6) {
   var okrId = _ref6.okrId,
       okrClassify = _ref6.okrClassify;
@@ -407,7 +413,7 @@ var deleteUser = function deleteUser(delUserId, okrId, relation) {
 exports.deleteUser = deleteUser;
 
 var workDelete = function workDelete(data) {
-  return (0, _request.rdelete)("v2")("work/deleteV2?workId=".concat(data.workId), {
+  return (0, _request.rdelete)("v1")("okr/deleteV2?workId=".concat(data.workId), {
     data: data
   });
 };

package/lib/components/okr-flow/export-modal/index.js

@@ -33,7 +33,7 @@ var _precls = _interopRequireDefault(require("../precls"));
 
 var _getLocale = require("../../../utils/getLocale");
 
-var _lodash = _interopRequireDefault(require("lodash"));
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 
 require("rc-color-picker/assets/index.css");
 
@@ -250,7 +250,7 @@ var ExportMapModal = function ExportMapModal(props) {
   var NodeDebug = function NodeDebug() {
     var elements = (0, _reactFlowRenderer.useStoreState)(function (state) {
       return [].concat(_toConsumableArray(state.nodes), _toConsumableArray(state.edges));
-    }, _lodash["default"].isEqual);
+    }, _isEqual["default"]);
     var setElements = (0, _reactFlowRenderer.useStoreActions)(function (actions) {
       return actions.setElements;
     });

package/lib/components/okr-flow/okr-map/index.js

@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactFlowRenderer = _interopRequireWildcard(require("@titaui/react-flow-renderer"));
 
-var _lodash = _interopRequireDefault(require("lodash"));
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -117,7 +117,7 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var NodeDebug = function NodeDebug() {
     var elements = (0, _reactFlowRenderer.useStoreState)(function (state) {
       return [].concat(_toConsumableArray(state.nodes), _toConsumableArray(state.edges));
-    }, _lodash["default"].isEqual);
+    }, _isEqual["default"]);
     var setElements = (0, _reactFlowRenderer.useStoreActions)(function (actions) {
       return actions.setElements;
     });

package/lib/components/okr-period-selector/select-cycle.js

@@ -49,7 +49,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _formatCycleData(periodParams, getCycleRange) {
-  if (!periodParams) return "";
+  if (!periodParams) return '';
   var startDate = periodParams.startDate;
   var endDate = periodParams.endDate;
 
@@ -58,7 +58,7 @@ function _formatCycleData(periodParams, getCycleRange) {
     endDate = periodParams.endDate.slice(5);
   }
 
-  return "".concat(_periodSelector["default"].formatPeriod(periodParams)).concat(getCycleRange ? ",".concat(startDate, "~").concat(endDate) : "");
+  return "".concat(_periodSelector["default"].formatPeriod(periodParams)).concat(getCycleRange ? ",".concat(startDate, "~").concat(endDate) : '');
 }
 
 function CreateCycle(_ref) {
@@ -94,21 +94,21 @@ function CreateCycle(_ref) {
       setCycleSetting = _useState4[1];
 
   (0, _react.useEffect)(function () {
-    var settings = localStorage.getItem("OKR_CYCLE_SETTING");
+    var settings = localStorage.getItem('OKR_CYCLE_SETTING');
 
     if (settings) {
       setCycleSetting(JSON.parse(settings));
       return;
     }
 
-    var url = (0, _helper.getApiUrl)("okr/cycleSetting");
-    (0, _helper.taker)(url, "GET").then(function (res) {
+    var url = (0, _helper.getApiUrl)('okr/cycleSetting');
+    (0, _helper.taker)(url, 'GET').then(function (res) {
       if (res.Code == 1) {
         setCycleSetting(res.Data);
       }
     });
   }, []);
-  var cycleWrapperRef = (0, _react.useRef)(document.createElement("div"));
+  var cycleWrapperRef = (0, _react.useRef)(document.createElement('div'));
 
   var onPeriodSelectorChangeHandler = function onPeriodSelectorChangeHandler(c) {
     setSelfCycle(_objectSpread(_objectSpread({}, selfCycle), c));
@@ -148,13 +148,13 @@ function CreateCycle(_ref) {
         },
         ref: cycleWrapperRef,
         style: {
-          backgroundColor: "white",
-          boxShadow: "0px 4px 12px 0px rgb(127 145 180 / 20%)",
+          backgroundColor: 'white',
+          boxShadow: '0px 4px 12px 0px rgb(127 145 180 / 20%)',
           borderRadius: 4
         }
       }, /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
         style: {
-          width: "100%"
+          width: '100%'
         },
         selected: selfCycle,
         showFullCycle: false,
@@ -176,9 +176,9 @@ function CreateCycle(_ref) {
       }))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "okr-detail-date-cycle__date-line",
         style: {
-          borderBottom: "1px solid #F0F2F5"
+          borderBottom: '1px solid #F0F2F5'
         }
-      }, (0, _getLocale.getLocale)("Mod_StartDate"), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
+      }, (0, _getLocale.getLocale)('Mod_StartDate'), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
         format: "YYYY/MM/DD",
         controlled: true,
         onConfirm: onStartDateConfirmHandler,
@@ -193,7 +193,7 @@ function CreateCycle(_ref) {
         className: "tu-icon-arrow-down okr-detail-date-cycle__select-time-down-icon"
       })))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "okr-detail-date-cycle__date-line"
-      }, (0, _getLocale.getLocale)("Mod_EndDate"), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
+      }, (0, _getLocale.getLocale)('Mod_EndDate'), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
         format: "YYYY/MM/DD",
         controlled: true,
         onConfirm: onEndDateCOnfirmHandler,
@@ -208,8 +208,8 @@ function CreateCycle(_ref) {
         className: "tu-icon-arrow-down okr-detail-date-cycle__select-time-down-icon"
       })))), /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          display: "flex",
-          justifyContent: "flex-end"
+          display: 'flex',
+          justifyContent: 'flex-end'
         }
       }, /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
         size: "s",
@@ -217,15 +217,15 @@ function CreateCycle(_ref) {
           marginRight: 12
         },
         onClick: onCancelClickHandler
-      }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
+      }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
         size: "s",
         type: "primary",
         onClick: onSureClickHandler
-      }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Determine"))));
+      }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Determine'))));
     } else {
-      return /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
+      return canEdit ? /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
         style: {
-          width: "100%"
+          width: '100%'
         },
         selected: cycle,
         showFullCycle: false,
@@ -245,7 +245,11 @@ function CreateCycle(_ref) {
         btnRef: btnRef,
         clickCallback: function clickCallback() {},
         text: _formatCycleData(cycle, getCycleRange)
-      }));
+      })) : renderInnerContent({
+        btnRef: btnRef,
+        clickCallback: function clickCallback() {},
+        text: _formatCycleData(cycle, getCycleRange)
+      });
     }
   }
 

package/lib/components/scroll-container/index.js

@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _lodash = require("lodash");
+var _lodash = _interopRequireDefault(require("lodash.debounce"));
 
 var _easyBem = _interopRequireDefault(require("easy-bem"));
 
@@ -179,7 +179,7 @@ var ScrollContainer = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this.container = /*#__PURE__*/_react["default"].createRef();
-    _this.onEndScroll = (0, _lodash.debounce)(_this.onEndScroll, SCROLL_END_DEBOUNCE); // Is container scrolling now (for example by inertia)
+    _this.onEndScroll = (0, _lodash["default"])(_this.onEndScroll, SCROLL_END_DEBOUNCE); // Is container scrolling now (for example by inertia)
 
     _this.scrolling = false; // Is scrolling started
 

package/lib/components/superset-charts/components/chart/index.js

@@ -19,7 +19,7 @@ var Chart = function Chart(props) {
   //   });
   // }, []);
   var Chart = (_window = window) === null || _window === void 0 ? void 0 : (_window$SupersetChart = _window.SupersetChart) === null || _window$SupersetChart === void 0 ? void 0 : _window$SupersetChart.SupersetChart;
-  return Chart && /*#__PURE__*/_react["default"].createElement(Chart, props);
+  return Chart ? /*#__PURE__*/_react["default"].createElement(Chart, props) : /*#__PURE__*/_react["default"].createElement("div", null);
 };
 
 var _default = Chart;

package/lib/components/task-relation-modal/request-api.js

@@ -15,7 +15,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var okrSearch = function okrSearch(params) {
   return (0, _request.rpost)("v1")("okr/search", _objectSpread(_objectSpread({}, params), {}, {
-    orderType: 1
+    orderType: 1,
+    includeCreateFailApprovalOkr: false
   })).then(function (res) {
     return res.Data;
   });

package/lib/components/textarea/index.css

@@ -0,0 +1,120 @@
+.titaui-textArea {
+  box-sizing: border-box;
+  position: relative;
+  min-height: 36px;
+  background: #ffffff;
+  cursor: text;
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  padding: 7px 0;
+  transition: border 0.2s ease 0.2s, box-shadow 0.2s ease 0.2s;
+}
+
+.titaui-textArea.has-error {
+  border: 1px solid #f05e5e !important;
+}
+
+.titaui-textArea:hover {
+  border: 1px solid #2879ff;
+}
+
+.titaui-textArea > input {
+  flex-grow: 1;
+  border: none;
+  padding: 0 12px;
+  margin: 0;
+  outline: none;
+  width: 0;
+  box-sizing: border-box;
+  background-color: transparent;
+  color: #3f4755;
+}
+
+.titaui-textArea > input ::-webkit-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea > input :-ms-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea > input :-moz-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea textarea {
+  flex: 1;
+  line-height: 20px;
+  min-height: 20px;
+  border: none;
+  padding: 0;
+  margin: 0;
+  outline: none;
+  resize: none;
+  padding: 0 12px;
+  width: 100%;
+  box-sizing: border-box;
+  background-color: transparent;
+  color: #3f4755;
+  word-break: break-all;
+}
+
+.titaui-textArea textarea ::-webkit-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea textarea :-ms-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea textarea :-moz-input-placeholder {
+  color: #bfc7d5;
+}
+
+.titaui-textArea.disabled {
+  background-color: rgba(240, 242, 245, 0.4);
+  border-color: #f0f2f5;
+  color: #bfc7d5;
+  cursor: default;
+}
+
+.titaui-textArea.disabled > input,
+    .titaui-textArea.disabled textarea,
+    .titaui-textArea.disabled .tail-wrapper {
+  color: #bfc7d5;
+}
+
+.titaui-textArea.disabled:hover {
+  border-color: #f0f2f5;
+}
+
+.area-error {
+  border: 1px solid #f05e5e !important;
+  box-shadow: 0px 0px 6px 0px rgba(240, 94, 94, 0.3);
+}
+
+.area-focus {
+  border: 1px solid #2879ff !important;
+  box-shadow: 0px 0px 6px 0px rgba(40, 121, 255, 0.3);
+}
+
+.area-normal {
+  border: 1px solid #e9ecf0 !important;
+  box-shadow: none;
+}
+
+.inner {
+  overflow: auto;
+  display: flex;
+  flex: 1;
+  width: 0;
+}
+
+.err-color {
+  font-size: 12px;
+  font-weight: 400;
+  color: #f05e5e;
+  line-height: 18px;
+  padding-left: 12px;
+}