@steedos-widgets/sortable 3.6.0-beta.9 → 3.6.2-beta.1

package/dist/sortable.umd.js

@@ -21248,16 +21248,17 @@
                         {
                             actionType: "custom",
                             script: `
+                            console.log("asdasd");
                             let items = _.cloneDeep(event.data.items);
                             let selectedItems = _.cloneDeep(event.data.selectedItems);
                             if(event.data.isBatchEdit){
                                 selectedItems.forEach(function(selectedItem){
                                     selectedItem._display.${field.name} = event.data._display.${field.name};
-                                    doAction({actionType: 'setValue', "args": {"value": selectedItem._display},componentId: "_display_" + selectedItem._index});
+                                    doAction({actionType: 'setValue', "args": {"value": selectedItem._display},componentId: "${options.objectName}" + "_display_" + selectedItem._index});
                                     doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + selectedItem._index});
                                 })
                             }else{
-                                doAction({actionType: 'setValue', "args": {"value": event.data._display},componentId: "_display_" + event.data._index});
+                                doAction({actionType: 'setValue', "args": {"value": event.data._display},componentId: "${options.objectName}" + "_display_" + event.data._index});
                                 doAction({actionType: 'setValue', "args": {"value": event.data.${field.name}},componentId: "${options.objectName + "_" + field.name + "_"}" + event.data._index});
                             }
                         `
@@ -25299,6 +25300,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             _.each(children, (item) => {
                 if (item.children) {
                     item.children = getChildren(records, item.children)
+                }else{
+                    item.children = [];
                 }
             })
             return children;
@@ -25653,6 +25656,14 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         })
         payload.data.rows = rows;
         */
+        if(enable_tree){
+            const rows = _.map(payload.data.rows, (item)=>{
+                delete item.children;
+                delete item.parent;
+                return item;
+            })
+            payload.data.rows = rows;
+        }
         return payload;
     }
     if(!payload.data.rows){
@@ -25684,6 +25695,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             _.each(children, (item)=>{
                 if(item.children){
                     item.children = getChildren(records, item.children)
+                }else{
+                    item.children = [];
                 }
             })
             return children;
@@ -25738,7 +25751,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             const isAllowCreate = refObjectConfig.permissions.allowCreate;
             const isCreate = lodash.exports.isBoolean(field.create) ? field.create : true;
             // lookup字段配置过滤条件就强制不显示新建按钮
-            let isHasFilters = (field.filters || field._filtersFunction) ? true : false;
+            let isHasFilters = (field.filters || field.filtersFunction || field._filtersFunction) ? true : false;
             if (isAllowCreate && isCreate && !isHasFilters) {
                 const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
                 new_button.align = "right";
@@ -26156,11 +26169,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         }
         let refLookupPage = refObject.pages && refObject.pages.lookup;
         if(refLookupPage){
-            if(typeof refLookupPage == 'string'){
-                refLookupPage = JSON.parse(refLookupPage);
+            if(refLookupPage.is_enable){
+                let pageAmisSchema = refLookupPage.amis_schema;
+                if(typeof pageAmisSchema == 'string'){
+                    pageAmisSchema = JSON.parse(pageAmisSchema);
+                }
+                amisSchema = lodash.exports.defaultsDeep({}, pageAmisSchema, amisSchema);
             }
-            // Object.assign(amisSchema, refLookupPage);
-            // amisSchema = _.defaultsDeep({}, refLookupPage, amisSchema);
         }
         return amisSchema;
     }
@@ -26800,7 +26815,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                         },
                         pipeOut: (value, oldValue, data) => {
                             if(value){
-                                return value/100;
+                                const result = value/100;
+                                return Number(result.toFixed(field.scale+2));
                             }
                             return value;
                         },
@@ -27034,7 +27050,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             if(field.is_wide || convertData.type === 'group'){
                 convertData.className = 'col-span-2 m-0';
             }else {
-                convertData.className = 'm-0';
+                convertData.className = 'm-1';
             }
             if(readonly){
                 convertData.className = `${convertData.className} border-b`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos-widgets/sortable",
-  "version": "3.6.0-beta.9",
+  "version": "3.6.2-beta.1",
   "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": "3.6.0-beta.9"
+    "@steedos-widgets/amis-lib": "3.6.2-beta.1"
   },
-  "gitHead": "a47b50fa1c03832ad0814bc769193e445ef9f30a"
+  "gitHead": "51749ac2fcf83301fa5cd22d3116dd1702bc5ef3"
 }