@titaui/pc 1.11.11 → 1.11.13-beta.2

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 (61) hide show
  1. package/.husky/pre-commit +1 -1
  2. package/lib/components/avatar/name-avatar/index.css +1 -0
  3. package/lib/components/avatar/name-avatar/index.js +22 -13
  4. package/lib/components/button/rect-btn/index.css +25 -11
  5. package/lib/components/button/rect-btn/index.js +8 -4
  6. package/lib/components/create-okr-modal/request-api.js +1 -1
  7. package/lib/components/drawer/headerAction.js +5 -1
  8. package/lib/components/drawer/headerDrop.js +41 -4
  9. package/lib/components/drawer/index.css +44 -0
  10. package/lib/components/drawer/index.js +35 -6
  11. package/lib/components/dynamic/constant.js +9 -5
  12. package/lib/components/dynamic/dynamic-item/components/feed-operate/index.css +2 -0
  13. package/lib/components/dynamic/dynamic-item/dynamic-kr/index.js +1 -1
  14. package/lib/components/dynamic/dynamic-item/dynamic-task/index.js +1 -1
  15. package/lib/components/e-priority/index.js +10 -4
  16. package/lib/components/icon-button-list/index.css +1 -1
  17. package/lib/components/nav-top/index.js +6 -2
  18. package/lib/components/okr-detail/base-info/other-infos/date-cycle/index.js +16 -4
  19. package/lib/components/okr-detail/base-info/other-infos/principal/index.js +9 -1
  20. package/lib/components/okr-detail/components/header/index.js +9 -3
  21. package/lib/components/okr-detail/components/header/o-name.js +9 -3
  22. package/lib/components/okr-detail/components/o-classify.js +5 -1
  23. package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/index.js +9 -6
  24. package/lib/components/okr-detail/detail-header/constant.js +53 -0
  25. package/lib/components/okr-detail/detail-header/index.js +12 -1
  26. package/lib/components/okr-detail/helper.js +62 -0
  27. package/lib/components/okr-detail/index.js +21 -2
  28. package/lib/components/okr-detail/okr-list/index.js +7 -2
  29. package/lib/components/okr-detail/request-apis.js +7 -1
  30. package/lib/components/okr-flow/child-node/index.css +54 -15
  31. package/lib/components/okr-flow/child-node/work-node.js +19 -3
  32. package/lib/components/okr-flow/empty/index.css +8 -1
  33. package/lib/components/okr-flow/export-modal/index.js +26 -2
  34. package/lib/components/okr-flow/export-modules/okr-search-panel/index.css +3 -1
  35. package/lib/components/okr-flow/export-modules/okr-search-panel/index.js +14 -9
  36. package/lib/components/okr-flow/images/loading-light.gif +0 -0
  37. package/lib/components/okr-flow/okr-map/index.js +32 -14
  38. package/lib/components/okr-flow/request-apis.js +11 -4
  39. package/lib/components/okr-flow/root-node/index.css +2 -2
  40. package/lib/components/okr-flow/utils/index.js +43 -26
  41. package/lib/components/okr-flow/utils/tree-handler.js +14 -3
  42. package/lib/components/okr-period-selector/select-cycle.js +23 -19
  43. package/lib/components/okrcase-library/okrcases-components/submitOkr-dialog.js +1 -0
  44. package/lib/components/period-selector/index.js +3 -0
  45. package/lib/components/textarea/index.css +120 -0
  46. package/lib/components/textarea/index.js +257 -0
  47. package/lib/index.js +40 -0
  48. package/lib/pages/new-okr-list/header/common.js +52 -0
  49. package/lib/pages/new-okr-list/header/index.css +45 -0
  50. package/lib/pages/new-okr-list/header/index.js +28 -16
  51. package/lib/pages/new-okr-list/header/operate-record.js +88 -0
  52. package/lib/pages/new-okr-list/index.js +3 -1
  53. package/lib/pages/new-okr-list/list/index.js +19 -2
  54. package/lib/pages/okr-map/export-modules/okr-map/header/index.css +6 -1
  55. package/lib/pages/okr-map/export-modules/okr-map/header/index.js +47 -13
  56. package/lib/pages/okr-map/export-modules/okr-map/okr-map.js +27 -17
  57. package/lib/pages/okr-map/number-select/index.css +4 -1
  58. package/lib/pages/okr-map/number-select/index.js +1 -1
  59. package/lib/utils/format-time.js +8 -1
  60. package/lib/utils/open-data.js +43 -19
  61. package/package.json +1 -1
@@ -0,0 +1,88 @@
1
+ "use strict";
2
+
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports["default"] = void 0;
9
+
10
+ var _react = _interopRequireWildcard(require("react"));
11
+
12
+ var _popup = _interopRequireDefault(require("../../../components/popup"));
13
+
14
+ var _getLocale = require("../../../utils/getLocale");
15
+
16
+ var _precls = require("../precls");
17
+
18
+ var _context = require("../context");
19
+
20
+ var _common = require("./common");
21
+
22
+ require("./index.css");
23
+
24
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
25
+
26
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
27
+
28
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
29
+
30
+ var OperateRecord = function OperateRecord(props) {
31
+ var popupRef = (0, _react.useRef)();
32
+ var drawerRef = (0, _react.useRef)();
33
+ var userInfo = props.userInfo,
34
+ toUserId = props.toUserId,
35
+ relation = props.relation;
36
+
37
+ var _useContext = (0, _react.useContext)(_context.Context),
38
+ OkrOperateRecordDrawer = _useContext.OkrOperateRecordDrawer,
39
+ annualNum = _useContext.annualNum,
40
+ cycleType = _useContext.cycleType,
41
+ yqmNum = _useContext.yqmNum;
42
+
43
+ var openOperateRecordPush = function openOperateRecordPush() {
44
+ popupRef.current && popupRef.current.close();
45
+ drawerRef.current && drawerRef.current.showOperateDrawerVisible();
46
+ };
47
+
48
+ var popup = /*#__PURE__*/_react["default"].createElement("div", {
49
+ className: "".concat(_precls.precls, "__header-record-popup")
50
+ }, /*#__PURE__*/_react["default"].createElement("div", {
51
+ className: "".concat(_precls.precls, "__header-record-item"),
52
+ onClick: openOperateRecordPush
53
+ }, /*#__PURE__*/_react["default"].createElement("i", {
54
+ className: "tu-icon-jinzhan-s"
55
+ }), /*#__PURE__*/_react["default"].createElement("span", {
56
+ className: "".concat(_precls.precls, "__header-record-item-content")
57
+ }, (0, _getLocale.getLocale)('Per_details_OperationRecord'))));
58
+
59
+ if (!toUserId && relation !== 1) return null;
60
+ return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_popup["default"], {
61
+ ref: popupRef,
62
+ popup: popup,
63
+ popupAlign: {
64
+ offset: [0, 4]
65
+ }
66
+ }, /*#__PURE__*/_react["default"].createElement("span", {
67
+ className: "".concat(_precls.precls, "__header-record")
68
+ }, /*#__PURE__*/_react["default"].createElement("i", {
69
+ className: "tu-icon-more1"
70
+ }))), (toUserId !== undefined || relation === 1) && !!userInfo && /*#__PURE__*/_react["default"].createElement(OkrOperateRecordDrawer, {
71
+ ref: drawerRef,
72
+ userInfo: {
73
+ Id: userInfo.userId,
74
+ Name: userInfo.name,
75
+ Color: userInfo.avatar.color,
76
+ AvatarsUrl: userInfo.avatar.original,
77
+ Type: 1
78
+ },
79
+ okrCycle: "\u300C".concat((0, _common.formatPeriod)({
80
+ annualNum: annualNum,
81
+ cycleType: cycleType,
82
+ yqmNum: yqmNum
83
+ }), "\u300D")
84
+ }));
85
+ };
86
+
87
+ var _default = OperateRecord;
88
+ exports["default"] = _default;
@@ -85,7 +85,8 @@ var NewOkrList = function NewOkrList(props) {
85
85
  var OkrListCmp = props.OkrListCmp,
86
86
  OkrCommunicationPush = props.OkrCommunicationPush,
87
87
  Empty = props.Empty,
88
- SetCycleModal = props.SetCycleModal;
88
+ SetCycleModal = props.SetCycleModal,
89
+ OkrOperateRecordDrawer = props.OkrOperateRecordDrawer;
89
90
  var useLocalStorage = new _localStorage.LocalStorage();
90
91
  var formFieldValues = useLocalStorage.getItem("okr-filter-values") || {
91
92
  targetType: "",
@@ -316,6 +317,7 @@ var NewOkrList = function NewOkrList(props) {
316
317
  return /*#__PURE__*/_react["default"].createElement(_context.Context.Provider, {
317
318
  value: _objectSpread({
318
319
  OkrCommunicationPush: OkrCommunicationPush,
320
+ OkrOperateRecordDrawer: OkrOperateRecordDrawer,
319
321
  relation: relation,
320
322
  departmentName: departmentName,
321
323
  departmentId: departmentId,
@@ -1,13 +1,19 @@
1
1
  "use strict";
2
2
 
3
+ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
6
8
  exports["default"] = void 0;
7
9
 
8
- var _react = _interopRequireDefault(require("react"));
10
+ var _react = _interopRequireWildcard(require("react"));
11
+
12
+ var _context = require("../context");
13
+
14
+ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
9
15
 
10
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
16
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
11
17
 
12
18
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
13
19
 
@@ -31,8 +37,19 @@ function List(props) {
31
37
  refreshList = props.refreshList,
32
38
  replaceOkr = props.replaceOkr;
33
39
  var OkrListCmp = props.OkrListCmp;
40
+
41
+ var _useContext = (0, _react.useContext)(_context.Context),
42
+ annualNum = _useContext.annualNum,
43
+ cycleType = _useContext.cycleType,
44
+ yqmNum = _useContext.yqmNum;
45
+
34
46
  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(OkrListCmp, {
35
47
  okrData: okrs,
48
+ cycle: {
49
+ annualNum: annualNum,
50
+ cycleType: cycleType,
51
+ yqmNum: yqmNum
52
+ },
36
53
  addOkr: function addOkr(okr) {
37
54
  setOkrs([].concat(_toConsumableArray(okrs), [okr]));
38
55
  },
@@ -6,6 +6,10 @@
6
6
  border-bottom: 1px solid #e9ecf0;
7
7
  }
8
8
 
9
+ .titapage-okr-map__header-period {
10
+ border-radius: 18px;
11
+ }
12
+
9
13
  .titapage-okr-map__header__folded {
10
14
  height: 0;
11
15
  }
@@ -93,13 +97,14 @@
93
97
  }
94
98
 
95
99
  .titapage-okr-map__header-action-showkr .titaui-switch {
96
- width: 136px;
100
+ width: 158px;
97
101
  position: relative;
98
102
  }
99
103
 
100
104
  .titapage-okr-map__header-action-showkr .titaui-switch-label {
101
105
  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
102
106
  font-size: 14px;
107
+ font-weight: unset;
103
108
  }
104
109
 
105
110
  .titapage-okr-map__header-action-showkr .titaui-switch .tui-switch {
@@ -25,6 +25,8 @@ var _periodSelector = _interopRequireDefault(require("../../../../../components/
25
25
 
26
26
  var _iconButtonList = _interopRequireDefault(require("../../../../../components/icon-button-list"));
27
27
 
28
+ var _toast = _interopRequireDefault(require("../../../../../components/toast"));
29
+
28
30
  var _showKrConfirm = _interopRequireDefault(require("./show-kr-confirm"));
29
31
 
30
32
  var _numberSelect = _interopRequireDefault(require("../../../number-select"));
@@ -57,6 +59,7 @@ var preCls = "titapage-okr-map";
57
59
 
58
60
  function _default(props) {
59
61
  var onShowKrClick = props.onShowKrClick,
62
+ onShowCardKr = props.onShowCardKr,
60
63
  onSearchChange = props.onSearchChange,
61
64
  onBtnClick = props.onBtnClick,
62
65
  onPeriodChange = props.onPeriodChange,
@@ -68,6 +71,7 @@ function _default(props) {
68
71
  darkTheme = props.darkTheme,
69
72
  period = props.period,
70
73
  showkr = props.showkr,
74
+ showCardKr = props.showCardKr,
71
75
  openLevel = props.openLevel;
72
76
 
73
77
  var _useState = (0, _react.useState)(false),
@@ -75,6 +79,11 @@ function _default(props) {
75
79
  visible = _useState2[0],
76
80
  setVisible = _useState2[1];
77
81
 
82
+ var _useState3 = (0, _react.useState)(false),
83
+ _useState4 = _slicedToArray(_useState3, 2),
84
+ ovisible = _useState4[0],
85
+ setOVisible = _useState4[1];
86
+
78
87
  var iconButtons = [{
79
88
  icon: "export",
80
89
  overlay: (0, _getLocale.getLocale)("Mod_Export")
@@ -90,16 +99,40 @@ function _default(props) {
90
99
  placement: "topRight"
91
100
  }];
92
101
 
102
+ var onConfirmHandler = function onConfirmHandler(checked) {
103
+ onShowKrClick(checked);
104
+
105
+ if (showCardKr) {
106
+ _toast["default"].Warning('仅允许开启一项');
107
+
108
+ onShowCardKr(false);
109
+ }
110
+ };
111
+
112
+ var onhandleShowCardKr = function onhandleShowCardKr(checked) {
113
+ onShowCardKr(checked);
114
+
115
+ if (showkr) {
116
+ _toast["default"].Warning('仅允许开启一项');
117
+
118
+ onShowKrClick(false);
119
+ }
120
+ };
121
+
93
122
  var popup = /*#__PURE__*/_react["default"].createElement("div", {
94
123
  className: (0, _classnames["default"])("".concat(preCls, "__show-more-popup"))
95
124
  }, /*#__PURE__*/_react["default"].createElement("div", {
96
125
  className: (0, _classnames["default"])("".concat(preCls, "__header-action-showkr"))
126
+ }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
127
+ label: '目标展示 KR 详情',
128
+ checked: showCardKr,
129
+ onChange: onhandleShowCardKr
130
+ })), /*#__PURE__*/_react["default"].createElement("div", {
131
+ className: (0, _classnames["default"])("".concat(preCls, "__header-action-showkr"))
97
132
  }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
98
133
  label: (0, _getLocale.getLocale)("OKR_Ali_Butt_ExhibitionKRs"),
99
134
  checked: showkr,
100
- onChange: function onChange() {
101
- return setVisible(true);
102
- }
135
+ onChange: onConfirmHandler
103
136
  })), /*#__PURE__*/_react["default"].createElement("div", {
104
137
  className: (0, _classnames["default"])("".concat(preCls, "__header-action-level"))
105
138
  }, /*#__PURE__*/_react["default"].createElement(_numberSelect["default"], {
@@ -112,15 +145,10 @@ function _default(props) {
112
145
  defaultValue: openLevel
113
146
  })));
114
147
 
115
- var onConfirmHandler = function onConfirmHandler(checked) {
116
- onShowKrClick(checked);
117
- setVisible(false);
118
- };
119
-
120
- var _useState3 = (0, _react.useState)(false),
121
- _useState4 = _slicedToArray(_useState3, 2),
122
- fold = _useState4[0],
123
- setFold = _useState4[1];
148
+ var _useState5 = (0, _react.useState)(false),
149
+ _useState6 = _slicedToArray(_useState5, 2),
150
+ fold = _useState6[0],
151
+ setFold = _useState6[1];
124
152
 
125
153
  return /*#__PURE__*/_react["default"].createElement("div", {
126
154
  className: (0, _classnames["default"])("".concat(preCls, "__header"), _defineProperty({}, "".concat(preCls, "__header__folded"), fold))
@@ -137,7 +165,8 @@ function _default(props) {
137
165
  align: "bottomRight",
138
166
  onChange: onPeriodChange,
139
167
  selected: period,
140
- yearsRange: [2018, 2030]
168
+ yearsRange: [2018, 2030],
169
+ buttonClass: "".concat(preCls, "__header-period")
141
170
  }))), /*#__PURE__*/_react["default"].createElement("div", {
142
171
  className: (0, _classnames["default"])("".concat(preCls, "__header-action"))
143
172
  }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -178,5 +207,10 @@ function _default(props) {
178
207
  setVisible: setVisible,
179
208
  onConfirmHandler: onConfirmHandler,
180
209
  showkr: showkr
210
+ }), /*#__PURE__*/_react["default"].createElement(_showKrConfirm["default"], {
211
+ visible: ovisible,
212
+ setVisible: setOVisible,
213
+ onConfirmHandler: onhandleShowCardKr,
214
+ showkr: showCardKr
181
215
  }));
182
216
  }
@@ -27,7 +27,7 @@ var _level2Search = _interopRequireDefault(require("../../level2-search"));
27
27
 
28
28
  var _requestApis = require("../../request-apis");
29
29
 
30
- var _useStorage13 = _interopRequireDefault(require("../../hooks/useStorage"));
30
+ var _useStorage15 = _interopRequireDefault(require("../../hooks/useStorage"));
31
31
 
32
32
  var _drawerManager = _interopRequireDefault(require("../../../../components/drawer-manager"));
33
33
 
@@ -75,7 +75,7 @@ function _default(props) {
75
75
  _objectDestructuringEmpty(props); // 使用存储的State
76
76
 
77
77
 
78
- var _useStorage = (0, _useStorage13["default"])("period", {
78
+ var _useStorage = (0, _useStorage15["default"])("period", {
79
79
  annualNum: "".concat(new Date().getFullYear()),
80
80
  cycleType: "2",
81
81
  yqmNum: "".concat((0, _dayjs["default"])().quarter())
@@ -84,30 +84,35 @@ function _default(props) {
84
84
  period = _useStorage2[0],
85
85
  setPeriod = _useStorage2[1];
86
86
 
87
- var _useStorage3 = (0, _useStorage13["default"])("showkr", false),
87
+ var _useStorage3 = (0, _useStorage15["default"])("showkr", false),
88
88
  _useStorage4 = _slicedToArray(_useStorage3, 2),
89
89
  showkr = _useStorage4[0],
90
90
  setShowKr = _useStorage4[1];
91
91
 
92
- var _useStorage5 = (0, _useStorage13["default"])("searchType", "company"),
92
+ var _useStorage5 = (0, _useStorage15["default"])("showCardKr", false),
93
93
  _useStorage6 = _slicedToArray(_useStorage5, 2),
94
- searchType = _useStorage6[0],
95
- setSearchType = _useStorage6[1];
94
+ showCardKr = _useStorage6[0],
95
+ setShowCardKr = _useStorage6[1];
96
96
 
97
- var _useStorage7 = (0, _useStorage13["default"])("level2Selected", {}),
97
+ var _useStorage7 = (0, _useStorage15["default"])("searchType", "company"),
98
98
  _useStorage8 = _slicedToArray(_useStorage7, 2),
99
- level2Selected = _useStorage8[0],
100
- setLevel2Selected = _useStorage8[1];
99
+ searchType = _useStorage8[0],
100
+ setSearchType = _useStorage8[1];
101
101
 
102
- var _useStorage9 = (0, _useStorage13["default"])("rootNode", {
102
+ var _useStorage9 = (0, _useStorage15["default"])("level2Selected", {}),
103
+ _useStorage10 = _slicedToArray(_useStorage9, 2),
104
+ level2Selected = _useStorage10[0],
105
+ setLevel2Selected = _useStorage10[1];
106
+
107
+ var _useStorage11 = (0, _useStorage15["default"])("rootNode", {
103
108
  rootId: 0,
104
109
  rootName: ""
105
110
  }, {
106
111
  noLocal: true
107
112
  }),
108
- _useStorage10 = _slicedToArray(_useStorage9, 2),
109
- rootNode = _useStorage10[0],
110
- setRootNode = _useStorage10[1];
113
+ _useStorage12 = _slicedToArray(_useStorage11, 2),
114
+ rootNode = _useStorage12[0],
115
+ setRootNode = _useStorage12[1];
111
116
 
112
117
  var _useState = (0, _react.useState)(true),
113
118
  _useState2 = _slicedToArray(_useState, 2),
@@ -152,10 +157,10 @@ function _default(props) {
152
157
  showMask = _useState16[0],
153
158
  setShowMask = _useState16[1];
154
159
 
155
- var _useStorage11 = (0, _useStorage13["default"])("openLevel", 2),
156
- _useStorage12 = _slicedToArray(_useStorage11, 2),
157
- openLevel = _useStorage12[0],
158
- setOpenLevel = _useStorage12[1];
160
+ var _useStorage13 = (0, _useStorage15["default"])("openLevel", 2),
161
+ _useStorage14 = _slicedToArray(_useStorage13, 2),
162
+ openLevel = _useStorage14[0],
163
+ setOpenLevel = _useStorage14[1];
159
164
 
160
165
  var _useState17 = (0, _react.useState)(false),
161
166
  _useState18 = _slicedToArray(_useState17, 2),
@@ -430,6 +435,9 @@ function _default(props) {
430
435
  onShowKrClick: function onShowKrClick(val) {
431
436
  return setShowKr(val);
432
437
  },
438
+ onShowCardKr: function onShowCardKr(val) {
439
+ return setShowCardKr(val);
440
+ },
433
441
  onSearchChange: onSearchChangeHandler,
434
442
  onPeriodChange: function onPeriodChange(period) {
435
443
  return setPeriod(period);
@@ -446,6 +454,7 @@ function _default(props) {
446
454
  darkTheme: darkTheme,
447
455
  direction: direction,
448
456
  showkr: showkr,
457
+ showCardKr: showCardKr,
449
458
  period: period
450
459
  }), /*#__PURE__*/_react["default"].createElement("div", {
451
460
  className: (0, _classnames["default"])("".concat(_precls["default"], "__content"))
@@ -469,6 +478,7 @@ function _default(props) {
469
478
  return /*#__PURE__*/_react["default"].createElement(OkrSearchPanel, _extends({
470
479
  ref: okrMapRef,
471
480
  showkr: showkr,
481
+ showCardKr: showCardKr,
472
482
  direction: direction,
473
483
  darkTheme: darkTheme,
474
484
  openLevel: openLevel,
@@ -2,7 +2,6 @@
2
2
  font-size: 14px;
3
3
  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
4
4
  color: #3F4755;
5
- width: 136px;
6
5
  position: relative;
7
6
  }
8
7
 
@@ -39,6 +38,10 @@
39
38
  user-select: none;
40
39
  }
41
40
 
41
+ .titaui-number-select--action-icon-right {
42
+ line-height: 12px;
43
+ }
44
+
42
45
  .titaui-number-select--action-icon:hover {
43
46
  background: #2879FF;
44
47
  }
@@ -72,7 +72,7 @@ function NumberSelect(props) {
72
72
  }, "-"), /*#__PURE__*/React.createElement("span", {
73
73
  className: (0, _classnames["default"])("".concat(preCls, "--value"))
74
74
  }, num), /*#__PURE__*/React.createElement("span", {
75
- className: (0, _classnames["default"])("".concat(preCls, "--action-icon"), _defineProperty({}, "".concat(preCls, "--action-icon__disable"), num == max)),
75
+ className: (0, _classnames["default"])("".concat(preCls, "--action-icon"), "".concat(preCls, "--action-icon-right"), _defineProperty({}, "".concat(preCls, "--action-icon__disable"), num == max)),
76
76
  onClick: addHandler
77
77
  }, "+")));
78
78
  }
@@ -167,5 +167,12 @@ var showNextMonthFirstDay = function showNextMonthFirstDay() {
167
167
  };
168
168
 
169
169
  exports.showNextMonthFirstDay = showNextMonthFirstDay;
170
- var _default = getTimeString;
170
+ var _default = {
171
+ getTimeString: getTimeString,
172
+ timeFormat: timeFormat,
173
+ showWeekFirstDay: showWeekFirstDay,
174
+ showMonthFirstDay: showMonthFirstDay,
175
+ showNextWeekFirstDay: showNextWeekFirstDay,
176
+ showNextMonthFirstDay: showNextMonthFirstDay
177
+ };
171
178
  exports["default"] = _default;
@@ -263,9 +263,12 @@ var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
263
263
  var openDatareg = /\[(\w+?)\:(\w+?)\]/g;
264
264
  var openDataStrReg = /\[\w+?\:\w+?\]/;
265
265
  var openDataMatchStr = openDatareg.exec(str);
266
+ var hasMatchStr = false;
267
+ var renderData = [];
266
268
 
267
- while (matchStr != null || openDataMatchStr != null) {
269
+ while (matchStr != null) {
268
270
  if (matchStr) {
271
+ hasMatchStr = true;
269
272
  var OpenDataCompoent = matchStr[1] == "userId" ? OpenUserName : OpenDepartmentName;
270
273
 
271
274
  if (!OpenDataCompoent) {
@@ -293,7 +296,24 @@ var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
293
296
  }
294
297
 
295
298
  matchStr = reg.exec(str);
296
- } else if (openDataMatchStr) {
299
+ }
300
+ }
301
+
302
+ if (hasMatchStr) {
303
+ var commonStrs = str.split(strReg);
304
+
305
+ for (var i = 0; i < commonStrs.length; i++) {
306
+ renderData.push( /*#__PURE__*/_react["default"].createElement("span", {
307
+ dangerouslySetInnerHTML: {
308
+ __html: commonStrs[i]
309
+ }
310
+ }));
311
+ renderData.push(openDatas[i]);
312
+ }
313
+ }
314
+
315
+ while (openDataMatchStr != null) {
316
+ if (openDataMatchStr) {
297
317
  var _OpenDataCompoent = openDataMap[openDataMatchStr[2]];
298
318
 
299
319
  if (!_OpenDataCompoent) {
@@ -304,38 +324,42 @@ var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
304
324
  })));
305
325
  }
306
326
 
307
- openDataMatchStr = reg.exec(str);
327
+ openDataMatchStr = openDatareg.exec(str);
308
328
  }
309
329
  }
310
330
 
311
- var commonStrs = str.split(strReg);
312
- var tempStrs = [];
313
- commonStrs && commonStrs.forEach(function (item) {
314
- tempStrs.push(item.split(openDataStrReg).filter(function (item) {
315
- return item !== '';
316
- }));
317
- });
318
- var renderData = [];
331
+ var newCommonStrs = str.split(openDataStrReg);
319
332
 
320
- for (var i = 0; i < tempStrs.length; i++) {
333
+ for (var _i = 0; _i < newCommonStrs.length; _i++) {
321
334
  renderData.push( /*#__PURE__*/_react["default"].createElement("span", {
322
- style: {
323
- verticalAlign: 'middle'
324
- },
325
335
  dangerouslySetInnerHTML: {
326
- __html: tempStrs[i]
336
+ __html: newCommonStrs[_i]
327
337
  }
328
338
  }));
329
- renderData.push(openDatas[i]);
339
+ renderData.push(openDatas[_i]);
330
340
  }
331
341
 
332
- return renderData;
342
+ return renderData.filter(function (item) {
343
+ return item !== undefined;
344
+ }).map(function (item) {
345
+ if (typeof item === 'string') {
346
+ return item.replace(',', '');
347
+ } else {
348
+ return item;
349
+ }
350
+ }).filter(function (item) {
351
+ return item !== "";
352
+ });
333
353
  };
334
354
 
335
355
  exports.parseHtmlAndTextTag = parseHtmlAndTextTag;
336
356
  var _default = {
337
357
  OpenUserName: OpenUserName,
338
358
  OpenDepartmentName: OpenDepartmentName,
339
- isWechat: isWechat
359
+ isWechat: isWechat,
360
+ isPlatform: isPlatform,
361
+ parseString: parseString,
362
+ parseTag: parseTag,
363
+ parseHtmlAndTextTag: parseHtmlAndTextTag
340
364
  };
341
365
  exports["default"] = _default;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.11.11",
3
+ "version": "1.11.13-beta.2",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",