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

package/dist/amis-object.cjs.css

@@ -1509,6 +1509,9 @@ fieldset.antd-Collapse > legend{
   .steedos-object-listview .antd-Table-content {
     max-height: calc(100vh - 263px);
   }
+  .steedos-object-table .antd-Table-content {
+    max-height: calc(100vh - 195px);
+  }
   .steedos-global-footer-root .antd-Nav-Menu-horizontal:after {
     /*手机端底部导航左右间隔不平衡*/
     content: unset;

package/dist/amis-object.cjs.js

@@ -3568,8 +3568,8 @@ function getContrastColor(bgColor) {
 /*
  * @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: 
  */
 
@@ -3753,6 +3753,9 @@ function getPasswordTpl(field){
         <% } %>`
 }
 
+function getLocationTpl(field){
+    return `\${${field.name} ? ${field.name}.address : ''}`
+}
 
 async function getFieldTpl (field, options){
     if((field.is_name || field.name === options.labelFieldName) && !options.onlyDisplayLabel){
@@ -3777,6 +3780,8 @@ async function getFieldTpl (field, options){
             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);
@@ -3789,9 +3794,10 @@ async function getFieldTpl (field, options){
     }
 }
 
-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 = [];
@@ -3803,33 +3809,43 @@ async function getFieldsTemplate(fields, expand){
     }
     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(___default.includes(['time','date','datetime','boolean','number','currency'], field.type)){
+                    fieldsName.push(`${field.name}`);
+                }
+                if(___default.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(___default.includes(['time','date','datetime','boolean','number','currency'], field.type)){
-                fieldsName.push(`${field.name}`);
-            }
-            if(___default.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 = ___default__namespace.uniq(displayFields);
     fieldsName = ___default__namespace.uniq(fieldsName);
+    let expandFieldsQuery = "";
+    if(expandFields.length > 0){
+        ___default__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(){
@@ -4119,6 +4135,7 @@ var frontend_form_save_and_new$1 = "Save and New";
 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";
@@ -4201,6 +4218,7 @@ var en_us = {
 	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,
@@ -4284,6 +4302,7 @@ var frontend_form_save_and_new = "保存并新建";
 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 = "确认";
@@ -4367,6 +4386,7 @@ var zh_cn = {
 	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,
@@ -9629,11 +9649,10 @@ async function getIdsPickerSchema(field, readonly, ctx){
  * @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 {
@@ -9660,7 +9679,7 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
                 "className": "steedos-markdown",
                 "tabs": [
                   {
-                    "title": "Write",
+                    "title": instance.t('frontend_form_edit'),
                     "tab": [
                       {
                         "type": "editor",
@@ -9670,7 +9689,7 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
                     ]
                   },
                   {
-                    "title": "Preview",
+                    "title": instance.t('frontend_form_preview'),
                     "tab": [
                       {
                         "type": "markdown",
@@ -9727,7 +9746,7 @@ const getHtmlFieldSchema = (field, readonly, ctx)=>{
  * @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: 
  */
 
@@ -9751,6 +9770,8 @@ function getAmisStaticFieldType(type, readonly, options){
     if(!readonly){
         if(___default__namespace.includes(AmisFormInputs, type)){
             return `input-${type}`;
+        }else if(type === 'location'){
+            return "location-picker"
         }
         return type;
     }
@@ -10308,6 +10329,30 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                 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;
@@ -10799,6 +10844,10 @@ async function getTableColumns$1(fields, options){
     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;
@@ -10809,7 +10858,7 @@ async function getTableColumns$1(fields, options){
             columns.push({
                 "type": "button",
                 "label": `<%=data.versions ? data.name : "${field.label}"%>`,
-                "className": "whitespace-nowrap",
+                className,
                 "level": "link",
                 "quickEdit": quickEditSchema,
                 "onEvent": {
@@ -10846,7 +10895,7 @@ async function getTableColumns$1(fields, options){
                 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'){
@@ -10858,16 +10907,12 @@ async function getTableColumns$1(fields, options){
                 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,
@@ -10895,12 +10940,8 @@ async function getTableColumns$1(fields, options){
                     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({}, {
@@ -10920,6 +10961,7 @@ async function getTableColumns$1(fields, options){
                 }, field.amis, {name: field.name}));
             }
         }
+
     }
     // columns.push(getOperation(fields));
     if(!___default__namespace.some(columns, { name: options.labelFieldName })){
@@ -12460,13 +12502,13 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
     "selectMirror": permissions.allowCreate,
     "initialView": initialView,
     "businessHours": businessHours,
-    ...config,
-    "onEvent": onEvent,
     "views":{
       listWeek: {
         buttonText: instance.t('frontend_calendar_listWeek')
       }
-    }
+    },
+    ...config,
+    "onEvent": onEvent
   };
   return amisSchema;
 }
@@ -13499,8 +13541,8 @@ async function getRelatedListSchema(
 /*
  * @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:
  */
 
@@ -13834,6 +13876,7 @@ async function getListSchema(
         "filterVisible": ctx.filterVisible,
         "rowClassNameExpr": ctx.rowClassNameExpr
     };
+    // console.log(`getListSchema===>`,amisSchema)
     return {
         uiSchema,
         amisSchema,
@@ -13847,7 +13890,7 @@ async function getTableSchema(
     columns,
     ctx = {}
 ) {
-    // console.time('getTableSchema');
+    // console.time('getTableSchema', columns);
     const uiSchema = await getUISchema(objectName);
 
     let sort = ctx.sort;
@@ -13861,19 +13904,52 @@ async function getTableSchema(
     }
 
     let fields = [];
-    ___default.each(columns, function (column) {
-        if (___default.isString(column) && uiSchema.fields[column]) {
-            fields.push(uiSchema.fields[column]);
-        } else if (___default.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 (___default.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') && ___default.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 (___default.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') && ___default.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;