@steedos-widgets/sortable 3.6.0-beta.7 → 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.7/dist/sortable.umd.js",
-                "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.7/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.7/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.7/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/sortable@3.6.0-beta.7/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});
                             }
                         `
@@ -54986,7 +54986,6 @@ async function getQuickEditSchema(field, options){
                         {
                             "actionType": "custom",
                             "script": `
-
                                     var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
@@ -55157,6 +55156,23 @@ async function getQuickEditSchema(field, options){
                 "onEvent":{
                     "init":{
                         "actions":[
+                            //amis3.6无法从数据域中直接拿到正确的selectitems，需要通过crud组件的getSelected()函数获取
+                            {
+                                "actionType": "custom",
+                                "script": `
+                                    crudScoped = event.context.scoped.getComponentById('${options.crudId}');
+                                    const selectedItems = crudScoped && crudScoped.control.getSelected();
+                                    doAction({
+                                        "componentId": "${quickEditId}",
+                                        "actionType": "setValue",
+                                        "args": {
+                                            "value": {
+                                                selectedItems
+                                            }
+                                        }
+                                    });
+                                `
+                            },
                             {
                                 "actionType": "setValue",
                                 "componentId": quickEditId,
@@ -56408,12 +56424,16 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     // }
     // listView.handleFilterSubmit(Object.assign({}, removedValues, filterFormValues));
     // 点击搜索的时候自动收起搜索栏
-    let resizeWindow = function(){
-      //触发amis crud 高度重算
-      setTimeout(()=>{
-        window.dispatchEvent(new Event("resize"))
-      }, 500);
-    }
+    //触发amis crud 高度重算
+    doAction({
+      "actionType": "broadcast",
+      "args": {
+        "eventName": "@height.changed.${objectSchema.name}"
+      },
+      "data": {
+        "timeOut": 500
+      }
+    });
     const filterService = filterForm.context.getComponents().find(function(n){
       return n.props.type === "service";
     });
@@ -56515,9 +56535,16 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     let filterFormService = SteedosUI.getClosestAmisComponentByType(filterForm.context, "service");
     filterFormService.setData({showFieldsFilter: !!!filterFormService.props.data.showFieldsFilter});
     //触发amis crud 高度重算
-    setTimeout(()=>{
-      window.dispatchEvent(new Event("resize"))
-    }, 100);
+    doAction({
+      "actionType": "broadcast",
+      "args": {
+        "eventName": "@height.changed.${objectSchema.name}"
+      },
+      "data": {
+        "timeOut": 100
+      }
+    });
+    
     // 移除搜索按钮上的红点
     // let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
     let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
@@ -56674,9 +56701,15 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       sessionStorage.setItem(listViewPropsStoreKey, JSON.stringify(localListViewProps));
     }
     //触发amis crud 高度重算
-    setTimeout(()=>{
-      window.dispatchEvent(new Event("resize"))
-    }, 100)
+    doAction({
+      "actionType": "broadcast",
+      "args": {
+        "eventName": "@height.changed.${objectSchema.name}"
+      },
+      "data": {
+        "timeOut": 100
+      }
+    });
     // ===END===
   `;
   return {
@@ -57918,13 +57951,16 @@ const filterService = filterForm.context.getComponents().find(function(n){
 });
 let toShowFieldsFilter = !!!filterService.props.data.showFieldsFilter;
 filterService.setData({showFieldsFilter: toShowFieldsFilter});
-let resizeWindow = function(){
-  //触发amis crud 高度重算
-  setTimeout(()=>{
-    window.dispatchEvent(new Event("resize"))
-  }, 1000);
-}
-resizeWindow();
+//触发amis crud 高度重算
+doAction({
+  "actionType": "broadcast",
+  "args": {
+    "eventName": "@height.changed." + event.data.objectName
+  },
+  "data": {
+    "timeOut": 1000
+  }
+});
 // 手机端在显示搜索栏时隐藏crud上的刷新按钮，因为点击后crud高度显示有问题
 let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
 crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
@@ -58288,12 +58324,16 @@ async function getObjectFilter(objectSchema, fields, options) {
       return;
     }
     // 列表搜索栏字段值变更后立刻触发提交表单执行crud搜索，所以这里需要额外重算crud高度及筛选按钮红色星号图标显示隐藏
-    let resizeWindow = function(){
-      //触发amis crud 高度重算
-      setTimeout(()=>{
-        window.dispatchEvent(new Event("resize"))
-      }, 1000);
-    }
+    //触发amis crud 高度重算
+    doAction({
+      "actionType": "broadcast",
+      "args": {
+        "eventName": "@height.changed.${objectSchema.name}"
+      },
+      "data": {
+        "timeOut": 1000
+      }
+    });
     resizeWindow();
     const scope = event.context.scoped;
     // let filterFormValues = event.data;
@@ -58958,6 +58998,8 @@ function getLookupSapceUserTreeSchema(isMobile){
             _.each(children, (item) => {
                 if (item.children) {
                     item.children = getChildren(records, item.children)
+                }else{
+                    item.children = [];
                 }
             })
             return children;
@@ -59312,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){
@@ -59343,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;
@@ -59397,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";
@@ -59800,18 +59852,30 @@ async function lookupToAmis(field, readonly, ctx){
             enableEnhancedLookup = true;
         }
     }
+    let amisSchema;
     // 默认使用下拉框模式显示lookup选项，只能配置了enable_enhanced_lookup才使用弹出增强模式
     if(enableEnhancedLookup == true){
-        return await lookupToAmisPicker(field, readonly, ctx);
+        amisSchema = await lookupToAmisPicker(field, readonly, ctx);
     }else if(refObject.enable_tree) {
-        return await lookupToAmisTreeSelect(field, readonly, Object.assign({}, ctx, {
+        amisSchema = await lookupToAmisTreeSelect(field, readonly, Object.assign({}, ctx, {
             labelField: referenceTo.labelField?.name || 'name',
             valueField: referenceTo.valueField?.name || '_id',
             objectName: referenceTo.objectName
         }));
     }else {
-        return await lookupToAmisSelect(field, readonly, ctx);
+        amisSchema = await lookupToAmisSelect(field, readonly, ctx);
     }
+    let refLookupPage = refObject.pages && refObject.pages.lookup;
+    if(refLookupPage){
+        if(refLookupPage.is_enable){
+            let pageAmisSchema = refLookupPage.amis_schema;
+            if(typeof pageAmisSchema == 'string'){
+                pageAmisSchema = JSON.parse(pageAmisSchema);
+            }
+            amisSchema = lodash.exports.defaultsDeep({}, pageAmisSchema, amisSchema);
+        }
+    }
+    return amisSchema;
 }
 
 async function lookupToAmisIdsPicker(field, readonly, ctx){
@@ -60449,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;
                     },
@@ -60683,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`;