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

package/dist/amis-object.cjs.css

@@ -814,9 +814,6 @@ fieldset.antd-Collapse > legend{
 .pl-1 {
     padding-left: 0.25rem
 }
-.pl-0 {
-    padding-left: 0px
-}
 .pr-4 {
     padding-right: 1rem
 }
@@ -1169,6 +1166,11 @@ fieldset.antd-Collapse > legend{
   .steedos-record-detail-related-lists .steedos-record-related-list .steedos-object-table .antd-Table-footToolbar {
     display: none;
   }
+}
+.steedos-select-user > .antd-Form {
+  margin-left: -200px;
+}
+@media (max-width: 576px) {
   .antd-Crud-toolbar {
     flex-basis: 0;
     flex-grow: 1;
@@ -1507,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);
@@ -4119,6 +4124,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 +4207,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 +4291,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 +4375,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,
@@ -8805,7 +8814,7 @@ function getLookupSapceUserTreeSchema(){
     const tree = [{
         "type": "input-tree",
         "className": "",
-        "inputClassName": "pl-0",
+        "inputClassName": "p-0",
         "id": "u:7fd77b7915b0",
         "source": {
           "method": "post",
@@ -8866,7 +8875,7 @@ function getLookupSapceUserTreeSchema(){
           "left": "-200px",
           "width": "190px",
           "bottom": 0,
-          "top": "-14px",
+          "top": "2px",
           "overflow": "auto",
           "min-height":"300px"
         },
@@ -9132,7 +9141,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
                 "margin-left":"200px",
                 "min-height": "300px"
              };
+             pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
         }
+
         pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, ctx.formFactor, { headerToolbarItems });
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         if (isAllowCreate) {
@@ -9627,11 +9638,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 {
@@ -9658,7 +9668,7 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
                 "className": "steedos-markdown",
                 "tabs": [
                   {
-                    "title": "Write",
+                    "title": instance.t('frontend_form_edit'),
                     "tab": [
                       {
                         "type": "editor",
@@ -9668,7 +9678,7 @@ const getMarkdownFieldSchema = (field, readonly, ctx)=>{
                     ]
                   },
                   {
-                    "title": "Preview",
+                    "title": instance.t('frontend_form_preview'),
                     "tab": [
                       {
                         "type": "markdown",
@@ -9725,7 +9735,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: 
  */
 
@@ -9749,6 +9759,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;
     }
@@ -10306,6 +10318,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;
@@ -10627,26 +10663,45 @@ async function getQuickEditSchema(field, options){
                     let labelField = quickEditSchema.body[0].labelField || "label";
                     let valueField = quickEditSchema.body[0].valueField || "value";
                     if (field.multiple) {
+                        /*
+                            多选分两种情况。
+                            第一种是减少选项时（判断新的数据是否比老的数据短），按照index删除_display中对应选项，保证回显没问题；
+                            第二种是增加选项时，按照value的值，找到对应选项，并按照_display的规则为其赋值
+                        */
                         TempDisplayField = `
+                            const preData = event.data.__super.${field.name};
+                            if(preData && event.data.${field.name}.length < preData.length){
+                                let deletedIndex;
+                                preData.forEach(function(item,index){
+                                    if(_.indexOf(event.data.${field.name}, item) == -1) _display["${field.name}"].splice(index, 1);
+                                })
+                            }else{
                                 _display["${field.name}"] = [];
-                                event.data.selectedItems.forEach(function(item,index){
+                                event.data.value.forEach(function(val,index){
+                                    const item = _.find(event.data.selectedItems, { ${valueField}: val });
                                     _display["${field.name}"].push(
                                         {
                                             "label": item.${labelField},
-                                            "value": item.${valueField},
+                                            "value": item[event.data.uiSchema.idFieldName],
                                             "objectName": "${field.reference_to}"
                                         }
                                     )
                                 })
-                            `;
+                            }
+                            
+                        `;
                     } else {
                         TempDisplayField = `
+                            if(event.data.value){
                                 _display["${field.name}"] = {
                                     "label": event.data.selectedItems.${labelField},
-                                    "value": event.data.selectedItems.${valueField},
+                                    "value": event.data.selectedItems[event.data.uiSchema.idFieldName],
                                     "objectName": "${field.reference_to}"
                                 }
-                            `;
+                            }else{
+                                _display["${field.name}"] = {}
+                            }
+                        `;
                     }
                     quickEditSchema.body[0].onEvent["change"] = quickEditOnEvent(TempDisplayField);
                     break;
@@ -10778,6 +10833,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;
@@ -10788,7 +10847,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": {
@@ -10825,7 +10884,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'){
@@ -10837,16 +10896,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,
@@ -10874,12 +10929,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({}, {
@@ -10899,6 +10950,7 @@ async function getTableColumns$1(fields, options){
                 }, field.amis, {name: field.name}));
             }
         }
+
     }
     // columns.push(getOperation(fields));
     if(!___default__namespace.some(columns, { name: options.labelFieldName })){
@@ -12439,13 +12491,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;
 }
@@ -17880,7 +17932,7 @@ var AmisRecordDetailRelatedList = function (props) { return __awaiter(void 0, vo
                 return [4 /*yield*/, getRecordDetailRelatedListSchema(objectApiName, recordId, relatedObjectApiName, relatedKey, { top: top, perPage: perPage, appId: appId, relatedLabel: relatedLabel, className: className, formFactor: formFactor, columns: columns, sort: sort, filters: filters, visible_on: visible_on, isRelated: true, hiddenEmptyTable: hiddenEmptyTable, requestAdaptor: requestAdaptor, adaptor: adaptor })];
             case 1:
                 schema = (_c.sent()).amisSchema;
-                schema.data = Object.assign(schema.data, formData);
+                schema.data = Object.assign(schema.data || {}, formData);
                 if (___default.has(props, "recordId") && $schema.recordId !== "${recordId}") {
                     schema.data = Object.assign(schema.data, {
                         _master: {