@steedos-widgets/amis-lib 6.10.1-beta.28 → 6.10.1-beta.30

package/dist/index.esm.js

@@ -1478,7 +1478,7 @@ var frontend_display_type_is_split$1 = "Split View";
 var frontend_display_as$1 = "Displayed as";
 var frontend_record_sum$1 = "items";
 var frontend_button_reload_tooltip$1 = "Refresh";
-var frontend_button_search_tooltip$1 = "Search";
+var frontend_button_search_tooltip$1 = "Advanced Search";
 var frontend_fields_filter_button_search$1 = "Search";
 var frontend_fields_filter_button_settings$1 = "Set search options";
 var frontend_button_listview_control_tooltip$1 = "List View Controls";
@@ -1659,7 +1659,7 @@ var frontend_display_type_is_split = "分栏视图";
 var frontend_display_as = "显示为";
 var frontend_record_sum = "个项目";
 var frontend_button_reload_tooltip = "刷新";
-var frontend_button_search_tooltip = "搜索";
+var frontend_button_search_tooltip = "高级搜索";
 var frontend_fields_filter_button_search = "搜索";
 var frontend_fields_filter_button_settings = "选择搜索项";
 var frontend_button_listview_control_tooltip = "列表视图控制";
@@ -6062,7 +6062,7 @@ async function getObjectFieldsFilterButtonSchema(objectSchema) {
     "type": "button",
     "label": "",
     "icon": "fa fa-search",
-    "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
+    "className": "bg-white p-2 rounded border-gray-300",
     "onEvent": {
       "click": {
         "actions": [
@@ -6086,7 +6086,7 @@ async function getObjectFieldsFilterFormSchema(ctx) {
   const formSchema = {
     "type": "service",
     "visibleOn": "this.filterFormSearchableFields && this.filterFormSearchableFields.length",
-    "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-4 sm:grid-cols-4 p-2",
+    "className": ctx.formFactor === 'SMALL' ? "slds-filters__body p-0 mb-2 overflow-y-auto overflow-x-hidden" : "slds-filters__body p-0 sm:grid sm:gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 2xl:grid-cols-6 p-1",
     "style":{
       "max-height":ctx.formFactor === 'SMALL'?"30vh":"unset"
     },
@@ -6211,24 +6211,24 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
     const filterService = filterForm.context.getComponents().find(function(n){
       return n.props.type === "service";
     });
-    let showFieldsFilter = false;
-    const isMobile = window.innerWidth < 768;
-    if(event.data.__from_fields_filter_settings_confirm){
-      // 如果是从设置搜索项点击确认按钮触发的搜索事件不应该自动关闭搜索栏
-      showFieldsFilter = true;
-    }
-    else if(isMobile){
-      // 如果是手机端，点击搜索后自动关闭搜索栏
-      showFieldsFilter = false;
-    }
-    else if(event.data.displayAs === "split") {
-      // PC上分栏模式下的列表，始终按手机上效果处理，即自动关闭搜索栏
-      showFieldsFilter = false;
-    }
-    else if(window.innerHeight >= 1200){
-      // 高分辨率屏幕（2k+），列表高度比较高，没必要自动关闭搜索栏
-      showFieldsFilter = true;
-    }
+    let showFieldsFilter = true;
+    // const isMobile = window.innerWidth < 768;
+    // if(event.data.__from_fields_filter_settings_confirm){
+    //   // 如果是从设置搜索项点击确认按钮触发的搜索事件不应该自动关闭搜索栏
+    //   showFieldsFilter = true;
+    // }
+    // else if(isMobile){
+    //   // 如果是手机端，点击搜索后自动关闭搜索栏
+    //   showFieldsFilter = false;
+    // }
+    // else if(event.data.displayAs === "split") {
+    //   // PC上分栏模式下的列表，始终按手机上效果处理，即自动关闭搜索栏
+    //   showFieldsFilter = false;
+    // }
+    // else if(window.innerHeight >= 1200){
+    //   // 高分辨率屏幕（2k+），列表高度比较高，没必要自动关闭搜索栏
+    //   showFieldsFilter = true;
+    // }
     filterService.setData({showFieldsFilter});
     // resizeWindow();//已迁移到搜索栏表单提交事件中执行，因为表单项change后也会触发表单提交了
     let isFieldsFilterEmpty = SteedosUI.isFilterFormValuesEmpty(filterFormValues);
@@ -6697,10 +6697,10 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
           "className": "slds-filters__footer slds-grid slds-shrink-none flex justify-between p-0"
         }],
         "size": "xs",
-        "className": "slds-filters"
+        "className": "slds-filters px-0"
       },
       "size": "xs",
-      "className": `border-y slds-grid slds-grid_vertical slds-nowrap ${!ctx.isLookup && "mt-2"}`,
+      "className": `p-0`,
       "visibleOn": "this.showFieldsFilter",
     },
     "className": "bg-white"
@@ -7637,7 +7637,7 @@ function getObjectListHeader(objectSchema, listViewName, ctx) {
   let headerSchema = [{
     "type": "wrapper",
     "body": body,
-    "className": `sm:rounded-tl sm:rounded-tr p-4 -mb-4`
+    "className": `p-3 m-4 shadow rounded bg-white`
   }];
   // console.log(`getObjectListHeader`, objectSchema, listViewName, ctx)
   return headerSchema;
@@ -9019,7 +9019,7 @@ function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLooku
   return {
     "type": "tooltip-wrapper",
     "id": "steedos_crud_toolbar_quick_search",
-    "align": "right",
+    "align": "left",
     "title": "",
     "content": "可搜索字段：" + searchableFieldsLabel.join(","),
     "placement": "bottom",
@@ -9081,6 +9081,8 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
   if(!hiddenCount){
     toolbarCount = {
       "type": "tpl",
+      "align": "right",
+      "className": "text-gray-500 mr-2",
       "tpl":  "${count} " + i18next.t('frontend_record_sum')
     };
   }
@@ -9163,7 +9165,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
         "animation": true,
         "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
       },
-      "align": "right",
+      "align": "left",
       "className": "bg-white p-2 rounded text-gray-500",
       "onEvent": {
         "click": {
@@ -9188,11 +9190,11 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
     if(toolbarCount){
       toolbars.push(toolbarCount);
     }
+    toolbars.push(toolbarReloadButton);
+    toolbars.push(toolbarDisplayAsButton);
     if(toolbarFilter){
       toolbars.push(toolbarFilter);
     }
-    toolbars.push(toolbarReloadButton);
-    toolbars.push(toolbarDisplayAsButton);
     toolbars.push(toolbarDQuickSearchBox);
     return [
       // "bulkActions",
@@ -9200,18 +9202,18 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
       ...toolbars,
   ]
   }else {
-    if(toolbarCount){
-      toolbars.push(toolbarCount);
-    }
-    if(toolbarFilter){
-      toolbars.push(toolbarFilter);
-    }
     toolbars.push(toolbarReloadButton);
     toolbars.push(toolbarDisplayAsButton);
     if(mainObject?.permissions?.allowCreateListViews){
       toolbars.push(getSettingListviewToolbarButtonSchema());
     }
     toolbars.push(toolbarDQuickSearchBox);
+    if(toolbarFilter){
+      toolbars.push(toolbarFilter);
+    }
+    if(toolbarCount){
+      toolbars.push(toolbarCount);
+    }
     return [
       // "filter-toggler",
       ...(headerToolbarItems || []),
@@ -9508,7 +9510,7 @@ async function getObjectCRUD(objectSchema, fields, options){
     const bodyProps = {
       // toolbar: getToolbar(),
       // headerToolbar: getObjectHeaderToolbar(objectSchema, options.formFactor, {showDisplayAs}),
-      headerToolbarClassName: "px-4 py-2 border-b",
+      headerToolbarClassName: "px-0 py-2 border-b",
       footerToolbar: getObjectFooterToolbar(objectSchema, options.formFactor, {
         ...options,
         disableStatistics: options.queryCount === false
@@ -14393,7 +14395,7 @@ function uuidv4() {
  * @Author: 殷亮辉 yinlianghui@hotoa.com
  * @Date: 2023-11-15 09:50:22
  * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2024-06-14 06:31:33
+ * @LastEditTime: 2025-06-05 11:49:01
  */
 
 /**
@@ -15885,7 +15887,8 @@ const getAmisInputTableSchema = async (props) => {
             "name": "__op__",
             "type": "operation",
             "buttons": buttonsForColumnOperations,
-            "width": 1
+            "width": 1,
+            "className": "steedos-input-table-column-operation",
         });
     }
     // if (showAsInlineEditMode) {