@steedos-widgets/amis-lib 6.3.12-beta.1 → 6.3.12-beta.11

package/dist/index.esm.js

@@ -4809,7 +4809,7 @@ const parseSingleExpression = function (func, formData, dataPath, global, userSe
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-11-01 15:51:00
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-02-18 18:37:35
+ * @LastEditTime: 2024-12-26 20:28:43
  * @Description: 
  */
 
@@ -4969,20 +4969,23 @@ const getSchema$5 = async (uiSchema, ctx) => {
                                         {
                                             type: 'button',
                                             actionType: 'cancel',
-                                            label: i18next.t('frontend_form_cancel')
+                                            label: i18next.t('frontend_form_cancel'),
+                                            className: 'form-btn-cancel'
                                         },
                                         {
                                             type: 'button',
                                             label: i18next.t('frontend_form_save_and_new'),
                                             actionType: 'confirm',
                                             close: false,
-                                            id: "confirmAndNew"
+                                            id: "confirmAndNew",
+                                            className: 'form-btn-save_and_new'
                                         },
                                         {
                                             type: 'button',
                                             actionType: 'confirm',
                                             label: i18next.t('frontend_form_save'),
-                                            primary: true
+                                            primary: true,
+                                            className: 'form-btn-save'
                                         },
                                     ]
                                 }
@@ -6141,11 +6144,30 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   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;
+    // 同步__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] = filterFormValues;
+      crud.setData(crudData);
+    }
     filterForm.handleFormSubmit(event);
     // var filterFormValues = filterForm.getValues();
     // var listView = scope.parent.parent.parent.getComponents().find(function(n){
@@ -6194,10 +6216,7 @@ 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");
     crudService && crudService.setData({isFieldsFilterEmpty, showFieldsFilter});
   `;
@@ -7583,7 +7602,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 = {};
   }
@@ -10000,8 +10019,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:
  */
 
@@ -10075,7 +10094,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){
@@ -10140,6 +10159,10 @@ async function getRecordDetailRelatedListSchema(objectName, recordId, relatedObj
     let headerToolbar = [];
     if(!isMobile){
         headerToolbar.push("bulkActions");
+        if (enableHeaderToolbar) {
+            // 通过 enableHeaderToolbar = true 可以控制是否显示内置的带过滤器的headerToolbar
+            headerToolbar = undefined;
+        }
     }
     const options = {
         globalFilter,
@@ -10178,7 +10201,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`,
@@ -10280,6 +10303,7 @@ async function getRelatedListSchema(
     listViewName,
     ctx
   ) {
+    const { enableHeaderToolbar } = ctx;
     const uiSchema = await getUISchema(objectName);
     if(!uiSchema){
         return {}
@@ -10332,10 +10356,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替换下。
@@ -10358,7 +10386,7 @@ async function getRelatedListSchema(
         "filters": listviewFilter,
         "filtersFunction": filtersFunction,
         "sort": listViewSort,
-        "filterVisible": false,
+        "filterVisible": !!enableHeaderToolbar,
         "requestAdaptor": ctx.requestAdaptor,  
         "adaptor": adaptor + ctx.adaptor || '',
         "ctx": ctx,
@@ -16009,7 +16037,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
             });
@@ -18492,5 +18520,5 @@ const getInstanceInfo = async ({ instanceId, box }) => {
   };
 };
 
-export { index as Field, Router, absoluteUrl, amisRender, amisRootClick, cloneObject, conditionsToFilters, createObject, defaultsDeep, deleteVariable, execute, executeButton, extendObject, fetchAPI, filtersToConditions, getAmisInputTableSchema, getApp, getApps, getAuthToken, getAuthorization, getButton, getButtonVisible, getButtonVisibleOn, getButtons, getCalendarSchema, getCreatedInfoTpl, getDateTimeTpl, getDateTpl, getDefaultRenderData, getEnv, getEnvs, getEvn, getField, getFieldTpl, getFileSrc, getFlowFormSchema, getFormPageInitSchema, getFormSchema, getGlobalNowData, getIdsPickerSchema, getImageSrc, getInstanceInfo, getListPageInitSchema, getListSchema, getListViewButtons, getListViewColumns, getListViewFilter, getListViewItemButtons, getListViewSort, getListviewInitSchema, getLocationTpl, getLookupSapceUserTreeSchema, getLookupTpl, getModifiedInfoTpl, getNameTpl, getNameTplUrl, getNotifications, getNumberTpl, getObjectDetailButtons, getObjectDetailButtonsSchemas, getObjectDetailMoreButtons, getObjectFieldsFilterBarSchema, getObjectFieldsFilterButtonSchema, getObjectFieldsFilterFormSchema, getObjectListHeader$1 as getObjectListHeader, getObjectListHeaderFieldsFilterBar, getObjectListHeaderFirstLine, getObjectListHeaderSecordLine, getObjectListViewButtonsSchemas, getObjectRecordDetailHeader, getObjectRecordDetailRelatedListButtonsSchemas, getObjectRecordDetailRelatedListHeader, getObjectRelated, getObjectRelatedList, getObjectRelatedListButtons, getObjectRelatedListHeader, getObjectRelatedListsMiniSchema, getPage, getPasswordTpl, getRecord, getRecordDetailHeaderSchema, getRecordDetailMiniSchema, getRecordDetailRelatedListSchema, getRecordDetailSchema, getRecordPageInitSchema, getRecordPermissions, getRecordServiceSchema, getRefObjectNameFieldName, getReferenceTo, getReferenceToFieldSchema, getReferenceToSync, getRelatedFieldTpl, getRelatedFieldValue, getRelatedListSchema, getRelatedsCount, getRootUrl, getSelectMap, getSelectTpl, getSelectUserSchema, getSpaceUsersPickerAmisSchema, getSpaceUsersPickerSchema, getSteedosAuth, getSwitchTpl, getTableSchema, getTenantId, getTimeTpl, getUISchema, getUISchemaSync$1 as getUISchemaSync, getUiFieldTpl, getUiFileSizeTpl, getUserId, getViewSchema, isExpression, isObject, lookupToAmis, lookupToAmisIdsPicker, lookupToAmisPicker, lookupToAmisSelect, lookupToAmisSelectUser, markReadAll, parseSingleExpression, registerRemoteAssets, registerRenders, setEnv, setEnvs, setRootUrl, setSteedosAuth, setUISchemaFunction, setVariable, standardButtonsTodo, uuidv4 };
+export { index as Field, Router, absoluteUrl, amisRender, amisRootClick, cloneObject, conditionsToFilters, createObject, defaultsDeep, deleteVariable, execute, executeButton, extendObject, fetchAPI, filtersToConditions, getAmisInputTableSchema, getApp, getApps, getAuthToken, getAuthorization, getButton, getButtonVisible, getButtonVisibleOn, getButtons, getCalendarSchema, getCreatedInfoTpl, getDateTimeTpl, getDateTpl, getDefaultRenderData, getEnv, getEnvs, getEvn, getField, getFieldTpl, getFileSrc, getFlowFormSchema, getFormPageInitSchema, getFormSchema, getGlobalNowData, getIdsPickerSchema, getImageSrc, getInstanceInfo, getListPageInitSchema, getListSchema, getListViewButtons, getListViewColumns, getListViewFilter, getListViewItemButtons, getListViewSort, getListviewInitSchema, getLocationTpl, getLookupSapceUserTreeSchema, getLookupTpl, getModifiedInfoTpl, getNameTpl, getNameTplUrl, getNotifications, getNumberTpl, getObjectDetailButtons, getObjectDetailButtonsSchemas, getObjectDetailMoreButtons, getObjectFieldsFilterBarSchema, getObjectFieldsFilterButtonSchema, getObjectFieldsFilterFormSchema, getObjectListHeader, getObjectListHeaderFieldsFilterBar, getObjectListHeaderFirstLine, getObjectListHeaderSecordLine, getObjectListViewButtonsSchemas, getObjectRecordDetailHeader, getObjectRecordDetailRelatedListButtonsSchemas, getObjectRecordDetailRelatedListHeader, getObjectRelated, getObjectRelatedList, getObjectRelatedListButtons, getObjectRelatedListHeader, getObjectRelatedListsMiniSchema, getPage, getPasswordTpl, getRecord, getRecordDetailHeaderSchema, getRecordDetailMiniSchema, getRecordDetailRelatedListSchema, getRecordDetailSchema, getRecordPageInitSchema, getRecordPermissions, getRecordServiceSchema, getRefObjectNameFieldName, getReferenceTo, getReferenceToFieldSchema, getReferenceToSync, getRelatedFieldTpl, getRelatedFieldValue, getRelatedListSchema, getRelatedsCount, getRootUrl, getSelectMap, getSelectTpl, getSelectUserSchema, getSpaceUsersPickerAmisSchema, getSpaceUsersPickerSchema, getSteedosAuth, getSwitchTpl, getTableSchema, getTenantId, getTimeTpl, getUISchema, getUISchemaSync$1 as getUISchemaSync, getUiFieldTpl, getUiFileSizeTpl, getUserId, getViewSchema, isExpression, isObject, lookupToAmis, lookupToAmisIdsPicker, lookupToAmisPicker, lookupToAmisSelect, lookupToAmisSelectUser, markReadAll, parseSingleExpression, registerRemoteAssets, registerRenders, setEnv, setEnvs, setRootUrl, setSteedosAuth, setUISchemaFunction, setVariable, standardButtonsTodo, uuidv4 };
 //# sourceMappingURL=index.esm.js.map