@nocobase/client 0.7.1-alpha.7 → 0.7.2-alpha.3

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));
 };

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

@@ -42,6 +42,10 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
   var uiSchema = props.uiSchema,
       fieldSchema = props.fieldSchema,
       collectionField = props.collectionField;
+
+  var _useCollectionManager2 = useCollectionManager(),
+      getInterface = _useCollectionManager2.getInterface;
+
   var field = useField();
 
   var _useTranslation = useTranslation(),
@@ -54,6 +58,7 @@ export 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__*/React.createElement(GeneralSchemaDesigner, {
     disableInitializer: true
   }, /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
@@ -65,7 +70,7 @@ export 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': {}
@@ -88,7 +93,7 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
 
       dn.refresh();
     }
-  }), /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), intefaceCfg && intefaceCfg.sortable === true && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     title: t('Sortable'),
     checked: field.componentProps.sorter,
     onChange: function onChange(v) {

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

@@ -64,6 +64,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__*/React.createElement(RecursionField, {
         name: s.name,
@@ -77,8 +78,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__*/React.createElement(RecordIndexProvider, {
           index: index
         }, /*#__PURE__*/React.createElement(RecordProvider, {

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

@@ -6,6 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { observer, useField, useFieldSchema, useForm } from '@formily/react';
 import React, { useEffect } from 'react';
+import { useFormBlockContext } from '../../../block-provider';
 import { useCollection } from '../../../collection-manager';
 import { useCompile } from '../../hooks';
 import { ActionBar } from '../action';
@@ -18,12 +19,18 @@ export var TableField = observer(function (props) {
   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-initializer/buttons/TableColumnInitializers.js

@@ -7,7 +7,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { SchemaInitializer } from '../SchemaInitializer';
-import { itemsMerge, useTableColumnInitializerFields } from '../utils'; // 表格列配置
+import { itemsMerge, useAssociatedTableColumnInitializerFields, useTableColumnInitializerFields } from '../utils'; // 表格列配置
 
 export var TableColumnInitializers = function TableColumnInitializers(props) {
   var _props$items = props.items,
@@ -16,6 +16,30 @@ export var TableColumnInitializers = function TableColumnInitializers(props) {
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
 
+  var associatedFields = useAssociatedTableColumnInitializerFields();
+  var fieldItems = [{
+    type: 'itemGroup',
+    title: t('Display fields'),
+    children: 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.createElement(SchemaInitializer.Button, {
     insertPosition: 'beforeEnd',
     icon: 'SettingOutlined',
@@ -32,16 +56,6 @@ export var TableColumnInitializers = function TableColumnInitializers(props) {
         properties: _defineProperty({}, s.name, _objectSpread({}, s))
       };
     },
-    items: itemsMerge([{
-      type: 'itemGroup',
-      title: t('Display fields'),
-      children: useTableColumnInitializerFields()
-    }, {
-      type: 'divider'
-    }, {
-      type: 'item',
-      title: t('Action column'),
-      component: 'TableActionColumnInitializer'
-    }], items)
+    items: itemsMerge(fieldItems, items)
   }, t('Configure columns'));
 };

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

@@ -4,14 +4,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."); }
@@ -24,11 +16,12 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { useField, useFieldSchema } from '@formily/react';
-import React, { useEffect, useState } from 'react';
+import { useField, useFieldSchema } from '@formily/react'; // import { Select, Space } from 'antd';
+
+import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { CollectionField, useCollection } from '../../../collection-manager';
-import { useCompile, useFilterOptions } from '../../../schema-component';
+import { CollectionField } from '../../../collection-manager';
+import { useCompile } from '../../../schema-component';
 export var AssignedField = function AssignedField(props) {
   var _field$value$value, _field$value;
 
@@ -37,46 +30,40 @@ export var AssignedField = function AssignedField(props) {
 
   var compile = useCompile();
   var field = useField();
-  var fieldSchema = useFieldSchema();
+  var fieldSchema = useFieldSchema(); // const [type, setType] = useState<string>('constantValue');
 
-  var _useState = useState('constantValue'),
+  var _useState = 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 = 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 = useState([]),
-      _useState6 = _slicedToArray(_useState5, 2),
-      options = _useState6[0],
-      setOptions = _useState6[1];
-
-  var _useCollection = useCollection(),
-      getField = _useCollection.getField;
-
-  var collectionField = getField(fieldSchema.name);
-  var uiSchema = collectionField.uiSchema;
-  var currentUser = useFilterOptions('users');
-  var currentRecord = useFilterOptions(collectionField.collectionName);
-  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__*/React.createElement(CollectionField, _objectSpread(_objectSpread({}, props), {}, {
     value: field.value,

package/es/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;