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

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>;
 };
@@ -67,7 +73,7 @@ export declare const useAssociationFilterProps: () => {
     onSelected: (value: any) => void;
     handleSearchInput: (e: ChangeEvent<any>) => void;
     params: any;
-    run: (...params: any) => void;
+    run: any;
 };
 export declare const useOptionalFieldList: () => import("../..").FieldOptions[];
 export declare const useAssociationFilterBlockProps: () => {
@@ -80,3 +86,7 @@ export declare const useAssociationFilterBlockProps: () => {
     valueKey: any;
     labelKey: any;
 };
+export declare const useAssociationNames: (collection: any) => {
+    appends: any[];
+    updateAssociationValues: any[];
+};