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

package/es/block-provider/DetailsBlockProvider.js

@@ -10,6 +10,7 @@ import { Spin } from 'antd';
 import React, { createContext, useContext, useEffect, useMemo } from 'react';
 import { RecordProvider } from '../record-provider';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
+import { useAssociationNames } from './hooks';
 export var DetailsBlockContext = /*#__PURE__*/createContext({});
 var InternalDetailsBlockProvider = function InternalDetailsBlockProvider(props) {
   var _service$data, _service$data$data;
@@ -41,7 +42,18 @@ var InternalDetailsBlockProvider = function InternalDetailsBlockProvider(props)
   }, props.children));
 };
 export var DetailsBlockProvider = function DetailsBlockProvider(props) {
-  return /*#__PURE__*/React.createElement(BlockProvider, _objectSpread({}, props), /*#__PURE__*/React.createElement(InternalDetailsBlockProvider, _objectSpread({}, props)));
+  var params = _objectSpread({}, props.params);
+  var collection = props.collection;
+  var _useAssociationNames = useAssociationNames(collection),
+    appends = _useAssociationNames.appends;
+  if (!Object.keys(params).includes('appends')) {
+    params['appends'] = appends;
+  }
+  return /*#__PURE__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: params
+  }), /*#__PURE__*/React.createElement(InternalDetailsBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: params
+  })));
 };
 export var useDetailsBlockContext = function useDetailsBlockContext() {
   return useContext(DetailsBlockContext);

package/es/block-provider/FormBlockProvider.js

@@ -6,19 +6,21 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 { createForm } from '@formily/core';
 import { RecursionField, useField, useFieldSchema } from '@formily/react';
-import { Spin } from 'antd';
-import isEmpty from 'lodash/isEmpty';
+import { isEmpty } from 'lodash';
 import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
 import { useCollection } from '../collection-manager';
 import { RecordProvider, useRecord } from '../record-provider';
 import { useActionContext, useDesignable } from '../schema-component';
 import { Templates as DataTemplateSelect } from '../schema-component/antd/form-v2/Templates';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
+import { useAssociationNames } from './hooks';
 export var FormBlockContext = /*#__PURE__*/createContext({});
 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 = useField();
   var form = useMemo(function () {
     return createForm({
@@ -30,17 +32,18 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
     service = _useBlockRequestConte.service;
   var formBlockRef = useRef();
   var record = useRecord();
-  if (service.loading) {
-    return /*#__PURE__*/React.createElement(Spin, null);
-  }
+  // if (service.loading) {
+  //   return <Spin />;
+  // }
   return /*#__PURE__*/React.createElement(FormBlockContext.Provider, {
     value: {
+      params: params,
       action: action,
       form: form,
       field: field,
       service: service,
       resource: resource,
-      updateAssociationValues: [],
+      updateAssociationValues: updateAssociationValues,
       formBlockRef: formBlockRef
     }
   }, readPretty ? /*#__PURE__*/React.createElement(RecordProvider, {
@@ -68,10 +71,17 @@ export var FormBlockProvider = function FormBlockProvider(props) {
   var record = useRecord();
   var collection = props.collection;
   var __collection = record.__collection;
+  var params = _objectSpread({}, props.params);
   var currentCollection = useCollection();
   var _useDesignable = useDesignable(),
     designable = _useDesignable.designable;
   var isEmptyRecord = useIsEmptyRecord();
+  var _useAssociationNames = useAssociationNames(collection),
+    appends = _useAssociationNames.appends,
+    updateAssociationValues = _useAssociationNames.updateAssociationValues;
+  if (!Object.keys(params).includes('appends')) {
+    params['appends'] = appends;
+  }
   var detailFlag = false;
   if (isEmptyRecord) {
     detailFlag = true;
@@ -81,14 +91,18 @@ export 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__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
-    block: 'form'
-  }), /*#__PURE__*/React.createElement(InternalFormBlockProvider, _objectSpread({}, props)));
+    block: 'form',
+    params: params
+  }), /*#__PURE__*/React.createElement(InternalFormBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: params,
+    updateAssociationValues: updateAssociationValues
+  })));
 };
 export var useFormBlockContext = function useFormBlockContext() {
   return useContext(FormBlockContext);
 };
 export var useFormBlockProps = function useFormBlockProps() {
-  var _fieldSchema$xCompon;
+  var _fieldSchema$xCompon, _ctx$service3;
   var ctx = useFormBlockContext();
   var record = useRecord();
   var _useActionContext = useActionContext(),
@@ -104,9 +118,12 @@ export var useFormBlockProps = function useFormBlockProps() {
     }
   });
   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/es/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[];
+};