@titaui/pc 1.15.11 → 1.15.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/components/dynamic/dynamic-item/components/okr-progress/index.js +1 -1
  2. package/lib/components/dynamic/dynamic-item/components/table-row-okr/index.js +7 -1
  3. package/lib/components/dynamic/dynamic-item/components/table-row-okr/utils.js +36 -13
  4. package/lib/components/nav-top/components/user-message/utils.js +1 -23
  5. package/lib/components/nav-top/index.js +1 -0
  6. package/package.json +1 -1
package/lib/components/dynamic/dynamic-item/components/okr-progress/index.js CHANGED
@@ -142,7 +142,7 @@ var OkrProgress = function OkrProgress(_ref) {
142
142
  })), /*#__PURE__*/_react["default"].createElement("td", {
143
143
  className: "padding-td"
144
144
  }, /*#__PURE__*/_react["default"].createElement(_schedule["default"], {
145
- value: item.LastRichContent,
145
+ value: item.LastRichContent || item.LastContent,
146
146
  date: item.LastContentTime,
147
147
  id: item.Id
148
148
  })));
package/lib/components/dynamic/dynamic-item/components/table-row-okr/index.js CHANGED
@@ -57,7 +57,13 @@ var TableRowOKR = function TableRowOKR(_ref) {
57
57
  onClick: handleClickTitle
58
58
  }, /*#__PURE__*/_react["default"].createElement("i", {
59
59
  className: "tu-icon-H5-".concat(isO ? "O" : "KR", "-s ").concat(prefix, "__common-icon")
60
- }), /*#__PURE__*/_react["default"].createElement("p", null, /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(text)), isO && (Number(data.CycleType) !== 0 || Number(data.AnnualNum) !== 0 || Number(data.YqmNum !== 0) || data.StartDate && data.EndDate) && /*#__PURE__*/_react["default"].createElement("span", {
60
+ }), /*#__PURE__*/_react["default"].createElement("p", null, /*#__PURE__*/_react["default"].createElement("span", null, (0, _openData.parseString)(text)), isO && (0, _utils.formatPeriod)({
61
+ annualNum: data.AnnualNum,
62
+ yqmNum: data.YqmNum,
63
+ cycleType: data.CycleType,
64
+ startDate: data.StartDate,
65
+ endDate: data.EndDate
66
+ }) !== '' && /*#__PURE__*/_react["default"].createElement("span", {
61
67
  className: "".concat(prefix, "__common-time")
62
68
  }, (0, _utils.formatPeriod)({
63
69
  annualNum: data.AnnualNum,
package/lib/components/dynamic/dynamic-item/components/table-row-okr/utils.js CHANGED
@@ -12,45 +12,68 @@ var _constant = require("../../../../../utils/constant");
12
12
  var formatPeriod = function formatPeriod(selected) {
13
13
  if (!selected) return "";
14
14
  var quarter = ["", "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_1stQuarter")), "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_2ndQuarter")), "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_3rdQuarter")), "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_4thQuarter"))];
15
- var cycleDate = "";
15
+ var cycleDate;
16
16
  var annualNum = Number("".concat(selected.annualNum)) === -1 ? "".concat((0, _getLocale.getLocale)("OKR_MyO_Butt_Allyears")) : "".concat(selected.annualNum).concat(_getLocale.isEn ? "" : "年");
17
17
  var month = (0, _constant.getMonth)();
18
18
 
19
19
  switch ("".concat(selected.cycleType)) {
20
20
  case "-1":
21
- cycleDate = "".concat((0, _getLocale.getLocale)("OKR_MyO_Butt_AllStatee"));
21
+ cycleDate = "".concat(annualNum, " ").concat((0, _getLocale.getLocale)("OKR_MyO_Butt_AllStatee"));
22
22
  break;
23
23
 
24
24
  case "1":
25
- cycleDate = "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Year"));
25
+ if (Number(selected.annualNum) === 0) {
26
+ cycleDate = '';
27
+ } else {
28
+ cycleDate = "".concat(annualNum, " ").concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Year"));
29
+ }
30
+
26
31
  break;
27
32
 
28
33
  case "2":
29
34
  // 季度
30
- cycleDate = quarter[Number(selected.yqmNum)];
35
+ if (Number(selected.annualNum) === 0 || Number(selected.yqmNum) === 0) {
36
+ cycleDate = '';
37
+ } else {
38
+ cycleDate = "".concat(annualNum, " ").concat(quarter[Number(selected.yqmNum)]);
39
+ }
40
+
31
41
  break;
32
42
 
33
43
  case "3":
34
- cycleDate = month[Number(selected.yqmNum) - 1];
44
+ cycleDate = "".concat(annualNum, " ").concat(month[Number(selected.yqmNum) - 1]);
35
45
  break;
36
46
 
37
47
  case "4":
38
- cycleDate = "".concat(month[Number(selected.yqmNum) - 1], " - ").concat(month[((Number(selected.yqmNum) + 1) % 12 || 12) - 1]);
48
+ if (Number(selected.annualNum) === 0) {
49
+ cycleDate = '';
50
+ } else {
51
+ cycleDate = "".concat(annualNum, " ").concat(month[Number(selected.yqmNum) - 1], " - ").concat(month[((Number(selected.yqmNum) + 1) % 12 || 12) - 1]);
52
+ }
53
+
39
54
  break;
40
55
 
41
56
  case "5":
42
- cycleDate = Number("".concat(selected.yqmNum)) === 1 ? "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Firsthalf")) : "".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Secondhalf"));
57
+ if (Number(selected.annualNum) === 0) {
58
+ cycleDate = '';
59
+ } else {
60
+ cycleDate = Number("".concat(selected.yqmNum)) === 1 ? "".concat(annualNum, " ").concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Firsthalf")) : "".concat(annualNum, " ").concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Secondhalf"));
61
+ }
62
+
43
63
  break;
44
64
 
65
+ case '0':
66
+ if (Number(selected.annualNum) === 0 && Number(selected.yqmNum) === 0 && !selected.startDate && !selected.endDate) {
67
+ cycleDate = '';
68
+ } else {
69
+ cycleDate = "".concat((0, _getLocale.getLocale)('Mod_Customization'));
70
+ }
71
+
45
72
  default:
46
- cycleDate = "".concat((0, _getLocale.getLocale)('Mod_Customization'));
73
+ cycleDate = '';
47
74
  }
48
75
 
49
- if (Number(selected.cycleType) !== 0) {
50
- return "".concat(annualNum, " ").concat(cycleDate);
51
- } else {
52
- return "".concat(cycleDate);
53
- }
76
+ return "".concat(cycleDate);
54
77
  };
55
78
 
56
79
  exports.formatPeriod = formatPeriod;
package/lib/components/nav-top/components/user-message/utils.js CHANGED
@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.htmlToText = exports.deleteText = void 0;
7
7
 
8
- var _getLocale = require("../../../../utils/getLocale");
9
-
10
8
  var htmlToText = function htmlToText(text) {
11
9
  var div = document.createElement("div");
12
10
  div.innerHTML = text;
@@ -17,28 +15,8 @@ var htmlToText = function htmlToText(text) {
17
15
  exports.htmlToText = htmlToText;
18
16
 
19
17
  var deleteText = function deleteText(text) {
20
- var last = text.trim().slice(-4);
21
- var pattern = /(查看详情|Details)(?!.*\1)/;
18
+ var pattern = /(查看详情|Details|查看任务|进入日报|进入周报|进入月报|进入项目|进入今日工作)(?!.*\1)/;
22
19
  text = text.replace(pattern, '');
23
-
24
- if (last === "查看任务") {
25
- text = text.trim().slice(0, -4);
26
- } else if (last === (0, _getLocale.getLocale)("Mod_Checkdetails")) {
27
- text = text.trim().slice(0, -4);
28
- } else if (last === "进入日报") {
29
- text = text.trim().slice(0, -4);
30
- } else if (last === "进入周报") {
31
- text = text.trim().slice(0, -4);
32
- } else if (last === "进入月报") {
33
- text = text.trim().slice(0, -4);
34
- } else if (last === "进入项目") {
35
- text = text.trim().slice(0, -4);
36
- } else if (text.trim().slice(-6) === "进入今日工作") {
37
- text = text.trim().slice(0, -6);
38
- } else {
39
- text = text;
40
- }
41
-
42
20
  return text;
43
21
  };
44
22
 
package/lib/components/nav-top/index.js CHANGED
@@ -326,6 +326,7 @@ var NavTop = function NavTop() {
326
326
  };
327
327
 
328
328
  var renderInviteContent = (0, _react.useCallback)(function () {
329
+ if (!inviteVisible) return;
329
330
  var title = '你没有权限，快去联系企业微信超级管理员操';
330
331
  if (!inviteAuth) return /*#__PURE__*/_react["default"].createElement("div", {
331
332
  className: "".concat(preCls, "__invite-guide-content")
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.15.11",
3
+ "version": "1.15.12",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",