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

package/dist/sortable.umd.js

@@ -21287,7 +21287,6 @@
                             {
                                 "actionType": "custom",
                                 "script": `
-
                                     var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
@@ -21458,6 +21457,23 @@
                     "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,
@@ -22221,6 +22237,14 @@
             
         }
 
+        const treeConfig = {};
+
+        if(options.enable_tree){
+            treeConfig.expandConfig = {
+                expand: 'first'
+            };
+        }
+
         return {
             mode: "table",
             perPageAvailable: [5, 10, 20, 50, 100, 500],
@@ -22236,6 +22260,7 @@
             labelTpl: `\${${options.labelFieldName}}`,
             autoFillHeight: false, // 自动高度效果不理想,先关闭
             columnsTogglable: false,
+            ...treeConfig
         }
     }
 
@@ -22700,12 +22725,16 @@
     // }
     // 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";
     });
@@ -22807,9 +22836,16 @@
     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");
@@ -22966,9 +23002,15 @@
       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 {
@@ -24210,13 +24252,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});
@@ -24580,12 +24625,16 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       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;
@@ -25647,14 +25696,6 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
         });
         payload.data.rows = treeRecords;
-        try{
-            setTimeout(() => {
-                $('.amis-dialog-widget.antd-Modal .antd-Table-content .antd-Table-table thead .antd-Table-expandBtn')[0]?.click();
-            }, 600);
-        }
-        catch(ex){
-            console.error("tree数据格式展开异常：", ex);
-        }
     }
     return payload;
     `;
@@ -25681,6 +25722,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 labelFieldName,
                 top:  top,
                 isLookup: true,
+                enable_tree: refObjectConfig.enable_tree,
                 ...ctx
             });
 
@@ -26099,18 +26141,28 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
                 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(typeof refLookupPage == 'string'){
+                refLookupPage = JSON.parse(refLookupPage);
+            }
+            // Object.assign(amisSchema, refLookupPage);
+            // amisSchema = _.defaultsDeep({}, refLookupPage, amisSchema);
         }
+        return amisSchema;
     }
 
     async function lookupToAmisIdsPicker(field, readonly, ctx){

package/package.json

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