@steedos-widgets/amis-lib 6.3.0-beta.13 → 6.3.0-beta.15

package/dist/index.esm.js

@@ -572,7 +572,7 @@ function getNameTpl(field, ctx){
     }
     let nameLabel = field.name;
     //若字段类型是lookup，则按照相关表tpl的label规则显示；若是其它类型，则显示_display或字段本身的值
-    if (field.type == "lookup") {
+    if (field.type == "lookup" || field.type == "master_detail") {
         if(!field.reference_to && (field.optionsFunction || field._optionsFunction || field.options)){
             if(!field.isTableField){
                 nameLabel = `\${${field.name}__label}`;
@@ -1359,6 +1359,7 @@ var frontend_setup$1 = "Setup";
 var frontend_notifications$1 = "Notifications";
 var frontend_notifications_allread$1 = "Mark all as read";
 var frontend_notifications_allread_message$1 = "All marked as read";
+var frontend_notifications_close_dialog$1 = "Close";
 var frontend_profile$1 = "Profile";
 var switch_space$1 = "Switch Space";
 var frontend_about$1 = "About";
@@ -1448,6 +1449,7 @@ var en_us = {
 	frontend_notifications: frontend_notifications$1,
 	frontend_notifications_allread: frontend_notifications_allread$1,
 	frontend_notifications_allread_message: frontend_notifications_allread_message$1,
+	frontend_notifications_close_dialog: frontend_notifications_close_dialog$1,
 	frontend_profile: frontend_profile$1,
 	switch_space: switch_space$1,
 	frontend_about: frontend_about$1,
@@ -1539,6 +1541,7 @@ var frontend_setup = "设置";
 var frontend_notifications = "通知";
 var frontend_notifications_allread = "全部标记为已读";
 var frontend_notifications_allread_message = "已全部标记为已读";
+var frontend_notifications_close_dialog = "关闭";
 var frontend_profile = "个人资料";
 var switch_space = "切换工作区";
 var frontend_about = "关于";
@@ -1629,6 +1632,7 @@ var zh_cn = {
 	frontend_notifications: frontend_notifications,
 	frontend_notifications_allread: frontend_notifications_allread,
 	frontend_notifications_allread_message: frontend_notifications_allread_message,
+	frontend_notifications_close_dialog: frontend_notifications_close_dialog,
 	frontend_profile: frontend_profile,
 	switch_space: switch_space,
 	frontend_about: frontend_about,
@@ -1824,7 +1828,12 @@ async function getQuickEditSchema(object, columnField, options){
                     break;
                 case "percent":
                     TempDisplayField = `
-                            _display["${field.name}"] = event.data.value.toFixed(${field.scale}) + '%';
+                            if(event.data.value){
+                                _display["${field.name}"] = event.data.value.toFixed(${field.scale}) + '%';
+                            } else {
+                                _display["${field.name}"] = event.data.value;
+                            }
+                            
                         `;
                     quickEditSchema.body[0].onEvent["change"] = quickEditOnEvent(TempDisplayField);
                     break;
@@ -2176,6 +2185,7 @@ async function getColumnItemOnClick(field, options){
             ...recordPage.schema.data,
             "_inDrawer": true,  // 用于判断是否在抽屉中
             "recordLoaded": false, // 重置数据加载状态
+            "recordId": `\${${options.idFieldName}}`//审批微页面依赖了作用域中的recordId
         }
     }) : {
         "type": "steedos-record-detail",
@@ -3318,7 +3328,7 @@ function getReadonlyFormAdaptor(object, fields, options){
     var fieldNames = _$1.map(fields, function(n){return n.name});
     var nameField = object.fields[object.NAME_FIELD_KEY];
     let nameLabel = nameField && nameField.name;
-    if (nameField && nameField.type == "lookup") {
+    if (nameField && (nameField.type == "lookup" || nameField.type == "master_detail")) {
         if(!nameField.reference_to && (nameField.optionsFunction || nameField._optionsFunction || nameField.options)){
             if(!nameField.isTableField){
                 nameLabel = `record.${nameField.name}__label`;
@@ -4710,16 +4720,6 @@ const getSchema$5 = async (uiSchema, ctx) => {
             data: formSchema
         };
     `;
-    const onDialogCancelScript = `
-        // 这里加setTimeout是因为amis的Bug，它会先触发cancel事件执行此脚本关闭父窗口然后再关闭子窗口
-        // 正确的顺序应该是先关闭子窗口再关闭父窗口，顺序错了会造成第二次点击新建按钮的时候异常
-        setTimeout(function(){
-            doAction({
-                "actionType": "cancel",
-                "componentId": "object_actions_drawer_${uiSchema.name}"
-            });
-        }, 200);
-    `;
     const getSelectedRowsScript = `
         const isLookup = event.data.isLookup;
         if(isLookup){
@@ -4809,17 +4809,6 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                     "closeOnEsc": false,
                                     "closeOnOutside": false,
                                     "size": "lg",
-                                    "onEvent": {
-                                        "cancel": {
-                                            "actions": [
-                                                {
-                                                    "actionType": "custom",
-                                                    "script": onDialogCancelScript,
-                                                    "expression": "${window:innerWidth < 768}",
-                                                }
-                                            ]
-                                        }
-                                    },
                                     "actions": [
                                         {
                                             type: 'button',
@@ -4837,8 +4826,7 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                             type: 'button',
                                             actionType: 'confirm',
                                             label: i18next.t('frontend_form_save'),
-                                            primary: true,
-                                            close: `object_actions_drawer_${uiSchema.name}`
+                                            primary: true
                                         },
                                     ]
                                 }
@@ -4890,16 +4878,6 @@ const getSchema$4 = async (uiSchema, ctx) => {
       : page.schema;
   }
   
-  const onDialogCancelScript = `
-    // 这里加setTimeout是因为amis的Bug，它会先触发cancel事件执行此脚本关闭父窗口然后再关闭子窗口
-    // 正确的顺序应该是先关闭子窗口再关闭父窗口，顺序错了会造成第二次点击编辑按钮的时候异常
-    setTimeout(function(){
-      doAction({
-        "actionType": "cancel",
-        "componentId": "object_actions_drawer_${uiSchema.name}"
-      });
-    }, 200);
-  `;
 
   return {
     type: "service",
@@ -4929,17 +4907,6 @@ const getSchema$4 = async (uiSchema, ctx) => {
                     "_master.relatedKey": "${relatedKey}"
                   },
                   size: "lg",
-                  "onEvent": {
-                    "cancel": {
-                      "actions": [
-                        {
-                          "actionType": "custom",
-                          "script": onDialogCancelScript,
-                          "expression": "${window:innerWidth < 768}",
-                        }
-                      ]
-                    }
-                  },
                   "actions": [
                     {
                         type: 'button',
@@ -4950,8 +4917,7 @@ const getSchema$4 = async (uiSchema, ctx) => {
                         type: 'button',
                         actionType: 'confirm',
                         label: i18next.t('frontend_form_save'),
-                        primary: true,
-                        close: `object_actions_drawer_${uiSchema.name}`
+                        primary: true
                     },
                   ]
                 },
@@ -5035,8 +5001,7 @@ const getSchema$3 = (uiSchema)=>{
                             }
                           ]
                     }
-                },
-                "close": `object_actions_drawer_${uiSchema.name}`
+                }
             }
         ],
         "regions": [
@@ -5734,6 +5699,105 @@ const getObjectDetailHeaderButtons = (objectSchema, recordId)=>{
     };
 };
 
+const getDropdown = (dropdownButtons)=>{
+    const dropdown = {
+        "type": "dropdown-button",
+        "icon": "fa fa-angle-down",
+        "size": "sm",
+        "hideCaret": true,
+        "className": "mr-0 steedos-mobile-header-drop-down",
+        "closeOnClick": true,
+        "menuClassName": "buttons-drawer fixed inset-0 bg-none border-0 shadow-none",
+        "align": "right",
+        "body": [
+            {
+                "type": "action",
+                "style": {
+                    "position": "fixed",
+                    "top": 0,
+                    "right": 0,
+                    "bottom": 0,
+                    "left": 0,
+                    "z-index": 1,
+                    "background": "var(--Drawer-overlay-bg)",
+                    "height": "unset",
+                    "width": "unset",
+                    "padding": "0",
+                    "margin": "0",
+                    "border-radius": "0"
+                }
+            },
+            {
+                "type": "wrapper",
+                "style": {
+                    "position": "fixed",
+                    "bottom": 0,
+                    "z-index": 2,
+                    "width": "100vw",
+                    "left": "0",
+                    "padding": "0",
+                    "background": "white",
+                    "box-shadow": "0 -10px 10px -10px rgba(0, 0, 0, 0.2)"
+                },
+                "body": [
+                    {
+                        "type": "flex",
+                        "justify": "space-between",
+                        "items": [
+                            {
+                                "type": "tpl",
+                                "tpl": "操作",
+                                "style": {
+                                    "padding": "4px 12px",
+                                    "align-items": "center",
+                                    "display": "flex"
+                                }
+                            },
+                            {
+                                "type": "action",
+                                "label": "",
+                                "icon": "fa fa-times",
+                                "level": "link",
+                                "style": {
+                                    "color": "black"
+                                },
+                            }
+                        ],
+                        "style": {
+                            "padding-top": "0.5rem",
+                            "padding-bottom": "0.5rem",
+                            "border-bottom": "var(--Drawer-content-borderWidth) solid var(--Drawer-header-borderColor)"
+                        }
+                    },
+                    {
+                        "type": "wrapper",
+                        "body": [
+                            {
+                                "type": "button-group",
+                                "id": "u:fd837823be5b",
+                                "vertical": true,
+                                "tiled": true,
+                                "buttons": dropdownButtons,
+                                "className": "w-full overflow-auto",
+                                "btnClassName": "w-full",
+                                "size": "lg"
+                            }
+                        ],
+                        "style": {
+                            "padding": "0",
+                            "overflow": "auto",
+                            "max-height": "70vh"
+                        }
+                    }
+
+                ]
+            }
+        ]
+    };
+
+    return dropdown;
+};
+
 const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
     const { buttons, moreButtons, moreButtonsVisibleOn } = getObjectDetailHeaderButtons(objectSchema, recordId);
     if(ctx.formFactor === 'SMALL'){
@@ -5757,46 +5821,7 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
             }
         });
 
-        return [
-            {
-                "type": "button",
-                "icon": "fa fa-angle-down",
-                "visibleOn": phoneMoreButtonsVisibleOn,
-                "onEvent": {
-                  "click": {
-                    "actions": [
-                      {
-                        "actionType": "drawer",
-                        "drawer": {
-                          "type": "drawer",
-                          "title": i18next.t('frontend_operation'),
-                          "id": "object_actions_drawer_" + objectSchema.name,
-                          "body": [
-                            {
-                              "type": "button-group",
-                              "id": "u:fd837823be5b",
-                              "vertical": true,
-                              "tiled": true,
-                              "buttons": dropdownButtons,
-                              "btnLevel": "enhance",
-                              "className": "w-full",
-                              "btnClassName": "w-full",
-                              "size": "lg"
-                            }
-                          ],
-                          "position": "bottom",
-                          "closeOnOutside": true,
-                          "resizable": false,
-                          "className": "buttons-drawer",
-                          "bodyClassName": "m-none p-none",
-                          "actions": []
-                        }
-                      }
-                    ]
-                  }
-                }
-              }
-        ]
+        return [getDropdown(dropdownButtons)];
     }else {
         if(moreButtons.length > 0){
             const dropdownButtonsSchema = {
@@ -5817,54 +5842,16 @@ const getObjectDetailButtonsSchemas = (objectSchema, recordId, ctx)=>{
 const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
     const buttons = getListViewButtons(objectSchema, ctx);
     if(ctx.formFactor === 'SMALL'){
-        return {
-            "type": "button",
-            "icon": "fa fa-angle-down",
-            "className": "mr-0",
-            "onEvent": {
-              "click": {
-                "actions": [
-                  {
-                    "actionType": "drawer",
-                    "drawer": {
-                      "type": "drawer",
-                      "title": i18next.t('frontend_operation'),
-                      "id": "object_actions_drawer_" + objectSchema.name,
-                      "body": [
-                        {
-                          "type": "button-group",
-                          "id": "u:fd837823be5b",
-                          "vertical": true,
-                          "tiled": true,
-                          "buttons": [
-                            ..._$1.map(buttons, (button)=>{
-                                return {
-                                    type: 'steedos-object-button',
-                                    name: button.name,
-                                    objectName: button.objectName,
-                                    visibleOn: getButtonVisibleOn(button),
-                                    className: `button_${button.name} w-full`
-                                }
-                            })
-                          ],
-                          "btnLevel": "enhance",
-                          "className": "w-full",
-                          "btnClassName": "w-full",
-                          "size": "lg"
-                        }
-                      ],
-                      "position": "bottom",
-                      "closeOnOutside": true,
-                      "resizable": false,
-                      "className": "buttons-drawer",
-                      "bodyClassName": "m-none p-none",
-                      "actions": []
-                    }
-                  }
-                ]
-              }
+        const dropdownButtons = _$1.map(buttons, (button)=>{
+            return {
+                type: 'steedos-object-button',
+                name: button.name,
+                objectName: button.objectName,
+                visibleOn: getButtonVisibleOn(button),
+                className: `button_${button.name} w-full`
             }
-          }
+        });
+        return getDropdown(dropdownButtons);
     }else {
         return _$1.map(buttons, (button) => {
             return {
@@ -5881,55 +5868,19 @@ const getObjectListViewButtonsSchemas = (objectSchema, ctx)=>{
 const getObjectRecordDetailRelatedListButtonsSchemas = (objectSchema, ctx)=>{
     const buttons = getObjectRelatedListButtons(objectSchema, ctx);
     if(ctx.formFactor === 'SMALL'){
-        return {
-            "type": "button",
-            "icon": "fa fa-angle-down",
-            "onEvent": {
-              "click": {
-                "actions": [
-                  {
-                    "actionType": "drawer",
-                    "drawer": {
-                      "type": "drawer",
-                      "title": i18next.t('frontend_operation'),
-                      "id": "object_actions_drawer_" + objectSchema.name,
-                      "body": [
-                        {
-                          "type": "button-group",
-                          "vertical": true,
-                          "tiled": true,
-                          "buttons": [
-                            ..._$1.map(buttons, (button)=>{
-                                return {
-                                    type: 'steedos-object-button',
-                                    name: button.name,
-                                    objectName: button.objectName,
-                                    visibleOn: getButtonVisibleOn(button),
-                                    className: `button_${button.name} w-full`
-                                }
-                            })
-                          ],
-                          "btnLevel": "enhance",
-                          "className": "w-full",
-                          "btnClassName": "w-full",
-                          "size": "lg"
-                        }
-                      ],
-                      "position": "bottom",
-                      "closeOnOutside": true,
-                      "resizable": false,
-                      "className": "buttons-drawer",
-                      "bodyClassName": "m-none p-none",
-                      "actions": []
-                    }
-                  }
-                ]
-              }
+        const dropdownButtons = _$1.map(buttons, (button)=>{
+            return {
+                type: 'steedos-object-button',
+                name: button.name,
+                objectName: button.objectName,
+                visibleOn: getButtonVisibleOn(button),
+                className: `button_${button.name} w-full`
             }
-          }
+        });
+        return [getDropdown(dropdownButtons)];
     }else {
         return _$1.map(buttons, (button) => {
-            return {
+            return {                                                                                                                                                                                                                                                                                                                                                                    
                 type: 'steedos-object-button',
                 name: button.name,
                 objectName: button.objectName,
@@ -10354,7 +10305,7 @@ async function getRecordDetailSchema(objectName, appId, props = {}){
     };
     const content = {
         "type": "tabs",
-        "className": "steedos-record-tabs bg-white p-4 m-2 border rounded",
+        "className": "steedos-record-tabs bg-white p-4 sm:m-2 sm:border sm:rounded",
         "contentClassName": "bg-none",
         "tabs": [
             detailed