@nocobase/client 0.7.1-alpha.5 → 0.7.2-alpha.1

package/es/locale/zh_CN.js

@@ -120,6 +120,7 @@ export default {
   "Phone": "手机号码",
   "Email": "电子邮箱",
   "Number": "数字",
+  "Integer": "整数",
   "Percent": "百分比",
   "Password": "密码",
   "Formula": "公式",
@@ -173,7 +174,11 @@ export default {
   "Many to one description": "用于创建多对一关系，比如一个城市只能属于一个国家，一个国家可以有多个城市。作为字段存在时，它是一个下拉选择用于选择目标数据表的数据。创建后，会在目标数据表里自动生成一个多对一字段。",
   "Many to many description": "用于创建多对多关系，比如一个学生会有多个老师，一个老师也会有多个学生。作为字段存在时，它是一个下拉选择用于选择目标数据表的数据。",
   "Generated automatically if left blank": "留空时，自动生成中间表",
-  "References fields of associated table": "引用关联表的字段",
+  "Display association fields": "显示关联表的字段",
+  "Field component": "字段组件",
+  "Subtable": "子表格",
+  "Subform": "子表单",
+  "Record picker": "数据选择器",
   "Toggles the subfield mode": "切换子字段模式",
   "Selector mode": "选择器模式",
   "Subtable mode": "子表格模式",
@@ -189,6 +194,7 @@ export default {
   "Add filter group": "添加筛选分组",
   "is": "等于",
   "is not": "不等于",
+  "is variable": "为动态变量",
   "contains": "包含",
   "does not contain": "不包含",
   "starts with": "开头是",
@@ -501,10 +507,13 @@ export default {
   'Branch into "Yes" and "No"': '“是”和“否”分别继续',
   'Conditions': '条件配置',
   'Parallel branch': '分支',
+  'Add branch': '增加分支',
   'All succeeded': '全部成功',
   'Any succeeded': '任意成功',
+  'Any succeeded or failed': '任意成功或失败',
   'Continue after all branches succeeded': '全部分支都成功后才能继续',
   'Continue after any branch succeeded': '任意分支成功后就继续',
+  'Continue after any branch succeeded, or exit after any branch failed': '任意分支成功继续，或失败后退出',
   'Delay': '延时',
   'Duration': '时长',
   'End Status': '到时状态',

package/es/schema-component/antd/filter/DynamicComponent.js

@@ -1,16 +1,60 @@
+var _templateObject;
+
 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
+import { css } from '@emotion/css';
 import { createForm, onFieldValueChange } from '@formily/core';
-import { FieldContext, FormContext } from '@formily/react';
+import { connect, FieldContext, FormContext } from '@formily/react';
 import { merge } from '@formily/shared';
+import { Cascader } from 'antd';
 import React, { useContext, useMemo } from 'react';
 import { SchemaComponent } from '../../core';
-import { useComponent } from '../../hooks';
+import { useCompile, useComponent } from '../../hooks';
 import { FilterContext } from './context';
+import { useFilterOptions } from './useFilterActionProps';
+var VariableCascader = connect(function (props) {
+  var fields = useFilterOptions('users');
+  var compile = useCompile();
+  var value = props.value,
+      _onChange = props.onChange;
+  return /*#__PURE__*/React.createElement(Cascader, {
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        width: 160px;\n      "]))),
+    value: value ? value.split('.') : [],
+    fieldNames: {
+      label: 'title',
+      value: 'name',
+      children: 'children'
+    },
+    onChange: function onChange(value) {
+      _onChange(value ? value.join('.') : null);
+    },
+    options: compile([{
+      title: '{{t("Current user")}}',
+      name: 'currentUser',
+      children: fields.filter(function (field) {
+        if (!field.target) {
+          return true;
+        }
+
+        return field.type === 'belongsTo';
+      }).map(function (field) {
+        if (field.children) {
+          field.children = field.children.filter(function (child) {
+            return !child.target;
+          });
+        }
+
+        return field;
+      })
+    }])
+  });
+});
 export var DynamicComponent = function DynamicComponent(props) {
   var _useContext = useContext(FilterContext),
       dynamicComponent = _useContext.dynamicComponent;
@@ -49,7 +93,10 @@ export var DynamicComponent = function DynamicComponent(props) {
         'x-read-pretty': false,
         'x-validator': undefined,
         'x-decorator': undefined
-      })
+      }),
+      components: {
+        VariableCascader: VariableCascader
+      }
     }));
   };
 

package/es/schema-component/antd/filter/FilterItem.js

@@ -1,4 +1,9 @@
+var _templateObject;
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
 import { CloseCircleOutlined } from '@ant-design/icons';
+import { css } from '@emotion/css';
 import { observer } from '@formily/react';
 import { Cascader, Select, Space } from 'antd';
 import React, { useContext } from 'react';
@@ -30,6 +35,7 @@ export var FilterItem = observer(function (props) {
       marginBottom: 8
     }
   }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Cascader, {
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            width: 160px;\n          "]))),
     fieldNames: {
       label: 'title',
       value: 'name',

package/es/schema-component/antd/filter/useFilterActionProps.js

@@ -56,6 +56,8 @@ export var useFilterOptions = function useFilterOptions(collectionName) {
         operators = _fieldInterface$filte.operators;
     var option = {
       name: field.name,
+      type: field.type,
+      target: field.target,
       title: (field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || field.name,
       schema: field === null || field === void 0 ? void 0 : field.uiSchema,
       operators: (operators === null || operators === void 0 ? void 0 : (_operators$filter = operators.filter) === null || _operators$filter === void 0 ? void 0 : _operators$filter.call(operators, function (operator) {

package/es/schema-component/antd/form-item/FormItem.js

@@ -11,14 +11,24 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { css } from '@emotion/css';
 import { FormItem as Item } from '@formily/antd';
 import { useField, useFieldSchema } from '@formily/react';
+import { uid } from '@formily/shared';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCompile, useDesignable } from '../..';
-import { useFormBlockContext } from '../../../block-provider';
+import { useFilterByTk, useFormBlockContext } from '../../../block-provider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 import { BlockItem } from '../block-item';
 import { HTMLEncode } from '../input/shared';
+
+var divWrap = function divWrap(schema) {
+  return {
+    type: 'void',
+    'x-component': 'div',
+    properties: _defineProperty({}, schema.name || uid(), schema)
+  };
+};
+
 export var FormItem = function FormItem(props) {
   var field = useField();
   return /*#__PURE__*/React.createElement(BlockItem, {
@@ -34,15 +44,20 @@ export var FormItem = function FormItem(props) {
   })));
 };
 
-FormItem.Designer = function () {
+FormItem.Designer = function (props) {
   var _collectionField$uiSc, _collectionField$uiSc2, _fieldSchema$xDecora, _field$componentProps, _field$componentProps2;
 
   var _useCollectionManager = useCollectionManager(),
-      getCollectionFields = _useCollectionManager.getCollectionFields;
+      getCollectionFields = _useCollectionManager.getCollectionFields,
+      getCollection = _useCollectionManager.getCollection,
+      getInterface = _useCollectionManager.getInterface,
+      getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
 
   var _useCollection = useCollection(),
       getField = _useCollection.getField;
 
+  var tk = useFilterByTk();
+
   var _useFormBlockContext = useFormBlockContext(),
       form = _useFormBlockContext.form;
 
@@ -54,12 +69,16 @@ FormItem.Designer = function () {
 
   var _useDesignable = useDesignable(),
       dn = _useDesignable.dn,
-      refresh = _useDesignable.refresh;
+      refresh = _useDesignable.refresh,
+      insertAdjacent = _useDesignable.insertAdjacent,
+      insertBeforeBegin = _useDesignable.insertBeforeBegin;
 
   var compile = useCompile();
-  var collectionField = getField(fieldSchema['name']);
+  var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  var interfaceConfig = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
   var originalTitle = collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title;
   var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField.target) : [];
+  var isSubFormAssocitionField = field.address.segments.includes('__form_grid');
   var initialValue = {
     title: field.title === originalTitle ? undefined : field.title
   };
@@ -177,7 +196,7 @@ FormItem.Designer = function () {
       });
       dn.refresh();
     }
-  }), !field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), !field.readPretty && fieldSchema['x-component'] !== 'FormField' && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "required",
     title: t('Required'),
     checked: field.required,
@@ -192,6 +211,52 @@ FormItem.Designer = function () {
       });
       refresh();
     }
+  }), form && !isSubFormAssocitionField && ['o2o', 'oho', 'obo', 'o2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+    title: t('Field component'),
+    options: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'o2m' ? [{
+      label: t('Record picker'),
+      value: 'CollectionField'
+    }, {
+      label: t('Subtable'),
+      value: 'TableField'
+    }] : [{
+      label: t('Record picker'),
+      value: 'CollectionField'
+    }, {
+      label: t('Subform'),
+      value: 'FormField'
+    }],
+    value: fieldSchema['x-component'],
+    onChange: function onChange(v) {
+      var _interfaceConfig$sche;
+
+      var schema = {
+        name: collectionField.name,
+        type: 'void',
+        // title: compile(collectionField.uiSchema?.title),
+        'x-decorator': 'FormItem',
+        'x-designer': 'FormItem.Designer',
+        'x-component': v,
+        'x-component-props': {},
+        'x-collection-field': fieldSchema['x-collection-field']
+      };
+      interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche === void 0 ? void 0 : _interfaceConfig$sche.call(interfaceConfig, schema, {
+        field: collectionField,
+        block: 'Form',
+        readPretty: field.readPretty,
+        action: tk ? 'get' : null
+      });
+      insertAdjacent('beforeBegin', divWrap(schema), {
+        onSuccess: function onSuccess() {
+          dn.remove(null, {
+            removeParentsIfNoChildren: true,
+            breakRemoveOn: {
+              'x-component': 'Grid'
+            }
+          });
+        }
+      });
+    }
   }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'o2m' && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     key: "pattern",
     title: t('Pattern'),
@@ -207,8 +272,6 @@ FormItem.Designer = function () {
     }],
     value: readOnlyMode,
     onChange: function onChange(v) {
-      console.log('v', v);
-
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
 
       switch (v) {
@@ -229,8 +292,7 @@ FormItem.Designer = function () {
             fieldSchema['x-disabled'] = false;
             schema['x-read-pretty'] = true;
             schema['x-disabled'] = false;
-            field.readPretty = true; // field.disabled = true;
-
+            field.readPretty = true;
             break;
           }
 
@@ -251,7 +313,7 @@ FormItem.Designer = function () {
       });
       dn.refresh();
     }
-  }), (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+  }), (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     key: "title-field",
     title: t('Title field'),
     options: options,
@@ -261,14 +323,15 @@ FormItem.Designer = function () {
 
       var fieldNames = _objectSpread(_objectSpread({}, field.componentProps.fieldNames), {}, {
         label: label
-      });
+      }); // if (fieldSchema['x-component-props']?.['field']?.['uiSchema']?.['x-component-props']) {
+      //   fieldSchema['x-component-props']['field']['uiSchema']['x-component-props']['fieldNames'] = fieldNames;
+      // } else {
+      // }
+
 
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;
-      field.componentProps.fieldNames = fieldNames;
-      schema['x-component-props'] = {
-        fieldNames: fieldNames
-      };
+      schema['x-component-props'] = fieldSchema['x-component-props'];
       dn.emit('patch', {
         schema: schema
       });

package/es/schema-component/antd/form-v2/FormField.d.ts

@@ -0,0 +1 @@
+export declare const FormField: any;

package/es/schema-component/antd/form-v2/FormField.js

@@ -0,0 +1,29 @@
+import { observer, useField, useFieldSchema } from '@formily/react';
+import React, { useEffect } from 'react';
+import { useFormBlockContext } from '../../../block-provider';
+import { useCollection } from '../../../collection-manager';
+import { useCompile } from '../../hooks';
+export var FormField = observer(function (props) {
+  var fieldSchema = useFieldSchema();
+
+  var _useCollection = useCollection(),
+      getField = _useCollection.getField;
+
+  var field = useField();
+  var collectionField = getField(fieldSchema.name);
+  var compile = useCompile();
+  var ctx = useFormBlockContext();
+  useEffect(function () {
+    if (!field.title) {
+      var _collectionField$uiSc;
+
+      field.title = compile(collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title);
+    }
+
+    if (ctx === null || ctx === void 0 ? void 0 : ctx.field) {
+      ctx.field.added = ctx.field.added || new Set();
+      ctx.field.added.add(fieldSchema.name);
+    }
+  }, []);
+  return /*#__PURE__*/React.createElement("div", null, props.children);
+});

package/es/schema-component/antd/form-v2/index.d.ts

@@ -1,3 +1,4 @@
 import { Form as FormV2 } from './Form';
 import { DetailsDesigner } from './Form.Designer';
 export { FormV2, DetailsDesigner };
+export * from './FormField';

package/es/schema-component/antd/form-v2/index.js

@@ -2,4 +2,5 @@ import { Form as FormV2 } from './Form';
 import { DetailsDesigner, FormDesigner, ReadPrettyFormDesigner } from './Form.Designer';
 FormV2.Designer = FormDesigner;
 FormV2.ReadPrettyDesigner = ReadPrettyFormDesigner;
-export { FormV2, DetailsDesigner };
+export { FormV2, DetailsDesigner };
+export * from './FormField';

package/es/schema-component/antd/kanban/Kanban.Card.Designer.js

@@ -14,7 +14,7 @@ import { useTranslation } from 'react-i18next';
 import { useAPIClient } from '../../../api-client';
 import { createDesignable, useDesignable } from '../../../schema-component';
 import { SchemaInitializer } from '../../../schema-initializer';
-import { useFormItemInitializerFields } from '../../../schema-initializer/utils';
+import { useAssociatedFormItemInitializerFields, useFormItemInitializerFields } from '../../../schema-initializer/utils';
 var titleCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  pointer-events: none;\n  position: absolute;\n  font-size: 12px;\n  background: #f18b62;\n  color: #fff;\n  padding: 0 5px;\n  line-height: 16px;\n  height: 16px;\n  border-bottom-right-radius: 2px;\n  border-radius: 2px;\n  top: 2px;\n  left: 2px;\n"])));
 
 var gridRowColWrap = function gridRowColWrap(schema) {
@@ -97,6 +97,15 @@ export var KanbanCardDesigner = function KanbanCardDesigner(props) {
       type: 'itemGroup',
       title: t('Display fields'),
       children: fields
+    }, {
+      type: 'divider'
+    }, {
+      type: 'itemGroup',
+      title: t('Display association fields'),
+      children: useAssociatedFormItemInitializerFields({
+        readPretty: true,
+        block: 'Kanban'
+      })
     }],
     component: /*#__PURE__*/React.createElement(MenuOutlined, {
       style: {

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

@@ -25,7 +25,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import { RecursionField, useFieldSchema } from '@formily/react';
 import { Select } from 'antd';
-import React, { createContext, useContext, useState } from 'react';
+import React, { createContext, useContext, useEffect, useState } from 'react';
 import { useTableSelectorProps as useTsp } from '../../../block-provider/TableSelectorProvider';
 import { CollectionProvider, useCollection } from '../../../collection-manager';
 import { FormProvider, SchemaComponentOptions } from '../../core';
@@ -116,19 +116,36 @@ export var InputRecordPicker = function InputRecordPicker(props) {
   var fieldSchema = useFieldSchema();
   var collectionField = useAssociation(props);
   var compile = useCompile();
-  var options = (Array.isArray(value) ? value : value ? [value] : []).map(function (option) {
-    var label = option[fieldNames.label];
-    return _objectSpread(_objectSpread({}, option), {}, _defineProperty({}, fieldNames.label, compile(label)));
-  });
 
-  var _useState3 = useState(options),
+  var _useState3 = useState([]),
       _useState4 = _slicedToArray(_useState3, 2),
       selectedRows = _useState4[0],
       setSelectedRows = _useState4[1];
 
-  var values = options === null || options === void 0 ? void 0 : options.map(function (option) {
-    return option[fieldNames.value];
-  });
+  var _useState5 = useState([]),
+      _useState6 = _slicedToArray(_useState5, 2),
+      options = _useState6[0],
+      setOptions = _useState6[1];
+
+  useEffect(function () {
+    if (value) {
+      var opts = (Array.isArray(value) ? value : value ? [value] : []).map(function (option) {
+        var label = option[fieldNames.label];
+        return _objectSpread(_objectSpread({}, option), {}, _defineProperty({}, fieldNames.label, compile(label)));
+      });
+      setOptions(opts);
+      setSelectedRows(opts);
+    }
+  }, [value]);
+  useEffect(function () {});
+
+  var getValue = function getValue() {
+    if (multiple == null) return null;
+    return multiple ? Array.isArray(value) ? value === null || value === void 0 ? void 0 : value.map(function (v) {
+      return v[fieldNames.value];
+    }) : [] : value === null || value === void 0 ? void 0 : value[fieldNames.value];
+  };
+
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, _objectSpread(_objectSpread({}, others), {}, {
     mode: multiple ? 'multiple' : props.mode,
     fieldNames: fieldNames,
@@ -146,17 +163,17 @@ export var InputRecordPicker = function InputRecordPicker(props) {
 
         setSelectedRows([]);
       } else if (Array.isArray(changed)) {
-        var _values = options === null || options === void 0 ? void 0 : options.filter(function (option) {
+        var values = options === null || options === void 0 ? void 0 : options.filter(function (option) {
           return changed.includes(option[fieldNames.value]);
         });
 
-        _onChange(_values);
+        _onChange(values);
 
-        setSelectedRows(_values);
+        setSelectedRows(values);
       }
     },
     options: options,
-    value: multiple ? values : values === null || values === void 0 ? void 0 : values[0],
+    value: getValue(),
     open: false
   })), /*#__PURE__*/React.createElement(RecordPickerContext.Provider, {
     value: {
@@ -181,6 +198,9 @@ export var InputRecordPicker = function InputRecordPicker(props) {
     }
   }, /*#__PURE__*/React.createElement(RecursionField, {
     schema: fieldSchema,
-    onlyRenderProperties: true
+    onlyRenderProperties: true,
+    filterProperties: function filterProperties(s) {
+      return s['x-component'] === 'RecordPicker.Selector';
+    }
   })))))));
 };

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

@@ -14,8 +14,8 @@ import { observer, RecursionField, useField, useFieldSchema } from '@formily/rea
 import { toArr } from '@formily/shared';
 import React, { useRef, useState } from 'react';
 import { BlockAssociationContext, WithoutTableFieldResource } from '../../../block-provider';
-import { CollectionProvider, useCollection } from '../../../collection-manager';
-import { RecordProvider } from '../../../record-provider';
+import { CollectionProvider, useCollection, useCollectionManager } from '../../../collection-manager';
+import { RecordProvider, useRecord } from '../../../record-provider';
 import { FormProvider } from '../../core';
 import { useCompile } from '../../hooks';
 import { ActionContext } from '../action';
@@ -24,6 +24,11 @@ import { useFieldNames } from './useFieldNames';
 export var ReadPrettyRecordPicker = observer(function (props) {
   var ellipsis = props.ellipsis;
   var fieldSchema = useFieldSchema();
+  var recordCtx = useRecord();
+
+  var _useCollectionManager = useCollectionManager(),
+      getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
+
   var field = useField();
   var fieldNames = useFieldNames(props);
 
@@ -40,7 +45,7 @@ export var ReadPrettyRecordPicker = observer(function (props) {
   var _useCollection = useCollection(),
       getField = _useCollection.getField;
 
-  var collectionField = getField(fieldSchema.name);
+  var collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-collection-field']);
 
   var _useState5 = useState({}),
       _useState6 = _slicedToArray(_useState5, 2),
@@ -71,6 +76,31 @@ export var ReadPrettyRecordPicker = observer(function (props) {
     });
   };
 
+  var renderWithoutTableFieldResourceProvider = function renderWithoutTableFieldResourceProvider() {
+    return /*#__PURE__*/React.createElement(WithoutTableFieldResource.Provider, {
+      value: true
+    }, /*#__PURE__*/React.createElement(FormProvider, null, /*#__PURE__*/React.createElement(RecursionField, {
+      schema: fieldSchema,
+      onlyRenderProperties: true,
+      filterProperties: function filterProperties(s) {
+        return s['x-component'] === 'RecordPicker.Viewer';
+      }
+    })));
+  };
+
+  var renderRecordProvider = function renderRecordProvider() {
+    var _fieldSchema$xCollec;
+
+    var collectionFieldNames = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCollec = fieldSchema['x-collection-field']) === null || _fieldSchema$xCollec === void 0 ? void 0 : _fieldSchema$xCollec.split('.');
+    return collectionFieldNames && collectionFieldNames.length > 2 ? /*#__PURE__*/React.createElement(RecordProvider, {
+      record: recordCtx[collectionFieldNames[1]]
+    }, /*#__PURE__*/React.createElement(RecordProvider, {
+      record: record
+    }, renderWithoutTableFieldResourceProvider())) : /*#__PURE__*/React.createElement(RecordProvider, {
+      record: record
+    }, renderWithoutTableFieldResourceProvider());
+  };
+
   return collectionField ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BlockAssociationContext.Provider, {
     value: "".concat(collectionField.collectionName, ".").concat(collectionField.name)
   }, /*#__PURE__*/React.createElement(CollectionProvider, {
@@ -84,12 +114,5 @@ export var ReadPrettyRecordPicker = observer(function (props) {
       setVisible: setVisible,
       openMode: 'drawer'
     }
-  }, /*#__PURE__*/React.createElement(RecordProvider, {
-    record: record
-  }, /*#__PURE__*/React.createElement(WithoutTableFieldResource.Provider, {
-    value: true
-  }, /*#__PURE__*/React.createElement(FormProvider, null, /*#__PURE__*/React.createElement(RecursionField, {
-    schema: fieldSchema,
-    onlyRenderProperties: true
-  })))))))) : null;
+  }, renderRecordProvider())))) : null;
 });

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

@@ -6,10 +6,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { useFieldSchema } from "@formily/react";
 export var useFieldNames = function useFieldNames(props) {
-  var _fieldSchema$xCompon;
+  var _fieldSchema$xCompon, _fieldSchema$xCompon$, _fieldSchema$xCompon$2, _fieldSchema$xCompon$3, _fieldSchema$xCompon2;
 
   var fieldSchema = useFieldSchema();
-  var fieldNames = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['fieldNames']) || props.fieldNames;
+  var fieldNames = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : (_fieldSchema$xCompon$ = _fieldSchema$xCompon['field']) === null || _fieldSchema$xCompon$ === void 0 ? void 0 : (_fieldSchema$xCompon$2 = _fieldSchema$xCompon$['uiSchema']) === null || _fieldSchema$xCompon$2 === void 0 ? void 0 : (_fieldSchema$xCompon$3 = _fieldSchema$xCompon$2['x-component-props']) === null || _fieldSchema$xCompon$3 === void 0 ? void 0 : _fieldSchema$xCompon$3['fieldNames']) || (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2['fieldNames']) || props.fieldNames;
   return _objectSpread({
     label: 'label',
     value: 'value'

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

@@ -14,7 +14,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 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); }
 
-import { toArr } from '@formily/shared';
+import { castArray } from 'lodash';
 export var defaultFieldNames = {
   label: 'label',
   value: 'value',
@@ -22,7 +22,9 @@ export var defaultFieldNames = {
   options: 'children'
 };
 export var getCurrentOptions = function getCurrentOptions(values, dataSource, fieldNames) {
-  values = toArr(values).map(function (val) {
+  values = castArray(values).filter(function (item) {
+    return item != null;
+  }).map(function (val) {
     return _typeof(val) === 'object' ? val[fieldNames.value] : val;
   });
 

package/es/schema-component/antd/table-v2/Table.Column.Decorator.d.ts

@@ -6,7 +6,7 @@ export declare const useColumnSchema: () => {
 } | {
     columnSchema: import("@formily/react").Schema<any, any, any, any, any, any, any, any, any>;
     fieldSchema: any;
-    collectionField: import("../../../").CollectionFieldOptions;
+    collectionField: any;
     uiSchema: any;
 };
 export declare const TableColumnDecorator: (props: any) => JSX.Element;

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

@@ -1,6 +1,6 @@
 import { useField, useFieldSchema } from '@formily/react';
 import React, { useLayoutEffect } from 'react';
-import { SortableItem, useCollection, useCompile, useDesignable, useDesigner } from '../../../';
+import { SortableItem, useCollection, useCollectionManager, useCompile, useDesignable, useDesigner } from '../../../';
 import { designerCss } from './Table.Column.ActionBar';
 export var useColumnSchema = function useColumnSchema() {
   var _useCollection = useCollection(),
@@ -8,6 +8,10 @@ export var useColumnSchema = function useColumnSchema() {
 
   var compile = useCompile();
   var columnSchema = useFieldSchema();
+
+  var _useCollectionManager = useCollectionManager(),
+      getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
+
   var fieldSchema = columnSchema.reduceProperties(function (buf, s) {
     if (s['x-component'] === 'CollectionField') {
       return s;
@@ -20,7 +24,7 @@ export var useColumnSchema = function useColumnSchema() {
     return {};
   }
 
-  var collectionField = getField(fieldSchema.name);
+  var collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-collection-field']);
   return {
     columnSchema: columnSchema,
     fieldSchema: fieldSchema,
@@ -60,5 +64,5 @@ export var TableColumnDecorator = function TableColumnDecorator(props) {
     fieldSchema: fieldSchema,
     uiSchema: uiSchema,
     collectionField: collectionField
-  }), field.title || compile(uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema.title));
+  }), (field === null || field === void 0 ? void 0 : field.title) || compile(uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema.title));
 };