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

package/dist/index.esm.js

@@ -5238,19 +5238,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) || "";
   }
@@ -5310,7 +5310,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",
@@ -5325,7 +5325,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 [
@@ -5358,7 +5378,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",
@@ -5389,7 +5409,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",
@@ -5755,8 +5775,8 @@ function getLookupSapceUserTreeSchema(){
         "style": {
           "max-height": "100%",
           "position": "absolute",
-          "left": "-220px",
-          "width": "210px",
+          "left": "-330px",
+          "width": "320px",
           "bottom": 0,
           "top": "0",
           "overflow": "auto",
@@ -5822,7 +5842,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);
                 }
             }
@@ -6041,13 +6061,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 });
@@ -6770,6 +6790,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');
 
@@ -7544,6 +7565,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,
@@ -8331,7 +8353,7 @@ async function getTableApi(mainObject, fields, options){
         baseFilters = filter;
     }
     _$1.each(fields,function(field){
-        if(field.searchable){
+        if(field.searchable && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1){
             searchableFields.push(field.name);
         }
     });