@steedos-widgets/amis-lib 6.3.12-beta.13 → 6.3.12-beta.14

package/dist/index.esm.js

@@ -1868,7 +1868,6 @@ async function getQuickEditSchema(object, columnField, options){
                     {
                         actionType: "custom",
                         script: `
-                            console.log("asdasd");
                             let items = _.cloneDeep(event.data.items);
                             let selectedItems = _.cloneDeep(event.data.selectedItems);
                             if(event.data.isBatchEdit){
@@ -3409,6 +3408,11 @@ async function getTableApi(mainObject, fields, options){
             }, 600);
         }
     }
+
+    // 列表搜索和快速搜索，有时在某些操作情况下还是会造成crud接口请求使用的过滤条件是上次的，这里强制把正确的过滤条件返回到crud，详细规则见：https://github.com/steedos/steedos-platform/issues/7112
+    // lookup字段的弹出列表搜索不受这里影响，因为lookup字段的弹出列表搜索是单独的接口请求
+    payload.data.__changedFilterFormValues = api.context.__changedFilterFormValues;
+    payload.data.__changedSearchBoxValues = api.context.__changedSearchBoxValues;
     ${options.adaptor || ''}
     return payload;
     `;
@@ -6153,6 +6157,8 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     });
     // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取，因为本地存储中的过滤条件自动填充到表单上时filterForm.getValues()拿不到。
     let filterFormValues = event.data;
+    filterFormValues = JSON.parse(JSON.stringify(filterFormValues)); //只取当层数据域中数据，去除__super层数据
+    const changedFilterFormValues = _.pickBy(filterFormValues, function(n,k){return /^__searchable__/.test(k);});
     // 同步__changedFilterFormValues中的值
     // crud && crud.setData({__changedFilterFormValues: {}});
     let __changedFilterFormValuesKey = "__changedFilterFormValues";
@@ -6165,7 +6171,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     }
     if(crud){
       let crudData = crud.getData();
-      crudData[__changedFilterFormValuesKey] = filterFormValues;
+      crudData[__changedFilterFormValuesKey] = changedFilterFormValues;
       crud.setData(crudData);
     }
     filterForm.handleFormSubmit(event);
@@ -8928,7 +8934,6 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
   }
 
   const onChangeScript = `
-    // console.log("==search=onChangeScript===");
     const scope = event.context.scoped;
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
     // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
@@ -9299,8 +9304,26 @@ async function getObjectFilter(objectSchema, fields, options) {
     let filterFormService = SteedosUI.getClosestAmisComponentByType(filterForm.context, "service");
     // 使用event.data的话，并不能拿到本地存储中的过滤条件，所以需要从filterFormService中取。
     let filterFormValues = filterFormService.getData();
+    filterFormValues = JSON.parse(JSON.stringify(filterFormValues)); //只取当层数据域中数据，去除__super层数据
     let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
+    const changedFilterFormValues = _.pickBy(filterFormValues, function(n,k){return /^__searchable__/.test(k);});
+    // 这里不用crudService而用crud是因为lookup字段弹出的列表中的crudService中的变量无法传入crud的发送适配器中
+    // crud && crud.setData({__changedFilterFormValues: changedFilterFormValues});
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    if(isLookup && __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);
+    }
+
     let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     crudService && crudService.setData({isFieldsFilterEmpty});
   `;
@@ -12212,6 +12235,20 @@ async function lookupToAmisPicker(field, readonly, ctx){
         });
         payload.data.rows = updatedResult;
     }
+    let __changedFilterFormValuesKey = "__changedFilterFormValues";
+    let __lookupField = api.data.$self.__lookupField;
+    if(__lookupField){
+        let lookupTag = "__lookup__" + __lookupField.name + "__" + __lookupField.reference_to;
+        if(__lookupField.reference_to_field){
+            lookupTag += "__" + __lookupField.reference_to_field;
+        }
+        __changedFilterFormValuesKey += lookupTag;
+    }
+    let __changedFilterFormValues = api.context[__changedFilterFormValuesKey] || {};
+    let __changedSearchBoxValues = api.context.__changedSearchBoxValues || {};
+    // 列表搜索和快速搜索，有时在某些操作情况下还是会造成crud接口请求使用的过滤条件是上次的，这里强制把正确的过滤条件返回到crud，详细规则见：https://github.com/steedos/steedos-platform/issues/7112
+    payload.data[__changedFilterFormValuesKey] = __changedFilterFormValues;
+    payload.data.__changedSearchBoxValues = __changedSearchBoxValues;
     return payload;
     `;
     if(field.optionsFunction || field._optionsFunction){