@steedos-widgets/amis-lib 3.6.0-beta.6 → 3.6.0-beta.9

package/dist/index.cjs.js

@@ -1670,7 +1670,6 @@ async function getQuickEditSchema(field, options){
                         {
                             "actionType": "custom",
                             "script": `
-
                                     var _display = _.cloneDeep(event.data._display);
                                     ${displayField}
                                     doAction({actionType: 'setValue', "args": {"value": {_display}},componentId: "${quickEditId}"});
@@ -1841,6 +1840,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,
@@ -2604,6 +2620,14 @@ async function getTableSchema$1(fields, options){
         
     }
 
+    const treeConfig = {};
+
+    if(options.enable_tree){
+        treeConfig.expandConfig = {
+            expand: 'first'
+        };
+    }
+
     return {
         mode: "table",
         perPageAvailable: [5, 10, 20, 50, 100, 500],
@@ -2619,6 +2643,7 @@ async function getTableSchema$1(fields, options){
         labelTpl: `\${${options.labelFieldName}}`,
         autoFillHeight: false, // 自动高度效果不理想,先关闭
         columnsTogglable: false,
+        ...treeConfig
     }
 }
 
@@ -2935,17 +2960,6 @@ async function getTableApi(mainObject, fields, options){
             payload.data.rows = getTreeOptions(records,{"valueField":"_id"});
             assignIndexToTreeRecords(payload.data.rows, '');
         }
-        try{
-            setTimeout(() => {
-                let expandBtn = $('.steedos-object-listview-content .antd-Table-content .antd-Table-table thead .antd-Table-expandBtn');
-                if(expandBtn && expandBtn.length > 0 && !expandBtn.hasClass("is-active")){
-                    expandBtn[0].click();
-                }
-            }, 600);
-        }
-        catch(ex){
-            console.error("tree数据格式展开异常：", ex);
-        }
     }
 
 
@@ -5773,12 +5787,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";
     });
@@ -5880,9 +5898,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");
@@ -6039,9 +6064,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 {
@@ -6536,7 +6567,10 @@ async function getObjectRecordDetailHeader(objectSchema, recordId, options) {
                     "@history_paths.changed": {
                         "actions": [
                             {
-                                "actionType": "reload"
+                                "actionType": "reload",
+                                // amis 3.6需要传入data来触发下面的window:historyPaths重新计算，此问题随机偶发，加上data后正常
+                                "data": {
+                                }
                             }
                         ]
                     }
@@ -7744,13 +7778,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});
@@ -8114,12 +8151,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;
@@ -8468,7 +8509,24 @@ async function getObjectCRUD(objectSchema, fields, options){
       id: `service_${id}`,
       name: `page`,
       data: options.amisData,
-      body: body
+      body: body,
+      //监听广播事件，重算crud高度
+      onEvent: {
+        [`@height.changed.${objectSchema.name}`]: {
+          "actions": [
+            {
+              "actionType": "custom",
+              "script": `
+                var crudScoped = event.context.scoped.getComponentById('${body.id}');
+                var timeOut = event.data.timeOut || 500;
+                setTimeout(()=>{
+                  crudScoped && crudScoped.control.updateAutoFillHeight();
+                }, timeOut);
+              `
+            }
+          ]
+        }
+      }
     }
 }
 
@@ -10764,14 +10822,6 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         });
         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;
     `;
@@ -10798,6 +10848,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             labelFieldName,
             top:  top,
             isLookup: true,
+            enable_tree: refObjectConfig.enable_tree,
             ...ctx
         });
 
@@ -11216,18 +11267,28 @@ 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(typeof refLookupPage == 'string'){
+            refLookupPage = JSON.parse(refLookupPage);
+        }
+        // Object.assign(amisSchema, refLookupPage);
+        // amisSchema = _.defaultsDeep({}, refLookupPage, amisSchema);
     }
+    return amisSchema;
 }
 
 async function lookupToAmisSelectUser(field, readonly, ctx){