@steedos-labs/content-compliance 0.7.10 → 0.7.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.
- package/dist/index.js +1 -1
- package/lib/actions/initUrgentQuota.js +7 -7
- package/lib/actions/initUrgentQuota.js.map +1 -1
- package/lib/methods/__tests__/urgent.test.d.ts +1 -0
- package/lib/methods/__tests__/urgent.test.js +121 -0
- package/lib/methods/__tests__/urgent.test.js.map +1 -0
- package/lib/methods/approval_engine.js +55 -21
- package/lib/methods/approval_engine.js.map +1 -1
- package/lib/methods/urgent.d.ts +1 -0
- package/lib/methods/urgent.js +43 -37
- package/lib/methods/urgent.js.map +1 -1
- package/main/default/objects/pepsico_material_approval/buttons/pepsico_postpone_review.button.yml +1 -1
- package/main/default/objects/pepsico_material_approval/buttons/pepsico_urgent_review.button.yml +3 -2
- package/main/default/objects/pepsico_material_approval/listviews/all.listview.yml +3 -3
- package/main/default/objects/pepsico_material_approval/listviews/collaboration.listview.yml +3 -3
- package/main/default/objects/pepsico_material_approval/listviews/handle.listview.yml +3 -3
- package/main/default/objects/pepsico_material_approval/listviews/handle_postpone.listview.yml +3 -3
- package/package.json +1 -1
- package/public/content-review/amis.css +4 -0
package/lib/methods/urgent.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ export type UrgentQuotaInfo = {
|
|
|
4
4
|
total: number;
|
|
5
5
|
year: number;
|
|
6
6
|
half: number;
|
|
7
|
+
configured: boolean;
|
|
7
8
|
};
|
|
8
9
|
export declare const getUrgentQuota: (ctx: any, userId: string, space: string) => Promise<UrgentQuotaInfo>;
|
|
9
10
|
export declare const canUrgent: (ctx: any, approvalId: string, userId: string) => Promise<{
|
package/lib/methods/urgent.js
CHANGED
|
@@ -17,6 +17,9 @@ var getUrgentQuota = function (ctx, userId, space) { return tslib_1.__awaiter(vo
|
|
|
17
17
|
})];
|
|
18
18
|
case 1:
|
|
19
19
|
quota = _a.sent();
|
|
20
|
+
if (!quota) {
|
|
21
|
+
return [2, { available: 0, used: 0, total: 0, year: year, half: half, configured: false }];
|
|
22
|
+
}
|
|
20
23
|
h1_used = (quota === null || quota === void 0 ? void 0 : quota.h1_used) || 0;
|
|
21
24
|
h2_used = (quota === null || quota === void 0 ? void 0 : quota.h2_used) || 0;
|
|
22
25
|
if (half === 1) {
|
|
@@ -30,13 +33,13 @@ var getUrgentQuota = function (ctx, userId, space) { return tslib_1.__awaiter(vo
|
|
|
30
33
|
used = h2_used;
|
|
31
34
|
available = Math.max(0, total - h2_used);
|
|
32
35
|
}
|
|
33
|
-
return [2, { available: available, used: used, total: total, year: year, half: half }];
|
|
36
|
+
return [2, { available: available, used: used, total: total, year: year, half: half, configured: true }];
|
|
34
37
|
}
|
|
35
38
|
});
|
|
36
39
|
}); };
|
|
37
40
|
exports.getUrgentQuota = getUrgentQuota;
|
|
38
41
|
var canUrgent = function (ctx, approvalId, userId) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
39
|
-
var approval, reviewSteps, postponedUsers, quota;
|
|
42
|
+
var approval, spaceUser, reviewSteps, postponedUsers, quota;
|
|
40
43
|
return tslib_1.__generator(this, function (_a) {
|
|
41
44
|
switch (_a.label) {
|
|
42
45
|
case 0: return [4, ctx.getObject('pepsico_material_approval').findOne(approvalId)];
|
|
@@ -51,6 +54,15 @@ var canUrgent = function (ctx, approvalId, userId) { return tslib_1.__awaiter(vo
|
|
|
51
54
|
if (approval.owner !== userId) {
|
|
52
55
|
return [2, { canUrgent: false, reason: '只有发起人可以加急' }];
|
|
53
56
|
}
|
|
57
|
+
return [4, ctx.getObject('space_users').findOne({
|
|
58
|
+
filters: [['user', '=', userId], ['space', '=', approval.space]],
|
|
59
|
+
fields: ['is_collaborator']
|
|
60
|
+
})];
|
|
61
|
+
case 2:
|
|
62
|
+
spaceUser = _a.sent();
|
|
63
|
+
if ((spaceUser === null || spaceUser === void 0 ? void 0 : spaceUser.is_collaborator) === true) {
|
|
64
|
+
return [2, { canUrgent: false, reason: '只有内部用户可以加急' }];
|
|
65
|
+
}
|
|
54
66
|
reviewSteps = [consts_1.Step.departmental_review, consts_1.Step.personnel_review];
|
|
55
67
|
if (!reviewSteps.includes(approval.current_step)) {
|
|
56
68
|
return [2, { canUrgent: false, reason: '当前步骤不支持加急' }];
|
|
@@ -60,8 +72,11 @@ var canUrgent = function (ctx, approvalId, userId) { return tslib_1.__awaiter(vo
|
|
|
60
72
|
return [2, { canUrgent: false, reason: '存在延后审核人，无法加急' }];
|
|
61
73
|
}
|
|
62
74
|
return [4, (0, exports.getUrgentQuota)(ctx, userId, approval.space)];
|
|
63
|
-
case
|
|
75
|
+
case 3:
|
|
64
76
|
quota = _a.sent();
|
|
77
|
+
if (!quota.configured) {
|
|
78
|
+
return [2, { canUrgent: false, reason: '未配置加急次数', quota: quota }];
|
|
79
|
+
}
|
|
65
80
|
if (quota.available <= 0) {
|
|
66
81
|
return [2, { canUrgent: false, reason: '暂无加急次数', quota: quota }];
|
|
67
82
|
}
|
|
@@ -173,30 +188,21 @@ var doUrgent = function (ctx, approvalId, userId) { return tslib_1.__awaiter(voi
|
|
|
173
188
|
})];
|
|
174
189
|
case 3:
|
|
175
190
|
existingQuota = _d.sent();
|
|
191
|
+
if (!existingQuota) {
|
|
192
|
+
throw new Error('未配置加急次数');
|
|
193
|
+
}
|
|
176
194
|
updateField = half === 1 ? 'h1_used' : 'h2_used';
|
|
177
|
-
if (!existingQuota) return [3, 5];
|
|
178
195
|
return [4, ctx.getObject('pepsico_urgent_quota').directUpdate(existingQuota._id, (_b = {},
|
|
179
196
|
_b[updateField] = (existingQuota[updateField] || 0) + 1,
|
|
180
197
|
_b))];
|
|
181
198
|
case 4:
|
|
182
199
|
_d.sent();
|
|
183
|
-
return [
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
h2_used: half === 2 ? 1 : 0
|
|
190
|
-
})];
|
|
191
|
-
case 6:
|
|
192
|
-
_d.sent();
|
|
193
|
-
_d.label = 7;
|
|
194
|
-
case 7: return [4, ctx.getObject('pepsico_material_approval').directUpdate(approvalId, {
|
|
195
|
-
is_urgent: true,
|
|
196
|
-
urgent_times: (approval.urgent_times || 0) + 1,
|
|
197
|
-
urgent_at: new Date()
|
|
198
|
-
})];
|
|
199
|
-
case 8:
|
|
200
|
+
return [4, ctx.getObject('pepsico_material_approval').directUpdate(approvalId, {
|
|
201
|
+
is_urgent: true,
|
|
202
|
+
urgent_times: (approval.urgent_times || 0) + 1,
|
|
203
|
+
urgent_at: new Date()
|
|
204
|
+
})];
|
|
205
|
+
case 5:
|
|
200
206
|
_d.sent();
|
|
201
207
|
return [4, ctx.getObject('pepsico_urgent_log').insert({
|
|
202
208
|
approval: approvalId,
|
|
@@ -206,38 +212,38 @@ var doUrgent = function (ctx, approvalId, userId) { return tslib_1.__awaiter(voi
|
|
|
206
212
|
year: year,
|
|
207
213
|
half: half
|
|
208
214
|
})];
|
|
209
|
-
case
|
|
215
|
+
case 6:
|
|
210
216
|
_d.sent();
|
|
211
217
|
pendingApprovers = Array.isArray(approval.person_pending_approve)
|
|
212
218
|
? approval.person_pending_approve
|
|
213
219
|
: [];
|
|
214
|
-
_d.label =
|
|
215
|
-
case
|
|
216
|
-
_d.trys.push([
|
|
220
|
+
_d.label = 7;
|
|
221
|
+
case 7:
|
|
222
|
+
_d.trys.push([7, 12, 13, 14]);
|
|
217
223
|
pendingApprovers_1 = tslib_1.__values(pendingApprovers), pendingApprovers_1_1 = pendingApprovers_1.next();
|
|
218
|
-
_d.label =
|
|
219
|
-
case
|
|
220
|
-
if (!!pendingApprovers_1_1.done) return [3,
|
|
224
|
+
_d.label = 8;
|
|
225
|
+
case 8:
|
|
226
|
+
if (!!pendingApprovers_1_1.done) return [3, 11];
|
|
221
227
|
approverId = pendingApprovers_1_1.value;
|
|
222
228
|
return [4, sendUrgentNotification(ctx, approval.space, approvalId, approval.name, userId, approverId)];
|
|
223
|
-
case
|
|
229
|
+
case 9:
|
|
224
230
|
_d.sent();
|
|
225
|
-
_d.label =
|
|
226
|
-
case
|
|
231
|
+
_d.label = 10;
|
|
232
|
+
case 10:
|
|
227
233
|
pendingApprovers_1_1 = pendingApprovers_1.next();
|
|
228
|
-
return [3,
|
|
229
|
-
case
|
|
230
|
-
case
|
|
234
|
+
return [3, 8];
|
|
235
|
+
case 11: return [3, 14];
|
|
236
|
+
case 12:
|
|
231
237
|
e_2_1 = _d.sent();
|
|
232
238
|
e_2 = { error: e_2_1 };
|
|
233
|
-
return [3,
|
|
234
|
-
case
|
|
239
|
+
return [3, 14];
|
|
240
|
+
case 13:
|
|
235
241
|
try {
|
|
236
242
|
if (pendingApprovers_1_1 && !pendingApprovers_1_1.done && (_c = pendingApprovers_1.return)) _c.call(pendingApprovers_1);
|
|
237
243
|
}
|
|
238
244
|
finally { if (e_2) throw e_2.error; }
|
|
239
245
|
return [7];
|
|
240
|
-
case
|
|
246
|
+
case 14:
|
|
241
247
|
newUsed = used + 1;
|
|
242
248
|
newAvailable = Math.max(0, total - newUsed);
|
|
243
249
|
return [2, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"urgent.js","sourceRoot":"","sources":["../../src/methods/urgent.ts"],"names":[],"mappings":";;;;AAMA,mCAAkD;AAElD,IAAM,eAAe,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"urgent.js","sourceRoot":"","sources":["../../src/methods/urgent.ts"],"names":[],"mappings":"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"}
|
package/main/default/objects/pepsico_material_approval/buttons/pepsico_postpone_review.button.yml
CHANGED
|
@@ -8,7 +8,7 @@ amis_schema: |-
|
|
|
8
8
|
"label": "延后审核",
|
|
9
9
|
"id": "u:pepsico_postpone_review",
|
|
10
10
|
"editorState": "default",
|
|
11
|
-
"visibleOn": "${(current_step == 'departmental_review' || current_step == 'personnel_review') && !ARRAYINCLUDES(person_pending_approve, context.user.user) && ARRAYINCLUDES(person_approved, context.user.user) && !ARRAYINCLUDES(postpone_marker_users, context.user.user) && !ARRAYINCLUDES(review_postponed_users, context.user.user) && !is_skip_approver &&
|
|
11
|
+
"visibleOn": "${(current_step == 'departmental_review' || current_step == 'personnel_review' || current_step == 'submitter_revisions') && !is_urgent && !ARRAYINCLUDES(person_pending_approve, context.user.user) && ARRAYINCLUDES(person_approved, context.user.user) && !ARRAYINCLUDES(postpone_marker_users, context.user.user) && !ARRAYINCLUDES(review_postponed_users, context.user.user) && !is_skip_approver && ((ARRAYINCLUDES(ns_reviewer, context.user.user) && ns_approval_status == false) || (ARRAYINCLUDES(legal_reviewer, context.user.user) && legal_approval_status == false) || (ARRAYINCLUDES(sra_reviewer, context.user.user) && sra_approval_status == false) || (ARRAYINCLUDES(ca_reviewer, context.user.user) && ca_approval_status == false) || (ARRAYINCLUDES(reviewer, context.user.user) && approval_status == false) || (pre_ns_reviewer == context.user.user && pre_ns_approval_status == false) || (pre_legal_reviewer == context.user.user && pre_legal_approval_status == false) || (pre_sra_reviewer == context.user.user && pre_sra_approval_status == false) || (pre_ca_reviewer == context.user.user && pre_ca_approval_status == false) || (pre_reviewer == context.user.user && pre_approval_status == false)) && formFactor != 'SMALL'}",
|
|
12
12
|
"onEvent": {
|
|
13
13
|
"click": {
|
|
14
14
|
"weight": 0,
|
package/main/default/objects/pepsico_material_approval/buttons/pepsico_urgent_review.button.yml
CHANGED
|
@@ -16,7 +16,7 @@ amis_schema: |-
|
|
|
16
16
|
"editorState": "default",
|
|
17
17
|
"visibleOn": "${(current_step == 'departmental_review' || current_step == 'personnel_review') && !is_urgent && context.user.user == owner && ENDSWITH(context.user.email, '@pepsico.com') && formFactor != 'SMALL'}",
|
|
18
18
|
"disabledOn": "${quota && quota.available === 0}",
|
|
19
|
-
"disabledTip": "${quota && quota.available === 0 ? '暂无加急次数' : ''}",
|
|
19
|
+
"disabledTip": "${quota && quota.available === 0 ? (reason || '暂无加急次数') : ''}",
|
|
20
20
|
"onEvent": {
|
|
21
21
|
"click": {
|
|
22
22
|
"weight": 0,
|
|
@@ -35,11 +35,12 @@ amis_schema: |-
|
|
|
35
35
|
{
|
|
36
36
|
"ignoreError": false,
|
|
37
37
|
"actionType": "custom",
|
|
38
|
-
"script": "if (event.data.quotaResult && event.data.quotaResult.quota && event.data.quotaResult.quota.available === 0) { doAction({ actionType: 'toast', args: { msgType: 'warning', msg: '暂无加急次数' } }); return false; } if (event.data.quotaResult && !event.data.quotaResult.canUrgent) { doAction({ actionType: 'toast', args: { msgType: 'warning', msg: event.data.quotaResult.reason || '不满足加急条件' } }); return false; }"
|
|
38
|
+
"script": "if (event.data.quotaResult && event.data.quotaResult.quota && event.data.quotaResult.quota.available === 0) { doAction({ actionType: 'toast', args: { msgType: 'warning', msg: event.data.quotaResult.reason || '暂无加急次数' } }); event.stopPropagation(); event.preventDefault(); return false; } if (event.data.quotaResult && !event.data.quotaResult.canUrgent) { doAction({ actionType: 'toast', args: { msgType: 'warning', msg: event.data.quotaResult.reason || '不满足加急条件' } }); event.stopPropagation(); event.preventDefault(); return false; }"
|
|
39
39
|
},
|
|
40
40
|
{
|
|
41
41
|
"ignoreError": false,
|
|
42
42
|
"actionType": "dialog",
|
|
43
|
+
"expression": "${quotaResult && quotaResult.canUrgent}",
|
|
43
44
|
"dialog": {
|
|
44
45
|
"type": "dialog",
|
|
45
46
|
"title": "加急审核",
|
|
@@ -4,7 +4,7 @@ columns:
|
|
|
4
4
|
width: '400'
|
|
5
5
|
wrap: true
|
|
6
6
|
amis:
|
|
7
|
-
classNameExpr: "${is_urgent ? 'color-priority-danger' : (ARRAYINCLUDES(review_postponed_users, context.userId) ? 'color-priority-postponed' : '')}"
|
|
7
|
+
classNameExpr: "${is_urgent ? 'color-priority-danger' : ((review_postponed_users && review_postponed_users.length > 0 && (ARRAYINCLUDES(review_postponed_users, context.userId) || owner == context.userId || context.user.profile == 'admin')) ? 'color-priority-postponed' : '')}"
|
|
8
8
|
- field: owner
|
|
9
9
|
wrap: false
|
|
10
10
|
- field: owner_department
|
|
@@ -62,5 +62,5 @@ extra_columns:
|
|
|
62
62
|
- is_urgent
|
|
63
63
|
- review_postponed_users
|
|
64
64
|
crudDataFilter: |
|
|
65
|
-
crud.rowClassNameExpr = "${is_urgent ? 'color-priority-danger' : ''}";
|
|
66
|
-
return crud;
|
|
65
|
+
crud.rowClassNameExpr = "${is_urgent ? 'color-priority-danger' : ((review_postponed_users && review_postponed_users.length > 0 && (ARRAYINCLUDES(review_postponed_users, context.userId) || owner == context.userId || context.user.profile == 'admin')) ? 'color-priority-postponed' : '')}";
|
|
66
|
+
return crud;
|
|
@@ -4,7 +4,7 @@ columns:
|
|
|
4
4
|
wrap: true
|
|
5
5
|
width: '400'
|
|
6
6
|
amis:
|
|
7
|
-
classNameExpr: "${is_urgent ? 'color-priority-danger' : (ARRAYINCLUDES(review_postponed_users, context.userId) ? 'color-priority-postponed' : '')}"
|
|
7
|
+
classNameExpr: "${is_urgent ? 'color-priority-danger' : ((review_postponed_users && review_postponed_users.length > 0 && (ARRAYINCLUDES(review_postponed_users, context.userId) || owner == context.userId || context.user.profile == 'admin')) ? 'color-priority-postponed' : '')}"
|
|
8
8
|
- field: current_step
|
|
9
9
|
- field: person_pending_approve
|
|
10
10
|
- field: draft_submitted
|
|
@@ -77,5 +77,5 @@ extra_columns:
|
|
|
77
77
|
- is_urgent
|
|
78
78
|
- review_postponed_users
|
|
79
79
|
crudDataFilter: |
|
|
80
|
-
crud.rowClassNameExpr = "${is_urgent ? 'color-priority-danger' : ''}";
|
|
81
|
-
return crud;
|
|
80
|
+
crud.rowClassNameExpr = "${is_urgent ? 'color-priority-danger' : ((review_postponed_users && review_postponed_users.length > 0 && (ARRAYINCLUDES(review_postponed_users, context.userId) || owner == context.userId || context.user.profile == 'admin')) ? 'color-priority-postponed' : '')}";
|
|
81
|
+
return crud;
|
|
@@ -4,7 +4,7 @@ columns:
|
|
|
4
4
|
wrap: true
|
|
5
5
|
width: '400'
|
|
6
6
|
amis:
|
|
7
|
-
classNameExpr: "${is_urgent ? 'color-priority-danger' : (ARRAYINCLUDES(review_postponed_users, context.userId) ? 'color-priority-postponed' : '')}"
|
|
7
|
+
classNameExpr: "${is_urgent ? 'color-priority-danger' : ((review_postponed_users && review_postponed_users.length > 0 && (ARRAYINCLUDES(review_postponed_users, context.userId) || owner == context.userId || context.user.profile == 'admin')) ? 'color-priority-postponed' : '')}"
|
|
8
8
|
- field: current_step
|
|
9
9
|
- field: person_pending_approve
|
|
10
10
|
- field: draft_submitted
|
|
@@ -89,5 +89,5 @@ extra_columns:
|
|
|
89
89
|
- is_urgent
|
|
90
90
|
- review_postponed_users
|
|
91
91
|
crudDataFilter: |
|
|
92
|
-
crud.rowClassNameExpr = "${is_urgent ? 'color-priority-danger' : ''}";
|
|
93
|
-
return crud;
|
|
92
|
+
crud.rowClassNameExpr = "${is_urgent ? 'color-priority-danger' : ((review_postponed_users && review_postponed_users.length > 0 && (ARRAYINCLUDES(review_postponed_users, context.userId) || owner == context.userId || context.user.profile == 'admin')) ? 'color-priority-postponed' : '')}";
|
|
93
|
+
return crud;
|
package/main/default/objects/pepsico_material_approval/listviews/handle_postpone.listview.yml
CHANGED
|
@@ -4,7 +4,7 @@ columns:
|
|
|
4
4
|
wrap: true
|
|
5
5
|
width: '400'
|
|
6
6
|
amis:
|
|
7
|
-
classNameExpr: "${is_urgent ? 'color-priority-danger' : (ARRAYINCLUDES(review_postponed_users, context.userId) ? 'color-priority-postponed' : '')}"
|
|
7
|
+
classNameExpr: "${is_urgent ? 'color-priority-danger' : ((review_postponed_users && review_postponed_users.length > 0 && (ARRAYINCLUDES(review_postponed_users, context.userId) || owner == context.userId || context.user.profile == 'admin')) ? 'color-priority-postponed' : '')}"
|
|
8
8
|
- field: current_step
|
|
9
9
|
- field: person_pending_approve
|
|
10
10
|
- field: draft_submitted
|
|
@@ -89,5 +89,5 @@ extra_columns:
|
|
|
89
89
|
- is_urgent
|
|
90
90
|
- review_postponed_users
|
|
91
91
|
crudDataFilter: |
|
|
92
|
-
crud.rowClassNameExpr = "${is_urgent ? 'color-priority-danger' : ''}";
|
|
93
|
-
return crud;
|
|
92
|
+
crud.rowClassNameExpr = "${is_urgent ? 'color-priority-danger' : ((review_postponed_users && review_postponed_users.length > 0 && (ARRAYINCLUDES(review_postponed_users, context.userId) || owner == context.userId || context.user.profile == 'admin')) ? 'color-priority-postponed' : '')}";
|
|
93
|
+
return crud;
|
package/package.json
CHANGED