@nocobase/client 0.7.2-alpha.7 → 0.7.4-alpha.4

package/lib/application/Application.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Application = void 0;
+exports.getCurrentTimezone = exports.Application = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -79,6 +79,14 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
+var getCurrentTimezone = function getCurrentTimezone() {
+  var timezoneOffset = new Date().getTimezoneOffset() / -60;
+  var timezone = String(timezoneOffset).padStart(2, '0') + ':00';
+  return (timezoneOffset > 0 ? '+' : '-') + timezone;
+};
+
+exports.getCurrentTimezone = getCurrentTimezone;
+
 var Application = /*#__PURE__*/function () {
   function Application(options) {
     var _window, _window$location;
@@ -93,7 +101,8 @@ var Application = /*#__PURE__*/function () {
     this.apiClient = new _apiClient.APIClient(_objectSpread({
       baseURL: process.env.API_BASE_URL,
       headers: {
-        'X-Hostname': (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.hostname
+        'X-Hostname': (_window = window) === null || _window === void 0 ? void 0 : (_window$location = _window.location) === null || _window$location === void 0 ? void 0 : _window$location.hostname,
+        'X-Timezone': getCurrentTimezone()
       }
     }, options.apiClient));
     this.i18n = options.i18n || _i18n.i18n;

package/lib/block-provider/FormBlockProvider.js

@@ -15,6 +15,8 @@ var _antd = require("antd");
 
 var _react2 = _interopRequireWildcard(require("react"));
 
+var _recordProvider = require("../record-provider");
+
 var _BlockProvider = require("./BlockProvider");
 
 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); }
@@ -31,6 +33,8 @@ var FormBlockContext = /*#__PURE__*/(0, _react2.createContext)({});
 exports.FormBlockContext = FormBlockContext;
 
 var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
+  var _service$data;
+
   var action = props.action,
       readPretty = props.readPretty;
   var field = (0, _react.useField)();
@@ -44,6 +48,8 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       resource = _useBlockRequestConte.resource,
       service = _useBlockRequestConte.service;
 
+  var formBlockRef = (0, _react2.useRef)();
+
   if (service.loading) {
     return /*#__PURE__*/_react2.default.createElement(_antd.Spin, null);
   }
@@ -55,9 +61,16 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       field: field,
       service: service,
       resource: resource,
-      updateAssociationValues: []
+      updateAssociationValues: [],
+      formBlockRef: formBlockRef
     }
-  }, props.children);
+  }, readPretty ? /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
+    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
+  }, props.children)) : /*#__PURE__*/_react2.default.createElement("div", {
+    ref: formBlockRef
+  }, props.children));
 };
 
 var FormBlockProvider = function FormBlockProvider(props) {

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

@@ -31,6 +31,7 @@ export declare const useTableFieldProps: () => {
     showIndex: any;
     dragSort: any;
     pagination: boolean;
+    required: any;
     rowKey: (record: any) => number;
     onRowSelectionChange(selectedRowKeys: any): void;
     onChange({ current, pageSize }: {

package/lib/block-provider/TableFieldProvider.js

@@ -49,6 +49,7 @@ var InternalTableFieldProvider = function InternalTableFieldProvider(props) {
       dragSort = props.dragSort,
       fieldName = props.fieldName;
   var field = (0, _react.useField)();
+  var fieldSchema = (0, _react.useFieldSchema)();
 
   var _useBlockRequestConte = (0, _BlockProvider.useBlockRequestContext)(),
       resource = _useBlockRequestConte.resource,
@@ -70,6 +71,7 @@ var InternalTableFieldProvider = function InternalTableFieldProvider(props) {
   return /*#__PURE__*/_react2.default.createElement(TableFieldContext.Provider, {
     value: {
       field: field,
+      fieldSchema: fieldSchema,
       service: service,
       resource: resource,
       params: params,
@@ -306,7 +308,7 @@ var useTableFieldContext = function useTableFieldContext() {
 exports.useTableFieldContext = useTableFieldContext;
 
 var useTableFieldProps = function useTableFieldProps() {
-  var _ctx$service3, _ctx$service4;
+  var _ctx$service3, _ctx$service4, _ctx$fieldSchema, _ctx$fieldSchema$pare;
 
   var field = (0, _react.useField)();
   var ctx = useTableFieldContext();
@@ -327,6 +329,7 @@ var useTableFieldProps = function useTableFieldProps() {
     showIndex: ctx.showIndex,
     dragSort: ctx.dragSort,
     pagination: false,
+    required: ctx === null || ctx === void 0 ? void 0 : (_ctx$fieldSchema = ctx.fieldSchema) === null || _ctx$fieldSchema === void 0 ? void 0 : (_ctx$fieldSchema$pare = _ctx$fieldSchema.parent) === null || _ctx$fieldSchema$pare === void 0 ? void 0 : _ctx$fieldSchema$pare.required,
     rowKey: function rowKey(record) {
       var _field$value, _field$value$indexOf;
 

package/lib/block-provider/TableSelectorProvider.js

@@ -82,7 +82,8 @@ var TableSelectorProvider = function TableSelectorProvider(props) {
   var ctx = (0, _FormBlockProvider.useFormBlockContext)();
 
   var _useCollectionManager2 = (0, _collectionManager.useCollectionManager)(),
-      getCollectionJoinField = _useCollectionManager2.getCollectionJoinField;
+      getCollectionJoinField = _useCollectionManager2.getCollectionJoinField,
+      getCollectionFields = _useCollectionManager2.getCollectionFields;
 
   var record = (0, _recordProvider.useRecord)();
   var collectionFieldSchema = recursiveParent(fieldSchema, 'CollectionField'); // const value = ctx.form.query(collectionFieldSchema?.name).value();
@@ -98,22 +99,49 @@ var TableSelectorProvider = function TableSelectorProvider(props) {
     params['sort'] = ['sort'];
   }
 
-  if (appends === null || appends === void 0 ? void 0 : appends.length) {
+  if (!Object.keys(params).includes('appends')) {
     params['appends'] = appends;
   }
 
   if (collectionField) {
     if (['oho', 'o2m'].includes(collectionField.interface)) {
-      params['filter'] = {
-        $or: [_defineProperty({}, collectionField.foreignKey, {
+      if (record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]) {
+        params['filter'] = {
+          $or: [_defineProperty({}, collectionField.foreignKey, {
+            $is: null
+          }), _defineProperty({}, collectionField.foreignKey, {
+            $eq: record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]
+          })]
+        };
+      } else {
+        params['filter'] = _defineProperty({}, collectionField.foreignKey, {
           $is: null
-        }), _defineProperty({}, collectionField.foreignKey, {
-          $eq: record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]
-        })]
-      };
+        });
+      }
     }
 
-    if (['obo'].includes(collectionField.interface)) {}
+    if (['obo'].includes(collectionField.interface)) {
+      var fields = getCollectionFields(collectionField.target);
+      var targetField = fields.find(function (f) {
+        return f.foreignKey && f.foreignKey === collectionField.foreignKey;
+      });
+
+      if (targetField) {
+        if (record === null || record === void 0 ? void 0 : record[collectionField.foreignKey]) {
+          params['filter'] = {
+            $or: [_defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
+              $is: null
+            }), _defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
+              $eq: record === null || record === void 0 ? void 0 : record[collectionField.foreignKey]
+            })]
+          };
+        } else {
+          params['filter'] = _defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
+            $is: null
+          });
+        }
+      }
+    }
   }
 
   return /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
@@ -166,14 +194,14 @@ var useTableSelectorProps = function useTableSelectorProps() {
       ctx.field.data = (ctx === null || ctx === void 0 ? void 0 : (_ctx$field2 = ctx.field) === null || _ctx$field2 === void 0 ? void 0 : _ctx$field2.data) || {};
       ctx.field.data.selectedRowKeys = selectedRowKeys;
     },
-    onRowDragEnd: function onRowDragEnd(_ref3) {
+    onRowDragEnd: function onRowDragEnd(_ref5) {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
         var from, to;
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                from = _ref3.from, to = _ref3.to;
+                from = _ref5.from, to = _ref5.to;
                 _context.next = 3;
                 return ctx.resource.move({
                   sourceId: from[ctx.rowKey || 'id'],
@@ -191,11 +219,11 @@ var useTableSelectorProps = function useTableSelectorProps() {
         }, _callee);
       }))();
     },
-    onChange: function onChange(_ref4) {
+    onChange: function onChange(_ref6) {
       var _ctx$service$params;
 
-      var current = _ref4.current,
-          pageSize = _ref4.pageSize;
+      var current = _ref6.current,
+          pageSize = _ref6.pageSize;
       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

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

@@ -16,9 +16,15 @@ export declare const useUpdateActionProps: () => {
 export declare const useDestroyActionProps: () => {
     onClick(): Promise<void>;
 };
+export declare const useDetailPrintActionProps: () => {
+    onClick(): Promise<void>;
+};
 export declare const useBulkDestroyActionProps: () => {
     onClick(): Promise<void>;
 };
+export declare const useRefreshActionProps: () => {
+    onClick(): Promise<void>;
+};
 export declare const useDetailsPaginationProps: () => {
     simple: boolean;
     hidden: boolean;