@steedos-widgets/amis-lib 6.3.17-beta.3 → 6.3.17-beta.4

package/dist/index.esm.js

@@ -3060,7 +3060,7 @@ async function getTableSchema$1(object, fields, options){
  */
 async function getTableApi(mainObject, fields, options){
     const searchableFields = [];
-    let { filter, filtersFunction, sort, top, setDataToComponentId = '' } = options;
+    let { filter, filtersFunction, sort, top, setDataToComponentId = '', searchable_default: searchableDefault } = options;
 
     if(_$1.isArray(filter)){
         filter = _$1.map(filter, function(item){
@@ -3200,8 +3200,25 @@ async function getTableApi(mainObject, fields, options){
         }else if(selfData.op === 'loadOptions' && selfData.value){
             userFilters = [["${valueField.name}", "=", selfData.value]];
         }
+        
+        let filterFormValues = {};
+        if (selfData.op !== 'loadOptions'){
+            filterFormValues = ${_$1.isObject(searchableDefault) ? JSON.stringify(searchableDefault) : ('"' + (searchableDefault || "") + '"')} || {};
+            if (_.isObject(filterFormValues) || !_.isEmpty(filterFormValues)){
+                _.each(filterFormValues, function(v, k){
+                    const isAmisFormulaValue = typeof v === "string" && v.indexOf("\${") > -1;
+                    if (isAmisFormulaValue){
+                        filterFormValues[k] = AmisCore.evaluate(v, context);
+                    }
+                });
+                let uiSchema = api.data.$self.uiSchema;
+                let fields = uiSchema && uiSchema.fields;
+                filterFormValues = SteedosUI.getSearchFilterFormValues(filterFormValues, fields);
+            }
+        }
+
+        var searchableFilter = SteedosUI.getSearchFilter(Object.assign({}, { ...filterFormValues }, selfData)) || [];
 
-        var searchableFilter = SteedosUI.getSearchFilter(selfData) || [];
         if(searchableFilter.length > 0){
             if(userFilters.length > 0 ){
                 userFilters = [userFilters, 'and', searchableFilter];
@@ -6301,7 +6318,6 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter});
   `;
   const onCancelScript = `
-    // console.log("===onCancelScript=form==");
     let isLookup = event.data.isLookup;
     let __lookupField = event.data.__lookupField;
     const scope = event.context.scoped;
@@ -6387,26 +6403,34 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
     `;
   /**
-  给lookup字段配置filter_form_data时可以配置为amis变量，也可以配置为事态key-value键值对象值：
+  给lookup字段或列表视图中配置 searchable_default 时可以配置为amis变量，也可以配置为静态key-value键值对象值：
   ```
-  "filter_form_data": "${selectedPublicGroupFilterFormData|toJson}"
+  "searchable_default": {
+    "start": "${[STARTOF(NOW(), 'month'),ENDOF(DATEMODIFY(NOW(), 3, 'month'), 'month')]}"
+  }
   ```
   or
   ```
-  "filter_form_data": {
+  "searchable_default": {
       "public_group_ids": [
           "67addbef39f9a4503789b38d"
       ]
   }
+  ```
+  注意只能配置为json键值对格式，amis变量值只能分别配置到各个字段值中，不支持配置为amis变量的字符串形式，例如：
+  ```
+  "searchable_default": "${selectedPublicGroupFilterFormData|toJson}"
   ```
    */
-  const filterFormValues = ctx.filter_form_data;
+  // 列表视图、对象表格组件或lookup字段上配置的searchable_default会传入到ctx中
+  const searchableDefault = ctx.searchable_default;
   const dataProviderInited = `
     const searchableFields = ${JSON.stringify(searchableFields)};
     const autoOpenFilter = ${autoOpenFilter};
     const objectName = data.objectName;
     const isLookup = data.isLookup;
     const listName = data.listName;
+    const crudId = "${ctx.crudId || ""}" || "listview_" + objectName;
     let searchableFieldsStoreKey = location.pathname + "/searchable_fields";
     if(isLookup){
       searchableFieldsStoreKey += "/lookup/" + objectName;
@@ -6437,42 +6461,45 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
       );
     }
     setData({ filterFormSearchableFields: defaultSearchableFields });
+
+    let searchableFilterData = ${_.isObject(searchableDefault) ? JSON.stringify(searchableDefault) : ('"' + (searchableDefault || "") + '"')} || {};
+    if (_.isObject(searchableFilterData) || !_.isEmpty(searchableFilterData)){
+      _.each(searchableFilterData, function(v, k){
+        const isAmisFormulaValue = typeof v === "string" && v.indexOf("\${") > -1;
+        if (isAmisFormulaValue){
+          searchableFilterData[k] = AmisCore.evaluate(v, data);
+        }
+      });
+      let fields = data.uiSchema && data.uiSchema.fields;
+      searchableFilterData = SteedosUI.getSearchFilterFormValues(searchableFilterData, fields);
+    }
     if(isLookup){
-      let filterFormValues = ${_.isObject(filterFormValues) ? JSON.stringify(filterFormValues) : ('"' + filterFormValues + '"')} || {};
-      const isAmisFormula = typeof filterFormValues === "string" && filterFormValues.indexOf("\${") > -1;
-      if (isAmisFormula){
-        filterFormValues = AmisCore.evaluate(filterFormValues, data) || {};
+      if (!_.isEmpty(searchableFilterData)){
+        setData({ ...searchableFilterData });
       }
-      if (_.isObject(filterFormValues) || !_.isEmpty(filterFormValues)){
-        let fields = data.uiSchema && data.uiSchema.fields;
-        filterFormValues = SteedosUI.getSearchFilterFormValues(filterFormValues, fields);
-        setData({ ...filterFormValues });
-      }
-      // looup字段过滤器不在本地缓存记住过滤条件，所以初始始终隐藏过滤器
+      // looup字段过滤器不在本地缓存记住过滤条件，只处理是否隐藏过滤器
       setData({ showFieldsFilter: autoOpenFilter });
     }
     else{
       const listViewPropsStoreKey = location.pathname + "/crud";
       let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
+      let localFilterFormValues;
       if(localListViewProps){
         localListViewProps = JSON.parse(localListViewProps);
-        let filterFormValues = _.pickBy(localListViewProps, function(n,k){
+        localFilterFormValues = _.pickBy(localListViewProps, function(n,k){
           return /^__searchable__/g.test(k);
         });
-        if(!_.isEmpty(filterFormValues)){
-          setData({ ...filterFormValues });
-          const omitedEmptyFormValue = _.omitBy(filterFormValues, function(n){
-            return _.isNil(n) 
-              || (_.isObject(n) && _.isEmpty(n)) 
-              || (_.isArray(n) && _.isEmpty(n.filter(function(item){return !_.isNil(item)})))
-              || (_.isString(n) && n.length === 0);
-          });
-          // 有过滤条件时只显示搜索按钮上的红点，不自动展开搜索栏
-          if(!_.isEmpty(omitedEmptyFormValue)){
-            let crudService = SteedosUI.getRef(data.$scopeId).parent.getComponentById("service_listview_" + data.objectName)
-            crudService && crudService.setData({isFieldsFilterEmpty: false});
-            // setData({ showFieldsFilter: true });//自动展开搜索栏
-          }
+      }
+      let filterFormValues = Object.assign({}, searchableFilterData, localFilterFormValues);
+      if(!_.isEmpty(filterFormValues)){
+        setData({ ...filterFormValues });
+        let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
+        // 有过滤条件时只显示搜索按钮上的红点，不自动展开搜索栏
+        if(!isFieldsFilterEmpty){
+          let crud = SteedosUI.getRef(data.$scopeId).getComponentById(crudId);
+          let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
+          crudService && crudService.setData({isFieldsFilterEmpty: false});
+          // setData({ showFieldsFilter: true });//自动展开搜索栏
         }
       }
     }
@@ -10582,8 +10609,8 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2025-05-20 16:56:55
+ * @LastEditors: yinlianghui yinlianghui@hotoa.com
+ * @LastEditTime: 2025-12-25 16:41:00
  * @Description:
  */
 
@@ -10923,7 +10950,8 @@ async function getListSchema(
         "filterVisible": ctx.filterVisible,
         "rowClassNameExpr": ctx.rowClassNameExpr,
         "crudDataFilter": ctx.crudDataFilter,
-        "onCrudDataFilter": ctx.onCrudDataFilter
+        "onCrudDataFilter": ctx.onCrudDataFilter,
+        "searchable_default": listView.searchable_default
     };
     // console.log(`getListSchema===>`,amisSchema)
     return {
@@ -12194,7 +12222,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
     // field.name可能是带点的名称，比如审批王中子表字段'instances.instances_submitter'，如果不替换掉点，会造成审批王表单中新建子表行时报错
     let keywordsSearchBoxName = `__keywords_lookup__${field.name.replace(/\./g, "_")}__to__${refObjectConfig.name}`;
 
-    const filterFormValues = field.filter_form_data;
+    // 优先认lookup字段上配置的searchable_default，没有时再使用lookup字段关联对象对应的Lookup列表视图上的searchable_default配置
+    const searchableDefault = field.searchable_default || listView.searchable_default;
     source.requestAdaptor = `
         let __changedFilterFormValuesKey = "__changedFilterFormValues";
         let __lookupField = api.data.$self.__lookupField;
@@ -12239,12 +12268,14 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
         let filterFormValues = {};
         if (selfData.op !== 'loadOptions'){
-            filterFormValues = ${_$1.isObject(filterFormValues) ? JSON.stringify(filterFormValues) : ('"' + filterFormValues + '"')} || {};
-            const isAmisFormula = typeof filterFormValues === "string" && filterFormValues.indexOf("\${") > -1;
-            if (isAmisFormula){
-                filterFormValues = AmisCore.evaluate(filterFormValues, context) || {};
-            }
+            filterFormValues = ${_$1.isObject(searchableDefault) ? JSON.stringify(searchableDefault) : ('"' + (searchableDefault || "") + '"')} || {};
             if (_.isObject(filterFormValues) || !_.isEmpty(filterFormValues)){
+                _.each(filterFormValues, function(v, k){
+                    const isAmisFormulaValue = typeof v === "string" && v.indexOf("\${") > -1;
+                    if (isAmisFormulaValue){
+                        filterFormValues[k] = AmisCore.evaluate(v, context);
+                    }
+                });
                 let fields = api.data.$self.uiSchema && api.data.$self.uiSchema.fields;
                 filterFormValues = SteedosUI.getSearchFilterFormValues(filterFormValues, fields);
             }
@@ -12490,8 +12521,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
                 keywordsSearchBoxName,
                 searchable_fields: field.searchable_fields,
                 auto_open_filter: field.auto_open_filter,
-                show_left_filter: field.show_left_filter,
-                filter_form_data: field.filter_form_data
+                searchable_default: searchableDefault,
+                show_left_filter: field.show_left_filter
             });
         }
         pickerSchema.data = Object.assign({}, pickerSchema.data, {