@steedos-labs/content-compliance 0.7.17 → 0.7.19

package/main/default/objects/pepsico_material_approval/buttons/pepsico_postpone_review.button.yml

@@ -8,7 +8,7 @@ amis_schema: |-
               "label": "延后审核",
               "id": "u:pepsico_postpone_review",
               "editorState": "default", 
-              "visibleOn": "${false && ((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')}",
+              "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'}",
               "onEvent": {
                   "click": {
                       "weight": 0,

package/main/default/objects/pepsico_material_approval/buttons/pepsico_urgent_review.button.yml

@@ -14,7 +14,7 @@ amis_schema: |-
               "label": "加急审核",
               "id": "u:pepsico_urgent_review",
               "editorState": "default",
-              "visibleOn": "${false && ((current_step == 'departmental_review' || current_step == 'personnel_review') && !is_urgent && context.user.user == owner && (context.user.is_collaborator !== true || canUrgent === true || quota) && formFactor != 'SMALL')}",
+              "visibleOn": "${(current_step == 'departmental_review' || current_step == 'personnel_review') && !is_urgent && context.user.user == owner && (context.user.is_collaborator !== true || canUrgent === true || quota) && formFactor != 'SMALL'}",
               "disabledOn": "${quota && quota.available === 0}",
               "disabledTip": "${quota && quota.available === 0 ? (reason || '暂无加急次数') : ''}",
               "onEvent": {

package/main/default/objects/pepsico_material_approval/fields/internal_collaborator.field.yml

@@ -2,7 +2,7 @@ name: internal_collaborator
 amis:
   id: 'u:d6eca338bc40'
   visibleOn: >-
-    (!global.user.email || !global.user.email.endsWith("@pepsico.com")) &&
+    global.user.is_collaborator === true &&
     global.mode ==="read"
   onEvent:
     change:
@@ -16,9 +16,9 @@ amis:
 description: ''
 enable_thousands: true
 filters:
-  - - email
-    - endswith
-    - '@pepsico.com'
+  - - is_collaborator
+    - '!='
+    - true
 group: 审核人员
 hidden: false
 index: true

package/main/default/objects/pepsico_material_approval/fields/internal_collaborator_edit.field.yml

@@ -2,7 +2,7 @@ name: internal_collaborator_edit
 amis:
   id: 'u:d6eca338bc40'
   visibleOn: >-
-    (!global.user.email || !global.user.email.endsWith("@pepsico.com")) &&
+    global.user.is_collaborator === true &&
     global.mode !=="read"
   onEvent:
     change:
@@ -28,7 +28,7 @@ amis:
     method: get
     url: >-
       /api/v1/space_users?top=5&filters=[["email", "startswith",
-      "$term"],["email", "endswith", "@pepsico.com"],["user_accepted", "=",
+      "$term"],["is_collaborator", "!=", true],["user_accepted", "=",
       true]]&fields=["email","user","organization"]
     requestAdaptor: ''
     adaptor: ' return {data: lodash.uniqBy(lodash.concat(payload.data.items || [], window._last_internal_collaborator_items || []), "user")}'

package/main/default/objects/pepsico_material_approval/fields/material_owner.field.yml

@@ -8,7 +8,7 @@ amis:
     method: get
     url: >-
       /api/v1/space_users?top=5&filters=[["email", "startswith",
-      "$term"],["email", "endswith", "@pepsico.com"],["user_accepted", "=",
+      "$term"],["is_collaborator", "!=", true],["user_accepted", "=",
       true]]&fields=["email","user"]
     requestAdaptor: ''
     adaptor: 'return {data: payload.data.items || []}'

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos-labs/content-compliance",
-    "version": "0.7.17",
+    "version": "0.7.19",
     "description": "内容审核系统",
     "main": "package.service.js",
     "scripts": {