npm - @steedos-labs/plugin-workflow - Versions diffs - 3.0.52 → 3.0.53 - Mend

@steedos-labs/plugin-workflow 3.0.52 → 3.0.53

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 (11) hide show

package/designer/dist/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <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-BkLrUP0o.js"></script>
+    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-3PKde6SC.js"></script>
     <link rel="stylesheet" crossorigin href="/api/workflow/designer-v2/assets/index-xR8ApdWL.css">
   </head>
   <body>

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

@@ -304,15 +304,16 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
         }
         for (const org of org_ids_names) {
+            const org_id_val = _.isString(org) ? org : org["id"];
             const check_org_count = await organizationsCollection.find({
-                _id: org["id"]
+                _id: org_id_val
             }).count();
             if (check_org_count === 0) {
                 throw new Error('error! 组织ID不合法');
             }
-            org_ids.push(org["id"]);
+            org_ids.push(org_id_val);
         }
         if (current_step.approver_roles && current_step.approver_roles.length > 0) {
@@ -380,15 +381,16 @@ getHandlersManager.getHandlers = async function (instance_id, step_id, login_use
         }
         for (const org of org_ids_names) {
+            const org_id_val = _.isString(org) ? org : org["id"];
             const check_org_count = await organizationsCollection.find({
-                _id: org["id"]
+                _id: org_id_val
             }).count();
             if (check_org_count === 0) {
                 throw new Error('error! 组织ID不合法');
             }
-            org_ids.push(org["id"]);
+            org_ids.push(org_id_val);
         }
         let user_ids = [];

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

@@ -81,7 +81,7 @@ async function upgradeForm(formId, form, currentUserId, spaceId) {
         const insCount = await instancesCollection.countDocuments({
             space: spaceId,
             form: formId,
-            'form_version': form['current']['id']
+            'form_version': form['current']['id'] || form['current']['_id']
         });
         pass = insCount > 0;
     } else if (ff.app === 'creator') {
@@ -89,7 +89,7 @@ async function upgradeForm(formId, form, currentUserId, spaceId) {
         const recordsCount = await recordsCollection.countDocuments({
             space: spaceId,
             form: formId,
-            'form_version': form['current']['id']
+            'form_version': form['current']['id'] || form['current']['_id']
         });
         pass = recordsCount > 0;
     }
@@ -165,7 +165,7 @@ async function upgradeFlow(flowCome, userId, flowId) {
     // Process steps
     const clientStepIds = [];
-    _.each(flowCome['current']['steps'], (step) => clientStepIds.push(step['id']));
+    _.each(flowCome['current']['steps'], (step) => clientStepIds.push(step['_id'] || step['id']));
     _.each(flowCome['current']['steps'], (step) => {
         if (step['approver_step'] && !clientStepIds.includes(step['approver_step'])) {
             step['approver_step'] = '';

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

@@ -1240,7 +1240,27 @@ UUFlowManager.getInstanceName = async function (instance, vals) {
             // Remove special characters from the name
             rev = rev.replace(/\?|\*|\:|\"|\<|\>|\\|\/|\|/g, "");
         } catch (error) {
-            console.error('Error evaluating instance name formula:', error);
+            // JS expression failed — retry as template format
+            // e.g. "新闻上报-{title}" or "News Report-{title}"
+            try {
+                let templateScript = form_v.name_forumla;
+                templateScript = templateScript.split(/(\{[^{}]+\})/).map(part => {
+                    if (/^\{[^{}]+\}$/.test(part)) return part;
+                    return part ? JSON.stringify(part) : '';
+                }).filter(Boolean).join('+');
+                if (templateScript.includes("{applicant.")) {
+                    templateScript = templateScript.replace(/\{applicant./g, "(applicant.").replace(/\}/g, " || '')");
+                }
+                templateScript = templateScript.replace(/\{/g, "(values.").replace(/\}/g, " || '')");
+                const script = `module.exports = function (applicant, values, flow, form) { return ${templateScript} }`;
+                const func = _eval(script, "getInstanceName");
+                rev = func(applicant, values, null, form) || default_value;
+                rev = rev.replace(/\?|\*|\:|\"|\<|\>|\\|\/|\|/g, "");
+            } catch (e) {
+                console.error('Error evaluating instance name formula:', e);
+            }
         }
     }

package/main/default/routes/am.router.js CHANGED Viewed

@@ -183,7 +183,7 @@ router.post('/am/forms', async function (req, res) {
             });
             let companyId = currentSpaceUser.company_id;
             let newForm = {
-                _id: form["id"],
+                _id: form["id"] || form["_id"],
                 name: form["name"],
                 state: "disabled",
                 is_deleted: false,
@@ -204,7 +204,7 @@ router.post('/am/forms', async function (req, res) {
                 newForm.company_id = companyId;
             }
             let current = {
-                _id: form["current"]["id"],
+                _id: form["current"]["id"] || form["current"]["_id"],
                 name_forumla: name_forumla,
                 form: newForm._id,
                 _rev: 1,
@@ -274,7 +274,7 @@ router.post('/am/forms', async function (req, res) {
             let flow = {
                 _id: _makeNewID(),
                 space: form["space"],
-                form: form["id"],
+                form: form["id"] || form["_id"],
                 name_formula: "",
                 code_formula: "",
                 is_valid: true,
@@ -323,7 +323,7 @@ router.post('/am/forms', async function (req, res) {
                 steps: await designerManager.makeSteps(userId, newForm.current.fields, language),
                 _rev: 1,
                 flow: flow._id,
-                form_version: form["current"]["id"],
+                form_version: form["current"]["id"] || form["current"]["_id"],
                 created: now,
                 created_by: userId,
                 modified: now,
@@ -359,7 +359,7 @@ router.put('/am/forms', async function (req, res) {
             // 执行者的身份校验
             await designerManager.checkSpaceUserBeforeUpdate(form['space'], userId, req.user.roles)
             // 更新表单
-            await designerManager.updateForm(form["id"], form, updatedForms, updatedFlows, userId)
+            await designerManager.updateForm(form["id"] || form["_id"], form, updatedForms, updatedFlows, userId)
         }
         res.send({
             "ChangeSet": {
@@ -395,7 +395,7 @@ router.delete('/am/forms', async function (req, res) {
         let now = new Date();
         for (let i = 0; i < data['Forms'].length; i++) {
             let form = data['Forms'][i];
-            let f = await formCollection.findOne({_id: form["id"]});
+            let f = await formCollection.findOne({_id: form["id"] || form["_id"]});
             // 执行者的身份校验
             await designerManager.checkSpaceUserBeforeUpdate(f.space, userId, req.user.roles)
@@ -405,7 +405,7 @@ router.delete('/am/forms', async function (req, res) {
             // 删除表单对应流程
             let flows = await flowCollection.find({
                 space: spaceId,
-                form: form["id"]
+                form: form["id"] || form["_id"]
             }).toArray();
             for (let flow_fd of flows) {
                 let deleted_flow = Object.assign({}, flow_fd);
@@ -420,7 +420,7 @@ router.delete('/am/forms', async function (req, res) {
             if (recordCollection) {
                 let records = await recordCollection.find({
                     space: spaceId,
-                    form: form["id"]
+                    form: form["id"] || form["_id"]
                 }).toArray();
                 for (let record_fd of records) {
                     let deleted_record = Object.assign({}, record_fd);
@@ -435,7 +435,7 @@ router.delete('/am/forms', async function (req, res) {
             // 删除表单对应申请单
             let instances = await instanceCollection.find({
                 space: spaceId,
-                form: form["id"]
+                form: form["id"] || form["_id"]
             }).toArray();
             for (let instance_fd of instances) {
                 let deleted_instance = Object.assign({}, instance_fd);
@@ -447,7 +447,7 @@ router.delete('/am/forms', async function (req, res) {
             }
             // 删除instance_tasks
-            await instanceCollection.deleteMany({ form: form["id"] })
+            await instanceCollection.deleteMany({ form: form["id"] || form["_id"] })
             // 删除表单
             let deleted_form = Object.assign({}, f);
@@ -455,7 +455,7 @@ router.delete('/am/forms', async function (req, res) {
             deleted_form['deleted_by'] = userId;
             await dFormsCollection.insert(deleted_form);
             deletedForms.push(deleted_form);
-            await formCollection.deleteOne({_id: form["id"]})
+            await formCollection.deleteOne({_id: form["id"] || form["_id"]})
         }
         res.send({
@@ -484,7 +484,7 @@ router.put('/am/flows', async function (req, res) {
             let flowCome = data['Flows'][i];
             let spaceId = flowCome["space"];
             let formId = flowCome["form"];
-            let flowId = flowCome["id"];
+            let flowId = flowCome["id"] || flowCome["_id"];
             let upgraded = flowCome['upgraded'];
             delete flowCome['decription'];
             let now = new Date();
@@ -502,7 +502,7 @@ router.put('/am/flows', async function (req, res) {
             // 某步骤被删除后，删除同流程的“指定历史步骤”属性中被引用的步骤id（仅限于流程的最新版)
             let clientStepIds = []
             _.each(flowCome['current']['steps'], function (step) {
-                clientStepIds.push(step['id']);
+                clientStepIds.push(step['_id'] || step['id']);
             })
             _.each(flowCome['current']['steps'], function (step) {
@@ -525,12 +525,16 @@ router.put('/am/flows', async function (req, res) {
             // 由于前台传的是id而非_id，故比较时将id转为_id
             _.each(flowCome['current']['steps'], function (step) {
-                step['_id'] = step['id'];
-                delete step['id'];
+                if (step['id']) {
+                    step['_id'] = step['id'];
+                    delete step['id'];
+                }
                 if (step['lines']) {
                     _.each(step['lines'], function (line) {
-                        line['_id'] = line['id'];
-                        delete line['id'];
+                        if (line['id']) {
+                            line['_id'] = line['id'];
+                            delete line['id'];
+                        }
                     })
                 }
             })
@@ -666,7 +670,7 @@ router.put('/am/flows/state', async function (req, res) {
             let flowCome = data['Flows'][i];
             let spaceId = flowCome["space"];
             let formId = flowCome["form"];
-            let flowId = flowCome["id"];
+            let flowId = flowCome["id"] || flowCome["_id"];
             let now = new Date();
             let flowUpdateObj = {
                 $set: {}

package/main/default/routes/api_workflow_ai_form_design.router.js CHANGED Viewed

@@ -416,6 +416,15 @@ if (field.name === 'quantity' || field.name === 'unit_price') {
 - 示例：旧版 \`{项目名称}（{申请日期}）\` → 新版 \`{project_name}（{apply_date}）\`（注意中文括号必须保留）
 - 如果用户未提供旧版标题公式，则 nameFormula 字段可省略或返回空字符串
+#### name_forumla 运行时格式规范
+nameFormula 是一个 JS 表达式，运行时被包装为 \`return <nameFormula>\`，其中 \`{fieldCode}\` 会被替换为 \`(values.fieldCode || '')\`，\`{applicant.xxx}\` 会被替换为 \`(applicant.xxx || '')\`。
+**规则：所有非 {xxx} 的文本（包括中文、符号、空格）必须用引号包裹，多段用 + 拼接。**
+- 正确：\`"合同名称" + {project_name}\`
+- 正确：\`{applicant_name} + "-" + {project_name}\`
+- 错误：\`合同名称{project_name}\` — JS 语法错误
+- 错误：\`合同名称 + {project_name}\` — JS 语法错误
+- 错误：\`{project_name} 审批单\` — JS 语法错误
 ### migrationLog（迁移记录）
 当用户提供了 flow_events、form_script、instance_template 中包含业务逻辑（如校验、赋值、显隐控制等脚本代码）时，必须在 migrationLog 数组中为每条被迁移的逻辑记录一条说明，格式：
   "<来源>: <原逻辑简述> → <迁移到的具体位置>"

package/main/default/routes/api_workflow_ai_form_design_stream.router.js CHANGED Viewed

@@ -787,6 +787,15 @@ if (field.name === 'quantity' || field.name === 'unit_price') {
 - 示例：旧版 \`{项目名称}（{申请日期}）\` → 新版 \`{project_name}（{apply_date}）\`（注意中文括号必须保留）
 - 如果用户未提供旧版标题公式，则 nameFormula 字段可省略或返回空字符串
+#### name_forumla 运行时格式规范
+nameFormula 是一个 JS 表达式，运行时被包装为 \`return <nameFormula>\`，其中 \`{fieldCode}\` 会被替换为 \`(values.fieldCode || '')\`，\`{applicant.xxx}\` 会被替换为 \`(applicant.xxx || '')\`。
+**规则：所有非 {xxx} 的文本（包括中文、符号、空格）必须用引号包裹，多段用 + 拼接。**
+- 正确：\`"合同名称" + {project_name}\`
+- 正确：\`{applicant_name} + "-" + {project_name}\`
+- 错误：\`合同名称{project_name}\` — JS 语法错误
+- 错误：\`合同名称 + {project_name}\` — JS 语法错误
+- 错误：\`{project_name} 审批单\` — JS 语法错误
 ### migrationLog（迁移记录）
 当用户提供了 flow_events、form_script、instance_template 中包含业务逻辑（如校验、赋值、显隐控制等脚本代码）时，必须在 migrationLog 数组中为每条被迁移的逻辑记录一条说明，格式：
   "<来源>: <原逻辑简述> → <迁移到的具体位置>"

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.52",
+  "version": "3.0.53",
   "main": "package.service.js",
   "license": "MIT",
   "files": [