@steedos-widgets/amis-object 1.2.8 → 1.2.9-beta.1

package/dist/amis-object.umd.js

@@ -2962,11 +2962,11 @@
               payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
           }
           const selfData = api.body.$self;
-          const filterFormSearchableFields = selfData.filterFormSearchableFields;
           const uiSchema = selfData.uiSchema;
           const fields = uiSchema.fields;
-          const searchableFields = [];
-
+          const filterFormSearchableFields = (selfData.filterFormSearchableFields || []).filter(function(item){
+            return !!fields[item]
+          });
           const resolveAll = function(values){
             payload.data = {
               "body": values
@@ -2981,21 +2981,7 @@
           return Promise.all(filterFormSearchableFields.map(function (item) {
             const field = _.clone(fields[item]);
             if (
-              field && !_.includes(
-                [
-                  "grid",
-                  "avatar",
-                  "image",
-                  "object",
-                  "[object]",
-                  "[Object]",
-                  "[grid]",
-                  "[text]",
-                  "audio",
-                  "file",
-                ],
-                field.type
-              )
+              field && window.isFieldTypeSearchable(field.type)
             ) {
               delete field.defaultValue;
               delete field.required;
@@ -3354,9 +3340,27 @@
                                         "headers": {
                                           "Authorization": "Bearer ${context.tenantId},${context.authToken}"
                                         },
-                                        "data": null,
+                                        "data": {
+                                          "$self": "$$"
+                                        },
                                         "requestAdaptor": "",
-                                        "adaptor": ""
+                                        "adaptor": `
+                                      if(payload.errors){
+                                          payload.status = 2;
+                                          payload.msg = window.t ? window.t(payload.errors[0].message) : payload.errors[0].message;
+                                      }
+                                      const selfData = api.body.$self;
+                                      const uiSchema = selfData.uiSchema;
+                                      const fields = uiSchema.fields;
+                                      const options = (payload.data?.options || []).filter(function(item){
+                                        let field = fields[item.value];
+                                        return !!field && window.isFieldTypeSearchable(field.type)
+                                      });
+                                      payload.data = {
+                                        "options": options
+                                      };
+                                      return payload;
+                                    `
                                       },
                                       "options": [],
                                       "required": true,
@@ -4054,9 +4058,9 @@ else{
             "icon": "fa fa-search",
             "type": "button",
             "badge": {
-              "offsetx": [
-                -2,
-                2
+              "offset": [
+                -5,
+                1
               ],
               "size":8,
               "animation": true,
@@ -6583,6 +6587,29 @@ else{
         window.getFieldSearchable = getFieldSearchable;
     }
 
+
+    function isFieldTypeSearchable(fieldType) {
+        return !___default__namespace.includes(
+            [
+                "grid",
+                "avatar",
+                "image",
+                "object",
+                "[object]",
+                "[Object]",
+                "[grid]",
+                "[text]",
+                "audio",
+                "file",
+            ],
+            fieldType
+        )
+    }
+
+    if (typeof window != 'undefined') {
+        window.isFieldTypeSearchable = isFieldTypeSearchable;
+    }
+
     var index = /*#__PURE__*/Object.freeze({
       __proto__: null,
       OMIT_FIELDS: OMIT_FIELDS,
@@ -6594,6 +6621,7 @@ else{
       getSelectFieldOptions: getSelectFieldOptions,
       convertSFieldToAmisField: convertSFieldToAmisField,
       getFieldSearchable: getFieldSearchable,
+      isFieldTypeSearchable: isFieldTypeSearchable,
       getAmisStaticFieldType: getAmisStaticFieldType
     });
 
@@ -13532,11 +13560,12 @@ else{
     }); };
 
     var AmisRecordDetailRelatedList = function (props) { return __awaiter(void 0, void 0, void 0, function () {
-        var $schema, objectApiName, recordId, relatedObjectApiName, relatedKey, top, perPage, hiddenEmptyTable, appId, relatedLabel, _a, className, columns, sort, filters, visible_on, requestAdaptor, adaptor, formFactor, formData, schema;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var $schema, objectApiName, recordId, relatedObjectApiName, data, relatedKey, top, perPage, hiddenEmptyTable, appId, relatedLabel, _a, className, columns, sort, filters, visible_on, requestAdaptor, adaptor, formFactor, formData, schema;
+        var _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0:
-                    $schema = props.$schema, objectApiName = props.objectApiName, recordId = props.recordId, relatedObjectApiName = props.relatedObjectApiName, props.data, relatedKey = props.relatedKey, top = props.top, perPage = props.perPage, hiddenEmptyTable = props.hiddenEmptyTable, appId = props.appId, relatedLabel = props.relatedLabel, _a = props.className, className = _a === void 0 ? '' : _a, columns = props.columns, sort = props.sort, filters = props.filters, visible_on = props.visible_on, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor;
+                    $schema = props.$schema, objectApiName = props.objectApiName, recordId = props.recordId, relatedObjectApiName = props.relatedObjectApiName, data = props.data, relatedKey = props.relatedKey, top = props.top, perPage = props.perPage, hiddenEmptyTable = props.hiddenEmptyTable, appId = props.appId, relatedLabel = props.relatedLabel, _a = props.className, className = _a === void 0 ? '' : _a, columns = props.columns, sort = props.sort, filters = props.filters, visible_on = props.visible_on, requestAdaptor = props.requestAdaptor, adaptor = props.adaptor;
                     formFactor = props.formFactor;
                     if (!formFactor) {
                         formFactor = window.innerWidth < 768 ? 'SMALL' : 'LARGE';
@@ -13557,8 +13586,17 @@ else{
                     }
                     return [4 /*yield*/, getRecordDetailRelatedListSchema(objectApiName, recordId, relatedObjectApiName, relatedKey, { top: top, perPage: perPage, appId: appId, relatedLabel: relatedLabel, className: className, formFactor: formFactor, columns: columns, sort: sort, filters: filters, visible_on: visible_on, isRelated: true, hiddenEmptyTable: hiddenEmptyTable, requestAdaptor: requestAdaptor, adaptor: adaptor })];
                 case 1:
-                    schema = (_b.sent()).amisSchema;
+                    schema = (_c.sent()).amisSchema;
                     schema.data = Object.assign(schema.data, formData);
+                    if (___default.has(props, "recordId") && $schema.recordId !== "${recordId}") {
+                        schema.data = Object.assign(schema.data, {
+                            _master: {
+                                record: (_b = data === null || data === void 0 ? void 0 : data._master) === null || _b === void 0 ? void 0 : _b.record,
+                                objectName: objectApiName,
+                                recordId: recordId
+                            }
+                        });
+                    }
                     return [2 /*return*/, schema];
             }
         });