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

package/main/default/objectTranslations/forms.zh-CN/forms.zh-CN.objectTranslation.yml

@@ -0,0 +1,246 @@
+name: forms
+label: 表单
+description:
+fields:
+  name:
+    label: 表单
+    help:
+    description:
+  state:
+    label: 表单状态
+    help:
+    options:
+      - label: 启用
+        value: enabled
+      - label: 停用
+        value: disabled
+    description:
+  description:
+    label: 表单描述
+    help:
+    description:
+  category:
+    label: 表单分类
+    help:
+    description:
+  is_valid:
+    label: 是否有效
+    help:
+    description:
+  instance_style:
+    label: 样式
+    help:
+    options:
+      - label: 表格
+        value: table
+      - label: 默认
+        value: default
+    description:
+  historys:
+    label: 历史版本
+    help:
+    description:
+  approve_on_create:
+    label: 是否同意审批
+    help:
+    description:
+  approve_on_modify:
+    label: 是否修改审批
+    help:
+    description:
+  approve_on_delete:
+    label: 是否删除审批
+    help:
+    description:
+  enable_workflow:
+    label: 是否启用工作流
+    help:
+    description:
+  enable_view_others:
+    label: 是否查看其它表单
+    help:
+    description:
+  current:
+    label: 当前版本
+    help:
+    description:
+  current.form_script:
+    label: 表单脚本
+    help:
+    description:
+  current.name_forumla:
+    label: 标题公式
+    help:
+    description:
+  current.fields:
+    label: 字段
+    help:
+    description:
+  current.fields.$.code:
+    label: Api 名称
+    help:
+    description:
+  current.fields.$.name:
+    label: 名称
+    help:
+    description:
+  current.fields.$.type:
+    label: 类型
+    help:
+    options:
+      - label: 勾选框
+        value: checkbox
+      - label: 日期时间
+        value: dateTime
+      - label: 日期
+        value: date
+      - label: 时间
+        value: time
+      - label: 电子邮件
+        value: email
+      - label: Group
+        value: group
+      - label: 输入框
+        value: input
+      - label: 多选框
+        value: multiSelect
+      - label: 数字框
+        value: number
+      - label: 密码
+        value: password
+      - label: 单选框
+        value: radio
+      - label: 分组
+        value: section
+      - label: 下拉框
+        value: select
+      - label: 表格
+        value: table
+      - label: 链接
+        value: url
+      - label: 选择用户
+        value: user
+      - label: Geolocation
+        value: geolocation
+      - label: 图片
+        value: image
+      - label: 附件
+        value: file
+      - label: 相关记录
+        value: lookup
+      - label: 文本
+        value: text
+      - label: 长文本
+        value: textarea
+      - label: 富文本
+        value: html
+      - label: 代码
+        value: code
+      - label: Markdown
+        value: markdown
+      - label: 选择框
+        value: select
+      - label: 颜色
+        value: color
+      - label: 复选框
+        value: boolean
+      - label: 开关
+        value: toggle
+      - label: 日期
+        value: date
+      - label: 日期时间
+        value: datetime
+      - label: 时间
+        value: time
+      - label: 数值
+        value: number
+      - label: 金额
+        value: currency
+      - label: 百分比
+        value: percent
+      - label: 密码
+        value: password
+      - label: 相关表关系
+        value: lookup
+      - label: 主/子表关系
+        value: master_detail
+      - label: 自动编号
+        value: autonumber
+      - label: 网址
+        value: url
+      - label: 邮件地址
+        value: email
+      - label: 地理位置
+        value: location
+      - label: 图片
+        value: image
+      - label: 附件
+        value: file
+      - label: 公式
+        value: formula
+      - label: 累计汇总
+        value: summary
+    description:
+  current.fields.$.is_required:
+    label: 必填
+    help:
+    description:
+  current.fields.$.is_wide:
+    label: 宽字段
+    help:
+    description:
+  current.fields.$.is_list_display:
+    label: 显示在列表内
+    help:
+    description:
+  current.fields.$.is_searchable:
+    label: 可搜索
+    help:
+    description:
+  current.fields.$.is_multiselect:
+    label: 可复选
+    help:
+    description:
+  current.fields.$.visibleOn:
+    label: 显隐的条件
+listviews:
+  all:
+    label: 所有
+actions:
+  standard_new:
+    label: 新建
+  standard_edit:
+    label: 编辑
+  standard_delete:
+    label: 删除
+  designForm:
+    label: 表单设计器
+CustomLabels:
+  _forms_field_code_error: 字段名 %s 不能包含'.'
+  forms_field_current.fields:
+  forms_field_current.fields_$_code:
+  forms_field_current.fields_$_is_list_display:
+  forms_field_current.fields_$_is_multiselect:
+  forms_field_current.fields_$_is_required:
+  forms_field_current.fields_$_is_searchable:
+  forms_field_current.fields_$_is_wide:
+  forms_field_current.fields_$_name:
+  forms_field_current.fields_$_type:
+  forms_field_current.fields_$_type_options_checkbox:
+  forms_field_current.fields_$_type_options_date:
+  forms_field_current.fields_$_type_options_dateTime:
+  forms_field_current.fields_$_type_options_email:
+  forms_field_current.fields_$_type_options_geolocation:
+  forms_field_current.fields_$_type_options_group:
+  forms_field_current.fields_$_type_options_input:
+  forms_field_current.fields_$_type_options_multiSelect:
+  forms_field_current.fields_$_type_options_number:
+  forms_field_current.fields_$_type_options_password:
+  forms_field_current.fields_$_type_options_radio:
+  forms_field_current.fields_$_type_options_section:
+  forms_field_current.fields_$_type_options_select:
+  forms_field_current.fields_$_type_options_table:
+  forms_field_current.fields_$_type_options_url:
+  forms_field_current.fields_$_type_options_user:
+  forms_field_current.form_script:
+  forms_field_current.name_forumla:

package/main/default/objectTranslations/instance_tasks.en/instance_tasks.en.objectTranslation.yml

@@ -209,3 +209,5 @@ listviews:
 actions:
   instance_new:
     label: New
+CustomLabels:
+  instance_task_set_have_read_failed: Set as read failed

package/main/default/objectTranslations/instance_tasks.zh-CN/instance_tasks.zh-CN.objectTranslation.yml

@@ -209,3 +209,5 @@ listviews:
 actions:
   instance_new:
     label: 新建
+CustomLabels:
+  instance_task_set_have_read_failed: 设置为已读失败

package/main/default/objects/forms/forms.object.yml

@@ -209,6 +209,52 @@ fields:
         value: file
       - label: Lookup
         value: lookup
+      - label: Steedos Field 
+        value: steedos-field
+      - label: Text
+        value: text
+      - label: Textarea
+        value: textarea
+      - label: Html
+        value: html
+      - label: Lookup
+        value: lookup
+      - label: Master Detail
+        value: master_detail
+      - label: Select
+        value: select
+      - label: Boolean
+        value: boolean
+      - label: Date
+        value: date
+      - label: Datetime
+        value: datetime
+      - label: Time
+        value: time
+      - label: Number
+        value: number
+      - label: Currency
+        value: currency
+      - label: Percent
+        value: percent
+      - label: Image
+        value: image
+      - label: File
+        value: file
+      - label: Code
+        value: code
+      - label: Markdown
+        value: markdown
+      - label: Color
+        value: color
+      - label: Toggle
+        value: toggle
+      - label: Password
+        value: password
+      - label: Url
+        value: url
+      - label: Email
+        value: email
     readonly: true
     name: current.fields.$.type
     filterable: true

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

@@ -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

@@ -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: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

@@ -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"
         }

package/main/default/routes/afterHook.js

@@ -0,0 +1,34 @@
+const afterHook = (req, res, next) => {
+  res.on('finish', () => {
+    if (req.url.includes('/api/workflow/v2/approve/save')) {
+      const { approve } = req.body;
+      const ins_id = approve.instance;
+      broker.call('objectql.update', {
+        objectName: 'instances',
+        id: ins_id,
+        doc: {},
+      })
+    }else if(req.url.includes('/api/workflow/engine')){
+        var hashData = req.body;
+        const approve_from_client = hashData['Approvals'][0];
+        const ins_id = approve_from_client.instance;
+        broker.call('objectql.update', {
+            objectName: 'instances',
+            id: ins_id,
+            doc: {},
+        })
+    }else if(req.ulr.includes('/api/workflow/relocate')){
+        var hashData = req.body;
+        const instance_from_client = hashData['Instances'][0];
+        const ins_id = instance_from_client._id;
+        broker.call('objectql.update', {
+            objectName: 'instances',
+            id: ins_id,
+            doc: {},
+        })
+    }
+  });
+  next();
+};
+
+module.exports = afterHook;

package/main/default/routes/api_have_read.router.js

@@ -0,0 +1,73 @@
+/*
+ * @Author: 殷亮辉 yinlianghui@hotoa.com
+ * @Date: 2025-10-09 10:12:49
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-10-29 09:38:43
+ */
+const express = require("express");
+const router = express.Router();
+const { requireAuthentication } = require("@steedos/auth");
+const objectql = require('@steedos/objectql')
+// const { cc_do } = require('../methods/trace_approve_cc');
+const { getCollection } = require('../utils/collection');
+const { set_approve_have_read } = require('../methods/instance_approve');
+const { cc_read } = require('../methods/trace_approve_cc');
+// const InstanceManager = global.InstanceManager;
+const InstanceManager = require('../manager/instance_manager');
+
+router.post('/api/workflow/v2/set_have_read', requireAuthentication, async function (req, res) {
+    try {
+        let userSession = req.user;
+        if (!userSession) {
+            return res.status(200).send({
+                error: "unauthorized"
+            });
+        }
+        const userId = userSession.userId;
+        const { instanceTaskId, isRead } = req.body;
+        if (isRead){
+            return res.status(200).send({
+                success: true
+            });
+        }
+        const db = {
+            instances: await getCollection('instances'),
+            instance_tasks: await getCollection('instance_tasks')
+        };
+        const instance_task = await db.instance_tasks.findOne({
+            _id: instanceTaskId
+        }, {
+            fields: {
+                "instance": 1,
+                "is_read": 1,
+                "type": 1
+            }
+        });
+        if (instance_task.is_read){
+            return res.status(200).send({
+                success: true
+            });
+        }
+
+        const instanceId = instance_task.instance;
+        const ins = await db.instances.findOne({_id: instanceId});
+        var myApprove = InstanceManager.getCurrentApprove(ins, userId, instance_task.type);
+        if (instance_task.type == "cc") {
+            // 传阅
+            await cc_read(ins, myApprove, { userId });
+        }
+        else{
+            await set_approve_have_read(ins._id, myApprove.trace, myApprove._id, { userId });
+        }
+        return res.status(200).send({
+            success: true
+        });
+
+    } catch (error) {
+        console.error(error);
+        return res.status(200).send({
+            error: error.message
+        });
+    }
+});
+exports.default = router;

package/main/default/routes/api_workflow_approve_save.router.js

@@ -8,8 +8,9 @@ const {
 const UUFlowManager = require('../manager/uuflow_manager');
 const { getCollection } = require('../utils/collection');
 const approveManager = require('../manager/approve_manager');
+const afterHook = require('./afterHook');
 
-router.post('/api/workflow/v2/approve/save', requireAuthentication, async function (req, res) {
+router.post('/api/workflow/v2/approve/save', requireAuthentication, afterHook, async function (req, res) {
     try {
         const userSession = req.user;
         const { approve } = req.body;

package/main/default/routes/api_workflow_engine.router.js

@@ -15,7 +15,7 @@ const Fiber = function(fun){console.log('TODO Fiber...')}
 const { excuteTriggers } = require('../utils/trigger');
 const { getStep } = require('../uuflowManager');
 const UUFlowManager = require('../manager/uuflow_manager');
-
+const afterHook = require('./afterHook');
 /**
  * 审批中提交申请单
  * body {
@@ -53,7 +53,7 @@ const UUFlowManager = require('../manager/uuflow_manager');
     ]
  * }
  */
-router.post('/api/workflow/engine', requireAuthentication, async function (req, res) {
+router.post('/api/workflow/engine', requireAuthentication, afterHook, async function (req, res) {
     try {
         let userSession = req.user;
         const spaceId = userSession.spaceId;
@@ -80,7 +80,7 @@ router.post('/api/workflow/engine', requireAuthentication, async function (req,
         }
 
         try {
-            const instance = UUFlowManager.workflow_engine(approve_from_client, userSession, userId);
+            const instance = await UUFlowManager.workflow_engine(approve_from_client, userSession, userId);
             // afterStepSubmit
             await excuteTriggers({ when: 'afterStepSubmit', userId, flowId, insId });
             // afterEnd

package/main/default/routes/api_workflow_flow_version.router.js

@@ -0,0 +1,61 @@
+const express = require("express");
+const router = express.Router();
+const { requireAuthentication } = require("@steedos/auth");
+const _ = require('lodash');
+const { getCollection } = require('../utils/collection');
+router.get('/api/workflow/flow/:flowId/version/:versionId', requireAuthentication, async function (req, res) {
+    try {
+        const { flowId, versionId } = req.params;
+        const flowsColl = await getCollection('flows');
+
+        const flow = await flowsColl.aggregate([
+        {
+            $match: {
+            "_id": flowId
+            }
+        },
+        {
+            $project: {
+            name: 1,
+            current_no: 1,
+            versionData: {
+                $cond: {
+                if: { $eq: ["$current._id", versionId] },
+                then: "$current",
+                else: {
+                    $arrayElemAt: [
+                    {
+                        $filter: {
+                        input: "$historys",
+                        as: "history",
+                        cond: { $eq: ["$$history._id", versionId] }
+                        }
+                    },
+                    0
+                    ]
+                }
+                }
+            }
+            }
+        },
+        {
+            $match: {
+            "versionData": { $ne: null }
+            }
+        },
+        { $limit: 1 } // 限制只返回一个文档
+        ]).next();
+
+        if (flow) {
+        res.status(200).send(flow.versionData);
+        } else {
+        res.status(404).send({ message: "流程版本未找到" });
+        }
+    } catch (error) {
+        console.error('Unexpected error:', error);
+        res.status(500).send({
+            error: error.message
+        });
+    }
+});
+exports.default = router;