[Bug]: 附件型字段，在只读页面点击后显示未找到记录，编辑页面可正常下载文件

steedos/steedos-platform#6977
steedos · Aug 28, 2024 · bc62144 · bc62144
1 parent ba522a8
commit bc62144
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/packages/@steedos-widgets/amis-lib/src/lib/converter/amis/api.js b/packages/@steedos-widgets/amis-lib/src/lib/converter/amis/api.js
@@ -231,6 +231,7 @@ function getScriptForRewriteValueForFileFields(fields){
                         if(fileFields[item].multiple){
                             if(fileFieldDisplayValue instanceof Array){
                                 data[item] = fileFieldDisplayValue.map((item, index)=>{ 
+                                    item.value = fileFieldValue[index];
                                     return {
                                         value: fileFieldValue[index],
                                         name: item.name,
@@ -240,6 +241,7 @@ function getScriptForRewriteValueForFileFields(fields){
                                 });
                             }
                         }else{
+                            fileFieldDisplayValue.value = fileFieldValue;
                             data[item] = [{
                                 value: fileFieldValue,
                                 name: fileFieldDisplayValue.name,

diff --git a/packages/@steedos-widgets/amis-lib/src/lib/converter/amis/fields/file.js b/packages/@steedos-widgets/amis-lib/src/lib/converter/amis/fields/file.js
@@ -29,7 +29,7 @@ async function getLookupLinkOnClick(field, options) {
     const recordPage = await getPage({ type: 'record', appId: options.appId, objectName: options.objectName, formFactor: options.formFactor });
 
     const drawerRecordDetailSchema = recordPage ? Object.assign({}, recordPage.schema, {
-        "recordId": `\${${field.name}}`,
+        "recordId": field.type == "file" ? "${value}":`\${${field.name}}`,
         "data": {
             ...recordPage.schema.data,
             "_inDrawer": true,  // 用于判断是否在抽屉中
@@ -39,7 +39,7 @@ async function getLookupLinkOnClick(field, options) {
     }) : {
         "type": "steedos-record-detail",
         "objectApiName": options.objectName,
-        "recordId": `\${${field.name}}`,
+        "recordId": field.type == "file" ? "${value}":`\${${field.name}}`,
         "showBackButton": false,
         "showButtons": true,
         "data": {
@@ -135,17 +135,18 @@ export const  getAmisFileReadonlySchema = async (steedosField,ctx = {})=>{
             //             <a href='<%= item.url %>' target='_self' class='block'><%= item.name %></a> 
             //     <% });} %>`
             "type": "control",
+            "name": "",//control若存在name，内部each组件的source则会获取不到内容
             "body": {
                 type: 'each',
                 placeholder: "",
-                // className: `steedos-field-lookup-each flex flex-wrap gap-2`,
+                className: steedosField.multiple ? `flex flex-col` : '',
                 source: `\${_display.${steedosField.name}|asArray}`,
                 items: {
                     type: 'static',
                     labelClassName: "hidden",
                     label: false,
                     className: 'm-0',
-                    tpl: `<a href="/app/-/cfs_files_filerecord/view/\${${steedosField.name}}" ${lookupATagClick}>\${name}</a>`,
+                    tpl: `<a href="/app/-/cfs_files_filerecord/view/\${value}" ${lookupATagClick}>\${name}</a>`,
                     // tpl: "<%= item.name >",
                     // onEvent: window.innerWidth < 768 ? null : REFERENCE_VALUE_ITEM_ONCLICK
                     onEvent: window.innerWidth < 768 ? null : await getLookupLinkOnClick(steedosField, {

diff --git a/packages/@steedos-widgets/amis-lib/src/lib/converter/amis/fields/table.js b/packages/@steedos-widgets/amis-lib/src/lib/converter/amis/fields/table.js
@@ -220,6 +220,8 @@ async function getQuickEditSchema(object, columnField, options){
                                 _display["${field.name}"].push({
                                     "name": event.data.result.name,
                                     "url": event.data.result.url,
+                                    "value": event.data.result.value,
+                                    "_id": event.data.result.value,
                                     "type": event.data.item.type,
                                     "size": event.data.item.size
                                 });
@@ -232,6 +234,8 @@ async function getQuickEditSchema(object, columnField, options){
                                 _display["${field.name}"] = {
                                     "name": event.data.result.name,
                                     "url": event.data.result.url,
+                                    "value": event.data.result.value,
+                                    "_id": event.data.result.value,
                                     "type": event.data.item.type,
                                     "size": event.data.item.size
                                 };
@@ -679,7 +683,7 @@ export async function getTableColumns(object, fields, options){
                 static: true,
                 className,
                 ...await getAmisFileReadonlySchema(field)
-            }, fieldAmis, {name: field.name});
+            }, fieldAmis);
         }
         else if(field.type === 'select'){
             const map = Tpl.getSelectMap(field.options);
@@ -1492,7 +1496,8 @@ export async function getTableApi(mainObject, fields, options){
                     // PC客户端附件子表列表点击标题预览附件功能依赖了_id，所以这里拼出来
                     let itemKeyValue = item[key];
                     item[key] = value.map(function(item, index){
-                        item._id = itemKeyValue[index];
+                        item._id = typeof itemKeyValue == 'string' ? itemKeyValue : itemKeyValue[index];
+                        item.value = typeof itemKeyValue == 'string' ? itemKeyValue : itemKeyValue[index];
                         return item;
                     });
                 }else{