@nocobase/client 0.7.2-alpha.5 → 0.7.3-alpha.1

package/es/schema-initializer/components/assigned-field/AssignedField.js

@@ -1,9 +1,3 @@
-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; }
-
-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."); }
@@ -16,81 +10,271 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { useField, useFieldSchema } from '@formily/react'; // import { Select, Space } from 'antd';
+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; }
 
-import React, { useState } from 'react';
+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; }
+
+import { connect, useField, useFieldSchema } from '@formily/react';
+import { Cascader, Select, Space } from 'antd';
+import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { CollectionField } from '../../../collection-manager';
-import { useCompile } from '../../../schema-component';
+import { useFormBlockContext } from '../../../block-provider';
+import { CollectionFieldProvider, useCollection, useCollectionField, useCollectionFilterOptions } from '../../../collection-manager';
+import { useCompile, useComponent } from '../../../schema-component';
+var DYNAMIC_RECORD_REG = /\{\{\s*currentRecord\.(.*)\s*\}\}/;
+var DYNAMIC_USER_REG = /\{\{\s*currentUser\.(.*)\s*\}\}/;
+var DYNAMIC_TIME_REG = /\{\{\s*currentTime\s*\}\}/;
+
+var InternalField = function InternalField(props) {
+  var field = useField();
+  var fieldSchema = useFieldSchema();
+
+  var _useCollectionField = useCollectionField(),
+      name = _useCollectionField.name,
+      interfaceType = _useCollectionField.interface,
+      uiSchema = _useCollectionField.uiSchema;
+
+  var component = useComponent(uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema['x-component']);
+  var compile = useCompile();
+
+  var setFieldProps = function setFieldProps(key, value) {
+    field[key] = typeof field[key] === 'undefined' ? value : field[key];
+  };
+
+  var setRequired = function setRequired() {
+    if (typeof fieldSchema['required'] === 'undefined') {
+      field.required = !!uiSchema['required'];
+    }
+  };
+
+  var ctx = useFormBlockContext();
+  useEffect(function () {
+    if (ctx === null || ctx === void 0 ? void 0 : ctx.field) {
+      ctx.field.added = ctx.field.added || new Set();
+      ctx.field.added.add(fieldSchema.name);
+    }
+  });
+  useEffect(function () {
+    if (!uiSchema) {
+      return;
+    }
+
+    setFieldProps('content', uiSchema['x-content']);
+    setFieldProps('title', uiSchema.title);
+    setFieldProps('description', uiSchema.description);
+    setFieldProps('initialValue', uiSchema.default);
+
+    if (!field.validator && uiSchema['x-validator']) {
+      field.validator = uiSchema['x-validator'];
+    }
+
+    if (fieldSchema['x-disabled'] === true) {
+      field.disabled = true;
+    }
+
+    if (fieldSchema['x-read-pretty'] === true) {
+      field.readPretty = true;
+    }
+
+    setRequired(); // @ts-ignore
+    // field.dataSource = uiSchema.enum;
+    // const originalProps = compile(uiSchema['x-component-props']) || {};
+    // const componentProps = merge(originalProps, field.componentProps || {});
+    // field.component = [component, componentProps];
+  }, [JSON.stringify(uiSchema)]);
+
+  if (!uiSchema) {
+    return null;
+  }
+
+  return /*#__PURE__*/React.createElement(component, props, props.children);
+};
+
+var CollectionField = connect(function (props) {
+  var fieldSchema = useFieldSchema();
+  return /*#__PURE__*/React.createElement(CollectionFieldProvider, {
+    name: fieldSchema.name
+  }, /*#__PURE__*/React.createElement(InternalField, _objectSpread({}, props)));
+});
+export var AssignedFieldValueType;
+
+(function (AssignedFieldValueType) {
+  AssignedFieldValueType["ConstantValue"] = "constantValue";
+  AssignedFieldValueType["DynamicValue"] = "dynamicValue";
+})(AssignedFieldValueType || (AssignedFieldValueType = {}));
+
 export var AssignedField = function AssignedField(props) {
-  var _field$value$value, _field$value;
+  var _initFieldType, _DYNAMIC_RECORD_REG$e, _DYNAMIC_RECORD_REG$e2, _DYNAMIC_RECORD_REG$e3, _DYNAMIC_USER_REG$exe, _DYNAMIC_USER_REG$exe2, _DYNAMIC_USER_REG$exe3;
 
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
 
   var compile = useCompile();
   var field = useField();
-  var fieldSchema = useFieldSchema(); // const [type, setType] = useState<string>('constantValue');
+  var fieldSchema = useFieldSchema();
+  var isDynamicValue = DYNAMIC_RECORD_REG.test(field.value) || DYNAMIC_USER_REG.test(field.value) || DYNAMIC_TIME_REG.test(field.value);
+  var initType = isDynamicValue ? AssignedFieldValueType.DynamicValue : AssignedFieldValueType.ConstantValue;
 
-  var _useState = useState((_field$value$value = field === null || field === void 0 ? void 0 : (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.value) !== null && _field$value$value !== void 0 ? _field$value$value : ''),
+  var _useState = useState(initType),
       _useState2 = _slicedToArray(_useState, 2),
-      value = _useState2[0],
-      setValue = _useState2[1]; // const [options, setOptions] = useState<any[]>([]);
-  // const { getField } = useCollection();
-  // const collectionField = getField(fieldSchema.name);
-  // const { uiSchema } = collectionField;
-  // const currentUser = useFilterOptions('users');
-  // const currentRecord = useFilterOptions(collectionField.collectionName);
-  // useEffect(() => {
-  //   const opt = [
-  //     {
-  //       name: 'currentUser',
-  //       title: t('Current user'),
-  //       children: [...currentUser],
-  //     },
-  //     {
-  //       name: 'currentRecord',
-  //       title: t('Current record'),
-  //       children: [...currentRecord],
-  //     },
-  //   ];
-  //   setOptions(compile(opt));
-  // }, []);
+      type = _useState2[0],
+      setType = _useState2[1];
+
+  var initFieldType = (_initFieldType = {}, _defineProperty(_initFieldType, "".concat(DYNAMIC_TIME_REG.test(field.value)), 'currentTime'), _defineProperty(_initFieldType, "".concat(DYNAMIC_USER_REG.test(field.value)), 'currentUser'), _defineProperty(_initFieldType, "".concat(DYNAMIC_RECORD_REG.test(field.value)), 'currentRecord'), _initFieldType);
+
+  var _useState3 = useState(initFieldType['true']),
+      _useState4 = _slicedToArray(_useState3, 2),
+      fieldType = _useState4[0],
+      setFieldType = _useState4[1];
+
+  var initRecordValue = (_DYNAMIC_RECORD_REG$e = (_DYNAMIC_RECORD_REG$e2 = DYNAMIC_RECORD_REG.exec(field.value)) === null || _DYNAMIC_RECORD_REG$e2 === void 0 ? void 0 : (_DYNAMIC_RECORD_REG$e3 = _DYNAMIC_RECORD_REG$e2[1]) === null || _DYNAMIC_RECORD_REG$e3 === void 0 ? void 0 : _DYNAMIC_RECORD_REG$e3.split('.')) !== null && _DYNAMIC_RECORD_REG$e !== void 0 ? _DYNAMIC_RECORD_REG$e : [];
+
+  var _useState5 = useState(initRecordValue),
+      _useState6 = _slicedToArray(_useState5, 2),
+      recordValue = _useState6[0],
+      setRecordValue = _useState6[1];
+
+  var initUserValue = (_DYNAMIC_USER_REG$exe = (_DYNAMIC_USER_REG$exe2 = DYNAMIC_USER_REG.exec(field.value)) === null || _DYNAMIC_USER_REG$exe2 === void 0 ? void 0 : (_DYNAMIC_USER_REG$exe3 = _DYNAMIC_USER_REG$exe2[1]) === null || _DYNAMIC_USER_REG$exe3 === void 0 ? void 0 : _DYNAMIC_USER_REG$exe3.split('.')) !== null && _DYNAMIC_USER_REG$exe !== void 0 ? _DYNAMIC_USER_REG$exe : [];
+
+  var _useState7 = useState(initUserValue),
+      _useState8 = _slicedToArray(_useState7, 2),
+      userValue = _useState8[0],
+      setUserValue = _useState8[1];
+
+  var initValue = isDynamicValue ? '' : field.value;
 
+  var _useState9 = useState(initValue),
+      _useState10 = _slicedToArray(_useState9, 2),
+      value = _useState10[0],
+      setValue = _useState10[1];
+
+  var _useState11 = useState([]),
+      _useState12 = _slicedToArray(_useState11, 2),
+      options = _useState12[0],
+      setOptions = _useState12[1];
+
+  var _useCollection = useCollection(),
+      getField = _useCollection.getField;
+
+  var collectionField = getField(fieldSchema.name);
+  var fields = useCollectionFilterOptions(collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName);
+  var userFields = useCollectionFilterOptions('users');
+  var dateTimeFields = ['createdAt', 'datetime', 'time', 'updatedAt'];
+  useEffect(function () {
+    var opt = [{
+      name: 'currentRecord',
+      title: t('Current record')
+    }, {
+      name: 'currentUser',
+      title: t('Current user')
+    }];
+
+    if (dateTimeFields.includes(collectionField.interface)) {
+      opt.unshift({
+        name: 'currentTime',
+        title: t('Current time')
+      });
+    } else {}
+
+    setOptions(compile(opt));
+  }, []);
+  useEffect(function () {
+    if (type === AssignedFieldValueType.ConstantValue) {
+      field.value = value;
+    } else {
+      if (fieldType === 'currentTime') {
+        field.value = '{{currentTime}}';
+      } else if (fieldType === 'currentUser') {
+        (userValue === null || userValue === void 0 ? void 0 : userValue.length) > 0 && (field.value = "{{currentUser.".concat(userValue.join('.'), "}}"));
+      } else if (fieldType === 'currentRecord') {
+        (recordValue === null || recordValue === void 0 ? void 0 : recordValue.length) > 0 && (field.value = "{{currentRecord.".concat(recordValue.join('.'), "}}"));
+      }
+    }
+  }, [type, value, fieldType, userValue, recordValue]);
+  useEffect(function () {
+    if (type === AssignedFieldValueType.ConstantValue) {
+      setFieldType(null);
+      setUserValue([]);
+      setRecordValue([]);
+    }
+  }, [type]);
+
+  var typeChangeHandler = function typeChangeHandler(val) {
+    setType(val);
+  };
 
   var valueChangeHandler = function valueChangeHandler(val) {
-    setValue(val);
-  }; // const typeChangeHandler = (val) => {
-  //   setType(val);
-  // };
-
-
-  return /*#__PURE__*/React.createElement(CollectionField, _objectSpread(_objectSpread({}, props), {}, {
-    value: field.value,
-    onChange: valueChangeHandler
-  })); // return (
-  //   <Space>
-  //     <Select defaultValue={type} value={type} style={{ width: 120 }} onChange={typeChangeHandler}>
-  //       <Select.Option value="constantValue">{t('Constant value')}</Select.Option>
-  //       <Select.Option value="dynamicValue">{t('Dynamic value')}</Select.Option>
-  //     </Select>
-  //     {type === 'constantValue' ? (
-  //       <CollectionField {...props} onChange={valueChangeHandler} />
-  //     ) : (
-  //       <Cascader
-  //         fieldNames={{
-  //           label: 'title',
-  //           value: 'name',
-  //           children: 'children',
-  //         }}
-  //         style={{
-  //           width: 150,
-  //         }}
-  //         options={options}
-  //         onChange={valueChangeHandler}
-  //         defaultValue={value}
-  //       />
-  //     )}
-  //   </Space>
-  // );
+    var _val$target$value, _val$target;
+
+    setValue((_val$target$value = val === null || val === void 0 ? void 0 : (_val$target = val.target) === null || _val$target === void 0 ? void 0 : _val$target.value) !== null && _val$target$value !== void 0 ? _val$target$value : val);
+  };
+
+  var fieldTypeChangeHandler = function fieldTypeChangeHandler(val) {
+    setFieldType(val);
+  };
+
+  var recordChangeHandler = function recordChangeHandler(val) {
+    setRecordValue(val);
+  };
+
+  var userChangeHandler = function userChangeHandler(val) {
+    setUserValue(val);
+  };
+
+  return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, {
+    defaultValue: type,
+    value: type,
+    style: {
+      width: 150
+    },
+    onChange: typeChangeHandler
+  }, /*#__PURE__*/React.createElement(Select.Option, {
+    value: AssignedFieldValueType.ConstantValue
+  }, t('Constant value')), /*#__PURE__*/React.createElement(Select.Option, {
+    value: AssignedFieldValueType.DynamicValue
+  }, t('Dynamic value'))), type === AssignedFieldValueType.ConstantValue ? /*#__PURE__*/React.createElement(CollectionField, _objectSpread(_objectSpread({}, props), {}, {
+    value: value,
+    onChange: valueChangeHandler,
+    style: {
+      minWidth: 150
+    }
+  })) : /*#__PURE__*/React.createElement(Select, {
+    defaultValue: fieldType,
+    value: fieldType,
+    style: {
+      minWidth: 150
+    },
+    onChange: fieldTypeChangeHandler
+  }, options === null || options === void 0 ? void 0 : options.map(function (opt) {
+    return /*#__PURE__*/React.createElement(Select.Option, {
+      key: opt.name,
+      value: opt.name
+    }, opt.title);
+  })), fieldType === 'currentRecord' && /*#__PURE__*/React.createElement(Cascader, {
+    fieldNames: {
+      label: 'title',
+      value: 'name',
+      children: 'children'
+    },
+    style: {
+      minWidth: 150
+    },
+    options: compile(fields),
+    onChange: recordChangeHandler,
+    defaultValue: recordValue
+  }), fieldType === 'currentUser' && /*#__PURE__*/React.createElement(Cascader, {
+    fieldNames: {
+      label: 'title',
+      value: 'name',
+      children: 'children'
+    },
+    style: {
+      minWidth: 150
+    },
+    options: compile(userFields),
+    onChange: userChangeHandler,
+    defaultValue: userValue
+  }));
 };

package/es/schema-initializer/items/index.d.ts

@@ -15,7 +15,9 @@ export declare const CreateActionInitializer: (props: any) => JSX.Element;
 export declare const ViewActionInitializer: (props: any) => JSX.Element;
 export declare const UpdateActionInitializer: (props: any) => JSX.Element;
 export declare const DestroyActionInitializer: (props: any) => JSX.Element;
+export declare const PrintActionInitializer: (props: any) => JSX.Element;
 export declare const BulkDestroyActionInitializer: (props: any) => JSX.Element;
+export declare const RefreshActionInitializer: (props: any) => JSX.Element;
 export declare const SubmitActionInitializer: (props: any) => JSX.Element;
 export declare const CreateSubmitActionInitializer: (props: any) => JSX.Element;
 export declare const UpdateSubmitActionInitializer: (props: any) => JSX.Element;

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';
@@ -693,6 +693,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 +727,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 +881,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 +967,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 +998,7 @@ export var RecordReadPrettyFormBlockInitializer = function RecordReadPrettyFormB
 
                 if (item.template.componentName === 'ReadPrettyFormItem') {
                   blockSchema = createReadPrettyFormBlockSchema({
+                    actionInitializers: actionInitializers,
                     association: association,
                     collection: collection.name,
                     action: 'get',
@@ -984,6 +1021,7 @@ export var RecordReadPrettyFormBlockInitializer = function RecordReadPrettyFormB
 
               case 8:
                 insert(createReadPrettyFormBlockSchema({
+                  actionInitializers: actionInitializers,
                   association: association,
                   collection: collection.name,
                   action: 'get',
@@ -1113,6 +1151,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 +1181,7 @@ export var RecordReadPrettyAssociationFormBlockInitializer = function RecordRead
 
                 if (item.template.componentName === 'ReadPrettyFormItem') {
                   blockSchema = createReadPrettyFormBlockSchema({
+                    actionInitializers: actionInitializers,
                     collection: collection,
                     resource: resource,
                     association: resource,
@@ -1161,6 +1205,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 });

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/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) {