@nocobase/client 0.7.1-alpha.6 → 0.7.2-alpha.2

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

@@ -48,6 +48,11 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
   var ellipsis = props.ellipsis;
   var fieldSchema = (0, _react.useFieldSchema)();
+  var recordCtx = (0, _recordProvider.useRecord)();
+
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+      getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
+
   var field = (0, _react.useField)();
   var fieldNames = (0, _useFieldNames.useFieldNames)(props);
 
@@ -64,7 +69,7 @@ var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
   var _useCollection = (0, _collectionManager.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 = (0, _react2.useState)({}),
       _useState6 = _slicedToArray(_useState5, 2),
@@ -95,6 +100,31 @@ var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
     });
   };
 
+  var renderWithoutTableFieldResourceProvider = function renderWithoutTableFieldResourceProvider() {
+    return /*#__PURE__*/_react2.default.createElement(_blockProvider.WithoutTableFieldResource.Provider, {
+      value: true
+    }, /*#__PURE__*/_react2.default.createElement(_core.FormProvider, null, /*#__PURE__*/_react2.default.createElement(_react.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__*/_react2.default.createElement(_recordProvider.RecordProvider, {
+      record: recordCtx[collectionFieldNames[1]]
+    }, /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
+      record: record
+    }, renderWithoutTableFieldResourceProvider())) : /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
+      record: record
+    }, renderWithoutTableFieldResourceProvider());
+  };
+
   return collectionField ? /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_blockProvider.BlockAssociationContext.Provider, {
     value: "".concat(collectionField.collectionName, ".").concat(collectionField.name)
   }, /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionProvider, {
@@ -108,13 +138,6 @@ var ReadPrettyRecordPicker = (0, _react.observer)(function (props) {
       setVisible: setVisible,
       openMode: 'drawer'
     }
-  }, /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
-    record: record
-  }, /*#__PURE__*/_react2.default.createElement(_blockProvider.WithoutTableFieldResource.Provider, {
-    value: true
-  }, /*#__PURE__*/_react2.default.createElement(_core.FormProvider, null, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
-    schema: fieldSchema,
-    onlyRenderProperties: true
-  })))))))) : null;
+  }, renderRecordProvider())))) : null;
 });
 exports.ReadPrettyRecordPicker = ReadPrettyRecordPicker;

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

@@ -14,10 +14,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 var useFieldNames = function useFieldNames(props) {
-  var _fieldSchema$xCompon;
+  var _fieldSchema$xCompon, _fieldSchema$xCompon$, _fieldSchema$xCompon$2, _fieldSchema$xCompon$3, _fieldSchema$xCompon2;
 
   var fieldSchema = (0, _react.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/lib/schema-component/antd/select/shared.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getCurrentOptions = exports.defaultFieldNames = void 0;
 
-var _shared = require("@formily/shared");
+var _lodash = require("lodash");
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -32,7 +32,9 @@ var defaultFieldNames = {
 exports.defaultFieldNames = defaultFieldNames;
 
 var getCurrentOptions = function getCurrentOptions(values, dataSource, fieldNames) {
-  values = (0, _shared.toArr)(values).map(function (val) {
+  values = (0, _lodash.castArray)(values).filter(function (item) {
+    return item != null;
+  }).map(function (val) {
     return _typeof(val) === 'object' ? val[fieldNames.value] : val;
   });
 

package/lib/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/lib/schema-component/antd/table-v2/Table.Column.Decorator.js

@@ -25,6 +25,10 @@ var useColumnSchema = function useColumnSchema() {
 
   var compile = (0, _.useCompile)();
   var columnSchema = (0, _react.useFieldSchema)();
+
+  var _useCollectionManager = (0, _.useCollectionManager)(),
+      getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
+
   var fieldSchema = columnSchema.reduceProperties(function (buf, s) {
     if (s['x-component'] === 'CollectionField') {
       return s;
@@ -37,7 +41,7 @@ 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,
@@ -80,7 +84,7 @@ 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));
 };
 
 exports.TableColumnDecorator = TableColumnDecorator;

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

@@ -56,6 +56,10 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
   var uiSchema = props.uiSchema,
       fieldSchema = props.fieldSchema,
       collectionField = props.collectionField;
+
+  var _useCollectionManager2 = (0, _collectionManager.useCollectionManager)(),
+      getInterface = _useCollectionManager2.getInterface;
+
   var field = (0, _react.useField)();
 
   var _useTranslation = (0, _reactI18next.useTranslation)(),
@@ -68,6 +72,7 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
 
   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']) || (uiSchema === null || uiSchema === void 0 ? void 0 : (_uiSchema$xComponent = uiSchema['x-component-props']) === null || _uiSchema$xComponent === void 0 ? void 0 : _uiSchema$xComponent['fieldNames']);
   var options = useLabelFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var intefaceCfg = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, {
     disableInitializer: true
   }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
@@ -79,7 +84,7 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
         title: {
           // title: t('Column title'),
           default: columnSchema === null || columnSchema === void 0 ? void 0 : columnSchema.title,
-          description: "".concat(t('Original title: ')).concat(collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title),
+          description: "".concat(t('Original title: ')).concat((collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title) || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.title)),
           'x-decorator': 'FormItem',
           'x-component': 'Input',
           'x-component-props': {}
@@ -102,7 +107,7 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
 
       dn.refresh();
     }
-  }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }), intefaceCfg && intefaceCfg.sortable === true && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     title: t('Sortable'),
     checked: field.componentProps.sorter,
     onChange: function onChange(v) {

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

@@ -82,6 +82,7 @@ var useTableColumns = function useTableColumns() {
       }
     }, []);
     var dataIndex = (collectionFields === null || collectionFields === void 0 ? void 0 : collectionFields.length) > 0 ? collectionFields[0].name : s.name;
+    console.log('useTableColumns', s.name, s, field.value);
     return {
       title: /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
         name: s.name,
@@ -95,8 +96,9 @@ var useTableColumns = function useTableColumns() {
       render: function render(v, record) {
         var _field$value;
 
-        var index = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record);
-        console.log((Date.now() - start) / 1000);
+        var index = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record); // console.log((Date.now() - start) / 1000);
+
+        console.log('useTableColumns.index', index, record);
         return /*#__PURE__*/_react2.default.createElement(_2.RecordIndexProvider, {
           index: index
         }, /*#__PURE__*/_react2.default.createElement(_2.RecordProvider, {

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

@@ -11,6 +11,8 @@ var _react = require("@formily/react");
 
 var _react2 = _interopRequireWildcard(require("react"));
 
+var _blockProvider = require("../../../block-provider");
+
 var _collectionManager = require("../../../collection-manager");
 
 var _hooks = require("../../hooks");
@@ -36,12 +38,18 @@ var TableField = (0, _react.observer)(function (props) {
   var field = (0, _react.useField)();
   var collectionField = getField(fieldSchema.name);
   var compile = (0, _hooks.useCompile)();
+  var ctx = (0, _blockProvider.useFormBlockContext)();
   (0, _react2.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__*/_react2.default.createElement("div", null, props.children);
 });

package/lib/schema-initializer/buttons/TableColumnInitializers.js

@@ -29,6 +29,30 @@ var TableColumnInitializers = function TableColumnInitializers(props) {
   var _useTranslation = (0, _reactI18next.useTranslation)(),
       t = _useTranslation.t;
 
+  var associatedFields = (0, _utils.useAssociatedTableColumnInitializerFields)();
+  var fieldItems = [{
+    type: 'itemGroup',
+    title: t('Display fields'),
+    children: (0, _utils.useTableColumnInitializerFields)()
+  }];
+
+  if ((associatedFields === null || associatedFields === void 0 ? void 0 : associatedFields.length) > 0) {
+    fieldItems.push({
+      type: 'divider'
+    }, {
+      type: 'itemGroup',
+      title: t('Display association fields'),
+      children: associatedFields
+    });
+  }
+
+  fieldItems.push({
+    type: 'divider'
+  }, {
+    type: 'item',
+    title: t('Action column'),
+    component: 'TableActionColumnInitializer'
+  });
   return /*#__PURE__*/_react.default.createElement(_SchemaInitializer.SchemaInitializer.Button, {
     insertPosition: 'beforeEnd',
     icon: 'SettingOutlined',
@@ -45,17 +69,7 @@ var TableColumnInitializers = function TableColumnInitializers(props) {
         properties: _defineProperty({}, s.name, _objectSpread({}, s))
       };
     },
-    items: (0, _utils.itemsMerge)([{
-      type: 'itemGroup',
-      title: t('Display fields'),
-      children: (0, _utils.useTableColumnInitializerFields)()
-    }, {
-      type: 'divider'
-    }, {
-      type: 'item',
-      title: t('Action column'),
-      component: 'TableActionColumnInitializer'
-    }], items)
+    items: (0, _utils.itemsMerge)(fieldItems, items)
   }, t('Configure columns'));
 };
 

package/lib/schema-initializer/components/assigned-field/AssignedField.js

@@ -27,14 +27,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -55,46 +47,40 @@ var AssignedField = function AssignedField(props) {
 
   var compile = (0, _schemaComponent.useCompile)();
   var field = (0, _react.useField)();
-  var fieldSchema = (0, _react.useFieldSchema)();
+  var fieldSchema = (0, _react.useFieldSchema)(); // const [type, setType] = useState<string>('constantValue');
 
-  var _useState = (0, _react2.useState)('constantValue'),
+  var _useState = (0, _react2.useState)((_field$value$value = field === null || field === void 0 ? void 0 : (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.value) !== null && _field$value$value !== void 0 ? _field$value$value : ''),
       _useState2 = _slicedToArray(_useState, 2),
-      type = _useState2[0],
-      setType = _useState2[1];
-
-  var _useState3 = (0, _react2.useState)((_field$value$value = field === null || field === void 0 ? void 0 : (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.value) !== null && _field$value$value !== void 0 ? _field$value$value : ''),
-      _useState4 = _slicedToArray(_useState3, 2),
-      value = _useState4[0],
-      setValue = _useState4[1];
-
-  var _useState5 = (0, _react2.useState)([]),
-      _useState6 = _slicedToArray(_useState5, 2),
-      options = _useState6[0],
-      setOptions = _useState6[1];
-
-  var _useCollection = (0, _collectionManager.useCollection)(),
-      getField = _useCollection.getField;
-
-  var collectionField = getField(fieldSchema.name);
-  var uiSchema = collectionField.uiSchema;
-  var currentUser = (0, _schemaComponent.useFilterOptions)('users');
-  var currentRecord = (0, _schemaComponent.useFilterOptions)(collectionField.collectionName);
-  (0, _react2.useEffect)(function () {
-    var opt = [{
-      name: 'currentUser',
-      title: t('Current user'),
-      children: _toConsumableArray(currentUser)
-    }, {
-      name: 'currentRecord',
-      title: t('Current record'),
-      children: _toConsumableArray(currentRecord)
-    }];
-    setOptions(compile(opt));
-  }, []);
+      value = _useState2[0],
+      setValue = _useState2[1]; // const [options, setOptions] = useState<any[]>([]);
+  // const { getField } = useCollection();
+  // const collectionField = getField(fieldSchema.name);
+  // const { uiSchema } = collectionField;
+  // const currentUser = useFilterOptions('users');
+  // const currentRecord = useFilterOptions(collectionField.collectionName);
+  // useEffect(() => {
+  //   const opt = [
+  //     {
+  //       name: 'currentUser',
+  //       title: t('Current user'),
+  //       children: [...currentUser],
+  //     },
+  //     {
+  //       name: 'currentRecord',
+  //       title: t('Current record'),
+  //       children: [...currentRecord],
+  //     },
+  //   ];
+  //   setOptions(compile(opt));
+  // }, []);
+
 
   var valueChangeHandler = function valueChangeHandler(val) {
     setValue(val);
-  };
+  }; // const typeChangeHandler = (val) => {
+  //   setType(val);
+  // };
+
 
   return /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionField, _objectSpread(_objectSpread({}, props), {}, {
     value: field.value,

package/lib/schema-initializer/utils.d.ts

@@ -74,7 +74,9 @@ export declare const removeGridFormItem: (schema: any, cb: any) => void;
 export declare const useRemoveGridFormItem: () => (schema: any, cb: any) => void;
 export declare const findTableColumn: (schema: Schema, key: string, action: string, deepth?: number) => unknown;
 export declare const useTableColumnInitializerFields: () => SchemaInitializerItemOptions[];
+export declare const useAssociatedTableColumnInitializerFields: () => SchemaInitializerItemOptions[];
 export declare const useFormItemInitializerFields: (options?: any) => SchemaInitializerItemOptions[];
+export declare const useAssociatedFormItemInitializerFields: (options?: any) => SchemaInitializerItemOptions[];
 export declare const useCustomFormItemInitializerFields: (options?: any) => SchemaInitializerItemOptions[];
 export declare const useCurrentSchema: (action: string, key: string, find?: (schema: Schema, key: string, action: string) => any, rm?: (schema: any, cb: any) => any) => {
     schema: any;