@steedos-widgets/amis-lib 1.2.39 → 1.2.41

package/dist/index.esm.js

@@ -678,7 +678,7 @@ async function getFieldsTemplate(fields, display){
     let expandFieldsQuery = "";
     if(expandFields.length > 0){
         _$1.each(expandFields, function(field){
-            expandFieldsQuery = expandFieldsQuery + `${field.expandInfo.fieldName}:${field.expandInfo.fieldName}__expand{${field.expandInfo.displayName}}`;
+            expandFieldsQuery = expandFieldsQuery + `${field.expandInfo.fieldName}__expand{${field.expandInfo.displayName}}`;
         });
     }
 
@@ -3285,6 +3285,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
   }
   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){
@@ -3370,6 +3371,11 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
         }
       }
     }
+    else{
+      const keywordsSearchBoxName = "${keywordsSearchBoxName}";
+      //lookup字段保留快速搜索条件
+      removedValues[keywordsSearchBoxName] = filterFormValues[keywordsSearchBoxName];
+    }
     filterForm.reset();
     listView.handleFilterSubmit(removedValues);
     const filterService = filterForm.context.getComponents().find(function(n){
@@ -3434,7 +3440,7 @@ async function getObjectFieldsFilterBarSchema(objectSchema, ctx) {
           });
           // 有过滤条件时只显示搜索按钮上的红点，不自动展开搜索栏
           if(!_.isEmpty(omitedEmptyFormValue)){
-            let crudService = SteedosUI.getRef(data.$scopeId).getComponentById("service_listview_" + data.objectName)
+            let crudService = SteedosUI.getRef(data.$scopeId).parent.getComponentById("service_listview_" + data.objectName)
             crudService && crudService.setData({isFieldsFilterEmpty: false});
             // setData({ showFieldsFilter: true });//自动展开搜索栏
           }
@@ -5237,16 +5243,14 @@ crudService && crudService.setData({showFieldsFilter: toShowFieldsFilter});
 // }
 `;
 
-
-function getObjectHeaderToolbar(mainObject, fields, formFactor, { showDisplayAs = false, hiddenCount = false, headerToolbarItems, filterVisible = true, isLookup = false } = {}){
-  // 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 && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1) {
+    if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
       searchableFieldsLabel.push(field.label);
     }
   });
+
   const listViewPropsStoreKey = location.pathname + "/crud";
   let localListViewProps = sessionStorage.getItem(listViewPropsStoreKey);
   let crudKeywords = "";
@@ -5255,6 +5259,35 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, { showDisplayAs
     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;
@@ -5326,26 +5359,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, { showDisplayAs
         }
       } : {},
       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 })
   ]
   }else {
     return [
@@ -5405,26 +5419,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, { showDisplayAs
       // 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"
@@ -5842,7 +5837,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
             })){
                 i++;
                 tableFields.push(field);
-                if(field.searchable && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1){
+                if(isFieldQuickSearchable(field, refObjectConfig.NAME_FIELD_KEY)){
                     searchableFields.push(field.name);
                 }
             }
@@ -5883,7 +5878,8 @@ async function lookupToAmisPicker(field, readonly, ctx){
     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 = [];
@@ -5937,19 +5933,10 @@ async function lookupToAmisPicker(field, readonly, ctx){
             })
         }
 
-        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){
@@ -6067,7 +6054,7 @@ async function lookupToAmisPicker(field, readonly, ctx){
              pickerSchema.className = pickerSchema.className || "" + " steedos-select-user";
         }
 
-        pickerSchema.headerToolbar = getObjectHeaderToolbar(refObjectConfig, fieldsArr, ctx.formFactor, { headerToolbarItems, isLookup: true });
+        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 });
@@ -6078,8 +6065,9 @@ async function lookupToAmisPicker(field, readonly, ctx){
         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, {
@@ -6415,7 +6403,7 @@ async function lookupToAmis(field, readonly, ctx){
     }
 
     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);
         }
@@ -6790,7 +6778,7 @@ const getAmisFileSchema = (steedosField, readonly)=>{
     return readonly ? getAmisFileReadonlySchema(steedosField) : getAmisFileEditSchema(steedosField);
 };
 
-const SEARCHABLE_FIELD_TYPES = ["text", "textarea", "autonumber", "url", "email"];
+const QUICK_SEARCHABLE_FIELD_TYPES = ["text", "textarea", "autonumber", "url", "email"];
 const OMIT_FIELDS = ['created', 'created_by', 'modified', 'modified_by'];
 // const Lookup = require('./lookup');
 
@@ -7563,9 +7551,22 @@ if (typeof window != 'undefined') {
     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,
-  SEARCHABLE_FIELD_TYPES: SEARCHABLE_FIELD_TYPES,
+  QUICK_SEARCHABLE_FIELD_TYPES: QUICK_SEARCHABLE_FIELD_TYPES,
   OMIT_FIELDS: OMIT_FIELDS,
   getBaseFields: getBaseFields,
   getAmisFieldType: getAmisFieldType,
@@ -7576,6 +7577,7 @@ var index = /*#__PURE__*/Object.freeze({
   convertSFieldToAmisField: convertSFieldToAmisField,
   getFieldSearchable: getFieldSearchable,
   isFieldTypeSearchable: isFieldTypeSearchable,
+  isFieldQuickSearchable: isFieldQuickSearchable,
   getAmisStaticFieldType: getAmisStaticFieldType
 });
 
@@ -8352,8 +8354,9 @@ async function getTableApi(mainObject, fields, options){
     if(filter){
         baseFilters = filter;
     }
-    _$1.each(fields,function(field){
-        if(field.searchable && SEARCHABLE_FIELD_TYPES.indexOf(field.type) > -1){
+
+    _$1.each(fields, function (field) {
+        if (isFieldQuickSearchable(field, mainObject.NAME_FIELD_KEY)) {
             searchableFields.push(field.name);
         }
     });
@@ -8481,19 +8484,10 @@ async function getTableApi(mainObject, fields, options){
             })
         }
 
-        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 = [];
 
@@ -9355,6 +9349,39 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
       });
   `;
 
+  const onEventClickScript = `
+    const data = event.data;
+    const eventData = data.event;
+    const appId = data.appId;
+    const objectName = data.objectName;
+    const eventId = data.event && data.event.id;
+    doAction({
+      "actionType": "link",
+      "args": {
+        "link": "/app/" + appId + "/" + objectName + "/view/" + eventId
+      }
+    });
+    // doAction({
+    //   "actionType": "dialog",
+    //   "dialog": {
+    //     "type": "dialog",
+    //     "title": "",
+    //     "body": [
+    //       {
+    //         "type": "steedos-record-detail",
+    //         "objectApiName": "\${objectName}",
+    //         "recordId": data.event && data.event.id
+    //       }
+    //     ],
+    //     "closeOnEsc": false,
+    //     "closeOnOutside": false,
+    //     "showCloseButton": true,
+    //     "size": "lg",
+    //     "actions": []
+    //   }
+    // });
+  `;
+
   const recordId = "${event.id}";
   const recordPermissionsApi = getCalendarRecordPermissionsApi(objectSchema, recordId);
   const recordSaveApi = getCalendarRecordSaveApi(objectSchema, calendarOptions);
@@ -9400,11 +9427,16 @@ async function getObjectCalendar(objectSchema, calendarOptions, options) {
       "weight": 0,
       "actions": [
         {
-          "actionType": "link",
-          "args": {
-            "link": "/app/${appId}/${objectName}/view/${event.id}"
-          }
-        }
+          "actionType": "custom",
+          "script": onEventClickScript
+        },
+        // amis 升级到 3.2后，以下的"actionType": "link"方式拿不到appId和objectName了
+        // {
+        //   "actionType": "link",
+        //   "args": {
+        //     "link": "/app/${appId}/${objectName}/view/${event.id}"
+        //   }
+        // }
       ]
     },
     "eventAdd": {
@@ -10571,8 +10603,8 @@ async function getRelatedListSchema(
 /*
  * @Author: baozhoutao@steedos.com
  * @Date: 2022-07-05 15:55:39
- * @LastEditors: 殷亮辉 yinlianghui@hotoa.com
- * @LastEditTime: 2023-08-04 12:27:48
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-08-17 18:03:51
  * @Description:
  */
 
@@ -10943,7 +10975,7 @@ async function getTableSchema(
                 if(filedInfo && (filedInfo.type === 'lookup' || filedInfo.type === 'master_detail') && isString(filedInfo.reference_to) ){
                     const rfUiSchema = await getUISchema(filedInfo.reference_to);
                     const rfFieldInfo = rfUiSchema.fields[displayName];
-                    fields.push(Object.assign({}, rfFieldInfo, {name: column, expand: true, expandInfo: {fieldName, displayName}}));
+                    fields.push(Object.assign({}, rfFieldInfo, {name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: {fieldName, displayName}}));
                 }
             }else {
                 if(uiSchema.fields[column]){
@@ -10959,7 +10991,7 @@ async function getTableSchema(
                     const rfUiSchema = await getUISchema(filedInfo.reference_to);
                     const rfFieldInfo = rfUiSchema.fields[displayName];
                     fields.push(Object.assign({}, rfFieldInfo, 
-                        {name: column.field, expand: true, expandInfo: {fieldName, displayName}},
+                        {name: `${fieldName}__expand.${displayName}`, expand: true, expandInfo: {fieldName, displayName}},
                         {
                             width: column.width,
                             wrap: column.wrap, // wrap = true 是没效果的