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

package/dist/index.umd.js

@@ -3309,6 +3309,7 @@
     }
     const btnSearchId = "btn_filter_form_search_" + new Date().getTime();
     const filterFormSchema = await getObjectFieldsFilterFormSchema(ctx);
+    const keywordsSearchBoxName = ctx.keywordsSearchBoxName || "__keywords";
     const onSearchScript = `
     const scope = event.context.scoped;
     var filterForm = scope.parent.parent.getComponents().find(function(n){
@@ -3394,6 +3395,11 @@
         }
       }
     }
+    else{
+      const keywordsSearchBoxName = "${keywordsSearchBoxName}";
+      //lookup字段保留快速搜索条件
+      removedValues[keywordsSearchBoxName] = filterFormValues[keywordsSearchBoxName];
+    }
     filterForm.reset();
     listView.handleFilterSubmit(removedValues);
     const filterService = filterForm.context.getComponents().find(function(n){
@@ -5261,24 +5267,51 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 // }
 `;
 
-
-  function getObjectHeaderToolbar(mainObject, fields, formFactor, {showDisplayAs = false, hiddenCount = false, headerToolbarItems, filterVisible = true} = {}){
-    // console.log(`getObjectHeaderToolbar====>`, filterVisible)
-    // console.log(`getObjectHeaderToolbar`, mainObject)
+  function getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup = false, keywordsSearchBoxName = "__keywords" } = {}){
     const searchableFieldsLabel = [];
     _.each(fields, function (field) {
-      if (field.searchable) {
+      if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
         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) || "";
     }
 
+    return {
+      "type": "tooltip-wrapper",
+      "align": "right",
+      "title": "",
+      "content": "可搜索字段：" + searchableFieldsLabel.join(","),
+      "placement": "bottom",
+      "tooltipTheme": "dark",
+      "trigger": "click",
+      "className": formFactor !== 'SMALL' ? "mr-1" : '',
+      "visible": !!searchableFieldsLabel.length,
+      "body": [
+        {
+          "type": "search-box",
+          "name": keywordsSearchBoxName,
+          "placeholder": "快速搜索",
+          "value": crudKeywords,
+          "clearable": true,
+          "clearAndSubmit": true
+        }
+      ]
+    }
+  }
+
+  function getObjectHeaderToolbar(mainObject, fields, formFactor, { 
+    showDisplayAs = false, hiddenCount = false, headerToolbarItems, 
+    filterVisible = true, isLookup = false, keywordsSearchBoxName } = {}){
+    // console.log(`getObjectHeaderToolbar====>`, filterVisible)
+    // console.log(`getObjectHeaderToolbar`, mainObject)
+
     const isMobile = window.innerWidth < 768;
     if(isMobile){
       showDisplayAs = false;
@@ -5334,7 +5367,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 +5382,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             }
           }
         } : {},
-        getDisplayAsButton(mainObject?.name)
+        getDisplayAsButton(mainObject?.name),
+        getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName })
     ]
     }else {
       return [
@@ -5382,7 +5416,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",
@@ -5409,26 +5443,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
         // getExportExcelToolbarButtonSchema(),
         mainObject?.permissions?.allowCreateListViews ? getSettingListviewToolbarButtonSchema() : {},
         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
-            }
-          ]
-        },
+        getObjectHeaderQuickSearchBox(mainObject, fields, formFactor, { isLookup, keywordsSearchBoxName }),
         // {
         //     "type": "drag-toggler",
         //     "align": "right"
@@ -5779,8 +5794,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 +5861,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
               })){
                   i++;
                   tableFields.push(field);
-                  if(field.searchable){
+                  if(isFieldQuickSearchable(field, refObjectConfig.NAME_FIELD_KEY)){
                       searchableFields.push(field.name);
                   }
               }
@@ -5887,7 +5902,8 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       source.data.$term = "$term";
       source.data.$self = "$$";
 
-     
+      let keywordsSearchBoxName = `__keywords_lookup__${field.name}__to__${refObjectConfig.name}`;
+      
       source.requestAdaptor = `
         const selfData = JSON.parse(JSON.stringify(api.data.$self));
         var filters = [];
@@ -5941,19 +5957,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             })
         }
 
-        if(selfData.__keywords && allowSearchFields){
-            const keywordsFilters = [];
-            allowSearchFields.forEach(function(key, index){
-                const keyValue = selfData.__keywords;
-                if(keyValue){
-                    keywordsFilters.push([key, "contains", keyValue]);
-                    if(index < allowSearchFields.length - 1){
-                        keywordsFilters.push('or');
-                    }
-                }
-            })
+        var keywordsFilters = SteedosUI.getKeywordsSearchFilter(selfData.${keywordsSearchBoxName}, allowSearchFields);
+        if(keywordsFilters && keywordsFilters.length > 0){
             filters.push(keywordsFilters);
-        };
+        }
 
         var fieldFilters = ${JSON.stringify(field.filters)};
         if(fieldFilters && fieldFilters.length){
@@ -6065,13 +6072,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, keywordsSearchBoxName });
           const isAllowCreate = refObjectConfig.permissions.allowCreate;
           if (isAllowCreate) {
               const new_button = await getSchema$5(refObjectConfig, { appId: ctx.appId, objectName: refObjectConfig.name, formFactor: ctx.formFactor });
@@ -6082,8 +6089,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
           pickerSchema.footerToolbar = refObjectConfig.enable_tree ? [] : getObjectFooterToolbar();
           if (ctx.filterVisible !== false) {
               pickerSchema.filter = await getObjectFilter(refObjectConfig, fields, {
+                  ...ctx,
                   isLookup: true,
-                  ...ctx
+                  keywordsSearchBoxName
               });
           }
           pickerSchema.data = Object.assign({}, pickerSchema.data, {
@@ -6419,7 +6427,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       }
 
       if(referenceTo.objectName === "space_users" && field.reference_to_field === "user"){
-          if(ctx.idsDependOn || field.amis){
+          if(ctx.idsDependOn){
               // ids人员点选模式
               return await lookupToAmisIdsPicker(field, readonly, ctx);
           }
@@ -6794,6 +6802,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       return readonly ? getAmisFileReadonlySchema(steedosField) : getAmisFileEditSchema(steedosField);
   };
 
+  const QUICK_SEARCHABLE_FIELD_TYPES = ["text", "textarea", "autonumber", "url", "email"];
   const OMIT_FIELDS = ['created', 'created_by', 'modified', 'modified_by'];
   // const Lookup = require('./lookup');
 
@@ -7566,8 +7575,22 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       window.isFieldTypeSearchable = isFieldTypeSearchable;
   }
 
+
+  function isFieldQuickSearchable(field, nameFieldKey) {
+      let fieldSearchable = field.searchable;
+      if(fieldSearchable !== false && field.name === nameFieldKey){
+          // 对象上名称字段的searchable默认认为是true
+          fieldSearchable = true;
+      }
+      if (fieldSearchable && QUICK_SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1) {
+          return true;
+      }
+      return false;
+  }
+
   var index = /*#__PURE__*/Object.freeze({
     __proto__: null,
+    QUICK_SEARCHABLE_FIELD_TYPES: QUICK_SEARCHABLE_FIELD_TYPES,
     OMIT_FIELDS: OMIT_FIELDS,
     getBaseFields: getBaseFields,
     getAmisFieldType: getAmisFieldType,
@@ -7578,6 +7601,7 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
     convertSFieldToAmisField: convertSFieldToAmisField,
     getFieldSearchable: getFieldSearchable,
     isFieldTypeSearchable: isFieldTypeSearchable,
+    isFieldQuickSearchable: isFieldQuickSearchable,
     getAmisStaticFieldType: getAmisStaticFieldType
   });
 
@@ -8354,8 +8378,9 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
       if(filter){
           baseFilters = filter;
       }
-      ___namespace.each(fields,function(field){
-          if(field.searchable){
+
+      ___namespace.each(fields, function (field) {
+          if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
               searchableFields.push(field.name);
           }
       });
@@ -8483,19 +8508,10 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
             })
         }
 
-        if(selfData.__keywords && allowSearchFields){
-            const keywordsFilters = [];
-            allowSearchFields.forEach(function(key, index){
-                const keyValue = selfData.__keywords;
-                if(keyValue){
-                    keywordsFilters.push([key, "contains", keyValue]);
-                    if(index < allowSearchFields.length - 1){
-                        keywordsFilters.push('or');
-                    }
-                }
-            })
+        var keywordsFilters = SteedosUI.getKeywordsSearchFilter(selfData.__keywords, allowSearchFields);
+        if(keywordsFilters && keywordsFilters.length > 0){
             userFilters.push(keywordsFilters);
-        };
+        }
 
         let filters = [];