@steedos-widgets/amis-object 1.2.19 → 1.2.25

package/dist/amis/AmisObjectForm.d.ts

@@ -1,2 +1,3 @@
 import './AmisObjectForm.less';
+import './AmisObjectFormMobile.less';
 export declare const AmisObjectForm: (props: any) => Promise<any>;

package/dist/amis-object.cjs.css

@@ -543,8 +543,9 @@ body {
 .w-8 {
     width: 2rem
 }
-.w-\[388px\] {
-    width: 388px
+.w-fit {
+    width: -moz-fit-content;
+    width: fit-content
 }
 .\!min-w-\[160px\] {
     min-width: 160px !important
@@ -558,6 +559,9 @@ body {
 .min-w-\[200px\] {
     min-width: 200px
 }
+.min-w-\[388px\] {
+    min-width: 388px
+}
 .max-w-\[360px\] {
     max-width: 360px
 }
@@ -1251,6 +1255,41 @@ body {
   }
 }
 
+@media (max-width: 767px) {
+  .steedos-amis-form.antd-Form {
+    /* start ======== 移动端给部分input加边框，并使输入框上下居中*/
+    /* =========end */
+  }
+  .steedos-amis-form.antd-Form .antd-Form-item .antd-Form-control > .antd-TextControl-input,
+  .steedos-amis-form.antd-Form .antd-Form-item div.antd-TextareaControl {
+    border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+    border-radius: var(--Form-input-borderRadius);
+  }
+  .steedos-amis-form.antd-Form .antd-Form-item .antd-Form-control > .antd-TextControl-input:hover,
+  .steedos-amis-form.antd-Form .antd-Form-item div.antd-TextareaControl:hover {
+    border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+    border-radius: var(--Form-input-borderRadius);
+  }
+  .steedos-amis-form.antd-Form .antd-Form-item .antd-TextControl.is-focused > .antd-TextControl-input,
+  .steedos-amis-form.antd-Form .antd-Form-item div.is-focused.antd-TextareaControl {
+    border-color: var(--input-default-active-top-border-color) var(--input-default-active-right-border-color) var(--input-default-active-bottom-border-color) var(--input-default-active-left-border-color);
+    border-style: var(--input-default-active-top-border-style) var(--input-default-active-right-border-style) var(--input-default-active-bottom-border-style) var(--input-default-active-left-border-style);
+    border-width: var(--input-default-active-top-border-width) var(--input-default-active-right-border-width) var(--input-default-active-bottom-border-width) var(--input-default-active-left-border-width);
+  }
+  .steedos-amis-form.antd-Form .antd-Form-item .antd-TextControl.is-focused > .antd-TextControl-input:hover,
+  .steedos-amis-form.antd-Form .antd-Form-item div.is-focused.antd-TextareaControl:hover {
+    border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+    border-radius: var(--Form-input-borderRadius);
+  }
+  .steedos-amis-form.antd-Form .antd-Form-item input {
+    height: 100%;
+  }
+  .steedos-amis-form.antd-Form .antd-Form-item {
+    margin-top: 0;
+    align-items: center;
+  }
+}
+
 @media (min-width: 767px) {
   .steedos-object-table .antd-Field-quickEditBtn {
     display: none;

package/dist/amis-object.cjs.js

@@ -6396,28 +6396,42 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     //   }
     // }
     // listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
-
-    let isMobile = Steedos.isMobile();
-    if(isMobile){
-      // 手机端点击搜索的时候自动收起搜索栏
-      let resizeWindow = function(){
-        //触发amis crud 高度重算
-        setTimeout(()=>{
-          window.dispatchEvent(new Event("resize"))
-        }, 500);
-      }
-      const filterService = filterForm.context.getComponents().find(function(n){
-        return n.props.type === "service";
-      });
-      filterService.setData({showFieldsFilter: false});
-      resizeWindow();
-      // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取。
-      let filterFormValues = event.data;
-      let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
-      let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
-      let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
-      crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter: false});
+    // 点击搜索的时候自动收起搜索栏
+    let resizeWindow = function(){
+      //触发amis crud 高度重算
+      setTimeout(()=>{
+        window.dispatchEvent(new Event("resize"))
+      }, 500);
     }
+    const filterService = filterForm.context.getComponents().find(function(n){
+      return n.props.type === "service";
+    });
+    let showFieldsFilter = false;
+    const isMobile = window.innerWidth < 768;
+    if(event.data.__from_fields_filter_settings_confirm){
+      // 如果是从设置搜索项点击确认按钮触发的搜索事件不应该自动关闭搜索栏
+      showFieldsFilter = true;
+    }
+    else if(isMobile){
+      // 如果是手机端，点击搜索后自动关闭搜索栏
+      showFieldsFilter = false;
+    }
+    else if(event.data.displayAs === "split") {
+      // PC上分栏模式下的列表，始终按手机上效果处理，即自动关闭搜索栏
+      showFieldsFilter = false;
+    }
+    else if(window.innerHeight >= 1200){
+      // 高分辨率屏幕（2k+），列表高度比较高，没必要自动关闭搜索栏
+      showFieldsFilter = true;
+    }
+    filterService.setData({showFieldsFilter});
+    resizeWindow();
+    // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取。
+    let filterFormValues = event.data;
+    let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
+    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter});
   `;
   const onCancelScript = `
     const scope = event.context.scoped;
@@ -6456,12 +6470,9 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     setTimeout(()=>{
       window.dispatchEvent(new Event("resize"))
     }, 100);
-    let isMobile = Steedos.isMobile();
-    if(isMobile){
-      // 手机端移除搜索按钮上的红点
-      let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
-      crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
-    }
+    // 移除搜索按钮上的红点
+    let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+    crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
     `;
   const dataProviderInited = `
     const objectName = data.objectName;
@@ -6514,17 +6525,11 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
               || (_.isArray(n) && _.isEmpty(n.filter(function(item){return !_.isNil(item)})))
               || (_.isString(n) && n.length === 0);
           });
-          // 有过滤条件时自动展开搜索栏
+          // 有过滤条件时只显示搜索按钮上的红点，不自动展开搜索栏
           if(!_.isEmpty(omitedEmptyFormValue)){
-            let isMobile = Steedos.isMobile();
-            if(isMobile){
-              // 手机端不展开，只显示搜索按钮上的红点
-              let crudService = SteedosUI.getRef(data.$scopeId).getComponentById("service_listview_" + data.objectName)
-              crudService && crudService.setData({isFieldsFilterEmpty: false});
-            }
-            else{
-              setData({ showFieldsFilter: true });
-            }
+            let crudService = SteedosUI.getRef(data.$scopeId).getComponentById("service_listview_" + data.objectName)
+            crudService && crudService.setData({isFieldsFilterEmpty: false});
+            // setData({ showFieldsFilter: true });//自动展开搜索栏
           }
         }
       }
@@ -6790,7 +6795,10 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
                                     },
                                     {
                                       "actionType": "click",
-                                      "componentId": btnSearchId
+                                      "componentId": btnSearchId,
+                                      "args": {
+                                        "__from_fields_filter_settings_confirm": true
+                                      }
                                     },
                                     {
                                       "componentId": "",
@@ -7322,7 +7330,8 @@ const getNewListviewButtonSchema = ()=>{
                         "name":"",
                         "label":"",
                         "filters":"",
-                        "shared":false
+                        "shared":false,
+                        "object_name": "${targetObjectName}",
                       },
                       "fieldsExtend": fieldsExtend$4(),
                       "fields": fields$1(),
@@ -7369,13 +7378,11 @@ function fields$1(){
     "object_name",
     "filter_scope",
     "show_count",
-    "columns.$.field",
-    "columns.$.width",
-    "sort.$.field_name",
-    "sort.$.order",
+    "columns",
+    "sort",
     "filters",
-    "mobile_columns.$.field",
-    "searchable_fields.$.field",
+    "mobile_columns",
+    "searchable_fields",
     "is_system",
     "shared"
   ]
@@ -7388,7 +7395,8 @@ function fieldsExtend$4(){
     },
     "name": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "object_name": {
@@ -7398,37 +7406,56 @@ function fieldsExtend$4(){
     },
     "filter_scope": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "columns": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
+      }
+    },
+    "mobile_columns":{
+      "amis": {
+        "hidden": true,
+        "required": false
+      }
+    },
+    "searchable_fields":{
+      "amis": {
+        "hidden": true,
+        "required": false
       }
     },
     "filter_fields": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "scrolling_mode": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "sort": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "show_count": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "type": {
       "amis": {
-        "hidden": true
+        "hidden": true,
+        "required": false
       }
     },
     "shared": {
@@ -8251,36 +8278,38 @@ const filterForm = scope.getComponents().find(function(n){
 const filterService = filterForm.context.getComponents().find(function(n){
   return n.props.type === "service";
 });
-// filterService.setData({showFieldsFilter: !!!filterService.props.data.showFieldsFilter});
+let toShowFieldsFilter = !!!filterService.props.data.showFieldsFilter;
+filterService.setData({showFieldsFilter: toShowFieldsFilter});
 let resizeWindow = function(){
   //触发amis crud 高度重算
   setTimeout(()=>{
     window.dispatchEvent(new Event("resize"))
   }, 500);
 }
-let isMobile = Steedos.isMobile();
-if(filterService.props.data.showFieldsFilter){
-  if(isMobile){
-    // 手机上只能通过取消按钮来关闭搜索栏
-    return;
-  }
-  let buttonCancel = SteedosUI.getClosestAmisComponentByType(filterForm.context, "button", { 
-    direction: "down", 
-    name: "btn_filter_form_cancel" 
-  });
-  buttonCancel.props.dispatchEvent('click', {}).then(function(){
-    resizeWindow();
-  });
-}
-else{
-  filterService.setData({showFieldsFilter: true});
-  resizeWindow();
-  if(isMobile){
-    // 手机端在显示搜索栏时隐藏刷新按钮
-    let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
-    crudService && crudService.setData({showFieldsFilter: true});
-  }
-}
+resizeWindow();
+// 手机端在显示搜索栏时隐藏crud上的刷新按钮，因为点击后crud高度显示有问题
+let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
+// if(filterService.props.data.showFieldsFilter){
+//   if(isMobile){
+//     // 手机上只能通过取消按钮来关闭搜索栏
+//     return;
+//   }
+//   let buttonCancel = SteedosUI.getClosestAmisComponentByType(filterForm.context, "button", { 
+//     direction: "down", 
+//     name: "btn_filter_form_cancel" 
+//   });
+//   buttonCancel.props.dispatchEvent('click', {}).then(function(){
+//     resizeWindow();
+//   });
+// }
+// else{
+//   if(isMobile){
+//     // 手机端在显示搜索栏时隐藏crud上的刷新按钮，因为点击后crud高度显示有问题
+//     let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
+//     crudService && crudService.setData({showFieldsFilter: true});
+//   }
+// }
 `;
 
 
@@ -8326,7 +8355,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
         },
       },
       filterVisible ? {
-        "label": "",
+        "label": instance.t('frontend_button_search_tooltip'),
         "icon": "fa fa-search",
         "type": "button",
         "tooltip": instance.t('frontend_button_search_tooltip'),
@@ -8379,12 +8408,23 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
         "className": "bg-white p-2 rounded border-gray-300 text-gray-500"
       },
       // getExportExcelToolbarButtonSchema(),
+      getSettingListviewToolbarButtonSchema(),
+      getDisplayAsButton(showDisplayAs),
       filterVisible ? {
-        "label": "",
+        "label": instance.t('frontend_button_search_tooltip'),
         "icon": "fa fa-search",
         "tooltip": instance.t('frontend_button_search_tooltip'),
         "tooltipPlacement": "bottom",
         "type": "button",
+        "badge": {
+          "offset": [
+            -5,
+            1
+          ],
+          "size":8,
+          "animation": true,
+          "visibleOn": "${isFieldsFilterEmpty == false}"
+        },
         "align": "right",
         "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
         "onEvent": {
@@ -8397,9 +8437,7 @@ function getObjectHeaderToolbar(mainObject, formFactor, {showDisplayAs = false,
             ]
           }
         }
-      } : {},
-      getSettingListviewToolbarButtonSchema(),
-      getDisplayAsButton(showDisplayAs)
+      } : {}
       // {
       //   "type": "search-box",
       //   "align": "right",
@@ -9029,6 +9067,58 @@ async function lookupToAmisPicker(field, readonly, ctx){
             "actions": [
               {
                 "actionType": "reload"
+              },
+              {
+                "actionType": "custom",
+                "script": `
+                    const masterRecord = event.data._master?.record;
+                    const fieldConfig = ${JSON.stringify(field)};
+                    let reference_to = fieldConfig.reference_to;
+                    let saveValue;
+                    const newRecord = {
+                        _id: event.data.result.data.recordId,
+                        ...event.data.__super.__super
+                    }
+                    const saveField = fieldConfig.reference_to_field || '_id';
+                    const saveFieldValue = newRecord[saveField];
+
+                    if( fieldConfig._reference_to && (_.isArray(fieldConfig._reference_to) || _.isFunction(fieldConfig._reference_to) || fieldConfig._reference_to.startsWith('function') ) ){
+                        
+                        const fieldValue = masterRecord ? masterRecord[fieldConfig.name] : {o: reference_to, ids: []};
+                        const baseSaveValue = {
+                            o: reference_to,
+                            ids: [saveFieldValue]
+                        };
+                        if(fieldValue && fieldValue.o){
+                            if(fieldValue.o === reference_to){
+                                saveValue = fieldConfig.multiple ? { o: reference_to, ids: fieldValue.ids.concat(saveFieldValue)} : baseSaveValue;
+                            }else{
+                                saveValue = baseSaveValue;
+                            }
+                        }else{
+                            saveValue = baseSaveValue;
+                        }
+
+                    }else{
+                        if(fieldConfig.multiple){
+                            // TODO: 连续新建多个记录时，因为获取的主记录不是实时的，所以只会勾选最后一个新建的记录。
+                            const fieldValue = (masterRecord && masterRecord[fieldConfig.name]) || [];
+                            saveValue = fieldValue.concat(saveFieldValue);
+                        }else{
+                            saveValue = saveFieldValue;
+                        }
+                    }
+                    
+                    const ctx = ${JSON.stringify(ctx)};
+                    const componentId = ctx.defaults.formSchema.id ? 'service-'+ctx.defaults.formSchema.id : 'new-'+ctx.defaults.formSchema.objectApiName;
+                    doAction({
+                        actionType: 'setValue',
+                        componentId: componentId, 
+                        args: {
+                            value: { [fieldConfig.name]: saveValue  }
+                        }
+                    });
+                `
               }
             ]
           };
@@ -9259,7 +9349,7 @@ async function lookupToAmis(field, readonly, ctx){
             type: 'steedos-field-lookup',
             field,
             readonly,
-            ctx: {},
+            ctx,
         }
         // return await lookupToAmisGroup(field, readonly, ctx);
     }
@@ -9413,8 +9503,8 @@ async function getIdsPickerSchema(field, readonly, ctx){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2023-01-13 17:27:54
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2023-05-31 13:34:22
+ * @LastEditors: liaodaxue
+ * @LastEditTime: 2023-06-16 15:58:21
  * @Description: 
  */
 
@@ -9466,6 +9556,7 @@ const getHtmlFieldSchema = (field, readonly, ctx)=>{
     }else {
         return {
             "type": "input-rich-text",
+            "receiver": "${context.rootUrl}/s3/images",
             "name": field.name
         }
         // return {
@@ -12652,6 +12743,8 @@ async function getObjectForm(objectSchema, ctx){
     };
     if(formSchema.id){
       amisSchema.id = `service-${formSchema.id}`;
+    }else {
+      amisSchema.id = `new-${objectSchema.name}`;
     }
     return amisSchema;
 }
@@ -18999,7 +19092,7 @@ var PageObject = function (props) { return __awaiter(void 0, void 0, void 0, fun
                                     "type": "wrapper",
                                     "size": "none",
                                     "className": {
-                                        "p-0 flex-shrink-0 w-[388px] border-r border-gray-300 bg-gray-100 shadow lg:order-first lg:flex lg:flex-col": "${display == 'split'}",
+                                        "p-0 flex-shrink-0 min-w-[388px] w-fit border-r border-gray-300 bg-gray-100 shadow lg:order-first lg:flex lg:flex-col": "${display == 'split'}",
                                         'h-full': "${display != 'split'}",
                                     },
                                     "body": {