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

package/dist/assets.json

@@ -3,8 +3,8 @@
         {
             "package": "@steedos-widgets/sortable",
             "urls": [
-                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.13/dist/sortable.umd.js",
-                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.13/dist/sortable.umd.css"
+                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.14/dist/sortable.umd.js",
+                "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.14/dist/sortable.umd.css"
             ],
             "library": "BuilderSortable"
         }
@@ -15,10 +15,10 @@
             "npm": {
                 "package": "@steedos-widgets/sortable"
             },
-            "url": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.13/dist/meta.js",
+            "url": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.14/dist/meta.js",
             "urls": {
-                "default": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.13/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.13/dist/meta.js"
+                "default": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.14/dist/meta.js",
+                "design": "https://unpkg.com/@steedos-widgets/sortable@6.3.0-beta.14/dist/meta.js"
             }
         }
     ]

package/dist/sortable.cjs.js

@@ -54147,7 +54147,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}`;
@@ -55167,7 +55167,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;
@@ -55519,6 +55524,7 @@ async function getColumnItemOnClick(field, options){
             ...recordPage.schema.data,
             "_inDrawer": true,  // 用于判断是否在抽屉中
             "recordLoaded": false, // 重置数据加载状态
+            "recordId": `\${${options.idFieldName}}`//审批微页面依赖了作用域中的recordId
         }
     }) : {
         "type": "steedos-record-detail",
@@ -56458,16 +56464,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){
@@ -56557,17 +56553,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',
@@ -56585,8 +56570,7 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                             type: 'button',
                                             actionType: 'confirm',
                                             label: instance.t('frontend_form_save'),
-                                            primary: true,
-                                            close: `object_actions_drawer_${uiSchema.name}`
+                                            primary: true
                                         },
                                     ]
                                 }