@titaui/pc 1.11.21-beta.3 → 1.11.21-beta.30

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-period-selector/index.js

@@ -17,6 +17,8 @@ var _selectCycle = _interopRequireDefault(require("./select-cycle"));
 
 var _requestApis = require("./request-apis");
 
+var _getLocale = require("../../utils/getLocale");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -68,12 +70,14 @@ function _default(props) {
   }, []);
 
   var handleChangeCyecle = function handleChangeCyecle(data) {
-    (0, _requestApis.updateOCyecle)(okrId, data).then(function () {
-      _toast["default"].Success("修改成功", {
-        canClose: false
-      });
+    (0, _requestApis.updateOCyecle)(okrId, data).then(function (resp) {
+      if (resp.Code === 1) {
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
-      setCycle(data);
+        setCycle(data);
+      } else {
+        _toast["default"].Error(resp.Message);
+      }
     });
   };
 

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/okrcase-library/okrcases-components/submitOkr-dialog.js

@@ -304,8 +304,13 @@ function PayDialog(props) {
       e.preventDefault();
       var path = window.location.href.split("#")[0];
       path = path.replace(/eLearningHome/, "Home");
-      var encode = encodeURIComponent("orderId=".concat(orderId, "&payCode=").concat(payCode, "&payName=").concat(payName));
-      window.open("".concat(path, "#/pay?").concat(encode), "_blank"); // postWxPayOrder({
+      var encode = encodeURIComponent("orderId=".concat(orderId, "&payCode=").concat(payCode, "&payName=").concat(payName)); // if(isDingDing()){
+      // window.open(`${path}#/pay?${encode}`, "_self");
+      // window.location.reload();
+      // }else{
+
+      window.open("".concat(path, "#/pay?").concat(encode), "_blank"); // }
+      // postWxPayOrder({
       //   order_id: orderId,
       //   default_bank: payCode,
       //   default_bank_name: payName,

package/lib/components/operation-records/index.js

@@ -80,7 +80,7 @@ var OperationRecord = /*#__PURE__*/function (_PureComponent) {
 
           _this.setState({
             operationTrackList: newOperationTrackList,
-            operationTrackTotal: _mockData.OperationData.length
+            operationTrackTotal: (_mockData.OperationData === null || _mockData.OperationData === void 0 ? void 0 : _mockData.OperationData.length) || 0
           });
         }
       });

package/lib/components/publish-dynamic-modal/publish-dynamic-modal.js

@@ -41,12 +41,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure undefined"); }
-
 var prefix = "publish-dynamic-modal";
-
-var PublishDynamicModal = function PublishDynamicModal(_ref) {
-  _objectDestructuringEmpty(_ref);
+var PublishDynamicModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var onSubmitSuccess = _ref.onSubmitSuccess;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -82,10 +79,10 @@ var PublishDynamicModal = function PublishDynamicModal(_ref) {
             localStorage.removeItem("mblogLocalStroage_".concat((0, _bsGlobal.getUserInfo)().Id, "_commentsTypeKey_").concat(isShare ? "share" : "announcement"));
             setVisible(false);
             setSubmitStatus(1);
-            setTimeout(function () {
-              // @ts-ignore 跳到我的发布页签
-              window.setTabsToPublish && window.setTabsToPublish();
-            }, 2000);
+
+            if (onSubmitSuccess) {
+              onSubmitSuccess();
+            }
           } else {
             _toast["default"].Error(resp.Message, {
               canClose: false
@@ -146,6 +143,13 @@ var PublishDynamicModal = function PublishDynamicModal(_ref) {
     setVisible(true);
   };
 
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      hide: hidePublishDynamicModal,
+      showShareModal: showPublishShareDynamicModal,
+      showAnnouncementModal: showPublishAnnouncementDynamicModal
+    };
+  });
   (0, _react.useEffect)(function () {
     // @ts-ignore
     window.hidePublishDynamicModal = hidePublishDynamicModal; // @ts-ignore
@@ -188,7 +192,9 @@ var PublishDynamicModal = function PublishDynamicModal(_ref) {
     ,
     onMblogSubmit: onMblogSubmit
   })));
+});
+PublishDynamicModal.defaultProps = {
+  onSubmitSuccess: function onSubmitSuccess() {}
 };
-
 var _default = PublishDynamicModal;
 exports["default"] = _default;

package/lib/components/superset-charts/utils/axios.js

@@ -65,14 +65,6 @@ var beforeResponse = function beforeResponse(res) {
   config.retry = 3;
   config.retryCount = config.retryCount || 0;
 
-  if (window.titaTracker) {
-    window.titaTracker("action").record({
-      actionName: JSON.stringify(config),
-      actionGroup: "调用接口",
-      productName: "接口"
-    });
-  }
-
   if (res.data.code === 401) {
     // 401错误表示未登录授权或者token失效
     clearToken();

package/lib/components/survey-model/contact.js

@@ -77,7 +77,7 @@ var ContactModel = function ContactModel(_ref) {
     className: "tu-icon-canceled ".concat(preCls, "__head-close "),
     onClick: handleClose
   })), /*#__PURE__*/_react["default"].createElement(Input, {
-    placeholder: '请输入',
+    placeholder: '参与调研有礼相送哦～',
     value: contact,
     onChange: onContactChange,
     className: "".concat(preCls, "__input")

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;
+}