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

package/es/schema-component/antd/cron/Cron.js

@@ -14,36 +14,33 @@ 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 React from 'react';
+import { css } from '@emotion/css';
 import { connect, mapReadPretty } from '@formily/react';
-import { Cron as ReactCron } from 'react-js-cron';
 import cronstrue from 'cronstrue';
-import 'cronstrue/locales/zh_CN';
-import { css } from '@emotion/css';
-import localeZhCN from './locale/zh-CN';
-var ComponentLocales = {
-  'zh-CN': localeZhCN
-};
-var ReadPrettyLocales = {
-  'en-US': 'en',
-  'zh-CN': 'zh_CN'
-};
-export var Cron = connect(function (props) {
+import React from 'react';
+import { Cron as ReactCron } from 'react-js-cron';
+import { useAPIClient } from '../../../api-client';
+
+var Input = function Input(props) {
   var onChange = props.onChange,
       rest = _objectWithoutProperties(props, _excluded);
 
-  var locale = ComponentLocales[localStorage.getItem('NOCOBASE_LOCALE') || 'en-US'];
   return /*#__PURE__*/React.createElement("fieldset", {
-    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        .react-js-cron{\n          padding: .5em .5em 0 .5em;\n          border: 1px dashed #ccc;\n\n          .react-js-cron-field{\n            flex-shrink: 0;\n            margin-bottom: .5em;\n\n            > span{\n              flex-shrink: 0;\n              margin: 0 .5em 0 0;\n            }\n\n            > .react-js-cron-select{\n              margin: 0 .5em 0 0;\n            }\n          }\n      "])))
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        .react-js-cron {\n          padding: 0.5em 0.5em 0 0.5em;\n          border: 1px dashed #ccc;\n          .react-js-cron-field {\n            flex-shrink: 0;\n            margin-bottom: 0.5em;\n\n            > span {\n              flex-shrink: 0;\n              margin: 0 0.5em 0 0;\n            }\n\n            > .react-js-cron-select {\n              margin: 0 0.5em 0 0;\n            }\n          }\n        }\n      "])))
   }, /*#__PURE__*/React.createElement(ReactCron, _objectSpread({
     setValue: onChange,
-    locale: locale
+    locale: window['cronLocale']
   }, rest)));
-}, mapReadPretty(function (props) {
-  var locale = ReadPrettyLocales[localStorage.getItem('NOCOBASE_LOCALE') || 'en-US'];
+};
+
+var ReadPretty = function ReadPretty(props) {
+  var api = useAPIClient();
+  var locale = api.auth.getLocale();
   return props.value ? /*#__PURE__*/React.createElement("span", null, cronstrue.toString(props.value, {
     locale: locale,
     use24HourTimeFormat: true
   })) : null;
-}));
+};
+
+export var Cron = connect(Input, mapReadPretty(ReadPretty));
 export default Cron;

package/es/schema-component/antd/cron/locale/index.d.ts

@@ -0,0 +1,37 @@
+declare const _default: {
+    'zh-CN': {
+        everyText: string;
+        emptyMonths: string;
+        emptyMonthDays: string;
+        emptyMonthDaysShort: string;
+        emptyWeekDays: string;
+        emptyWeekDaysShort: string;
+        emptyHours: string;
+        emptyMinutes: string;
+        emptyMinutesForHourPeriod: string;
+        yearOption: string;
+        monthOption: string;
+        weekOption: string;
+        dayOption: string;
+        hourOption: string;
+        minuteOption: string;
+        rebootOption: string;
+        prefixPeriod: string;
+        prefixMonths: string;
+        prefixMonthDays: string;
+        prefixWeekDays: string;
+        prefixWeekDaysForMonthAndYearPeriod: string;
+        prefixHours: string;
+        prefixMinutes: string;
+        prefixMinutesForHourPeriod: string;
+        suffixMinutesForHourPeriod: string;
+        errorInvalidCron: string;
+        clearButtonText: string;
+        weekDays: string[];
+        months: string[];
+        altWeekDays: string[];
+        altMonths: string[];
+    };
+    'en-US': import("react-js-cron").DefaultLocale;
+};
+export default _default;

package/es/schema-component/antd/cron/locale/index.js

@@ -0,0 +1,6 @@
+import { DEFAULT_LOCALE_EN } from 'react-js-cron/dist/cjs/locale';
+import zhCN from './zh-CN';
+export default {
+  'zh-CN': zhCN,
+  'en-US': DEFAULT_LOCALE_EN
+};

package/es/schema-component/antd/filter/useFilterActionProps.js

@@ -18,10 +18,9 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 import { useField, useFieldSchema } from '@formily/react';
 import flat from 'flat';
-import { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useBlockRequestContext } from '../../../block-provider';
-import { concatFilter, SharedFilterContext } from '../../../block-provider/SharedFilterProvider';
+import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
 export var useFilterOptions = function useFilterOptions(collectionName) {
   var _useCollectionManager = useCollectionManager(),
@@ -155,32 +154,23 @@ export var useFilterFieldProps = function useFilterFieldProps(_ref) {
       t = _useTranslation.t;
 
   var field = useField();
-
-  var _useContext = useContext(SharedFilterContext),
-      sharedFilterStore = _useContext.sharedFilterStore,
-      setSharedFilterStore = _useContext.setSharedFilterStore,
-      getFilterParams = _useContext.getFilterParams;
-
   return {
     options: options,
     onSubmit: function onSubmit(values) {
-      var _service$params;
+      var _service$params, _service$params$, _service$params2;
 
       // filter parameter for the block
       var defaultFilter = params.filter; // filter parameter for the filter action
 
       var filter = removeNullCondition(values === null || values === void 0 ? void 0 : values.filter);
-
-      var newSharedFilterStore = _objectSpread(_objectSpread({}, sharedFilterStore), {}, {
-        ActionBar: concatFilter(defaultFilter, filter)
-      });
-
-      setSharedFilterStore(newSharedFilterStore);
-      var paramFilter = getFilterParams(newSharedFilterStore);
-      service.run(_objectSpread(_objectSpread({}, (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params[0]), {}, {
+      var filters = ((_service$params = service.params) === null || _service$params === void 0 ? void 0 : (_service$params$ = _service$params[1]) === null || _service$params$ === void 0 ? void 0 : _service$params$.filters) || {};
+      filters["filterAction"] = filter;
+      service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
         page: 1,
-        filter: paramFilter
-      }));
+        filter: mergeFilter([].concat(_toConsumableArray(Object.values(filters)), [defaultFilter]))
+      }), {
+        filters: filters
+      });
       var items = (filter === null || filter === void 0 ? void 0 : filter.$and) || (filter === null || filter === void 0 ? void 0 : filter.$or);
 
       if (items === null || items === void 0 ? void 0 : items.length) {
@@ -192,13 +182,17 @@ export var useFilterFieldProps = function useFilterFieldProps(_ref) {
       }
     },
     onReset: function onReset() {
-      var _service$params2;
+      var _service$params3, _service$params3$, _service$params4;
 
       var filter = params.filter;
-      service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
-        filter: filter,
+      var filters = ((_service$params3 = service.params) === null || _service$params3 === void 0 ? void 0 : (_service$params3$ = _service$params3[1]) === null || _service$params3$ === void 0 ? void 0 : _service$params3$.filters) || {};
+      delete filters["filterAction"];
+      service.run(_objectSpread(_objectSpread({}, (_service$params4 = service.params) === null || _service$params4 === void 0 ? void 0 : _service$params4[0]), {}, {
+        filter: mergeFilter([].concat(_toConsumableArray(Object.values(filters)), [filter])),
         page: 1
-      }));
+      }), {
+        filters: filters
+      });
       field.title = t('Filter');
     }
   };

package/es/schema-component/antd/form-item/FormItem.js

@@ -21,10 +21,11 @@ import { uid } from '@formily/shared';
 import _ from 'lodash';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useCompile, useDesignable, useFieldComponentOptions } from '../../hooks';
+import { ACLCollectionFieldProvider } from '../../../acl/ACLProvider';
 import { useFilterByTk, useFormBlockContext } from '../../../block-provider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
+import { useCompile, useDesignable, useFieldComponentOptions } from '../../hooks';
 import { BlockItem } from '../block-item';
 import { HTMLEncode } from '../input/shared';
 
@@ -38,17 +39,17 @@ var divWrap = function divWrap(schema) {
 
 export var FormItem = function FormItem(props) {
   var field = useField();
-  return /*#__PURE__*/React.createElement(BlockItem, {
+  return /*#__PURE__*/React.createElement(ACLCollectionFieldProvider, null, /*#__PURE__*/React.createElement(BlockItem, {
     className: 'nb-form-item'
   }, /*#__PURE__*/React.createElement(Item, _objectSpread(_objectSpread({
-    className: "".concat(css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          & .ant-space {\n            flex-wrap: wrap;\n          }\n        "]))))
+    className: "".concat(css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            & .ant-space {\n              flex-wrap: wrap;\n            }\n          "]))))
   }, props), {}, {
     extra: typeof field.description === 'string' ? /*#__PURE__*/React.createElement("div", {
       dangerouslySetInnerHTML: {
         __html: HTMLEncode(field.description).split('\n').join('<br/>')
       }
     }) : field.description
-  })));
+  }))));
 };
 
 FormItem.Designer = function (props) {

package/es/schema-component/antd/index.d.ts

@@ -4,14 +4,13 @@ export * from './calendar';
 export * from './card-item';
 export * from './cascader';
 export * from './checkbox';
-export * from './cron';
 export * from './color-select';
+export * from './cron';
 export * from './date-picker';
 export * from './filter';
 export * from './form';
 export * from './form-item';
 export * from './form-v2';
-export * from './formula-input';
 export * from './g2plot';
 export * from './grid';
 export * from './icon-picker';

package/es/schema-component/antd/index.js

@@ -4,14 +4,13 @@ export * from './calendar';
 export * from './card-item';
 export * from './cascader';
 export * from './checkbox';
-export * from './cron';
 export * from './color-select';
+export * from './cron';
 export * from './date-picker';
 export * from './filter';
 export * from './form';
 export * from './form-item';
 export * from './form-v2';
-export * from './formula-input';
 export * from './g2plot';
 export * from './grid';
 export * from './icon-picker';

package/es/schema-component/antd/page/FixedBlock.d.ts

@@ -4,7 +4,7 @@ export declare const useFixedSchema: () => void;
 export declare const useFixedBlock: () => {
     setFixedSchema: (schema: Schema) => void;
     height: number;
-    schema: Schema<any, any, any, any, any, any, any, any, any>;
+    fixedSchemaRef: React.MutableRefObject<Schema<any, any, any, any, any, any, any, any, any>>;
 };
 export declare const useFixedBlockDesignerSetting: () => JSX.Element;
 interface FixedBlockProps {

package/es/schema-component/antd/page/FixedBlock.js

@@ -14,8 +14,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 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; }
 
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { RecursionField, useField, useFieldSchema } from '@formily/react';
 import { css } from '@emotion/css';
@@ -23,10 +31,11 @@ import { SchemaSettings } from '../../../schema-settings';
 import { useTranslation } from 'react-i18next';
 import { useDesignable } from '../../hooks';
 import { useRecord } from '../../../record-provider';
+import { useBlockTemplateContext } from '../../../schema-templates/BlockTemplate';
 var FixedBlockContext = /*#__PURE__*/React.createContext({
   setFixedSchema: function setFixedSchema(schema) {},
   height: 0,
-  schema: {}
+  fixedSchemaRef: {}
 });
 export var useFixedSchema = function useFixedSchema() {
   var _field$decoratorProps, _fieldSchema$xDecora2;
@@ -35,21 +44,29 @@ export var useFixedSchema = function useFixedSchema() {
   var fieldSchema = useFieldSchema();
 
   var _useFixedBlock = useFixedBlock(),
-      setFixedSchema = _useFixedBlock.setFixedSchema;
+      setFixedSchema = _useFixedBlock.setFixedSchema,
+      fixedSchemaRef = _useFixedBlock.fixedSchemaRef;
+
+  var _useBlockTemplateCont = useBlockTemplateContext(),
+      templateFieldSchema = _useBlockTemplateCont.fieldSchema;
 
   var hasSet = useRef(false);
   useEffect(function () {
     var _fieldSchema$xDecora;
 
     if (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : _fieldSchema$xDecora.fixedBlock) {
-      setFixedSchema(fieldSchema);
+      var nextSchema = templateFieldSchema || fieldSchema;
+      setFixedSchema(nextSchema);
       hasSet.current = true;
+    } else if (hasSet.current) {
+      setFixedSchema(null);
     }
   }, [field === null || field === void 0 ? void 0 : (_field$decoratorProps = field.decoratorProps) === null || _field$decoratorProps === void 0 ? void 0 : _field$decoratorProps.fixedBlock, fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora2 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora2 === void 0 ? void 0 : _fieldSchema$xDecora2.fixedBlock]);
   useEffect(function () {
     return function () {
-      if (hasSet.current) {
+      if (hasSet.current && fixedSchemaRef.current) {
         setFixedSchema(null);
+        fixedSchemaRef.current = null;
       }
     };
   }, []);
@@ -79,15 +96,40 @@ export var useFixedBlockDesignerSetting = function useFixedBlockDesignerSetting(
     return /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
       title: t('Fix block'),
       checked: fieldSchema['x-decorator-props']['fixedBlock'],
-      onChange: function onChange(fixedBlock) {
-        var _schema;
-
-        field.decoratorProps.fixedBlock = fixedBlock;
-        fieldSchema['x-decorator-props'].fixedBlock = fixedBlock;
-        dn.emit('patch', {
-          schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, 'x-decorator-props', fieldSchema['x-decorator-props']), _schema)
-        });
-      }
+      onChange: function () {
+        var _onChange = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(fixedBlock) {
+          var _schema;
+
+          var decoratorProps;
+          return regeneratorRuntime.wrap(function _callee$(_context) {
+            while (1) {
+              switch (_context.prev = _context.next) {
+                case 0:
+                  decoratorProps = _objectSpread(_objectSpread({}, fieldSchema['x-decorator-props']), {}, {
+                    fixedBlock: fixedBlock
+                  });
+                  _context.next = 3;
+                  return dn.emit('patch', {
+                    schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, 'x-decorator-props', decoratorProps), _schema)
+                  });
+
+                case 3:
+                  field.decoratorProps = fieldSchema['x-decorator-props'] = decoratorProps;
+
+                case 4:
+                case "end":
+                  return _context.stop();
+              }
+            }
+          }, _callee);
+        }));
+
+        function onChange(_x) {
+          return _onChange.apply(this, arguments);
+        }
+
+        return onChange;
+      }()
     });
   }, [fieldSchema['x-decorator-props'], (_field$decoratorProps2 = field.decoratorProps) === null || _field$decoratorProps2 === void 0 ? void 0 : _field$decoratorProps2.fixedBlock, dn, record]);
 };
@@ -98,19 +140,26 @@ var FixedBlock = function FixedBlock(props) {
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
       fixedSchema = _useState2[0],
-      setFixedSchema = _useState2[1];
+      _setFixedSchema = _useState2[1];
 
-  var schema = useMemo(function () {
-    var _fixedSchema$xDecora;
+  var fixedSchemaRef = useRef(fixedSchema);
+
+  var setFixedSchema = function setFixedSchema(next) {
+    if (fixedSchema && next) {
+      fixedSchemaRef.current = next;
+    }
 
-    if (!fixedSchema || ((_fixedSchema$xDecora = fixedSchema['x-decorator-props']) === null || _fixedSchema$xDecora === void 0 ? void 0 : _fixedSchema$xDecora.fixedBlock) !== true) return;
-    return fixedSchema.parent;
-  }, [fixedSchema, fixedSchema === null || fixedSchema === void 0 ? void 0 : fixedSchema['x-decorator-props']['fixedBlock']]);
+    _setFixedSchema(next);
+  };
+
+  var schema = useMemo(function () {
+    return fixedSchema === null || fixedSchema === void 0 ? void 0 : fixedSchema.parent;
+  }, [fixedSchema]);
   return /*#__PURE__*/React.createElement(FixedBlockContext.Provider, {
     value: {
-      schema: fixedSchema,
       height: height,
-      setFixedSchema: setFixedSchema
+      setFixedSchema: setFixedSchema,
+      fixedSchemaRef: fixedSchemaRef
     }
   }, schema ? /*#__PURE__*/React.createElement("div", {
     className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            height: 100%;\n            overflow: hidden;\n            .noco-card-item {\n              height: 100%;\n              .ant-card {\n                display: flex;\n                flex-direction: column;\n                height: 100%;\n                .ant-card-body {\n                  display: flex;\n                  flex-direction: column;\n                  height: 100%;\n                  overflow: hidden;\n                  // padding-bottom: 0;\n                }\n              }\n              & .ant-spin-nested-loading {\n                height: 100%;\n                overflow: hidden;\n              }\n              & .ant-spin-container {\n                height: 100%;\n              }\n            }\n          "]))),

package/es/schema-component/antd/page/Page.js

@@ -32,7 +32,7 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 
 import { css } from '@emotion/css';
 import { FormDialog, FormLayout } from '@formily/antd';
-import { RecursionField, SchemaOptionsContext, useField, useFieldSchema } from '@formily/react';
+import { Schema, SchemaOptionsContext, useField, useFieldSchema } from '@formily/react';
 import { Button, PageHeader as AntdPageHeader, Spin, Tabs } from 'antd';
 import classNames from 'classnames';
 import React, { useContext, useEffect, useState } from 'react';
@@ -205,16 +205,21 @@ export var Page = function Page(props) {
     style: {
       margin: 24
     }
-  }, loading ? /*#__PURE__*/React.createElement(Spin, null) : /*#__PURE__*/React.createElement(FixedBlock, {
+  }, loading ? /*#__PURE__*/React.createElement(Spin, null) : !disablePageHeader && enablePageTabs ? fieldSchema.mapProperties(function (schema) {
+    if (schema.name !== activeKey) return null;
+    return /*#__PURE__*/React.createElement(FixedBlock, {
+      key: schema.name,
+      height: // header 46 margin 48
+      height + 46 + 48
+    }, /*#__PURE__*/React.createElement(SchemaComponent, {
+      schema: new Schema({
+        properties: _defineProperty({}, schema.name, schema)
+      })
+    }));
+  }) : /*#__PURE__*/React.createElement(FixedBlock, {
     height: // header 46 margin 48
     height + 46 + 48
-  }, !disablePageHeader && enablePageTabs ? /*#__PURE__*/React.createElement(RecursionField, {
-    schema: fieldSchema,
-    onlyRenderProperties: true,
-    filterProperties: function filterProperties(s) {
-      return s.name === activeKey;
-    }
-  }) : /*#__PURE__*/React.createElement("div", {
-    className: css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                  > .nb-grid:not(:last-child) {\n                    > .nb-schema-initializer-button {\n                      display: none;\n                    }\n                  }\n                "])))
+  }, /*#__PURE__*/React.createElement("div", {
+    className: css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                > .nb-grid:not(:last-child) {\n                  > .nb-schema-initializer-button {\n                    display: none;\n                  }\n                }\n              "])))
   }, props.children))));
 };

package/es/schema-component/antd/remote-select/RemoteSelect.js

@@ -28,8 +28,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import { LoadingOutlined } from '@ant-design/icons';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useRequest } from '../../../api-client';
+import { useCompile } from '../../hooks';
 import { defaultFieldNames, Select } from '../select';
 import { ReadPretty } from './ReadPretty';
 var InternalRemoteSelect = connect(function (props) {
@@ -43,6 +44,8 @@ var InternalRemoteSelect = connect(function (props) {
       wait = _props$wait === void 0 ? 300 : _props$wait,
       others = _objectWithoutProperties(props, _excluded);
 
+  var compile = useCompile();
+
   var _useRequest = useRequest(_objectSpread(_objectSpread({
     action: 'list'
   }, service), {}, {
@@ -91,6 +94,13 @@ var InternalRemoteSelect = connect(function (props) {
     };
   }();
 
+  var options = useMemo(function () {
+    var _data$data;
+
+    return (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, _defineProperty({}, fieldNames.label, compile(item[fieldNames.label])));
+    })) || [];
+  }, [data, fieldNames.label]);
   return /*#__PURE__*/React.createElement(Select, _objectSpread(_objectSpread({
     autoClearSearchValue: true,
     filterOption: false,
@@ -98,7 +108,7 @@ var InternalRemoteSelect = connect(function (props) {
     fieldNames: fieldNames,
     onSearch: onSearch
   }, others), {}, {
-    options: (data === null || data === void 0 ? void 0 : data.data) || []
+    options: options
   }));
 }, mapProps({
   dataSource: 'options',

package/es/schema-component/antd/table/Table.Array.js

@@ -79,7 +79,7 @@ var useTableColumns = function useTableColumns() {
           record: record
         }, /*#__PURE__*/React.createElement(RecursionField, {
           schema: s,
-          name: index,
+          name: record.__index || index,
           onlyRenderProperties: true
         })));
       }

package/es/schema-component/antd/table-v2/Table.js

@@ -40,13 +40,18 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next';
 import { DndContext, useDesignable } from '../..';
 import { RecordIndexProvider, RecordProvider, useSchemaInitializer } from '../../../';
+import { useACLFieldWhitelist } from '../../../acl/ACLProvider';
 import { isCollectionFieldComponent, isColumnComponent } from './utils';
 
 var useTableColumns = function useTableColumns() {
-  var start = Date.now();
+  var _schema$reducePropert;
+
   var field = useField();
   var schema = useFieldSchema();
 
+  var _useACLFieldWhitelist = useACLFieldWhitelist(),
+      schemaInWhitelist = _useACLFieldWhitelist.schemaInWhitelist;
+
   var _useDesignable = useDesignable(),
       designable = _useDesignable.designable;
 
@@ -54,11 +59,13 @@ var useTableColumns = function useTableColumns() {
       exists = _useSchemaInitializer.exists,
       render = _useSchemaInitializer.render;
 
-  var columns = schema.reduceProperties(function (buf, s) {
-    if (isColumnComponent(s)) {
+  var columns = (_schema$reducePropert = schema.reduceProperties(function (buf, s) {
+    if (isColumnComponent(s) && schemaInWhitelist(Object.values(s.properties || {}).pop())) {
       return buf.concat([s]);
     }
-  }, []).map(function (s) {
+
+    return buf;
+  }, [])) === null || _schema$reducePropert === void 0 ? void 0 : _schema$reducePropert.map(function (s) {
     var _s$xComponentProps;
 
     var collectionFields = s.reduceProperties(function (buf, s) {
@@ -83,12 +90,12 @@ var useTableColumns = function useTableColumns() {
 
         var index = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record);
         return /*#__PURE__*/React.createElement(RecordIndexProvider, {
-          index: index
+          index: record.__index || index
         }, /*#__PURE__*/React.createElement(RecordProvider, {
           record: record
         }, /*#__PURE__*/React.createElement(RecursionField, {
           schema: s,
-          name: index,
+          name: record.__index || index,
           onlyRenderProperties: true
         })));
       }

package/es/schema-component/antd/table-v2/TableBlockDesigner.js

@@ -1,3 +1,15 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -9,6 +21,7 @@ import { useField, useFieldSchema } from '@formily/react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useTableBlockContext } from '../../../block-provider';
+import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
 import { useCollection } from '../../../collection-manager';
 import { useCollectionFilterOptions, useSortFields } from '../../../collection-manager/action-hooks';
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
@@ -87,17 +100,20 @@ export var TableBlockDesigner = function TableBlockDesigner() {
       }
     },
     onSubmit: function onSubmit(_ref) {
-      var _service$params2, _schema2;
+      var _service$params2, _service$params2$, _service$params3, _schema2;
 
       var filter = _ref.filter;
       var params = field.decoratorProps.params || {};
       params.filter = filter;
       field.decoratorProps.params = params;
       fieldSchema['x-decorator-props']['params'] = params;
-      service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
-        filter: filter,
+      var filters = ((_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : (_service$params2$ = _service$params2[1]) === null || _service$params2$ === void 0 ? void 0 : _service$params2$.filters) || {};
+      service.run(_objectSpread(_objectSpread({}, (_service$params3 = service.params) === null || _service$params3 === void 0 ? void 0 : _service$params3[0]), {}, {
+        filter: mergeFilter([].concat(_toConsumableArray(Object.values(filters)), [filter])),
         page: 1
-      }));
+      }), {
+        filters: filters
+      });
       dn.emit('patch', {
         schema: (_schema2 = {}, _defineProperty(_schema2, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema2, 'x-decorator-props', fieldSchema['x-decorator-props']), _schema2)
       });
@@ -174,7 +190,7 @@ export var TableBlockDesigner = function TableBlockDesigner() {
       }
     },
     onSubmit: function onSubmit(_ref2) {
-      var _schema3, _service$params3;
+      var _schema3, _service$params4;
 
       var sort = _ref2.sort;
       var sortArr = sort.map(function (item) {
@@ -187,7 +203,7 @@ export var TableBlockDesigner = function TableBlockDesigner() {
       dn.emit('patch', {
         schema: (_schema3 = {}, _defineProperty(_schema3, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema3, 'x-decorator-props', fieldSchema['x-decorator-props']), _schema3)
       });
-      service.run(_objectSpread(_objectSpread({}, (_service$params3 = service.params) === null || _service$params3 === void 0 ? void 0 : _service$params3[0]), {}, {
+      service.run(_objectSpread(_objectSpread({}, (_service$params4 = service.params) === null || _service$params4 === void 0 ? void 0 : _service$params4[0]), {}, {
         sort: sortArr
       }));
     }
@@ -211,13 +227,13 @@ export var TableBlockDesigner = function TableBlockDesigner() {
       value: 200
     }],
     onChange: function onChange(pageSize) {
-      var _service$params4, _schema4;
+      var _service$params5, _schema4;
 
       var params = field.decoratorProps.params || {};
       params.pageSize = pageSize;
       field.decoratorProps.params = params;
       fieldSchema['x-decorator-props']['params'] = params;
-      service.run(_objectSpread(_objectSpread({}, (_service$params4 = service.params) === null || _service$params4 === void 0 ? void 0 : _service$params4[0]), {}, {
+      service.run(_objectSpread(_objectSpread({}, (_service$params5 = service.params) === null || _service$params5 === void 0 ? void 0 : _service$params5[0]), {}, {
         pageSize: pageSize,
         page: 1
       }));

package/es/schema-component/hooks/useDesignable.d.ts

@@ -36,7 +36,7 @@ export declare class Designable {
     loadAPIClientEvents(): void;
     prepareProperty(schema: ISchema): void;
     on(name: 'insertAdjacent' | 'remove' | 'error' | 'patch' | 'batchPatch', listener: any): void;
-    emit(name: 'insertAdjacent' | 'remove' | 'error' | 'patch' | 'batchPatch', ...args: any[]): void;
+    emit(name: 'insertAdjacent' | 'remove' | 'error' | 'patch' | 'batchPatch', ...args: any[]): Promise<any>;
     parentsIn(schema: Schema): boolean;
     refresh(): void;
     insertAdjacent(position: Position, schema: ISchema, options?: InsertAdjacentOptions): void;