@nocobase/client 0.9.0-alpha.2 → 0.9.1-alpha.2

package/lib/schema-component/antd/form-v2/utils.js

@@ -0,0 +1,181 @@
+"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
+});
+exports.evaluate = evaluate;
+exports.linkageMergeAction = void 0;
+
+var _lodash = require("lodash");
+
+var functions = _interopRequireWildcard(require("@formulajs/formulajs"));
+
+var _uitls = require("../../common/utils/uitls");
+
+var _type = require("../../../schema-settings/LinkageRules/type");
+
+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 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 _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+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 now() {
+  return new Date();
+}
+
+var fnNames = Object.keys(functions).filter(function (key) {
+  return key !== 'default';
+});
+var fns = fnNames.map(function (key) {
+  return functions[key];
+});
+
+function formula(expression) {
+  var scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+  try {
+    var fn = _construct(Function, _toConsumableArray(fnNames).concat(_toConsumableArray(Object.keys(scope)), ["return ".concat(expression)]));
+
+    var result = fn.apply(void 0, _toConsumableArray(fns).concat(_toConsumableArray(Object.values(scope))));
+
+    if (typeof result === 'number') {
+      if (Number.isNaN(result) || !Number.isFinite(result)) {
+        return null;
+      }
+
+      return functions.ROUND(result, 9);
+    }
+
+    if (typeof result === 'function') {
+      return result();
+    }
+
+    return result;
+  } catch (error) {
+    return undefined;
+  }
+}
+
+function evaluate(expression) {
+  var scope = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+  var mergeScope = _objectSpread(_objectSpread({}, scope), {}, {
+    now: now
+  });
+
+  var exp = expression.trim().replace(/{{\s*([^{}]+)\s*}}/g, function (_, v) {
+    var item = (0, _lodash.get)(scope, v);
+    var key = v.replace(/\.(\d+)/g, '["$1"]');
+    return " ".concat(typeof item === 'function' ? item() : key, " ");
+  });
+  return formula(exp, mergeScope);
+}
+
+var linkageMergeAction = function linkageMergeAction(_ref, field, condition, values) {
+  var _field$linkagePropert, _field$initProperty, _field$linkagePropert2, _field$initProperty2, _field$linkagePropert3, _field$initProperty3, _field$linkagePropert4, _field$initProperty4, _field$linkagePropert5, _field$linkagePropert6, _field$linkagePropert7;
+
+  var operator = _ref.operator,
+      value = _ref.value;
+  var requiredResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert = field.linkageProperty) === null || _field$linkagePropert === void 0 ? void 0 : _field$linkagePropert.required) || [(field === null || field === void 0 ? void 0 : (_field$initProperty = field.initProperty) === null || _field$initProperty === void 0 ? void 0 : _field$initProperty.required) || false];
+  var displayResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert2 = field.linkageProperty) === null || _field$linkagePropert2 === void 0 ? void 0 : _field$linkagePropert2.display) || [field === null || field === void 0 ? void 0 : (_field$initProperty2 = field.initProperty) === null || _field$initProperty2 === void 0 ? void 0 : _field$initProperty2.display];
+  var patternResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert3 = field.linkageProperty) === null || _field$linkagePropert3 === void 0 ? void 0 : _field$linkagePropert3.pattern) || [field === null || field === void 0 ? void 0 : (_field$initProperty3 = field.initProperty) === null || _field$initProperty3 === void 0 ? void 0 : _field$initProperty3.pattern];
+  var valueResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert4 = field.linkageProperty) === null || _field$linkagePropert4 === void 0 ? void 0 : _field$linkagePropert4.value) || [field.value || (field === null || field === void 0 ? void 0 : (_field$initProperty4 = field.initProperty) === null || _field$initProperty4 === void 0 ? void 0 : _field$initProperty4.value)];
+
+  switch (operator) {
+    case _type.ActionType.Required:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        requiredResult.push(true);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        required: requiredResult
+      });
+      field.required = (0, _lodash.last)((_field$linkagePropert5 = field.linkageProperty) === null || _field$linkagePropert5 === void 0 ? void 0 : _field$linkagePropert5.required);
+      break;
+
+    case _type.ActionType.InRequired:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        requiredResult.push(false);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        required: requiredResult
+      });
+      field.required = (0, _lodash.last)((_field$linkagePropert6 = field.linkageProperty) === null || _field$linkagePropert6 === void 0 ? void 0 : _field$linkagePropert6.required);
+      break;
+
+    case _type.ActionType.Visible:
+    case _type.ActionType.None:
+    case _type.ActionType.Hidden:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        displayResult.push(operator);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        display: displayResult
+      });
+      field.display = (0, _lodash.last)((_field$linkagePropert7 = field.linkageProperty) === null || _field$linkagePropert7 === void 0 ? void 0 : _field$linkagePropert7.display);
+      break;
+
+    case _type.ActionType.Editable:
+    case _type.ActionType.ReadOnly:
+    case _type.ActionType.ReadPretty:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        patternResult.push(operator);
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        pattern: patternResult
+      });
+      field.pattern = (0, _lodash.last)(field.linkageProperty.pattern);
+      break;
+
+    case _type.ActionType.Value:
+      if ((0, _uitls.conditionAnalyse)(condition, values)) {
+        if ((value === null || value === void 0 ? void 0 : value.mode) === 'express') {
+          var result = evaluate(value.result || value.value, values);
+          valueResult.push(result);
+        } else {
+          valueResult.push((value === null || value === void 0 ? void 0 : value.value) || value);
+        }
+      }
+
+      field.linkageProperty = _objectSpread(_objectSpread({}, field.linkageProperty), {}, {
+        value: valueResult
+      });
+      setTimeout(function () {
+        return field.value = (0, _lodash.last)(valueResult) === undefined ? field.value : (0, _lodash.last)(valueResult);
+      });
+      break;
+
+    default:
+      return null;
+  }
+};
+
+exports.linkageMergeAction = linkageMergeAction;

package/lib/schema-component/antd/g2plot/G2Plot.js

@@ -91,8 +91,10 @@ var G2PlotRenderer = /*#__PURE__*/(0, _react2.forwardRef)(function (props, ref)
     if (plotRef.current) {
       plotRef.current.update(config);
     } else {
+      var _plotRef$current;
+
       plotRef.current = new plot(containerRef.current, config);
-      plotRef.current.render();
+      plotRef === null || plotRef === void 0 ? void 0 : (_plotRef$current = plotRef.current) === null || _plotRef$current === void 0 ? void 0 : _plotRef$current.render();
     }
 
     syncRef(plotRef, ref);

package/lib/schema-component/antd/grid/Grid.js

@@ -423,15 +423,20 @@ Grid.Row = (0, _react.observer)(function (props) {
   })));
 });
 Grid.Col = (0, _react.observer)(function (props) {
-  var _schema$xComponentP;
-
   var _useContext = (0, _react2.useContext)(GridRowContext),
-      cols = _useContext.cols;
+      _useContext$cols = _useContext.cols,
+      cols = _useContext$cols === void 0 ? [] : _useContext$cols;
 
   var schema = (0, _react.useFieldSchema)();
   var field = (0, _react.useField)();
-  var w = (schema === null || schema === void 0 ? void 0 : (_schema$xComponentP = schema['x-component-props']) === null || _schema$xComponentP === void 0 ? void 0 : _schema$xComponentP['width']) || 100 / cols.length;
-  var width = "calc(".concat(w, "% - 24px - 24px / ").concat(cols.length, ")");
+  var width = '100%';
+
+  if (cols === null || cols === void 0 ? void 0 : cols.length) {
+    var _schema$xComponentP;
+
+    var w = (schema === null || schema === void 0 ? void 0 : (_schema$xComponentP = schema['x-component-props']) === null || _schema$xComponentP === void 0 ? void 0 : _schema$xComponentP['width']) || 100 / cols.length;
+    width = "calc(".concat(w, "% - 24px - 24px / ").concat(cols.length, ")");
+  }
 
   var _useDroppable3 = (0, _core.useDroppable)({
     id: field.address.toString(),

package/lib/schema-component/antd/icon-picker/IconPicker.js

@@ -87,6 +87,7 @@ function IconField(props) {
       }
     }, _toConsumableArray(_icon.icons.keys()).map(function (key) {
       return /*#__PURE__*/_react2.default.createElement("span", {
+        key: key,
         style: {
           fontSize: 18,
           marginRight: 10,

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

@@ -36,4 +36,5 @@ export * from './tabs';
 export * from './time-picker';
 export * from './tree-select';
 export * from './upload';
+export * from './variable';
 import './index.less';

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

@@ -498,4 +498,17 @@ Object.keys(_upload).forEach(function (key) {
   });
 });
 
+var _variable = require("./variable");
+
+Object.keys(_variable).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _variable[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _variable[key];
+    }
+  });
+});
+
 require("./index.less");

package/lib/schema-component/antd/input/Input.d.ts

@@ -1,9 +1,10 @@
 import { InputProps, TextAreaProps } from 'antd/lib/input';
 import React from 'react';
+import { JSONTextAreaProps } from './Json';
 declare type ComposedInput = React.FC<InputProps> & {
     TextArea?: React.FC<TextAreaProps>;
     URL?: React.FC<InputProps>;
-    JSON?: React.FC<TextAreaProps>;
+    JSON?: React.FC<JSONTextAreaProps>;
 };
 export declare const Input: ComposedInput;
 export default Input;

package/lib/schema-component/antd/input/Json.d.ts

@@ -1,6 +1,8 @@
-/// <reference types="react" />
+import React, { Ref } from 'react';
 import { TextAreaProps } from 'antd/lib/input';
-export declare function Json({ value, onChange, space, ...props }: TextAreaProps & {
+export declare type JSONTextAreaProps = TextAreaProps & {
+    ref: Ref<any>;
     value: any;
     space: number;
-}): JSX.Element;
+};
+export declare const Json: React.ForwardRefExoticComponent<React.RefAttributes<React.Ref<any>>>;

package/lib/schema-component/antd/input/Json.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Json = Json;
+exports.Json = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -25,7 +25,7 @@ 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; }
 
-function Json(_ref) {
+var Json = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var value = _ref.value,
       _onChange = _ref.onChange,
       _ref$space = _ref.space,
@@ -34,6 +34,7 @@ function Json(_ref) {
 
   var field = (0, _react2.useField)();
   return /*#__PURE__*/_react.default.createElement(_antd.Input.TextArea, _objectSpread(_objectSpread({}, props), {}, {
+    ref: ref,
     defaultValue: value != null ? JSON.stringify(value, null, space) : '',
     onChange: function onChange(ev) {
       try {
@@ -50,4 +51,6 @@ function Json(_ref) {
       }
     }
   }));
-}
+});
+
+exports.Json = Json;

package/lib/schema-component/antd/input/ReadPretty.js

@@ -128,7 +128,7 @@ ReadPretty.JSON = function (props) {
 
   var prefixCls = (0, _builtins__.usePrefixCls)('json', props);
   return /*#__PURE__*/_react.default.createElement("pre", {
-    className: (0, _css.cx)(prefixCls, props.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        margin-bottom: 0;\n      "])))),
+    className: (0, _css.cx)(prefixCls, props.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        margin-bottom: 0;\n        line-height: 1.5;\n        font-size: 90%;\n      "])))),
     style: props.style
   }, props.value != null ? JSON.stringify(props.value, null, (_props$space = props.space) !== null && _props$space !== void 0 ? _props$space : 2) : '');
 };

package/lib/schema-component/antd/input-number/InputNumber.js

@@ -31,6 +31,8 @@ var InputNumber = (0, _react.connect)(function (props) {
   var onChange = props.onChange,
       others = _objectWithoutProperties(props, _excluded);
 
+  var field = (0, _react.useField)();
+
   var handleChange = function handleChange(v) {
     onChange(parseFloat(v));
   };

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

@@ -117,13 +117,15 @@ var useFixedBlockDesignerSetting = function useFixedBlockDesignerSetting() {
 
   var record = (0, _recordProvider.useRecord)();
   return (0, _react.useMemo)(function () {
+    var _fieldSchema$xDecora3;
+
     if (Object.keys(record).length) {
       return;
     }
 
     return /*#__PURE__*/_react.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
       title: t('Fix block'),
-      checked: fieldSchema['x-decorator-props']['fixedBlock'],
+      checked: (_fieldSchema$xDecora3 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora3 === void 0 ? void 0 : _fieldSchema$xDecora3.fixedBlock,
       onChange: function () {
         var _onChange = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(fixedBlock) {
           var _schema;

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

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Page = void 0;
 
+var _icons = require("@ant-design/icons");
+
 var _css = require("@emotion/css");
 
 var _antd = require("@formily/antd");
@@ -27,6 +29,10 @@ var _documentTitle = require("../../../document-title");
 
 var _icon = require("../../../icon");
 
+var _common = require("../../common");
+
+var _sortableItem = require("../../common/sortable-item");
+
 var _core = require("../../core");
 
 var _hooks = require("../../hooks");
@@ -140,7 +146,7 @@ var Page = function Page(props) {
     ghost: false,
     title: hidePageTitle ? undefined : fieldSchema.title || compile(title)
   }, others), {}, {
-    footer: enablePageTabs && /*#__PURE__*/_react2.default.createElement(_antd2.Tabs, {
+    footer: enablePageTabs && /*#__PURE__*/_react2.default.createElement(_common.DndContext, null, /*#__PURE__*/_react2.default.createElement(_antd2.Tabs, {
       size: 'small',
       activeKey: activeKey,
       onTabClick: function onTabClick(activeKey) {
@@ -152,7 +158,8 @@ var Page = function Page(props) {
         }, 50);
       },
       tabBarExtraContent: dn.designable && /*#__PURE__*/_react2.default.createElement(_antd2.Button, {
-        className: (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                          border-color: rgb(241, 139, 98) !important;\n                          color: rgb(241, 139, 98) !important;\n                        "]))),
+        icon: /*#__PURE__*/_react2.default.createElement(_icons.PlusOutlined, null),
+        className: (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                            border-color: rgb(241, 139, 98) !important;\n                            color: rgb(241, 139, 98) !important;\n                          "]))),
         type: 'dashed',
         onClick: function () {
           var _onClick = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
@@ -215,10 +222,12 @@ var Page = function Page(props) {
 
           return onClick;
         }()
-      }, "Add tab")
+      }, t('Add tab'))
     }, fieldSchema.mapProperties(function (schema) {
       return /*#__PURE__*/_react2.default.createElement(_antd2.Tabs.TabPane, {
-        tab: /*#__PURE__*/_react2.default.createElement("span", {
+        tab: /*#__PURE__*/_react2.default.createElement(_sortableItem.SortableItem, {
+          id: schema.name,
+          schema: schema,
           className: (0, _classnames.default)('nb-action-link', designerCss, props.className)
         }, schema['x-icon'] && /*#__PURE__*/_react2.default.createElement(_icon.Icon, {
           style: {
@@ -230,7 +239,7 @@ var Page = function Page(props) {
         })),
         key: schema.name
       });
-    }))
+    })))
   }))), /*#__PURE__*/_react2.default.createElement("div", {
     style: {
       margin: 24

package/lib/schema-component/antd/page/PageTabDesigner.js

@@ -156,7 +156,7 @@ var PageTabDesigner = function PageTabDesigner(_ref3) {
   }, /*#__PURE__*/_react2.default.createElement(_antd.Space, {
     size: 2,
     align: 'center'
-  }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings, {
+  }, /*#__PURE__*/_react2.default.createElement(_.DragHandler, null, /*#__PURE__*/_react2.default.createElement(_icons.DragOutlined, null)), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings, {
     title: /*#__PURE__*/_react2.default.createElement(_icons.MenuOutlined, {
       style: {
         cursor: 'pointer',

package/lib/schema-component/antd/record-picker/ReadPrettyRecordPicker.js

@@ -56,6 +56,8 @@ var toValue = function toValue(value, placeholder) {
 };
 
 var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
+  var _collectionField$targ;
+
   var ellipsis = props.ellipsis;
   var fieldSchema = (0, _react.useFieldSchema)();
   var recordCtx = (0, _recordProvider.useRecord)();
@@ -147,7 +149,7 @@ var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
   return collectionField ? /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_blockProvider.BlockAssociationContext.Provider, {
     value: "".concat(collectionField.collectionName, ".").concat(collectionField.name)
   }, /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionProvider, {
-    name: collectionField.target
+    name: (_collectionField$targ = collectionField.target) !== null && _collectionField$targ !== void 0 ? _collectionField$targ : collectionField.targetCollection
   }, /*#__PURE__*/_react2.default.createElement(_EllipsisWithTooltip.EllipsisWithTooltip, {
     ellipsis: ellipsis,
     ref: ellipsisWithTooltipRef

package/lib/schema-component/antd/record-picker/RecordPicker.js

@@ -11,6 +11,5 @@ var _InputRecordPicker = require("./InputRecordPicker");
 
 var _ReadPrettyRecordPicker = require("./ReadPrettyRecordPicker");
 
-var RecordPicker = (0, _react.connect)(_InputRecordPicker.InputRecordPicker, // mapProps(mapSuffixProps),
-(0, _react.mapReadPretty)(_ReadPrettyRecordPicker.ReadPrettyRecordPicker));
+var RecordPicker = (0, _react.connect)(_InputRecordPicker.InputRecordPicker, (0, _react.mapReadPretty)(_ReadPrettyRecordPicker.ReadPrettyRecordPicker));
 exports.RecordPicker = RecordPicker;

package/lib/schema-component/antd/record-picker/util.js

@@ -41,6 +41,13 @@ var getDatePickerLabels = function getDatePickerLabels(props) {
 exports.getDatePickerLabels = getDatePickerLabels;
 
 var getLabelFormatValue = function getLabelFormatValue(labelUiSchema, value) {
+  if (Array.isArray(labelUiSchema === null || labelUiSchema === void 0 ? void 0 : labelUiSchema.enum) && value) {
+    var opt = labelUiSchema.enum.find(function (option) {
+      return option.value === value;
+    });
+    return opt === null || opt === void 0 ? void 0 : opt.label;
+  }
+
   switch (labelUiSchema === null || labelUiSchema === void 0 ? void 0 : labelUiSchema['x-component']) {
     case 'DatePicker':
       return getDatePickerLabels(_objectSpread(_objectSpread({}, labelUiSchema === null || labelUiSchema === void 0 ? void 0 : labelUiSchema['x-component-props']), {}, {

package/lib/schema-component/antd/remote-select/RemoteSelect.d.ts

@@ -7,6 +7,7 @@ export declare type RemoteSelectProps<P = any> = SelectProps<P, any> & {
     onChange?: (v: any) => void;
     target: string;
     wait?: number;
+    manual?: boolean;
     service: ResourceActionOptions<P>;
 };
 export declare const RemoteSelect: React.ForwardRefExoticComponent<Partial<SelectProps<any, any> & {
@@ -14,6 +15,7 @@ export declare const RemoteSelect: React.ForwardRefExoticComponent<Partial<Selec
     onChange?: (v: any) => void;
     target: string;
     wait?: number;
+    manual?: boolean;
     service: ResourceActionOptions<any>;
 }> & React.RefAttributes<unknown>> & {
     ReadPretty: typeof ReadPretty;