@titaui/pc 1.12.17-beta.5 → 1.12.17-beta.8

package/lib/components/dynamic/components/comments-dialog/index.js

@@ -106,11 +106,7 @@ var RemindDialog = function RemindDialog(props) {
     var params = {
       objId: feedId,
       objType: "8",
-      // tenantId,
-      // userId,
       toUserId: toUserId,
-      // evaluateType,
-      // evaluateValue,
       remark: remark,
       evaluateInfo: [{
         evaluateType: evaluateType,
@@ -139,7 +135,7 @@ var RemindDialog = function RemindDialog(props) {
         if ((res === null || res === void 0 ? void 0 : (_res$Data2 = res.Data) === null || _res$Data2 === void 0 ? void 0 : _res$Data2.type) === 1) {
           var _res$Data3;
 
-          setRatingScore((res === null || res === void 0 ? void 0 : (_res$Data3 = res.Data) === null || _res$Data3 === void 0 ? void 0 : _res$Data3.value) / 2);
+          setRatingScore(Number(res === null || res === void 0 ? void 0 : (_res$Data3 = res.Data) === null || _res$Data3 === void 0 ? void 0 : _res$Data3.value) / 2);
         } else if ((res === null || res === void 0 ? void 0 : (_res$Data4 = res.Data) === null || _res$Data4 === void 0 ? void 0 : _res$Data4.type) === 2) {
           var _res$Data5;
 

package/lib/components/dynamic/dynamic-item/dynamic-new-report/index.js

@@ -69,14 +69,14 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 var getEReportType = function getEReportType(type) {
   var reportTextMap = {
-    8: (0, _getLocale.getLocale)("Rep_Tab_Dailynewspaper"),
-    26: (0, _getLocale.getLocale)("Rep_Tab_Weeklynewspaper"),
-    27: (0, _getLocale.getLocale)("Rep_Tab_MonthlyReport")
+    8: (0, _getLocale.getLocale)('Rep_Tab_Dailynewspaper'),
+    26: (0, _getLocale.getLocale)('Rep_Tab_Weeklynewspaper'),
+    27: (0, _getLocale.getLocale)('Rep_Tab_MonthlyReport')
   };
   return reportTextMap[type];
 };
 
-var prefix = "titaui-dynamic-new-report-item";
+var prefix = 'titaui-dynamic-new-report-item';
 
 var DynamicReply = function DynamicReply(_ref) {
   var data = _ref.data,
@@ -93,7 +93,7 @@ var DynamicReply = function DynamicReply(_ref) {
       evaluates = data.evaluates;
   var files = (0, _util.formatAttachments)(attachments);
 
-  var _useState = (0, _react.useState)(""),
+  var _useState = (0, _react.useState)(''),
       _useState2 = _slicedToArray(_useState, 2),
       mindImg = _useState2[0],
       setMindImg = _useState2[1];
@@ -140,9 +140,9 @@ var DynamicReply = function DynamicReply(_ref) {
   }, []);
   var renderDesc = (0, _react.useMemo)(function () {
     var reportTextMap = {
-      8: (0, _getLocale.getLocale)("Rep_Tab_Mys_Dailynewsp"),
-      26: (0, _getLocale.getLocale)("Rep_Tab_Mys_sweeklyReport"),
-      27: (0, _getLocale.getLocale)("Rep_Tab_Sub_monthlyeport")
+      8: (0, _getLocale.getLocale)('Rep_Tab_Mys_Dailynewsp'),
+      26: (0, _getLocale.getLocale)('Rep_Tab_Mys_sweeklyReport'),
+      27: (0, _getLocale.getLocale)('Rep_Tab_Sub_monthlyeport')
     };
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc")
@@ -160,28 +160,31 @@ var DynamicReply = function DynamicReply(_ref) {
   }, [data, searchKeyWord]);
   (0, _react.useEffect)(function () {
     if (dailyContent) {
-      var _dailyContent$filter$, _dailyContent$filter$2, _dailyContent$filter$3, _dailyContent$filter$4, _mindData$, _mindData$2;
+      var _dailyContent$filter$, _dailyContent$filter$2, _dailyContent$filter$3, _dailyContent$filter$4, _dailyContent$filter$5, _mindData$, _mindData$2;
 
       var mindData = dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.ContentType) === 1;
+        return (item === null || item === void 0 ? void 0 : item.contentType) === 1;
       });
-      setOkrtableData(((_dailyContent$filter$ = dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.ContentType) === 2;
-      })[0]) === null || _dailyContent$filter$ === void 0 ? void 0 : _dailyContent$filter$.content) || null);
-      setOkrtableTitle((_dailyContent$filter$2 = dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.ContentType) === 2;
-      })[0]) === null || _dailyContent$filter$2 === void 0 ? void 0 : _dailyContent$filter$2.title);
-      setTasktableData(((_dailyContent$filter$3 = dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.ContentType) === 3;
-      })[0]) === null || _dailyContent$filter$3 === void 0 ? void 0 : _dailyContent$filter$3.content) || null);
-      setTasktableTitle((_dailyContent$filter$4 = dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.ContentType) === 3;
-      })[0]) === null || _dailyContent$filter$4 === void 0 ? void 0 : _dailyContent$filter$4.title);
+      console.log((_dailyContent$filter$ = dailyContent.filter(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.contentType) === 2;
+      })[0]) === null || _dailyContent$filter$ === void 0 ? void 0 : _dailyContent$filter$.content);
+      setOkrtableData(((_dailyContent$filter$2 = dailyContent.filter(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.contentType) === 2;
+      })[0]) === null || _dailyContent$filter$2 === void 0 ? void 0 : _dailyContent$filter$2.content) || null);
+      setOkrtableTitle((_dailyContent$filter$3 = dailyContent.filter(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.contentType) === 2;
+      })[0]) === null || _dailyContent$filter$3 === void 0 ? void 0 : _dailyContent$filter$3.title);
+      setTasktableData(((_dailyContent$filter$4 = dailyContent.filter(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.contentType) === 3;
+      })[0]) === null || _dailyContent$filter$4 === void 0 ? void 0 : _dailyContent$filter$4.content) || null);
+      setTasktableTitle((_dailyContent$filter$5 = dailyContent.filter(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.contentType) === 3;
+      })[0]) === null || _dailyContent$filter$5 === void 0 ? void 0 : _dailyContent$filter$5.title);
       setRichTextData(dailyContent.filter(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.ContentType) === _constant.dailyContentType.richText;
+        return (item === null || item === void 0 ? void 0 : item.contentType) === _constant.dailyContentType.richText;
       }));
 
-      if (typeof ((_mindData$ = mindData[0]) === null || _mindData$ === void 0 ? void 0 : _mindData$.content) === "string" && ((_mindData$2 = mindData[0]) === null || _mindData$2 === void 0 ? void 0 : _mindData$2.content) !== "") {
+      if (typeof ((_mindData$ = mindData[0]) === null || _mindData$ === void 0 ? void 0 : _mindData$.content) === 'string' && ((_mindData$2 = mindData[0]) === null || _mindData$2 === void 0 ? void 0 : _mindData$2.content) !== '') {
         setMindImg(_constant.Motion.filter(function (item) {
           return item.id === JSON.parse(mindData[0].content).SelectedValues[0];
         })[0].img);
@@ -212,14 +215,14 @@ var DynamicReply = function DynamicReply(_ref) {
     src: mindImg,
     className: "".concat(prefix, "__content-mind"),
     alt: ""
-  })), richTextData && richTextData.map(function (item) {
-    return /*#__PURE__*/_react["default"].createElement("div", {
+  })), (richTextData === null || richTextData === void 0 ? void 0 : richTextData.length) !== 0 && (richTextData === null || richTextData === void 0 ? void 0 : richTextData.map(function (item) {
+    return item.richContent !== '' && typeof item.richContent === 'string' && /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__work")
-    }, item.title, item.content && /*#__PURE__*/_react["default"].createElement(_richEditor["default"].Editor, {
-      defaultState: JSON.parse(item.content).RichText,
+    }, item.title, /*#__PURE__*/_react["default"].createElement(_richEditor["default"].Editor, {
+      defaultState: JSON.parse(item.richContent),
       editable: false
     }));
-  }), okrTableData && /*#__PURE__*/_react["default"].createElement(_okrProgress["default"], {
+  })), okrTableData && /*#__PURE__*/_react["default"].createElement(_okrProgress["default"], {
     data: okrTableData,
     title: okrTableTitle
   }), taskTableData && /*#__PURE__*/_react["default"].createElement(_taskProgress["default"], {

package/lib/components/import-modal/helper.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatDateStr = void 0;
-exports.formatPeriodPlanData = formatPeriodPlanData;
-exports.lableTypeMap = exports.isOpenWorkManage = exports.isOpenOkrManage = exports.isOpenLabel = exports.getCycleDate = void 0;
+exports.lableTypeMap = exports.isOpenWorkManage = exports.isOpenOkrManage = exports.isOpenLabel = exports.getCycleDate = exports.formatDateStr = void 0;
 exports.momentDate = momentDate;
 exports.workStatus = exports.timeFormat = exports.preCls = exports.okrStatus = void 0;
 
@@ -13,8 +11,6 @@ var _bsGlobal = require("../../utils/bs-global");
 
 var _getLocale = require("../../utils/getLocale");
 
-var _planDataJson = require("../../utils/planDataJson");
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -139,57 +135,6 @@ function momentDate(date) {
   return date.replace(reg, '/').slice(0, -1);
 }
 
-function formatPeriodPlanData(period) {
-  var planData; // 获取选取年份的 dataJSON
-
-  var yearGroup = (0, _planDataJson.PlanDataJson)().find(function (p) {
-    return p.GroupName == period.annualNum + '';
-  }); // 年份下的 ‘年/季’ data
-
-  var seasonData = yearGroup ? yearGroup.PlanTableListModels.find(function (item) {
-    return item.TagName == (0, _getLocale.getLocale)('Tasks_Menu_Yearseason');
-  }) : null;
-
-  switch (period.cycleType) {
-    // case '-1': // 全部周期
-    //     break;
-    case '0':
-      planData = {
-        StartDate: period.startDate,
-        EndDate: period.endDate
-      };
-      break;
-
-    case '1':
-      // 年度
-      planData = seasonData ? seasonData.PlanTableModels[0] : null;
-      break;
-
-    case '2':
-      planData = seasonData ? seasonData.PlanTableModels[period.yqmNum] : null; // 季度
-
-      break;
-
-    case '3':
-      // @ts-ignore
-      var monthData = yearGroup ? yearGroup.PlanTableListModels.find(function (p) {
-        return p.TagName == period.yqmNum + '月';
-      }) : null;
-      planData = monthData ? monthData.PlanTableModels[0] : null;
-      break;
-
-    default:
-      break;
-  }
-
-  return {
-    endDate: planData ? period.cycleType == '0' ? planData.EndDate : momentDate(planData.EndDate || '') : '',
-    planTableId: planData && planData.PlanTableId,
-    planTableType: planData && planData.PlanTableType,
-    startDate: planData ? period.cycleType == '0' ? planData.StartDate : momentDate(planData.StartDate || '') : ''
-  };
-}
-
 var getCycleDate = function getCycleDate(date) {
   if (date) {
     var _date$split = date.split('/'),

package/lib/components/import-modal/import-okr-modal/index.js

@@ -15,6 +15,8 @@ var _getLocale = require("../../../utils/getLocale");
 
 var _okrTree = _interopRequireDefault(require("../tree/okr-tree"));
 
+var _toast = _interopRequireDefault(require("../../toast"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -70,6 +72,12 @@ function ImportOKRModal(props) {
   var selectedRef = (0, _react.useRef)(selected); // 解决闭包
 
   var onOkHandler = function onOkHandler() {
+    if (selected.length < 1) {
+      _toast["default"].Error((0, _getLocale.getLocale)('OKR_MyO_Selectaleastone'));
+
+      return;
+    }
+
     onOk && onOk(selected);
     setSelected([]);
     onCancelHandler();

package/lib/components/import-modal/import-task-modal/index.js

@@ -25,6 +25,8 @@ var _loading = _interopRequireDefault(require("../image/loading.gif"));
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _toast = _interopRequireDefault(require("../../toast"));
+
 require("./index.css");
 
 var _excluded = ["isVisible", "multiple", "onOk", "onCancel", "isRelationOther", "onRelateSuccess", "lastSelected", "time"];
@@ -169,6 +171,12 @@ function ImportTaskModal(props) {
   };
 
   var onOkHandler = function onOkHandler() {
+    if (selected.length < 1) {
+      _toast["default"].Error((0, _getLocale.getLocale)('OKR_MyO_Selectaleastone'));
+
+      return;
+    }
+
     onCancelHandler();
     onOk && onOk(selected);
     setSelected([]);

package/lib/components/import-modal/import-task-modal/search-form.js

@@ -77,13 +77,11 @@ function SearchForm(props) {
 
   var dilagRef = (0, _react.useRef)(document.createElement('div'));
   (0, _react.useEffect)(function () {
-    if (!cycle) return;
-    var planCycle = (0, _helper.formatPeriodPlanData)(cycle);
     onChange(_objectSpread({
       status: status,
       keyWords: keyWords,
       relation: relation
-    }, planCycle));
+    }, cycle));
   }, [status, keyWords, cycle, relation]);
   (0, _react.useEffect)(function () {
     if (time) {

package/lib/components/rich-editor-at/components/index.css

@@ -9,7 +9,7 @@
   display: inline-block;
   width: 60px;
   height: 60px;
-  border-radius: 8px;
+  border-radius: 30px;
   overflow: hidden;
   position: relative;
 }
@@ -22,7 +22,7 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  font-size: 16px;
+  font-size: 14px;
   font-weight: 400;
   color: #ffffff;
   line-height: 24px;
@@ -61,6 +61,7 @@
   font-size: 14px;
   color: #6f7886;
   line-height: 20px;
-  margin-left: 4px;
   text-align: center;
+  margin: 0 auto;
+  margin-top: 6px;
 }

package/lib/components/rich-editor-at/index.css

@@ -12,13 +12,13 @@
 }
 
 .titaui-rich-editor-at__content-user {
-  margin-right: 10px;
+  margin-right: 20px;
 }
 
 .titaui-rich-editor-at__import {
   width: 60px;
   height: 60px;
-  border-radius: 8px;
+  border-radius: 30px;
   border: 1px solid #e9ecf0;
   display: flex;
   align-items: center;
@@ -27,7 +27,7 @@
 
 .titaui-rich-editor-at__import-icon {
   font-size: 24px;
-  color: #BFC7D5;
+  color: #bfc7d5;
 }
 
 .titaui-rich-editor-at__import:hover {

package/lib/components/write-summary-modal/constants.js

@@ -0,0 +1,21 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.color = void 0;
+var color = [{
+  bg: "#2879FF",
+  contentBg: "rgba(40, 121, 255, 0.2)"
+}, {
+  bg: "#5AD8A6",
+  contentBg: "rgba(90, 216, 166, 0.2)"
+}, {
+  bg: "#F6BD16",
+  contentBg: "rgba(246, 189, 22, 0.2)"
+}];
+exports.color = color;
+var _default = {
+  color: color
+};
+exports["default"] = _default;

package/lib/components/write-summary-modal/index.js

@@ -17,7 +17,7 @@ var _requestApi = require("./request-api");
 
 require("./index.css");
 
-var _utils = require("./utils");
+var _constants = require("./constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -121,8 +121,7 @@ var WriteSummaryModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     maskClosable: false
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix)
-  }, modalList.map(function (item) {
-    var randomColor = (0, _utils.getRandomColor)();
+  }, modalList.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item"),
       onClick: function onClick() {
@@ -133,7 +132,7 @@ var WriteSummaryModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-title-avatar"),
       style: {
-        background: randomColor.bg
+        background: _constants.color[index].bg
       }
     }, item.name[0]), /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__content-item-title-name")
@@ -144,21 +143,21 @@ var WriteSummaryModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
     }, (0, _getLocale.getLocale)("Rep_Tab_Mys_Workprogre")), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-desc-block"),
       style: {
-        background: randomColor.contentBg
+        background: _constants.color[index].contentBg
       }
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-desc-text")
     }, (0, _getLocale.getLocale)("Tasks_Tab_MyS_JobSummary")), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-desc-block"),
       style: {
-        background: randomColor.contentBg
+        background: _constants.color[index].contentBg
       }
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-desc-text")
     }, (0, _getLocale.getLocale)("Rep_Tab_Mys_NextWorkPlans")), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__content-item-desc-block"),
       style: {
-        background: randomColor.contentBg
+        background: _constants.color[index].contentBg
       }
     })));
   })));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.17-beta.5",
+  "version": "1.12.17-beta.8",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",