@nocobase/client 0.9.4-alpha.2 → 0.10.0-alpha.3

package/es/schema-component/antd/quick-edit/QuickEdit.js

@@ -0,0 +1,88 @@
+var _templateObject;
+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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { css } from '@emotion/css';
+import { FormItem } from '@formily/antd';
+import { createForm } from '@formily/core';
+import { FormContext, RecursionField, observer, useField, useFieldSchema } from '@formily/react';
+import { Popover } from 'antd';
+import React, { useMemo, useRef } from 'react';
+import { useCollectionManager } from '../../../collection-manager';
+export var Editable = observer(function (props) {
+  var field = useField();
+  var containerRef = useRef(null);
+  var fieldSchema = useFieldSchema();
+  var schema = {
+    name: fieldSchema.name,
+    'x-collection-field': fieldSchema['x-collection-field'],
+    'x-component': 'CollectionField',
+    'x-read-pretty': true,
+    default: field.value,
+    'x-component-props': fieldSchema['x-component-props']
+  };
+  var form = useMemo(function () {
+    return createForm({
+      values: _defineProperty({}, fieldSchema.name, field.value)
+    });
+  }, [field.value, fieldSchema['x-component-props']]);
+  var getContainer = function getContainer() {
+    return containerRef.current;
+  };
+  var modifiedChildren = React.Children.map(props.children, function (child) {
+    if ( /*#__PURE__*/React.isValidElement(child)) {
+      //@ts-ignore
+      return /*#__PURE__*/React.cloneElement(child, {
+        getContainer: getContainer
+      });
+    }
+    return child;
+  });
+  return /*#__PURE__*/React.createElement(FormItem, _objectSpread(_objectSpread({}, props), {}, {
+    labelStyle: {
+      display: 'none'
+    }
+  }), /*#__PURE__*/React.createElement(Popover, {
+    content: /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: '100%',
+        height: '100%',
+        minWidth: 500
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      ref: containerRef
+    }, modifiedChildren)),
+    trigger: "click",
+    placement: 'bottomLeft',
+    overlayClassName: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          padding-top: 0;\n          .ant-popover-arrow {\n            display: none;\n          }\n        "])))
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      minHeight: 30,
+      padding: '0 8px'
+    }
+  }, /*#__PURE__*/React.createElement(FormContext.Provider, {
+    value: form
+  }, /*#__PURE__*/React.createElement(RecursionField, {
+    schema: schema,
+    name: fieldSchema.name
+  })))));
+});
+export var QuickEdit = observer(function (props) {
+  var field = useField();
+  var _useCollectionManager = useCollectionManager(),
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
+  var fieldSchema = useFieldSchema();
+  var collectionField = getCollectionJoinField(fieldSchema['x-collection-field']);
+  if (!collectionField) {
+    return null;
+  }
+  return field.editable ? /*#__PURE__*/React.createElement(Editable, _objectSpread({}, props)) : /*#__PURE__*/React.createElement(FormItem, _objectSpread(_objectSpread({}, props), {}, {
+    style: {
+      padding: '0 8px'
+    }
+  }));
+});

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

@@ -0,0 +1 @@
+export * from './QuickEdit';

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

@@ -0,0 +1 @@
+export * from './QuickEdit';

package/es/schema-component/antd/radio/Radio.d.ts

@@ -1,4 +1,4 @@
-import type { RadioGroupProps, RadioProps } from 'antd/lib/radio';
+import type { RadioGroupProps, RadioProps } from 'antd/es/radio';
 import React from 'react';
 declare type ComposedRadio = React.FC<RadioProps> & {
     Group?: React.FC<RadioGroupProps>;

package/es/schema-component/antd/record-picker/InputRecordPicker.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 export declare const RecordPickerContext: React.Context<any>;
 export declare const InputRecordPicker: React.FC<any>;
-export declare const RecordPickerProvider: (props: any) => JSX.Element;
+export declare const RecordPickerProvider: (props: any) => React.JSX.Element;
 export declare function isShowFilePicker(labelUiSchema: any): boolean;

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

@@ -27,7 +27,7 @@ import { TableSelectorParamsProvider, useTableSelectorProps as useTsp } from '..
 import { CollectionProvider, useCollection } from '../../../collection-manager';
 import { FormProvider, SchemaComponentOptions } from '../../core';
 import { useCompile } from '../../hooks';
-import { ActionContext, useActionContext } from '../action';
+import { ActionContextProvider, useActionContext } from '../action';
 import { FileSelector } from '../preview';
 import { useFieldNames } from './useFieldNames';
 import { getLabelFormatValue, useLabelUiSchema } from './util';
@@ -291,12 +291,10 @@ var Drawer = function Drawer(_ref) {
   return /*#__PURE__*/React.createElement(RecordPickerProvider, _objectSpread({}, recordPickerProps), /*#__PURE__*/React.createElement(CollectionProvider, {
     allowNull: true,
     name: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
-  }, /*#__PURE__*/React.createElement(ActionContext.Provider, {
-    value: {
-      openMode: 'drawer',
-      visible: visible,
-      setVisible: setVisible
-    }
+  }, /*#__PURE__*/React.createElement(ActionContextProvider, {
+    openMode: "drawer",
+    visible: visible,
+    setVisible: setVisible
   }, /*#__PURE__*/React.createElement(FormProvider, null, /*#__PURE__*/React.createElement(TableSelectorParamsProvider, {
     params: {
       filter: getFilter()

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

@@ -13,12 +13,14 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { observer, RecursionField, useFieldSchema } from '@formily/react';
 import { toArr } from '@formily/shared';
 import React, { Fragment, useRef, useState } from 'react';
-import { BlockAssociationContext, WithoutTableFieldResource } from '../../../block-provider';
+import { WithoutTableFieldResource } from '../../../block-provider';
+// TODO: 不要使用 '../../../block-provider' 这个路径引用 BlockAssociationContext，在 Vitest 中会报错，待修复
+import { BlockAssociationContext } from '../../../block-provider/BlockProvider';
 import { CollectionProvider, useCollection, useCollectionManager } from '../../../collection-manager';
 import { RecordProvider, useRecord } from '../../../record-provider';
 import { FormProvider } from '../../core';
 import { useCompile } from '../../hooks';
-import { ActionContext, useActionContext } from '../action';
+import { ActionContextProvider, useActionContext } from '../action';
 import { EllipsisWithTooltip } from '../input/EllipsisWithTooltip';
 import { Preview } from '../preview';
 import { isShowFilePicker } from './InputRecordPicker';
@@ -67,7 +69,9 @@ export var ReadPrettyRecordPicker = observer(function (props) {
       var text = getLabelFormatValue(labelUiSchema, val, true);
       return /*#__PURE__*/React.createElement(Fragment, {
         key: "".concat(record.id, "_").concat(index)
-      }, /*#__PURE__*/React.createElement("span", null, snapshot || isTagsMode ? text : /*#__PURE__*/React.createElement("a", {
+      }, /*#__PURE__*/React.createElement("span", {
+        className: "test-record-picker-read-pretty-item"
+      }, snapshot || isTagsMode ? text : /*#__PURE__*/React.createElement("a", {
         onClick: function onClick(e) {
           var _ellipsisWithTooltipR;
           e.stopPropagation();
@@ -113,7 +117,7 @@ export var ReadPrettyRecordPicker = observer(function (props) {
   }, /*#__PURE__*/React.createElement(EllipsisWithTooltip, {
     ellipsis: ellipsis,
     ref: ellipsisWithTooltipRef
-  }, renderRecords()), /*#__PURE__*/React.createElement(ActionContext.Provider, {
+  }, renderRecords()), /*#__PURE__*/React.createElement(ActionContextProvider, {
     value: {
       visible: visible,
       setVisible: setVisible,
@@ -121,4 +125,6 @@ export var ReadPrettyRecordPicker = observer(function (props) {
       snapshot: collectionField.interface === 'snapshot'
     }
   }, renderRecordProvider())))) : null;
+}, {
+  displayName: 'ReadPrettyRecordPicker'
 });

package/es/schema-component/antd/remote-select/ReadPretty.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const ReadPretty: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const ReadPretty: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

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

@@ -49,4 +49,6 @@ export var ReadPretty = observer(function (props) {
   return /*#__PURE__*/React.createElement(Select.ReadPretty, _objectSpread(_objectSpread({}, props), {}, {
     options: data === null || data === void 0 ? void 0 : data.data
   }));
+}, {
+  displayName: 'ReadPretty'
 });

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

@@ -11,6 +11,7 @@ export declare type RemoteSelectProps<P = any> = SelectProps<P, any> & {
     mapOptions?: (data: any) => RemoteSelectProps['fieldNames'];
     targetField?: any;
     service: ResourceActionOptions<P>;
+    CustomDropdownRender?: (v: any) => any;
 };
 export declare const RemoteSelect: React.ForwardRefExoticComponent<Partial<SelectProps<any, any> & {
     objectValue?: boolean;
@@ -21,6 +22,7 @@ export declare const RemoteSelect: React.ForwardRefExoticComponent<Partial<Selec
     mapOptions?: (data: any) => RemoteSelectProps['fieldNames'];
     targetField?: any;
     service: ResourceActionOptions<any>;
+    CustomDropdownRender?: (v: any) => any;
 }> & React.RefAttributes<unknown>> & {
     ReadPretty: typeof ReadPretty;
 };

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

@@ -1,5 +1,5 @@
-var _excluded = ["fieldNames", "service", "wait", "value", "objectValue", "manual", "mapOptions", "targetField"];
 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); }
+var _excluded = ["fieldNames", "service", "wait", "value", "objectValue", "manual", "mapOptions", "targetField", "CustomDropdownRender"];
 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); } }
 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); }); }; }
@@ -8,22 +8,32 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { LoadingOutlined } from '@ant-design/icons';
-import { connect, mapProps, mapReadPretty, useField, useFieldSchema } from '@formily/react';
-import { Tag } from 'antd';
+import { connect, mapProps, mapReadPretty, useField, useFieldSchema, useForm } from '@formily/react';
+import { Divider, Tag } from 'antd';
+import flat from 'flat';
 import { uniqBy } from 'lodash';
 import moment from 'moment';
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useRequest } from '../../../api-client';
+import { useBlockRequestContext } from '../../../block-provider/BlockProvider';
 import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
-import { Select, defaultFieldNames } from '../select';
+import { getInnermostKeyAndValue } from '../../common/utils/uitls';
+import { defaultFieldNames, Select } from '../select';
 import { ReadPretty } from './ReadPretty';
+import { extractFilterfield, extractValuesByPattern, generatePattern, parseVariables } from './utils';
 var EMPTY = 'N/A';
 var InternalRemoteSelect = connect(function (props) {
-  var _field$componentProps, _field$componentProps2, _field$componentProps3, _service$params;
+  var _fieldSchema$xCompon, _field$componentProps, _field$componentProps2, _field$componentProps3, _service$params;
   var _props$fieldNames = props.fieldNames,
     fieldNames = _props$fieldNames === void 0 ? {} : _props$fieldNames,
     _props$service = props.service,
@@ -36,12 +46,21 @@ var InternalRemoteSelect = connect(function (props) {
     manual = _props$manual === void 0 ? true : _props$manual,
     mapOptions = props.mapOptions,
     _targetField = props.targetField,
+    CustomDropdownRender = props.CustomDropdownRender,
     others = _objectWithoutProperties(props, _excluded);
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  var form = useForm();
   var firstRun = useRef(false);
   var fieldSchema = useFieldSchema();
+  var isQuickAdd = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.addMode) === 'quickAdd';
   var field = useField();
+  var ctx = useBlockRequestContext();
   var _useCollection = useCollection(),
     getField = _useCollection.getField;
+  var searchData = useRef(null);
   var _useCollectionManager = useCollectionManager(),
     getCollectionJoinField = _useCollectionManager.getCollectionJoinField,
     getInterface = _useCollectionManager.getInterface;
@@ -104,15 +123,60 @@ var InternalRemoteSelect = connect(function (props) {
       return options;
     }
   }, [targetField === null || targetField === void 0 ? void 0 : targetField.uiSchema, fieldNames]);
+  var parseFilter = function parseFilter(rules) {
+    if (!rules) {
+      return undefined;
+    }
+    var type = Object.keys(rules)[0] || '$and';
+    var conditions = rules[type];
+    var results = [];
+    conditions === null || conditions === void 0 ? void 0 : conditions.forEach(function (c) {
+      var _jsonlogic$value, _jsonlogic$value$matc;
+      var jsonlogic = getInnermostKeyAndValue(c);
+      var regex = /{{(.*?)}}/;
+      var matches = (_jsonlogic$value = jsonlogic.value) === null || _jsonlogic$value === void 0 ? void 0 : (_jsonlogic$value$matc = _jsonlogic$value.match) === null || _jsonlogic$value$matc === void 0 ? void 0 : _jsonlogic$value$matc.call(_jsonlogic$value, regex);
+      if (!matches || !matches[1].includes('$form') && !matches[1].includes('$iteration')) {
+        results.push(c);
+        return;
+      }
+      var associationfield = extractFilterfield(matches[1]);
+      var filterCollectionField = getCollectionJoinField("".concat(ctx.props.collection, ".").concat(associationfield));
+      if (['o2m', 'm2m'].includes(filterCollectionField === null || filterCollectionField === void 0 ? void 0 : filterCollectionField.interface)) {
+        // 对多子表单
+        var pattern = generatePattern(matches === null || matches === void 0 ? void 0 : matches[1], associationfield);
+        var parseValue = extractValuesByPattern(flat(form.values), pattern);
+        var filters = parseValue.map(function (v) {
+          return JSON.parse(JSON.stringify(c).replace(jsonlogic.value, v));
+        });
+        results.push({
+          $or: filters
+        });
+      } else {
+        var variablesCtx = {
+          $form: form.values,
+          $iteration: form.values
+        };
+        var str = matches === null || matches === void 0 ? void 0 : matches[1];
+        if (str.includes('$iteration')) {
+          var path = field.path.segments.concat([]);
+          path.pop();
+          str = str.replace('$iteration.', "$iteration.".concat(path.join('.'), "."));
+        }
+        var _parseValue = parseVariables(str, variablesCtx);
+        var filterObj = JSON.parse(JSON.stringify(c).replace(jsonlogic.value, str.endsWith('id') ? _parseValue !== null && _parseValue !== void 0 ? _parseValue : 0 : _parseValue));
+        results.push(filterObj);
+      }
+    });
+    return _defineProperty({}, type, results);
+  };
   var _useRequest = useRequest(_objectSpread(_objectSpread({
       action: 'list'
     }, service), {}, {
       params: _objectSpread(_objectSpread({
         pageSize: 200
       }, service === null || service === void 0 ? void 0 : service.params), {}, {
-        // fields: [fieldNames.label, fieldNames.value, ...(service?.params?.fields || [])],
         // search needs
-        filter: mergeFilter([((_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.service) === null || _field$componentProps2 === void 0 ? void 0 : (_field$componentProps3 = _field$componentProps2.params) === null || _field$componentProps3 === void 0 ? void 0 : _field$componentProps3.filter) || (service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.filter)])
+        filter: mergeFilter([parseFilter((_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.service) === null || _field$componentProps2 === void 0 ? void 0 : (_field$componentProps3 = _field$componentProps2.params) === null || _field$componentProps3 === void 0 ? void 0 : _field$componentProps3.filter) || (service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.filter)])
       })
     }), {
       manual: manual,
@@ -127,6 +191,18 @@ var InternalRemoteSelect = connect(function (props) {
       fieldNames: fieldNames
     });
   }, [service, fieldNames]);
+  var CustomRenderCom = useCallback(function () {
+    if (searchData.current && CustomDropdownRender) {
+      return /*#__PURE__*/React.createElement(CustomDropdownRender, {
+        search: searchData.current,
+        callBack: function callBack() {
+          searchData.current = null;
+          setOpen(false);
+        }
+      });
+    }
+    return null;
+  }, [searchData.current]);
   useEffect(function () {
     // Lazy load
     if (firstRun.current) {
@@ -134,7 +210,7 @@ var InternalRemoteSelect = 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 _field$componentProps4, _field$componentProps5, _field$componentProps6, _service$params2;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -142,44 +218,33 @@ var InternalRemoteSelect = connect(function (props) {
             run({
               filter: mergeFilter([search ? _defineProperty({}, fieldNames.label, _defineProperty({}, operator, search)) : {}, ((_field$componentProps4 = field.componentProps) === null || _field$componentProps4 === void 0 ? void 0 : (_field$componentProps5 = _field$componentProps4.service) === null || _field$componentProps5 === void 0 ? void 0 : (_field$componentProps6 = _field$componentProps5.params) === null || _field$componentProps6 === void 0 ? void 0 : _field$componentProps6.filter) || (service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter)])
             });
-          case 1:
+            searchData.current = search;
+          case 2:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function onSearch(_x) {
-      return _ref.apply(this, arguments);
+    return function onSearch(_x2) {
+      return _ref2.apply(this, arguments);
     };
   }();
-  var getOptionsByFieldNames = useCallback(function (item) {
-    return Object.keys(fieldNames).reduce(function (obj, key) {
-      return obj;
-    }, {});
-  }, [fieldNames]);
-  var normalizeOptions = useCallback(function (obj) {
-    var _ref3;
-    if (objectValue || _typeof(obj) === 'object') {
-      return getOptionsByFieldNames(obj);
-    }
-    return _ref3 = {}, _defineProperty(_ref3, fieldNames.value, obj), _defineProperty(_ref3, fieldNames.label, obj), _ref3;
-  }, [objectValue, getOptionsByFieldNames]);
   var options = useMemo(function () {
     var _data$data, _data$data2;
     if (!(data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.length)) {
-      return value !== undefined && value !== null ? Array.isArray(value) ? value : [value] : [];
+      return value != null ? Array.isArray(value) ? value : [value] : [];
     }
-    var valueOptions = value !== undefined && value !== null && (Array.isArray(value) ? value : [value]) || [];
+    var valueOptions = value != null && (Array.isArray(value) ? value : [value]) || [];
     return uniqBy((data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.concat(valueOptions)) || [], fieldNames.value);
-  }, [data === null || data === void 0 ? void 0 : data.data, getOptionsByFieldNames, normalizeOptions, value]);
-  var onDropdownVisibleChange = function onDropdownVisibleChange() {
-    if (firstRun.current) {
-      return;
-    }
+  }, [data === null || data === void 0 ? void 0 : data.data, value]);
+  var onDropdownVisibleChange = function onDropdownVisibleChange(visible) {
+    setOpen(visible);
+    searchData.current = null;
     run();
     firstRun.current = true;
   };
   return /*#__PURE__*/React.createElement(Select, _objectSpread(_objectSpread({
+    open: open,
     dropdownMatchSelectWidth: false,
     autoClearSearchValue: true,
     filterOption: false,
@@ -191,13 +256,26 @@ var InternalRemoteSelect = connect(function (props) {
     value: value
   }, others), {}, {
     loading: data ? loading : true,
-    options: mapOptionsToTags(options)
+    options: mapOptionsToTags(options),
+    rawOptions: options,
+    dropdownRender: function dropdownRender(menu) {
+      var isFullMatch = options.some(function (v) {
+        return v[fieldNames.label] === searchData.current;
+      });
+      return /*#__PURE__*/React.createElement(React.Fragment, null, isQuickAdd ? /*#__PURE__*/React.createElement(React.Fragment, null, !((data === null || data === void 0 ? void 0 : data.data.length) === 0 && (searchData === null || searchData === void 0 ? void 0 : searchData.current)) && menu, (data === null || data === void 0 ? void 0 : data.data.length) > 0 && (searchData === null || searchData === void 0 ? void 0 : searchData.current) && !isFullMatch && /*#__PURE__*/React.createElement(Divider, {
+        style: {
+          margin: 0
+        }
+      }), !isFullMatch && /*#__PURE__*/React.createElement(CustomRenderCom, null)) : menu);
+    }
   }));
 }, mapProps({
   dataSource: 'options'
 }, function (props, field) {
+  var _fieldSchema$xCompon2;
+  var fieldSchema = useFieldSchema();
   return _objectSpread(_objectSpread({}, props), {}, {
-    fieldNames: _objectSpread(_objectSpread(_objectSpread({}, defaultFieldNames), props.fieldNames), field.componentProps.fieldNames),
+    fieldNames: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultFieldNames), props.fieldNames), field.componentProps.fieldNames), (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.fieldNames),
     suffixIcon: (field === null || field === void 0 ? void 0 : field['loading']) || (field === null || field === void 0 ? void 0 : field['validating']) ? /*#__PURE__*/React.createElement(LoadingOutlined, null) : props.suffixIcon
   });
 }), mapReadPretty(ReadPretty));

package/es/schema-component/antd/remote-select/utils.d.ts

@@ -0,0 +1,4 @@
+export declare const parseVariables: (str: string, ctx: any) => any;
+export declare function extractFilterfield(str: any): any;
+export declare function extractValuesByPattern(obj: any, pattern: any): any[];
+export declare function generatePattern(str: any, fieldName: any): any;

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

@@ -0,0 +1,31 @@
+import { get, isFunction } from 'lodash';
+export var parseVariables = function parseVariables(str, ctx) {
+  if (str) {
+    var result = get(ctx, str);
+    return isFunction(result) ? result() : result;
+  } else {
+    return str;
+  }
+};
+export function extractFilterfield(str) {
+  var match = str.match(/^\$form\.([^.[\]]+)/);
+  if (match) {
+    return match[1];
+  }
+  return null;
+}
+export function extractValuesByPattern(obj, pattern) {
+  var regexPattern = new RegExp(pattern.replace(/\*/g, '\\d+'));
+  var result = [];
+  for (var key in obj) {
+    if (regexPattern.test(key)) {
+      var value = obj[key];
+      result.push(value);
+    }
+  }
+  return result;
+}
+export function generatePattern(str, fieldName) {
+  var result = str.replace("$form.".concat(fieldName, "."), "".concat(fieldName, ".*."));
+  return result;
+}

package/es/schema-component/antd/select/ReadPretty.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const ReadPretty: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const ReadPretty: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

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

@@ -9,14 +9,12 @@ import { observer, useField } from '@formily/react';
 import { isValid } from '@formily/shared';
 import { Tag } from 'antd';
 import React from 'react';
-import { useCompile } from '../../hooks';
-import { defaultFieldNames, getCurrentOptions } from './shared';
 import { EllipsisWithTooltip } from '../input/EllipsisWithTooltip';
+import { defaultFieldNames, getCurrentOptions } from './utils';
 export var ReadPretty = observer(function (props) {
   var _field$value;
   var fieldNames = _objectSpread(_objectSpread({}, defaultFieldNames), props.fieldNames);
   var field = useField();
-  var compile = useCompile();
   if (!isValid(props.value)) {
     return /*#__PURE__*/React.createElement("div", null);
   }
@@ -24,14 +22,16 @@ export var ReadPretty = observer(function (props) {
     return /*#__PURE__*/React.createElement("div", null);
   }
   var dataSource = field.dataSource || props.options || [];
-  var options = getCurrentOptions(field.value, dataSource, fieldNames);
+  var currentOptions = getCurrentOptions(field.value, dataSource, fieldNames);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(EllipsisWithTooltip, {
     ellipsis: props.ellipsis
-  }, options.map(function (option, key) {
+  }, currentOptions.map(function (option, key) {
     return /*#__PURE__*/React.createElement(Tag, {
       key: key,
       color: option[fieldNames.color],
       icon: option.icon
-    }, compile(option[fieldNames.label]));
+    }, option[fieldNames.label]);
   })));
+}, {
+  displayName: 'ReadPretty'
 });

package/es/schema-component/antd/select/Select.d.ts

@@ -1,10 +1,13 @@
 import type { SelectProps } from 'antd';
 import React from 'react';
 import { ReadPretty } from './ReadPretty';
+import { FieldNames } from './utils';
 export declare const Select: React.ForwardRefExoticComponent<Partial<SelectProps<any, any> & {
     objectValue?: boolean;
     onChange?: (v: any) => void;
     multiple: boolean;
+    rawOptions: any[];
+    fieldNames: FieldNames;
 }> & React.RefAttributes<unknown>> & {
     ReadPretty: typeof ReadPretty;
 };