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

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

@@ -5,19 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.Cron = void 0;
 
-var _react = _interopRequireDefault(require("react"));
-
-var _react2 = require("@formily/react");
+var _css = require("@emotion/css");
 
-var _reactJsCron = require("react-js-cron");
+var _react = require("@formily/react");
 
 var _cronstrue = _interopRequireDefault(require("cronstrue"));
 
-require("cronstrue/locales/zh_CN");
+var _react2 = _interopRequireDefault(require("react"));
 
-var _css = require("@emotion/css");
+var _reactJsCron = require("react-js-cron");
 
-var _zhCN = _interopRequireDefault(require("./locale/zh-CN"));
+var _apiClient = require("../../../api-client");
 
 var _templateObject;
 
@@ -37,31 +35,28 @@ 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; }
 
-var ComponentLocales = {
-  'zh-CN': _zhCN.default
-};
-var ReadPrettyLocales = {
-  'en-US': 'en',
-  'zh-CN': 'zh_CN'
-};
-var Cron = (0, _react2.connect)(function (props) {
+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.default.createElement("fieldset", {
-    className: (0, _css.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      "])))
-  }, /*#__PURE__*/_react.default.createElement(_reactJsCron.Cron, _objectSpread({
+  return /*#__PURE__*/_react2.default.createElement("fieldset", {
+    className: (0, _css.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__*/_react2.default.createElement(_reactJsCron.Cron, _objectSpread({
     setValue: onChange,
-    locale: locale
+    locale: window['cronLocale']
   }, rest)));
-}, (0, _react2.mapReadPretty)(function (props) {
-  var locale = ReadPrettyLocales[localStorage.getItem('NOCOBASE_LOCALE') || 'en-US'];
-  return props.value ? /*#__PURE__*/_react.default.createElement("span", null, _cronstrue.default.toString(props.value, {
+};
+
+var ReadPretty = function ReadPretty(props) {
+  var api = (0, _apiClient.useAPIClient)();
+  var locale = api.auth.getLocale();
+  return props.value ? /*#__PURE__*/_react2.default.createElement("span", null, _cronstrue.default.toString(props.value, {
     locale: locale,
     use24HourTimeFormat: true
   })) : null;
-}));
+};
+
+var Cron = (0, _react.connect)(Input, (0, _react.mapReadPretty)(ReadPretty));
 exports.Cron = Cron;
 var _default = Cron;
 exports.default = _default;

package/lib/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/lib/schema-component/antd/cron/locale/index.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _locale = require("react-js-cron/dist/cjs/locale");
+
+var _zhCN = _interopRequireDefault(require("./zh-CN"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var _default = {
+  'zh-CN': _zhCN.default,
+  'en-US': _locale.DEFAULT_LOCALE_EN
+};
+exports.default = _default;

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

@@ -9,8 +9,6 @@ var _react = require("@formily/react");
 
 var _flat = _interopRequireDefault(require("flat"));
 
-var _react2 = require("react");
-
 var _reactI18next = require("react-i18next");
 
 var _blockProvider = require("../../../block-provider");
@@ -182,32 +180,23 @@ var useFilterFieldProps = function useFilterFieldProps(_ref) {
       t = _useTranslation.t;
 
   var field = (0, _react.useField)();
-
-  var _useContext = (0, _react2.useContext)(_SharedFilterProvider.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: (0, _SharedFilterProvider.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: (0, _SharedFilterProvider.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) {
@@ -219,13 +208,17 @@ 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: (0, _SharedFilterProvider.mergeFilter)([].concat(_toConsumableArray(Object.values(filters)), [filter])),
         page: 1
-      }));
+      }), {
+        filters: filters
+      });
       field.title = t('Filter');
     }
   };

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

@@ -19,7 +19,7 @@ var _react2 = _interopRequireDefault(require("react"));
 
 var _reactI18next = require("react-i18next");
 
-var _hooks = require("../../hooks");
+var _ACLProvider = require("../../../acl/ACLProvider");
 
 var _blockProvider = require("../../../block-provider");
 
@@ -27,6 +27,8 @@ var _collectionManager = require("../../../collection-manager");
 
 var _schemaSettings = require("../../../schema-settings");
 
+var _hooks = require("../../hooks");
+
 var _blockItem = require("../block-item");
 
 var _shared2 = require("../input/shared");
@@ -59,17 +61,17 @@ var divWrap = function divWrap(schema) {
 
 var FormItem = function FormItem(props) {
   var field = (0, _react.useField)();
-  return /*#__PURE__*/_react2.default.createElement(_blockItem.BlockItem, {
+  return /*#__PURE__*/_react2.default.createElement(_ACLProvider.ACLCollectionFieldProvider, null, /*#__PURE__*/_react2.default.createElement(_blockItem.BlockItem, {
     className: 'nb-form-item'
   }, /*#__PURE__*/_react2.default.createElement(_antd.FormItem, _objectSpread(_objectSpread({
-    className: "".concat((0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          & .ant-space {\n            flex-wrap: wrap;\n          }\n        "]))))
+    className: "".concat((0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            & .ant-space {\n              flex-wrap: wrap;\n            }\n          "]))))
   }, props), {}, {
     extra: typeof field.description === 'string' ? /*#__PURE__*/_react2.default.createElement("div", {
       dangerouslySetInnerHTML: {
         __html: (0, _shared2.HTMLEncode)(field.description).split('\n').join('<br/>')
       }
     }) : field.description
-  })));
+  }))));
 };
 
 exports.FormItem = FormItem;

package/lib/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/lib/schema-component/antd/index.js

@@ -82,28 +82,28 @@ Object.keys(_checkbox).forEach(function (key) {
   });
 });
 
-var _cron = require("./cron");
+var _colorSelect = require("./color-select");
 
-Object.keys(_cron).forEach(function (key) {
+Object.keys(_colorSelect).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _cron[key]) return;
+  if (key in exports && exports[key] === _colorSelect[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _cron[key];
+      return _colorSelect[key];
     }
   });
 });
 
-var _colorSelect = require("./color-select");
+var _cron = require("./cron");
 
-Object.keys(_colorSelect).forEach(function (key) {
+Object.keys(_cron).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _colorSelect[key]) return;
+  if (key in exports && exports[key] === _cron[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _colorSelect[key];
+      return _cron[key];
     }
   });
 });
@@ -173,19 +173,6 @@ Object.keys(_formV).forEach(function (key) {
   });
 });
 
-var _formulaInput = require("./formula-input");
-
-Object.keys(_formulaInput).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _formulaInput[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _formulaInput[key];
-    }
-  });
-});
-
 var _g2plot = require("./g2plot");
 
 Object.keys(_g2plot).forEach(function (key) {

package/lib/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/lib/schema-component/antd/page/FixedBlock.js

@@ -21,6 +21,8 @@ var _hooks = require("../../hooks");
 
 var _recordProvider = require("../../../record-provider");
 
+var _BlockTemplate = require("../../../schema-templates/BlockTemplate");
+
 var _templateObject;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -41,12 +43,20 @@ 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); }); }; }
+
 var FixedBlockContext = /*#__PURE__*/_react.default.createContext({
   setFixedSchema: function setFixedSchema(schema) {},
   height: 0,
-  schema: {}
+  fixedSchemaRef: {}
 });
 
 var useFixedSchema = function useFixedSchema() {
@@ -56,21 +66,29 @@ var useFixedSchema = function useFixedSchema() {
   var fieldSchema = (0, _react2.useFieldSchema)();
 
   var _useFixedBlock = useFixedBlock(),
-      setFixedSchema = _useFixedBlock.setFixedSchema;
+      setFixedSchema = _useFixedBlock.setFixedSchema,
+      fixedSchemaRef = _useFixedBlock.fixedSchemaRef;
+
+  var _useBlockTemplateCont = (0, _BlockTemplate.useBlockTemplateContext)(),
+      templateFieldSchema = _useBlockTemplateCont.fieldSchema;
 
   var hasSet = (0, _react.useRef)(false);
   (0, _react.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]);
   (0, _react.useEffect)(function () {
     return function () {
-      if (hasSet.current) {
+      if (hasSet.current && fixedSchemaRef.current) {
         setFixedSchema(null);
+        fixedSchemaRef.current = null;
       }
     };
   }, []);
@@ -106,15 +124,40 @@ var useFixedBlockDesignerSetting = function useFixedBlockDesignerSetting() {
     return /*#__PURE__*/_react.default.createElement(_schemaSettings.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]);
 };
@@ -127,19 +170,26 @@ var FixedBlock = function FixedBlock(props) {
   var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
       fixedSchema = _useState2[0],
-      setFixedSchema = _useState2[1];
+      _setFixedSchema = _useState2[1];
 
-  var schema = (0, _react.useMemo)(function () {
-    var _fixedSchema$xDecora;
+  var fixedSchemaRef = (0, _react.useRef)(fixedSchema);
+
+  var setFixedSchema = function setFixedSchema(next) {
+    if (fixedSchema && next) {
+      fixedSchemaRef.current = next;
+    }
+
+    _setFixedSchema(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']]);
+  var schema = (0, _react.useMemo)(function () {
+    return fixedSchema === null || fixedSchema === void 0 ? void 0 : fixedSchema.parent;
+  }, [fixedSchema]);
   return /*#__PURE__*/_react.default.createElement(FixedBlockContext.Provider, {
     value: {
-      schema: fixedSchema,
       height: height,
-      setFixedSchema: setFixedSchema
+      setFixedSchema: setFixedSchema,
+      fixedSchemaRef: fixedSchemaRef
     }
   }, schema ? /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _css.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/lib/schema-component/antd/page/Page.js

@@ -235,17 +235,22 @@ var Page = function Page(props) {
     style: {
       margin: 24
     }
-  }, loading ? /*#__PURE__*/_react2.default.createElement(_antd2.Spin, null) : /*#__PURE__*/_react2.default.createElement(_FixedBlock.default, {
+  }, loading ? /*#__PURE__*/_react2.default.createElement(_antd2.Spin, null) : !disablePageHeader && enablePageTabs ? fieldSchema.mapProperties(function (schema) {
+    if (schema.name !== activeKey) return null;
+    return /*#__PURE__*/_react2.default.createElement(_FixedBlock.default, {
+      key: schema.name,
+      height: // header 46 margin 48
+      height + 46 + 48
+    }, /*#__PURE__*/_react2.default.createElement(_core.SchemaComponent, {
+      schema: new _react.Schema({
+        properties: _defineProperty({}, schema.name, schema)
+      })
+    }));
+  }) : /*#__PURE__*/_react2.default.createElement(_FixedBlock.default, {
     height: // header 46 margin 48
     height + 46 + 48
-  }, !disablePageHeader && enablePageTabs ? /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
-    schema: fieldSchema,
-    onlyRenderProperties: true,
-    filterProperties: function filterProperties(s) {
-      return s.name === activeKey;
-    }
-  }) : /*#__PURE__*/_react2.default.createElement("div", {
-    className: (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                  > .nb-grid:not(:last-child) {\n                    > .nb-schema-initializer-button {\n                      display: none;\n                    }\n                  }\n                "])))
+  }, /*#__PURE__*/_react2.default.createElement("div", {
+    className: (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                > .nb-grid:not(:last-child) {\n                  > .nb-schema-initializer-button {\n                    display: none;\n                  }\n                }\n              "])))
   }, props.children))));
 };
 

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

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,17 +11,21 @@ var _icons = require("@ant-design/icons");
 
 var _react = require("@formily/react");
 
-var _react2 = _interopRequireDefault(require("react"));
+var _react2 = _interopRequireWildcard(require("react"));
 
 var _apiClient = require("../../../api-client");
 
+var _hooks = require("../../hooks");
+
 var _select = require("../select");
 
 var _ReadPretty = require("./ReadPretty");
 
 var _excluded = ["fieldNames", "service", "wait"];
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 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); } }
 
@@ -58,6 +64,8 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
       wait = _props$wait === void 0 ? 300 : _props$wait,
       others = _objectWithoutProperties(props, _excluded);
 
+  var compile = (0, _hooks.useCompile)();
+
   var _useRequest = (0, _apiClient.useRequest)(_objectSpread(_objectSpread({
     action: 'list'
   }, service), {}, {
@@ -106,6 +114,13 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     };
   }();
 
+  var options = (0, _react2.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__*/_react2.default.createElement(_select.Select, _objectSpread(_objectSpread({
     autoClearSearchValue: true,
     filterOption: false,
@@ -113,7 +128,7 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     fieldNames: fieldNames,
     onSearch: onSearch
   }, others), {}, {
-    options: (data === null || data === void 0 ? void 0 : data.data) || []
+    options: options
   }));
 }, (0, _react.mapProps)({
   dataSource: 'options',

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

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

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

@@ -31,6 +31,8 @@ var _ = require("../..");
 
 var _2 = require("../../../");
 
+var _ACLProvider = require("../../../acl/ACLProvider");
+
 var _utils = require("./utils");
 
 var _excluded = ["pagination", "useProps", "onChange"],
@@ -70,10 +72,14 @@ 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; }
 
 var useTableColumns = function useTableColumns() {
-  var start = Date.now();
+  var _schema$reducePropert;
+
   var field = (0, _react.useField)();
   var schema = (0, _react.useFieldSchema)();
 
+  var _useACLFieldWhitelist = (0, _ACLProvider.useACLFieldWhitelist)(),
+      schemaInWhitelist = _useACLFieldWhitelist.schemaInWhitelist;
+
   var _useDesignable = (0, _.useDesignable)(),
       designable = _useDesignable.designable;
 
@@ -81,11 +87,13 @@ var useTableColumns = function useTableColumns() {
       exists = _useSchemaInitializer.exists,
       render = _useSchemaInitializer.render;
 
-  var columns = schema.reduceProperties(function (buf, s) {
-    if ((0, _utils.isColumnComponent)(s)) {
+  var columns = (_schema$reducePropert = schema.reduceProperties(function (buf, s) {
+    if ((0, _utils.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) {
@@ -110,12 +118,12 @@ var useTableColumns = function useTableColumns() {
 
         var index = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record);
         return /*#__PURE__*/_react2.default.createElement(_2.RecordIndexProvider, {
-          index: index
+          index: record.__index || index
         }, /*#__PURE__*/_react2.default.createElement(_2.RecordProvider, {
           record: record
         }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
           schema: s,
-          name: index,
+          name: record.__index || index,
           onlyRenderProperties: true
         })));
       }