@nocobase/client 0.7.2-alpha.6 → 0.7.4-alpha.1

package/es/application/Application.d.ts

@@ -5,6 +5,7 @@ export interface ApplicationOptions {
     i18n?: any;
     plugins?: any[];
 }
+export declare const getCurrentTimezone: () => string;
 export declare type PluginCallback = () => Promise<any>;
 export declare class Application {
     providers: any[];

package/es/application/Application.js

@@ -51,6 +51,11 @@ import { BlockTemplateDetails, BlockTemplatePage, SchemaTemplateShortcut } from
 import { SystemSettingsProvider, SystemSettingsShortcut } from '../system-settings';
 import { SigninPage, SignupPage } from '../user';
 import { compose } from './compose';
+export var getCurrentTimezone = function getCurrentTimezone() {
+  var timezoneOffset = new Date().getTimezoneOffset() / -60;
+  var timezone = String(timezoneOffset).padStart(2, '0') + ':00';
+  return (timezoneOffset > 0 ? '+' : '-') + timezone;
+};
 export var Application = /*#__PURE__*/function () {
   function Application(options) {
     var _window, _window$location;
@@ -65,7 +70,8 @@ export var Application = /*#__PURE__*/function () {
     this.apiClient = new 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;

package/es/block-provider/FormBlockProvider.js

@@ -7,7 +7,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { createForm } from '@formily/core';
 import { useField } from '@formily/react';
 import { Spin } from 'antd';
-import React, { createContext, useContext, useEffect, useMemo } from 'react';
+import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
 export var FormBlockContext = /*#__PURE__*/createContext({});
 
@@ -25,6 +25,8 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       resource = _useBlockRequestConte.resource,
       service = _useBlockRequestConte.service;
 
+  var formBlockRef = useRef();
+
   if (service.loading) {
     return /*#__PURE__*/React.createElement(Spin, null);
   }
@@ -36,9 +38,12 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       field: field,
       service: service,
       resource: resource,
-      updateAssociationValues: []
+      updateAssociationValues: [],
+      formBlockRef: formBlockRef
     }
-  }, props.children);
+  }, /*#__PURE__*/React.createElement("div", {
+    ref: formBlockRef
+  }, props.children));
 };
 
 export var FormBlockProvider = function FormBlockProvider(props) {

package/es/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/es/block-provider/TableFieldProvider.js

@@ -14,7 +14,7 @@ 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; }
 
-import { useField } from '@formily/react';
+import { useField, useFieldSchema } from '@formily/react';
 import React, { createContext, useContext, useEffect } from 'react';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
 import { useFormBlockContext } from './FormBlockProvider';
@@ -30,6 +30,7 @@ var InternalTableFieldProvider = function InternalTableFieldProvider(props) {
       dragSort = props.dragSort,
       fieldName = props.fieldName;
   var field = useField();
+  var fieldSchema = useFieldSchema();
 
   var _useBlockRequestConte = useBlockRequestContext(),
       resource = _useBlockRequestConte.resource,
@@ -51,6 +52,7 @@ var InternalTableFieldProvider = function InternalTableFieldProvider(props) {
   return /*#__PURE__*/React.createElement(TableFieldContext.Provider, {
     value: {
       field: field,
+      fieldSchema: fieldSchema,
       service: service,
       resource: resource,
       params: params,
@@ -277,7 +279,7 @@ export var useTableFieldContext = function useTableFieldContext() {
   return useContext(TableFieldContext);
 };
 export var useTableFieldProps = function useTableFieldProps() {
-  var _ctx$service3, _ctx$service4;
+  var _ctx$service3, _ctx$service4, _ctx$fieldSchema, _ctx$fieldSchema$pare;
 
   var field = useField();
   var ctx = useTableFieldContext();
@@ -298,6 +300,7 @@ export 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/es/block-provider/TableSelectorProvider.js

@@ -62,7 +62,8 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
   var ctx = useFormBlockContext();
 
   var _useCollectionManager2 = useCollectionManager(),
-      getCollectionJoinField = _useCollectionManager2.getCollectionJoinField;
+      getCollectionJoinField = _useCollectionManager2.getCollectionJoinField,
+      getCollectionFields = _useCollectionManager2.getCollectionFields;
 
   var record = useRecord();
   var collectionFieldSchema = recursiveParent(fieldSchema, 'CollectionField'); // const value = ctx.form.query(collectionFieldSchema?.name).value();
@@ -84,16 +85,43 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
 
   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__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
@@ -140,14 +168,14 @@ export 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'],
@@ -165,11 +193,11 @@ export 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/es/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;