@nocobase/client 0.10.0-alpha.2 → 0.10.0-alpha.4

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

@@ -1,6 +1,6 @@
 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 = ["children"];
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 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); }); }; }
@@ -19,10 +19,11 @@ 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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 import { PlusOutlined } from '@ant-design/icons';
+import { PageHeader as AntdPageHeader } from '@ant-design/pro-layout';
 import { css } from '@emotion/css';
 import { FormDialog, FormLayout } from '@formily/antd';
 import { Schema, SchemaOptionsContext, useFieldSchema } from '@formily/react';
-import { Button, PageHeader as AntdPageHeader, Spin, Tabs } from 'antd';
+import { Button, Spin, Tabs } from 'antd';
 import classNames from 'classnames';
 import React, { useContext, useEffect, useMemo, useState } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
@@ -41,6 +42,8 @@ import { PageDesigner, PageTabDesigner } from './PageTabDesigner';
 var designerCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  &:hover {\n    > .general-schema-designer {\n      display: block;\n    }\n  }\n  &.nb-action-link {\n    > .general-schema-designer {\n      top: var(--nb-designer-offset);\n      bottom: var(--nb-designer-offset);\n      right: var(--nb-designer-offset);\n      left: var(--nb-designer-offset);\n    }\n  }\n  > .general-schema-designer {\n    position: absolute;\n    z-index: 999;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    display: none;\n    background: rgba(241, 139, 98, 0.06);\n    border: 0;\n    pointer-events: none;\n    > .general-schema-designer-icons {\n      position: absolute;\n      right: 2px;\n      top: 2px;\n      line-height: 16px;\n      pointer-events: all;\n      .ant-space-item {\n        background-color: #f18b62;\n        color: #fff;\n        line-height: 16px;\n        width: 16px;\n        padding-left: 1px;\n      }\n    }\n  }\n"])));
 var pageDesignerCss = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  position: relative;\n  z-index: 20;\n  flex: 1;\n  display: flex;\n  flex-direction: column;\n\n  &:hover {\n    > .general-schema-designer {\n      display: block;\n    }\n  }\n  .ant-page-header {\n    z-index: 1;\n    position: relative;\n  }\n  > .general-schema-designer {\n    position: absolute;\n    z-index: 999;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    display: none;\n    /* background: rgba(241, 139, 98, 0.06); */\n    border: 0;\n    pointer-events: none;\n    > .general-schema-designer-icons {\n      z-index: 9999;\n      position: absolute;\n      right: 2px;\n      top: 2px;\n      line-height: 16px;\n      pointer-events: all;\n      .ant-space-item {\n        background-color: #f18b62;\n        color: #fff;\n        line-height: 16px;\n        width: 16px;\n        padding-left: 1px;\n      }\n    }\n  }\n"])));
 var pageWithFixedBlockCss = classNames(['nb-page-content', css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    height: 100%;\n    > .nb-grid:not(:last-child) {\n      > .nb-schema-initializer-button {\n        display: none;\n      }\n    }\n  "])))]);
+var pageHeaderCss = css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  background-color: white;\n  &.ant-page-header-has-footer {\n    padding-top: 12px;\n    padding-bottom: 0;\n    .ant-page-header-heading-left {\n      /* margin: 0; */\n    }\n    .ant-page-header-footer {\n      margin-top: 0;\n    }\n  }\n"])));
+var height0 = css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  font-size: 0;\n  height: 0;\n"])));
 export var Page = function Page(props) {
   var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3;
   var children = props.children,
@@ -90,6 +93,7 @@ export var Page = function Page(props) {
   var handleErrors = function handleErrors(error) {
     console.error(error);
   };
+  var pageHeaderTitle = hidePageTitle ? undefined : fieldSchema.title || compile(title);
   return /*#__PURE__*/React.createElement(FilterBlockProvider, null, /*#__PURE__*/React.createElement("div", {
     className: pageDesignerCss
   }, /*#__PURE__*/React.createElement(PageDesigner, {
@@ -99,9 +103,10 @@ export var Page = function Page(props) {
       setHeight(Math.floor((_ref === null || _ref === void 0 ? void 0 : _ref.getBoundingClientRect().height) || 0) + 1);
     }
   }, !disablePageHeader && /*#__PURE__*/React.createElement(AntdPageHeader, _objectSpread(_objectSpread({
-    className: css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                &.has-footer {\n                  padding-top: 12px;\n                  .ant-page-header-heading-left {\n                    /* margin: 0; */\n                  }\n                  .ant-page-header-footer {\n                    margin-top: 0;\n                  }\n                }\n              "]))),
+    className: classNames(pageHeaderCss, pageHeaderTitle || enablePageTabs ? '' : height0),
     ghost: false,
-    title: hidePageTitle ? undefined : fieldSchema.title || compile(title)
+    // 如果标题为空的时候会导致 PageHeader 不渲染，所以这里设置一个空白字符，然后再设置高度为 0
+    title: pageHeaderTitle || ' '
   }, others), {}, {
     footer: enablePageTabs && /*#__PURE__*/React.createElement(DndContext, null, /*#__PURE__*/React.createElement(Tabs, {
       size: 'small',
@@ -116,7 +121,7 @@ export var Page = function Page(props) {
       },
       tabBarExtraContent: dn.designable && /*#__PURE__*/React.createElement(Button, {
         icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
-        className: css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                              border-color: rgb(241, 139, 98) !important;\n                              color: rgb(241, 139, 98) !important;\n                            "]))),
+        className: css(_templateObject6 || (_templateObject6 = _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() {
@@ -173,24 +178,25 @@ export var Page = function Page(props) {
           }
           return onClick;
         }()
-      }, t('Add tab'))
-    }, fieldSchema.mapProperties(function (schema) {
-      return /*#__PURE__*/React.createElement(Tabs.TabPane, {
-        tab: /*#__PURE__*/React.createElement(SortableItem, {
-          id: schema.name,
-          schema: schema,
-          className: classNames('nb-action-link', designerCss, props.className)
-        }, schema['x-icon'] && /*#__PURE__*/React.createElement(Icon, {
-          style: {
-            marginRight: 8
-          },
-          type: schema['x-icon']
-        }), /*#__PURE__*/React.createElement("span", null, schema.title || t('Unnamed')), /*#__PURE__*/React.createElement(PageTabDesigner, {
-          schema: schema
-        })),
-        key: schema.name
-      });
-    })))
+      }, t('Add tab')),
+      items: fieldSchema.mapProperties(function (schema) {
+        return {
+          label: /*#__PURE__*/React.createElement(SortableItem, {
+            id: schema.name,
+            schema: schema,
+            className: classNames('nb-action-link', designerCss, props.className)
+          }, schema['x-icon'] && /*#__PURE__*/React.createElement(Icon, {
+            style: {
+              marginRight: 8
+            },
+            type: schema['x-icon']
+          }), /*#__PURE__*/React.createElement("span", null, schema.title || t('Unnamed')), /*#__PURE__*/React.createElement(PageTabDesigner, {
+            schema: schema
+          })),
+          key: schema.name
+        };
+      })
+    }))
   }))), /*#__PURE__*/React.createElement("div", {
     className: "nb-page-wrapper",
     style: {

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

@@ -17,16 +17,20 @@ 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, Divider } 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, 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 _fieldSchema$xCompon, _field$componentProps, _field$componentProps2, _field$componentProps3, _service$params;
@@ -48,10 +52,12 @@ var InternalRemoteSelect = connect(function (props) {
     _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);
@@ -117,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,
@@ -159,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) {
@@ -175,7 +226,7 @@ var InternalRemoteSelect = connect(function (props) {
       }, _callee);
     }));
     return function onSearch(_x2) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var options = useMemo(function () {
@@ -189,10 +240,9 @@ var InternalRemoteSelect = connect(function (props) {
   var onDropdownVisibleChange = function onDropdownVisibleChange(visible) {
     setOpen(visible);
     searchData.current = null;
-    if (firstRun.current && (data === null || data === void 0 ? void 0 : data.data.length) > 0) {
-      return;
+    if (visible) {
+      run();
     }
-    run();
     firstRun.current = true;
   };
   return /*#__PURE__*/React.createElement(Select, _objectSpread(_objectSpread({

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/table-v2/FilterDynamicComponent.js

@@ -1,11 +1,26 @@
+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 = ["value", "onChange", "renderSchemaComponent", "form", "collectionField"];
+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); }
+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 React from 'react';
 import { useVariableOptions } from '../../../schema-settings/VariableInput/hooks/useVariableOptions';
 import { Variable } from '../variable';
 export function FilterDynamicComponent(props) {
   var value = props.value,
     onChange = props.onChange,
-    renderSchemaComponent = props.renderSchemaComponent;
-  var options = useVariableOptions();
+    renderSchemaComponent = props.renderSchemaComponent,
+    form = props.form,
+    collectionField = props.collectionField,
+    other = _objectWithoutProperties(props, _excluded);
+  var options = useVariableOptions(_objectSpread({
+    form: form,
+    collectionField: collectionField
+  }, other));
   return /*#__PURE__*/React.createElement(Variable.Input, {
     value: value,
     onChange: onChange,

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

@@ -6,11 +6,14 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 { useField, useFieldSchema } from '@formily/react';
 import React from 'react';
+import { set } from 'lodash';
 import { useTranslation } from 'react-i18next';
-import { useCollectionManager } from '../../../collection-manager';
+import { useCollectionManager, useCollectionFilterOptions } from '../../../collection-manager';
 import { GeneralSchemaDesigner, SchemaSettings, isPatternDisabled } from '../../../schema-settings';
 import { useCompile, useDesignable } from '../../hooks';
 import { useAssociationFieldContext } from '../association-field/hooks';
+import { FilterDynamicComponent } from './FilterDynamicComponent';
+import { removeNullCondition } from '../filter';
 var useLabelFields = function useLabelFields(collectionName) {
   var _targetFields$filter, _targetFields$filter$, _targetFields$filter$2;
   // 需要在组件顶层调用
@@ -32,7 +35,7 @@ var useLabelFields = function useLabelFields(collectionName) {
   });
 };
 export var TableColumnDesigner = function TableColumnDesigner(props) {
-  var _fieldSchema$xCompon, _uiSchema$xComponent, _collectionField$targ, _collectionField$uiSc, _columnSchema$xCompo, _fieldSchema$xCompon2;
+  var _fieldSchema$xCompon, _uiSchema$xComponent, _collectionField$targ, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _collectionField$uiSc, _columnSchema$xCompo, _fieldSchema$xCompon5;
   var uiSchema = props.uiSchema,
     fieldSchema = props.fieldSchema,
     collectionField = props.collectionField;
@@ -54,6 +57,8 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
   var _useAssociationFieldC = useAssociationFieldContext(),
     currentMode = _useAssociationFieldC.currentMode,
     tableField = _useAssociationFieldC.field;
+  var defaultFilter = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : (_fieldSchema$xCompon3 = _fieldSchema$xCompon2.service) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : (_fieldSchema$xCompon4 = _fieldSchema$xCompon3.params) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.filter) || {};
+  var dataSource = useCollectionFilterOptions(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
   var readOnlyMode = 'editable';
   if (fieldSchema['x-disabled'] === true) {
     readOnlyMode = 'readonly';
@@ -93,6 +98,40 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
       }
       dn.refresh();
     }
+  }), currentMode && !field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+    title: t('Set the data scope'),
+    schema: {
+      type: 'object',
+      title: t('Set the data scope'),
+      properties: {
+        filter: {
+          default: defaultFilter,
+          enum: dataSource,
+          'x-component': 'Filter',
+          'x-component-props': {
+            dynamicComponent: function dynamicComponent(props) {
+              return FilterDynamicComponent(_objectSpread({}, props));
+            }
+          }
+        }
+      }
+    },
+    onSubmit: function onSubmit(_ref2) {
+      var _field$path, _field$path2, _schema;
+      var filter = _ref2.filter;
+      filter = removeNullCondition(filter);
+      set(field.componentProps, 'service.params.filter', filter);
+      fieldSchema['x-component-props'] = field.componentProps;
+      var path = (_field$path = field.path) === null || _field$path === void 0 ? void 0 : _field$path.splice(((_field$path2 = field.path) === null || _field$path2 === void 0 ? void 0 : _field$path2.length) - 1, 1);
+      tableField === null || tableField === void 0 ? void 0 : tableField.value.map(function (_, index) {
+        field.form.query("".concat(path.concat("".concat(index, ".") + fieldSchema.name))).take(function (f) {
+          set(f.componentProps, 'service.params.filter', filter);
+        });
+      });
+      dn.emit('patch', {
+        schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, 'x-component-props', field.componentProps), _schema)
+      });
+    }
   }), /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     title: t('Column width'),
     schema: {
@@ -107,8 +146,8 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
         }
       }
     },
-    onSubmit: function onSubmit(_ref2) {
-      var width = _ref2.width;
+    onSubmit: function onSubmit(_ref3) {
+      var width = _ref3.width;
       var props = columnSchema['x-component-props'] || {};
       props['width'] = width;
       var schema = _defineProperty({}, 'x-uid', columnSchema['x-uid']);
@@ -137,7 +176,7 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
     }
   }), ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho', 'snapshot', 'createdBy', 'updatedBy'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isFileField && readOnlyMode === 'read-pretty' && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     title: t('Enable link'),
-    checked: ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.enableLink) !== false,
+    checked: ((_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5.enableLink) !== false,
     onChange: function onChange(flag) {
       fieldSchema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
         enableLink: flag
@@ -158,8 +197,8 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
     options: options,
     value: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames['label'],
     onChange: function onChange(label) {
-      var _collectionField$uiSc2, _fieldSchema$xCompon3;
-      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-component-props']['fieldNames']), fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3['fieldNames']), {}, {
+      var _collectionField$uiSc2, _fieldSchema$xCompon6;
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-component-props']['fieldNames']), fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon6 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : _fieldSchema$xCompon6['fieldNames']), {}, {
         label: label
       });
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;
@@ -179,11 +218,11 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
     title: t('Required'),
     checked: fieldSchema.required,
     onChange: function onChange(required) {
-      var _field$path, _field$path2;
+      var _field$path3, _field$path4;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       fieldSchema['required'] = required;
       schema['required'] = required;
-      var path = (_field$path = field.path) === null || _field$path === void 0 ? void 0 : _field$path.splice(((_field$path2 = field.path) === null || _field$path2 === void 0 ? void 0 : _field$path2.length) - 1, 1);
+      var path = (_field$path3 = field.path) === null || _field$path3 === void 0 ? void 0 : _field$path3.splice(((_field$path4 = field.path) === null || _field$path4 === void 0 ? void 0 : _field$path4.length) - 1, 1);
       tableField === null || tableField === void 0 ? void 0 : tableField.value.map(function (_, index) {
         field.form.query("".concat(path.concat("".concat(index, ".") + fieldSchema.name))).take(function (f) {
           f.required = required;
@@ -209,9 +248,9 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
     }],
     value: readOnlyMode,
     onChange: function onChange(v) {
-      var _field$path3, _field$path4;
+      var _field$path5, _field$path6;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
-      var path = (_field$path3 = field.path) === null || _field$path3 === void 0 ? void 0 : _field$path3.splice(((_field$path4 = field.path) === null || _field$path4 === void 0 ? void 0 : _field$path4.length) - 1, 1);
+      var path = (_field$path5 = field.path) === null || _field$path5 === void 0 ? void 0 : _field$path5.splice(((_field$path6 = field.path) === null || _field$path6 === void 0 ? void 0 : _field$path6.length) - 1, 1);
       switch (v) {
         case 'readonly':
           {
@@ -261,7 +300,7 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
       dn.refresh();
     }
   }), /*#__PURE__*/React.createElement(SchemaSettings.Divider, null), /*#__PURE__*/React.createElement(SchemaSettings.Remove, {
-    removeParentsIfNoChildren: true,
+    removeParentsIfNoChildren: !isSubTableColumn,
     breakRemoveOn: {
       'x-component': 'Grid'
     },