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

package/dist/index.umd.js

@@ -423,8 +423,8 @@
   /*
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-05-23 09:53:08
-   * @LastEditors: Please set LastEditors
-   * @LastEditTime: 2023-05-22 15:13:18
+   * @LastEditors: liaodaxue
+   * @LastEditTime: 2023-07-28 16:26:31
    * @Description: 
    */
 
@@ -608,6 +608,9 @@
         <% } %>`
   }
 
+  function getLocationTpl(field){
+      return `\${${field.name} ? ${field.name}.address : ''}`
+  }
 
   async function getFieldTpl (field, options){
       if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLabel){
@@ -632,6 +635,8 @@
               return await getRelatedFieldTpl(field, options);
           case 'master_detail':
               return await getRelatedFieldTpl(field, options);
+          case 'location':
+              return await getLocationTpl(field);
           case 'number':
           case 'currency':
               return await getNumberTpl(field);
@@ -644,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 = [];
@@ -658,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}`);
+                  objectFieldName = field.name.split('.')[0];
+                  fieldsName.push(objectFieldName);
+                  displayFields.push(objectFieldName);
               }
-              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 {
-              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(){
@@ -974,6 +990,7 @@
   var frontend_form_cancel$1 = "Cancel";
   var frontend_form_new$1 = "New";
   var frontend_form_edit$1 = "Edit";
+  var frontend_form_preview$1 = "Preview";
   var frontend_form_select$1 = "Select";
   var frontend_form_please_select$1 = "Please select";
   var frontend_form_confirm$1 = "Confirm";
@@ -1056,6 +1073,7 @@
   	frontend_form_cancel: frontend_form_cancel$1,
   	frontend_form_new: frontend_form_new$1,
   	frontend_form_edit: frontend_form_edit$1,
+  	frontend_form_preview: frontend_form_preview$1,
   	frontend_form_select: frontend_form_select$1,
   	frontend_form_please_select: frontend_form_please_select$1,
   	frontend_form_confirm: frontend_form_confirm$1,
@@ -1139,6 +1157,7 @@
   var frontend_form_cancel = "取消";
   var frontend_form_new = "新建";
   var frontend_form_edit = "编辑";
+  var frontend_form_preview = "预览";
   var frontend_form_select = "选择";
   var frontend_form_please_select = "请选择";
   var frontend_form_confirm = "确认";
@@ -1222,6 +1241,7 @@
   	frontend_form_cancel: frontend_form_cancel,
   	frontend_form_new: frontend_form_new,
   	frontend_form_edit: frontend_form_edit,
+  	frontend_form_preview: frontend_form_preview,
   	frontend_form_select: frontend_form_select,
   	frontend_form_please_select: frontend_form_please_select,
   	frontend_form_confirm: frontend_form_confirm,
@@ -6484,11 +6504,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
    * @Author: baozhoutao@steedos.com
    * @Date: 2023-01-13 17:27:54
    * @LastEditors: liaodaxue
-   * @LastEditTime: 2023-07-24 15:23:12
+   * @LastEditTime: 2023-07-27 17:33:54
    * @Description: 
    */
 
-
   const getMarkdownFieldSchema = (field, readonly, ctx)=>{
       if(readonly){
           return {
@@ -6515,7 +6534,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   "className": "steedos-markdown",
                   "tabs": [
                     {
-                      "title": "Write",
+                      "title": i18next__default["default"].t('frontend_form_edit'),
                       "tab": [
                         {
                           "type": "editor",
@@ -6525,7 +6544,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                       ]
                     },
                     {
-                      "title": "Preview",
+                      "title": i18next__default["default"].t('frontend_form_preview'),
                       "tab": [
                         {
                           "type": "markdown",
@@ -6582,7 +6601,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
    * @Author: baozhoutao@steedos.com
    * @Date: 2022-10-28 14:52:55
    * @LastEditors: liaodaxue
-   * @LastEditTime: 2023-07-14 17:18:42
+   * @LastEditTime: 2023-07-28 16:16:29
    * @Description: 
    */
 
@@ -6606,6 +6625,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       if(!readonly){
           if(___namespace.includes(AmisFormInputs, type)){
               return `input-${type}`;
+          }else if(type === 'location'){
+              return "location-picker"
           }
           return type;
       }
@@ -7163,6 +7184,30 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   type: getAmisStaticFieldType('email', readonly)
               };
               break;
+          case 'location':
+              // 申请ak后需要设置白名单； https://lbsyun.baidu.com/apiconsole/key/create#/home
+              // console.log('fie==>', field.name, field);
+              let ak = "LiZT5dVbGTsPI91tFGcOlSpe5FDehpf7";
+              let vendor = "baidu";  /* 'baidu' | 'gaode' */
+              if(window.Meteor){
+                  const map_ak = Meteor.settings?.public?.amis?.map_ak;
+                  if(map_ak){
+                      ak = map_ak;
+                  }
+                  const map_vendor = Meteor.settings?.public?.amis?.map_vendor;
+                  if(map_vendor){
+                      vendor = map_vendor;
+                  }
+              }
+              
+              convertData = {
+                  type: getAmisStaticFieldType('location', readonly),
+                  tpl: readonly ? getLocationTpl(field) : null,
+                  ak,
+                  vendor,
+                  label: field.label
+              };
+              break;
           case 'avatar':
               convertData = getAmisFileSchema(field, readonly);
               break;
@@ -7654,6 +7699,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       for (const field of fields) {
           //增加quickEdit属性，实现快速编辑
           const quickEditSchema = allowEdit ? await getQuickEditSchema(field, options) : allowEdit;
+          let className = "";
+          if(field.wrap != true){
+              className += " whitespace-nowrap";
+          }
           if((field.is_name || field.name === options.labelFieldName) && options.objectName === 'cms_files'){
               const previewFileScript = `
                 var data = event.data;
@@ -7664,7 +7713,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               columns.push({
                   "type": "button",
                   "label": `<%=data.versions ? data.name : "${field.label}"%>`,
-                  "className": "whitespace-nowrap",
+                  className,
                   "level": "link",
                   "quickEdit": quickEditSchema,
                   "onEvent": {
@@ -7701,7 +7750,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   width: getFieldWidth(field.width),
                   toggled: field.toggled,
                   static: true,
-                  className:"whitespace-nowrap",
+                  className,
                   quickEdit: quickEditSchema
               }, field.amis, {name: field.name}));
           }else if(field.type === 'avatar' || field.type === 'image' || field.type === 'file'){
@@ -7713,16 +7762,12 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   toggled: field.toggled,
                   quickEdit: quickEditSchema,
                   static: true,
-                  className:"whitespace-nowrap",
+                  className,
                   ...getAmisFileReadonlySchema(field)
               }, field.amis, {name: field.name}));
           }
           else if(field.type === 'select'){
               const map = getSelectMap(field.options);
-              let className = "";
-              if(field.wrap === false){
-                  className += " whitespace-nowrap";
-              }
               columns.push(Object.assign({}, {
                   type: "mapping",
                   name: field.name,
@@ -7750,12 +7795,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                       type = 'input-url';
                   }
               }
-              let className = "";
               if(field.type === 'textarea'){
-                  className = 'min-w-56';
-              }
-              if(field.wrap === false){
-                  className += " whitespace-nowrap";
+                  className += 'min-w-56';
               }
               if(!field.hidden && !field.extra){
                   columns.push(Object.assign({}, {
@@ -7775,6 +7816,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   }, field.amis, {name: field.name}));
               }
           }
+
       }
       // columns.push(getOperation(fields));
       if(!___namespace.some(columns, { name: options.labelFieldName })){
@@ -9315,13 +9357,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       "selectMirror": permissions.allowCreate,
       "initialView": initialView,
       "businessHours": businessHours,
-      ...config,
-      "onEvent": onEvent,
       "views":{
         listWeek: {
           buttonText: i18next__default["default"].t('frontend_calendar_listWeek')
         }
-      }
+      },
+      ...config,
+      "onEvent": onEvent
     };
     return amisSchema;
   }
@@ -10354,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:
    */
 
@@ -10689,6 +10731,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           "filterVisible": ctx.filterVisible,
           "rowClassNameExpr": ctx.rowClassNameExpr
       };
+      // console.log(`getListSchema===>`,amisSchema)
       return {
           uiSchema,
           amisSchema,
@@ -10702,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;
@@ -10716,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;