@titaui/pc 1.11.13 → 1.11.14-beta.1

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 (31) hide show
  1. package/.husky/pre-commit +2 -2
  2. package/lib/components/dynamic/constant.js +4 -2
  3. package/lib/components/dynamic/dynamic-item/dynamic-kr/index.js +1 -1
  4. package/lib/components/dynamic/dynamic-item/dynamic-milestone/index.js +1 -1
  5. package/lib/components/dynamic/dynamic-item/dynamic-progress/index.js +1 -1
  6. package/lib/components/dynamic/dynamic-item/dynamic-reply/index.js +1 -1
  7. package/lib/components/dynamic/dynamic-item/dynamic-task/index.js +1 -1
  8. package/lib/components/dynamic/dynamic-item/index.js +14 -2
  9. package/lib/components/dynamic/dynamic-list/index.js +1 -9
  10. package/lib/components/icon-button-list/index.css +2 -57
  11. package/lib/components/icon-button-list/index.js +8 -5
  12. package/lib/components/okr-flow/child-node/index.css +56 -15
  13. package/lib/components/okr-flow/child-node/work-node.js +22 -4
  14. package/lib/components/okr-flow/empty/index.css +8 -1
  15. package/lib/components/okr-flow/export-modal/index.js +26 -2
  16. package/lib/components/okr-flow/export-modules/okr-search-panel/index.css +3 -1
  17. package/lib/components/okr-flow/export-modules/okr-search-panel/index.js +14 -9
  18. package/lib/components/okr-flow/images/loading-light.gif +0 -0
  19. package/lib/components/okr-flow/okr-map/index.js +32 -14
  20. package/lib/components/okr-flow/request-apis.js +11 -4
  21. package/lib/components/okr-flow/root-node/index.css +2 -2
  22. package/lib/components/okr-flow/utils/index.js +43 -26
  23. package/lib/components/okr-flow/utils/tree-handler.js +14 -3
  24. package/lib/components/okrcase-library/index.css +6 -4
  25. package/lib/components/period-selector/index.js +3 -0
  26. package/lib/pages/okr-map/export-modules/okr-map/header/index.css +6 -1
  27. package/lib/pages/okr-map/export-modules/okr-map/header/index.js +60 -21
  28. package/lib/pages/okr-map/export-modules/okr-map/okr-map.js +27 -17
  29. package/lib/pages/okr-map/number-select/index.css +4 -1
  30. package/lib/pages/okr-map/number-select/index.js +1 -1
  31. package/package.json +1 -1
@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _reactFlowRenderer = _interopRequireWildcard(require("@titaui/react-flow-renderer"));
13
13
 
14
+ var _lodash = _interopRequireDefault(require("lodash"));
15
+
14
16
  var _classnames = _interopRequireDefault(require("classnames"));
15
17
 
16
18
  var _html2canvas = _interopRequireDefault(require("html2canvas"));
@@ -39,6 +41,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
39
41
 
40
42
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
41
43
 
44
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
45
+
46
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
47
+
48
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
49
+
50
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
51
+
42
52
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
43
53
 
44
54
  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."); }
@@ -68,16 +78,12 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
68
78
  onChildClose = _props$onChildClose === void 0 ? function () {} : _props$onChildClose,
69
79
  _props$dataSource = props.dataSource,
70
80
  dataSource = _props$dataSource === void 0 ? [] : _props$dataSource;
81
+ var virtualElements = (0, _react.useRef)([]);
71
82
 
72
- var _useState = (0, _react.useState)([]),
83
+ var _useState = (0, _react.useState)(),
73
84
  _useState2 = _slicedToArray(_useState, 2),
74
- elements = _useState2[0],
75
- setElements = _useState2[1];
76
-
77
- var _useState3 = (0, _react.useState)(),
78
- _useState4 = _slicedToArray(_useState3, 2),
79
- flowInstance = _useState4[0],
80
- setFlowInstance = _useState4[1];
85
+ flowInstance = _useState2[0],
86
+ setFlowInstance = _useState2[1];
81
87
 
82
88
  var isMoving = (0, _react.useRef)(false);
83
89
 
@@ -89,12 +95,10 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
89
95
  onNodeClick & onNodeClick(data);
90
96
  };
91
97
 
92
- var layoutedElements = (0, _utils.getLayoutedElements)(dataSource, direction);
93
-
94
98
  var getDefaultPos = function getDefaultPos() {
95
99
  var containerHeight = document.body.clientHeight - 200 - 96;
96
100
  var containerWidth = document.body.clientWidth - 180 - 320;
97
- var rootNode = layoutedElements[0];
101
+ var rootNode = virtualElements[0];
98
102
 
99
103
  if (direction == "horizontal") {
100
104
  var targetY = containerHeight / 2;
@@ -102,13 +106,27 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
102
106
  }
103
107
 
104
108
  var targetX = containerWidth / 2;
105
- return [targetX - rootNode.position.x, -48];
109
+ return [targetX - rootNode.position.x, -48]; // debugger
110
+ // return [0, 0]
106
111
  };
107
112
 
108
113
  var onLoad = function onLoad(reactFlowInstance) {
109
114
  setFlowInstance(reactFlowInstance);
110
115
  };
111
116
 
117
+ var NodeDebug = function NodeDebug() {
118
+ var elements = (0, _reactFlowRenderer.useStoreState)(function (state) {
119
+ return [].concat(_toConsumableArray(state.nodes), _toConsumableArray(state.edges));
120
+ }, _lodash["default"].isEqual);
121
+ var setElements = (0, _reactFlowRenderer.useStoreActions)(function (actions) {
122
+ return actions.setElements;
123
+ });
124
+ var newElements = (0, _utils.getLayoutedElements)(elements, direction);
125
+ virtualElements = newElements;
126
+ setElements(newElements);
127
+ return null;
128
+ };
129
+
112
130
  (0, _react.useEffect)(function () {
113
131
  if (flowInstance) {
114
132
  var _getDefaultPos = getDefaultPos(),
@@ -174,7 +192,7 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
174
192
 
175
193
  }, /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer.ReactFlowProvider, null, dataSource.length == 0 ? /*#__PURE__*/_react["default"].createElement(_empty["default"], null) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_reactFlowRenderer["default"], {
176
194
  onLoad: onLoad,
177
- elements: layoutedElements,
195
+ elements: dataSource,
178
196
  nodesDraggable: false,
179
197
  nodesConnectable: false,
180
198
  nodeTypes: _utils.nodeTypes,
@@ -182,7 +200,7 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
182
200
  minZoom: 0.25,
183
201
  maxZoom: 1.5,
184
202
  panOnScroll: true
185
- }), /*#__PURE__*/_react["default"].createElement(_miniMap["default"], {
203
+ }, /*#__PURE__*/_react["default"].createElement(NodeDebug, null)), /*#__PURE__*/_react["default"].createElement(_miniMap["default"], {
186
204
  onMoveStart: function onMoveStart() {
187
205
  return isMoving.current = true;
188
206
  }
@@ -78,7 +78,9 @@ var expandNode = function expandNode(params) {
78
78
  _params$okrIdParent = params.okrIdParent,
79
79
  okrIdParent = _params$okrIdParent === void 0 ? 0 : _params$okrIdParent,
80
80
  _params$currentOkrRol = params.currentOkrRole,
81
- currentOkrRole = _params$currentOkrRol === void 0 ? true : _params$currentOkrRol;
81
+ currentOkrRole = _params$currentOkrRol === void 0 ? true : _params$currentOkrRol,
82
+ _params$showCardKr = params.showCardKr,
83
+ showCardKr = _params$showCardKr === void 0 ? 1 : _params$showCardKr;
82
84
  return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/okr/map/expand"), {
83
85
  params: {
84
86
  okrId: okrId,
@@ -87,7 +89,9 @@ var expandNode = function expandNode(params) {
87
89
  // true: 展开子节点, false: 展开父节点
88
90
  okrIdParent: okrIdParent,
89
91
  // 当前选中okr 或 当前选中kr 的okrId(kr的父节点是所属okr)
90
- currentOkrRole: currentOkrRole // 查看权限
92
+ currentOkrRole: currentOkrRole,
93
+ // 查看权限
94
+ showCardKr: showCardKr // o带上kr
91
95
 
92
96
  }
93
97
  }).then(function (res) {
@@ -103,12 +107,15 @@ var expandNodesByLevel = function expandNodesByLevel(_ref2) {
103
107
  _ref2$okrIds = _ref2.okrIds,
104
108
  okrIds = _ref2$okrIds === void 0 ? [] : _ref2$okrIds,
105
109
  _ref2$showKr = _ref2.showKr,
106
- showKr = _ref2$showKr === void 0 ? 0 : _ref2$showKr;
110
+ showKr = _ref2$showKr === void 0 ? 0 : _ref2$showKr,
111
+ _ref2$showCardKr = _ref2.showCardKr,
112
+ showCardKr = _ref2$showCardKr === void 0 ? 0 : _ref2$showCardKr;
107
113
  return (// const queryStr = qs.stringify({ okrIds, level }, { arrayFormat: 'repeat' });
108
114
  _axios["default"].post("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/okr/map/generalview"), {
109
115
  okrIds: okrIds,
110
116
  level: level,
111
- showKr: showKr
117
+ showKr: showKr,
118
+ showCardKr: showCardKr
112
119
  }).then(function (res) {
113
120
  return res.data.Data;
114
121
  })
@@ -1,6 +1,6 @@
1
1
  .titaui-okr-flow--root-node {
2
- padding: 5px 12px;
3
- background: #f0f2f5;
2
+ padding: 4px 12px;
3
+ background: rgba(255, 255, 255, 0.6);
4
4
  border-radius: 16px;
5
5
  color: #89919f;
6
6
  }
@@ -15,6 +15,12 @@ var _rootNode = _interopRequireDefault(require("../root-node"));
15
15
 
16
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
17
17
 
18
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
19
+
20
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
21
+
22
+ function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
23
+
18
24
  var nodeTypes = {
19
25
  ChildNode: _childNode["default"],
20
26
  RootNode: _rootNode["default"]
@@ -24,42 +30,53 @@ exports.nodeTypes = nodeTypes;
24
30
  var getLayoutedElements = function getLayoutedElements(elements) {
25
31
  var direction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "horizontal";
26
32
  var isHorizontal = direction === "horizontal";
27
- var nodeWidth = 320;
28
- var nodeHeight = 96;
29
- var dagreGraph = new _dagre["default"].graphlib.Graph();
30
- dagreGraph.setDefaultEdgeLabel(function () {
31
- return {};
33
+ var g = new _dagre["default"].graphlib.Graph({
34
+ compound: true
32
35
  });
33
- dagreGraph.setGraph({
36
+ g.setGraph({
34
37
  rankdir: isHorizontal ? "LR" : "TB",
35
- ranksep: 80,
36
- nodesep: 12
38
+ nodesep: 12,
39
+ ranksep: 80
37
40
  });
38
- elements.forEach(function (el) {
39
- if ((0, _reactFlowRenderer.isNode)(el)) {
40
- dagreGraph.setNode(el.id, {
41
- width: nodeWidth,
42
- height: nodeHeight
41
+ g.setDefaultEdgeLabel(function () {
42
+ return {};
43
+ });
44
+ elements.forEach(function (element) {
45
+ if ((0, _reactFlowRenderer.isNode)(element)) {
46
+ var _element$__rf, _element$__rf2;
47
+
48
+ // const { data,id } = element
49
+ // if(id!=="0"){
50
+ // const {parentId} = data
51
+ // if(parentId===0||parentId){
52
+ // g.setParent(id, parentId+"");
53
+ // }
54
+ // }
55
+ g.setNode(element.id, {
56
+ width: (_element$__rf = element.__rf) === null || _element$__rf === void 0 ? void 0 : _element$__rf.width,
57
+ height: (_element$__rf2 = element.__rf) === null || _element$__rf2 === void 0 ? void 0 : _element$__rf2.height
43
58
  });
44
59
  } else {
45
- dagreGraph.setEdge(el.source, el.target);
60
+ g.setEdge(element.source, element.target);
46
61
  }
47
62
  });
48
63
 
49
- _dagre["default"].layout(dagreGraph);
50
-
51
- return elements.map(function (el) {
52
- if ((0, _reactFlowRenderer.isNode)(el)) {
53
- var nodeWithPosition = dagreGraph.node(el.id);
54
- el.targetPosition = isHorizontal ? "left" : "top";
55
- el.sourcePosition = isHorizontal ? "right" : "bottom";
56
- el.position = {
57
- x: nodeWithPosition.x,
58
- y: nodeWithPosition.y
59
- };
64
+ _dagre["default"].layout(g);
65
+
66
+ return elements.map(function (element) {
67
+ if ((0, _reactFlowRenderer.isNode)(element)) {
68
+ var node = g.node(element.id);
69
+ return _objectSpread(_objectSpread({}, element), {}, {
70
+ targetPosition: isHorizontal ? "left" : "top",
71
+ sourcePosition: isHorizontal ? "right" : "bottom",
72
+ position: {
73
+ x: node.x - node.width / 2,
74
+ y: node.y - node.height / 2
75
+ }
76
+ });
60
77
  }
61
78
 
62
- return el;
79
+ return element;
63
80
  });
64
81
  };
65
82
 
@@ -130,6 +130,7 @@ exports.formatNodes = formatNodes;
130
130
 
131
131
  var flatTree = function flatTree(current, elements, showkr) {
132
132
  var isParentExpand = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
133
+ var parentId = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
133
134
  if (!current) return;
134
135
  var id = current.id,
135
136
  data = current.data,
@@ -142,7 +143,12 @@ var flatTree = function flatTree(current, elements, showkr) {
142
143
  elements.push({
143
144
  id: "".concat(id),
144
145
  type: "RootNode",
145
- data: data
146
+ data: data,
147
+ isParent: true,
148
+ position: {
149
+ x: 0,
150
+ y: 0
151
+ }
146
152
  });
147
153
  } else {
148
154
  var isChildExpand = false;
@@ -164,11 +170,16 @@ var flatTree = function flatTree(current, elements, showkr) {
164
170
  elements.push({
165
171
  id: "".concat(id),
166
172
  type: "ChildNode",
173
+ position: {
174
+ x: 0,
175
+ y: 0
176
+ },
167
177
  data: {
168
178
  id: id,
169
179
  data: data,
170
180
  isParentExpand: isParentExpand,
171
181
  isChildExpand: isChildExpand,
182
+ parentId: parentId,
172
183
  modelType: modelType,
173
184
  isSearchRes: isSearchRes
174
185
  }
@@ -191,7 +202,7 @@ var flatTree = function flatTree(current, elements, showkr) {
191
202
  source: "".concat(id),
192
203
  target: "".concat(sub.id)
193
204
  });
194
- flatTree(sub, elements, showkr, current.modelType != "root");
205
+ flatTree(sub, elements, showkr, current.modelType != "root", id);
195
206
  });
196
207
  }
197
208
  } else {
@@ -200,7 +211,7 @@ var flatTree = function flatTree(current, elements, showkr) {
200
211
  source: "".concat(id),
201
212
  target: "".concat(child.id)
202
213
  });
203
- flatTree(child, elements, showkr, current.modelType != "root");
214
+ flatTree(child, elements, showkr, current.modelType != "root", id);
204
215
  }
205
216
  });
206
217
  }
@@ -647,12 +647,14 @@
647
647
  }
648
648
 
649
649
  .okr-cases-library__pay-window__commit-order {
650
- background: #FFFFFF;
650
+ background: #ffffff;
651
651
  border-radius: 8px;
652
- border: 1px solid #DFE3EA;
652
+ border: 1px solid #dfe3ea;
653
653
  padding: 12px 20px;
654
- color: #3F4755;
654
+ color: #3f4755;
655
655
  cursor: pointer;
656
+ display: flex;
657
+ align-items: center;
656
658
  }
657
659
 
658
660
  .okr-cases-library__pay-window__commit-order--wx {
@@ -660,7 +662,7 @@
660
662
  }
661
663
 
662
664
  .okr-cases-library__pay-window__commit-order--active {
663
- border-color: #2879FF;
665
+ border-color: #2879ff;
664
666
  position: relative;
665
667
  }
666
668
 
@@ -73,6 +73,8 @@ function PeriodSelector(_ref) {
73
73
  wrapperStyle = _ref.wrapperStyle,
74
74
  popClass = _ref.popClass,
75
75
  style = _ref.style,
76
+ _ref$buttonClass = _ref.buttonClass,
77
+ buttonClass = _ref$buttonClass === void 0 ? "" : _ref$buttonClass,
76
78
  _ref$noBorder = _ref.noBorder,
77
79
  noBorder = _ref$noBorder === void 0 ? false : _ref$noBorder;
78
80
 
@@ -174,6 +176,7 @@ function PeriodSelector(_ref) {
174
176
  className: className
175
177
  }, children || /*#__PURE__*/_react["default"].createElement(_button["default"], {
176
178
  type: "default",
179
+ className: buttonClass,
177
180
  style: noBorder ? {
178
181
  padding: "0",
179
182
  border: "none"
@@ -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 !important;
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,31 +79,65 @@ 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
- icon: "export",
80
- overlay: (0, _getLocale.getLocale)("Mod_Export")
88
+ icon: "daochu",
89
+ overlay: (0, _getLocale.getLocale)("Mod_Export"),
90
+ type: 'export'
81
91
  }, {
82
- icon: "share",
83
- overlay: (0, _getLocale.getLocale)("OKR_MyO_Share")
92
+ icon: "fenxiang",
93
+ overlay: (0, _getLocale.getLocale)("OKR_MyO_Share"),
94
+ type: 'share'
84
95
  }, {
85
- icon: fullScreen ? "quit-fullscreen" : "fullscreen",
86
- overlay: (0, _getLocale.getLocale)("OKR_Ali_Butt_Fullscreen")
96
+ icon: fullScreen ? "restore" : "quanping",
97
+ overlay: (0, _getLocale.getLocale)("OKR_Ali_Butt_Fullscreen"),
98
+ type: fullScreen ? 'quit-fullscreen' : 'fullscreen'
87
99
  }, {
88
- icon: direction == "horizontal" ? "vertical" : "horizontal",
100
+ icon: direction == "horizontal" ? "yangshi-ditu" : "yangshi-ditu",
89
101
  overlay: direction == "horizontal" ? "".concat((0, _getLocale.getLocale)("OKR_Ali_Butt_Toggleportrait")) : "".concat((0, _getLocale.getLocale)("OKR_Ali_Butt_Togglelandscape")),
90
- placement: "topRight"
102
+ placement: "topRight",
103
+ rotate: direction == "horizontal" ? 0 : -90,
104
+ type: direction == "horizontal" ? "vertical" : "horizontal"
91
105
  }];
92
106
 
107
+ var onConfirmHandler = function onConfirmHandler(checked) {
108
+ onShowKrClick(checked);
109
+
110
+ if (showCardKr) {
111
+ _toast["default"].Warning('仅允许开启一项');
112
+
113
+ onShowCardKr(false);
114
+ }
115
+ };
116
+
117
+ var onhandleShowCardKr = function onhandleShowCardKr(checked) {
118
+ onShowCardKr(checked);
119
+
120
+ if (showkr) {
121
+ _toast["default"].Warning('仅允许开启一项');
122
+
123
+ onShowKrClick(false);
124
+ }
125
+ };
126
+
93
127
  var popup = /*#__PURE__*/_react["default"].createElement("div", {
94
128
  className: (0, _classnames["default"])("".concat(preCls, "__show-more-popup"))
95
129
  }, /*#__PURE__*/_react["default"].createElement("div", {
96
130
  className: (0, _classnames["default"])("".concat(preCls, "__header-action-showkr"))
131
+ }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
132
+ label: (0, _getLocale.getLocale)("OKR_Db_KRDetails"),
133
+ checked: showCardKr,
134
+ onChange: onhandleShowCardKr
135
+ })), /*#__PURE__*/_react["default"].createElement("div", {
136
+ className: (0, _classnames["default"])("".concat(preCls, "__header-action-showkr"))
97
137
  }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
98
138
  label: (0, _getLocale.getLocale)("OKR_Ali_Butt_ExhibitionKRs"),
99
139
  checked: showkr,
100
- onChange: function onChange() {
101
- return setVisible(true);
102
- }
140
+ onChange: onConfirmHandler
103
141
  })), /*#__PURE__*/_react["default"].createElement("div", {
104
142
  className: (0, _classnames["default"])("".concat(preCls, "__header-action-level"))
105
143
  }, /*#__PURE__*/_react["default"].createElement(_numberSelect["default"], {
@@ -112,15 +150,10 @@ function _default(props) {
112
150
  defaultValue: openLevel
113
151
  })));
114
152
 
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];
153
+ var _useState5 = (0, _react.useState)(false),
154
+ _useState6 = _slicedToArray(_useState5, 2),
155
+ fold = _useState6[0],
156
+ setFold = _useState6[1];
124
157
 
125
158
  return /*#__PURE__*/_react["default"].createElement("div", {
126
159
  className: (0, _classnames["default"])("".concat(preCls, "__header"), _defineProperty({}, "".concat(preCls, "__header__folded"), fold))
@@ -137,7 +170,8 @@ function _default(props) {
137
170
  align: "bottomRight",
138
171
  onChange: onPeriodChange,
139
172
  selected: period,
140
- yearsRange: [2018, 2030]
173
+ yearsRange: [2018, 2030],
174
+ buttonClass: "".concat(preCls, "__header-period")
141
175
  }))), /*#__PURE__*/_react["default"].createElement("div", {
142
176
  className: (0, _classnames["default"])("".concat(preCls, "__header-action"))
143
177
  }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -178,5 +212,10 @@ function _default(props) {
178
212
  setVisible: setVisible,
179
213
  onConfirmHandler: onConfirmHandler,
180
214
  showkr: showkr
215
+ }), /*#__PURE__*/_react["default"].createElement(_showKrConfirm["default"], {
216
+ visible: ovisible,
217
+ setVisible: setOVisible,
218
+ onConfirmHandler: onhandleShowCardKr,
219
+ showkr: showCardKr
181
220
  }));
182
221
  }
@@ -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
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.11.13",
3
+ "version": "1.11.14-beta.1",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",