npm - @steedos-labs/plugin-workflow - Versions diffs - 3.0.55 → 3.0.57 - Mend

@steedos-labs/plugin-workflow 3.0.55 → 3.0.57

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.

Files changed (33) hide show

package/designer/dist/index.html CHANGED Viewed

@@ -5,8 +5,8 @@
     <link rel="shortcut icon" type="image/svg+xml" href="/images/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>designer</title>
-    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-CBj3S4BT.js"></script>
-    <link rel="stylesheet" crossorigin href="/api/workflow/designer-v2/assets/index-BNulYl_s.css">
+    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-DqalQY4s.js"></script>
+    <link rel="stylesheet" crossorigin href="/api/workflow/designer-v2/assets/index-DIAKZCeb.css">
   </head>
   <body>
     <div id="root"></div>

package/main/default/manager/uuflow_manager.js CHANGED Viewed

@@ -803,6 +803,79 @@ UUFlowManager.setFormFieldVariable = async function (fields, __values, space_id)
     }
 };
+/**
+ * 按需为条件表达式中以 {fieldCode.xxx} 形式引用了属性的 lookup/odata 字段查询完整记录
+ * 仅当字段值是纯字符串（新版 lookup ID）时才查询，旧版对象值直接跳过
+ */
+UUFlowManager.enrichLookupFieldValues = async function (fields, __values, lines) {
+    if (!lines || !fields) return;
+    // 1. 收集所有条件表达式
+    const allConditions = lines
+        .filter(l => l.condition)
+        .map(l => l.condition)
+        .join(' ');
+    if (!allConditions) return;
+    // 2. 提取所有 {fieldCode.xxx} 中的 fieldCode（不限定 .xxx 的内容，如 @label）
+    const dotAccessRegex = /\{(\w+)\./g;
+    const referencedFieldCodes = new Set();
+    let match;
+    while ((match = dotAccessRegex.exec(allConditions)) !== null) {
+        referencedFieldCodes.add(match[1]);
+    }
+    if (referencedFieldCodes.size === 0) return;
+    // 3. 建立 fieldCode → field 的映射（含 section 内嵌字段）
+    const fieldMap = {};
+    for (const field of fields) {
+        if (field.type === 'section' && field.fields) {
+            for (const f of field.fields) { fieldMap[f.code] = f; }
+        } else if (field.type === 'table' && field.fields) {
+            for (const f of field.fields) { fieldMap[f.code] = f; }
+        } else {
+            fieldMap[field.code] = field;
+        }
+    }
+    // 4. 仅对 odata/lookup 类型、且值为纯字符串的字段查询
+    for (const code of referencedFieldCodes) {
+        const field = fieldMap[code];
+        if (!field) continue;
+        if (field.type !== 'odata' && field.type !== 'lookup') continue;
+        const val = __values[code];
+        if (!val || typeof val === 'object') continue; // 已是对象，无需处理
+        // 从 odata 的 url 或 lookup 的 reference_to 获取对象名
+        let objectName = null;
+        if (field.type === 'odata' && field.url) {
+            // url 格式通常为: /api/odata/v4/{spaceId}/{objectName}
+            const parts = field.url.replace(/\/$/, '').split('/');
+            objectName = parts[parts.length - 1];
+        } else if (field.type === 'lookup' && field.reference_to) {
+            objectName = field.reference_to;
+        }
+        if (!objectName) continue;
+        try {
+            const obj = getObject(objectName);
+            const record = await obj.findOne(val, { fields: { name: 1 } });
+            if (record) {
+                __values[code] = {
+                    _id: val,
+                    "@label": record.name || val
+                };
+            }
+        } catch (e) {
+            console.warn(`[workflow/engine] enrichLookupFieldValues: failed to enrich field "${code}" from "${objectName}": ${e.message}`);
+        }
+    }
+};
 function isSkipStep(instance, step) {
     return instance.skip_steps?.includes(step._id);
 }
@@ -885,6 +958,9 @@ UUFlowManager.getNextSteps = async function (instance, flow, step, judge, values
         // Set form field variables
         await UUFlowManager.setFormFieldVariable(formVersion.fields, __values, instance.space);
+        // 按需为 lookup/odata 字段补充对象值，使 {field.@label} 等属性访问可用
+        await UUFlowManager.enrichLookupFieldValues(formVersion.fields, __values, step.lines);
         // Evaluate conditions
         const reg = /(\{[^{}]*\})/g;
         const prefix = "__values";
@@ -1818,7 +1894,7 @@ UUFlowManager.handleSkipProcessed = async function (instance_id, flow, maxDepth
                 step: next_step_id,
                 name: next_step.name,
                 start_date: now,
-                due_date: UUFlowManager.getDueDate(next_step.timeout_hours, space_id),
+                due_date: await UUFlowManager.getDueDate(next_step.timeout_hours, space_id),
                 approves: []
             };
@@ -2150,7 +2226,7 @@ UUFlowManager.engine_step_type_is_start_or_submit_or_condition = async function
             step: next_step_id,
             name: next_step_name,
             start_date: new Date(),
-            due_date: UUFlowManager.getDueDate(next_step.timeout_hours, space_id),
+            due_date: await UUFlowManager.getDueDate(next_step.timeout_hours, space_id),
             approves: []
         };
@@ -2436,7 +2512,7 @@ UUFlowManager.engine_step_type_is_sign = async function (
                 step: next_step_id,
                 name: next_step_name,
                 start_date: new Date(),
-                due_date: UUFlowManager.getDueDate(next_step.timeout_hours, space_id),
+                due_date: await UUFlowManager.getDueDate(next_step.timeout_hours, space_id),
                 approves: []
             };
@@ -2668,7 +2744,7 @@ UUFlowManager.engine_step_type_is_sign = async function (
                 step: next_step_id,
                 name: next_step_name,
                 start_date: new Date(),
-                due_date: UUFlowManager.getDueDate(next_step.timeout_hours, space_id),
+                due_date: await UUFlowManager.getDueDate(next_step.timeout_hours, space_id),
                 approves: []
             };
@@ -2926,7 +3002,7 @@ UUFlowManager.engine_step_type_is_counterSign = async function (
                 step: next_step_id,
                 name: next_step_name,
                 start_date: new Date(),
-                due_date: UUFlowManager.getDueDate(next_step.timeout_hours, space_id),
+                due_date: await UUFlowManager.getDueDate(next_step.timeout_hours, space_id),
                 approves: []
             };
@@ -3154,6 +3230,7 @@ UUFlowManager.create_instance = async function (instance_from_client, user_info)
     ins_obj.applicant_organization_name = instance_from_client["applicant_organization_name"] || space_user_org_info.organization_name;
     ins_obj.applicant_organization_fullname = instance_from_client["applicant_organization_fullname"] || space_user_org_info.organization_fullname;
     ins_obj.applicant_company = instance_from_client["applicant_company"] || space_user.company_id;
+    ins_obj.submitterOrApplicant = [...new Set([ins_obj.submitter, ins_obj.applicant])];
     ins_obj.state = 'draft';
     ins_obj.code = '';
     ins_obj.is_archived = false;
@@ -3233,11 +3310,11 @@ UUFlowManager.getCurrentStepAutoSubmit = function (timeout_auto_submit, lines) {
 };
 UUFlowManager.getDueDate = async function (hours, spaceId) {
-    if (hours) {
-        // TODO: 实现异步获取超时日期
-        // return await steedosCore.getTimeoutDateWithoutHolidays(new Date(), hours, spaceId);
+    if (!hours) {
+        return undefined;
     }
-    return undefined;
+    const { getTimeoutDateWithoutHolidays } = require('../utils/business_timeout');
+    return await getTimeoutDateWithoutHolidays(new Date(), hours, spaceId);
 };
 //////////
@@ -3332,6 +3409,7 @@ UUFlowManager.submit_instance = async function (instance_from_client, user_info)
         setObj.applicant_organization_name = applicant_org_info.organization_name;
         setObj.applicant_organization_fullname = applicant_org_info.organization_fullname;
         setObj.applicant_company = applicant.company_id;
+        setObj.submitterOrApplicant = [...new Set([submitter_id, applicant_id])];
         instance_traces[0].approves[0].user = applicant_id;
         instance_traces[0].approves[0].user_name = user.name;
     }
@@ -4190,6 +4268,7 @@ UUFlowManager.cancelProcessDelegation = async function (spaceId, toId) {
                     if (ins.state === 'draft') {
                         setObj.submitter = a.user;
                         setObj.submitter_name = a.user_name;
+                        setObj.submitterOrApplicant = [...new Set([a.user, ins.applicant])];
                     }
                     await db.instances.updateOne({
@@ -4292,7 +4371,8 @@ UUFlowManager.updateCCcount = async function (insId) {
 UUFlowManager.timeoutAutoSubmit = async function (ins_id) {
     const db = {
-        instances: await getCollection('instances')
+        instances: await getCollection('instances'),
+        users: await getCollection('users')
     };
     const query = {
@@ -4312,66 +4392,89 @@ UUFlowManager.timeoutAutoSubmit = async function (ins_id) {
     const instances = await db.instances.find(query).toArray();
-    await Promise.all(instances.map(async (ins) => {
+    for (const ins of instances) {
         try {
             const flow_id = ins.flow;
             const instance_id = ins._id;
             const trace = ins.traces[ins.traces.length - 1];
+            // Only process if trace is not finished and due_date has passed
+            if (trace.is_finished || !trace.due_date || new Date(trace.due_date) > new Date()) {
+                continue;
+            }
             const flow = await UUFlowManager.getFlow(flow_id);
             const step = await UUFlowManager.getStep(ins, flow, trace.step);
             const step_type = step.step_type;
-            const toLine = step.lines.find(l => l.timeout_line === true);
-            if (!toLine) return;
+            // Find the timeout line configuration on the current step
+            const toLine = step.lines ? step.lines.find(l => l.timeout_line === true) : null;
+            if (!toLine) continue;
             let nextStepId = toLine.to_step;
             let nextStep = await UUFlowManager.getStep(ins, flow, nextStepId);
+            // If the next step is a condition step, resolve it to the actual next step
             if (nextStep.step_type === 'condition') {
                 const nextSteps = await UUFlowManager.getNextSteps(ins, flow, nextStep, "");
-                console.error(nextSteps);
+                if (!nextSteps || nextSteps.length === 0) {
+                    console.error(`[timeout_auto_submit] No next steps resolved for condition step, instance: ${instance_id}`);
+                    continue;
+                }
                 nextStepId = nextSteps[0];
                 nextStep = await UUFlowManager.getStep(ins, flow, nextStepId);
             }
-            const nextUserIds = await await HandlersManager.getHandlers(instance_id, nextStepId);
+            const nextUserIds = await HandlersManager.getHandlers(instance_id, nextStepId);
             const judge = step_type === "sign" ? "approved" : "submitted";
-            const approve_from_client = {
-                instance: instance_id,
-                trace: trace._id,
-                judge: judge,
-                next_steps: [{
-                    step: nextStepId,
-                    users: nextUserIds
-                }]
-            };
+            // Process each unfinished approve in the trace sequentially to avoid race conditions
+            const unfinishedApproves = trace.approves.filter(a => !a.is_finished);
+            for (const a of unfinishedApproves) {
+                try {
+                    // Create a separate approve_from_client for each approve to avoid shared mutation
+                    const approve_from_client = {
+                        _id: a._id,
+                        instance: instance_id,
+                        trace: trace._id,
+                        judge: judge,
+                        next_steps: [{
+                            step: nextStepId,
+                            users: nextUserIds
+                        }]
+                    };
-            await Promise.all(trace.approves.map(async (a) => {
-                approve_from_client._id = a._id;
-                const current_user_info = await db.users.findOne(
-                    { _id: a.handler },
-                    { projection: { services: 0 } }
-                );
+                    const current_user_info = await db.users.findOne(
+                        { _id: a.handler },
+                        { projection: { services: 0 } }
+                    );
-                const updatedInstance = await UUFlowManager.workflow_engine(
-                    approve_from_client,
-                    current_user_info,
-                    current_user_info._id,
-                    true
-                );
+                    if (!current_user_info) {
+                        console.error(`[timeout_auto_submit] User not found: ${a.handler}, instance: ${instance_id}`);
+                        continue;
+                    }
-                await pushManager.send_instance_notification(
-                    "auto_submit_pending_inbox",
-                    updatedInstance,
-                    "",
-                    current_user_info
-                );
-            }));
+                    const updatedInstance = await UUFlowManager.workflow_engine(
+                        approve_from_client,
+                        current_user_info,
+                        current_user_info._id,
+                        true
+                    );
+                    await pushManager.send_instance_notification(
+                        "auto_submit_pending_inbox",
+                        updatedInstance,
+                        "",
+                        current_user_info
+                    );
+                } catch (approveError) {
+                    console.error(`[timeout_auto_submit] Error processing approve ${a._id} for instance ${instance_id}: `, approveError.stack);
+                }
+            }
         } catch (error) {
-            console.error('AUTO TIMEOUT_AUTO_SUBMIT ERROR: ', error.stack);
+            console.error(`[timeout_auto_submit] Error processing instance ${ins._id}: `, error.stack);
         }
-    }));
+    }
     return true;
 };
@@ -4783,6 +4886,7 @@ UUFlowManager.draft_save_instance = async function (ins, userId) {
             setObj.applicant_organization = applicant.organization;
             setObj.applicant_organization_name = organization.name;
             setObj.applicant_organization_fullname = organization.fullname;
+            setObj.submitterOrApplicant = [...new Set([instance.submitter, applicant_id])];
             setObj[key_str + 'user'] = applicant_id;
             setObj[key_str + 'user_name'] = user.name;
         }

package/main/default/objects/categories/buttons/badge_recalc.button.yml ADDED Viewed

@@ -0,0 +1,44 @@
+name: badge_recalc
+amis_schema: |-
+  {
+      "type": "service",
+      "body": [
+          {
+              "type": "button",
+              "label": "重算角标",
+              "id": "u:badge_recalc",
+              "editorState": "default",
+              "onEvent": {
+                  "click": {
+                      "weight": 0,
+                      "actions": [
+                          {
+                              "actionType": "url",
+                              "args": {
+                                  "url": "/api/workflow/badge-recalc-console",
+                                  "blank": true
+                              }
+                          }
+                      ]
+                  }
+              }
+          }
+      ],
+      "data": {
+          "context": {},
+          "dataComponentId": "",
+          "record_id": "",
+          "record": {},
+          "permissions": {}
+      },
+      "id": "u:badge_recalc_service",
+      "bodyClassName": "p-0",
+      "dsType": "api",
+      "definitions": {}
+  }
+is_enable: true
+label: 重算角标
+locked: false
+'on': record_more
+type: amis_button
+visible: true

package/main/default/objects/instance_tasks/listviews/inbox.listview.yml CHANGED Viewed

@@ -26,12 +26,12 @@ filters: !!js/function |
     }
 sort: [['start_date','desc']]
 searchable_fields:
+  - field: flow
   - field: instance_name
   - field: submitter_name
   - field: applicant_organization_name
   - field: submit_date
   - field: instance_state
-  - field: is_archived
 extra_columns:
   - extras
   - is_read

package/main/default/objects/instance_tasks/listviews/outbox.listview.yml CHANGED Viewed

@@ -25,13 +25,12 @@ filters: !!js/function |
     }
 sort: [['modified','desc']]
 searchable_fields:
+  - field: flow
   - field: instance_name
   - field: submitter_name
-  - field: flow
   - field: applicant_organization_name
   - field: submit_date
   - field: instance_state
-  - field: is_archived
 extra_columns:
   - extras
 disableSwitch: true

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

@@ -17,65 +17,9 @@ amis_schema: |-
                                   "title": "${'CustomAction.instances.instance_related' | t}",
                                   "body": [
                                       {
-                                          "type": "form",
-                                          "data": {
-                                            "initApiFinished": false,
-                                            "appId": "${app_id}"
-                                          },
-                                          "body": [
-                                            {
-                                                "type": "steedos-field",
-                                                "config": {
-                                                  "type": "lookup",
-                                                  "label": "字段1",
-                                                  "name": "related_instances",
-                                                  "id": "u:ff88cc3375b5",
-                                                  "reference_to": "instances",
-                                                  "pickerSchema": {
-                                                        "rowClassNameExpr": "<%= data.__selected === true ? 'hidden' : '' %>",
-                                                        "perPage": 20
-                                                    },
-                                                  "searchable_default": {
-                                                      "submit_date": "${[STARTOF(DATEMODIFY(NOW(), -180, 'day'), 'day'),ENDOF(NOW(), 'day')]}"
-                                                  },
-                                                  "amis": {
-                                                    "id": "u:f0273e374d19",
-                                                    "embed": true,
-                                                    "label": false,
-                                                    "multiple": true,
-                                                    "visibleOn": "initApiFinished == true",
-                                                    "labelField": "name",
-                                                    "valueField": "_id",
-                                                    "menuTpl": null,
-                                                    "source": {
-                                                      "method": "post",
-                                                      "url": "${context.rootUrl}/graphql",
-                                                      "requestAdaptor": "var searchableDefaultConfig = {\"submit_date\": \"${[STARTOF(DATEMODIFY(NOW(), -180, 'day'), 'day'),ENDOF(NOW(), 'day')]}\"};\nvar filterFormValues = JSON.parse(JSON.stringify(searchableDefaultConfig));\nif (_.isObject(filterFormValues)) {\n    _.each(filterFormValues, function(v, k) {\n        var isAmisFormulaValue = typeof v === \"string\" && v.indexOf(\"${\") > -1;\n        if (isAmisFormulaValue) {\n            filterFormValues[k] = AmisCore.evaluate(v, context);\n        }\n    });\n    var fields = api.data.$self.uiSchema && api.data.$self.uiSchema.fields;\n    filterFormValues = SteedosUI.getSearchFilterFormValues(filterFormValues, fields);\n}\nvar selfData = JSON.parse(JSON.stringify(api.data.$self));\nvar searchableFilter = SteedosUI.getSearchFilter(Object.assign({}, filterFormValues, selfData)) || []; const { pageNo, pageSize, keywords = '' } = api.data;\nvar keywordsFilters = SteedosUI.getKeywordsSearchFilter(api.data.$self.__keywords_lookup__related_instances__to__instances, [\"name\", \"flow_name\",\"submitter\",\"submit_date\"]);\nif (keywordsFilters && keywordsFilters.length > 0) {\n  searchableFilter.push(keywordsFilters);\n}\nconsole.log(\"===\", JSON.stringify(api.data));\napi.data = {\n    query: `\n        query{\n            rows: instances__getRelatedInstances(keywords: \"${keywords}\", top: ${pageSize || 20}, skip: ${(pageNo - 1) * pageSize}, filters: ${JSON.stringify(searchableFilter)}){\n                 _id,\n    name,\n    flow_name,\n    submit_date,\n    submitter\n    _display:_ui{\n      submit_date,\n      submitter\n    }\n            },\n            count: instances__getRelatedInstances__count(filters: ${JSON.stringify(searchableFilter)}, keywords: \"${keywords}\")\n            }\n    `\n};\nreturn api;",
-                                                      "headers": {
-                                                        "Authorization": "Bearer ${context.tenantId},${context.authToken}"
-                                                      },
-                                                      "adaptor": "payload.data.rows = payload.data.rows?.concat(api.body.$self.selectedRelatedInstances || []); return payload",
-                                                      "data": {
-                                                        "orderBy": "${orderBy}",
-                                                        "orderDir": "${orderDir}",
-                                                        "pageNo": "${page}",
-                                                        "pageSize": 20,
-                                                        "$self": "$$",
-                                                        "keywords": "${keywords}",
-                                                        "ids": "${ids}"
-                                                      }
-                                                    }
-                                                  }
-                                                },
-                                                "id": "u:774bdcbde030"
-                                              }
-                                          ],
-                                          "initApi": {
-                                              "method": "post",
-                                              "url": "${context.rootUrl}/graphql",
-                                              "requestAdaptor": "const { _id: recordId } = api.data.record;\napi.data = {\n  query:`\n            {\n              instance: instances__findOne(id:\"${recordId}\"){\n                related_instances: related_instances__expand{\n                  _id,\n                 name\n                }\n              }\n            }\n          `\n        }\n        return api;",
-                                              "adaptor": "payload.data = {initApiFinished: true, \n  related_instances: _.map(payload.data.instance?.related_instances, '_id'),\n selectedRelatedInstances: _.map(payload.data.instance?.related_instances, (item)=>{item.__selected=true;return item})};console.log('====payload', payload);\nreturn payload;"
-                                          }
+                                          "type": "antd-related-instances",
+                                          "name": "related_instances",
+                                        "id": "u:ff88cc3375b5"
                                       }
                                   ],
                                   "id": "u:47c202e8149b",

package/main/default/objects/instances/listviews/completed.listview.yml CHANGED Viewed

@@ -25,13 +25,12 @@ filters: !!js/function |
     }
 sort: [['modified','desc']]
 searchable_fields:
+  - field: flow
   - field: name
   - field: submitter_name
-  - field: flow
   - field: applicant_organization_name
   - field: submit_date
   - field: state
-  - field: is_archived
 extra_columns:
   - extras
 disableSwitch: true

package/main/default/objects/instances/listviews/draft.listview.yml CHANGED Viewed

@@ -16,11 +16,10 @@ filters: !!js/function |
     }
 sort: [['modified','desc']]
 searchable_fields:
+  - field: flow
   - field: name
   - field: submitter_name
-  - field: flow
   - field: applicant_organization_name
   - field: submit_date
   - field: state
-  - field: is_archived
 disableSwitch: true

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

@@ -25,12 +25,12 @@ filters: !!js/function |
     }
 sort: [['submit_date','desc']]
 searchable_fields:
+  - field: flow
   - field: name
   - field: submitter_name
   - field: applicant_organization_name
   - field: submit_date
   - field: state
-  - field: is_archived
 extra_columns:
   - extras
   - values

package/main/default/objects/instances/listviews/pending.listview.yml CHANGED Viewed

@@ -25,13 +25,12 @@ filters: !!js/function |
     }
 sort: [['submit_date','desc']]
 searchable_fields:
+  - field: flow
   - field: name
   - field: submitter_name
-  - field: flow
   - field: applicant_organization_name
   - field: submit_date
   - field: state
-  - field: is_archived
 extra_columns:
   - extras
 disableSwitch: true