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

package/dist/index.umd.js

@@ -5262,19 +5262,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) || "";
     }
@@ -5334,7 +5334,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             ],
             "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",
@@ -5349,7 +5349,27 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
           }
         } : {},
-        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 [
@@ -5382,7 +5402,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             ],
             "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",
@@ -5413,7 +5433,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           "type": "tooltip-wrapper",
           "align": "right",
           "title": "",
-          "content": "可模糊搜索字段：" + searchableFieldsLabel.join(","),
+          "content": "可搜索字段：" + searchableFieldsLabel.join(","),
           "placement": "bottom",
           "tooltipTheme": "dark",
           "trigger": "click",
@@ -5779,8 +5799,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           "style": {
             "max-height": "100%",
             "position": "absolute",
-            "left": "-220px",
-            "width": "210px",
+            "left": "-330px",
+            "width": "320px",
             "bottom": 0,
             "top": "0",
             "overflow": "auto",
@@ -5846,7 +5866,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               })){
                   i++;
                   tableFields.push(field);
-                  if(field.searchable){
+                  if(field.searchable && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1){
                       searchableFields.push(field.name);
                   }
               }
@@ -6065,13 +6085,13 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           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 });
@@ -6794,6 +6814,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       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');
 
@@ -7568,6 +7589,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 
   var index = /*#__PURE__*/Object.freeze({
     __proto__: null,
+    SEARCHABLE_FIELD_TYPES: SEARCHABLE_FIELD_TYPES,
     OMIT_FIELDS: OMIT_FIELDS,
     getBaseFields: getBaseFields,
     getAmisFieldType: getAmisFieldType,
@@ -8355,7 +8377,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           baseFilters = filter;
       }
       ___namespace.each(fields,function(field){
-          if(field.searchable){
+          if(field.searchable && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1){
               searchableFields.push(field.name);
           }
       });