@things-factory/meta-ui 7.1.27 → 7.1.30

package/client/utils/service-util.js

@@ -460,9 +460,17 @@ export class ServiceUtil {
               column.hidden !== true
           )
           .reduce((record, column) => {
-            record[column.imex.key] = column.imex.key
-              .split('.')
-              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+            record[column.imex.key] = column.imex.key.split('.').reduce((obj, key) => {
+              const val = obj && obj[key] !== 'undefined' ? obj[key] : undefined
+
+              if (column.type == 'select') {
+                return column?.record?.options?.find(option => option.value == val)?.display
+              } else if (column.type.includes('object')) {
+                return val?.name
+              }
+
+              return val
+            }, item)
             return record
           }, {})
       }
@@ -488,10 +496,10 @@ export class ServiceUtil {
    ************************************************
    * @param {String} exportFileName 그리드 내보내기 용 타이틀 (파일명)
    * @param {String} exportQueryName 서버 사이드 GraphQL 쿼리명
-   * @param {Grist} grist 그리드 오브젝트
+   * @param {Object} filterParam 필터용 파라미터
    * @returns {Object} { header: headerSetting, data: data } or Not
    */
-  static async exportableDataByServer(exportFileName, exportQueryName, grist) {
+  static async exportableDataByServer(exportFileName, exportQueryName, filterParam) {
     // 1. 내보내기 graphQL 요청
     const response = await client.query({
       query: gql`
@@ -500,7 +508,7 @@ export class ServiceUtil {
         }
       `,
       variables: {
-        filters: grist.filters
+        filters: filterParam
       }
     })
 
@@ -917,7 +925,7 @@ export class ServiceUtil {
     if (action.graphql_type == 'query') {
       return await ServiceUtil.callQueryService(action, filterParam, dataParams)
     } else if (action.graphql_type == 'export') {
-      return await ServiceUtil.exportableDataByServer(action.export_file_name, action.query_name, pageView.grist)
+      return await ServiceUtil.exportableDataByServer(action.export_file_name, action.query_name, filterParam)
     } else {
       return await ServiceUtil.callMutationService(action, filterParam, dataParams)
     }