@nocobase/client 0.9.2-alpha.4 → 0.9.3-alpha.1

package/es/schema-initializer/items/ExpandActionInitializer.d.ts

@@ -1,2 +1 @@
 export declare const ExpandActionInitializer: (props: any) => JSX.Element;
-export declare const ExpandActionComponent: (props: any) => JSX.Element;

package/es/schema-initializer/items/ExpandActionInitializer.js

@@ -1,28 +1,25 @@
-var _templateObject;
 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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 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); }
 import React from 'react';
-import { Button } from 'antd';
-import { css } from '@emotion/css';
-import { useTranslation } from 'react-i18next';
-import { useFieldSchema } from '@formily/react';
 import { ActionInitializer } from './ActionInitializer';
-import { useTableBlockContext, useTableSelectorContext } from '../../';
-import { NodeCollapseOutlined, NodeExpandOutlined } from '@ant-design/icons';
+import { useTranslation } from 'react-i18next';
 export var ExpandActionInitializer = function ExpandActionInitializer(props) {
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   var schema = {
     'x-action': 'expandAll',
     'x-component': 'Action',
-    'x-designer': 'Action.Designer',
+    'x-designer': 'Expand.Action.Design',
     'x-component-props': {
-      icon: '{{ expandIcon}}',
-      useProps: '{{ useExpandAllActionProps }}',
-      component: 'ExpandActionComponent',
+      titleExpand: t("Expand all"),
+      titleCollapse: t("Collapse all"),
+      iconExpand: 'nodeexpandoutlined',
+      iconCollapse: 'nodecollapseoutlined',
+      component: 'Expand.Action',
       useAction: function useAction() {
         return {
           run: function run() {}
@@ -33,26 +30,4 @@ export var ExpandActionInitializer = function ExpandActionInitializer(props) {
   return /*#__PURE__*/React.createElement(ActionInitializer, _objectSpread(_objectSpread({}, props), {}, {
     schema: schema
   }));
-};
-var actionDesignerCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  &:hover {\n    .general-schema-designer {\n      display: block;\n    }\n  }\n  .general-schema-designer {\n    position: absolute;\n    z-index: 999;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    display: none;\n    background: rgba(241, 139, 98, 0.06);\n    border: 0;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    pointer-events: none;\n    > .general-schema-designer-icons {\n      position: absolute;\n      right: 2px;\n      top: 2px;\n      line-height: 16px;\n      pointer-events: all;\n      .ant-space-item {\n        background-color: #f18b62;\n        color: #fff;\n        line-height: 16px;\n        width: 16px;\n        padding-left: 1px;\n      }\n    }\n  }\n"])));
-export var ExpandActionComponent = function ExpandActionComponent(props) {
-  var _schema$parent, _schema$parent$parent;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  var schema = useFieldSchema();
-  var isTableSelector = ((_schema$parent = schema.parent) === null || _schema$parent === void 0 ? void 0 : (_schema$parent$parent = _schema$parent.parent) === null || _schema$parent$parent === void 0 ? void 0 : _schema$parent$parent['x-decorator']) === 'TableSelectorProvider';
-  var ctx = isTableSelector ? useTableSelectorContext() : useTableBlockContext();
-  return /*#__PURE__*/React.createElement("div", {
-    className: actionDesignerCss
-  }, ctx.params['tree'] && /*#__PURE__*/React.createElement(Button, {
-    onClick: function onClick() {
-      ctx === null || ctx === void 0 ? void 0 : ctx.setExpandFlag();
-    },
-    icon: (ctx === null || ctx === void 0 ? void 0 : ctx.expandFlag) ? /*#__PURE__*/React.createElement(NodeCollapseOutlined, null) : /*#__PURE__*/React.createElement(NodeExpandOutlined, null),
-    type: props.type
-  }, props.children[1], /*#__PURE__*/React.createElement("span", {
-    style: {
-      marginLeft: 10
-    }
-  }, (ctx === null || ctx === void 0 ? void 0 : ctx.expandFlag) ? t('Collapse all') : t('Expand all'))));
 };

package/es/schema-initializer/items/SelectActionInitializer.d.ts

@@ -0,0 +1 @@
+export declare const SelectActionInitializer: (props: any) => JSX.Element;

package/es/schema-initializer/items/SelectActionInitializer.js

@@ -0,0 +1,65 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+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); }
+import React from 'react';
+import { ActionInitializer } from './ActionInitializer';
+export var SelectActionInitializer = function SelectActionInitializer(props) {
+  var schema = {
+    type: 'void',
+    title: '{{ t("Select") }}',
+    'x-action': 'update',
+    'x-designer': 'Action.Designer',
+    'x-component': 'Action',
+    'x-component-props': {
+      openMode: 'drawer'
+    },
+    properties: {
+      drawer: {
+        type: 'void',
+        'x-component': 'AssociationField.Selector',
+        title: '{{ t("Select record") }}',
+        'x-component-props': {
+          className: 'nb-record-picker-selector'
+        },
+        properties: {
+          grid: {
+            type: 'void',
+            'x-component': 'Grid',
+            'x-initializer': 'TableSelectorInitializers',
+            properties: {}
+          },
+          footer: {
+            'x-component': 'Action.Container.Footer',
+            'x-component-props': {},
+            properties: {
+              actions: {
+                type: 'void',
+                'x-component': 'ActionBar',
+                'x-component-props': {},
+                properties: {
+                  submit: {
+                    title: '{{ t("Submit") }}',
+                    'x-action': 'submit',
+                    'x-component': 'Action',
+                    'x-designer': 'Action.Designer',
+                    'x-component-props': {
+                      type: 'primary',
+                      htmlType: 'submit',
+                      useProps: '{{ usePickActionProps }}'
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  };
+  return /*#__PURE__*/React.createElement(ActionInitializer, _objectSpread(_objectSpread({}, props), {}, {
+    schema: schema
+  }));
+};

package/es/schema-initializer/items/index.d.ts

@@ -48,3 +48,4 @@ export * from './TableSelectorInitializer';
 export * from './UpdateActionInitializer';
 export * from './UpdateSubmitActionInitializer';
 export * from './ViewActionInitializer';
+export * from './SelectActionInitializer';

package/es/schema-initializer/items/index.js

@@ -48,4 +48,5 @@ export * from './TableCollectionFieldInitializer';
 export * from './TableSelectorInitializer';
 export * from './UpdateActionInitializer';
 export * from './UpdateSubmitActionInitializer';
-export * from './ViewActionInitializer';
+export * from './ViewActionInitializer';
+export * from './SelectActionInitializer';

package/es/schema-initializer/utils.js

@@ -263,12 +263,15 @@ export var useFormItemInitializerFields = function useFormItemInitializerFields(
     var _field$uiSchema3, _field$uiSchema4;
     var interfaceConfig = getInterface(field.interface);
     var targetCollection = getCollection(field.target);
-    var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
+    // const component =
+    //   field.interface === 'o2m' && targetCollection?.template !== 'file' && !snapshot
+    //     ? 'TableField'
+    //     : 'CollectionField';
     var schema = {
       type: 'string',
       name: field.name,
       'x-designer': 'FormItem.Designer',
-      'x-component': component,
+      'x-component': 'CollectionField',
       'x-decorator': 'FormItem',
       'x-collection-field': "".concat(name, ".").concat(field.name),
       'x-component-props': {},
@@ -327,13 +330,16 @@ export var useFilterFormItemInitializerFields = function useFilterFormItemInitia
     var _field$uiSchema6;
     var interfaceConfig = getInterface(field.interface);
     var targetCollection = getCollection(field.target);
-    var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
+    // const component =
+    //   field.interface === 'o2m' && targetCollection?.template !== 'file' && !snapshot
+    //     ? 'TableField'
+    //     : 'CollectionField';
     var schema = {
       type: 'string',
       name: field.name,
       required: false,
       'x-designer': 'FormItem.FilterFormDesigner',
-      'x-component': component,
+      'x-component': 'CollectionField',
       'x-decorator': 'FormItem',
       'x-collection-field': "".concat(name, ".").concat(field.name),
       'x-component-props': {}
@@ -518,13 +524,16 @@ export var useInheritsFormItemInitializerFields = function useInheritsFormItemIn
       var _field$uiSchema10, _field$uiSchema11, _field$uiSchema12;
       var interfaceConfig = getInterface(field.interface);
       var targetCollection = getCollection(field.target);
-      var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
+      // const component =
+      //   field.interface === 'o2m' && targetCollection?.template !== 'file' && !snapshot
+      //     ? 'TableField'
+      //     : 'CollectionField';
       var schema = {
         type: 'string',
         name: field.name,
         title: (field === null || field === void 0 ? void 0 : (_field$uiSchema10 = field.uiSchema) === null || _field$uiSchema10 === void 0 ? void 0 : _field$uiSchema10.title) || field.name,
         'x-designer': 'FormItem.Designer',
-        'x-component': component,
+        'x-component': 'CollectionField',
         'x-decorator': 'FormItem',
         'x-collection-field': "".concat(name, ".").concat(field.name),
         'x-component-props': {},
@@ -578,14 +587,17 @@ export var useFilterInheritsFormItemInitializerFields = function useFilterInheri
       var _field$uiSchema13, _field$uiSchema14, _field$uiSchema15;
       var interfaceConfig = getInterface(field.interface);
       var targetCollection = getCollection(field.target);
-      var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
+      // const component =
+      //   field.interface === 'o2m' && targetCollection?.template !== 'file' && !snapshot
+      //     ? 'TableField'
+      //     : 'CollectionField';
       var schema = {
         type: 'string',
         name: field.name,
         title: (field === null || field === void 0 ? void 0 : (_field$uiSchema13 = field.uiSchema) === null || _field$uiSchema13 === void 0 ? void 0 : _field$uiSchema13.title) || field.name,
         required: false,
         'x-designer': 'FormItem.FilterFormDesigner',
-        'x-component': component,
+        'x-component': 'CollectionField',
         'x-decorator': 'FormItem',
         'x-collection-field': "".concat(name, ".").concat(field.name),
         'x-component-props': {},

package/es/schema-settings/LinkageRules/FilterDynamicComponent.js

@@ -6,7 +6,7 @@ export function FilterDynamicComponent(props) {
     onChange = props.onChange,
     renderSchemaComponent = props.renderSchemaComponent,
     collectionName = props.collectionName;
-  var scope = useVariableOptions(collectionName);
+  var scope = useVariableOptions(collectionName, ['o2m', 'm2m']);
   return /*#__PURE__*/React.createElement(Variable.Input, {
     value: value,
     onChange: onChange,

package/es/schema-settings/LinkageRules/Variables.d.ts

@@ -1,4 +1,4 @@
-export declare function useVariableOptions(collectionName: any): {
+export declare function useVariableOptions(collectionName: any, excludes?: any): {
     label: any;
     value: any;
     key: any;

package/es/schema-settings/LinkageRules/Variables.js

@@ -6,8 +6,9 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { useCompile } from '../../schema-component';
 import { useCollectionManager } from '../../collection-manager';
-var supportsType = ['checkbox', 'number', 'percent', 'integer', 'input', 'textarea', 'email', 'phone', 'datetime', 'createdAt', 'updatedAt', 'radioGroup', 'checkboxGroup', 'select', 'multipleSelect', 'formula', 'oho', 'obo', 'm2o', 'o2m', 'm2m'];
+var supportsType = ['id', 'checkbox', 'number', 'percent', 'integer', 'input', 'textarea', 'email', 'phone', 'datetime', 'createdAt', 'updatedAt', 'radioGroup', 'checkboxGroup', 'select', 'multipleSelect', 'formula', 'oho', 'obo', 'm2o', 'o2m', 'm2m'];
 var useVariableTypes = function useVariableTypes(currentCollection) {
+  var excludes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var _useCollectionManager = useCollectionManager(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -20,7 +21,9 @@ var useVariableTypes = function useVariableTypes(currentCollection) {
     options: function options() {
       var field2option = function field2option(field, depth) {
         var _field$uiSchema;
-        if (!field.interface || !supportsType.includes(field.interface)) {
+        if (!field.interface || !supportsType.filter(function (v) {
+          return !excludes.includes(v);
+        }).includes(field.interface)) {
           return;
         }
         var fieldInterface = getInterface(field.interface);
@@ -76,9 +79,9 @@ var useVariableTypes = function useVariableTypes(currentCollection) {
     }]
   }];
 };
-export function useVariableOptions(collectionName) {
+export function useVariableOptions(collectionName, excludes) {
   var compile = useCompile();
-  var options = useVariableTypes(collectionName).map(function (item) {
+  var options = useVariableTypes(collectionName, excludes).map(function (item) {
     var options = typeof item.options === 'function' ? item.options() : item.options;
     return {
       label: compile(item.title),

package/es/schema-settings/SchemaSettings.js

@@ -50,6 +50,7 @@ import { useBlockTemplateContext } from '../schema-templates/BlockTemplate';
 import { FormDataTemplates } from './DataTemplates';
 import { FormLinkageRules } from './LinkageRules';
 import { useLinkageCollectionFieldOptions } from './LinkageRules/action-hooks';
+import { EnableChildCollections } from './EnableChildCollections';
 var SchemaSettingsContext = /*#__PURE__*/createContext(null);
 export var useSchemaSettings = function useSchemaSettings() {
   return useContext(SchemaSettingsContext);
@@ -1200,7 +1201,7 @@ SchemaSettings.DataTemplates = function DataTemplates(props) {
     }
   });
 };
-SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
+SchemaSettings.EnableChildCollections = function EnableChildCollectionsItem(props) {
   var collectionName = props.collectionName;
   var fieldSchema = useFieldSchema();
   var _useDesignable5 = useDesignable(),
@@ -1240,7 +1241,6 @@ SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
       }
     },
     onSubmit: function onSubmit(v) {
-      console.log(v);
       var enableChildren = [];
       var _iterator2 = _createForOfIteratorHelper(v.enableChildren.childrenCollections),
         _step2;

package/lib/block-provider/DetailsBlockProvider.js

@@ -10,6 +10,7 @@ var _antd = require("antd");
 var _react2 = _interopRequireWildcard(require("react"));
 var _recordProvider = require("../record-provider");
 var _BlockProvider = require("./BlockProvider");
+var _hooks = require("./hooks");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _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); }
@@ -50,7 +51,18 @@ var InternalDetailsBlockProvider = function InternalDetailsBlockProvider(props)
   }, props.children));
 };
 var DetailsBlockProvider = function DetailsBlockProvider(props) {
-  return /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread({}, props), /*#__PURE__*/_react2.default.createElement(InternalDetailsBlockProvider, _objectSpread({}, props)));
+  var params = _objectSpread({}, props.params);
+  var collection = props.collection;
+  var _useAssociationNames = (0, _hooks.useAssociationNames)(collection),
+    appends = _useAssociationNames.appends;
+  if (!Object.keys(params).includes('appends')) {
+    params['appends'] = appends;
+  }
+  return /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: params
+  }), /*#__PURE__*/_react2.default.createElement(InternalDetailsBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: params
+  })));
 };
 exports.DetailsBlockProvider = DetailsBlockProvider;
 var useDetailsBlockContext = function useDetailsBlockContext() {

package/lib/block-provider/FormBlockProvider.js

@@ -6,17 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.useIsEmptyRecord = exports.useFormBlockProps = exports.useFormBlockContext = exports.findFormBlock = exports.FormBlockProvider = exports.FormBlockContext = void 0;
 var _core = require("@formily/core");
 var _react = require("@formily/react");
-var _antd = require("antd");
-var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
+var _lodash = require("lodash");
 var _react2 = _interopRequireWildcard(require("react"));
 var _collectionManager = require("../collection-manager");
 var _recordProvider = require("../record-provider");
 var _schemaComponent = require("../schema-component");
 var _Templates = require("../schema-component/antd/form-v2/Templates");
 var _BlockProvider = require("./BlockProvider");
+var _hooks = require("./hooks");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 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; }
@@ -28,7 +27,9 @@ exports.FormBlockContext = FormBlockContext;
 var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
   var _service$data;
   var action = props.action,
-    readPretty = props.readPretty;
+    readPretty = props.readPretty,
+    params = props.params,
+    updateAssociationValues = props.updateAssociationValues;
   var field = (0, _react.useField)();
   var form = (0, _react2.useMemo)(function () {
     return (0, _core.createForm)({
@@ -40,21 +41,22 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
     service = _useBlockRequestConte.service;
   var formBlockRef = (0, _react2.useRef)();
   var record = (0, _recordProvider.useRecord)();
-  if (service.loading) {
-    return /*#__PURE__*/_react2.default.createElement(_antd.Spin, null);
-  }
+  // if (service.loading) {
+  //   return <Spin />;
+  // }
   return /*#__PURE__*/_react2.default.createElement(FormBlockContext.Provider, {
     value: {
+      params: params,
       action: action,
       form: form,
       field: field,
       service: service,
       resource: resource,
-      updateAssociationValues: [],
+      updateAssociationValues: updateAssociationValues,
       formBlockRef: formBlockRef
     }
   }, readPretty ? /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
-    parent: (0, _isEmpty.default)(record === null || record === void 0 ? void 0 : record.__parent) ? record : record === null || record === void 0 ? void 0 : record.__parent,
+    parent: (0, _lodash.isEmpty)(record === null || record === void 0 ? void 0 : record.__parent) ? record : record === null || record === void 0 ? void 0 : record.__parent,
     record: service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data
   }, /*#__PURE__*/_react2.default.createElement("div", {
     ref: formBlockRef
@@ -79,10 +81,17 @@ var FormBlockProvider = function FormBlockProvider(props) {
   var record = (0, _recordProvider.useRecord)();
   var collection = props.collection;
   var __collection = record.__collection;
+  var params = _objectSpread({}, props.params);
   var currentCollection = (0, _collectionManager.useCollection)();
   var _useDesignable = (0, _schemaComponent.useDesignable)(),
     designable = _useDesignable.designable;
   var isEmptyRecord = useIsEmptyRecord();
+  var _useAssociationNames = (0, _hooks.useAssociationNames)(collection),
+    appends = _useAssociationNames.appends,
+    updateAssociationValues = _useAssociationNames.updateAssociationValues;
+  if (!Object.keys(params).includes('appends')) {
+    params['appends'] = appends;
+  }
   var detailFlag = false;
   if (isEmptyRecord) {
     detailFlag = true;
@@ -92,8 +101,12 @@ var FormBlockProvider = function FormBlockProvider(props) {
   }
   var createFlag = currentCollection.name === ((collection === null || collection === void 0 ? void 0 : collection.name) || collection) && !isEmptyRecord || !currentCollection.name;
   return (detailFlag || createFlag) && /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
-    block: 'form'
-  }), /*#__PURE__*/_react2.default.createElement(InternalFormBlockProvider, _objectSpread({}, props)));
+    block: 'form',
+    params: params
+  }), /*#__PURE__*/_react2.default.createElement(InternalFormBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: params,
+    updateAssociationValues: updateAssociationValues
+  })));
 };
 exports.FormBlockProvider = FormBlockProvider;
 var useFormBlockContext = function useFormBlockContext() {
@@ -101,7 +114,7 @@ var useFormBlockContext = function useFormBlockContext() {
 };
 exports.useFormBlockContext = useFormBlockContext;
 var useFormBlockProps = function useFormBlockProps() {
-  var _fieldSchema$xCompon;
+  var _fieldSchema$xCompon, _ctx$service3;
   var ctx = useFormBlockContext();
   var record = (0, _recordProvider.useRecord)();
   var _useActionContext = (0, _schemaComponent.useActionContext)(),
@@ -117,9 +130,12 @@ var useFormBlockProps = function useFormBlockProps() {
     }
   });
   (0, _react2.useEffect)(function () {
-    var _ctx$form2, _ctx$service, _ctx$service$data;
-    (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setInitialValues((_ctx$service = ctx.service) === null || _ctx$service === void 0 ? void 0 : (_ctx$service$data = _ctx$service.data) === null || _ctx$service$data === void 0 ? void 0 : _ctx$service$data.data);
-  }, []);
+    var _ctx$service;
+    if (!(ctx === null || ctx === void 0 ? void 0 : (_ctx$service = ctx.service) === null || _ctx$service === void 0 ? void 0 : _ctx$service.loading)) {
+      var _ctx$form2, _ctx$service2, _ctx$service2$data;
+      (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setInitialValues((_ctx$service2 = ctx.service) === null || _ctx$service2 === void 0 ? void 0 : (_ctx$service2$data = _ctx$service2.data) === null || _ctx$service2$data === void 0 ? void 0 : _ctx$service2$data.data);
+    }
+  }, [ctx === null || ctx === void 0 ? void 0 : (_ctx$service3 = ctx.service) === null || _ctx$service3 === void 0 ? void 0 : _ctx$service3.loading]);
   return {
     form: ctx.form
   };

package/lib/block-provider/hooks/index.d.ts

@@ -5,6 +5,9 @@ export declare const usePickActionProps: () => {
 export declare const useCreateActionProps: () => {
     onClick(): Promise<void>;
 };
+export declare const useAssociationCreateActionProps: () => {
+    onClick(): Promise<void>;
+};
 export interface FilterTarget {
     targets?: {
         /** field uid */
@@ -40,6 +43,9 @@ export declare const useUpdateActionProps: () => {
 export declare const useDestroyActionProps: () => {
     onClick(): Promise<void>;
 };
+export declare const useRemoveActionProps: (associationName: any) => {
+    onClick(value: any): Promise<void>;
+};
 export declare const useDetailPrintActionProps: () => {
     onClick(): Promise<void>;
 };
@@ -80,3 +86,7 @@ export declare const useAssociationFilterBlockProps: () => {
     valueKey: any;
     labelKey: any;
 };
+export declare const useAssociationNames: (collection: any) => {
+    appends: any[];
+    updateAssociationValues: any[];
+};