@steedos-widgets/sortable 6.3.0-beta.13 → 6.3.0-beta.15

package/dist/sortable.umd.js

@@ -20448,7 +20448,7 @@
         }
         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}`;
@@ -21003,6 +21003,7 @@
     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";
@@ -21092,6 +21093,7 @@
     	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,
@@ -21183,6 +21185,7 @@
     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 = "关于";
@@ -21273,6 +21276,7 @@
     	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,
@@ -21468,7 +21472,12 @@
                         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;
@@ -21820,6 +21829,7 @@
                 ...recordPage.schema.data,
                 "_inDrawer": true,  // 用于判断是否在抽屉中
                 "recordLoaded": false, // 重置数据加载状态
+                "recordId": `\${${options.idFieldName}}`//审批微页面依赖了作用域中的recordId
             }
         }) : {
             "type": "steedos-record-detail",
@@ -22758,16 +22768,6 @@
         return {
             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;
@@ -22858,17 +22858,6 @@
                                         "closeOnEsc": false,
                                         "closeOnOutside": false,
                                         "size": "lg",
-                                        "onEvent": {
-                                            "cancel": {
-                                                "actions": [
-                                                    {
-                                                        "actionType": "custom",
-                                                        "script": onDialogCancelScript,
-                                                        "expression": "${window:innerWidth < 768}",
-                                                    }
-                                                ]
-                                            }
-                                        },
                                         "actions": [
                                             {
                                                 type: 'button',
@@ -22886,8 +22875,7 @@
                                                 type: 'button',
                                                 actionType: 'confirm',
                                                 label: instance.t('frontend_form_save'),
-                                                primary: true,
-                                                close: `object_actions_drawer_${uiSchema.name}`
+                                                primary: true
                                             },
                                         ]
                                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "6.3.0-beta.13",
+  "version": "6.3.0-beta.15",
   "main": "dist/sortable.cjs.js",
   "module": "dist/sortable.esm.js",
   "unpkg": "dist/sortable.umd.js",
@@ -45,7 +45,7 @@
   "dependencies": {
     "@dnd-kit/core": "^6.0.5",
     "@dnd-kit/sortable": "^7.0.1",
-    "@steedos-widgets/amis-lib": "6.3.0-beta.13"
+    "@steedos-widgets/amis-lib": "6.3.0-beta.15"
   },
-  "gitHead": "9c91a4fcaec8a9a5399a98e4217c8230067f294f"
+  "gitHead": "2814297d85c3ef6567fb501ada86fb28edb92b9d"
 }