@titaui/pc 1.15.31 → 1.15.34
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.
- package/lib/components/dynamic/dynamic-item/components/summary-header/index.js +2 -1
- package/lib/components/img-viewer/index.css +1 -0
- package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js +3 -3
- package/lib/components/okr-flow/child-node/fields/creator.js +7 -6
- package/lib/components/okr-flow/child-node/index.css +3 -2
- package/lib/components/okr-flow/child-node/work-node.js +1 -1
- package/lib/components/task-relation-modal/relation-single-okr/index.css +6 -1
- package/package.json +1 -1
|
@@ -160,6 +160,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
|
|
|
160
160
|
departmentName = _ref3.departmentName,
|
|
161
161
|
departmentId = _ref3.departmentId;
|
|
162
162
|
|
|
163
|
+
console.log('users', users);
|
|
163
164
|
var departmentsRender = (0, _react.useMemo)(function () {
|
|
164
165
|
return (departments === null || departments === void 0 ? void 0 : departments.length) !== 0 && departments.map(function (item, index) {
|
|
165
166
|
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
|
|
@@ -172,7 +173,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
|
|
|
172
173
|
return (users === null || users === void 0 ? void 0 : users.length) !== 0 && users.map(function (item, index) {
|
|
173
174
|
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
174
175
|
name: item.name,
|
|
175
|
-
id: item.
|
|
176
|
+
id: item.userId
|
|
176
177
|
}), /*#__PURE__*/_react["default"].createElement("span", null, ","));
|
|
177
178
|
});
|
|
178
179
|
}, [users]);
|
|
@@ -137,12 +137,12 @@ var EKrNode = function EKrNode(props) {
|
|
|
137
137
|
allowObjectOptions: true,
|
|
138
138
|
labelOption: {
|
|
139
139
|
isOnlyCurrent: true,
|
|
140
|
-
labelId: data.mileStoneId,
|
|
140
|
+
labelId: data.mileStoneId === 0 ? data.workId : data.mileStoneId,
|
|
141
141
|
workId: data.workId,
|
|
142
142
|
workName: okrInfo.workName,
|
|
143
|
-
name: data.mileStoneName,
|
|
143
|
+
name: data.mileStoneId === 0 ? okrInfo.workName : data.mileStoneName,
|
|
144
144
|
krId: data.mileStoneId,
|
|
145
|
-
type:
|
|
145
|
+
type: data.mileStoneId === 0 ? 'okr' : 'kr'
|
|
146
146
|
}
|
|
147
147
|
}
|
|
148
148
|
}).then(function () {
|
|
@@ -116,7 +116,7 @@ function Creator(_ref) {
|
|
|
116
116
|
var generalCanvas = function generalCanvas() {
|
|
117
117
|
var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "text";
|
|
118
118
|
var userName = arguments.length > 1 ? arguments[1] : undefined;
|
|
119
|
-
var font = "normal
|
|
119
|
+
var font = "normal 24px/30px Arial,Verdana,Helvetica Neue,Helvetica,sans-serif,PingFang SC,Microsoft YaHei";
|
|
120
120
|
var canvas = document.createElement("canvas");
|
|
121
121
|
var ctx = canvas.getContext("2d");
|
|
122
122
|
ctx.font = font;
|
|
@@ -124,14 +124,14 @@ function Creator(_ref) {
|
|
|
124
124
|
var _ctx$measureText = ctx.measureText(userName),
|
|
125
125
|
width = _ctx$measureText.width;
|
|
126
126
|
|
|
127
|
-
var actualWidth = Math.min(width,
|
|
128
|
-
(0, _openDataPainter.setSize)(canvas, ctx, actualWidth,
|
|
127
|
+
var actualWidth = Math.min(width, 184);
|
|
128
|
+
(0, _openDataPainter.setSize)(canvas, ctx, actualWidth, 48); // 设置画布尺寸
|
|
129
129
|
|
|
130
130
|
setImgwidth(actualWidth);
|
|
131
131
|
ctx.textBaseline = "middle";
|
|
132
132
|
ctx.font = font;
|
|
133
133
|
ctx.fillStyle = type == "text" ? "#6f7886" : "#FFFFFF";
|
|
134
|
-
ctx.fillText(userName, 0,
|
|
134
|
+
ctx.fillText(userName, 0, 36);
|
|
135
135
|
type == "text" ? setNormalImg(canvas.toDataURL()) : setWhiteImg(canvas.toDataURL());
|
|
136
136
|
};
|
|
137
137
|
|
|
@@ -167,9 +167,10 @@ function Creator(_ref) {
|
|
|
167
167
|
src: darkTheme ? whiteImg : normalImg,
|
|
168
168
|
style: {
|
|
169
169
|
maxWidth: 92,
|
|
170
|
-
marginLeft: 4
|
|
170
|
+
marginLeft: 4,
|
|
171
|
+
transform: 'translateY(-20%)'
|
|
171
172
|
},
|
|
172
|
-
width: imgWidth
|
|
173
|
+
width: Number(imgWidth) / 2
|
|
173
174
|
}));
|
|
174
175
|
}
|
|
175
176
|
|
|
@@ -144,7 +144,7 @@
|
|
|
144
144
|
.titaui-okr-flow--node-right {
|
|
145
145
|
position: absolute;
|
|
146
146
|
right: 0;
|
|
147
|
-
top:
|
|
147
|
+
top: 2px;
|
|
148
148
|
}
|
|
149
149
|
|
|
150
150
|
.titaui-okr-flow--node-type {
|
|
@@ -152,6 +152,7 @@
|
|
|
152
152
|
}
|
|
153
153
|
|
|
154
154
|
.titaui-okr-flow--node-cycle, .titaui-okr-flow--node-type {
|
|
155
|
+
height: 22px;
|
|
155
156
|
display: inline-block !important;
|
|
156
157
|
background: #f7f9fb;
|
|
157
158
|
border-radius: 12px;
|
|
@@ -163,7 +164,7 @@
|
|
|
163
164
|
overflow: hidden;
|
|
164
165
|
text-overflow: ellipsis;
|
|
165
166
|
white-space: nowrap;
|
|
166
|
-
line-height:
|
|
167
|
+
line-height: 22px;
|
|
167
168
|
max-width: 96px;
|
|
168
169
|
}
|
|
169
170
|
|
|
@@ -165,7 +165,7 @@ function WorkNode(_ref) {
|
|
|
165
165
|
var name = arguments.length > 1 ? arguments[1] : undefined;
|
|
166
166
|
var canvas = document.createElement('canvas');
|
|
167
167
|
var ctx = canvas.getContext('2d');
|
|
168
|
-
var font = '
|
|
168
|
+
var font = '400 12px/12px OPPOSans, Arial, Verdana, "Helvetica Neue", Helvetica, sans-serif, "PingFang SC", "Microsoft YaHei"';
|
|
169
169
|
ctx.font = font; // const fitStr = fittingString(ctx, name, 92);
|
|
170
170
|
|
|
171
171
|
var _ctx$measureText = ctx.measureText(name),
|
|
@@ -5,11 +5,16 @@
|
|
|
5
5
|
box-shadow: 0px 4px 16px 0px rgba(127, 145, 180, 0.2);
|
|
6
6
|
border: 1px solid #F0F2F5;
|
|
7
7
|
border-radius: 24px;
|
|
8
|
-
padding: 20px
|
|
8
|
+
padding: 20px 10px 16px 16px;
|
|
9
9
|
box-sizing: border-box;
|
|
10
10
|
overflow: auto;
|
|
11
11
|
}
|
|
12
12
|
|
|
13
|
+
.relation-single-okr__pop::-webkit-scrollbar {
|
|
14
|
+
width: 10px !important;
|
|
15
|
+
height: 10px !important;
|
|
16
|
+
}
|
|
17
|
+
|
|
13
18
|
.relation-single-okr__pop-O {
|
|
14
19
|
display: flex;
|
|
15
20
|
align-items: flex-start;
|