@steedos-widgets/amis-object 1.2.39-beta.1 → 1.2.39

package/dist/amis-object.cjs.css

@@ -419,12 +419,12 @@ fieldset.antd-Collapse > legend{
 .mr-4 {
     margin-right: 1rem
 }
-.mr-2 {
-    margin-right: 0.5rem
-}
 .mr-1 {
     margin-right: 0.25rem
 }
+.mr-2 {
+    margin-right: 0.5rem
+}
 .mt-0\.5 {
     margin-top: 0.125rem
 }
@@ -1185,7 +1185,7 @@ fieldset.antd-Collapse > legend{
   position: unset;
 }
 .steedos-select-user .antd-Table .antd-Table-content {
-  max-height: calc(100vh - 560px);
+  max-height: calc(100vh - 343px);
 }
 .steedos-select-user .antd-Table .antd-SearchBox {
   margin-top: 0;
@@ -1363,6 +1363,41 @@ fieldset.antd-Collapse > legend{
   width: 100%;
   justify-content: unset;
 }
+/*
+    列表快速搜索，手机端及PC端分栏模式需要独占一行
+*/
+.steedos-crud-mobile-search-box .antd-Crud .antd-Crud-toolbar .antd-Crud-toolbar-item--right:last-child {
+  width: 100%;
+  margin-top: 8px;
+}
+.steedos-crud-mobile-search-box .antd-Crud .antd-Crud-toolbar .antd-Crud-toolbar-item--right:last-child .antd-TooltipWrapper {
+  width: 100%;
+}
+.steedos-crud-mobile-search-box .antd-Crud .antd-Crud-toolbar .antd-Crud-toolbar-item--right:last-child .antd-TooltipWrapper .antd-SearchBox.is-active {
+  width: 100%;
+}
+.page-list-split .steedos-object-listview .antd-Crud .antd-Crud-toolbar .antd-Crud-toolbar-item--right:last-child {
+  width: 100%;
+  margin-top: 8px;
+}
+.page-list-split .steedos-object-listview .antd-Crud .antd-Crud-toolbar .antd-Crud-toolbar-item--right:last-child .antd-TooltipWrapper {
+  width: 100%;
+}
+.page-list-split .steedos-object-listview .antd-Crud .antd-Crud-toolbar .antd-Crud-toolbar-item--right:last-child .antd-TooltipWrapper .antd-SearchBox.is-active {
+  width: 100%;
+}
+@media (max-width: 768px) {
+  .steedos-object-listview .antd-Crud .antd-Crud-toolbar .antd-Crud-toolbar-item--right:last-child {
+    width: 100%;
+    margin-top: 8px;
+  }
+  .steedos-object-listview .antd-Crud .antd-Crud-toolbar .antd-Crud-toolbar-item--right:last-child .antd-TooltipWrapper {
+    width: 100%;
+  }
+  .steedos-object-listview .antd-Crud .antd-Crud-toolbar .antd-Crud-toolbar-item--right:last-child .antd-TooltipWrapper .antd-SearchBox.is-active {
+    width: 100%;
+  }
+}
 
 @media (min-width: 767px) {
   .steedos-object-table tbody td.antd-Field--quickEditable div {

package/dist/amis-object.cjs.js

@@ -8407,19 +8407,19 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 `;
 
 
-function getObjectHeaderToolbar(mainObject, fields, formFactor, {showDisplayAs = false, hiddenCount = false, headerToolbarItems, filterVisible = true} = {}){
+function getObjectHeaderToolbar(mainObject, fields, formFactor, { showDisplayAs = false, hiddenCount = false, headerToolbarItems, filterVisible = true, isLookup = false } = {}){
   // console.log(`getObjectHeaderToolbar====>`, filterVisible)
   // console.log(`getObjectHeaderToolbar`, mainObject)
   const searchableFieldsLabel = [];
   _.each(fields, function (field) {
-    if (field.searchable) {
+    if (field.searchable && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1) {
       searchableFieldsLabel.push(field.label);
     }
   });
   const listViewPropsStoreKey = location.pathname + "/crud";
   let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
   let crudKeywords = "";
-  if(localListViewProps){
+  if(localListViewProps && !isLookup){
     localListViewProps = JSON.parse(localListViewProps);
     crudKeywords = (localListViewProps && localListViewProps.__keywords) || "";
   }
@@ -8479,7 +8479,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {showDisplayAs =
           ],
           "size":8,
           "animation": true,
-          "visibleOn": "${isFieldsFilterEmpty == false}"
+          "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
         },
         "align": "right",
         "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
@@ -8494,7 +8494,27 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {showDisplayAs =
           }
         }
       } : {},
-      getDisplayAsButton(mainObject?.name)
+      getDisplayAsButton(mainObject?.name),
+      {
+        "type": "tooltip-wrapper",
+        "align": "right",
+        "title": "",
+        "content": "可搜索字段：" + searchableFieldsLabel.join(","),
+        "placement": "bottom",
+        "tooltipTheme": "dark",
+        "trigger": "click",
+        // "className": "mr-1",
+        "body": [
+          {
+            "type": "search-box",
+            "name": "__keywords",
+            "placeholder": "请输入关键字",
+            "value": crudKeywords,
+            "clearable": true,
+            "clearAndSubmit": true
+          }
+        ]
+      },
   ]
   }else {
     return [
@@ -8527,7 +8547,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {showDisplayAs =
           ],
           "size":8,
           "animation": true,
-          "visibleOn": "${isFieldsFilterEmpty == false}"
+          "visibleOn": "${isFieldsFilterEmpty == false && isLookup != true}"
         },
         "align": "right",
         "className": "bg-white p-2 rounded border-gray-300 text-gray-500",
@@ -8558,7 +8578,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {showDisplayAs =
         "type": "tooltip-wrapper",
         "align": "right",
         "title": "",
-        "content": "可模糊搜索字段：" + searchableFieldsLabel.join(","),
+        "content": "可搜索字段：" + searchableFieldsLabel.join(","),
         "placement": "bottom",
         "tooltipTheme": "dark",
         "trigger": "click",
@@ -8924,8 +8944,8 @@ function getLookupSapceUserTreeSchema(){
         "style": {
           "max-height": "100%",
           "position": "absolute",
-          "left": "-220px",
-          "width": "210px",
+          "left": "-330px",
+          "width": "320px",
           "bottom": 0,
           "top": "0",
           "overflow": "auto",
@@ -8991,7 +9011,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             })){
                 i++;
                 tableFields.push(field);
-                if(field.searchable){
+                if(field.searchable && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1){
                     searchableFields.push(field.name);
                 }
             }
@@ -9210,13 +9230,13 @@ async function lookupToAmisPicker(field, readonly, ctx){
         if(referenceTo.objectName === "space_users" && field.reference_to_field === "user" && !isMobile){
              headerToolbarItems = getLookupSapceUserTreeSchema();
              pickerSchema["style"] = {
-                "margin-left":"220px",
+                "margin-left":"330px",
                 "min-height": "300px"
              };
              pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
         }
 
-        pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, ctx.formFactor, { headerToolbarItems });
+        pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { headerToolbarItems, isLookup: true });
         const isAllowCreate = refObjectConfig.permissions.allowCreate;
         if (isAllowCreate) {
             const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
@@ -9939,6 +9959,7 @@ const getAmisFileSchema = (steedosField, readonly)=>{
     return readonly ? getAmisFileReadonlySchema(steedosField) : getAmisFileEditSchema(steedosField);
 };
 
+const SEARCHABLE_FIELD_TYPES = ["text", "textarea", "autonumber", "url", "email"];
 const OMIT_FIELDS = ['created', 'created_by', 'modified', 'modified_by'];
 // const Lookup = require('./lookup');
 
@@ -10713,6 +10734,7 @@ if (typeof window != 'undefined') {
 
 var index = /*#__PURE__*/Object.freeze({
   __proto__: null,
+  SEARCHABLE_FIELD_TYPES: SEARCHABLE_FIELD_TYPES,
   OMIT_FIELDS: OMIT_FIELDS,
   getBaseFields: getBaseFields,
   getAmisFieldType: getAmisFieldType,
@@ -11500,7 +11522,7 @@ async function getTableApi(mainObject, fields, options){
         baseFilters = filter;
     }
     ___default__namespace.each(fields,function(field){
-        if(field.searchable){
+        if(field.searchable && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1){
             searchableFields.push(field.name);
         }
     });
@@ -19700,7 +19722,8 @@ var PageListView = function (props) { return __awaiter(void 0, void 0, void 0, f
                         type: 'service',
                         className: {
                             "h-full": "true",
-                            "sm:px-3 sm:pt-3": "${display != 'split'}"
+                            "sm:px-3 sm:pt-3 page-list-grid": "${display != 'split'}",
+                            "page-list-split": "${display == 'split'}"
                         },
                         body: listSchema
                     }];