@steedos-widgets/amis-object 6.3.12-beta.18 → 6.3.12-beta.19

package/dist/amis-object.cjs.js

@@ -9343,6 +9343,7 @@ 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();
@@ -9513,6 +9514,7 @@ 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});
     `;
+  const filterFormValues = ctx.filter_form_data;
   const dataProviderInited = `
     const searchableFields = ${JSON.stringify(searchableFields)};
     const autoOpenFilter = ${autoOpenFilter};
@@ -9550,6 +9552,20 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     }
     setData({ filterFormSearchableFields: defaultSearchableFields });
     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 (_.isObject(filterFormValues) || !_.isEmpty(filterFormValues)){
+        filterFormValues = _.pickBy(filterFormValues, function(n,k){
+          return defaultSearchableFields.indexOf(k) > -1;
+        });
+        filterFormValues = _.mapKeys(filterFormValues, function(n,k){
+          return "__searchable__" + k;
+        })
+        setData({ ...filterFormValues });
+      }
       // looup字段过滤器不在本地缓存记住过滤条件，所以初始始终隐藏过滤器
       setData({ showFieldsFilter: autoOpenFilter });
     }
@@ -15011,6 +15027,7 @@ function getLookupSapceUserTreeSchema(isMobile){
               {
                 "actionType": "custom",
                 "script": `
+                console.log("===__searchable__organizations_parents===",event.data);
                 const scope = event.context.scoped;
                 var filterFormValues={
                     "__searchable__organizations_parents":event.data.value.value
@@ -15236,6 +15253,7 @@ 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;
     source.requestAdaptor = `
         let __changedFilterFormValuesKey = "__changedFilterFormValues";
         let __lookupField = api.data.$self.__lookupField;
@@ -15278,7 +15296,21 @@ async function lookupToAmisPicker(field, readonly, ctx){
             }
         }
 
-        var searchableFilter = SteedosUI.getSearchFilter(selfData) || [];
+        let filterFormValues = ${_$1__namespace.isObject(filterFormValues) ? JSON.stringify(filterFormValues) : ('"' + filterFormValues + '"')} || {};
+        const isAmisFormula = typeof filterFormValues === "string" && filterFormValues.indexOf("\${") > -1;
+        if (isAmisFormula){
+            filterFormValues = AmisCore.evaluate(filterFormValues, context) || {};
+        }
+        if (_.isObject(filterFormValues) || !_.isEmpty(filterFormValues)){
+            // filterFormValues = _.pickBy(filterFormValues, function(n,k){
+            //     return defaultSearchableFields.indexOf(k) > -1;
+            // });
+            filterFormValues = _.mapKeys(filterFormValues, function(n,k){
+                return "__searchable__" + k;
+            })
+        }
+
+        var searchableFilter = SteedosUI.getSearchFilter(Object.assign({}, { ...filterFormValues }, selfData)) || [];
 
         if(searchableFilter.length > 0){
             if(filters.length > 0 ){
@@ -15512,13 +15544,15 @@ 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,
                 keywordsSearchBoxName,
                 searchable_fields: field.searchable_fields,
                 auto_open_filter: field.auto_open_filter,
-                show_left_filter: field.show_left_filter
+                show_left_filter: field.show_left_filter,
+                filter_form_data: field.filter_form_data
             });
         }
         pickerSchema.data = Object.assign({}, pickerSchema.data, {
@@ -16012,6 +16046,10 @@ async function lookupToAmis(field, readonly, ctx){
     }
     let amisSchema;
     // 默认使用下拉框模式显示lookup选项，只能配置了enable_enhanced_lookup才使用弹出增强模式
+    if(enableEnhancedLookup == true && field.amis && field.amis.type && field.amis.type !== 'picker'){
+        // 如果配置了amis.type且其值不是picker，则不使用弹出增强模式
+        enableEnhancedLookup = false;
+    }
     if(enableEnhancedLookup == true){
         amisSchema = await lookupToAmisPicker(field, readonly, ctx);
     }else if(refObject.enable_tree) {
@@ -17143,7 +17181,16 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
             return  convertData
         }
         // if(ctx.mode === 'edit'){
-        let convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, field.amis, {name: baseData.name});
+        let convertDataResult;
+        if(convertData.type == "steedos-field"){
+            // 如果是steedos-field，不能把amis属性合并到steedos-field根属性中，要合并也是合并到steedos-field的config.amis中
+            // 而steedos-field字段的amis属性本身就在config.amis中了，所以这里不需要再合并field.amis
+            // 目前测试到受影响的是，把字段的amis属性配置为{"type": "checkboxes"}时，ObjectForm只读模式下，lookup字段返回的是type为steedos-field的组件，此时field.amis中的type不应该合并到steedos-field根属性中
+            convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, {name: baseData.name});
+        }
+        else {
+            convertDataResult = Object.assign({}, baseData, convertData, { labelClassName: 'text-left', clearValueOnHidden: true, fieldName: field.name}, field.amis, {name: baseData.name});
+        }
         // 只读时file字段的外层control层若存在name，内部each组件存在问题
         if(readonly && field.type == "file") {
             convertDataResult.name = "";