@steedos-widgets/amis-lib 6.3.12-beta.20 → 6.3.12-beta.22

package/dist/index.esm.js

@@ -6144,7 +6144,6 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   if (!ctx) {
     ctx = {};
   }
-  console.log("getObjectFieldsFilterBarSchema===", ctx);
   const searchableFields = ctx.searchable_fields;
   const autoOpenFilter = !!ctx.auto_open_filter;
   const btnSearchId = "btn_filter_form_search_" + new Date().getTime();
@@ -6315,6 +6314,20 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
     `;
+  /**
+  给lookup字段配置filter_form_data时可以配置为amis变量，也可以配置为事态key-value键值对象值：
+  ```
+  "filter_form_data": "${selectedPublicGroupFilterFormData|toJson}"
+  ```
+  or
+  ```
+  "filter_form_data": {
+      "public_group_ids": [
+          "67addbef39f9a4503789b38d"
+      ]
+  }
+  ```
+   */
   const filterFormValues = ctx.filter_form_data;
   const dataProviderInited = `
     const searchableFields = ${JSON.stringify(searchableFields)};
@@ -11824,15 +11837,42 @@ function getLookupSapceUserTreeSchema(isMobile){
               {
                 "actionType": "custom",
                 "script": `
-                console.log("===__searchable__organizations_parents===",event.data);
+                console.log("lookup-tree-event.data:",event.data);
+                console.log("lookup-tree-event.data.value.label:",event.data.value.label);
+                console.log("lookup-tree-event.data.value.value:",event.data.value.value);
                 const scope = event.context.scoped;
-                var filterFormValues={
+                var treeFilterFormValues={
                     "__searchable__organizations_parents":event.data.value.value
                 }
-                var listView = scope.parent.getComponents().find(function(n){
-                  return n.props.type === "crud";
+                // var listView = scope.parent.getComponents().find(function(n){
+                //   return n.props.type === "crud";
+                // });
+                // listView.handleFilterSubmit(Object.assign({}, filterFormValues));
+                let __lookupField = event.data.__lookupField;
+                let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
+                var filterForm = scope.getComponents().find(function(n){
+                    return n.props.type === "form";
                 });
-                listView.handleFilterSubmit(Object.assign({}, filterFormValues));
+                let filterFormValues = filterForm.getData();
+                filterFormValues = JSON.parse(JSON.stringify(filterFormValues)); //只取当层数据域中数据，去除__super层数据
+                const changedFilterFormValues = _.pickBy(filterFormValues, function(n,k){return /^__searchable__/.test(k);});
+                Object.assign(changedFilterFormValues, treeFilterFormValues);
+                // 同步__changedFilterFormValues中的值
+                let __changedFilterFormValuesKey = "__changedFilterFormValues";
+                if(__lookupField){
+                    let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
+                    if(__lookupField.reference_to_field){
+                        lookupTag += "__" + __lookupField.reference_to_field;
+                    }
+                    __changedFilterFormValuesKey += lookupTag;
+                }
+                if(crud){
+                    let crudData = crud.getData();
+                    crudData[__changedFilterFormValuesKey] = changedFilterFormValues;
+                    crud.setData(crudData);
+                }
+                filterForm.setData(treeFilterFormValues);
+                filterForm.handleFormSubmit(event);
               `
               },
               {
@@ -12072,7 +12112,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         }
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
         ${listviewFilter && !ctx.inFilterForm ? `var filters = ${JSON.stringify(listviewFilter)};` : 'var filters = [];'}
-        var pageSize = 500;//api.data.pageSize || 10;
+        var pageSize = api.data.pageSize || 10;
         var pageNo = api.data.pageNo || 1;
         var skip = (pageNo - 1) * pageSize;
         var orderBy = api.data.orderBy || '';
@@ -12296,7 +12336,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
         return payload;
         `;
     }
-    let top = 20;
+    let top = 500;
 
     if(refObjectConfig.paging && refObjectConfig.paging.enabled === false){
         top = 1000;
@@ -12340,7 +12380,6 @@ async function lookupToAmisPicker(field, readonly, ctx){
         }
         pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar(refObjectConfig,ctx.formFactor,{isLookup: true});
         if (ctx.filterVisible !== false) {
-            console.log("lookupToAmisPicker===pickerSchema.filter===field===", field);
             pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
                 ...ctx,
                 isLookup: true,