@steedos-widgets/amis-lib 6.3.12-beta.9 → 6.10.1-beta.8

package/dist/index.cjs.js

@@ -1240,7 +1240,7 @@ async function getPage({type, pageId = '', appId, objectName = '', recordId = ''
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-10-28 14:15:09
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-11-14 10:50:01
+ * @LastEditTime: 2025-02-13 09:31:02
  * @Description: 
  */
 
@@ -1299,7 +1299,7 @@ async function getLookupLinkOnClick(field, options) {
                         "title": " ",
                         "headerClassName": "hidden",
                         "size": "lg",
-                        "width": "70%",
+                        "width": window.drawerWidth || "70%",
                         "bodyClassName": "p-0 m-0 bg-gray-100",
                         "closeOnEsc": true,
                         "closeOnOutside": true,
@@ -1895,7 +1895,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){
@@ -2392,7 +2391,7 @@ async function getColumnItemOnClick(field, options){
                   "title": " ",
                   "headerClassName": "hidden",
                   "size": "lg",
-                  "width": "70%",
+                  "width": window.drawerWidth || "70%",
                   "bodyClassName": "p-0 m-0 bg-gray-100",
                   "closeOnEsc": true,
                   "closeOnOutside": true,
@@ -3436,6 +3435,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;
     `;
@@ -3533,6 +3537,7 @@ function getReadonlyFormAdaptor(object, fields, options){
             payload.data.data = [emptyDoc];
         }
         else{
+            console.log('无法找到记录', api, payload, context)
             return {
                 status: 2,
                 msg: "${i18next__default["default"].t('frontend_no_records_found')}"
@@ -3559,13 +3564,12 @@ function getReadonlyFormAdaptor(object, fields, options){
             console.error(e)
         }
         payload.data = data;
-        payload.data.__objectName = "${object.name}";
         payload.data.record = record;
         payload.data.NAME_FIELD_VALUE = ${nameLabel} || record.name;
         payload.data._master = {
             record: record,
-            objectName: "${object.name}",
-            recordId: record._id
+            objectName: "\${objectName}",
+            recordId: "\${recordId}"
         }
         window.postMessage(Object.assign({type: "record.loaded"}, {record: record}), "*")
     }
@@ -4474,6 +4478,11 @@ var __assign = function() {
         return t;
     };
     return __assign.apply(this, arguments);
+};
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
 /**
@@ -6167,15 +6176,38 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   if (!ctx) {
     ctx = {};
   }
+  const searchableFields = ctx.searchable_fields;
+  const autoOpenFilter = !!ctx.auto_open_filter;
   const btnSearchId = "btn_filter_form_search_" + new Date().getTime();
   const filterFormSchema = await getObjectFieldsFilterFormSchema(ctx);
   const keywordsSearchBoxName = ctx.keywordsSearchBoxName || "__keywords";
   const onSearchScript = `
-    // console.log("===onSearchScript=form==");
+    let isLookup = event.data.isLookup;
+    let __lookupField = event.data.__lookupField;
     const scope = event.context.scoped;
+    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
     var filterForm = scope.parent.parent.getComponents().find(function(n){
       return n.props.type === "form";
     });
+    // 使用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";
+    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);
+    }
     filterForm.handleFormSubmit(event);
     // var filterFormValues = filterForm.getValues();
     // var listView = scope.parent.parent.parent.getComponents().find(function(n){
@@ -6224,11 +6256,8 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     }
     filterService.setData({showFieldsFilter});
     // resizeWindow();//已迁移到搜索栏表单提交事件中执行，因为表单项change后也会触发表单提交了
-    // 使用filterForm.getValues()的话，并不能拿到本地存储中的过滤条件，所以需要从event.data中取。
-    let filterFormValues = event.data;
     let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
-    let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
-    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter});
   `;
   const onCancelScript = `
@@ -6314,10 +6343,12 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     
     // 移除搜索按钮上的红点
     // let crudService = scope.getComponentById("service_listview_" + event.data.objectName);
-    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     crudService && crudService.setData({isFieldsFilterEmpty: true, showFieldsFilter: false});
     `;
   const dataProviderInited = `
+    const searchableFields = ${JSON.stringify(searchableFields)};
+    const autoOpenFilter = ${autoOpenFilter};
     const objectName = data.objectName;
     const isLookup = data.isLookup;
     const listName = data.listName;
@@ -6330,6 +6361,11 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     if(defaultSearchableFields){
       defaultSearchableFields = defaultSearchableFields.split(",");
     }
+    if(_.isEmpty(defaultSearchableFields) && searchableFields){
+      if(searchableFields.length){
+        defaultSearchableFields = _.map(searchableFields, 'field');
+      }
+    }
     if(_.isEmpty(defaultSearchableFields) && data.uiSchema){
       let listView = data.uiSchema.list_views[data.listName];
       const sFields = listView && listView.searchable_fields;
@@ -6348,7 +6384,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     setData({ filterFormSearchableFields: defaultSearchableFields });
     if(isLookup){
       // looup字段过滤器不在本地缓存记住过滤条件，所以初始始终隐藏过滤器
-      setData({ showFieldsFilter: false });
+      setData({ showFieldsFilter: autoOpenFilter });
     }
     else{
       const listViewPropsStoreKey = location.pathname + "/crud";
@@ -7613,7 +7649,7 @@ async function getObjectListHeaderFieldsFilterBar(objectSchema, listViewName, ct
  * @param {*} objectSchema 对象UISchema
  * @returns amisSchema
  */
-function getObjectListHeader$1(objectSchema, listViewName, ctx) {
+function getObjectListHeader(objectSchema, listViewName, ctx) {
   if (!ctx) {
     ctx = {};
   }
@@ -8939,10 +8975,9 @@ 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");
+    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     let __changedSearchBoxValues = {};
     __changedSearchBoxValues["${keywordsSearchBoxName}"] = event.data["${keywordsSearchBoxName}"];
     // crudService && crudService.setData({__changedSearchBoxValues: __changedSearchBoxValues});
@@ -9309,10 +9344,28 @@ async function getObjectFilter(objectSchema, fields, options) {
     let filterForm = SteedosUI.getClosestAmisComponentByType(scope, "form");
     let filterFormService = SteedosUI.getClosestAmisComponentByType(filterForm.context, "service");
     // 使用event.data的话，并不能拿到本地存储中的过滤条件，所以需要从filterFormService中取。
-    let filterFormValues = filterFormService.getData()
+    let filterFormValues = filterFormService.getData();
+    filterFormValues = JSON.parse(JSON.stringify(filterFormValues)); //只取当层数据域中数据，去除__super层数据
     let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
-    let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    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});
   `;
   let onChangeScript = `
@@ -9327,7 +9380,7 @@ async function getObjectFilter(objectSchema, fields, options) {
     filterFormValues = JSON.parse(JSON.stringify(filterFormValues)); //只取当层数据域中数据，去除__super层数据
     let crud = SteedosUI.getClosestAmisComponentByType(scope, "crud");
     const changedFilterFormValues = _.pickBy(filterFormValues, function(n,k){return /^__searchable__/.test(k);});;
-    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service");
+    // let crudService = crud && SteedosUI.getClosestAmisComponentByType(crud.context, "service", {name: "service_object_table_crud"});
     // crudService && crudService.setData({__changedFilterFormValues: changedFilterFormValues});
     // 这里不用crudService而用crud是因为lookup字段弹出的列表中的crudService中的变量无法传入crud的发送适配器中
     // crud && crud.setData({__changedFilterFormValues: changedFilterFormValues});
@@ -9683,7 +9736,7 @@ async function getObjectCRUD(objectSchema, fields, options){
       className: crudModeClassName,
       //目前crud的service层id不认用户自定义id，只支持默认规则id，许多地方的格式都写死了service_listview_${objectname}
       id: `service_${id}`,
-      name: `page`,
+      name: "service_object_table_crud",
       data: options.amisData,
       body: body,
       //监听广播事件，重算crud高度
@@ -9950,7 +10003,7 @@ async function getObjectDetail(objectSchema, recordId, ctx){
     }
 
     amisSchema.body[0].body = await getFormSchemaWithDataFilter(amisSchema.body[0].body, { formDataFilter, onFormDataFilter, amisData, env });
-    // console.log('getObjectDetail=====>', amisSchema);
+    // console.log('getObjectDetail=====>', amisSchema, objectSchema, recordId, ctx);
     return amisSchema;
 }
 
@@ -10030,8 +10083,8 @@ const getRecordPermissions = async (objectName, recordId)=>{
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-18 14:46:50
+ * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
+ * @LastEditTime: 2025-01-08 13:32:51
  * @Description:
  */
 
@@ -10105,7 +10158,7 @@ async function getObjectRelatedList(
 
 // 获取单个相关表
 async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObjectName, relatedKey, ctx){
-    let { top, perPage, appId, relatedLabel, className, columns, sort, filters, visible_on } = ctx;
+    let { top, perPage, appId, relatedLabel, className, columns, sort, filters, visible_on, enableHeaderToolbar } = ctx;
     // console.log('getRecordDetailRelatedListSchema==>',objectName,recordId,relatedObjectName)
     const relatedObjectUiSchema = await getUISchema(relatedObjectName);
     if(!relatedObjectUiSchema){
@@ -10170,6 +10223,10 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
     let headerToolbar = [];
     if(!isMobile){
         headerToolbar.push("bulkActions");
+        if (enableHeaderToolbar) {
+            // 通过 enableHeaderToolbar = true 可以控制是否显示内置的带过滤器的headerToolbar
+            headerToolbar = undefined;
+        }
     }
     const options = {
         globalFilter,
@@ -10208,7 +10265,7 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
         amisSchema: {
             type: "service",
             id: componentId,
-            className: `steedos-record-related-list mb-4 last:mb-0 ${componentId} ${className}`,
+            className: `steedos-record-related-list mb-4 last:mb-0 ${componentId} ${className} ${enableHeaderToolbar ? 'enable-header-toolbar' : ''}`,
             data: {
                 relatedKey: relatedKey,   
                 listViewId: `amis-\${appId}-${relatedObjectName}-listview`,
@@ -10310,6 +10367,7 @@ async function getRelatedListSchema(
     listViewName,
     ctx
   ) {
+    const { enableHeaderToolbar } = ctx;
     const uiSchema = await getUISchema(objectName);
     if(!uiSchema){
         return {}
@@ -10362,10 +10420,14 @@ async function getRelatedListSchema(
     delete ctx.filters;
 
     delete ctx.globalFilter;
+    delete ctx.enableHeaderToolbar;
 
     const adaptor = `
         try{
             if(setDataToComponentId){
+                // 子表列表在headerToolbar过滤器中设置过过滤条件的话，始终显示子表列表，无论是否查询到数据
+                // 改为使用css样式控制子表列表放开headerToolbar时，始终显示crud，只隐藏crud内部的表格，从而始终显示headerToolbar不受这里逻辑影响
+                // var headerToolbarFilterChanged = context.isFieldsFilterEmpty === false;
                 if(payload.data.count){
                     setTimeout(function(){
                         // 设计器中获取不到window.$从而导致报错， 所以用纯js替换下。
@@ -10388,7 +10450,7 @@ async function getRelatedListSchema(
         "filters": listviewFilter,
         "filtersFunction": filtersFunction,
         "sort": listViewSort,
-        "filterVisible": false,
+        "filterVisible": !!enableHeaderToolbar,
         "requestAdaptor": ctx.requestAdaptor,  
         "adaptor": adaptor + ctx.adaptor || '',
         "ctx": ctx,
@@ -10439,8 +10501,8 @@ async function getObjectRelatedListsMiniSchema(objectApiName){
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-04-26 16:46:44
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2025-02-21 13:31:43
  * @Description:
  */
 
@@ -11883,6 +11945,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
     ctx.idFieldName = refObjectConfig.idFieldName;
     ctx.objectName = refObjectConfig.name;
 
+    // 是否显示lookup字段左侧的过滤器（如果有的话），默认为true，目前只有lookup选人字段有左侧树过滤器
+    const showLeftFilter = field.show_left_filter !== false;
+
     let tableFields = [];
     const searchableFields = [];
 
@@ -12214,6 +12279,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){
@@ -12249,7 +12328,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
 
         pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { isLookup: true, keywordsSearchBoxName });
         
-        if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
+        if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && showLeftFilter){
             pickerSchema.headerToolbar.push(getLookupSapceUserTreeSchema(isMobile));
             pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
         }
@@ -12269,7 +12348,10 @@ async function lookupToAmisPicker(field, readonly, ctx){
             pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
                 ...ctx,
                 isLookup: true,
-                keywordsSearchBoxName
+                keywordsSearchBoxName,
+                searchable_fields: field.searchable_fields,
+                auto_open_filter: field.auto_open_filter,
+                show_left_filter: field.show_left_filter
             });
         }
         pickerSchema.data = Object.assign({}, pickerSchema.data, {
@@ -16039,7 +16121,7 @@ async function getListviewInitSchema(objectApiName, listViewName, ctx) {
         const defaults = ctx.defaults || {};
         if(!defaults.headerSchema){
             //传入isListviewInit是区别于对象列表类型的微页面，即getListPageInitSchema函数中该属性为false
-            const headerSchema = await getObjectListHeader$1(uiSchema, listViewName, {
+            const headerSchema = await getObjectListHeader(uiSchema, listViewName, {
                 onlySecordLine: true,
                 isListviewInit: true
             });
@@ -18590,7 +18672,7 @@ exports.getObjectDetailMoreButtons = getObjectDetailMoreButtons;
 exports.getObjectFieldsFilterBarSchema = getObjectFieldsFilterBarSchema;
 exports.getObjectFieldsFilterButtonSchema = getObjectFieldsFilterButtonSchema;
 exports.getObjectFieldsFilterFormSchema = getObjectFieldsFilterFormSchema;
-exports.getObjectListHeader = getObjectListHeader$1;
+exports.getObjectListHeader = getObjectListHeader;
 exports.getObjectListHeaderFieldsFilterBar = getObjectListHeaderFieldsFilterBar;
 exports.getObjectListHeaderFirstLine = getObjectListHeaderFirstLine;
 exports.getObjectListHeaderSecordLine = getObjectListHeaderSecordLine;