@steedos-labs/plugin-workflow 3.0.0-beta.9 → 3.0.1-beta.1

package/main/default/objects/instances/buttons/instance_reassign.button.yml

@@ -17,7 +17,7 @@ amis_schema: |-
         "type": "button",
         "label": "转签核",
         "id": "u:instance_reassign",
-        "hiddenOn": "!(this.record.box === 'monitor' && this.record.state == 'pending' && this.flowPermissions.includes('admin'))",
+        "hiddenOn": "!(this.record.box === 'monitor' && this.record.state == 'pending' && this.record.flowPermissions.includes('admin'))",
         "onEvent": {
           "click": {
             "weight": 0,
@@ -104,20 +104,5 @@ amis_schema: |-
         }
       }
     ],
-    "data": {
-      "context": {
-        "rootUrl": "http://127.0.0.1:5300",
-        "tenantId": "63ed8fb288feeecd0165843d",
-        "userId": "1852bcb9-a3cb-4d04-905b-1cd12e4cdb3b",
-        "authToken": "4c6a0b7d705b6fcab7f09d08006e644e30a37d3b5e198a056e85d7383ced3f492a097a30b63ad8e42d1c08"
-      },
-      "app_id": "",
-      "tab_id": "",
-      "object_name": "",
-      "dataComponentId": "",
-      "record_id": "",
-      "record": {},
-      "permissions": {}
-    },
     "id": "u:fbe25e9811ea"
   }

package/main/default/objects/instances/buttons/instance_related.button.yml

@@ -5,7 +5,7 @@ amis_schema: |-
       "body": [
           {
               "type": "button",
-              "label": "关联文件",
+              "label": "${'CustomAction.instances.instance_related' | t}",
               "id": "u:instance_link",
               "onEvent": {
                   "click": {
@@ -14,7 +14,7 @@ amis_schema: |-
                               "actionType": "dialog",
                               "dialog": {
                                   "type": "dialog",
-                                  "title": "关联文件",
+                                  "title": "${'CustomAction.instances.instance_related' | t}",
                                   "body": [
                                       {
                                           "type": "form",
@@ -78,7 +78,7 @@ amis_schema: |-
                                   "actions": [
                                       {
                                           "type": "button",
-                                          "label": "取消",
+                                          "label": "${'Cancel' | t}",
                                           "onEvent": {
                                               "click": {
                                                   "actions": [
@@ -94,7 +94,7 @@ amis_schema: |-
                                       },
                                       {
                                           "type": "button",
-                                          "label": "确定",
+                                          "label": "${'OK' | t}",
                                           "onEvent": {
                                               "click": {
                                                   "actions": [

package/main/default/objects/instances/buttons/instance_relocate.button.yml

@@ -15,8 +15,8 @@ amis_schema: |-
     "body": [
       {
         "type": "button",
-        "label": "重定位",
-        "hiddenOn": "!(this.record.box === 'monitor' && this.record.state != 'draft' && this.flowPermissions.includes('admin'))",
+        "label": "${'CustomAction.instances.instance_relocate' | t}",
+        "hiddenOn": "!(this.record.box === 'monitor' && this.record.state != 'draft' && this.record.flowPermissions.includes('admin'))",
         "onEvent": {
           "click": {
             "weight": 0,
@@ -24,7 +24,7 @@ amis_schema: |-
               {
                 "dialog": {
                   "type": "dialog",
-                  "title": "重定位",
+                  "title": "${'instance_action_instance_relocate_dialog_title' | t}",
                   "body": [
                     {
                       "type": "service",
@@ -37,14 +37,14 @@ amis_schema: |-
                           "body": [
                             {
                               "type": "tpl",
-                              "tpl": "当前步骤: <p class='font-medium inline'>${record.currentStep.name}</p>",
+                              "tpl": "${'instance_action_instance_relocate_dialog_title_prefix' | t} <p class='font-medium inline'>${record.currentStep.name}</p>",
                               "inline": true,
                               "wrapperComponent": "",
                               "id": "u:1f7dd93080d3"
                             },
                             {
                               "type": "select",
-                              "label": "下一步",
+                              "label": "${'instance_next_step' | t",
                               "name": "relocate_step",
                               "id": "u:ee15214c1808",
                               "multiple": false,
@@ -53,7 +53,7 @@ amis_schema: |-
                             },
                             {
                               "type": "steedos-select-user",
-                              "label": "处理人",
+                              "label": "${'instance_next_step_users' | t}",
                               "name": "relocate_users",
                               "id": "u:c3ad733db360",
                               "multiple": true,
@@ -68,7 +68,7 @@ amis_schema: |-
                               "id": "u:bffe87a42168",
                               "minRows": 3,
                               "maxRows": 20,
-                              "placeholder": "请填写重定位的理由",
+                              "description": "${'instance_action_instance_relocate_dialog_field_reason' | t}",
                               "className": "mt-3"
                             }
                           ],
@@ -78,12 +78,9 @@ amis_schema: |-
                           "api": {
                             "url": "${context.rootUrl}/api/workflow/relocate",
                             "method": "post",
-                            "messages": {
-                              "success": "重定位成功",
-                              "failed": "重定位失败"
-                            },
                             "dataType": "json",
-                            "requestAdaptor": "const { record, relocate_users, relocate_step, reason } = api.data;\napi.data = {\n  \"Instances\": [{\n    _id: record._id, relocate_next_step: relocate_step.split('.')[1], relocate_inbox_users: relocate_users, relocate_comment: reason\n  }]\n}\n\nreturn api;"
+                            "requestAdaptor": "const { record, relocate_users, relocate_step, reason } = api.data;\napi.data = {\n  \"Instances\": [{\n    _id: record._id, relocate_next_step: relocate_step.split('.')[1], relocate_inbox_users: relocate_users, relocate_comment: reason\n  }]\n}\n\nreturn api;",
+                            "adaptor": "return response.status == 200 ? {data: {...payload}, status: 0, msg: t('instance_action_relocate_dialog_msg_success')} : {...payload, status: 1, msg: t('instance_action_relocate_dialog_msg_failed')};"
                           },
                           "onEvent": {
                             "submitFail": {

package/main/default/objects/instances/buttons/instance_retrieve.button.yml

@@ -1,7 +1,111 @@
 name: instance_retrieve
-is_enable: false
+amis_schema: |-
+  {
+      "type": "service",
+      "body": [
+          {
+              "type": "button",
+              "label": "取回",
+              "id": "u:instance_retrieve",
+              "editorState": "default",
+              "onEvent": {
+                  "click": {
+                      "weight": 0,
+                      "actions": [
+                          {
+                              "ignoreError": false,
+                              "actionType": "dialog",
+                              "dialog": {
+                                  "type": "dialog",
+                                  "title": "取回",
+                                  "body": [
+                                      {
+                                          "type": "input-text",
+                                          "label": "备注",
+                                          "name": "retrieve_comment",
+                                          "id": "u:c7fa318c8af1",
+                                          "editorState": "default"
+                                      }
+                                  ],
+                                  "id": "u:b05694926b78",
+                                  "actions": [
+                                      {
+                                          "type": "button",
+                                          "actionType": "cancel",
+                                          "label": "取消",
+                                          "id": "u:76960d34d658"
+                                      },
+                                      {
+                                          "type": "button",
+                                          "actionType": "confirm",
+                                          "label": "确定",
+                                          "primary": true,
+                                          "id": "u:907978324dc2",
+                                          "editorState": "default",
+                                          "onEvent": {
+                                              "click": {
+                                                  "weight": 0,
+                                                  "actions": [
+                                                      {
+                                                          "ignoreError": false,
+                                                          "actionType": "ajax",
+                                                          "outputVar": "responseResult",
+                                                          "options": {},
+                                                          "api": {
+                                                              "url": "${context.rootUrl}/api/workflow/retrieve",
+                                                              "method": "post",
+                                                              "requestAdaptor": "debugger;\nconsole.log(\"api:\", api);\napi.data = {\n    \"_id\": api.body.record._id,\n    \"retrieve_comment\": api.body.retrieve_comment\n};\nreturn api;",
+                                                              "adaptor": "console.log('payload', payload);\nreturn payload;",
+                                                              "messages": {},
+                                                              "headers": {
+                                                                  "Authorization": "Bearer ${context.tenantId},${context.authToken}"
+                                                              },
+                                                              "data": {
+                                                                  "&": "$$",
+                                                                  "record": "${record}"
+                                                              }
+                                                          }
+                                                      },
+                                                      {
+                                                          "actionType": "broadcast",
+                                                          "args": {
+                                                              "eventName": "@data.@instanceDetail.changed"
+                                                          },
+                                                          "data": {}
+                                                      }
+                                                  ]
+                                              }
+                                          }
+                                      }
+                                  ],
+                                  "showCloseButton": true,
+                                  "closeOnOutside": false,
+                                  "closeOnEsc": false,
+                                  "showErrorMsg": true,
+                                  "showLoading": true,
+                                  "draggable": false,
+                                  "actionType": "dialog"
+                              }
+                          }
+                      ]
+                  }
+              },
+              "hiddenOn": "!(record.box === 'outbox' && record.state === 'pending')"
+          }
+      ],
+      "regions": [
+          "body"
+      ],
+      "data": {
+      },
+      "id": "u:5b9a5a685ac9",
+      "bodyClassName": "p-0",
+      "dsType": "api",
+      "definitions": {}
+  }
+is_enable: true
 label: 取回
 'on': record_only
+sort: 40
 type: amis_button
 visible: true
-sort: 40

package/main/default/objects/instances/buttons/instance_save.button.yml

@@ -5,7 +5,7 @@ amis_schema: |-
       "body": [
           {
               "type": "button",
-              "label": "保存",
+              "label": "${'CustomAction.instances.instance_save' | t}",
               "id": "u:instance_save",
               "className": "  ",
               "onEvent": {
@@ -18,16 +18,13 @@ amis_schema: |-
                                       "method": "post",
                                       "sendOn": "",
                                       "requestAdaptor": "var _SteedosUI$getRef$get, _approveValues$next_s;\nconst formValues = context._scoped.getComponentById(\"instance_form\").getValues();\nconst approveValues = (_SteedosUI$getRef$get = context._scoped.getComponentById(\"instance_approval\")) === null || _SteedosUI$getRef$get === void 0 ? void 0 : _SteedosUI$getRef$get.getValues();\nlet nextUsers = approveValues === null || approveValues === void 0 ? void 0 : approveValues.next_users;\nif (_.isString(nextUsers)) {\n  nextUsers = [approveValues.next_users];\n}\nconst instance = context.record;\nconst body = {\n  instance: {\n    _id: instance._id,\n    applicant: formValues.applicant,\n    submitter: formValues.submitter,\n    traces: [{\n      _id: instance.trace._id,\n      step: instance.step._id,\n      approves: [{\n        _id: instance.approve._id,\n        next_steps: [{\n          step: approveValues === null || approveValues === void 0 || (_approveValues$next_s = approveValues.next_step) === null || _approveValues$next_s === void 0 ? void 0 : _approveValues$next_s._id,\n          users: nextUsers\n        }],\n        description: approveValues === null || approveValues === void 0 ? void 0 : approveValues.suggestion,\n        values: formValues\n      }]\n    }]\n  }\n};\napi.data = body;\nreturn api;",
+                                      "adaptor": "if (payload.instance == \"upgraded\") { window.setTimeout(function(){ window.location.reload(); }, 2000); return {...payload, status: 1, msg: t('instance_action_instance_save_msg_upgraded')}; } \n return payload.instance === true ? {...payload, status: 0, msg: t('instance_action_instance_save_msg_success')} : {...payload, status: 1, msg: t('instance_action_instance_save_msg_failed')};",
                                       "headers": {
                                           "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                       },
                                       "data": {
                                           "&": "$$"
                                       }
-                                  },
-                                  "messages": {
-                                      "success": "暂存成功",
-                                      "failed": "暂存失败"
                                   }
                               },
                               "actionType": "ajax",
@@ -40,16 +37,13 @@ amis_schema: |-
                                       "method": "post",
                                       "sendOn": "",
                                       "requestAdaptor": "var _SteedosUI$getRef$get, _approveValues$next_s;\nconst formValues = context._scoped.getComponentById(\"instance_form\").getValues();\nconst approveValues = (_SteedosUI$getRef$get = context._scoped.getComponentById(\"instance_approval\")) === null || _SteedosUI$getRef$get === void 0 ? void 0 : _SteedosUI$getRef$get.getValues();\nlet nextUsers = approveValues === null || approveValues === void 0 ? void 0 : approveValues.next_users;\nif (_.isString(nextUsers)) {\n  nextUsers = [approveValues.next_users];\n}\nconst instance = context.record;\nconst body = {\n  approve: {\n    id: instance.approve._id,\n    instance: instance._id,\n    trace: instance.trace._id,\n    next_steps: [{\n      step: approveValues === null || approveValues === void 0 || (_approveValues$next_s = approveValues.next_step) === null || _approveValues$next_s === void 0 ? void 0 : _approveValues$next_s._id,\n      users: nextUsers\n    }],\n    description: approveValues === null || approveValues === void 0 ? void 0 : approveValues.suggestion,\n    judge: approveValues === null || approveValues === void 0 ? void 0 : approveValues.judge,\n    values: formValues\n  }\n};\napi.data = body;\nreturn api;",
+                                      "adaptor": "return payload.instance ? {...payload, status: 0, msg: t('instance_action_instance_save_msg_success')} : {...payload, status: 1, msg: t('instance_action_instance_save_msg_failed')};",
                                       "headers": {
                                           "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                       },
                                       "data": {
                                           "&": "$$"
                                       }
-                                  },
-                                  "messages": {
-                                      "success": "暂存成功",
-                                      "failed": "暂存失败"
                                   }
                               },
                               "actionType": "ajax",

package/main/default/objects/instances/buttons/instance_submit.button.yml

@@ -5,7 +5,7 @@ amis_schema: |-
     "body": [
         {
         "type": "button",
-        "label": "发送",
+        "label": "${'CustomAction.instances.instance_submit' | t}",
         "level": "primary",
         "id": "u:instance_submit",
         "hiddenOn": "!(this.record.box === 'inbox' || this.record.box === 'draft')",

package/main/default/objects/instances/buttons/instance_terminate.button.yml

@@ -5,7 +5,7 @@ amis_schema: |-
       "body": [
           {
               "type": "button",
-              "label": "取消申请",
+              "label": "${'CustomAction.instances.instance_terminate' | t}",
               "id": "u:instance_terminate",
               "className": "  ",
               "onEvent": {
@@ -15,11 +15,11 @@ amis_schema: |-
                               "actionType": "dialog",
                               "dialog": {
                                   "type": "dialog",
-                                  "title": "取消申请",
+                                  "title": "${'CustomLabels.instance_action_terminate_dialog_title' | t}",
                                   "body": [
                                       {
                                           "type": "tpl",
-                                          "tpl": "<p>&nbsp;请填写取消申请的理由</p>",
+                                          "tpl": "${'CustomLabels.instance_action_terminate_dialog_content' | t}",
                                           "inline": false,
                                           "id": "u:0a1847d1d018",
                                           "className": "m-b-sm"
@@ -47,12 +47,9 @@ amis_schema: |-
                                                     "record": "${record}"
                                                 },
                                                 "requestAdaptor": "\nconsole.log(\"api.data\", api.data)\nconst { record, terminate_reason } = api.data;\napi.data = {\n  terminate_reason: terminate_reason,\n  instance_id: record._id\n}\nreturn api;",
+                                                "adaptor": "return response.status == 200 ? {data: {...payload}, status: 0, msg: t('instance_action_terminate_dialog_msg_success')} : {...payload, status: 1, msg: t('instance_action_terminate_dialog_msg_failed')};",
                                                 "headers": {
                                                     "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                                                },
-                                                "messages": {
-                                                    "success": "取消申请成功!",
-                                                    "failed": "取消申请失败"
                                                 }
                                             },
                                             "onEvent": {
@@ -67,7 +64,7 @@ amis_schema: |-
                                                             "componentId": "",
                                                             "args": {
                                                                 "blank": false,
-                                                                "url": "/app/${appId}/instance_tasks/grid/${side_listview_id}"
+                                                                "url": "/app/${appId}/instances/grid/${side_listview_id}"
                                                             },
                                                             "actionType": "url"
                                                         }
@@ -80,7 +77,7 @@ amis_schema: |-
                                   "actions": [
                                       {
                                           "type": "button",
-                                          "label": "取消",
+                                          "label": "${'Cancel' | t}",
                                           "onEvent": {
                                               "click": {
                                                   "actions": [
@@ -96,7 +93,7 @@ amis_schema: |-
                                       },
                                       {
                                           "type": "button",
-                                          "label": "确定",
+                                          "label": "${'OK' | t}",
                                           "onEvent": {
                                               "click": {
                                                   "actions": [

package/main/default/objects/instances/listviews/monitor.listview.yml

@@ -9,7 +9,6 @@ columns:
   - flow_name
   - current_step_name
   - modified
-  - is_archived
 mobile_columns:
   - name
   - flow_name

package/main/default/pages/flowdetail.page.amis.json

@@ -72,7 +72,7 @@
 															"actionType": "dialog",
 															"dialog": {
 																"type": "dialog",
-																"title": "编辑表单",
+																"title": "${'flows_page_record_action_edit_dialog_title' | t}",
 																"body": [
 																	{
 																		"type": "form",
@@ -80,13 +80,13 @@
 																		"body": [
 																			{
 																				"type": "input-text",
-																				"label": "表单名称",
+																				"label": "${'flows_page_record_field_form_name' | t}",
 																				"name": "name",
 																				"id": "u:84af37d53da42"
 																			},
 																			{
 																				"type": "textarea",
-																				"label": "表单描述",
+																				"label": "${'flows_page_record_field_form_description' | t}",
 																				"name": "description",
 																				"id": "u:84af37d53da4",
 																				"minRows": 3,
@@ -94,7 +94,7 @@
 																			},
 																			{
 																				"type": "textarea",
-																				"label": "标题公式",
+																				"label": "${'flows_page_record_field_form_name_forumla' | t}",
 																				"name": "name_forumla",
 																				"id": "u:69b6536e9fd8",
 																				"minRows": 3,
@@ -102,7 +102,7 @@
 																			},
 																			{
 																				"type": "editor",
-																				"label": "表单脚本",
+																				"label": "${'flows_page_record_field_form_script' | t}",
 																				"name": "form_script",
 																				"id": "u:025f8c4f09b6",
 																				"minRows": 3,
@@ -163,13 +163,13 @@
 									"body": [
 										{
 											"type": "input-text",
-											"label": "表单名称",
+											"label": "${'flows_page_record_field_form_name' | t}",
 											"name": "name",
 											"id": "u:84af37d53da42"
 										},
 										{
 											"type": "textarea",
-											"label": "表单描述",
+											"label": "${'flows_page_record_field_form_description' | t}",
 											"name": "description",
 											"id": "u:84af37d53da4",
 											"minRows": 3,
@@ -177,7 +177,7 @@
 										},
 										{
 											"type": "textarea",
-											"label": "标题公式",
+											"label": "${'flows_page_record_field_form_name_forumla' | t}",
 											"name": "name_forumla",
 											"id": "u:69b6536e9fd8",
 											"minRows": 3,
@@ -185,7 +185,7 @@
 										},
 										{
 											"type": "editor",
-											"label": "表单脚本",
+											"label": "${'flows_page_record_field_form_script' | t}",
 											"name": "form_script",
 											"id": "u:025f8c4f09b6",
 											"minRows": 3,
@@ -615,7 +615,7 @@
 									"id": "u:5df987ad9bc8",
 									"className": "bg-white",
 									"mode": "edit",
-									"initApiAdaptor": "_.each(payload.data.current.fields, (item)=>{if(item.type =='table' || item.type == 'section'){  var _item = _.find(payload.data.current.fields, function(__item){return __item.code == item.code}); if(_item){_item.children = item.fields;}  }}); return payload",
+									"initApiAdaptor": "_.each(payload.data.current.fields, (item)=>{if(item.type=='steedos-field'){item.type = item.config.type}  if(item.type =='table' || item.type == 'section'){  var _item = _.find(payload.data.current.fields, function(__item){return __item.code == item.code}); if(_item){_item.children = item.fields;}  }}); return payload",
 									"fields": [
 										"current",
 										"current.fields",
@@ -630,7 +630,7 @@
 										"current.fields.$.visibleOn"
 									],
 									"fieldsExtend": "{\n  \"current\": {\n    \"label\": false\n  },\n  \"current.fields\": {\n    \"label\": false\n  }\n}",
-									"formDataFilter": "if (!form.onEvent.change) {\n  form.onEvent.change = { actions: [] }\n};\nform.onEvent.change.actions.push({\n  actionType: \"custom\",\n  script: \"console.log('onChange event.data', event.data)\"\n}, {\n  \"actionType\": \"ajax\",\n  \"outputVar\": \"responseResult\",\n  \"args\": {\n    \"options\": { \"silent\": false },\n    \"api\": {\n      \"url\": \"/api/workflow/updateFormFields\",\n      \"method\": \"post\",\n      \"requestAdaptor\": `\n        console.log('api.data', api, 'context', context);\n        var fields = (context.current.fields || []).map(function(item){\n          // 有时编辑children子行记录时未同步到fields属性值中，造成保存数据不成功\n          if(item.children){\n            var newItem = _.clone(item);\n            newItem.fields = newItem.children;\n            delete newItem.children;\n            return newItem;\n          }\n          else{\n            return item;\n          }\n        });\n        api.data = { \n          formId: context.current.form, \n          fields: fields\n        };\n        return api;\n      `,\n      \"adaptor\": \"\",\n      \"messages\": {},\n      \"dataType\": \"json\"\n    }\n  }\n})"
+									"formDataFilter": "if (!form.onEvent.change) {\n  form.onEvent.change = { actions: [] }\n};\nform.onEvent.change.actions.push({\n  actionType: \"custom\",\n  script: \"console.log('onChange event.data', event.data)\"\n}, {\n  \"actionType\": \"ajax\",\n  \"outputVar\": \"responseResult\",\n  \"args\": {\n    \"options\": { \"silent\": false },\n    \"api\": {\n      \"url\": \"/api/workflow/updateFormFields\",\n      \"method\": \"post\",\n      \"requestAdaptor\": `\n        console.log('api.data', api, 'context', context);\n        var fields = (context.current.fields || []).map(function(item){\n  if(item.config.type){item.type='steedos-field'}         // 有时编辑children子行记录时未同步到fields属性值中，造成保存数据不成功\n          if(item.children){\n            var newItem = _.clone(item);\n            newItem.fields = newItem.children;\n            delete newItem.children;\n            return newItem;\n          }\n          else{\n            return item;\n          }\n        });\n        api.data = { \n          formId: context.current.form, \n          fields: fields\n        };\n        return api;\n      `,\n      \"adaptor\": \"\",\n      \"messages\": {},\n      \"dataType\": \"json\"\n    }\n  }\n})"
 								}
 							],
 							"id": "u:827750209c5d",

package/main/default/pages/instance_detail.page.amis.json

@@ -3,7 +3,7 @@
   "body": [{
       "type": "wrapper",
       "visibleOn": "${AND(display != 'split', ${window:innerWidth > 768},!!!_inDrawer)}",
-      "className": "bg-white m-0 p-0 flex-shrink-0 min-w-[240px] lg:order-first lg:flex lg:flex-col border-r border-gray-300",
+      "className": "bg-white p-0 flex-shrink-0 min-w-[240px] lg:order-first lg:flex lg:flex-col rounded shadow my-4 ml-4 mr-1 my-4 sm:rounded",
       "body": [{
         "type": "service",
         "className": "w-full h-full",
@@ -18,7 +18,7 @@
           "type": "input-tree",
           "treeContainerClassName": "h-full",
           "name": "tree",
-          "className": "instance-box-tree bg-white w-full",
+          "className": "instance-box-tree w-full",
           "id": "u:9f3dd961ca12",
           "stacked": true,
           "multiple": false,
@@ -85,46 +85,34 @@
         "visibleOn": "false"
       }
     },
+    {
+      "type": "button",
+      "label": "刷新",
+      "className": "steedos-workflow-reload-btn hidden",
+      "onEvent": {
+        "click": {
+          "actions": [
+            {
+              "componentId": "u:d6db0c84f150",
+              "groupType": "component",
+              "actionType": "rebuild"
+            }
+          ]
+        }
+      }
+    },
     {
       "type": "wrapper",
-      "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:pt-3 sm:px-3",
+      "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:m-4 shadow sm:rounded",
       "body": [{
         "type": "service",
         "id": "u:d6db0c84f150",
-        "body": [{
-            "type": "wrapper",
-            "className": "p-0 h-full",
-            "body": [{
-              "type": "steedos-instance-detail",
-              "id": "u:40052b3812c1",
-              "label": "Instance Detail",
-              "instanceId": "${recordId}",
-              "boxName": "${side_listview_id}",
-              "hiddenOn": "!!!this.recordId"
-            }],
-            "visibleOn": "${window:InstanceDetailEnabledAmisRender != false}",
-            "id": "u:829a40757f0a"
-          },
-          {
-            "type": "wrapper",
-            "className": "workflow-main flex w-full h-full no-columns instance-show instance-detail-service-wrapper",
-            "visibleOn": "${window:InstanceDetailEnabledAmisRender == false}",
-            "body": [{
-              "type": "custom",
-              "html": "<div className='workflow-main flex w-full h-full no-columns instance-show instance-detail-service-wrapper'></div>",
-              "onMount": "try {\n    Session.set(\"instance_change\", false);\n\n    Session.set(\"instance_loading\", true);\n    Session.set(\"judge\", null);\n    Session.set(\"next_step_id\", null);\n    Session.set(\"next_step_multiple\", null);\n    Session.set(\"next_user_multiple\", null);\n    let box;\n    let recordId;\n    if (props.data._inDrawer) {\n        // 主表记录详细页面审批相关列表中点击名称字段右侧弹出drawer时，box写死，recordId取作用域中值\n        box = \"outbox\";\n        recordId = props.data.recordId;\n    }\n    else {\n        box = props.data.side_listview_id;\n        recordId = Session.get(\"record_id\");\n    }\n    Session.set(\"box\", box);\n    Session.set(\"instanceId\", recordId);\n    Session.set(\"instanceTaskId\", null);\n    window.instanceDetailBlazeRenderView = Blaze.render(Blaze._getTemplate('instance_view_wrapper'), document.getElementsByClassName('instance-detail-service-wrapper')[0])\n} catch (error) {\n    console.error(error)\n};\nif (window.instanceDetailBlazeRenderView) {\n    window.instanceDetailBlazeRenderView.autorun(() => {\n        if (FlowRouter.current().params.object_name == \"instances\") {\n            console.debug('====onMount=', props);\n            Session.set(\"instanceId\", Session.get(\"record_id\"));\n            Session.set(\"instanceTaskId\", null)\n        }\n    }\n    )\n};",
-              "id": "u:a6e0685d1da3",
-              "onUnmount": "if(window.instanceDetailBlazeRenderView){console.log('Blaze.remove===>instanceDetailBlazeRenderView');Blaze.remove(window.instanceDetailBlazeRenderView); window.instanceDetailBlazeRenderView = null;}"
-            }],
-            "id": "u:16cf880c925a",
-            "style": {
-              "position": "static",
-              "display": "block"
-            },
-            "isFixedHeight": false,
-            "isFixedWidth": false
-          }
-        ],
+        "schemaApi": {
+            "method": "get",
+            "url": "/api/health_check",
+            "adaptor": "return {data: {'type':'wrapper','className':'p-0 h-full','body':[{'type':'steedos-instance-detail','id':'u:40052b3812c1','label':'Instance Detail','instanceId':context.recordId,'boxName':context.side_listview_id}],'id':'u:829a40757f0a'}}"
+        },
+        "body": {},
         "className": "h-full",
         "dsType": "api"
       }],

package/main/default/pages/instance_tasks_detail.page.amis.json

@@ -4,7 +4,7 @@
     {
       "type": "wrapper",
       "visibleOn": "${AND(display != 'split', ${window:innerWidth > 768})}",
-      "className": "bg-white m-0 p-0 flex-shrink-0 min-w-[240px] lg:order-first lg:flex lg:flex-col border-r border-gray-300",
+      "className": "bg-white p-0 flex-shrink-0 min-w-[240px] lg:order-first lg:flex lg:flex-col rounded shadow my-4 ml-4 mr-1 my-4 sm:rounded",
       "body": [
         {
           "type": "service",
@@ -23,7 +23,7 @@
               "type": "input-tree",
               "treeContainerClassName": "h-full",
               "name": "tree",
-              "className": "instance-box-tree bg-white w-full",
+              "className": "instance-box-tree w-full",
               "id": "u:9f3dd961ca12",
               "stacked": true,
               "multiple": false,
@@ -90,7 +90,7 @@
     },
     {
       "type": "wrapper",
-      "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:pt-3 sm:px-3",
+      "className": "steedos-instance-detail-wrapper m-0 p-0 flex-1 focus:outline-none lg:order-last sm:m-4 shadow sm:rounded",
       "body": [
         {
           "type": "service",
@@ -123,8 +123,24 @@
             "headers": {
               "Authorization": "Bearer ${context.tenantId},${context.authToken}"
             },
-            "requestAdaptor": "\nconst { recordId } = api.body;\napi.data = {\n  query: `{instance_task:instance_tasks__findOne(id: \"${recordId}\"){_id,instance}}`\n};\n\nreturn api;",
-            "adaptor": "\nlet boxName = api.body.side_listview_id === 'inbox' ? 'inbox' : 'outbox';\npayload.data = {\n  instanceId: payload.data.instance_task.instance,\n  boxName: boxName\n}\n; console.log('=======>payload===>', payload);  \nreturn payload;"
+            "requestAdaptor": "\nconst { recordId } = api.body;\napi.data = {\n  query: `{instance_task:instance_tasks__findOne(id: \"${recordId}\"){_id,instance,is_read}}`\n};\n\nreturn api;",
+            "adaptor": "\nlet boxName = api.body.side_listview_id === 'inbox' ? 'inbox' : 'outbox';\npayload.data = {\n  instanceId: payload.data.instance_task.instance,\n  boxName: boxName,\n  isRead: payload.data.instance_task.is_read\n}\n; console.log('=======>payload===>', payload);  \nreturn payload;"
+          },
+          "onEvent": {
+            "fetchInited": {
+              "actions": [
+                {
+                  "actionType": "ajax",
+                  "api": {
+                    "url": "${context.rootUrl}/api/workflow/v2/set_have_read",
+                    "method": "post",
+                    "requestAdaptor": "api.data={instanceTaskId: context.recordId, isRead: context.isRead}\n\n\nreturn api;",
+                    "adaptor": "return payload.success ? {data: {...payload}, status: 0} : {...payload, status: 1, msg: (t('CustomLabels.instance_task_set_have_read_failed') + ':' + payload.error)};"
+                  },
+                  "expression": "${!event.data.isRead}"
+                }
+              ]
+            }
           },
           "className": "h-full"
         }