@nocobase/client 0.9.2-alpha.1 → 0.9.2-alpha.3

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

@@ -40,6 +40,7 @@ var breakRemoveOnRow = function breakRemoveOnRow(s) {
 };
 var ColDivider = function ColDivider(props) {
   var _dndContext$active, _dndContext$active$da, _dndContext$active$da2;
+  var dragIdRef = (0, _react2.useRef)(null);
   var _useDroppable = (0, _core.useDroppable)({
       id: props.id,
       data: props.data
@@ -90,6 +91,7 @@ var ColDivider = function ColDivider(props) {
       if (!isDragging) {
         return;
       }
+      dragIdRef.current = event.active.id;
       var el = dividerRef.current;
       var prev = el.previousElementSibling;
       var next = el.nextElementSibling;
@@ -99,14 +101,23 @@ var ColDivider = function ColDivider(props) {
       if (!isDragging) {
         return;
       }
+      if (dragIdRef.current === event.active.id) {
+        dragIdRef.current = dragIdRef.current + '_move';
+      }
       var el = dividerRef.current;
       var prev = el.previousElementSibling;
       var next = el.nextElementSibling;
-      prev.style.width = "calc(".concat(clientWidths[0], "px + ").concat(event.delta.x, "px)");
-      next.style.width = "calc(".concat(clientWidths[1], "px - ").concat(event.delta.x, "px)");
+      prev.style.width = "".concat(clientWidths[0] + event.delta.x, "px");
+      next.style.width = "".concat(clientWidths[1] - event.delta.x, "px");
     },
     onDragEnd: function onDragEnd(event) {
-      var _ref, _ref2;
+      var _dragIdRef$current, _ref, _ref2;
+      if (!dragIdRef.current) return;
+      if ((_dragIdRef$current = dragIdRef.current) === null || _dragIdRef$current === void 0 ? void 0 : _dragIdRef$current.startsWith(event.active.id)) {
+        if (!dragIdRef.current.endsWith('_move')) {
+          return;
+        }
+      }
       if (clientWidths[0] <= 0 || clientWidths[1] <= 0) {
         return;
       }
@@ -119,8 +130,11 @@ var ColDivider = function ColDivider(props) {
       var next = el.nextElementSibling;
       prevSchema['x-component-props'] = prevSchema['x-component-props'] || {};
       nextSchema['x-component-props'] = nextSchema['x-component-props'] || {};
-      prevSchema['x-component-props']['width'] = 100 * ((prev === null || prev === void 0 ? void 0 : prev.clientWidth) + 24 + 24 / props.cols.length) / el.parentElement.clientWidth;
-      nextSchema['x-component-props']['width'] = 100 * ((next === null || next === void 0 ? void 0 : next.clientWidth) + 24 + 24 / props.cols.length) / el.parentElement.clientWidth;
+      var dividerWidth = el.clientWidth * (props.cols.length + 1) / props.cols.length;
+      var preWidth = (100 * (prev.getBoundingClientRect().width + dividerWidth) / el.parentElement.clientWidth).toFixed(2);
+      var nextWidth = (100 * (next.getBoundingClientRect().width + dividerWidth) / el.parentElement.clientWidth).toFixed(2);
+      prevSchema['x-component-props']['width'] = preWidth;
+      nextSchema['x-component-props']['width'] = nextWidth;
       dn.emit('batchPatch', {
         schemas: [(_ref = {}, _defineProperty(_ref, 'x-uid', prevSchema['x-uid']), _defineProperty(_ref, 'x-component-props', _objectSpread({}, prevSchema['x-component-props'])), _ref), (_ref2 = {}, _defineProperty(_ref2, 'x-uid', nextSchema['x-uid']), _defineProperty(_ref2, 'x-component-props', _objectSpread({}, nextSchema['x-component-props'])), _ref2)]
       });
@@ -133,12 +147,12 @@ var ColDivider = function ColDivider(props) {
         dividerRef.current = el;
       }
     },
-    className: (0, _classnames.default)('nb-col-divider', (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          width: var(--nb-spacing);\n        "])))),
+    className: (0, _classnames.default)('nb-col-divider', (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          flex-shrink: 0;\n          width: var(--nb-spacing);\n        "])))),
     style: _objectSpread({}, droppableStyle)
   }, /*#__PURE__*/_react2.default.createElement("div", _objectSpread(_objectSpread(_objectSpread({
     ref: setDraggableNodeRef
   }, listeners), attributes), {}, {
-    className: props.first || props.last || !designable ? null : (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                &::before {\n                  content: ' ';\n                  width: 12px;\n                  height: 100%;\n                  left: 6px;\n                  position: absolute;\n                  cursor: col-resize;\n                }\n                &:hover {\n                  &::before {\n                    background: rgba(241, 139, 98, 0.06) !important;\n                  }\n                }\n                width: var(--nb-spacing);\n                height: 100%;\n                position: absolute;\n                cursor: col-resize;\n              "])))
+    className: props.first || props.last || !designable ? null : (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                &::before {\n                  content: ' ';\n                  width: 100%;\n                  height: 100%;\n                  position: absolute;\n                  cursor: col-resize;\n                }\n                &:hover {\n                  &::before {\n                    background: rgba(241, 139, 98, 0.06) !important;\n                  }\n                }\n                width: var(--nb-spacing);\n                height: 100%;\n                position: absolute;\n                cursor: col-resize;\n              "])))
   })));
 };
 var RowDivider = function RowDivider(props) {
@@ -326,7 +340,7 @@ Grid.Row = (0, _react.observer)(function () {
       cols: cols
     }
   }, /*#__PURE__*/_react2.default.createElement("div", {
-    className: (0, _classnames.default)('nb-grid-row', (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n            margin: 0 calc(-1 * var(--nb-spacing));\n            display: flex;\n            position: relative;\n            /* z-index: 0; */\n          "]))))
+    className: (0, _classnames.default)('nb-grid-row', (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n            overflow-x: hidden;\n            margin: 0 calc(-1 * var(--nb-spacing));\n            display: flex;\n            position: relative;\n            /* z-index: 0; */\n          "]))))
   }, /*#__PURE__*/_react2.default.createElement(ColDivider, {
     cols: cols,
     first: true,
@@ -367,7 +381,7 @@ Grid.Col = (0, _react.observer)(function (props) {
   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, "% - var(--nb-spacing) * 2 / ").concat(cols.length, ")");
+    width = "calc(".concat(w, "% - var(--nb-spacing) *  ").concat((cols.length + 1) / cols.length, ")");
   }
   var _useDroppable3 = (0, _core.useDroppable)({
       id: field.address.toString(),

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

@@ -20,6 +20,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var getContentWidth = function getContentWidth(element) {
+  if (element) {
+    var range = document.createRange();
+    range.selectNodeContents(element);
+    var contentWidth = range.getBoundingClientRect().width;
+    return contentWidth;
+  }
+};
 var ellipsisDefaultStyle = {
   overflow: 'hidden',
   overflowWrap: 'break-word',
@@ -36,6 +44,7 @@ var EllipsisWithTooltip = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
     _useState4 = _slicedToArray(_useState3, 2),
     visible = _useState4[0],
     setVisible = _useState4[1];
+  var elRef = (0, _react.useRef)();
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       setPopoverVisible: setVisible
@@ -45,6 +54,12 @@ var EllipsisWithTooltip = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, props.children);
   }
   var popoverContent = props.popoverContent;
+  var isOverflowTooltip = function isOverflowTooltip() {
+    var _elRef$current;
+    var contentWidth = getContentWidth(elRef.current);
+    var offsetWidth = (_elRef$current = elRef.current) === null || _elRef$current === void 0 ? void 0 : _elRef$current.offsetWidth;
+    return contentWidth > offsetWidth;
+  };
   return /*#__PURE__*/_react.default.createElement(_antd.Popover, {
     visible: ellipsis && visible,
     onVisibleChange: function onVisibleChange(visible) {
@@ -57,10 +72,14 @@ var EllipsisWithTooltip = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
       }
     }, popoverContent || props.children)
   }, /*#__PURE__*/_react.default.createElement("div", {
+    ref: elRef,
     style: _objectSpread({}, ellipsisDefaultStyle),
     onMouseEnter: function onMouseEnter(e) {
       var el = e.target;
-      setEllipsis(el.scrollWidth > el.clientWidth);
+      var isShowTooltips = isOverflowTooltip();
+      if (isShowTooltips) {
+        setEllipsis(el.scrollWidth >= el.clientWidth);
+      }
     }
   }, props.children));
 });

package/lib/schema-component/antd/menu/util.js

@@ -47,7 +47,6 @@ function findMenuItem(schema) {
   } finally {
     _iterator.f();
   }
-  ;
   return null;
 }
 function findKeys(schema) {

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

@@ -12,6 +12,7 @@ var _react = require("@formily/react");
 var _antd2 = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _react2 = _interopRequireWildcard(require("react"));
+var _reactErrorBoundary = require("react-error-boundary");
 var _reactI18next = require("react-i18next");
 var _reactRouterDom = require("react-router-dom");
 var _documentTitle = require("../../../document-title");
@@ -21,6 +22,7 @@ var _common = require("../../common");
 var _sortableItem = require("../../common/sortable-item");
 var _core = require("../../core");
 var _hooks = require("../../hooks");
+var _errorFallback = require("../error-fallback");
 var _FixedBlock = _interopRequireDefault(require("./FixedBlock"));
 var _PageTabDesigner = require("./PageTabDesigner");
 var _excluded = ["children"];
@@ -86,6 +88,9 @@ var Page = function Page(props) {
     _useState6 = _slicedToArray(_useState5, 2),
     height = _useState6[0],
     setHeight = _useState6[1];
+  var handleErrors = function handleErrors(error) {
+    console.error(error);
+  };
   return /*#__PURE__*/_react2.default.createElement(_FilterProvider.FilterBlockProvider, null, /*#__PURE__*/_react2.default.createElement("div", {
     className: pageDesignerCss
   }, /*#__PURE__*/_react2.default.createElement(_PageTabDesigner.PageDesigner, {
@@ -193,6 +198,9 @@ var Page = function Page(props) {
       margin: 'var(--nb-spacing)',
       flex: 1
     }
+  }, /*#__PURE__*/_react2.default.createElement(_reactErrorBoundary.ErrorBoundary, {
+    FallbackComponent: _errorFallback.ErrorFallback,
+    onError: handleErrors
   }, 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, {
@@ -209,6 +217,6 @@ var Page = function Page(props) {
     "calc(".concat(height, "px + 46px + var(--nb-spacing) * 2)")
   }, /*#__PURE__*/_react2.default.createElement("div", {
     className: pageWithFixedBlockCss
-  }, props.children)))));
+  }, props.children))))));
 };
 exports.Page = Page;

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

@@ -25,6 +25,13 @@ var Pagination = (0, _react.observer)(function (props) {
   if (hidden) {
     return null;
   }
-  return /*#__PURE__*/_react2.default.createElement(_antd.Pagination, _objectSpread({}, others));
+  var onKeypress = function onKeypress(e) {
+    if (e.key === 'Enter') {
+      e.preventDefault();
+    }
+  };
+  return /*#__PURE__*/_react2.default.createElement("div", {
+    onKeyPress: onKeypress
+  }, /*#__PURE__*/_react2.default.createElement(_antd.Pagination, _objectSpread({}, others)));
 });
 exports.Pagination = Pagination;

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

@@ -190,7 +190,7 @@ var InputRecordPicker = function InputRecordPicker(props) {
     multiple: multiple,
     quickUpload: quickUpload,
     selectFile: selectFile,
-    action: "".concat(collectionField.target, ":create"),
+    action: "".concat(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target, ":create"),
     onSelect: handleSelect,
     onRemove: handleRemove,
     onChange: function onChange(changed) {
@@ -257,12 +257,11 @@ var Drawer = function Drawer(_ref) {
     setVisible = _ref.setVisible,
     fieldSchema = _ref.fieldSchema,
     options = _ref.options;
-  console.log('collectionField', options);
   var getFilter = function getFilter() {
-    var targetKey = collectionField.targetKey || 'id';
+    var targetKey = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetKey) || 'id';
     var list = options.map(function (option) {
       return option[targetKey];
-    });
+    }).filter(Boolean);
     var filter = list.length ? {
       $and: [_defineProperty({}, "".concat(targetKey, ".$ne"), list)]
     } : {};

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

@@ -9,6 +9,7 @@ export declare type RemoteSelectProps<P = any> = SelectProps<P, any> & {
     wait?: number;
     manual?: boolean;
     mapOptions?: (data: any) => RemoteSelectProps['fieldNames'];
+    targetField?: any;
     service: ResourceActionOptions<P>;
 };
 export declare const RemoteSelect: React.ForwardRefExoticComponent<Partial<SelectProps<any, any> & {
@@ -18,6 +19,7 @@ export declare const RemoteSelect: React.ForwardRefExoticComponent<Partial<Selec
     wait?: number;
     manual?: boolean;
     mapOptions?: (data: any) => RemoteSelectProps['fieldNames'];
+    targetField?: any;
     service: ResourceActionOptions<any>;
 }> & React.RefAttributes<unknown>> & {
     ReadPretty: typeof ReadPretty;

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

@@ -6,15 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = exports.RemoteSelect = void 0;
 var _icons = require("@ant-design/icons");
 var _react = require("@formily/react");
+var _antd = require("antd");
+var _moment = _interopRequireDefault(require("moment"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _apiClient = require("../../../api-client");
 var _SharedFilterProvider = require("../../../block-provider/SharedFilterProvider");
+var _collectionManager = require("../../../collection-manager");
 var _hooks = require("../../hooks");
 var _select = require("../select");
 var _ReadPretty = require("./ReadPretty");
-var _excluded = ["fieldNames", "service", "wait", "value", "objectValue", "manual", "mapOptions"];
+var _excluded = ["fieldNames", "service", "wait", "value", "objectValue", "manual", "mapOptions", "targetField"];
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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); } }
@@ -39,9 +43,73 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     _props$manual = props.manual,
     manual = _props$manual === void 0 ? true : _props$manual,
     mapOptions = props.mapOptions,
+    _targetField = props.targetField,
     others = _objectWithoutProperties(props, _excluded);
   var compile = (0, _hooks.useCompile)();
   var firstRun = (0, _react2.useRef)(false);
+  var fieldSchema = (0, _react.useFieldSchema)();
+  var _useCollection = (0, _collectionManager.useCollection)(),
+    getField = _useCollection.getField;
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField,
+    getInterface = _useCollectionManager.getInterface;
+  var collectionField = getField(fieldSchema.name);
+  var targetField = _targetField || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) && getCollectionJoinField("".concat(collectionField.target, ".").concat(fieldNames.label));
+  var operator = (0, _react2.useMemo)(function () {
+    if (targetField === null || targetField === void 0 ? void 0 : targetField.interface) {
+      var _getInterface, _getInterface$filtera;
+      return ((_getInterface = getInterface(targetField.interface)) === null || _getInterface === void 0 ? void 0 : (_getInterface$filtera = _getInterface.filterable) === null || _getInterface$filtera === void 0 ? void 0 : _getInterface$filtera.operators[0].value) || '$includes';
+    }
+    return '$includes';
+  }, [targetField]);
+  var mapOptionsToTags = (0, _react2.useCallback)(function (options) {
+    try {
+      return options.map(function (option) {
+        var _targetField$uiSchema, _ref;
+        var label = option[fieldNames.label];
+        if (targetField === null || targetField === void 0 ? void 0 : (_targetField$uiSchema = targetField.uiSchema) === null || _targetField$uiSchema === void 0 ? void 0 : _targetField$uiSchema.enum) {
+          if (Array.isArray(label)) {
+            label = label.map(function (item, index) {
+              var option = targetField.uiSchema.enum.find(function (i) {
+                return i.value === item;
+              });
+              if (option) {
+                return /*#__PURE__*/_react2.default.createElement(_antd.Tag, {
+                  key: index,
+                  color: option.color,
+                  style: {
+                    marginRight: 3
+                  }
+                }, (option === null || option === void 0 ? void 0 : option.label) || item);
+              } else {
+                return /*#__PURE__*/_react2.default.createElement(_antd.Tag, null, item);
+              }
+            }).reverse();
+          } else {
+            var item = targetField.uiSchema.enum.find(function (i) {
+              return i.value === label;
+            });
+            if (item) {
+              label = /*#__PURE__*/_react2.default.createElement(_antd.Tag, {
+                color: item.color
+              }, item.label);
+            }
+          }
+        }
+        if ((targetField === null || targetField === void 0 ? void 0 : targetField.type) === 'date') {
+          label = (0, _moment.default)(label).format('YYYY-MM-DD');
+        }
+        if (mapOptions) {
+          var _mapOptions;
+          return mapOptions((_mapOptions = {}, _defineProperty(_mapOptions, fieldNames.label, label), _defineProperty(_mapOptions, fieldNames.value, option[fieldNames.value]), _mapOptions));
+        }
+        return _ref = {}, _defineProperty(_ref, fieldNames.label, label || option[fieldNames.value]), _defineProperty(_ref, fieldNames.value, option[fieldNames.value]), _ref;
+      });
+    } catch (err) {
+      console.error(err);
+      return options;
+    }
+  }, [targetField === null || targetField === void 0 ? void 0 : targetField.uiSchema, fieldNames]);
   var _useRequest = (0, _apiClient.useRequest)(_objectSpread(_objectSpread({
       action: 'list'
     }, service), {}, {
@@ -72,15 +140,13 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     }
   }, [runDep]);
   var onSearch = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(search) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(search) {
       var _service$params2;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             run({
-              filter: (0, _SharedFilterProvider.mergeFilter)([_defineProperty({}, fieldNames.label, {
-                $includes: search
-              }), service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter])
+              filter: (0, _SharedFilterProvider.mergeFilter)([_defineProperty({}, fieldNames.label, _defineProperty({}, operator, search)), service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter])
             });
           case 1:
           case "end":
@@ -89,13 +155,10 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
       }, _callee);
     }));
     return function onSearch(_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var getOptionsByFieldNames = (0, _react2.useCallback)(function (item) {
-    if (mapOptions) {
-      return mapOptions(item);
-    }
     return Object.keys(fieldNames).reduce(function (obj, key) {
       var value = item[fieldNames[key]];
       if (value) {
@@ -106,11 +169,11 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     }, {});
   }, [fieldNames]);
   var normalizeOptions = (0, _react2.useCallback)(function (obj) {
-    var _ref3;
+    var _ref4;
     if (objectValue || _typeof(obj) === 'object') {
       return getOptionsByFieldNames(obj);
     }
-    return _ref3 = {}, _defineProperty(_ref3, fieldNames.value, obj), _defineProperty(_ref3, fieldNames.label, obj), _ref3;
+    return _ref4 = {}, _defineProperty(_ref4, fieldNames.value, obj), _defineProperty(_ref4, fieldNames.label, obj), _ref4;
   }, [objectValue, getOptionsByFieldNames]);
   var options = (0, _react2.useMemo)(function () {
     var _data$data, _data$data2;
@@ -137,7 +200,7 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     value: value
   }, others), {}, {
     loading: loading,
-    options: options
+    options: mapOptionsToTags(options)
   }));
 }, (0, _react.mapProps)({
   dataSource: 'options'

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

@@ -11,6 +11,7 @@ var _antd = require("antd");
 var _react2 = _interopRequireDefault(require("react"));
 var _hooks = require("../../hooks");
 var _shared2 = require("./shared");
+var _EllipsisWithTooltip = require("../input/EllipsisWithTooltip");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
 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; }
@@ -31,12 +32,14 @@ var ReadPretty = (0, _react.observer)(function (props) {
   }
   var dataSource = field.dataSource || props.options || [];
   var options = (0, _shared2.getCurrentOptions)(field.value, dataSource, fieldNames);
-  return /*#__PURE__*/_react2.default.createElement("div", null, options.map(function (option, key) {
+  return /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_EllipsisWithTooltip.EllipsisWithTooltip, {
+    ellipsis: props.ellipsis
+  }, options.map(function (option, key) {
     return /*#__PURE__*/_react2.default.createElement(_antd.Tag, {
       key: key,
       color: option[fieldNames.color],
       icon: option.icon
     }, compile(option[fieldNames.label]));
-  }));
+  })));
 });
 exports.ReadPretty = ReadPretty;

package/lib/schema-component/antd/select/Select.js

@@ -90,18 +90,12 @@ var InternalSelect = (0, _react.connect)(function (props) {
     value = props.value,
     others = _objectWithoutProperties(props, _excluded2);
   var mode = props.multiple ? 'multiple' : props.mode;
-  if (mode === 'links') {
+  if (mode && !['multiple', 'tags'].includes(mode)) {
     mode = undefined;
   }
-  var toValue = function toValue(v) {
-    if (['multiple', 'tags'].includes(mode)) {
-      return v || [];
-    }
-    return v;
-  };
   if (objectValue) {
     return /*#__PURE__*/_react2.default.createElement(ObjectSelect, _objectSpread(_objectSpread({}, others), {}, {
-      value: toValue(value),
+      value: value,
       mode: mode
     }));
   }
@@ -109,7 +103,7 @@ var InternalSelect = (0, _react.connect)(function (props) {
     showSearch: true,
     filterOption: filterOption,
     allowClear: true,
-    value: toValue(value)
+    value: value
   }, others), {}, {
     onChange: function onChange(changed) {
       var _props$onChange;

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

@@ -5,153 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FilterDynamicComponent = FilterDynamicComponent;
 var _react = _interopRequireDefault(require("react"));
-var _ = require("../..");
-var _useValues2 = require("../filter/useValues");
+var _useVariableOptions = require("../../../schema-settings/VariableInput/hooks/useVariableOptions");
 var _variable = require("../variable");
-var _useUserVariable = require("./hooks/useUserVariable");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var useVariableOptions = function useVariableOptions() {
-  var _useValues = (0, _useValues2.useValues)(),
-    operator = _useValues.operator,
-    schema = _useValues.schema;
-  var operatorValue = (operator === null || operator === void 0 ? void 0 : operator.value) || '';
-  var userVariable = (0, _useUserVariable.useUserVariable)({
-    schema: schema,
-    operator: operator
-  });
-  if (!operator || !schema) return [];
-  var disabled = !['DatePicker', 'DatePicker.RangePicker'].includes(schema['x-component']);
-  var dateOptions = [{
-    key: 'now',
-    value: 'now',
-    label: "{{t(\"Now\")}}",
-    disabled: schema['x-component'] !== 'DatePicker' || operatorValue === '$dateBetween'
-  }, {
-    key: 'yesterday',
-    value: 'yesterday',
-    label: "{{t(\"Yesterday\")}}",
-    disabled: disabled
-  }, {
-    key: 'today',
-    value: 'today',
-    label: "{{t(\"Today\")}}",
-    disabled: disabled
-  }, {
-    key: 'tomorrow',
-    value: 'tomorrow',
-    label: "{{t(\"Tomorrow\")}}",
-    disabled: disabled
-  }, {
-    key: 'lastIsoWeek',
-    value: 'lastIsoWeek',
-    label: "{{t(\"Last week\")}}",
-    disabled: disabled
-  }, {
-    key: 'thisIsoWeek',
-    value: 'thisIsoWeek',
-    label: "{{t(\"This week\")}}",
-    disabled: disabled
-  }, {
-    key: 'nextIsoWeek',
-    value: 'nextIsoWeek',
-    label: "{{t(\"Next week\")}}",
-    disabled: disabled
-  }, {
-    key: 'lastMonth',
-    value: 'lastMonth',
-    label: "{{t(\"Last month\")}}",
-    disabled: disabled
-  }, {
-    key: 'thisMonth',
-    value: 'thisMonth',
-    label: "{{t(\"This month\")}}",
-    disabled: disabled
-  }, {
-    key: 'nextMonth',
-    value: 'nextMonth',
-    label: "{{t(\"Next month\")}}",
-    disabled: disabled
-  }, {
-    key: 'lastQuarter',
-    value: 'lastQuarter',
-    label: "{{t(\"Last quarter\")}}",
-    disabled: disabled
-  }, {
-    key: 'thisQuarter',
-    value: 'thisQuarter',
-    label: "{{t(\"This quarter\")}}",
-    disabled: disabled
-  }, {
-    key: 'nextQuarter',
-    value: 'nextQuarter',
-    label: "{{t(\"Next quarter\")}}",
-    disabled: disabled
-  }, {
-    key: 'lastYear',
-    value: 'lastYear',
-    label: "{{t(\"Last year\")}}",
-    disabled: disabled
-  }, {
-    key: 'thisYear',
-    value: 'thisYear',
-    label: "{{t(\"This year\")}}",
-    disabled: disabled
-  }, {
-    key: 'nextYear',
-    value: 'nextYear',
-    label: "{{t(\"Next year\")}}",
-    disabled: disabled
-  }, {
-    key: 'last7Days',
-    value: 'last7Days',
-    label: "{{t(\"Last 7 days\")}}",
-    disabled: disabled
-  }, {
-    key: 'next7Days',
-    value: 'next7Days',
-    label: "{{t(\"Next 7 days\")}}",
-    disabled: disabled
-  }, {
-    key: 'last30Days',
-    value: 'last30Days',
-    label: "{{t(\"Last 30 days\")}}",
-    disabled: disabled
-  }, {
-    key: 'next30Days',
-    value: 'next30Days',
-    label: "{{t(\"Next 30 days\")}}",
-    disabled: disabled
-  }, {
-    key: 'last90Days',
-    value: 'last90Days',
-    label: "{{t(\"Last 90 days\")}}",
-    disabled: disabled
-  }, {
-    key: 'next90Days',
-    value: 'next90Days',
-    label: "{{t(\"Next 90 days\")}}",
-    disabled: disabled
-  }];
-  return [userVariable, {
-    label: "{{t(\"Date variables\")}}",
-    value: '$date',
-    key: '$date',
-    disabled: dateOptions.every(function (option) {
-      return option.disabled;
-    }),
-    children: dateOptions
-  }];
-};
 function FilterDynamicComponent(props) {
   var value = props.value,
     onChange = props.onChange,
     renderSchemaComponent = props.renderSchemaComponent;
-  var options = useVariableOptions();
-  var compile = (0, _.useCompile)();
-  var scope = compile(options);
+  var options = (0, _useVariableOptions.useVariableOptions)();
   return /*#__PURE__*/_react.default.createElement(_variable.Variable.Input, {
     value: value,
     onChange: onChange,
-    scope: scope
+    scope: options
   }, renderSchemaComponent());
 }