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

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

@@ -20,21 +20,17 @@ import { LoadingOutlined } from '@ant-design/icons';
 import { connect, mapProps, mapReadPretty, useField, useFieldSchema, useForm } from '@formily/react';
 import dayjs from 'dayjs';
 import { Divider, Tag } from 'antd';
-import flat from 'flat';
-import _, { uniqBy } from 'lodash';
+import { uniqBy } from 'lodash';
 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 { getInnermostKeyAndValue } from '../../common/utils/uitls';
 import { useCompile } from '../../hooks';
 import { Select, defaultFieldNames } 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, _ctx$props, _field$componentProps4, _field$componentProps5, _field$componentProps6, _service$params2;
+  var _fieldSchema$xCompon, _service$params;
   var _props$fieldNames = props.fieldNames,
     fieldNames = _props$fieldNames === void 0 ? {} : _props$fieldNames,
     _props$service = props.service,
@@ -59,7 +55,6 @@ var InternalRemoteSelect = connect(function (props) {
   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);
@@ -126,80 +121,16 @@ var InternalRemoteSelect = connect(function (props) {
       return options;
     }
   }, [targetField === null || targetField === void 0 ? void 0 : targetField.uiSchema, fieldNames]);
-  var parseFilter = useCallback(function (rules) {
-    if (!rules) {
-      return undefined;
-    }
-    if (typeof rules === 'string') {
-      return rules;
-    }
-    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);
-        if (Array.isArray(_parseValue)) {
-          var _filters = _parseValue.map(function (v) {
-            return JSON.parse(JSON.stringify(c).replace(jsonlogic.value, v));
-          });
-          results.push({
-            $or: _filters
-          });
-        } else {
-          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);
-  }, [(_ctx$props = ctx.props) === null || _ctx$props === void 0 ? void 0 : _ctx$props.collection, field.path.segments, form.values, getCollectionJoinField]);
-  var filter = useMemo(function () {
-    var _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _field$componentProps, _field$componentProps2, _field$componentProps3, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _service$params;
-    var filterFromSchema = _.isString(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) ? (_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 : fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : (_fieldSchema$xCompon6 = _fieldSchema$xCompon5.service) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : (_fieldSchema$xCompon7 = _fieldSchema$xCompon6.params) === null || _fieldSchema$xCompon7 === void 0 ? void 0 : _fieldSchema$xCompon7.filter;
-    return mergeFilter([parseFilter(filterFromSchema) || (service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.filter)]);
-  }, [(_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, fieldSchema, parseFilter, service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter]);
   var _useRequest = useRequest(_objectSpread(_objectSpread({
       action: 'list'
     }, service), {}, {
       params: _objectSpread(_objectSpread({
         pageSize: 200
       }, service === null || service === void 0 ? void 0 : service.params), {}, {
-        // search needs
-        filter: filter
+        filter: service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.filter
       })
     }), {
-      manual: manual,
+      manual: manual && Object.prototype.toString.call(value) === '[object Object]',
       debounceWait: wait
     }),
     data = _useRequest.data,
@@ -230,12 +161,13 @@ var InternalRemoteSelect = connect(function (props) {
     }
   }, [runDep]);
   var onSearch = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(search) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(search) {
+      var _service$params2;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             run({
-              filter: mergeFilter([search ? _defineProperty({}, fieldNames.label, _defineProperty({}, operator, search)) : {}, filter])
+              filter: mergeFilter([search ? _defineProperty({}, fieldNames.label, _defineProperty({}, operator, search)) : {}, service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter])
             });
             searchData.current = search;
           case 2:
@@ -245,7 +177,7 @@ var InternalRemoteSelect = connect(function (props) {
       }, _callee);
     }));
     return function onSearch(_x2) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
   var options = useMemo(function () {
@@ -254,7 +186,7 @@ var InternalRemoteSelect = connect(function (props) {
     if (!(data !== null && data !== void 0 && (_data$data = data.data) !== null && _data$data !== void 0 && _data$data.length)) {
       return v != null ? Array.isArray(v) ? v : [v] : [];
     }
-    var valueOptions = v != null && (Array.isArray(v) ? v : [v]) || [];
+    var valueOptions = v != null && (Array.isArray(v) ? v : [_objectSpread(_objectSpread({}, v), {}, _defineProperty({}, fieldNames.value, v[fieldNames.value] || v))]) || [];
     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);
   }, [value, defaultValue, data === null || data === void 0 ? void 0 : data.data, fieldNames.value]);
   var onDropdownVisibleChange = function onDropdownVisibleChange(visible) {
@@ -295,10 +227,10 @@ var InternalRemoteSelect = connect(function (props) {
 }, mapProps({
   dataSource: 'options'
 }, function (props, field) {
-  var _fieldSchema$xCompon8;
+  var _fieldSchema$xCompon2;
   var fieldSchema = useFieldSchema();
   return _objectSpread(_objectSpread({}, props), {}, {
-    fieldNames: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultFieldNames), props.fieldNames), field.componentProps.fieldNames), (_fieldSchema$xCompon8 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon8 === void 0 ? void 0 : _fieldSchema$xCompon8.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 && field['loading'] || field !== null && field !== void 0 && field['validating'] ? /*#__PURE__*/React.createElement(LoadingOutlined, null) : props.suffixIcon
   });
 }), mapReadPretty(ReadPretty));

package/es/schema-component/antd/rich-text/RichText.js

@@ -4,7 +4,7 @@ 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); }
-import { connect, mapReadPretty } from '@formily/react';
+import { connect, mapReadPretty, mapProps } from '@formily/react';
 import React from 'react';
 import ReactQuill from 'react-quill';
 import { ReadPretty as InputReadPretty } from '../input';
@@ -33,6 +33,11 @@ export var RichText = connect(function (props) {
     onChange: onChange,
     readOnly: disabled
   }));
-}, mapReadPretty(function (props) {
+}, mapProps(function (props) {
+  var value = props.value;
+  return _objectSpread(_objectSpread({}, props), {}, {
+    value: _typeof(value) === 'object' ? value === null || value === void 0 ? void 0 : value.default : value
+  });
+}), mapReadPretty(function (props) {
   return /*#__PURE__*/React.createElement(InputReadPretty.Html, _objectSpread({}, props));
 }));

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

@@ -10,7 +10,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCollectionFilterOptions, useCollectionManager } from '../../../collection-manager';
 import { GeneralSchemaDesigner, SchemaSettings, isPatternDisabled, isShowDefaultValue } from '../../../schema-settings';
-import { useCompile, useDesignable } from '../../hooks';
+import { useCompile, useDesignable, useFieldModeOptions } from '../../hooks';
 import { useAssociationFieldContext } from '../association-field/hooks';
 import { removeNullCondition } from '../filter';
 import { FilterDynamicComponent } from './FilterDynamicComponent';
@@ -75,11 +75,14 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
   var isFileField = isFileCollection(targetCollection);
   var isSubTableColumn = ['QuickEdit', 'FormItem'].includes(fieldSchema['x-decorator']);
   var _useAssociationFieldC = useAssociationFieldContext(),
-    currentMode = _useAssociationFieldC.currentMode,
-    tableField = _useAssociationFieldC.field;
+    currentMode = _useAssociationFieldC.currentMode;
   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 isDateField = ['datetime', 'createdAt', 'updatedAt'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
+  var isAssociationField = ['obo', 'oho', 'o2o', 'o2m', 'm2m', 'm2o', 'snapshot'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
+  var fieldModeOptions = useFieldModeOptions({
+    fieldSchema: fieldSchema
+  });
   var fieldMode = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5['mode']) || 'Select';
   var readOnlyMode = 'editable';
   if (fieldSchema['x-disabled'] === true) {
@@ -88,6 +91,7 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
   if (fieldSchema['x-read-pretty'] === true) {
     readOnlyMode = 'read-pretty';
   }
+  var isSelectFieldMode = isAssociationField && fieldMode === 'Select';
   return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, {
     disableInitializer: true
   }, /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
@@ -120,7 +124,7 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
       }
       dn.refresh();
     }
-  }), currentMode && !field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+  }), isSelectFieldMode && !field.readPretty && !(uiSchema !== null && uiSchema !== void 0 && uiSchema['x-read-pretty']) && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     title: t('Set the data scope'),
     schema: {
       type: 'object',
@@ -145,10 +149,11 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
       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);
-        });
+      field.form.query("".concat(path.concat("*." + fieldSchema.name))).forEach(function (f) {
+        f.componentProps.service = f.componentProps.service || {
+          params: {}
+        };
+        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)
@@ -219,12 +224,13 @@ 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$xCompon7;
+      var _collectionField$uiSc2, _fieldSchema$xCompon7, _field$path3, _field$path4;
       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$xCompon7 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon7 === void 0 ? void 0 : _fieldSchema$xCompon7['fieldNames']), {}, {
         label: label
       });
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;
-      field.query(".*.".concat(fieldSchema.name)).take(function (f) {
+      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);
+      field.form.query("".concat(path.concat("*." + fieldSchema.name))).forEach(function (f) {
         f.componentProps.fieldNames = fieldNames;
       });
       dn.emit('patch', {
@@ -235,16 +241,16 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
       });
       dn.refresh();
     }
-  }), readOnlyMode === 'read-pretty' && ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho', 'snapshot'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+  }), isAssociationField && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     key: "field-mode",
     title: t('Field component'),
-    options: [{
+    options: readOnlyMode === 'read-pretty' ? [{
       label: t('Title'),
       value: 'Select'
     }, {
       label: t('Tag'),
       value: 'Tag'
-    }],
+    }] : fieldModeOptions,
     value: fieldMode,
     onChange: function onChange(mode) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
@@ -279,15 +285,13 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
     title: t('Required'),
     checked: fieldSchema.required,
     onChange: function onChange(required) {
-      var _field$path3, _field$path4;
+      var _field$path5, _field$path6;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       fieldSchema['required'] = required;
       schema['required'] = required;
-      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;
-        });
+      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);
+      field.form.query("".concat(path.concat("*." + fieldSchema.name))).forEach(function (f) {
+        f.required = required;
       });
       dn.emit('patch', {
         schema: schema
@@ -309,9 +313,9 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
     }],
     value: readOnlyMode,
     onChange: function onChange(v) {
-      var _field$path5, _field$path6;
+      var _field$path7, _field$path8;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
-      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);
+      var path = (_field$path7 = field.path) === null || _field$path7 === void 0 ? void 0 : _field$path7.splice(((_field$path8 = field.path) === null || _field$path8 === void 0 ? void 0 : _field$path8.length) - 1, 1);
       switch (v) {
         case 'readonly':
           {
@@ -319,11 +323,9 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
             fieldSchema['x-disabled'] = true;
             schema['x-read-pretty'] = false;
             schema['x-disabled'] = true;
-            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.readonly = true;
-                f.disabled = true;
-              });
+            field.form.query("".concat(path.concat("*." + fieldSchema.name))).forEach(function (f) {
+              f.readonly = true;
+              f.disabled = true;
             });
             break;
           }
@@ -333,10 +335,8 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
             fieldSchema['x-disabled'] = false;
             schema['x-read-pretty'] = true;
             schema['x-disabled'] = false;
-            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.readPretty = true;
-              });
+            field.form.query("".concat(path.concat("*." + fieldSchema.name))).forEach(function (f) {
+              f.readPretty = true;
             });
             break;
           }
@@ -346,11 +346,9 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
             fieldSchema['x-disabled'] = false;
             schema['x-read-pretty'] = false;
             schema['x-disabled'] = false;
-            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.readPretty = false;
-                f.disabled + false;
-              });
+            field.form.query("".concat(path.concat("*." + fieldSchema.name))).forEach(function (f) {
+              f.readPretty = false;
+              f.disabled + false;
             });
             break;
           }
@@ -362,6 +360,18 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
     }
   }), isDateField && /*#__PURE__*/React.createElement(SchemaSettings.DataFormat, {
     fieldSchema: fieldSchema
+  }), isSubTableColumn && !(field !== null && field !== void 0 && field.readPretty) && ['obo', 'oho', 'o2o', 'o2m', 'm2m', 'm2o'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/React.createElement(SchemaSettings.SortingRule, {
+    fieldSchema: fieldSchema,
+    onSubmitCallBack: function onSubmitCallBack(sortArr) {
+      var _field$path9, _field$path10;
+      var path = (_field$path9 = field.path) === null || _field$path9 === void 0 ? void 0 : _field$path9.splice(((_field$path10 = field.path) === null || _field$path10 === void 0 ? void 0 : _field$path10.length) - 1, 1);
+      field.form.query("".concat(path.concat("*." + fieldSchema.name))).forEach(function (f) {
+        f.componentProps.service = f.componentProps.service || {
+          params: {}
+        };
+        f.componentProps.service.params.sort = sortArr;
+      });
+    }
   }), isSubTableColumn && !(field !== null && field !== void 0 && field.readPretty) && isShowDefaultValue(collectionField, getInterface) && /*#__PURE__*/React.createElement(SchemaSettings.DefaultValue, {
     fieldSchema: fieldSchema
   }), /*#__PURE__*/React.createElement(SchemaSettings.Divider, null), /*#__PURE__*/React.createElement(SchemaSettings.Remove, {

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

@@ -38,7 +38,7 @@ import { RecordIndexProvider, RecordProvider, useSchemaInitializer, useTableBloc
 import { useACLFieldWhitelist } from '../../../acl/ACLProvider';
 import { useToken } from '../__builtins__';
 import { ColumnFieldProvider } from './components/ColumnFieldProvider';
-import { extractIndex, isCollectionFieldComponent, isColumnComponent } from './utils';
+import { extractIndex, isCollectionFieldComponent, isColumnComponent, isPortalInBody } from './utils';
 var useArrayField = function useArrayField(props) {
   var field = useField();
   return props.field || field;
@@ -274,8 +274,11 @@ export var Table = observer(function (props) {
   if (onClickRow) {
     onRow = function onRow(record) {
       return {
-        onClick: function onClick() {
-          return onClickRow(record, setSelectedRow, selectedRow);
+        onClick: function onClick(e) {
+          if (isPortalInBody(e.target)) {
+            return;
+          }
+          onClickRow(record, setSelectedRow, selectedRow);
         }
       };
     };
@@ -328,7 +331,7 @@ export var Table = observer(function (props) {
         },
         cell: function cell(props) {
           return /*#__PURE__*/React.createElement("td", _objectSpread(_objectSpread({}, props), {}, {
-            className: classNames(props.className, css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                  max-width: 300px;\n                  white-space: nowrap;\n                  .nb-read-pretty-input-number {\n                    text-align: right;\n                  }\n                  .ant-color-picker-trigger{\n                    position:absolute;\n                    top:50%;\n                    transform: translateY(-50%);\n                  }\n                "]))))
+            className: classNames(props.className, css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n                  max-width: 300px;\n                  white-space: nowrap;\n                  .nb-read-pretty-input-number {\n                    text-align: right;\n                  }\n                  .ant-color-picker-trigger {\n                    position: absolute;\n                    top: 50%;\n                    transform: translateY(-50%);\n                  }\n                "]))))
           }));
         }
       }
@@ -390,11 +393,8 @@ export var Table = observer(function (props) {
     var _field$value4, _field$value4$map;
     var children = _ref3.children;
     return dragSort ? /*#__PURE__*/React.createElement(SortableContext, {
-      items: ((_field$value4 = field.value) === null || _field$value4 === void 0 ? void 0 : (_field$value4$map = _field$value4.map) === null || _field$value4$map === void 0 ? void 0 : _field$value4$map.call(_field$value4, getRowKey)) || [],
-      children: children
-    }) : /*#__PURE__*/React.createElement(React.Fragment, {
-      children: children
-    });
+      items: ((_field$value4 = field.value) === null || _field$value4 === void 0 ? void 0 : (_field$value4$map = _field$value4.map) === null || _field$value4$map === void 0 ? void 0 : _field$value4$map.call(_field$value4, getRowKey)) || []
+    }, children) : /*#__PURE__*/React.createElement(React.Fragment, {}, children);
   }, [field, dragSort]);
   var fieldSchema = useFieldSchema();
   var fixedBlock = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$parent = fieldSchema.parent) === null || _fieldSchema$parent === void 0 ? void 0 : (_fieldSchema$parent$x = _fieldSchema$parent['x-decorator-props']) === null || _fieldSchema$parent$x === void 0 ? void 0 : _fieldSchema$parent$x.fixedBlock;
@@ -442,7 +442,9 @@ export var Table = observer(function (props) {
     className: "ant-formily-item-error-help ant-formily-item-help ant-formily-item-help-enter ant-formily-item-help-enter-active"
   }, field.errors.map(function (error) {
     return error.messages.map(function (message) {
-      return /*#__PURE__*/React.createElement("div", null, message);
+      return /*#__PURE__*/React.createElement("div", {
+        key: message
+      }, message);
     });
   })));
 }, {

package/es/schema-component/antd/table-v2/utils.d.ts

@@ -2,3 +2,8 @@ import { ISchema, Schema } from '@formily/react';
 export declare const isCollectionFieldComponent: (schema: ISchema) => boolean;
 export declare const isColumnComponent: (schema: Schema) => boolean;
 export declare function extractIndex(str: any): string;
+/**
+ * 判断一个 DOM 对象是否是由 createPortal 挂在到了 body 上
+ * @param domNode DOM 对象
+ */
+export declare const isPortalInBody: (dom: HTMLElement) => boolean;

package/es/schema-component/antd/table-v2/utils.js

@@ -13,4 +13,17 @@ export function extractIndex(str) {
     }
   });
   return numbers.join('.');
-}
+}
+/**
+ * 判断一个 DOM 对象是否是由 createPortal 挂在到了 body 上
+ * @param domNode DOM 对象
+ */
+export var isPortalInBody = function isPortalInBody(dom) {
+  while (dom) {
+    if (dom.id === 'root') {
+      return false;
+    }
+    dom = dom.parentNode;
+  }
+  return true;
+};

package/es/schema-component/antd/variable/Input.js

@@ -226,12 +226,13 @@ export function Input(props) {
   }, [scope]);
   var loadData = /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(selectedOptions) {
+      var _option$children;
       var option;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             option = selectedOptions[selectedOptions.length - 1];
-            if (!(!option.children && !option.isLeaf && option.loadChildren)) {
+            if (!(!((_option$children = option.children) !== null && _option$children !== void 0 && _option$children.length) && !option.isLeaf && option.loadChildren)) {
               _context.next = 5;
               break;
             }

package/es/schema-component/antd/variable/TextArea.js

@@ -383,7 +383,7 @@ export function TextArea(props) {
   var disabled = props.disabled || form.disabled;
   return wrapSSR( /*#__PURE__*/React.createElement(Input.Group, {
     compact: true,
-    className: cx(componentCls, hashId, css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          &.ant-input-group.ant-input-group-compact {\n            display: flex;\n            .ant-input {\n              flex-grow: 1;\n              min-width: 200px;\n            }\n            .ant-input-disabled {\n              .ant-tag {\n                color: #bfbfbf;\n                border-color: #d9d9d9;\n              }\n            }\n          }\n        "]))))
+    className: cx(componentCls, hashId, css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          &.ant-input-group.ant-input-group-compact {\n            display: flex;\n            .ant-input {\n              flex-grow: 1;\n              min-width: 200px;\n            }\n            .ant-input-disabled {\n              .ant-tag {\n                color: #bfbfbf;\n                border-color: #d9d9d9;\n              }\n            }\n          }\n\n          > .x-button {\n            height: min-content;\n          }\n        "]))))
   }, /*#__PURE__*/React.createElement("div", {
     onInput: onInput,
     onBlur: onBlur,

package/es/schema-component/common/utils/uitls.js

@@ -1,9 +1,12 @@
+var _excluded = ["children"];
 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 _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 _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 dayjs from 'dayjs';
 import flat from 'flat';
 import _, { every, findIndex, isArray, some } from 'lodash';
@@ -11,14 +14,28 @@ import { useMemo } from 'react';
 import { useTableBlockContext } from '../../../block-provider';
 import { useCurrentUserContext } from '../../../user';
 import jsonLogic from '../../common/utils/logic';
+function flattenDeep(data) {
+  var result = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  for (var i = 0; i < (data === null || data === void 0 ? void 0 : data.length); i++) {
+    var _data$i = data[i],
+      children = _data$i.children,
+      rest = _objectWithoutProperties(_data$i, _excluded);
+    result.push(rest);
+    if (children) {
+      flattenDeep(children, result);
+    }
+  }
+  return result;
+}
 export var useVariablesCtx = function useVariablesCtx() {
-  var _service$data, _service$data$data, _currentUser$data2;
+  var _service$data, _currentUser$data2;
   var currentUser = useCurrentUserContext();
   var _useTableBlockContext = useTableBlockContext(),
     field = _useTableBlockContext.field,
     service = _useTableBlockContext.service,
     rowKey = _useTableBlockContext.rowKey;
-  var contextData = service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : (_service$data$data = _service$data.data) === null || _service$data$data === void 0 ? void 0 : _service$data$data.filter(function (v) {
+  var tableData = flattenDeep(service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data);
+  var contextData = tableData === null || tableData === void 0 ? void 0 : tableData.filter(function (v) {
     var _ref, _field$data;
     return (_ref = (field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.selectedRowKeys) || []) === null || _ref === void 0 ? void 0 : _ref.includes(v[rowKey]);
   });

package/es/schema-component/hooks/useFieldModeOptions.d.ts

@@ -1,4 +1,4 @@
-export declare const useFieldModeOptions: () => {
+export declare const useFieldModeOptions: (props?: any) => {
     label: string;
     value: string;
 }[];

package/es/schema-component/hooks/useFieldModeOptions.js

@@ -2,14 +2,16 @@ import { useField, useFieldSchema } from '@formily/react';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCollection, useCollectionManager } from '../../collection-manager';
-export var useFieldModeOptions = function useFieldModeOptions() {
+export var useFieldModeOptions = function useFieldModeOptions(props) {
   var _fieldSchema$xCompon;
   var _useCollectionManager = useCollectionManager(),
     getCollectionJoinField = _useCollectionManager.getCollectionJoinField,
     getCollection = _useCollectionManager.getCollection;
-  var fieldSchema = useFieldSchema();
+  var currentFieldSchema = useFieldSchema();
+  var fieldSchema = (props === null || props === void 0 ? void 0 : props.fieldSchema) || currentFieldSchema;
   var field = useField();
   var isReadPretty = field.readPretty;
+  var isSubTableField = props === null || props === void 0 ? void 0 : props.fieldSchema;
   var _useCollection = useCollection(),
     getField = _useCollection.getField;
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
@@ -39,7 +41,7 @@ export var useFieldModeOptions = function useFieldModeOptions() {
       }, {
         label: t('Record picker'),
         value: 'Picker'
-      }, {
+      }, !isSubTableField && {
         label: t('File manager'),
         value: 'FileManager'
       }];
@@ -64,10 +66,13 @@ export var useFieldModeOptions = function useFieldModeOptions() {
         }, {
           label: t('Record picker'),
           value: 'Picker'
-        }, {
+        }, !isSubTableField && {
           label: t('Sub-form'),
           value: 'Nester'
         }, {
+          label: t('Sub-form(Popover)'),
+          value: 'PopoverNester'
+        }, !isSubTableField && {
           label: t('Sub-table'),
           value: 'SubTable'
         }];
@@ -90,12 +95,15 @@ export var useFieldModeOptions = function useFieldModeOptions() {
         }, {
           label: t('Record picker'),
           value: 'Picker'
-        }, {
+        }, !isSubTableField && {
           label: t('Sub-table'),
           value: 'SubTable'
-        }, {
+        }, !isSubTableField && {
           label: t('Sub-form'),
           value: 'Nester'
+        }, {
+          label: t('Sub-form(Popover)'),
+          value: 'PopoverNester'
         }];
       case 'm2o':
       case 'linkTo':
@@ -114,9 +122,12 @@ export var useFieldModeOptions = function useFieldModeOptions() {
         }, {
           label: t('Record picker'),
           value: 'Picker'
-        }, {
+        }, !isSubTableField && {
           label: t('Sub-form'),
           value: 'Nester'
+        }, {
+          label: t('Sub-form(Popover)'),
+          value: 'PopoverNester'
         }];
       default:
         return isReadPretty ? [{
@@ -134,11 +145,14 @@ export var useFieldModeOptions = function useFieldModeOptions() {
         }, {
           label: t('Record picker'),
           value: 'Picker'
-        }, {
+        }, !isSubTableField && {
           label: t('Sub-form'),
           value: 'Nester'
+        }, {
+          label: t('Sub-form(Popover)'),
+          value: 'PopoverNester'
         }];
     }
   }, [t, collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface, label]);
-  return fieldModeOptions;
+  return (fieldModeOptions || []).filter(Boolean);
 };