@steedos-labs/plugin-workflow 3.0.64 → 3.0.66

package/public/workflow/index.css

@@ -81,12 +81,12 @@ tbody .color-priority-muted *{
     color: blue !important;
 }
 
-.instance-tasks-list .unread-instance .antd-Table-checkCell {
+.steedos-object-listview .unread-instance .antd-Table-checkCell {
     position: relative
 }
 
 /* PC端未读列表蓝色圆点 */
-.instance-tasks-list .unread-instance .antd-Table-checkCell:before {
+.steedos-object-listview .unread-instance .antd-Table-checkCell:before {
     content: " ";
     position: absolute;
     right: -6px;
@@ -98,19 +98,21 @@ tbody .color-priority-muted *{
     margin-top: -6px;
 }
 
-.instance-tasks-list .unread-instance .steedos-listview-item {
-    position: relative
+/* 分栏/手机端：含未读行的列表中所有行统一缩进，保持已读与未读左侧对齐 */
+.steedos-object-listview:has(.unread-instance) .steedos-listview-item {
+    position: relative;
+    padding-left: 12px;
 }
 
-/* 手机端未读列表蓝色圆点 */
-.instance-tasks-list .unread-instance .steedos-listview-item:before {
+/* 手机端及分栏模式未读列表蓝色圆点 */
+.steedos-object-listview .unread-instance .steedos-listview-item:before {
     content: " ";
     position: absolute;
-    left: -5px;
-    width: 8px;
-    height: 8px;
+    left: 0;
+    width: 10px;
+    height: 10px;
     background-color: #1890ff;
-    border-radius: 4px;
+    border-radius: 5px;
     top: 10px;
 }
 
@@ -364,6 +366,8 @@ tbody .color-priority-muted *{
 .instance-form .td-childfield{
     padding: 0 !important;
     border: none !important;
+    max-width: 0;
+    overflow: hidden;
 }
 
 .steedos-instance-style-table .instance-form .td-childfield {

package/src/instance_record_queue.js

@@ -1,6 +1,110 @@
 // 审批单同步到台账
 
 const objectql = require('@steedos/objectql');
+const crypto = require('crypto');
+const fs = require('fs');
+const pathModule = require('path');
+
+// ========== 文件同步辅助函数 ==========
+
+function getStorageConfig() {
+    try {
+        const config = objectql.getSteedosConfig();
+        return {
+            store: config?.cfs?.store || 'local',
+            storageDir: pathModule.resolve(config?.cfs?.storePath || process.env.STEEDOS_STORAGE_DIR || './steedos-storage')
+        };
+    } catch (e) {
+        return { store: 'local', storageDir: pathModule.resolve('./steedos-storage') };
+    }
+}
+
+function getCollectionFolderName(collectionName) {
+    const match = collectionName.match(/^cfs\.(\w+)\.filerecord$/);
+    return match ? match[1] : collectionName;
+}
+
+async function readFileBuffer(collectionName, fileRecord) {
+    // 优先使用 moleculer broker 读取（支持 local 和 S3）
+    try {
+        const broker = objectql.getSteedosSchema()?.broker;
+        if (broker) {
+            const folderName = getCollectionFolderName(collectionName);
+            return await broker.call('@builder6/files.getFileById', {
+                collectionName: folderName,
+                fileId: fileRecord._id
+            });
+        }
+    } catch (e) {
+        console.warn(`[syncAttach] broker.call getFileById failed for ${fileRecord._id}: ${e.message}`);
+    }
+
+    // 回退：从本地文件系统读取
+    const config = getStorageConfig();
+    if (config.store !== 'local') {
+        console.error(`[syncAttach] Cannot read file ${fileRecord._id}: S3 storage requires broker`);
+        return null;
+    }
+
+    const folderName = getCollectionFolderName(collectionName);
+    const storeKey = fileRecord.copies?.[folderName]?.key;
+    if (!storeKey) {
+        console.error(`[syncAttach] No storage key found for file ${fileRecord._id}`);
+        return null;
+    }
+
+    const filePath = pathModule.join(config.storageDir, 'files', folderName, storeKey);
+    if (fs.existsSync(filePath)) {
+        return fs.readFileSync(filePath);
+    }
+    console.error(`[syncAttach] File not found on disk: ${filePath}`);
+    return null;
+}
+
+async function uploadFileToCollection(collectionName, buffer, metadata, originalInfo) {
+    const config = getStorageConfig();
+    const folderName = getCollectionFolderName(collectionName);
+    const fileId = crypto.randomUUID();
+    const md5Hash = crypto.createHash('md5').update(buffer).digest('hex');
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = String(now.getMonth() + 1).padStart(2, '0');
+    const fileName = originalInfo.name || 'file';
+    const objName = metadata.object_name || 'default';
+    const key = `${objName}/${year}/${month}/${fileId}-${fileName}`;
+
+    if (config.store === 'local') {
+        const filePath = pathModule.join(config.storageDir, 'files', folderName, key);
+        fs.mkdirSync(pathModule.dirname(filePath), { recursive: true });
+        fs.writeFileSync(filePath, buffer);
+    } else {
+        // S3: 通过 broker 上传（如果可用）
+        try {
+            const broker = objectql.getSteedosSchema()?.broker;
+            if (broker) {
+                // 目前 @builder6/files moleculer 没有 uploadFile action
+                // 回退到直接 MongoDB 记录（文件需要通过其他方式上传到 S3）
+                console.warn(`[syncAttach] S3 upload not supported via broker, file ${fileId} record created but binary not stored`);
+            }
+        } catch (e) {
+            console.error(`[syncAttach] S3 upload failed for ${fileId}: ${e.message}`);
+        }
+    }
+
+    const record = {
+        _id: fileId,
+        original: { type: originalInfo.type, size: buffer.length, name: fileName, md5: md5Hash },
+        metadata: { ...metadata },
+        uploadedAt: now,
+        copies: {
+            [folderName]: { name: fileName, type: originalInfo.type, size: buffer.length, key, updatedAt: now, createdAt: now }
+        }
+    };
+
+    const coll = await getCollection(collectionName);
+    await coll.insertOne(record);
+    return record;
+}
 
 async function getCollection(name) {
     const adapter = objectql.getDataSource('default').adapter
@@ -129,56 +233,57 @@ const getFormField = function (_formFields, _fieldCode) {
 }
 
 const getFileFieldValue = async function (recordFieldId, fType) {
-    var collection, files, query, value;
     if (_.isEmpty(recordFieldId)) {
         return;
     }
+
+    var targetCollection;
     if (fType === 'image') {
-        collection = 'images';
+        targetCollection = 'cfs.images.filerecord';
     } else if (fType === 'file') {
-        collection = 'files';
-    }
-    if (_.isString(recordFieldId)) {
-        query = {
-            _id: {
-                $in: [recordFieldId]
-            }
-        };
+        targetCollection = 'cfs.files.filerecord';
     } else {
-        query = {
-            _id: {
-                $in: recordFieldId
+        return;
+    }
+
+    var ids = _.isString(recordFieldId) ? [recordFieldId] : recordFieldId;
+
+    // 源文件在 cfs.instances.filerecord 中（workflow 上传的附件）
+    var sourceCollection = 'cfs.instances.filerecord';
+    var sourceColl = await getCollection(sourceCollection);
+    var files = await sourceColl.find({ _id: { $in: ids } }).toArray();
+
+    // 如果在 instances 中找不到，尝试从目标集合中查找（兼容旧数据）
+    if (files.length === 0) {
+        var targetColl = await getCollection(targetCollection);
+        files = await targetColl.find({ _id: { $in: ids } }).toArray();
+        if (files.length > 0) {
+            sourceCollection = targetCollection;
+        }
+    }
+
+    var value = [];
+    for (const f of files) {
+        try {
+            var buffer = await readFileBuffer(sourceCollection, f);
+            if (!buffer) {
+                console.error(`[getFileFieldValue] Cannot read file ${f._id}`);
+                continue;
             }
-        };
+
+            var newRecord = await uploadFileToCollection(targetCollection, buffer, {
+                owner: f.metadata?.owner
+            }, {
+                name: f.original?.name,
+                type: f.original?.type
+            });
+
+            value.push(newRecord._id);
+        } catch (err) {
+            console.error(`[getFileFieldValue] Error copying file ${f._id}: ${err.message}`);
+        }
     }
 
-    //TODO 同步附
-    console.log('TODO, 同步附件')
-    value = [];
-//     files = await Creator.Collections["cfs." + collection + ".filerecord"].find(query).toArray();
-//     for (const f of files) {
-//         console.log('TODO, 同步附件')
-//         var newFile;
-//         newFile = new FS.File();
-//         await new Promise((resolve, reject) => {
-//             newFile.attachData(f.createReadStream('files'), {
-//                 type: f.original.type
-//             }, function (err) {
-//                 if (err) return reject(err);
-//                 var metadata;
-//                 newFile.name(f.name());
-//                 newFile.size(f.size());
-//                 metadata = {
-//                     owner: f.metadata.owner
-//                 };
-//                 newFile.metadata = metadata;
-//                 newFile._id = Creator.Collections.instances._makeNewID();
-//                 cfs[collection].insert(newFile);
-//                 value.push(newFile._id);
-//                 resolve();
-//             });
-//         });
-//     }
     if (value.length > 0) {
         if (_.isString(recordFieldId)) {
             return value[0];
@@ -318,6 +423,27 @@ const getRecordFieldValue = async function (oField, wField, ofValue, wfValue, sp
                 }
             }
         }
+        // 通用处理：lookup/master_detail 字段，wfValue 为对象格式 {id, name, ...} 或对象数组
+        // 适用于部门等字段类型，当 reference_to 不是 organizations 或 users 时
+        if (value === undefined || value === null) {
+            let referToField = oField.reference_to_field || '_id'
+            if (Array.isArray(wfValue)) {
+                if (wfValue.length > 0 && typeof wfValue[0] === 'object' && wfValue[0] !== null && (wfValue[0].id || wfValue[0]._id)) {
+                    if (oField.multiple) {
+                        value = _.compact(wfValue.map(v => v.id || v._id))
+                    } else {
+                        value = wfValue[0].id || wfValue[0]._id
+                    }
+                }
+            } else if (typeof wfValue === 'object' && wfValue !== null && (wfValue.id || wfValue._id)) {
+                const idValue = wfValue.id || wfValue._id;
+                if (oField.multiple) {
+                    value = [idValue];
+                } else {
+                    value = referToField === '_id' ? (wfValue._id || wfValue.id) : (wfValue[referToField] || idValue);
+                }
+            }
+        }
     }
     else if (!oField.multiple && ['lookup', 'master_detail'].includes(oFieldType) && _.isString(oField.reference_to) && _.isString(wfValue)) {
         // 当是对象类型的 member/org 字段时，应该已在上面处理了，这里只处理字符串值
@@ -372,15 +498,9 @@ const getRecordFieldValue = async function (oField, wField, ofValue, wfValue, sp
         if (_.isString(ids)) {
             ids = [ids];
         }
-        if (ids) {
-            await new Promise((resolve, reject) => {
-                cfs.images.remove({
-                    '_id': { $in: ids }
-                }, function(err) {
-                    if (err) return reject(err);
-                    resolve();
-                });
-            });
+        if (ids && ids.length > 0) {
+            var imgColl = await getCollection('cfs.images.filerecord');
+            await imgColl.deleteMany({ '_id': { $in: ids } });
         }
 
         value = await getFileFieldValue(wfValue, 'image')
@@ -390,15 +510,9 @@ const getRecordFieldValue = async function (oField, wField, ofValue, wfValue, sp
         if (_.isString(ids)) {
             ids = [ids];
         }
-        if (ids) {
-            await new Promise((resolve, reject) => {
-                cfs.files.remove({
-                    '_id': { $in: ids }
-                }, function(err) {
-                    if (err) return reject(err);
-                    resolve();
-                });
-            });
+        if (ids && ids.length > 0) {
+            var fileColl = await getCollection('cfs.files.filerecord');
+            await fileColl.deleteMany({ '_id': { $in: ids } });
         }
         value = await getFileFieldValue(wfValue, 'file')
     } else if (['lookup', 'master_detail'].includes(oFieldType) && wField.type == 'lookup') {
@@ -623,154 +737,158 @@ InstanceRecordQueue.Configure = function (options) {
     }
 };
 
-//TODO 同步附件
 InstanceRecordQueue.syncAttach = async function (sync_attachment, insId, spaceId, newRecordId, objectName) {
-    console.log(`TODO 同步附件 syncAttach`)
-    // if (sync_attachment == "lastest") {
-    //     const files = await cfs.instances.find({
-    //         'metadata.instance': insId,
-    //         'metadata.current': true
-    //     }).toArray();
-
-    //     for (const f of files) {
-    //         if (!f.hasStored('instances')) {
-    //             console.error('syncAttach-file not stored: ', f._id);
-    //             continue;
-    //         }
-    //         var newFile = new FS.File(),
-    //             cmsFileId = Creator.getCollection('cms_files')._makeNewID();
-            
-    //         await new Promise((resolve, reject) => {
-    //             newFile.attachData(f.createReadStream('instances'), {
-    //                 type: f.original.type
-    //             }, function (err) {
-    //                 if (err) return reject(err);
-    //                 newFile.name(f.name());
-    //                 newFile.size(f.size());
-    //                 var metadata = {
-    //                     owner: f.metadata.owner,
-    //                     owner_name: f.metadata.owner_name,
-    //                     space: spaceId,
-    //                     record_id: newRecordId,
-    //                     object_name: objectName,
-    //                     parent: cmsFileId
-    //                 };
-
-    //                 newFile.metadata = metadata;
-    //                 cfs.files.insert(newFile);
-    //                 resolve();
-    //             });
-    //         });
-
-    //         await new Promise((resolve, reject) => {
-    //             newFile.once('stored', function (storeName) {
-    //                 Creator.getCollection('cms_files').insert({
-    //                     _id: cmsFileId,
-    //                     parent: {
-    //                         o: objectName,
-    //                         ids: [newRecordId]
-    //                     },
-    //                     size: newFile.size(),
-    //                     name: newFile.name(),
-    //                     extention: newFile.extension(),
-    //                     space: spaceId,
-    //                     versions: [newFile._id],
-    //                     owner: f.metadata.owner,
-    //                     created_by: f.metadata.owner,
-    //                     modified_by: f.metadata.owner
-    //                 });
-    //                 resolve();
-    //             });
-    //             newFile.once('error', function (error) {
-    //                 console.error('syncAttach-error: ', error);
-    //                 reject(error);
-    //             });
-    //         });
-    //     }
-    // } else if (sync_attachment == "all") {
-    //     var parents = [];
-    //     const files = await cfs.instances.find({
-    //         'metadata.instance': insId
-    //     }).toArray();
-
-    //     for (const f of files) {
-    //         if (!f.hasStored('instances')) {
-    //             console.error('syncAttach-file not stored: ', f._id);
-    //             continue;
-    //         }
-    //         var newFile = new FS.File(),
-    //             cmsFileId = f.metadata.parent;
-
-    //         if (!parents.includes(cmsFileId)) {
-    //             parents.push(cmsFileId);
-    //             await Creator.getCollection('cms_files').insert({
-    //                 _id: cmsFileId,
-    //                 parent: {
-    //                     o: objectName,
-    //                     ids: [newRecordId]
-    //                 },
-    //                 space: spaceId,
-    //                 versions: [],
-    //                 owner: f.metadata.owner,
-    //                 created_by: f.metadata.owner,
-    //                 modified_by: f.metadata.owner
-    //             });
-    //         }
-
-    //         await new Promise((resolve, reject) => {
-    //             newFile.attachData(f.createReadStream('instances'), {
-    //                 type: f.original.type
-    //             }, function (err) {
-    //                 if (err) return reject(err);
-    //                 newFile.name(f.name());
-    //                 newFile.size(f.size());
-    //                 var metadata = {
-    //                     owner: f.metadata.owner,
-    //                     owner_name: f.metadata.owner_name,
-    //                     space: spaceId,
-    //                     record_id: newRecordId,
-    //                     object_name: objectName,
-    //                     parent: cmsFileId
-    //                 };
-
-    //                 newFile.metadata = metadata;
-    //                 cfs.files.insert(newFile);
-    //                 resolve();
-    //             });
-    //         });
-
-    //         await new Promise((resolve, reject) => {
-    //             newFile.once('stored', function (storeName) {
-    //                 if (f.metadata.current == true) {
-    //                     Creator.getCollection('cms_files').update(cmsFileId, {
-    //                         $set: {
-    //                             size: newFile.size(),
-    //                             name: newFile.name(),
-    //                             extention: newFile.extension(),
-    //                         },
-    //                         $addToSet: {
-    //                             versions: newFile._id
-    //                         }
-    //                     });
-    //                 } else {
-    //                     Creator.getCollection('cms_files').update(cmsFileId, {
-    //                         $addToSet: {
-    //                             versions: newFile._id
-    //                         },
-    //                         $set: {
-    //                             modified: new Date()
-    //                         }
-    //                     });
-    //                 }
-    //                 resolve();
-    //             });
-    //             newFile.once('error', function (error) {
-    //                 console.error('syncAttach-error: ', error);
-    //                 reject(error);
-    //             });
-    //         });
-    //     }
-    // }
+    if (!sync_attachment || sync_attachment === 'null') {
+        return;
+    }
+
+    console.log(`[syncAttach] Starting: sync_attachment=${sync_attachment}, insId=${insId}, recordId=${newRecordId}, objectName=${objectName}`);
+
+    var instanceFilesColl = await getCollection('cfs.instances.filerecord');
+
+    if (sync_attachment === 'lastest') {
+        var files = await instanceFilesColl.find({
+            'metadata.instance': insId,
+            'metadata.current': true
+        }).toArray();
+
+        console.log(`[syncAttach] Found ${files.length} current files for instance ${insId}`);
+
+        for (const f of files) {
+            try {
+                var buffer = await readFileBuffer('cfs.instances.filerecord', f);
+                if (!buffer) {
+                    console.error(`[syncAttach] Cannot read file content: ${f._id}`);
+                    continue;
+                }
+
+                var cmsFileId = crypto.randomUUID();
+
+                var newFileRecord = await uploadFileToCollection('cfs.files.filerecord', buffer, {
+                    owner: f.metadata.owner,
+                    owner_name: f.metadata.owner_name,
+                    space: spaceId,
+                    record_id: newRecordId,
+                    object_name: objectName,
+                    parent: cmsFileId
+                }, {
+                    name: f.original?.name,
+                    type: f.original?.type
+                });
+
+                var extension = f.original?.name ? f.original.name.split('.').pop() : '';
+                var cmsColl = await getCollection('cms_files');
+                await cmsColl.insertOne({
+                    _id: cmsFileId,
+                    parent: {
+                        o: objectName,
+                        ids: [newRecordId]
+                    },
+                    size: buffer.length,
+                    name: f.original?.name,
+                    extention: extension,
+                    space: spaceId,
+                    versions: [newFileRecord._id],
+                    owner: f.metadata.owner,
+                    created_by: f.metadata.owner,
+                    modified_by: f.metadata.owner,
+                    created: new Date(),
+                    modified: new Date()
+                });
+
+                console.log(`[syncAttach] Synced file ${f._id} -> cfs.files ${newFileRecord._id}, cms_files ${cmsFileId}`);
+            } catch (err) {
+                console.error(`[syncAttach] Error syncing file ${f._id}: ${err.message}`);
+            }
+        }
+    } else if (sync_attachment === 'all') {
+        var files = await instanceFilesColl.find({
+            'metadata.instance': insId
+        }).toArray();
+
+        console.log(`[syncAttach] Found ${files.length} total files for instance ${insId}`);
+
+        var parentMap = {}; // metadata.parent -> cmsFileId
+
+        for (const f of files) {
+            try {
+                var buffer = await readFileBuffer('cfs.instances.filerecord', f);
+                if (!buffer) {
+                    console.error(`[syncAttach] Cannot read file content: ${f._id}`);
+                    continue;
+                }
+
+                var fileParent = f.metadata.parent || f._id;
+                var cmsFileId = parentMap[fileParent];
+
+                // 如果该 parent 组还没有创建 cms_files 记录，先创建
+                if (!cmsFileId) {
+                    cmsFileId = crypto.randomUUID();
+                    parentMap[fileParent] = cmsFileId;
+
+                    var cmsColl = await getCollection('cms_files');
+                    await cmsColl.insertOne({
+                        _id: cmsFileId,
+                        parent: {
+                            o: objectName,
+                            ids: [newRecordId]
+                        },
+                        space: spaceId,
+                        versions: [],
+                        owner: f.metadata.owner,
+                        created_by: f.metadata.owner,
+                        modified_by: f.metadata.owner,
+                        created: new Date(),
+                        modified: new Date()
+                    });
+                }
+
+                var newFileRecord = await uploadFileToCollection('cfs.files.filerecord', buffer, {
+                    owner: f.metadata.owner,
+                    owner_name: f.metadata.owner_name,
+                    space: spaceId,
+                    record_id: newRecordId,
+                    object_name: objectName,
+                    parent: cmsFileId
+                }, {
+                    name: f.original?.name,
+                    type: f.original?.type
+                });
+
+                // 更新 cms_files：添加版本，如果是 current 则更新名称等信息
+                var cmsColl = await getCollection('cms_files');
+                if (f.metadata.current === true) {
+                    var extension = f.original?.name ? f.original.name.split('.').pop() : '';
+                    await cmsColl.updateOne({ _id: cmsFileId }, {
+                        $set: {
+                            size: buffer.length,
+                            name: f.original?.name,
+                            extention: extension,
+                            modified: new Date()
+                        },
+                        $addToSet: {
+                            versions: newFileRecord._id
+                        }
+                    });
+                } else {
+                    await cmsColl.updateOne({ _id: cmsFileId }, {
+                        $addToSet: {
+                            versions: newFileRecord._id
+                        },
+                        $set: {
+                            modified: new Date()
+                        }
+                    });
+                }
+
+                console.log(`[syncAttach] Synced file ${f._id} -> cfs.files ${newFileRecord._id}, cms_files ${cmsFileId} (current=${f.metadata.current})`);
+            } catch (err) {
+                console.error(`[syncAttach] Error syncing file ${f._id}: ${err.message}`);
+            }
+        }
+    }
+
+    console.log(`[syncAttach] Completed for instance ${insId}`);
 }
 
 InstanceRecordQueue.syncInsFields = ['name', 'submitter_name', 'applicant_name', 'applicant_organization_name', 'applicant_organization_fullname', 'state',
@@ -1280,10 +1398,11 @@ InstanceRecordQueue.sendDoc = async function (doc) {
                 }];
                 newObj.instance_state = instance_state;
 
+                newObj._id = newRecordId;
                 newObj.owner = newObj.owner || ins.applicant;
                 newObj.created_by = ins.applicant;
                 newObj.modified_by = ins.applicant;
-                
+
                 var r = await objectInsert(ow.object_name, newObj);
                 recordInserted = !!r;
                 const insColl = await getCollection('instances');