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

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

@@ -5,14 +5,20 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AssignedField = void 0;
+exports.AssignedFieldValueType = exports.AssignedField = void 0;
 
 var _react = require("@formily/react");
 
+var _shared = require("@formily/shared");
+
+var _antd = require("antd");
+
 var _react2 = _interopRequireWildcard(require("react"));
 
 var _reactI18next = require("react-i18next");
 
+var _blockProvider = require("../../../block-provider");
+
 var _collectionManager = require("../../../collection-manager");
 
 var _schemaComponent = require("../../../schema-component");
@@ -21,12 +27,6 @@ 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 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."); }
@@ -39,77 +39,268 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+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; }
+
+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 = (0, _react.useField)();
+  var fieldSchema = (0, _react.useFieldSchema)();
+
+  var _useCollectionField = (0, _collectionManager.useCollectionField)(),
+      name = _useCollectionField.name,
+      interfaceType = _useCollectionField.interface,
+      uiSchema = _useCollectionField.uiSchema;
+
+  var component = (0, _schemaComponent.useComponent)(uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema['x-component']);
+  var compile = (0, _schemaComponent.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 = (0, _blockProvider.useFormBlockContext)();
+  (0, _react2.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);
+    }
+  });
+  (0, _react2.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;
+    var originalProps = compile(uiSchema['x-component-props']) || {};
+    var componentProps = (0, _shared.merge)(originalProps, field.componentProps || {});
+    field.componentProps = componentProps; // field.component = [component, componentProps];
+  }, [JSON.stringify(uiSchema)]);
+
+  if (!uiSchema) {
+    return null;
+  }
+
+  return /*#__PURE__*/_react2.default.createElement(component, props, props.children);
+};
+
+var CollectionField = (0, _react.connect)(function (props) {
+  var fieldSchema = (0, _react.useFieldSchema)();
+  return /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionFieldProvider, {
+    name: fieldSchema.name
+  }, /*#__PURE__*/_react2.default.createElement(InternalField, _objectSpread({}, props)));
+});
+var AssignedFieldValueType;
+exports.AssignedFieldValueType = AssignedFieldValueType;
+
+(function (AssignedFieldValueType) {
+  AssignedFieldValueType["ConstantValue"] = "constantValue";
+  AssignedFieldValueType["DynamicValue"] = "dynamicValue";
+})(AssignedFieldValueType || (exports.AssignedFieldValueType = AssignedFieldValueType = {}));
+
 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 = (0, _reactI18next.useTranslation)(),
       t = _useTranslation.t;
 
   var compile = (0, _schemaComponent.useCompile)();
   var field = (0, _react.useField)();
-  var fieldSchema = (0, _react.useFieldSchema)(); // const [type, setType] = useState<string>('constantValue');
+  var fieldSchema = (0, _react.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 = (0, _react2.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 = (0, _react2.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 = (0, _react2.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 = (0, _react2.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 = (0, _react2.useState)(initUserValue),
+      _useState8 = _slicedToArray(_useState7, 2),
+      userValue = _useState8[0],
+      setUserValue = _useState8[1];
+
+  var initValue = isDynamicValue ? '' : field.value;
+
+  var _useState9 = (0, _react2.useState)(initValue),
+      _useState10 = _slicedToArray(_useState9, 2),
+      value = _useState10[0],
+      setValue = _useState10[1];
+
+  var _useState11 = (0, _react2.useState)([]),
+      _useState12 = _slicedToArray(_useState11, 2),
+      options = _useState12[0],
+      setOptions = _useState12[1];
+
+  var _useCollection = (0, _collectionManager.useCollection)(),
+      getField = _useCollection.getField;
+
+  var collectionField = getField(fieldSchema.name);
+  var fields = (0, _collectionManager.useCollectionFilterOptions)(collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName);
+  var userFields = (0, _collectionManager.useCollectionFilterOptions)('users');
+  var dateTimeFields = ['createdAt', 'datetime', 'time', 'updatedAt'];
+  (0, _react2.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));
+  }, []);
+  (0, _react2.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]);
+  (0, _react2.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__*/_react2.default.createElement(_collectionManager.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__*/_react2.default.createElement(_antd.Space, null, /*#__PURE__*/_react2.default.createElement(_antd.Select, {
+    defaultValue: type,
+    value: type,
+    style: {
+      width: 150
+    },
+    onChange: typeChangeHandler
+  }, /*#__PURE__*/_react2.default.createElement(_antd.Select.Option, {
+    value: AssignedFieldValueType.ConstantValue
+  }, t('Constant value')), /*#__PURE__*/_react2.default.createElement(_antd.Select.Option, {
+    value: AssignedFieldValueType.DynamicValue
+  }, t('Dynamic value'))), type === AssignedFieldValueType.ConstantValue ? /*#__PURE__*/_react2.default.createElement(CollectionField, _objectSpread(_objectSpread({}, props), {}, {
+    value: value,
+    onChange: valueChangeHandler,
+    style: {
+      minWidth: 150
+    }
+  })) : /*#__PURE__*/_react2.default.createElement(_antd.Select, {
+    defaultValue: fieldType,
+    value: fieldType,
+    style: {
+      minWidth: 150
+    },
+    onChange: fieldTypeChangeHandler
+  }, options === null || options === void 0 ? void 0 : options.map(function (opt) {
+    return /*#__PURE__*/_react2.default.createElement(_antd.Select.Option, {
+      key: opt.name,
+      value: opt.name
+    }, opt.title);
+  })), fieldType === 'currentRecord' && /*#__PURE__*/_react2.default.createElement(_antd.Cascader, {
+    fieldNames: {
+      label: 'title',
+      value: 'name',
+      children: 'children'
+    },
+    style: {
+      minWidth: 150
+    },
+    options: compile(fields),
+    onChange: recordChangeHandler,
+    defaultValue: recordValue
+  }), fieldType === 'currentUser' && /*#__PURE__*/_react2.default.createElement(_antd.Cascader, {
+    fieldNames: {
+      label: 'title',
+      value: 'name',
+      children: 'children'
+    },
+    style: {
+      minWidth: 150
+    },
+    options: compile(userFields),
+    onChange: userChangeHandler,
+    defaultValue: userValue
+  }));
 };
 
 exports.AssignedField = AssignedField;

package/lib/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/lib/schema-initializer/items/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ViewActionInitializer = exports.UpdateSubmitActionInitializer = exports.UpdateActionInitializer = exports.TableSelectorInitializer = exports.TableCollectionFieldInitializer = exports.TableBlockInitializer = exports.TableActionColumnInitializer = exports.SubmitActionInitializer = exports.RecordReadPrettyFormBlockInitializer = exports.RecordReadPrettyAssociationFormBlockInitializer = exports.RecordFormBlockInitializer = exports.RecordAssociationFormBlockInitializer = exports.RecordAssociationDetailsBlockInitializer = exports.RecordAssociationCalendarBlockInitializer = exports.RecordAssociationBlockInitializer = exports.MarkdownBlockInitializer = exports.KanbanBlockInitializer = exports.InitializerWithSwitch = exports.G2PlotInitializer = exports.FormBlockInitializer = exports.FilterActionInitializer = exports.DetailsBlockInitializer = exports.DestroyActionInitializer = exports.DataBlockInitializer = exports.CustomizeActionInitializer = exports.CreateSubmitActionInitializer = exports.CreateFormBlockInitializer = exports.CreateActionInitializer = exports.CollectionFieldInitializer = exports.CalendarBlockInitializer = exports.BulkDestroyActionInitializer = exports.BlockInitializer = exports.ActionInitializer = void 0;
+exports.ViewActionInitializer = exports.UpdateSubmitActionInitializer = exports.UpdateActionInitializer = exports.TableSelectorInitializer = exports.TableCollectionFieldInitializer = exports.TableBlockInitializer = exports.TableActionColumnInitializer = exports.SubmitActionInitializer = exports.RefreshActionInitializer = exports.RecordReadPrettyFormBlockInitializer = exports.RecordReadPrettyAssociationFormBlockInitializer = exports.RecordFormBlockInitializer = exports.RecordAssociationFormBlockInitializer = exports.RecordAssociationDetailsBlockInitializer = exports.RecordAssociationCalendarBlockInitializer = exports.RecordAssociationBlockInitializer = exports.PrintActionInitializer = exports.MarkdownBlockInitializer = exports.KanbanBlockInitializer = exports.InitializerWithSwitch = exports.G2PlotInitializer = exports.FormBlockInitializer = exports.FilterActionInitializer = exports.DetailsBlockInitializer = exports.DestroyActionInitializer = exports.DataBlockInitializer = exports.CustomizeActionInitializer = exports.CreateSubmitActionInitializer = exports.CreateFormBlockInitializer = exports.CreateActionInitializer = exports.CollectionFieldInitializer = exports.CalendarBlockInitializer = exports.BulkDestroyActionInitializer = exports.BlockInitializer = exports.ActionInitializer = void 0;
 
 var _icons = require("@ant-design/icons");
 
@@ -471,9 +471,10 @@ 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,
@@ -770,6 +771,24 @@ var DestroyActionInitializer = function DestroyActionInitializer(props) {
 
 exports.DestroyActionInitializer = DestroyActionInitializer;
 
+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__*/_react2.default.createElement(ActionInitializer, _objectSpread(_objectSpread({}, props), {}, {
+    schema: schema
+  }));
+};
+
+exports.PrintActionInitializer = PrintActionInitializer;
+
 var BulkDestroyActionInitializer = function BulkDestroyActionInitializer(props) {
   var schema = {
     title: '{{ t("Delete") }}',
@@ -792,6 +811,24 @@ var BulkDestroyActionInitializer = function BulkDestroyActionInitializer(props)
 
 exports.BulkDestroyActionInitializer = BulkDestroyActionInitializer;
 
+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__*/_react2.default.createElement(ActionInitializer, _objectSpread(_objectSpread({}, props), {}, {
+    schema: schema
+  }));
+};
+
+exports.RefreshActionInitializer = RefreshActionInitializer;
+
 var SubmitActionInitializer = function SubmitActionInitializer(props) {
   var schema = {
     title: '{{ t("Submit") }}',
@@ -943,6 +980,7 @@ var RecordFormBlockInitializer = function RecordFormBlockInitializer(props) {
 
   var collection = (0, _collectionManager.useCollection)();
   var association = (0, _blockProvider.useBlockAssociationContext)();
+  console.log('RecordFormBlockInitializer', collection, association);
   return /*#__PURE__*/_react2.default.createElement(_SchemaInitializer.SchemaInitializer.Item, _objectSpread(_objectSpread({
     icon: /*#__PURE__*/_react2.default.createElement(_icons.FormOutlined, null)
   }, others), {}, {
@@ -1031,6 +1069,11 @@ var RecordReadPrettyFormBlockInitializer = function RecordReadPrettyFormBlockIni
 
   var collection = (0, _collectionManager.useCollection)();
   var association = (0, _blockProvider.useBlockAssociationContext)();
+
+  var _useBlockRequestConte = (0, _blockProvider.useBlockRequestContext)(),
+      block = _useBlockRequestConte.block;
+
+  var actionInitializers = block !== 'TableField' ? 'ReadPrettyFormActionInitializers' : null;
   return /*#__PURE__*/_react2.default.createElement(_SchemaInitializer.SchemaInitializer.Item, _objectSpread(_objectSpread({
     icon: /*#__PURE__*/_react2.default.createElement(_icons.FormOutlined, null)
   }, others), {}, {
@@ -1057,6 +1100,7 @@ var RecordReadPrettyFormBlockInitializer = function RecordReadPrettyFormBlockIni
 
                 if (item.template.componentName === 'ReadPrettyFormItem') {
                   blockSchema = (0, _utils.createReadPrettyFormBlockSchema)({
+                    actionInitializers: actionInitializers,
                     association: association,
                     collection: collection.name,
                     action: 'get',
@@ -1079,6 +1123,7 @@ var RecordReadPrettyFormBlockInitializer = function RecordReadPrettyFormBlockIni
 
               case 8:
                 insert((0, _utils.createReadPrettyFormBlockSchema)({
+                  actionInitializers: actionInitializers,
                   association: association,
                   collection: collection.name,
                   action: 'get',
@@ -1214,6 +1259,11 @@ var RecordReadPrettyAssociationFormBlockInitializer = function RecordReadPrettyA
   var field = item.field;
   var collection = field.target;
   var resource = "".concat(field.collectionName, ".").concat(field.name);
+
+  var _useBlockRequestConte2 = (0, _blockProvider.useBlockRequestContext)(),
+      block = _useBlockRequestConte2.block;
+
+  var actionInitializers = block !== 'TableField' ? 'ReadPrettyFormActionInitializers' : null;
   return /*#__PURE__*/_react2.default.createElement(_SchemaInitializer.SchemaInitializer.Item, _objectSpread(_objectSpread({
     icon: /*#__PURE__*/_react2.default.createElement(_icons.FormOutlined, null)
   }, others), {}, {
@@ -1239,6 +1289,7 @@ var RecordReadPrettyAssociationFormBlockInitializer = function RecordReadPrettyA
 
                 if (item.template.componentName === 'ReadPrettyFormItem') {
                   blockSchema = (0, _utils.createReadPrettyFormBlockSchema)({
+                    actionInitializers: actionInitializers,
                     collection: collection,
                     resource: resource,
                     association: resource,
@@ -1262,6 +1313,7 @@ var RecordReadPrettyAssociationFormBlockInitializer = function RecordReadPrettyA
 
               case 8:
                 insert((0, _utils.createReadPrettyFormBlockSchema)({
+                  actionInitializers: actionInitializers,
                   collection: collection,
                   resource: resource,
                   association: resource,

package/lib/schema-initializer/utils.js

@@ -300,8 +300,9 @@ var useAssociatedFormItemInitializerFields = function useAssociatedFormItemIniti
       _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;
 
@@ -318,7 +319,10 @@ var useAssociatedFormItemInitializerFields = function useAssociatedFormItemIniti
         // 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 });
@@ -429,11 +433,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);
+};
+
 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 = (0, _react.useFieldSchema)();
 
+  if (!((_fieldSchema = fieldSchema) === null || _fieldSchema === void 0 ? void 0 : _fieldSchema['x-initializer'])) {
+    var recursiveInitializerSchema = recursiveParent(fieldSchema);
+
+    if (recursiveInitializerSchema) {
+      fieldSchema = recursiveInitializerSchema;
+    }
+  }
+
   var _useDesignable = (0, _schemaComponent.useDesignable)(),
       _remove = _useDesignable.remove;
 

package/lib/system-settings/SystemSettingsShortcut.js

@@ -13,6 +13,8 @@ var _react = require("@formily/react");
 
 var _shared = require("@formily/shared");
 
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+
 var _react2 = _interopRequireWildcard(require("react"));
 
 var _reactI18next = require("react-i18next");
@@ -25,12 +27,12 @@ var _locale = _interopRequireDefault(require("../locale"));
 
 var _schemaComponent = require("../schema-component");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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); }
 
 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 _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."); }
@@ -110,6 +112,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) {
@@ -118,18 +123,28 @@ var useSaveSystemSettingsValues = function useSaveSystemSettingsValues() {
                 return form.submit();
 
               case 2:
-                setVisible(false);
+                values = (0, _cloneDeep.default)(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();
             }
@@ -177,14 +192,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(_2.i18n.t('Default'), ")");
+            }
+
+            return {
+              label: label,
+              value: item.value
+            };
+          });
+        }
       },
       allowSignUp: {
         type: 'boolean',