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

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);
@@ -974,6 +979,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 +1062,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 +1146,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 +1230,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,
@@ -5660,7 +5669,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       const tree = [{
           "type": "input-tree",
           "className": "",
-          "inputClassName": "pl-0",
+          "inputClassName": "p-0",
           "id": "u:7fd77b7915b0",
           "source": {
             "method": "post",
@@ -5721,7 +5730,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             "left": "-200px",
             "width": "190px",
             "bottom": 0,
-            "top": "-14px",
+            "top": "2px",
             "overflow": "auto",
             "min-height":"300px"
           },
@@ -5987,7 +5996,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   "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) {
@@ -6482,11 +6493,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 {
@@ -6513,7 +6523,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   "className": "steedos-markdown",
                   "tabs": [
                     {
-                      "title": "Write",
+                      "title": i18next__default["default"].t('frontend_form_edit'),
                       "tab": [
                         {
                           "type": "editor",
@@ -6523,7 +6533,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                       ]
                     },
                     {
-                      "title": "Preview",
+                      "title": i18next__default["default"].t('frontend_form_preview'),
                       "tab": [
                         {
                           "type": "markdown",
@@ -6580,7 +6590,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: 
    */
 
@@ -6604,6 +6614,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;
       }
@@ -7161,6 +7173,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;
@@ -7482,26 +7518,45 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                       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;
@@ -7633,6 +7688,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;
@@ -7643,7 +7702,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": {
@@ -7680,7 +7739,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'){
@@ -7692,16 +7751,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,
@@ -7729,12 +7784,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({}, {
@@ -7754,6 +7805,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                   }, field.amis, {name: field.name}));
               }
           }
+
       }
       // columns.push(getOperation(fields));
       if(!___namespace.some(columns, { name: options.labelFieldName })){
@@ -9294,13 +9346,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;
   }