@nocobase/client 0.8.1-alpha.4 → 0.9.0-alpha.2

package/es/acl/Configuration/schemas/roleCollections.js

@@ -14,18 +14,34 @@ var collection = {
       'x-component': 'Input',
       required: true
     }
-  }, // {
-  //   type: 'string',
-  //   name: 'name',
-  //   interface: 'input',
-  //   uiSchema: {
-  //     title: '数据表标识',
-  //     type: 'string',
-  //     'x-component': 'Input',
-  //     description: '使用英文',
-  //   } as ISchema,
-  // },
-  {
+  }, {
+    type: 'string',
+    name: 'name',
+    interface: 'input',
+    uiSchema: {
+      title: '{{t("Collection name")}}',
+      type: 'string',
+      'x-component': 'Input'
+    }
+  }, {
+    type: 'string',
+    name: 'type',
+    interface: 'input',
+    uiSchema: {
+      title: '{{t("Resource type")}}',
+      type: 'string',
+      'x-component': 'Select',
+      enum: [{
+        label: '{{t("Collection")}}',
+        value: 'collection',
+        color: 'green'
+      }, {
+        label: '{{t("Association")}}',
+        value: 'association',
+        color: 'blue'
+      }]
+    }
+  }, {
     type: 'string',
     name: 'usingConfig',
     interface: 'input',
@@ -91,7 +107,7 @@ export var roleCollectionsSchema = {
         useDataSource: '{{ cm.useDataSourceFromRAC }}'
       },
       properties: {
-        column1: {
+        column0: {
           type: 'void',
           'x-decorator': 'Table.Column.Decorator',
           'x-component': 'Table.Column',
@@ -103,6 +119,18 @@ export var roleCollectionsSchema = {
             }
           }
         },
+        // column1: {
+        //   type: 'void',
+        //   'x-decorator': 'Table.Column.Decorator',
+        //   'x-component': 'Table.Column',
+        //   properties: {
+        //     type: {
+        //       type: 'string',
+        //       'x-component': 'CollectionField',
+        //       'x-read-pretty': true,
+        //     },
+        //   },
+        // },
         column2: {
           type: 'void',
           'x-decorator': 'Table.Column.Decorator',

package/es/acl/Configuration/schemas/roles.js

@@ -5,7 +5,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import { uid } from '@formily/shared';
+import pick from 'lodash/pick';
+import { useEffect } from 'react';
 import { useRequest } from '../../../api-client';
+import { useRecord } from '../../../record-provider';
 import { useActionContext } from '../../../schema-component';
 import { roleCollectionsSchema } from './roleCollections';
 var collection = {
@@ -109,7 +112,8 @@ export var roleSchema = {
                       return useRequest(function () {
                         return Promise.resolve({
                           data: {
-                            name: "r_".concat(uid())
+                            name: "r_".concat(uid()),
+                            snippets: ['!ui.*', '!pm', '!pm.*']
                           }
                         });
                       }, _objectSpread(_objectSpread({}, options), {}, {
@@ -225,11 +229,14 @@ export var roleSchema = {
                       type: 'void',
                       title: '{{t("Configure")}}',
                       'x-component': 'Action.Link',
+                      'x-decorator': 'ACLActionProvider',
+                      'x-acl-action': 'roles:update',
                       'x-component-props': {},
                       properties: {
                         drawer: {
                           type: 'void',
                           'x-component': 'Action.Drawer',
+                          'x-decorator': 'PermissionProvider',
                           title: '{{t("Configure permissions")}}',
                           properties: {
                             tabs1: {
@@ -268,6 +275,19 @@ export var roleSchema = {
                                       'x-component': 'MenuConfigure'
                                     }
                                   }
+                                },
+                                tab4: {
+                                  type: 'void',
+                                  title: '{{t("Plugin settings permissions")}}',
+                                  'x-decorator': 'SettingCenterPermissionProvider',
+                                  'x-component': 'Tabs.TabPane',
+                                  'x-component-props': {},
+                                  properties: {
+                                    menu: {
+                                      'x-decorator': 'SettingCenterProvider',
+                                      'x-component': 'SettingsCenterConfigure'
+                                    }
+                                  }
                                 }
                               }
                             }
@@ -278,6 +298,8 @@ export var roleSchema = {
                     update: {
                       type: 'void',
                       title: '{{t("Edit")}}',
+                      'x-decorator': 'ACLActionProvider',
+                      'x-acl-action': 'roles:update',
                       'x-component': 'Action.Link',
                       'x-component-props': {
                         type: 'primary'
@@ -288,7 +310,23 @@ export var roleSchema = {
                           'x-component': 'Action.Drawer',
                           'x-decorator': 'Form',
                           'x-decorator-props': {
-                            useValues: '{{ cm.useValuesFromRecord }}'
+                            useValues: function useValues(options) {
+                              var record = useRecord();
+                              var result = useRequest(function () {
+                                return Promise.resolve({
+                                  data: pick(record, ['title', 'name', 'default'])
+                                });
+                              }, _objectSpread(_objectSpread({}, options), {}, {
+                                manual: true
+                              }));
+                              var ctx = useActionContext();
+                              useEffect(function () {
+                                if (ctx.visible) {
+                                  result.run();
+                                }
+                              }, [ctx.visible]);
+                              return result;
+                            }
                           },
                           title: '{{t("Edit role")}}',
                           properties: {
@@ -335,6 +373,8 @@ export var roleSchema = {
                     delete: {
                       type: 'void',
                       title: '{{ t("Delete") }}',
+                      'x-acl-action': 'roles:destroy',
+                      'x-decorator': 'ACLActionProvider',
                       'x-component': 'Action.Link',
                       'x-component-props': {
                         confirm: {

package/es/acl/Configuration/schemas/scopes.js

@@ -224,6 +224,7 @@ export var scopesSchema = {
                               type: 'void',
                               title: '{{ t("Edit") }}',
                               'x-action': 'update',
+                              'x-decorator': 'ACLActionProvider',
                               'x-component': 'Action.Link',
                               'x-component-props': {
                                 openMode: 'drawer',
@@ -310,6 +311,7 @@ export var scopesSchema = {
                             destroy: {
                               title: '{{ t("Delete") }}',
                               'x-action': 'destroy',
+                              'x-decorator': 'ACLActionProvider',
                               'x-component': 'Action.Link',
                               'x-designer': 'Action.Designer',
                               'x-component-props': {

package/es/acl/index.d.ts

@@ -1,2 +1,3 @@
 export * from './ACLProvider';
 export * from './ACLShortcut';
+import './style.less';

package/es/acl/index.js

@@ -1,2 +1,3 @@
 export * from './ACLProvider';
-export * from './ACLShortcut';
+export * from './ACLShortcut';
+import './style.less';

package/es/acl/style.less

@@ -0,0 +1,10 @@
+.ant-table-cell {
+  > .ant-space-horizontal {
+    .ant-space-item:empty:not(:last-child) + .ant-space-item-split {
+      display: none;
+    }
+    .ant-space-item-split:has(+ .ant-space-item:empty) {
+      display: none;
+    }
+  }
+}

package/es/antd-config-provider/index.d.ts

@@ -1,2 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
+export declare const AppLangContext: React.Context<any>;
+export declare const useAppLangContext: () => any;
 export declare function AntdConfigProvider(props: any): JSX.Element;

package/es/antd-config-provider/index.js

@@ -11,11 +11,18 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 import { ConfigProvider, Spin } from 'antd';
-import React from 'react';
+import moment from 'moment';
+import React, { createContext, useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAPIClient, useRequest } from '../api-client';
-import locale from '../locale';
+import { loadConstrueLocale } from './loadConstrueLocale';
+export var AppLangContext = /*#__PURE__*/createContext({});
+export var useAppLangContext = function useAppLangContext() {
+  return useContext(AppLangContext);
+};
 export function AntdConfigProvider(props) {
+  var _data$data9;
+
   var remoteLocale = props.remoteLocale,
       others = _objectWithoutProperties(props, _excluded);
 
@@ -28,7 +35,7 @@ export function AntdConfigProvider(props) {
     url: 'app:getLang'
   }, {
     onSuccess: function onSuccess(data) {
-      var _data$data;
+      var _data$data, _data$data4, _data$data7, _data$data8;
 
       var locale = api.auth.locale;
 
@@ -38,18 +45,30 @@ export function AntdConfigProvider(props) {
         api.auth.setLocale(data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.lang);
         i18n.changeLanguage(data === null || data === void 0 ? void 0 : (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : _data$data3.lang);
       }
+
+      Object.keys((data === null || data === void 0 ? void 0 : (_data$data4 = data.data) === null || _data$data4 === void 0 ? void 0 : _data$data4.resources) || {}).forEach(function (key) {
+        var _data$data5, _data$data6;
+
+        i18n.addResources(data === null || data === void 0 ? void 0 : (_data$data5 = data.data) === null || _data$data5 === void 0 ? void 0 : _data$data5.lang, key, (data === null || data === void 0 ? void 0 : (_data$data6 = data.data) === null || _data$data6 === void 0 ? void 0 : _data$data6.resources[key]) || {});
+      });
+      loadConstrueLocale(data === null || data === void 0 ? void 0 : data.data);
+      moment.locale(data === null || data === void 0 ? void 0 : (_data$data7 = data.data) === null || _data$data7 === void 0 ? void 0 : _data$data7.moment);
+      window['cronLocale'] = data === null || data === void 0 ? void 0 : (_data$data8 = data.data) === null || _data$data8 === void 0 ? void 0 : _data$data8.cron;
     },
     manual: !remoteLocale
   }),
+      data = _useRequest.data,
       loading = _useRequest.loading;
 
   if (loading) {
     return /*#__PURE__*/React.createElement(Spin, null);
   }
 
-  return /*#__PURE__*/React.createElement(ConfigProvider, _objectSpread(_objectSpread({
+  return /*#__PURE__*/React.createElement(AppLangContext.Provider, {
+    value: data === null || data === void 0 ? void 0 : data.data
+  }, /*#__PURE__*/React.createElement(ConfigProvider, _objectSpread(_objectSpread({
     dropdownMatchSelectWidth: false
   }, others), {}, {
-    locale: locale[i18n.language].antd
-  }), props.children);
+    locale: (data === null || data === void 0 ? void 0 : (_data$data9 = data.data) === null || _data$data9 === void 0 ? void 0 : _data$data9.antd) || {}
+  }), props.children));
 }

package/es/antd-config-provider/loadConstrueLocale.d.ts

@@ -0,0 +1 @@
+export declare const loadConstrueLocale: (data: any) => void;

package/es/antd-config-provider/loadConstrueLocale.js

@@ -0,0 +1,293 @@
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+import cronstrue from 'cronstrue';
+
+var CronstrueLocale = /*#__PURE__*/function () {
+  function CronstrueLocale(data) {
+    _classCallCheck(this, CronstrueLocale);
+
+    this.data = void 0;
+    this.data = data;
+  }
+
+  _createClass(CronstrueLocale, [{
+    key: "atX0SecondsPastTheMinuteGt20",
+    value: function atX0SecondsPastTheMinuteGt20() {
+      return this.data['atX0SecondsPastTheMinuteGt20'];
+    }
+  }, {
+    key: "atX0MinutesPastTheHourGt20",
+    value: function atX0MinutesPastTheHourGt20() {
+      return this.data['atX0MinutesPastTheHourGt20'];
+    }
+  }, {
+    key: "commaMonthX0ThroughMonthX1",
+    value: function commaMonthX0ThroughMonthX1() {
+      return this.data['commaMonthX0ThroughMonthX1'];
+    }
+  }, {
+    key: "commaYearX0ThroughYearX1",
+    value: function commaYearX0ThroughYearX1() {
+      return this.data['commaYearX0ThroughYearX1'];
+    }
+  }, {
+    key: "use24HourTimeFormatByDefault",
+    value: function use24HourTimeFormatByDefault() {
+      return this.data['use24HourTimeFormatByDefault'];
+    }
+  }, {
+    key: "anErrorOccuredWhenGeneratingTheExpressionD",
+    value: function anErrorOccuredWhenGeneratingTheExpressionD() {
+      return this.data['anErrorOccuredWhenGeneratingTheExpressionD'];
+    }
+  }, {
+    key: "everyMinute",
+    value: function everyMinute() {
+      return this.data['everyMinute'];
+    }
+  }, {
+    key: "everyHour",
+    value: function everyHour() {
+      return this.data['everyHour'];
+    }
+  }, {
+    key: "atSpace",
+    value: function atSpace() {
+      return this.data['atSpace'];
+    }
+  }, {
+    key: "everyMinuteBetweenX0AndX1",
+    value: function everyMinuteBetweenX0AndX1() {
+      return this.data['everyMinuteBetweenX0AndX1'];
+    }
+  }, {
+    key: "at",
+    value: function at() {
+      return this.data['at'];
+    }
+  }, {
+    key: "spaceAnd",
+    value: function spaceAnd() {
+      return this.data['spaceAnd'];
+    }
+  }, {
+    key: "everySecond",
+    value: function everySecond() {
+      return this.data['everySecond'];
+    }
+  }, {
+    key: "everyX0Seconds",
+    value: function everyX0Seconds() {
+      return this.data['everyX0Seconds'];
+    }
+  }, {
+    key: "secondsX0ThroughX1PastTheMinute",
+    value: function secondsX0ThroughX1PastTheMinute() {
+      return this.data['secondsX0ThroughX1PastTheMinute'];
+    }
+  }, {
+    key: "atX0SecondsPastTheMinute",
+    value: function atX0SecondsPastTheMinute() {
+      return this.data['atX0SecondsPastTheMinute'];
+    }
+  }, {
+    key: "everyX0Minutes",
+    value: function everyX0Minutes() {
+      return this.data['everyX0Minutes'];
+    }
+  }, {
+    key: "minutesX0ThroughX1PastTheHour",
+    value: function minutesX0ThroughX1PastTheHour() {
+      return this.data['minutesX0ThroughX1PastTheHour'];
+    }
+  }, {
+    key: "atX0MinutesPastTheHour",
+    value: function atX0MinutesPastTheHour() {
+      return this.data['atX0MinutesPastTheHour'];
+    }
+  }, {
+    key: "everyX0Hours",
+    value: function everyX0Hours() {
+      return this.data['everyX0Hours'];
+    }
+  }, {
+    key: "betweenX0AndX1",
+    value: function betweenX0AndX1() {
+      return this.data['betweenX0AndX1'];
+    }
+  }, {
+    key: "atX0",
+    value: function atX0() {
+      return this.data['atX0'];
+    }
+  }, {
+    key: "commaEveryDay",
+    value: function commaEveryDay() {
+      return this.data['commaEveryDay'];
+    }
+  }, {
+    key: "commaEveryX0DaysOfTheWeek",
+    value: function commaEveryX0DaysOfTheWeek() {
+      return this.data['commaEveryX0DaysOfTheWeek'];
+    }
+  }, {
+    key: "commaX0ThroughX1",
+    value: function commaX0ThroughX1() {
+      return this.data['commaX0ThroughX1'];
+    }
+  }, {
+    key: "commaAndX0ThroughX1",
+    value: function commaAndX0ThroughX1() {
+      return this.data['commaAndX0ThroughX1'];
+    }
+  }, {
+    key: "first",
+    value: function first() {
+      return this.data['first'];
+    }
+  }, {
+    key: "second",
+    value: function second() {
+      return this.data['second'];
+    }
+  }, {
+    key: "third",
+    value: function third() {
+      return this.data['third'];
+    }
+  }, {
+    key: "fourth",
+    value: function fourth() {
+      return this.data['fourth'];
+    }
+  }, {
+    key: "fifth",
+    value: function fifth() {
+      return this.data['fifth'];
+    }
+  }, {
+    key: "commaOnThe",
+    value: function commaOnThe() {
+      return this.data['commaOnThe'];
+    }
+  }, {
+    key: "spaceX0OfTheMonth",
+    value: function spaceX0OfTheMonth() {
+      return this.data['spaceX0OfTheMonth'];
+    }
+  }, {
+    key: "lastDay",
+    value: function lastDay() {
+      return this.data['lastDay'];
+    }
+  }, {
+    key: "commaOnTheLastX0OfTheMonth",
+    value: function commaOnTheLastX0OfTheMonth() {
+      return this.data['commaOnTheLastX0OfTheMonth'];
+    }
+  }, {
+    key: "commaOnlyOnX0",
+    value: function commaOnlyOnX0() {
+      return this.data['commaOnlyOnX0'];
+    }
+  }, {
+    key: "commaAndOnX0",
+    value: function commaAndOnX0() {
+      return this.data['commaAndOnX0'];
+    }
+  }, {
+    key: "commaEveryX0Months",
+    value: function commaEveryX0Months() {
+      return this.data['commaEveryX0Months'];
+    }
+  }, {
+    key: "commaOnlyInX0",
+    value: function commaOnlyInX0() {
+      return this.data['commaOnlyInX0'];
+    }
+  }, {
+    key: "commaOnTheLastDayOfTheMonth",
+    value: function commaOnTheLastDayOfTheMonth() {
+      return this.data['commaOnTheLastDayOfTheMonth'];
+    }
+  }, {
+    key: "commaOnTheLastWeekdayOfTheMonth",
+    value: function commaOnTheLastWeekdayOfTheMonth() {
+      return this.data['commaOnTheLastWeekdayOfTheMonth'];
+    }
+  }, {
+    key: "commaDaysBeforeTheLastDayOfTheMonth",
+    value: function commaDaysBeforeTheLastDayOfTheMonth() {
+      return this.data['commaDaysBeforeTheLastDayOfTheMonth'];
+    }
+  }, {
+    key: "firstWeekday",
+    value: function firstWeekday() {
+      return this.data['firstWeekday'];
+    }
+  }, {
+    key: "weekdayNearestDayX0",
+    value: function weekdayNearestDayX0() {
+      return this.data['weekdayNearestDayX0'];
+    }
+  }, {
+    key: "commaOnTheX0OfTheMonth",
+    value: function commaOnTheX0OfTheMonth() {
+      return this.data['commaOnTheX0OfTheMonth'];
+    }
+  }, {
+    key: "commaEveryX0Days",
+    value: function commaEveryX0Days() {
+      return this.data['commaEveryX0Days'];
+    }
+  }, {
+    key: "commaBetweenDayX0AndX1OfTheMonth",
+    value: function commaBetweenDayX0AndX1OfTheMonth() {
+      return this.data['commaBetweenDayX0AndX1OfTheMonth'];
+    }
+  }, {
+    key: "commaOnDayX0OfTheMonth",
+    value: function commaOnDayX0OfTheMonth() {
+      return this.data['commaOnDayX0OfTheMonth'];
+    }
+  }, {
+    key: "commaEveryHour",
+    value: function commaEveryHour() {
+      return this.data['commaEveryHour'];
+    }
+  }, {
+    key: "commaEveryX0Years",
+    value: function commaEveryX0Years() {
+      return this.data['commaEveryX0Years'];
+    }
+  }, {
+    key: "commaStartingX0",
+    value: function commaStartingX0() {
+      return this.data['commaStartingX0'];
+    }
+  }, {
+    key: "daysOfTheWeek",
+    value: function daysOfTheWeek() {
+      return this.data['daysOfTheWeek'];
+    }
+  }, {
+    key: "monthsOfTheYear",
+    value: function monthsOfTheYear() {
+      return this.data['monthsOfTheYear'];
+    }
+  }]);
+
+  return CronstrueLocale;
+}();
+
+export var loadConstrueLocale = function loadConstrueLocale(data) {
+  cronstrue.initialize({
+    load: function load(availableLocales) {
+      availableLocales[data === null || data === void 0 ? void 0 : data.lang] = new CronstrueLocale(data === null || data === void 0 ? void 0 : data.cronstrue);
+    }
+  });
+};

package/es/api-client/APIClient.js

@@ -74,6 +74,11 @@ export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
   }, {
     key: "interceptors",
     value: function interceptors() {
+      this.axios.interceptors.request.use(function (config) {
+        config.headers['X-With-ACL-Meta'] = true;
+        return config;
+      });
+
       _get(_getPrototypeOf(APIClient.prototype), "interceptors", this).call(this);
 
       this.notification();

package/es/block-provider/FormBlockProvider.js

@@ -7,11 +7,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { createForm } from '@formily/core';
 import { useField } from '@formily/react';
 import { Spin } from 'antd';
+import isEmpty from 'lodash/isEmpty';
 import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
+import { useCollectionManager } from '../collection-manager';
 import { RecordProvider, useRecord } from '../record-provider';
-import { BlockProvider, useBlockRequestContext } from './BlockProvider';
 import { useDesignable } from '../schema-component';
-import { useCollectionManager } from '../collection-manager';
+import { BlockProvider, useBlockRequestContext } from './BlockProvider';
 export var FormBlockContext = /*#__PURE__*/createContext({});
 
 var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
@@ -31,6 +32,7 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       service = _useBlockRequestConte.service;
 
   var formBlockRef = useRef();
+  var record = useRecord();
 
   if (service.loading) {
     return /*#__PURE__*/React.createElement(Spin, null);
@@ -47,6 +49,7 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       formBlockRef: formBlockRef
     }
   }, readPretty ? /*#__PURE__*/React.createElement(RecordProvider, {
+    parent: isEmpty(record === null || record === void 0 ? void 0 : record.__parent) ? record : record === null || record === void 0 ? void 0 : record.__parent,
     record: service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data
   }, /*#__PURE__*/React.createElement("div", {
     ref: formBlockRef

package/es/block-provider/KanbanBlockProvider.js

@@ -197,14 +197,14 @@ var useDisableCardDrag = function useDisableCardDrag() {
   var _useACLRoleContext = useACLRoleContext(),
       allowAll = _useACLRoleContext.allowAll,
       allowConfigure = _useACLRoleContext.allowConfigure,
-      getActionParams = _useACLRoleContext.getActionParams;
+      parseAction = _useACLRoleContext.parseAction;
 
   if (allowAll || allowConfigure) {
     return false;
   }
 
-  var result = getActionParams("".concat(ctx === null || ctx === void 0 ? void 0 : (_ctx$props = ctx.props) === null || _ctx$props === void 0 ? void 0 : _ctx$props.resource, ":update"), {
-    skipOwnCheck: true
+  var result = parseAction("".concat(ctx === null || ctx === void 0 ? void 0 : (_ctx$props = ctx.props) === null || _ctx$props === void 0 ? void 0 : _ctx$props.resource, ":update"), {
+    ignoreScope: true
   });
   return !result;
 };

package/es/block-provider/SharedFilterProvider.d.ts

@@ -12,6 +12,7 @@ export declare type SharedFilterContextValue = {
     setSharedFilterStore: (filterStore: SharedFilterStore) => void;
     getFilterParams: (filterStore?: SharedFilterStore) => any;
 };
+export declare const mergeFilter: (filters: any[], op?: string) => any;
 export declare const getFilterParams: (filterStore?: SharedFilterStore) => {
     $and: SharedFilter[];
 } | {