@nocobase/client 0.7.0-alpha.82 → 0.7.1-alpha.4

package/lib/block-provider/TableBlockProvider.js

@@ -5,10 +5,14 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useTableBlockProps = exports.useTableBlockContext = exports.TableBlockProvider = exports.TableBlockContext = void 0;
+exports.useTableBlockProps = exports.useTableBlockContext = exports.useAssociationNames = exports.TableBlockProvider = exports.TableBlockContext = void 0;
+
+var _core = require("@formily/core");
 
 var _react = require("@formily/react");
 
+var _uniq = _interopRequireDefault(require("lodash/uniq"));
+
 var _react2 = _interopRequireWildcard(require("react"));
 
 var _collectionManager = require("../collection-manager");
@@ -19,6 +23,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -29,6 +35,20 @@ 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 _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."); }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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; }
+
 var TableBlockContext = /*#__PURE__*/(0, _react2.createContext)({});
 exports.TableBlockContext = TableBlockContext;
 
@@ -60,17 +80,47 @@ var InternalTableBlockProvider = function InternalTableBlockProvider(props) {
 };
 
 var useAssociationNames = function useAssociationNames(collection) {
-  var _getCollectionFields;
-
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
       getCollectionFields = _useCollectionManager.getCollectionFields;
 
-  var names = (_getCollectionFields = getCollectionFields(collection)) === null || _getCollectionFields === void 0 ? void 0 : _getCollectionFields.filter(function (field) {
-    return field.target;
-  }).map(function (field) {
-    return field.name;
-  });
-  return names;
+  var collectionFields = getCollectionFields(collection);
+  var associationFields = new Set();
+
+  var _iterator = _createForOfIteratorHelper(collectionFields),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var collectionField = _step.value;
+
+      if (collectionField.target) {
+        associationFields.add(collectionField.name);
+        var fields = getCollectionFields(collectionField.target);
+
+        var _iterator2 = _createForOfIteratorHelper(fields),
+            _step2;
+
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var field = _step2.value;
+
+            if (field.target) {
+              associationFields.add("".concat(collectionField.name, ".").concat(field.name));
+            }
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
   var fieldSchema = (0, _react.useFieldSchema)();
   var tableSchema = fieldSchema.reduceProperties(function (buf, schema) {
     if (schema['x-component'] === 'TableV2') {
@@ -78,11 +128,15 @@ var useAssociationNames = function useAssociationNames(collection) {
     }
 
     return buf;
-  }, null);
-  return tableSchema.reduceProperties(function (buf, schema) {
+  }, new _react.Schema({}));
+  return (0, _uniq.default)(tableSchema.reduceProperties(function (buf, schema) {
     if (schema['x-component'] === 'TableV2.Column') {
       var s = schema.reduceProperties(function (buf, s) {
-        if (s['x-collection-field'] && names.includes(s.name)) {
+        var _s$name$split = s.name.split('.'),
+            _s$name$split2 = _slicedToArray(_s$name$split, 1),
+            name = _s$name$split2[0];
+
+        if (s['x-collection-field'] && associationFields.has(name)) {
           return s;
         }
 
@@ -90,32 +144,48 @@ var useAssociationNames = function useAssociationNames(collection) {
       }, null);
 
       if (s) {
-        buf.push(s.name);
+        // 关联字段和关联的关联字段
+        var _s$name$split3 = s.name.split('.'),
+            _s$name$split4 = _slicedToArray(_s$name$split3, 1),
+            firstName = _s$name$split4[0];
+
+        if (associationFields.has(s.name)) {
+          buf.push(s.name);
+        } else if (associationFields.has(firstName)) {
+          buf.push(firstName);
+        }
       }
     }
 
     return buf;
-  }, []);
+  }, []));
 };
 
+exports.useAssociationNames = useAssociationNames;
+
 var TableBlockProvider = function TableBlockProvider(props) {
   var params = _objectSpread({}, props.params);
 
   var appends = useAssociationNames(props.collection);
+  var form = (0, _react2.useMemo)(function () {
+    return (0, _core.createForm)();
+  }, []);
 
   if (props.dragSort) {
     params['sort'] = ['sort'];
   }
 
-  if (appends === null || appends === void 0 ? void 0 : appends.length) {
+  if (!Object.keys(params).includes('appends')) {
     params['appends'] = appends;
   }
 
-  return /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+  return /*#__PURE__*/_react2.default.createElement(_react.FormContext.Provider, {
+    value: form
+  }, /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
     params: params
   }), /*#__PURE__*/_react2.default.createElement(InternalTableBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
     params: params
-  })));
+  }))));
 };
 
 exports.TableBlockProvider = TableBlockProvider;
@@ -127,10 +197,12 @@ var useTableBlockContext = function useTableBlockContext() {
 exports.useTableBlockContext = useTableBlockContext;
 
 var useTableBlockProps = function useTableBlockProps() {
-  var _ctx$service6, _ctx$service7, _ctx$params, _ctx$params2, _ctx$params3;
+  var _fieldSchema$parent, _fieldSchema$parent$x, _fieldSchema$parent$x2, _ctx$service6, _ctx$service7, _ctx$params, _ctx$params2, _ctx$params3;
 
   var field = (0, _react.useField)();
+  var fieldSchema = (0, _react.useFieldSchema)();
   var ctx = useTableBlockContext();
+  var globalSort = (_fieldSchema$parent = fieldSchema.parent) === null || _fieldSchema$parent === void 0 ? void 0 : (_fieldSchema$parent$x = _fieldSchema$parent['x-decorator-props']) === null || _fieldSchema$parent$x === void 0 ? void 0 : (_fieldSchema$parent$x2 = _fieldSchema$parent$x['params']) === null || _fieldSchema$parent$x2 === void 0 ? void 0 : _fieldSchema$parent$x2['sort'];
   (0, _react2.useEffect)(function () {
     var _ctx$service;
 
@@ -186,14 +258,16 @@ var useTableBlockProps = function useTableBlockProps() {
         }, _callee);
       }))();
     },
-    onChange: function onChange(_ref2) {
+    onChange: function onChange(_ref2, filters, sorter) {
       var _ctx$service$params;
 
       var current = _ref2.current,
           pageSize = _ref2.pageSize;
+      var sort = sorter.order ? sorter.order === "ascend" ? [sorter.field] : ["-".concat(sorter.field)] : globalSort || null;
       ctx.service.run(_objectSpread(_objectSpread({}, (_ctx$service$params = ctx.service.params) === null || _ctx$service$params === void 0 ? void 0 : _ctx$service$params[0]), {}, {
         page: current,
-        pageSize: pageSize
+        pageSize: pageSize,
+        sort: sort
       }));
     }
   };

package/lib/block-provider/TableFieldProvider.d.ts

@@ -22,6 +22,7 @@ export declare class TableFieldResource {
     update(options: any): Promise<void>;
     destroy(options: any): Promise<void>;
 }
+export declare const WithoutTableFieldResource: React.Context<any>;
 export declare const TableFieldProvider: (props: any) => JSX.Element;
 export declare const useTableFieldContext: () => any;
 export declare const useTableFieldProps: () => {

package/lib/block-provider/TableFieldProvider.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useTableFieldProps = exports.useTableFieldContext = exports.TableFieldResource = exports.TableFieldProvider = exports.TableFieldContext = void 0;
+exports.useTableFieldProps = exports.useTableFieldContext = exports.WithoutTableFieldResource = exports.TableFieldResource = exports.TableFieldProvider = exports.TableFieldContext = void 0;
 
 var _react = require("@formily/react");
 
@@ -269,11 +269,15 @@ var TableFieldResource = /*#__PURE__*/function () {
 }();
 
 exports.TableFieldResource = TableFieldResource;
+var WithoutTableFieldResource = /*#__PURE__*/(0, _react2.createContext)(null);
+exports.WithoutTableFieldResource = WithoutTableFieldResource;
 
 var TableFieldProvider = function TableFieldProvider(props) {
-  return /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread({
+  return /*#__PURE__*/_react2.default.createElement(WithoutTableFieldResource.Provider, {
+    value: false
+  }, /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread({
     block: 'TableField'
-  }, props), /*#__PURE__*/_react2.default.createElement(InternalTableFieldProvider, _objectSpread({}, props)));
+  }, props), /*#__PURE__*/_react2.default.createElement(InternalTableFieldProvider, _objectSpread({}, props))));
 };
 
 exports.TableFieldProvider = TableFieldProvider;

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

@@ -7,6 +7,9 @@ export declare const useCreateActionProps: () => {
 export declare const useCustomizeUpdateActionProps: () => {
     onClick(): Promise<void>;
 };
+export declare const useCustomizeRequestActionProps: () => {
+    onClick(): Promise<void>;
+};
 export declare const useUpdateActionProps: () => {
     onClick(): Promise<void>;
 };