@steedos/objectql 2.2.52-beta.6 → 2.2.53-beta.2

package/lib/services/datasourceServiceFactory.js

@@ -7,10 +7,10 @@ var convert_1 = require("../util/convert");
 var datasource_1 = require("../types/datasource");
 var LocalDataSourceServices = {};
 function createDataSourceService(broker, dataSource) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var dataSourceName, serviceName, service;
         var _a;
-        return (0, tslib_1.__generator)(this, function (_b) {
+        return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     dataSourceName = dataSource.name;

package/lib/services/helpers/graphql/index.js

@@ -3,7 +3,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-06-15 15:49:44
  * @LastEditors: sunhaolin@hotoa.com
- * @LastEditTime: 2022-06-21 18:50:27
+ * @LastEditTime: 2022-07-07 16:53:26
  * @Description:
  */
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -27,22 +27,22 @@ function generateActionGraphqlProp(actionName, objectConfig) {
     }
     switch (actionName) {
         case 'graphqlCount':
-            gplObj.query = gql(templateObject_1 || (templateObject_1 = (0, tslib_1.__makeTemplateObject)(["\n                type Query {\n                    ", "__count(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): Int\n                }\n            "], ["\n                type Query {\n                    ", "__count(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): Int\n                }\n            "])), objectName);
+            gplObj.query = gql(templateObject_1 || (templateObject_1 = tslib_1.__makeTemplateObject(["\n                type Query {\n                    ", "__count(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): Int\n                }\n            "], ["\n                type Query {\n                    ", "__count(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): Int\n                }\n            "])), objectName);
             break;
         case 'graphqlFind':
-            gplObj.query = gql(templateObject_2 || (templateObject_2 = (0, tslib_1.__makeTemplateObject)(["\n                type Query {\n                    ", "(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): [", "]\n                }\n            "], ["\n                type Query {\n                    ", "(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): [", "]\n                }\n            "])), objectName, objectName);
+            gplObj.query = gql(templateObject_2 || (templateObject_2 = tslib_1.__makeTemplateObject(["\n                type Query {\n                    ", "(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): [", "]\n                }\n            "], ["\n                type Query {\n                    ", "(fields: JSON, filters: JSON, top: Int, skip: Int, sort: String): [", "]\n                }\n            "])), objectName, objectName);
             break;
         case 'findOne':
-            gplObj.query = gql(templateObject_3 || (templateObject_3 = (0, tslib_1.__makeTemplateObject)(["\n                type Query {\n                    ", "__", "(id: JSON): ", "\n                }\n            "], ["\n                type Query {\n                    ", "__", "(id: JSON): ", "\n                }\n            "])), objectName, actionName, objectName);
+            gplObj.query = gql(templateObject_3 || (templateObject_3 = tslib_1.__makeTemplateObject(["\n                type Query {\n                    ", "__", "(id: JSON): ", "\n                }\n            "], ["\n                type Query {\n                    ", "__", "(id: JSON): ", "\n                }\n            "])), objectName, actionName, objectName);
             break;
         case 'insert':
-            gplObj.mutation = gql(templateObject_4 || (templateObject_4 = (0, tslib_1.__makeTemplateObject)(["\n                type Mutation {\n                    ", "__", "(doc: JSON): ", "\n                }\n            "], ["\n                type Mutation {\n                    ", "__", "(doc: JSON): ", "\n                }\n            "])), objectName, actionName, objectName);
+            gplObj.mutation = gql(templateObject_4 || (templateObject_4 = tslib_1.__makeTemplateObject(["\n                type Mutation {\n                    ", "__", "(doc: JSON): ", "\n                }\n            "], ["\n                type Mutation {\n                    ", "__", "(doc: JSON): ", "\n                }\n            "])), objectName, actionName, objectName);
             break;
         case 'update':
-            gplObj.mutation = gql(templateObject_5 || (templateObject_5 = (0, tslib_1.__makeTemplateObject)(["\n                type Mutation {\n                    ", "__", "(id: JSON, doc: JSON): ", "\n                }\n            "], ["\n                type Mutation {\n                    ", "__", "(id: JSON, doc: JSON): ", "\n                }\n            "])), objectName, actionName, objectName);
+            gplObj.mutation = gql(templateObject_5 || (templateObject_5 = tslib_1.__makeTemplateObject(["\n                type Mutation {\n                    ", "__", "(id: JSON, doc: JSON): ", "\n                }\n            "], ["\n                type Mutation {\n                    ", "__", "(id: JSON, doc: JSON): ", "\n                }\n            "])), objectName, actionName, objectName);
             break;
         case 'delete':
-            gplObj.mutation = gql(templateObject_6 || (templateObject_6 = (0, tslib_1.__makeTemplateObject)(["\n                type Mutation {\n                    ", "__", "(id: JSON): JSON\n                }\n            "], ["\n                type Mutation {\n                    ", "__", "(id: JSON): JSON\n                }\n            "])), objectName, actionName);
+            gplObj.mutation = gql(templateObject_6 || (templateObject_6 = tslib_1.__makeTemplateObject(["\n                type Mutation {\n                    ", "__", "(id: JSON): JSON\n                }\n            "], ["\n                type Mutation {\n                    ", "__", "(id: JSON): JSON\n                }\n            "])), objectName, actionName);
             break;
         default:
             // console.error(`need to handle action: ${actionName}`);
@@ -69,20 +69,25 @@ function generateSettingsGraphql(objectConfig) {
             type += "".concat(name, ": JSON ");
             return;
         }
+        var isLookup = (field.type == "lookup" || field.type == "master_detail") &&
+            field.reference_to && _.isString(field.reference_to);
+        var isFile = field.type == "image" || field.type == "file";
         if (consts_1.BASIC_TYPE_MAPPING[field.type]) {
             type += "".concat(name, ": ").concat(consts_1.BASIC_TYPE_MAPPING[field.type], " ");
         }
-        else if ((field.type == "lookup" || field.type == "master_detail") &&
-            field.reference_to &&
-            _.isString(field.reference_to)) {
+        else if (isLookup || isFile) {
             var refTo = field.reference_to;
-            // 判断能否根据refTo找到对象，如果找到则说明对象已加载，否则return
+            var referenceToField = field.reference_to_field;
+            if (isFile) {
+                // TODO: cfs_images_filerecord对象不存在，需要额外处理
+                refTo = field.type == "image" ? "cfs_images_filerecord" : "cfs_files_filerecord";
+            }
             var objMetaData = getLocalService(refTo);
             if (refTo != objectName && (!objMetaData || objMetaData.settings.deleted)) {
                 return;
             }
             if (field.multiple) {
-                type += "".concat(name, ": [String] ");
+                type += "".concat(name, ": [JSON] ");
                 type += "".concat(name).concat(consts_1.EXPAND_SUFFIX, ": [").concat(refTo, "] ");
                 resolvers[objectName]["".concat(name).concat(consts_1.EXPAND_SUFFIX)] = {
                     action: "".concat((0, __1.getObjectServiceName)(refTo), ".").concat(consts_1.GRAPHQL_ACTION_PREFIX).concat(consts_1.EXPAND_SUFFIX, "_multiple"),
@@ -91,11 +96,12 @@ function generateSettingsGraphql(objectConfig) {
                         _a),
                     params: {
                         objectName: refTo,
+                        referenceToField: referenceToField
                     },
                 };
             }
             else {
-                type += "".concat(name, ": String ");
+                type += "".concat(name, ": JSON ");
                 type += "".concat(name).concat(consts_1.EXPAND_SUFFIX, ": ").concat(refTo, " ");
                 resolvers[objectName]["".concat(name).concat(consts_1.EXPAND_SUFFIX)] = {
                     action: "".concat((0, __1.getObjectServiceName)(refTo), ".").concat(consts_1.GRAPHQL_ACTION_PREFIX).concat(consts_1.EXPAND_SUFFIX),
@@ -104,6 +110,7 @@ function generateSettingsGraphql(objectConfig) {
                         _b),
                     params: {
                         objectName: refTo,
+                        referenceToField: referenceToField
                     },
                 };
             }
@@ -130,7 +137,7 @@ function generateSettingsGraphql(objectConfig) {
     };
     // define _display type
     var _display_type = _getDisplayType(_display_type_name, fields);
-    type = gql(templateObject_7 || (templateObject_7 = (0, tslib_1.__makeTemplateObject)(["\n    ", "\n    ", "\n  "], ["\n    ", "\n    ", "\n  "])), _display_type, type);
+    type = gql(templateObject_7 || (templateObject_7 = tslib_1.__makeTemplateObject(["\n        ", "\n        ", "\n    "], ["\n        ", "\n        ", "\n    "])), _display_type, type);
     // _related
     if (objectConfig.enable_files) {
         var relatedObjName = "cms_files";
@@ -182,10 +189,10 @@ function generateSettingsGraphql(objectConfig) {
 }
 exports.generateSettingsGraphql = generateSettingsGraphql;
 function dealWithRelatedFields(objectConfig, graphql) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var steedosSchema, objectName, obj, relationsInfo, detailsInfo, lookupsInfo, relatedInfos, relatedInfos_1, relatedInfos_1_1, info, infos, detailObjectApiName, detailFieldName, relatedFieldName, relatedType;
         var e_1, _a;
-        return (0, tslib_1.__generator)(this, function (_b) {
+        return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     steedosSchema = (0, __2.getSteedosSchema)();
@@ -198,7 +205,7 @@ function dealWithRelatedFields(objectConfig, graphql) {
                     lookupsInfo = relationsInfo.lookup_details || [];
                     relatedInfos = detailsInfo.concat(lookupsInfo);
                     try {
-                        for (relatedInfos_1 = (0, tslib_1.__values)(relatedInfos), relatedInfos_1_1 = relatedInfos_1.next(); !relatedInfos_1_1.done; relatedInfos_1_1 = relatedInfos_1.next()) {
+                        for (relatedInfos_1 = tslib_1.__values(relatedInfos), relatedInfos_1_1 = relatedInfos_1.next(); !relatedInfos_1_1.done; relatedInfos_1_1 = relatedInfos_1.next()) {
                             info = relatedInfos_1_1.value;
                             if (!info.startsWith("__")) {
                                 infos = info.split(".");
@@ -242,14 +249,14 @@ function getGraphqlActions(objectConfig) {
     var objName = objectConfig.name;
     actions["".concat(consts_1.GRAPHQL_ACTION_PREFIX).concat(consts_1.EXPAND_SUFFIX, "_multiple")] = {
         handler: function (ctx) {
-            return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-                var _a, ids, objectName, filters, selector, steedosSchema, obj, resolveInfo, fieldNames;
-                return (0, tslib_1.__generator)(this, function (_b) {
-                    _a = ctx.params, ids = _a.ids, objectName = _a.objectName;
+            return tslib_1.__awaiter(this, void 0, void 0, function () {
+                var _a, ids, objectName, referenceToField, filters, selector, steedosSchema, obj, resolveInfo, fieldNames;
+                return tslib_1.__generator(this, function (_b) {
+                    _a = ctx.params, ids = _a.ids, objectName = _a.objectName, referenceToField = _a.referenceToField;
                     if (_.isEmpty(ids)) {
                         return [2 /*return*/, null];
                     }
-                    filters = [["_id", "in", ids]];
+                    filters = [[referenceToField || "_id", "in", ids]];
                     selector = { filters: filters };
                     steedosSchema = (0, __2.getSteedosSchema)();
                     obj = steedosSchema.getObject(objectName);
@@ -265,18 +272,18 @@ function getGraphqlActions(objectConfig) {
     };
     actions["".concat(consts_1.GRAPHQL_ACTION_PREFIX).concat(consts_1.EXPAND_SUFFIX)] = {
         handler: function (ctx) {
-            return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-                var _a, id, objectName, steedosSchema, obj, selector, resolveInfo, fieldNames;
-                return (0, tslib_1.__generator)(this, function (_b) {
+            return tslib_1.__awaiter(this, void 0, void 0, function () {
+                var _a, id, objectName, referenceToField, steedosSchema, obj, selector, resolveInfo, fieldNames;
+                return tslib_1.__generator(this, function (_b) {
                     switch (_b.label) {
                         case 0:
-                            _a = ctx.params, id = _a.id, objectName = _a.objectName;
+                            _a = ctx.params, id = _a.id, objectName = _a.objectName, referenceToField = _a.referenceToField;
                             if (!id) {
                                 return [2 /*return*/];
                             }
                             steedosSchema = (0, __2.getSteedosSchema)();
                             obj = steedosSchema.getObject(objectName);
-                            selector = { filters: [["_id", "=", id]] };
+                            selector = { filters: [[referenceToField || "_id", "=", id]] };
                             resolveInfo = ctx.meta.resolveInfo;
                             fieldNames = (0, getQueryFields_1.getQueryFields)(resolveInfo);
                             if (!_.isEmpty(fieldNames)) {
@@ -300,9 +307,9 @@ function getGraphqlActions(objectConfig) {
     ].includes(objName)) {
         actions["".concat(consts_1.GRAPHQL_ACTION_PREFIX).concat(consts_1.RELATED_PREFIX, "_enabled")] = {
             handler: function (ctx) {
-                return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+                return tslib_1.__awaiter(this, void 0, void 0, function () {
                     var params, _parentId, _related_params, objectName, parentObjectName, foreignKey, userSession, steedosSchema, object, filters;
-                    return (0, tslib_1.__generator)(this, function (_a) {
+                    return tslib_1.__generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
                                 params = ctx.params;
@@ -330,9 +337,9 @@ function getGraphqlActions(objectConfig) {
     }
     actions["".concat(consts_1.GRAPHQL_ACTION_PREFIX).concat(consts_1.RELATED_PREFIX)] = {
         handler: function (ctx) {
-            return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var params, _parentId, _related_params, objectName, parentObjectName, fieldName, referenceToParentFieldName, userSession, steedosSchema, object, parentObj, parent, filters, _idValue, resolveInfo, fieldNames;
-                return (0, tslib_1.__generator)(this, function (_a) {
+                return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             params = ctx.params;
@@ -369,9 +376,9 @@ function getGraphqlActions(objectConfig) {
     };
     actions["".concat(consts_1.GRAPHQL_ACTION_PREFIX).concat(consts_1.DISPLAY_PREFIX)] = {
         handler: function (ctx) {
-            return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return tslib_1.__awaiter(this, void 0, void 0, function () {
                 var params, _id, objectName, fields, userSession, steedosSchema, obj, selector, resolveInfo, fieldNames, doc, result;
-                return (0, tslib_1.__generator)(this, function (_a) {
+                return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             params = ctx.params;
@@ -441,9 +448,9 @@ function getTranslatedFieldConfig(translatedObject, name) {
     return translatedObject.fields[name.replace(/__label$/, "")];
 }
 function translateToDisplay(objectName, doc, userSession) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var lng, steedosSchema, object, objConfig, fields, displayObj, utcOffset, _loop_1, _a, _b, _i, name;
-        return (0, tslib_1.__generator)(this, function (_c) {
+        return tslib_1.__generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
                     lng = (0, __2.getUserLocale)(userSession);
@@ -458,29 +465,29 @@ function translateToDisplay(objectName, doc, userSession) {
                     displayObj = { _id: doc._id };
                     utcOffset = userSession.utcOffset;
                     _loop_1 = function (name) {
-                        var field, fType, label, map_1, value, translatedField, translatedFieldOptions, labels_1, i, lookupLabel, refTo, refValue, refObj, nameFieldKey, refRecords, refRecord, masterDetailLabel, refTo, refValue, refObj, nameFieldKey, refRecords, refRecord;
-                        return (0, tslib_1.__generator)(this, function (_d) {
+                        var field, fType, label, map_1, value, translatedField, translatedFieldOptions, labels_1, i, lookupLabel, refTo, refValue, refObj, nameFieldKey, refRecords, refRecord, masterDetailLabel, refTo, refValue, refObj, nameFieldKey, refRecords, refRecord, fileLabel, value, fileObjectName, fileObject, fileNameFieldKey, fileRecords, fileRecord;
+                        return tslib_1.__generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0:
-                                    if (!Object.prototype.hasOwnProperty.call(fields, name)) return [3 /*break*/, 27];
+                                    if (!Object.prototype.hasOwnProperty.call(fields, name)) return [3 /*break*/, 38];
                                     field = fields[name];
-                                    if (!_.has(doc, name)) return [3 /*break*/, 26];
+                                    if (!_.has(doc, name)) return [3 /*break*/, 37];
                                     fType = field.type;
                                     if (!(fType == "text")) return [3 /*break*/, 1];
                                     displayObj[name] = doc[name] || "";
-                                    return [3 /*break*/, 25];
+                                    return [3 /*break*/, 36];
                                 case 1:
                                     if (!(fType == "textarea")) return [3 /*break*/, 2];
                                     displayObj[name] = doc[name] || "";
-                                    return [3 /*break*/, 25];
+                                    return [3 /*break*/, 36];
                                 case 2:
                                     if (!(fType == "html_text")) return [3 /*break*/, 3];
                                     displayObj[name] = doc[name] || "";
-                                    return [3 /*break*/, 25];
+                                    return [3 /*break*/, 36];
                                 case 3:
                                     if (!(fType == "html")) return [3 /*break*/, 4];
                                     displayObj[name] = doc[name] || "";
-                                    return [3 /*break*/, 25];
+                                    return [3 /*break*/, 36];
                                 case 4:
                                     if (!(fType == "select")) return [3 /*break*/, 5];
                                     label = "";
@@ -502,7 +509,7 @@ function translateToDisplay(objectName, doc, userSession) {
                                         label = map_1[value];
                                     }
                                     displayObj[name] = label;
-                                    return [3 /*break*/, 25];
+                                    return [3 /*break*/, 36];
                                 case 5:
                                     if (!(fType == "boolean")) return [3 /*break*/, 6];
                                     if (doc[name]) {
@@ -511,42 +518,48 @@ function translateToDisplay(objectName, doc, userSession) {
                                     else {
                                         displayObj[name] = "";
                                     }
-                                    return [3 /*break*/, 25];
+                                    return [3 /*break*/, 36];
                                 case 6:
                                     if (!(fType == "date")) return [3 /*break*/, 7];
-                                    displayObj[name] = moment(doc[name])
-                                        .utcOffset(utcOffset)
-                                        .format("YYYY-MM-DD");
-                                    return [3 /*break*/, 25];
+                                    // 注意日期类型存的是utc0点，不需要执行utcOffset
+                                    displayObj[name] = doc[name] ? moment.utc(doc[name])
+                                        .format("YYYY-MM-DD") : '';
+                                    return [3 /*break*/, 36];
                                 case 7:
                                     if (!(fType == "datetime")) return [3 /*break*/, 8];
-                                    displayObj[name] = moment(doc[name])
+                                    displayObj[name] = doc[name] ? moment(doc[name])
                                         .utcOffset(utcOffset)
-                                        .format("YYYY-MM-DD H:mm");
-                                    return [3 /*break*/, 25];
+                                        .format("YYYY-MM-DD HH:mm") : '';
+                                    return [3 /*break*/, 36];
                                 case 8:
-                                    if (!(fType == "number")) return [3 /*break*/, 9];
-                                    displayObj[name] = doc[name] || "";
-                                    return [3 /*break*/, 25];
+                                    if (!(fType == "time")) return [3 /*break*/, 9];
+                                    // 注意时间类型走的是utc时间，不需要执行utcOffset
+                                    displayObj[name] = doc[name] ? moment.utc(doc[name])
+                                        .format("HH:mm") : '';
+                                    return [3 /*break*/, 36];
                                 case 9:
-                                    if (!(fType == "currency")) return [3 /*break*/, 10];
+                                    if (!(fType == "number")) return [3 /*break*/, 10];
                                     displayObj[name] = doc[name] || "";
-                                    return [3 /*break*/, 25];
+                                    return [3 /*break*/, 36];
                                 case 10:
-                                    if (!(fType == "percent")) return [3 /*break*/, 11];
-                                    displayObj[name] = "".concat(doc[name] * 100, "%");
-                                    return [3 /*break*/, 25];
+                                    if (!(fType == "currency")) return [3 /*break*/, 11];
+                                    displayObj[name] = doc[name] || "";
+                                    return [3 /*break*/, 36];
                                 case 11:
-                                    if (!(fType == "password")) return [3 /*break*/, 12];
+                                    if (!(fType == "percent")) return [3 /*break*/, 12];
+                                    displayObj[name] = "".concat(doc[name] * 100, "%");
+                                    return [3 /*break*/, 36];
+                                case 12:
+                                    if (!(fType == "password")) return [3 /*break*/, 13];
                                     displayObj[name] = "";
                                     if (_.isString(doc[name])) {
                                         for (i = 0; i < doc[name].length; i++) {
                                             displayObj[name] += "*";
                                         }
                                     }
-                                    return [3 /*break*/, 25];
-                                case 12:
-                                    if (!(fType == "lookup" && _.isString(field.reference_to))) return [3 /*break*/, 18];
+                                    return [3 /*break*/, 36];
+                                case 13:
+                                    if (!(fType == "lookup" && _.isString(field.reference_to))) return [3 /*break*/, 19];
                                     lookupLabel = "";
                                     refTo = field.reference_to;
                                     refValue = doc[name];
@@ -555,32 +568,32 @@ function translateToDisplay(objectName, doc, userSession) {
                                     }
                                     refObj = steedosSchema.getObject(refTo);
                                     return [4 /*yield*/, refObj.getNameFieldKey()];
-                                case 13:
+                                case 14:
                                     nameFieldKey = _d.sent();
-                                    if (!field.multiple) return [3 /*break*/, 15];
+                                    if (!field.multiple) return [3 /*break*/, 16];
                                     return [4 /*yield*/, refObj.find({
                                             filters: ["_id", "in", refValue],
                                             fields: [nameFieldKey],
                                         })];
-                                case 14:
+                                case 15:
                                     refRecords = _d.sent();
                                     lookupLabel = _.pluck(refRecords, nameFieldKey).join(",");
-                                    return [3 /*break*/, 17];
-                                case 15: return [4 /*yield*/, refObj.find({
+                                    return [3 /*break*/, 18];
+                                case 16: return [4 /*yield*/, refObj.find({
                                         filters: ["_id", "=", refValue],
                                         fields: [nameFieldKey],
                                     })];
-                                case 16:
+                                case 17:
                                     refRecord = (_d.sent())[0];
                                     if (refRecord) {
                                         lookupLabel = refRecord[nameFieldKey];
                                     }
-                                    _d.label = 17;
-                                case 17:
-                                    displayObj[name] = lookupLabel;
-                                    return [3 /*break*/, 25];
+                                    _d.label = 18;
                                 case 18:
-                                    if (!(fType == "master_detail" && _.isString(field.reference_to))) return [3 /*break*/, 24];
+                                    displayObj[name] = lookupLabel;
+                                    return [3 /*break*/, 36];
+                                case 19:
+                                    if (!(fType == "master_detail" && _.isString(field.reference_to))) return [3 /*break*/, 25];
                                     masterDetailLabel = "";
                                     refTo = field.reference_to;
                                     refValue = doc[name];
@@ -589,59 +602,94 @@ function translateToDisplay(objectName, doc, userSession) {
                                     }
                                     refObj = steedosSchema.getObject(refTo);
                                     return [4 /*yield*/, refObj.getNameFieldKey()];
-                                case 19:
+                                case 20:
                                     nameFieldKey = _d.sent();
-                                    if (!field.multiple) return [3 /*break*/, 21];
+                                    if (!field.multiple) return [3 /*break*/, 22];
                                     return [4 /*yield*/, refObj.find({
                                             filters: ["_id", "in", refValue],
                                             fields: [nameFieldKey],
                                         })];
-                                case 20:
+                                case 21:
                                     refRecords = _d.sent();
                                     masterDetailLabel = _.pluck(refRecords, nameFieldKey).join(",");
-                                    return [3 /*break*/, 23];
-                                case 21: return [4 /*yield*/, refObj.find({
+                                    return [3 /*break*/, 24];
+                                case 22: return [4 /*yield*/, refObj.find({
                                         filters: ["_id", "=", refValue],
                                         fields: [nameFieldKey],
                                     })];
-                                case 22:
+                                case 23:
                                     refRecord = (_d.sent())[0];
                                     if (refRecord) {
                                         masterDetailLabel = refRecord[nameFieldKey];
                                     }
-                                    _d.label = 23;
-                                case 23:
-                                    displayObj[name] = masterDetailLabel;
-                                    return [3 /*break*/, 25];
+                                    _d.label = 24;
                                 case 24:
-                                    if (fType == "autonumber") {
-                                        displayObj[name] = doc[name] || "";
-                                    }
-                                    else if (fType == "url") {
-                                        displayObj[name] = doc[name] || "";
-                                    }
-                                    else if (fType == "email") {
-                                        displayObj[name] = doc[name] || "";
-                                    }
-                                    else if (fType == "formula") {
-                                        displayObj[name] = doc[name] || "";
-                                    }
-                                    else if (fType == "summary") {
-                                        displayObj[name] = doc[name] || "";
-                                    }
-                                    else if (fType == "image") {
-                                        displayObj[name] = doc[name] || "";
+                                    displayObj[name] = masterDetailLabel;
+                                    return [3 /*break*/, 36];
+                                case 25:
+                                    if (!(fType == "autonumber")) return [3 /*break*/, 26];
+                                    displayObj[name] = doc[name] || "";
+                                    return [3 /*break*/, 36];
+                                case 26:
+                                    if (!(fType == "url")) return [3 /*break*/, 27];
+                                    displayObj[name] = doc[name] || "";
+                                    return [3 /*break*/, 36];
+                                case 27:
+                                    if (!(fType == "email")) return [3 /*break*/, 28];
+                                    displayObj[name] = doc[name] || "";
+                                    return [3 /*break*/, 36];
+                                case 28:
+                                    if (!(fType == "formula")) return [3 /*break*/, 29];
+                                    displayObj[name] = doc[name] || "";
+                                    return [3 /*break*/, 36];
+                                case 29:
+                                    if (!(fType == "summary")) return [3 /*break*/, 30];
+                                    displayObj[name] = doc[name] || "";
+                                    return [3 /*break*/, 36];
+                                case 30:
+                                    if (!(fType == "image" || fType == "file")) return [3 /*break*/, 35];
+                                    fileLabel = "";
+                                    value = doc[name];
+                                    if (!value) {
+                                        return [2 /*return*/, "continue"];
                                     }
-                                    else {
-                                        console.error("Graphql Display: need to handle new field type ".concat(field.type, " for ").concat(objectName, "."));
-                                        displayObj[name] = doc[name] || "";
+                                    fileObjectName = fType == "image" ? "cfs_images_filerecord" : "cfs_files_filerecord";
+                                    fileObject = steedosSchema.getObject(fileObjectName);
+                                    fileNameFieldKey = "original.name";
+                                    if (!field.multiple) return [3 /*break*/, 32];
+                                    return [4 /*yield*/, fileObject.find({
+                                            filters: ["_id", "in", value],
+                                            fields: [fileNameFieldKey],
+                                        })];
+                                case 31:
+                                    fileRecords = _d.sent();
+                                    fileLabel = _.map(fileRecords, function (fileRecord) {
+                                        var _a;
+                                        return (_a = fileRecord.original) === null || _a === void 0 ? void 0 : _a.name;
+                                    }).join(",");
+                                    return [3 /*break*/, 34];
+                                case 32: return [4 /*yield*/, fileObject.find({
+                                        filters: ["_id", "=", value],
+                                        fields: [fileNameFieldKey],
+                                    })];
+                                case 33:
+                                    fileRecord = (_d.sent())[0];
+                                    if (fileRecord) {
+                                        fileLabel = fileRecord["original"]["name"];
                                     }
-                                    _d.label = 25;
-                                case 25: return [3 /*break*/, 27];
-                                case 26:
+                                    _d.label = 34;
+                                case 34:
+                                    displayObj[name] = fileLabel;
+                                    return [3 /*break*/, 36];
+                                case 35:
+                                    console.error("Graphql Display: need to handle new field type ".concat(field.type, " for ").concat(objectName, "."));
+                                    displayObj[name] = doc[name] || "";
+                                    _d.label = 36;
+                                case 36: return [3 /*break*/, 38];
+                                case 37:
                                     displayObj[name] = ""; // 如果值为空，均返回空字符串
-                                    _d.label = 27;
-                                case 27: return [2 /*return*/];
+                                    _d.label = 38;
+                                case 38: return [2 /*return*/];
                             }
                         });
                     };
@@ -685,7 +733,7 @@ function getLocalService(objectApiName) {
     return steedosSchema.broker.getLocalService((0, __1.getObjectServiceName)(objectApiName));
 }
 exports.getLocalService = getLocalService;
-(0, tslib_1.__exportStar)(require("./getQueryFields"), exports);
-(0, tslib_1.__exportStar)(require("./consts"), exports);
+tslib_1.__exportStar(require("./getQueryFields"), exports);
+tslib_1.__exportStar(require("./consts"), exports);
 var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5, templateObject_6, templateObject_7;
 //# sourceMappingURL=index.js.map