@steedos-widgets/sortable 3.6.0-beta.9 → 3.6.1

package/dist/assets.json

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

package/dist/sortable.cjs.js

@@ -54952,11 +54952,11 @@ async function getQuickEditSchema(field, options){
                             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});
                             }
                         `
@@ -58998,6 +58998,8 @@ function getLookupSapceUserTreeSchema(isMobile){
             _.each(children, (item) => {
                 if (item.children) {
                     item.children = getChildren(records, item.children)
+                }else{
+                    item.children = [];
                 }
             })
             return children;
@@ -59352,6 +59354,14 @@ async function lookupToAmisPicker(field, readonly, ctx){
         })
         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){
@@ -59383,6 +59393,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
             _.each(children, (item)=>{
                 if(item.children){
                     item.children = getChildren(records, item.children)
+                }else{
+                    item.children = [];
                 }
             })
             return children;
@@ -59437,7 +59449,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         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";
@@ -59855,11 +59867,13 @@ async function lookupToAmis(field, readonly, ctx){
     }
     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;
 }
@@ -60499,7 +60513,8 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     },
                     pipeOut: (value, oldValue, data) => {
                         if(value){
-                            return value/100;
+                            const result = value/100;
+                            return Number(result.toFixed(field.scale+2));
                         }
                         return value;
                     },
@@ -60733,7 +60748,7 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
         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`;