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

package/es/schema-initializer/items/index.js

@@ -31,7 +31,7 @@ import { merge } from '@formily/shared';
 import React, { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAPIClient } from '../../api-client';
-import { useBlockAssociationContext } from '../../block-provider';
+import { useBlockAssociationContext, useBlockRequestContext } from '../../block-provider';
 import { useCollection, useCollectionManager } from '../../collection-manager';
 import { SchemaComponent, SchemaComponentOptions } from '../../schema-component';
 import { useSchemaTemplateManager } from '../../schema-templates';
@@ -415,9 +415,10 @@ export var KanbanBlockInitializer = function KanbanBlockInitializer(props) {
                     schema: {
                       properties: {
                         groupField: {
-                          title: t('Group field'),
+                          title: t('Grouping field'),
                           enum: fields,
                           required: true,
+                          description: '{{t("Single select and radio fields can be used as the grouping field")}}',
                           'x-component': 'Select',
                           'x-component-props': {
                             objectValue: true,
@@ -693,6 +694,21 @@ export var DestroyActionInitializer = function DestroyActionInitializer(props) {
     schema: schema
   }));
 };
+export var PrintActionInitializer = function PrintActionInitializer(props) {
+  var schema = {
+    title: '{{ t("Print") }}',
+    'x-action': 'print',
+    'x-component': 'Action',
+    'x-designer': 'Action.Designer',
+    'x-component-props': {
+      icon: 'PrinterOutlined',
+      useProps: '{{ useDetailPrintActionProps }}'
+    }
+  };
+  return /*#__PURE__*/React.createElement(ActionInitializer, _objectSpread(_objectSpread({}, props), {}, {
+    schema: schema
+  }));
+};
 export var BulkDestroyActionInitializer = function BulkDestroyActionInitializer(props) {
   var schema = {
     title: '{{ t("Delete") }}',
@@ -712,6 +728,21 @@ export var BulkDestroyActionInitializer = function BulkDestroyActionInitializer(
     schema: schema
   }));
 };
+export var RefreshActionInitializer = function RefreshActionInitializer(props) {
+  var schema = {
+    title: '{{ t("Refresh") }}',
+    'x-action': 'refresh',
+    'x-component': 'Action',
+    'x-designer': 'Action.Designer',
+    'x-component-props': {
+      icon: 'ReloadOutlined',
+      useProps: '{{ useRefreshActionProps }}'
+    }
+  };
+  return /*#__PURE__*/React.createElement(ActionInitializer, _objectSpread(_objectSpread({}, props), {}, {
+    schema: schema
+  }));
+};
 export var SubmitActionInitializer = function SubmitActionInitializer(props) {
   var schema = {
     title: '{{ t("Submit") }}',
@@ -851,6 +882,7 @@ export var RecordFormBlockInitializer = function RecordFormBlockInitializer(prop
 
   var collection = useCollection();
   var association = useBlockAssociationContext();
+  console.log('RecordFormBlockInitializer', collection, association);
   return /*#__PURE__*/React.createElement(SchemaInitializer.Item, _objectSpread(_objectSpread({
     icon: /*#__PURE__*/React.createElement(FormOutlined, null)
   }, others), {}, {
@@ -936,6 +968,11 @@ export var RecordReadPrettyFormBlockInitializer = function RecordReadPrettyFormB
 
   var collection = useCollection();
   var association = useBlockAssociationContext();
+
+  var _useBlockRequestConte = useBlockRequestContext(),
+      block = _useBlockRequestConte.block;
+
+  var actionInitializers = block !== 'TableField' ? 'ReadPrettyFormActionInitializers' : null;
   return /*#__PURE__*/React.createElement(SchemaInitializer.Item, _objectSpread(_objectSpread({
     icon: /*#__PURE__*/React.createElement(FormOutlined, null)
   }, others), {}, {
@@ -962,6 +999,7 @@ export var RecordReadPrettyFormBlockInitializer = function RecordReadPrettyFormB
 
                 if (item.template.componentName === 'ReadPrettyFormItem') {
                   blockSchema = createReadPrettyFormBlockSchema({
+                    actionInitializers: actionInitializers,
                     association: association,
                     collection: collection.name,
                     action: 'get',
@@ -984,6 +1022,7 @@ export var RecordReadPrettyFormBlockInitializer = function RecordReadPrettyFormB
 
               case 8:
                 insert(createReadPrettyFormBlockSchema({
+                  actionInitializers: actionInitializers,
                   association: association,
                   collection: collection.name,
                   action: 'get',
@@ -1113,6 +1152,11 @@ export var RecordReadPrettyAssociationFormBlockInitializer = function RecordRead
   var field = item.field;
   var collection = field.target;
   var resource = "".concat(field.collectionName, ".").concat(field.name);
+
+  var _useBlockRequestConte2 = useBlockRequestContext(),
+      block = _useBlockRequestConte2.block;
+
+  var actionInitializers = block !== 'TableField' ? 'ReadPrettyFormActionInitializers' : null;
   return /*#__PURE__*/React.createElement(SchemaInitializer.Item, _objectSpread(_objectSpread({
     icon: /*#__PURE__*/React.createElement(FormOutlined, null)
   }, others), {}, {
@@ -1138,6 +1182,7 @@ export var RecordReadPrettyAssociationFormBlockInitializer = function RecordRead
 
                 if (item.template.componentName === 'ReadPrettyFormItem') {
                   blockSchema = createReadPrettyFormBlockSchema({
+                    actionInitializers: actionInitializers,
                     collection: collection,
                     resource: resource,
                     association: resource,
@@ -1161,6 +1206,7 @@ export var RecordReadPrettyAssociationFormBlockInitializer = function RecordRead
 
               case 8:
                 insert(createReadPrettyFormBlockSchema({
+                  actionInitializers: actionInitializers,
                   collection: collection,
                   resource: resource,
                   association: resource,

package/es/schema-initializer/utils.js

@@ -260,8 +260,9 @@ export var useAssociatedFormItemInitializerFields = function useAssociatedFormIt
       _ref2$block = _ref2.block,
       block = _ref2$block === void 0 ? 'Form' : _ref2$block;
 
+  var interfaces = block === 'Form' ? ['m2o'] : ['o2o', 'oho', 'obo', 'm2o'];
   var groups = fields === null || fields === void 0 ? void 0 : (_fields$filter3 = fields.filter(function (field) {
-    return ['o2o', 'oho', 'obo', 'm2o'].includes(field.interface);
+    return interfaces.includes(field.interface);
   })) === null || _fields$filter3 === void 0 ? void 0 : _fields$filter3.map(function (field) {
     var _subFields$filter2, _field$uiSchema4;
 
@@ -278,7 +279,10 @@ export var useAssociatedFormItemInitializerFields = function useAssociatedFormIt
         // title: subField?.uiSchema?.title || subField.name,
         'x-designer': 'FormItem.Designer',
         'x-component': 'CollectionField',
-        'x-component-props': {},
+        'x-read-pretty': readPretty,
+        'x-component-props': {
+          'pattern-disable': block === 'Form' && readPretty
+        },
         'x-decorator': 'FormItem',
         'x-collection-field': "".concat(name, ".").concat(field.name, ".").concat(subField.name)
       }; // interfaceConfig?.schemaInitialize?.(schema, { field, block: 'Form', readPretty: form.readPretty });
@@ -384,11 +388,27 @@ var removeSchema = function removeSchema(schema, cb) {
   return cb(schema);
 };
 
+var recursiveParent = function recursiveParent(schema) {
+  if (!schema.parent) return null;
+  if (schema.parent['x-initializer']) return schema.parent;
+  return recursiveParent(schema.parent);
+};
+
 export var useCurrentSchema = function useCurrentSchema(action, key) {
+  var _fieldSchema;
+
   var find = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : findSchema;
   var rm = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : removeSchema;
   var fieldSchema = useFieldSchema();
 
+  if (!((_fieldSchema = fieldSchema) === null || _fieldSchema === void 0 ? void 0 : _fieldSchema['x-initializer'])) {
+    var recursiveInitializerSchema = recursiveParent(fieldSchema);
+
+    if (recursiveInitializerSchema) {
+      fieldSchema = recursiveInitializerSchema;
+    }
+  }
+
   var _useDesignable = useDesignable(),
       _remove = _useDesignable.remove;
 

package/es/system-settings/SystemSettingsShortcut.js

@@ -23,10 +23,11 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { SettingOutlined } from '@ant-design/icons';
 import { useForm } from '@formily/react';
 import { uid } from '@formily/shared';
+import cloneDeep from 'lodash/cloneDeep';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSystemSettings } from '.';
-import { PluginManager, useAPIClient, useRequest } from '..';
+import { i18n, PluginManager, useAPIClient, useRequest } from '..';
 import locale from '../locale';
 import { ActionContext, SchemaComponent, useActionContext } from '../schema-component';
 var langs = Object.keys(locale).map(function (lang) {
@@ -86,6 +87,9 @@ var useSaveSystemSettingsValues = function useSaveSystemSettingsValues() {
   return {
     run: function run() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+        var _values$enabledLangua;
+
+        var values, lang;
         return regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -94,18 +98,28 @@ var useSaveSystemSettingsValues = function useSaveSystemSettingsValues() {
                 return form.submit();
 
               case 2:
-                setVisible(false);
+                values = cloneDeep(form.values);
                 mutate({
-                  data: _objectSpread(_objectSpread({}, data === null || data === void 0 ? void 0 : data.data), form.values)
+                  data: _objectSpread(_objectSpread({}, data === null || data === void 0 ? void 0 : data.data), values)
                 });
                 _context2.next = 6;
                 return api.request({
                   url: 'systemSettings:update/1',
                   method: 'post',
-                  data: form.values
+                  data: values
                 });
 
               case 6:
+                lang = ((_values$enabledLangua = values.enabledLanguages) === null || _values$enabledLangua === void 0 ? void 0 : _values$enabledLangua[0]) || 'en-US';
+
+                if (values.enabledLanguages.length < 2 && api.auth.getLocale() !== lang) {
+                  api.auth.setLocale('');
+                  window.location.reload();
+                } else {
+                  setVisible(false);
+                }
+
+              case 8:
               case "end":
                 return _context2.stop();
             }
@@ -153,14 +167,23 @@ var schema = {
           mode: 'multiple'
         },
         'x-decorator': 'FormItem',
-        enum: langs
-      },
-      appLang: {
-        type: 'string',
-        title: '{{t("Default language")}}',
-        'x-component': 'Select',
-        'x-decorator': 'FormItem',
-        enum: langs
+        enum: langs,
+        'x-reactions': function xReactions(field) {
+          field.dataSource = langs.map(function (item) {
+            var _field$value;
+
+            var label = item.label;
+
+            if (((_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value[0]) === item.value) {
+              label += "(".concat(i18n.t('Default'), ")");
+            }
+
+            return {
+              label: label,
+              value: item.value
+            };
+          });
+        }
       },
       allowSignUp: {
         type: 'boolean',

package/lib/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/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

@@ -44,6 +44,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 +57,12 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       field: field,
       service: service,
       resource: resource,
-      updateAssociationValues: []
+      updateAssociationValues: [],
+      formBlockRef: 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();
@@ -104,16 +105,43 @@ 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__*/_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;