@steedos-widgets/amis-lib 1.2.35-beta.1 → 1.2.35-beta.2

package/dist/index.umd.js

@@ -649,9 +649,10 @@
       }
   }
 
-  async function getFieldsTemplate(fields, expand){
-      if(expand != false){
-          expand = true;
+  async function getFieldsTemplate(fields, display){
+      let expandFields = [];
+      if(display != false){
+          display = true;
       }
       let fieldsName = ['_id'];
       let displayFields = [];
@@ -663,33 +664,43 @@
       }
       for (const field of fieldsArr) {
           //graphql 的  ui\display 中使用的字段需要先在query中查询. 否则会返回null
-          if(field.name.indexOf('.') < 0){
-              if(expand && (field.type == 'lookup' || field.type == 'master_detail')){
-                  fieldsName.push(`${field.name}`);
-                  displayFields.push(`${field.name}`);
+          if(field.expand){
+              expandFields.push(field);
+          }else {
+              if(field.name.indexOf('.') < 0){
+                  if(display && (field.type == 'lookup' || field.type == 'master_detail')){
+                      fieldsName.push(`${field.name}`);
+                      displayFields.push(`${field.name}`);
+                  }else {
+                      fieldsName.push( field.alias ? `${field.alias}:${field.name}` : field.name);
+                  }
+                  if(_$1.includes(['time','date','datetime','boolean','number','currency'], field.type)){
+                      fieldsName.push(`${field.name}`);
+                  }
+                  if(_$1.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
+                      displayFields.push(`${field.name}`);
+                  }
               }else {
-                  fieldsName.push( field.alias ? `${field.alias}:${field.name}` : field.name);
-              }
-              if(_$1.includes(['time','date','datetime','boolean','number','currency'], field.type)){
-                  fieldsName.push(`${field.name}`);
-              }
-              if(_$1.includes(['percent','time','filesize','date','datetime','boolean','number','currency', 'select', 'file', 'image', 'avatar', 'formula', 'summary', 'object', 'grid'], field.type)){
-                  displayFields.push(`${field.name}`);
+                  objectFieldName = field.name.split('.')[0];
+                  fieldsName.push(objectFieldName);
+                  displayFields.push(objectFieldName);
               }
-          }else {
-              objectFieldName = field.name.split('.')[0];
-              fieldsName.push(objectFieldName);
-              displayFields.push(objectFieldName);
           }
       }
 
       displayFields = ___namespace.uniq(displayFields);
       fieldsName = ___namespace.uniq(fieldsName);
+      let expandFieldsQuery = "";
+      if(expandFields.length > 0){
+          ___namespace.each(expandFields, function(field){
+              expandFieldsQuery = expandFieldsQuery + `${field.expandInfo.fieldName}:${field.expandInfo.fieldName}__expand{${field.expandInfo.displayName}}`;
+          });
+      }
 
       if(displayFields.length > 0){
-          return `${fieldsName.join(',')},_display:_ui{${displayFields.join(',')}}`;
+          return `${fieldsName.join(',')},${expandFieldsQuery},_display:_ui{${displayFields.join(',')}}`;
       }
-      return `${fieldsName.join(' ')}`
+      return `${fieldsName.join(' ')},${expandFieldsQuery}`
   }
 
   function getRecordPermissionsTemplate(){
@@ -10385,8 +10396,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
   /*
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-07-05 15:55:39
-   * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
-   * @LastEditTime: 2023-06-04 17:36:49
+   * @LastEditors: baozhoutao@steedos.com
+   * @LastEditTime: 2023-07-29 13:58:07
    * @Description:
    */
 
@@ -10720,6 +10731,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           "filterVisible": ctx.filterVisible,
           "rowClassNameExpr": ctx.rowClassNameExpr
       };
+      // console.log(`getListSchema===>`,amisSchema)
       return {
           uiSchema,
           amisSchema,
@@ -10733,7 +10745,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       columns,
       ctx = {}
   ) {
-      // console.time('getTableSchema');
+      // console.time('getTableSchema', columns);
       const uiSchema = await getUISchema(objectName);
 
       let sort = ctx.sort;
@@ -10747,19 +10759,52 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       }
 
       let fields = [];
-      _$1.each(columns, function (column) {
-          if (_$1.isString(column) && uiSchema.fields[column]) {
-              fields.push(uiSchema.fields[column]);
-          } else if (_$1.isObject(column) && uiSchema.fields[column.field]) {
-              fields.push(
-                  Object.assign({}, uiSchema.fields[column.field], {
-                      width: column.width,
-                      wrap: column.wrap, // wrap = true 是没效果的
-                      amis: column.amis
-                  })
-              );
+      for(const column of columns){
+          if (_$1.isString(column)) {
+              if(column.indexOf('.') > 0){
+                  const fieldName = column.split('.')[0];
+                  const displayName = column.split('.')[1];
+                  const filedInfo = uiSchema.fields[fieldName];
+                  if(filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && _$1.isString(filedInfo.reference_to) ){
+                      const rfUiSchema = await getUISchema(filedInfo.reference_to);
+                      const rfFieldInfo = rfUiSchema.fields[displayName];
+                      fields.push(Object.assign({}, rfFieldInfo, {name: column, expand: true, expandInfo: {fieldName, displayName}}));
+                  }
+              }else {
+                  if(uiSchema.fields[column]){
+                      fields.push(uiSchema.fields[column]);
+                  }
+              }
+          } else if (_$1.isObject(column)) {
+              if(column.field.indexOf('.') > 0){
+                  const fieldName = column.field.split('.')[0];
+                  const displayName = column.field.split('.')[1];
+                  const filedInfo = uiSchema.fields[fieldName];
+                  if(filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && _$1.isString(filedInfo.reference_to) ){
+                      const rfUiSchema = await getUISchema(filedInfo.reference_to);
+                      const rfFieldInfo = rfUiSchema.fields[displayName];
+                      fields.push(Object.assign({}, rfFieldInfo, 
+                          {name: column.field, expand: true, expandInfo: {fieldName, displayName}},
+                          {
+                              width: column.width,
+                              wrap: column.wrap, // wrap = true 是没效果的
+                              amis: column.amis
+                          }
+                      ));
+                  }
+              }else {
+                  if(uiSchema.fields[column.field]){
+                      fields.push(
+                          Object.assign({}, uiSchema.fields[column.field], {
+                              width: column.width,
+                              wrap: column.wrap, // wrap = true 是没效果的
+                              amis: column.amis
+                          })
+                      );
+                  }
+              }
           }
-      });
+      }
 
       const extraColumns = ctx.extraColumns;