@titaui/pc 1.10.70 → 1.10.74

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.
@@ -221,7 +221,10 @@ var Dynamic = function Dynamic() {
221
221
  setNoMoreData(resp.Data.isEnd);
222
222
 
223
223
  if (needResetValue) {
224
- setDynamicData(resp.Data.feeds);
224
+ setDynamicData([]);
225
+ setTimeout(function () {
226
+ setDynamicData(resp.Data.feeds);
227
+ }, 0);
225
228
  } else {
226
229
  setDynamicData(JSON.parse(JSON.stringify([].concat(_toConsumableArray(dynamicData), _toConsumableArray(resp.Data.feeds)))));
227
230
  }
@@ -176,7 +176,7 @@ var EKrNode = function EKrNode(props) {
176
176
  className: (0, _classnames["default"])("tu-icon-O ".concat(_precls["default"], "__e-kr-node-preicon"))
177
177
  }) : /*#__PURE__*/_react["default"].createElement("span", {
178
178
  className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-prefix"))
179
- }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
179
+ }, "KR", data.SortNum ? data.SortNum + 1 : index + 1), /*#__PURE__*/_react["default"].createElement("span", {
180
180
  className: (0, _classnames["default"])("".concat(_precls["default"], "__e-kr-node-title")),
181
181
  onClick: function onClick() {
182
182
  if (data.mileStoneId) {
@@ -332,7 +332,7 @@ function _default(props) {
332
332
  editable: krCanEdit,
333
333
  onEditUser: onEditUserHandler,
334
334
  nameTips: function nameTips(name) {
335
- return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A");
335
+ return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A", name);
336
336
  }
337
337
  })), showKrWeight && /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
338
338
  width: 60,
@@ -215,7 +215,7 @@ function Elist(props, ref) {
215
215
  !(index + 1 == krList.length && oEList.length == 0) && hasdivider && /*#__PURE__*/_react["default"].createElement("div", {
216
216
  className: "e__divider"
217
217
  }));
218
- }), oEList.map(function (kr) {
218
+ }), !!oEList && !!oEList.length && oEList.map(function (kr) {
219
219
  return /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
220
220
  padding: layoutPadding
221
221
  }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
@@ -102,7 +102,20 @@ function RootNode(props) {
102
102
  style: {
103
103
  backgroundColor: color
104
104
  }
105
- }, rootName[0]);
105
+ }, /*#__PURE__*/_react["default"].createElement("div", {
106
+ style: {
107
+ height: '24px',
108
+ width: '12px',
109
+ overflow: 'hidden',
110
+ margin: '0px auto'
111
+ }
112
+ }, /*#__PURE__*/_react["default"].createElement("img", {
113
+ src: whiteRootImg,
114
+ style: {
115
+ maxWidth: 268
116
+ },
117
+ width: imgWidth
118
+ })));
106
119
  }
107
120
 
108
121
  if (searchType == "depart") {
@@ -37,7 +37,7 @@
37
37
  position: absolute;
38
38
  width: 100%;
39
39
  bottom: 0;
40
- content: "";
40
+ content: '';
41
41
  border-bottom: 2px solid #2879ff;
42
42
  z-index: 1;
43
43
  }
@@ -51,7 +51,7 @@
51
51
  position: absolute;
52
52
  width: 100%;
53
53
  top: 0;
54
- content: "";
54
+ content: '';
55
55
  border-top: 2px solid #2879ff;
56
56
  z-index: 1;
57
57
  }
@@ -61,6 +61,7 @@
61
61
  align-items: center;
62
62
  line-height: unset;
63
63
  overflow: hidden;
64
+ border-radius: 8px;
64
65
  }
65
66
 
66
67
  .titaui-tree .rc-tree .rc-tree-treenode .rc-tree-node-content-wrapper {
package/lib/utils/auth.js CHANGED
@@ -92,8 +92,10 @@ var OAuth = /*#__PURE__*/function (_BaseAuth) {
92
92
  }, {
93
93
  key: "isPrincipalUser",
94
94
  value: function isPrincipalUser() {
95
+ var _this$principalUser;
96
+
95
97
  // console.log('o isp', this.userId, this.principalUser.userId)
96
- return this.userId == this.principalUser.userId;
98
+ return this.userId == ((_this$principalUser = this.principalUser) === null || _this$principalUser === void 0 ? void 0 : _this$principalUser.userId);
97
99
  } // 有操作OKR的權限
98
100
 
99
101
  }, {
@@ -139,8 +141,10 @@ var KRAuth = /*#__PURE__*/function (_BaseAuth2) {
139
141
  }, {
140
142
  key: "isPrincipalUser",
141
143
  value: function isPrincipalUser() {
144
+ var _this$user;
145
+
142
146
  // console.log('kr isp', this.userId, this.user.userId)
143
- return this.userId == this.user.userId;
147
+ return this.userId == ((_this$user = this.user) === null || _this$user === void 0 ? void 0 : _this$user.userId);
144
148
  } // 有操作KR的權限
145
149
 
146
150
  }, {
@@ -178,15 +182,19 @@ var EAuth = /*#__PURE__*/function (_BaseAuth3) {
178
182
  _createClass(EAuth, [{
179
183
  key: "isCreater",
180
184
  value: function isCreater() {
185
+ var _this$user2;
186
+
181
187
  // console.log('e iscreater', this.userId, this.user.userId)
182
- return this.userId == this.user.userId;
188
+ return this.userId == ((_this$user2 = this.user) === null || _this$user2 === void 0 ? void 0 : _this$user2.userId);
183
189
  } // 負責人
184
190
 
185
191
  }, {
186
192
  key: "isPrincipalUser",
187
193
  value: function isPrincipalUser() {
194
+ var _this$principalUser2;
195
+
188
196
  // console.log('e isp', this.userId, this.principalUser.userId)
189
- return this.userId == this.principalUser.userId;
197
+ return this.userId == ((_this$principalUser2 = this.principalUser) === null || _this$principalUser2 === void 0 ? void 0 : _this$principalUser2.userId);
190
198
  } // 有操作KR的權限
191
199
 
192
200
  }, {
@@ -268,7 +276,9 @@ var ChildAuth = /*#__PURE__*/function (_BaseAuth5) {
268
276
  _createClass(ChildAuth, [{
269
277
  key: "isPrincipalUser",
270
278
  value: function isPrincipalUser() {
271
- return this.userId == this.principalUser.userId;
279
+ var _this$principalUser3;
280
+
281
+ return this.userId == ((_this$principalUser3 = this.principalUser) === null || _this$principalUser3 === void 0 ? void 0 : _this$principalUser3.userId);
272
282
  } // 超管、助理、目标管理员以及目标负责人可以修改此目标下对齐子目标的权重;
273
283
 
274
284
  }, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.10.70",
3
+ "version": "1.10.74",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",