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

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/schema-settings/SchemaSettings.js

@@ -578,6 +578,8 @@ SchemaSettings.Remove = function (props) {
   var _useTranslation3 = (0, _reactI18next.useTranslation)(),
       t = _useTranslation3.t;
 
+  var field = (0, _react.useField)();
+  var fieldSchema = (0, _react.useFieldSchema)();
   var ctx = (0, _BlockTemplate.useBlockTemplateContext)();
   return /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, {
     onClick: function onClick() {
@@ -591,6 +593,11 @@ SchemaSettings.Remove = function (props) {
             breakRemoveOn: breakRemoveOn
           };
 
+          if (field && field.required) {
+            field.required = false;
+            fieldSchema['required'] = false;
+          }
+
           if (template && (ctx === null || ctx === void 0 ? void 0 : ctx.dn)) {
             ctx === null || ctx === void 0 ? void 0 : ctx.dn.remove(null, options);
           } else {

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',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.7.2-alpha.7",
+  "version": "0.7.4-alpha.4",
   "license": "Apache-2.0",
   "licenses": [
     {
@@ -19,14 +19,15 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/sdk": "0.7.2-alpha.7",
-    "@nocobase/utils": "0.7.2-alpha.7",
+    "@nocobase/sdk": "0.7.4-alpha.4",
+    "@nocobase/utils": "0.7.4-alpha.4",
     "ahooks": "^3.0.5",
     "antd": "~4.19.5",
     "axios": "^0.26.1",
     "classnames": "^2.3.1",
     "file-saver": "^2.0.5",
     "i18next": "^21.6.0",
+    "json-templates": "^4.2.0",
     "marked": "^4.0.12",
     "mathjs": "^10.6.0",
     "react-beautiful-dnd": "^13.1.0",
@@ -34,10 +35,12 @@
     "react-contenteditable": "^3.3.6",
     "react-drag-listview": "^0.1.9",
     "react-helmet": "^6.1.0",
+    "react-hotkeys-hook": "^3.4.7",
     "react-i18next": "^11.15.1",
     "react-image-lightbox": "^5.1.4",
     "react-quill": "^1.3.5",
     "react-router-dom": "^5.2.0",
+    "react-to-print": "^2.14.7",
     "use-deep-compare-effect": "^1.8.1"
   },
   "peerDependencies": {
@@ -52,5 +55,5 @@
     "@types/marked": "^4.0.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "c34194ae51395346b7cf1d1b6b5e127597d956ab"
+  "gitHead": "726c06b721b217a6aa5c1421b899d1315e552b57"
 }