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

package/dist/amis-object.umd.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.umd.js

@@ -3566,8 +3566,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: 
      */
 
@@ -3751,6 +3751,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){
@@ -3775,6 +3778,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);
@@ -4117,6 +4122,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";
@@ -4199,6 +4205,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,
@@ -4282,6 +4289,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 = "确认";
@@ -4365,6 +4373,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,
@@ -9627,11 +9636,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 {
@@ -9658,7 +9666,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     "className": "steedos-markdown",
                     "tabs": [
                       {
-                        "title": "Write",
+                        "title": instance.t('frontend_form_edit'),
                         "tab": [
                           {
                             "type": "editor",
@@ -9668,7 +9676,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                         ]
                       },
                       {
-                        "title": "Preview",
+                        "title": instance.t('frontend_form_preview'),
                         "tab": [
                           {
                             "type": "markdown",
@@ -9725,7 +9733,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: 
      */
 
@@ -9749,6 +9757,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         if(!readonly){
             if(___default__namespace.includes(AmisFormInputs, type)){
                 return `input-${type}`;
+            }else if(type === 'location'){
+                return "location-picker"
             }
             return type;
         }
@@ -10306,6 +10316,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;
@@ -10797,6 +10831,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;
@@ -10807,7 +10845,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": {
@@ -10844,7 +10882,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'){
@@ -10856,16 +10894,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,
@@ -10893,12 +10927,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({}, {
@@ -10918,6 +10948,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                     }, field.amis, {name: field.name}));
                 }
             }
+
         }
         // columns.push(getOperation(fields));
         if(!___default__namespace.some(columns, { name: options.labelFieldName })){
@@ -12458,13 +12489,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         "selectMirror": permissions.allowCreate,
         "initialView": initialView,
         "businessHours": businessHours,
-        ...config,
-        "onEvent": onEvent,
         "views":{
           listWeek: {
             buttonText: instance.t('frontend_calendar_listWeek')
           }
-        }
+        },
+        ...config,
+        "onEvent": onEvent
       };
       return amisSchema;
     }