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

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Page = void 0;
 var _icons = require("@ant-design/icons");
+var _proLayout = require("@ant-design/pro-layout");
 var _css = require("@emotion/css");
 var _antd = require("@formily/antd");
 var _react = require("@formily/react");
@@ -26,7 +27,7 @@ var _errorFallback = require("../error-fallback");
 var _FixedBlock = _interopRequireDefault(require("./FixedBlock"));
 var _PageTabDesigner = require("./PageTabDesigner");
 var _excluded = ["children"];
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 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 }; }
@@ -50,6 +51,8 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 var designerCss = (0, _css.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 = (0, _css.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 = (0, _classnames.default)(['nb-page-content', (0, _css.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 = (0, _css.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 = (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  font-size: 0;\n  height: 0;\n"])));
 var Page = function Page(props) {
   var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3;
   var children = props.children,
@@ -99,6 +102,7 @@ var Page = function Page(props) {
   var handleErrors = function handleErrors(error) {
     console.error(error);
   };
+  var pageHeaderTitle = hidePageTitle ? undefined : fieldSchema.title || compile(title);
   return /*#__PURE__*/_react2.default.createElement(_FilterProvider.FilterBlockProvider, null, /*#__PURE__*/_react2.default.createElement("div", {
     className: pageDesignerCss
   }, /*#__PURE__*/_react2.default.createElement(_PageTabDesigner.PageDesigner, {
@@ -107,10 +111,11 @@ var Page = function Page(props) {
     ref: function ref(_ref) {
       setHeight(Math.floor((_ref === null || _ref === void 0 ? void 0 : _ref.getBoundingClientRect().height) || 0) + 1);
     }
-  }, !disablePageHeader && /*#__PURE__*/_react2.default.createElement(_antd2.PageHeader, _objectSpread(_objectSpread({
-    className: (0, _css.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              "]))),
+  }, !disablePageHeader && /*#__PURE__*/_react2.default.createElement(_proLayout.PageHeader, _objectSpread(_objectSpread({
+    className: (0, _classnames.default)(pageHeaderCss, pageHeaderTitle || enablePageTabs ? '' : height0),
     ghost: false,
-    title: hidePageTitle ? undefined : fieldSchema.title || compile(title)
+    // 如果标题为空的时候会导致 PageHeader 不渲染，所以这里设置一个空白字符，然后再设置高度为 0
+    title: pageHeaderTitle || ' '
   }, others), {}, {
     footer: enablePageTabs && /*#__PURE__*/_react2.default.createElement(_common.DndContext, null, /*#__PURE__*/_react2.default.createElement(_antd2.Tabs, {
       size: 'small',
@@ -125,7 +130,7 @@ var Page = function Page(props) {
       },
       tabBarExtraContent: dn.designable && /*#__PURE__*/_react2.default.createElement(_antd2.Button, {
         icon: /*#__PURE__*/_react2.default.createElement(_icons.PlusOutlined, null),
-        className: (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                              border-color: rgb(241, 139, 98) !important;\n                              color: rgb(241, 139, 98) !important;\n                            "]))),
+        className: (0, _css.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() {
@@ -182,24 +187,25 @@ var Page = function Page(props) {
           }
           return onClick;
         }()
-      }, t('Add tab'))
-    }, fieldSchema.mapProperties(function (schema) {
-      return /*#__PURE__*/_react2.default.createElement(_antd2.Tabs.TabPane, {
-        tab: /*#__PURE__*/_react2.default.createElement(_sortableItem.SortableItem, {
-          id: schema.name,
-          schema: schema,
-          className: (0, _classnames.default)('nb-action-link', designerCss, props.className)
-        }, schema['x-icon'] && /*#__PURE__*/_react2.default.createElement(_icon.Icon, {
-          style: {
-            marginRight: 8
-          },
-          type: schema['x-icon']
-        }), /*#__PURE__*/_react2.default.createElement("span", null, schema.title || t('Unnamed')), /*#__PURE__*/_react2.default.createElement(_PageTabDesigner.PageTabDesigner, {
-          schema: schema
-        })),
-        key: schema.name
-      });
-    })))
+      }, t('Add tab')),
+      items: fieldSchema.mapProperties(function (schema) {
+        return {
+          label: /*#__PURE__*/_react2.default.createElement(_sortableItem.SortableItem, {
+            id: schema.name,
+            schema: schema,
+            className: (0, _classnames.default)('nb-action-link', designerCss, props.className)
+          }, schema['x-icon'] && /*#__PURE__*/_react2.default.createElement(_icon.Icon, {
+            style: {
+              marginRight: 8
+            },
+            type: schema['x-icon']
+          }), /*#__PURE__*/_react2.default.createElement("span", null, schema.title || t('Unnamed')), /*#__PURE__*/_react2.default.createElement(_PageTabDesigner.PageTabDesigner, {
+            schema: schema
+          })),
+          key: schema.name
+        };
+      })
+    }))
   }))), /*#__PURE__*/_react2.default.createElement("div", {
     className: "nb-page-wrapper",
     style: {

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

@@ -8,14 +8,18 @@ exports.default = exports.RemoteSelect = void 0;
 var _icons = require("@ant-design/icons");
 var _react = require("@formily/react");
 var _antd = require("antd");
+var _flat = _interopRequireDefault(require("flat"));
 var _lodash = require("lodash");
 var _moment = _interopRequireDefault(require("moment"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _apiClient = require("../../../api-client");
+var _BlockProvider = require("../../../block-provider/BlockProvider");
 var _SharedFilterProvider = require("../../../block-provider/SharedFilterProvider");
 var _collectionManager = require("../../../collection-manager");
+var _uitls = require("../../common/utils/uitls");
 var _select = require("../select");
 var _ReadPretty = require("./ReadPretty");
+var _utils = require("./utils");
 var _excluded = ["fieldNames", "service", "wait", "value", "objectValue", "manual", "mapOptions", "targetField", "CustomDropdownRender"];
 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; }
@@ -57,10 +61,12 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  var form = (0, _react.useForm)();
   var firstRun = (0, _react2.useRef)(false);
   var fieldSchema = (0, _react.useFieldSchema)();
   var isQuickAdd = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.addMode) === 'quickAdd';
   var field = (0, _react.useField)();
+  var ctx = (0, _BlockProvider.useBlockRequestContext)();
   var _useCollection = (0, _collectionManager.useCollection)(),
     getField = _useCollection.getField;
   var searchData = (0, _react2.useRef)(null);
@@ -126,15 +132,60 @@ var InternalRemoteSelect = (0, _react.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 = (0, _uitls.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 = (0, _utils.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 = (0, _utils.generatePattern)(matches === null || matches === void 0 ? void 0 : matches[1], associationfield);
+        var parseValue = (0, _utils.extractValuesByPattern)((0, _flat.default)(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 = (0, _utils.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 = (0, _apiClient.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: (0, _SharedFilterProvider.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: (0, _SharedFilterProvider.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,
@@ -168,7 +219,7 @@ 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 _field$componentProps4, _field$componentProps5, _field$componentProps6, _service$params2;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -184,7 +235,7 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
       }, _callee);
     }));
     return function onSearch(_x2) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var options = (0, _react2.useMemo)(function () {
@@ -198,9 +249,6 @@ var InternalRemoteSelect = (0, _react.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;
-    }
     run();
     firstRun.current = true;
   };

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

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.extractFilterfield = extractFilterfield;
+exports.extractValuesByPattern = extractValuesByPattern;
+exports.generatePattern = generatePattern;
+exports.parseVariables = void 0;
+var _lodash = require("lodash");
+var parseVariables = function parseVariables(str, ctx) {
+  if (str) {
+    var result = (0, _lodash.get)(ctx, str);
+    return (0, _lodash.isFunction)(result) ? result() : result;
+  } else {
+    return str;
+  }
+};
+exports.parseVariables = parseVariables;
+function extractFilterfield(str) {
+  var match = str.match(/^\$form\.([^.[\]]+)/);
+  if (match) {
+    return match[1];
+  }
+  return null;
+}
+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;
+}
+function generatePattern(str, fieldName) {
+  var result = str.replace("$form.".concat(fieldName, "."), "".concat(fieldName, ".*."));
+  return result;
+}

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

@@ -1,5 +1,6 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -7,12 +8,26 @@ exports.FilterDynamicComponent = FilterDynamicComponent;
 var _react = _interopRequireDefault(require("react"));
 var _useVariableOptions = require("../../../schema-settings/VariableInput/hooks/useVariableOptions");
 var _variable = require("../variable");
+var _excluded = ["value", "onChange", "renderSchemaComponent", "form", "collectionField"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
+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; }
 function FilterDynamicComponent(props) {
   var value = props.value,
     onChange = props.onChange,
-    renderSchemaComponent = props.renderSchemaComponent;
-  var options = (0, _useVariableOptions.useVariableOptions)();
+    renderSchemaComponent = props.renderSchemaComponent,
+    form = props.form,
+    collectionField = props.collectionField,
+    other = _objectWithoutProperties(props, _excluded);
+  var options = (0, _useVariableOptions.useVariableOptions)(_objectSpread({
+    form: form,
+    collectionField: collectionField
+  }, other));
   return /*#__PURE__*/_react.default.createElement(_variable.Variable.Input, {
     value: value,
     onChange: onChange,

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

@@ -6,11 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.TableColumnDesigner = void 0;
 var _react = require("@formily/react");
 var _react2 = _interopRequireDefault(require("react"));
+var _lodash = require("lodash");
 var _reactI18next = require("react-i18next");
 var _collectionManager = require("../../../collection-manager");
 var _schemaSettings = require("../../../schema-settings");
 var _hooks = require("../../hooks");
 var _hooks2 = require("../association-field/hooks");
+var _FilterDynamicComponent = require("./FilterDynamicComponent");
+var _filter = require("../filter");
 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; }
@@ -39,7 +42,7 @@ var useLabelFields = function useLabelFields(collectionName) {
   });
 };
 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;
@@ -61,6 +64,8 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
   var _useAssociationFieldC = (0, _hooks2.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 = (0, _collectionManager.useCollectionFilterOptions)(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
   var readOnlyMode = 'editable';
   if (fieldSchema['x-disabled'] === true) {
     readOnlyMode = 'readonly';
@@ -100,6 +105,40 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
       }
       dn.refresh();
     }
+  }), currentMode && !field.readPretty && /*#__PURE__*/_react2.default.createElement(_schemaSettings.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 (0, _FilterDynamicComponent.FilterDynamicComponent)(_objectSpread({}, props));
+            }
+          }
+        }
+      }
+    },
+    onSubmit: function onSubmit(_ref2) {
+      var _field$path, _field$path2, _schema;
+      var filter = _ref2.filter;
+      filter = (0, _filter.removeNullCondition)(filter);
+      (0, _lodash.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) {
+          (0, _lodash.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__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
     title: t('Column width'),
     schema: {
@@ -114,8 +153,8 @@ 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']);
@@ -144,7 +183,7 @@ 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__*/_react2.default.createElement(_schemaSettings.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
@@ -165,8 +204,8 @@ 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;
@@ -186,11 +225,11 @@ 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;
@@ -216,9 +255,9 @@ 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':
           {
@@ -268,7 +307,7 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
       dn.refresh();
     }
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Divider, null), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Remove, {
-    removeParentsIfNoChildren: true,
+    removeParentsIfNoChildren: !isSubTableColumn,
     breakRemoveOn: {
       'x-component': 'Grid'
     },

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

@@ -279,7 +279,7 @@ var Table = (0, _react.observer)(function (props) {
         }
       };
     };
-    highlightRow = (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n      & > td {\n        background-color: #caedff !important;\n      }\n      &:hover > td {\n        background-color: #caedff !important;\n      }\n    "])));
+    highlightRow = (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n        & > td {\n          background-color: #caedff !important;\n        }\n        &:hover > td {\n          background-color: #caedff !important;\n        }\n      "])));
   }
   // useEffect(() => {
   //   field.setValidator((value) => {
@@ -311,7 +311,7 @@ var Table = (0, _react.observer)(function (props) {
         },
         cell: function cell(props) {
           return /*#__PURE__*/_react2.default.createElement("th", _objectSpread(_objectSpread({}, props), {}, {
-            className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                  max-width: 300px;\n                  white-space: nowrap;\n                  &:hover .general-schema-designer {\n                    display: block;\n                  }\n                "]))))
+            className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                    max-width: 300px;\n                    white-space: nowrap;\n                    &:hover .general-schema-designer {\n                      display: block;\n                    }\n                  "]))))
           }));
         }
       },
@@ -343,7 +343,7 @@ var Table = (0, _react.observer)(function (props) {
         },
         cell: function cell(props) {
           return /*#__PURE__*/_react2.default.createElement("td", _objectSpread(_objectSpread({}, props), {}, {
-            className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                max-width: 300px;\n                white-space: nowrap;\n                .nb-read-pretty-input-number {\n                  text-align: right;\n                }\n              "]))))
+            className: (0, _classnames.default)(props.className, (0, _css.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                  max-width: 300px;\n                  white-space: nowrap;\n                  .nb-read-pretty-input-number {\n                    text-align: right;\n                  }\n                "]))))
           }));
         }
       }
@@ -388,15 +388,15 @@ var Table = (0, _react.observer)(function (props) {
           index = (0, _utils.extractIndex)(record.__index);
         }
         return /*#__PURE__*/_react2.default.createElement("div", {
-          className: (0, _classnames.default)(checked ? 'checked' : null, (0, _css.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n                    position: relative;\n                    display: flex;\n                    float: left;\n                    align-items: center;\n                    justify-content: space-evenly;\n                    padding-right: 8px;\n                    .nb-table-index {\n                      opacity: 0;\n                    }\n                    &:not(.checked) {\n                      .nb-table-index {\n                        opacity: 1;\n                      }\n                    }\n                  "]))), _defineProperty({}, (0, _css.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n                      &:hover {\n                        .nb-table-index {\n                          opacity: 0;\n                        }\n                        .nb-origin-node {\n                          display: block;\n                        }\n                      }\n                    "]))), isRowSelect))
+          className: (0, _classnames.default)(checked ? 'checked' : null, (0, _css.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n                      position: relative;\n                      display: flex;\n                      float: left;\n                      align-items: center;\n                      justify-content: space-evenly;\n                      padding-right: 8px;\n                      .nb-table-index {\n                        opacity: 0;\n                      }\n                      &:not(.checked) {\n                        .nb-table-index {\n                          opacity: 1;\n                        }\n                      }\n                    "]))), _defineProperty({}, (0, _css.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n                        &:hover {\n                          .nb-table-index {\n                            opacity: 0;\n                          }\n                          .nb-origin-node {\n                            display: block;\n                          }\n                        }\n                      "]))), isRowSelect))
         }, /*#__PURE__*/_react2.default.createElement("div", {
-          className: (0, _classnames.default)(checked ? 'checked' : null, (0, _css.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n                      position: relative;\n                      display: flex;\n                      align-items: center;\n                      justify-content: space-evenly;\n                    "]))))
+          className: (0, _classnames.default)(checked ? 'checked' : null, (0, _css.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n                        position: relative;\n                        display: flex;\n                        align-items: center;\n                        justify-content: space-evenly;\n                      "]))))
         }, dragSort && /*#__PURE__*/_react2.default.createElement(SortHandle, {
           id: getRowKey(record)
         }), showIndex && /*#__PURE__*/_react2.default.createElement(TableIndex, {
           index: index
         })), isRowSelect && /*#__PURE__*/_react2.default.createElement("div", {
-          className: (0, _classnames.default)('nb-origin-node', checked ? 'checked' : null, (0, _css.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n                        position: absolute;\n                        right: 50%;\n                        transform: translateX(50%);\n                        &:not(.checked) {\n                          display: none;\n                        }\n                      "]))))
+          className: (0, _classnames.default)('nb-origin-node', checked ? 'checked' : null, (0, _css.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n                          position: absolute;\n                          right: 50%;\n                          transform: translateX(50%);\n                          &:not(.checked) {\n                            display: none;\n                          }\n                        "]))))
         }, originNode));
       }
     }, rowSelection) : undefined
@@ -425,7 +425,7 @@ var Table = (0, _react.observer)(function (props) {
     };
   }, [fixedBlock, tableHeight]);
   return /*#__PURE__*/_react2.default.createElement("div", {
-    className: (0, _css.css)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n        height: 100%;\n        overflow: hidden;\n        .ant-table-wrapper {\n          height: 100%;\n          .ant-spin-nested-loading {\n            height: 100%;\n            .ant-spin-container {\n              height: 100%;\n              display: flex;\n              flex-direction: column;\n            }\n          }\n        }\n        .ant-table {\n          overflow-x: auto;\n          overflow-y: hidden;\n        }\n      "])))
+    className: (0, _css.css)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n          height: 100%;\n          overflow: hidden;\n          .ant-table-wrapper {\n            height: 100%;\n            .ant-spin-nested-loading {\n              height: 100%;\n              .ant-spin-container {\n                height: 100%;\n                display: flex;\n                flex-direction: column;\n              }\n            }\n          }\n          .ant-table {\n            overflow-x: auto;\n            overflow-y: hidden;\n          }\n        "])))
   }, /*#__PURE__*/_react2.default.createElement(SortableWrapper, null, /*#__PURE__*/_react2.default.createElement(_antd.Table, _objectSpread(_objectSpread(_objectSpread({
     ref: tableSizeRefCallback,
     rowKey: rowKey !== null && rowKey !== void 0 ? rowKey : defaultRowKey,
@@ -460,5 +460,7 @@ var Table = (0, _react.observer)(function (props) {
       return /*#__PURE__*/_react2.default.createElement("div", null, message);
     });
   })));
+}, {
+  displayName: 'Table'
 });
 exports.Table = Table;

package/lib/schema-component/antd/tabs/Tabs.js

@@ -12,6 +12,7 @@ var _react2 = _interopRequireWildcard(require("react"));
 var _icon = require("../../../icon");
 var _schemaInitializer = require("../../../schema-initializer");
 var _common = require("../../common");
+var _hooks = require("../../hooks");
 var _useDesigner = require("../../hooks/useDesigner");
 var _context = require("./context");
 var _Tabs = require("./Tabs.Designer");
@@ -30,31 +31,43 @@ var Tabs = (0, _react.observer)(function (props) {
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useSchemaInitializer = (0, _schemaInitializer.useSchemaInitializer)(fieldSchema['x-initializer']),
     render = _useSchemaInitializer.render;
+  var _useDesignable = (0, _hooks.useDesignable)(),
+    designable = _useDesignable.designable;
   var contextProps = (0, _context.useTabsContext)();
-  var PaneProvider = (0, _react2.useMemo)(function () {
-    if (contextProps.deep === false) {
-      return _context.TabsContextProvider;
+  var _contextProps$PaneRoo = contextProps.PaneRoot,
+    PaneRoot = _contextProps$PaneRoo === void 0 ? _react2.default.Fragment : _contextProps$PaneRoo;
+  var items = (0, _react2.useMemo)(function () {
+    var result = fieldSchema.mapProperties(function (schema, key) {
+      return {
+        key: key,
+        label: /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
+          name: key,
+          schema: schema,
+          onlyRenderSelf: true
+        }),
+        children: /*#__PURE__*/_react2.default.createElement(PaneRoot, {
+          active: key === contextProps.activeKey
+        }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
+          name: key,
+          schema: schema,
+          onlyRenderProperties: true
+        }))
+      };
+    });
+    if (designable) {
+      result.push({
+        key: 'designer',
+        label: render(),
+        children: null
+      });
     }
-    return _react2.default.Fragment;
-  }, [contextProps.deep]);
+    return result;
+  }, [fieldSchema.mapProperties(function (s, key) {
+    return key;
+  }).join()]);
   return /*#__PURE__*/_react2.default.createElement(_common.DndContext, null, /*#__PURE__*/_react2.default.createElement(_antd.Tabs, _objectSpread(_objectSpread({}, contextProps), {}, {
     style: props.style,
-    tabBarExtraContent: {
-      right: render()
-    }
-  }), fieldSchema.mapProperties(function (schema, key) {
-    return /*#__PURE__*/_react2.default.createElement(_antd.Tabs.TabPane, {
-      tab: /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
-        name: key,
-        schema: schema,
-        onlyRenderSelf: true
-      }),
-      key: key
-    }, /*#__PURE__*/_react2.default.createElement(PaneProvider, null, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
-      name: key,
-      schema: schema,
-      onlyRenderProperties: true
-    })));
+    items: items
   })));
 }, {
   displayName: 'Tabs'

package/lib/schema-component/antd/tabs/context.d.ts

@@ -1,7 +1,7 @@
 import { TabsProps } from 'antd';
 import React from 'react';
 interface TabsContextProps extends TabsProps {
-    deep?: boolean;
+    PaneRoot?: React.FC<any>;
 }
 export declare const TabsContextProvider: React.FC<TabsContextProps>;
 export declare const useTabsContext: () => TabsContextProps;