@nocobase/client 0.7.7-alpha.1 → 0.8.0-alpha.4

package/lib/schema-initializer/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useTableColumnInitializerFields = exports.useRemoveGridFormItem = exports.useRecordCollectionDataSourceItems = exports.useFormItemInitializerFields = exports.useCustomFormItemInitializerFields = exports.useCurrentSchema = exports.useCollectionDataSourceItems = exports.useAssociatedTableColumnInitializerFields = exports.useAssociatedFormItemInitializerFields = exports.removeTableColumn = exports.removeGridFormItem = exports.itemsMerge = exports.gridRowColWrap = exports.findTableColumn = exports.createTableSelectorSchema = exports.createTableBlockSchema = exports.createReadPrettyFormBlockSchema = exports.createKanbanBlockSchema = exports.createFormBlockSchema = exports.createDetailsBlockSchema = exports.createCalendarBlockSchema = void 0;
+exports.useTableColumnInitializerFields = exports.useRemoveGridFormItem = exports.useRecordCollectionDataSourceItems = exports.useFormItemInitializerFields = exports.useCustomFormItemInitializerFields = exports.useCustomBulkEditFormItemInitializerFields = exports.useCurrentSchema = exports.useCollectionDataSourceItems = exports.useAssociatedTableColumnInitializerFields = exports.useAssociatedFormItemInitializerFields = exports.removeTableColumn = exports.removeGridFormItem = exports.itemsMerge = exports.gridRowColWrap = exports.findTableColumn = exports.createTableSelectorSchema = exports.createTableBlockSchema = exports.createReadPrettyFormBlockSchema = exports.createKanbanBlockSchema = exports.createFormBlockSchema = exports.createDetailsBlockSchema = exports.createCalendarBlockSchema = void 0;
 
 var _react = require("@formily/react");
 
@@ -246,7 +246,7 @@ var useFormItemInitializerFields = function useFormItemInitializerFields(options
   return fields === null || fields === void 0 ? void 0 : (_fields$filter2 = fields.filter(function (field) {
     return field === null || field === void 0 ? void 0 : field.interface;
   })) === null || _fields$filter2 === void 0 ? void 0 : _fields$filter2.map(function (field) {
-    var _field$uiSchema3;
+    var _field$uiSchema3, _field$uiSchema4;
 
     var interfaceConfig = getInterface(field.interface);
     var schema = {
@@ -257,12 +257,13 @@ var useFormItemInitializerFields = function useFormItemInitializerFields(options
       'x-component': field.interface === 'o2m' ? 'TableField' : 'CollectionField',
       'x-decorator': 'FormItem',
       'x-collection-field': "".concat(name, ".").concat(field.name),
-      'x-component-props': {}
+      'x-component-props': {},
+      'x-read-pretty': field === null || field === void 0 ? void 0 : (_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : _field$uiSchema3['x-read-pretty']
     }; // interfaceConfig?.schemaInitialize?.(schema, { field, block: 'Form', readPretty: form.readPretty });
 
     return {
       type: 'item',
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : _field$uiSchema3.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema4 = field.uiSchema) === null || _field$uiSchema4 === void 0 ? void 0 : _field$uiSchema4.title) || field.name,
       component: 'CollectionFieldInitializer',
       remove: removeGridFormItem,
       schemaInitialize: function schemaInitialize(s) {
@@ -304,7 +305,7 @@ var useAssociatedFormItemInitializerFields = function useAssociatedFormItemIniti
   var groups = fields === null || fields === void 0 ? void 0 : (_fields$filter3 = fields.filter(function (field) {
     return interfaces.includes(field.interface);
   })) === null || _fields$filter3 === void 0 ? void 0 : _fields$filter3.map(function (field) {
-    var _subFields$filter2, _field$uiSchema4;
+    var _subFields$filter2, _field$uiSchema5;
 
     var subFields = getCollectionFields(field.target);
     var items = subFields === null || subFields === void 0 ? void 0 : (_subFields$filter2 = subFields.filter(function (subField) {
@@ -346,7 +347,7 @@ var useAssociatedFormItemInitializerFields = function useAssociatedFormItemIniti
     });
     return {
       type: 'subMenu',
-      title: (_field$uiSchema4 = field.uiSchema) === null || _field$uiSchema4 === void 0 ? void 0 : _field$uiSchema4.title,
+      title: (_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5.title,
       children: items
     };
   });
@@ -375,17 +376,17 @@ var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFi
 
   var remove = useRemoveGridFormItem();
   return fields === null || fields === void 0 ? void 0 : (_fields$filter4 = fields.filter(function (field) {
-    var _field$uiSchema5;
+    var _field$uiSchema6;
 
-    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5['x-read-pretty']);
+    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema6 = field.uiSchema) === null || _field$uiSchema6 === void 0 ? void 0 : _field$uiSchema6['x-read-pretty']);
   })) === null || _fields$filter4 === void 0 ? void 0 : _fields$filter4.map(function (field) {
-    var _field$uiSchema6, _field$uiSchema7;
+    var _field$uiSchema7, _field$uiSchema8;
 
     var interfaceConfig = getInterface(field.interface);
     var schema = {
       type: 'string',
       name: field.name,
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema6 = field.uiSchema) === null || _field$uiSchema6 === void 0 ? void 0 : _field$uiSchema6.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema7 = field.uiSchema) === null || _field$uiSchema7 === void 0 ? void 0 : _field$uiSchema7.title) || field.name,
       'x-designer': 'FormItem.Designer',
       'x-component': 'AssignedField',
       'x-decorator': 'FormItem',
@@ -393,7 +394,7 @@ var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFi
     };
     return {
       type: 'item',
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema7 = field.uiSchema) === null || _field$uiSchema7 === void 0 ? void 0 : _field$uiSchema7.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema8 = field.uiSchema) === null || _field$uiSchema8 === void 0 ? void 0 : _field$uiSchema8.title) || field.name,
       component: 'CollectionFieldInitializer',
       remove: remove,
       schemaInitialize: function schemaInitialize(s) {
@@ -412,6 +413,63 @@ var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFi
 
 exports.useCustomFormItemInitializerFields = useCustomFormItemInitializerFields;
 
+var useCustomBulkEditFormItemInitializerFields = function useCustomBulkEditFormItemInitializerFields(options) {
+  var _fields$filter5;
+
+  var _useCollection6 = (0, _collectionManager.useCollection)(),
+      name = _useCollection6.name,
+      fields = _useCollection6.fields;
+
+  var _useCollectionManager6 = (0, _collectionManager.useCollectionManager)(),
+      getInterface = _useCollectionManager6.getInterface;
+
+  var form = (0, _react.useForm)();
+
+  var _ref4 = options || {},
+      _ref4$readPretty = _ref4.readPretty,
+      readPretty = _ref4$readPretty === void 0 ? form.readPretty : _ref4$readPretty,
+      _ref4$block = _ref4.block,
+      block = _ref4$block === void 0 ? 'Form' : _ref4$block;
+
+  var remove = useRemoveGridFormItem();
+  return fields === null || fields === void 0 ? void 0 : (_fields$filter5 = fields.filter(function (field) {
+    var _field$uiSchema9;
+
+    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema9 = field.uiSchema) === null || _field$uiSchema9 === void 0 ? void 0 : _field$uiSchema9['x-read-pretty']);
+  })) === null || _fields$filter5 === void 0 ? void 0 : _fields$filter5.map(function (field) {
+    var _field$uiSchema10, _field$uiSchema11;
+
+    var interfaceConfig = getInterface(field.interface);
+    var schema = {
+      type: 'string',
+      name: field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema10 = field.uiSchema) === null || _field$uiSchema10 === void 0 ? void 0 : _field$uiSchema10.title) || field.name,
+      'x-designer': 'FormItem.Designer',
+      'x-component': 'BulkEditField',
+      'x-decorator': 'FormItem',
+      'x-collection-field': "".concat(name, ".").concat(field.name)
+    };
+    return {
+      type: 'item',
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema11 = field.uiSchema) === null || _field$uiSchema11 === void 0 ? void 0 : _field$uiSchema11.title) || field.name,
+      component: 'CollectionFieldInitializer',
+      remove: remove,
+      schemaInitialize: function schemaInitialize(s) {
+        var _interfaceConfig$sche6;
+
+        interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche6 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche6 === void 0 ? void 0 : _interfaceConfig$sche6.call(interfaceConfig, s, {
+          field: field,
+          block: block,
+          readPretty: readPretty
+        });
+      },
+      schema: schema
+    };
+  });
+};
+
+exports.useCustomBulkEditFormItemInitializerFields = useCustomBulkEditFormItemInitializerFields;
+
 var findSchema = function findSchema(schema, key, action) {
   if (!_react.Schema.isSchemaInstance(schema)) return null;
   return schema.reduceProperties(function (buf, s) {
@@ -544,8 +602,8 @@ var useCollectionDataSourceItems = function useCollectionDataSourceItems(compone
   var _useTranslation2 = (0, _reactI18next.useTranslation)(),
       t = _useTranslation2.t;
 
-  var _useCollectionManager6 = (0, _collectionManager.useCollectionManager)(),
-      collections = _useCollectionManager6.collections;
+  var _useCollectionManager7 = (0, _collectionManager.useCollectionManager)(),
+      collections = _useCollectionManager7.collections;
 
   var _useSchemaTemplateMan2 = (0, _schemaTemplates.useSchemaTemplateManager)(),
       getTemplatesByCollection = _useSchemaTemplateMan2.getTemplatesByCollection;

package/lib/schema-settings/SchemaSettings.d.ts

@@ -31,6 +31,7 @@ declare type SchemaSettingsNested = {
     Popup?: React.FC<MenuItemProps & {
         schema?: ISchema;
     }>;
+    SwitchItem?: React.FC<SwitchItemProps>;
     [key: string]: any;
 };
 interface SchemaSettingsProviderProps {
@@ -44,4 +45,9 @@ interface SchemaSettingsProviderProps {
 }
 export declare const SchemaSettingsProvider: React.FC<SchemaSettingsProviderProps>;
 export declare const SchemaSettings: React.FC<SchemaSettingsProps> & SchemaSettingsNested;
+interface SwitchItemProps extends Omit<MenuItemProps, 'onChange'> {
+    title: string;
+    checked?: boolean;
+    onChange?: (v: boolean) => void;
+}
 export {};

package/lib/schema-settings/SchemaSettings.js

@@ -581,6 +581,7 @@ SchemaSettings.Remove = function (props) {
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
   var ctx = (0, _BlockTemplate.useBlockTemplateContext)();
+  var form = (0, _react.useForm)();
   return /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, {
     onClick: function onClick() {
       _antd2.Modal.confirm(_objectSpread(_objectSpread({
@@ -603,6 +604,8 @@ SchemaSettings.Remove = function (props) {
           } else {
             dn.remove(null, options);
           }
+
+          delete form.values[fieldSchema.name];
         }
       }));
     }

package/lib/schema-templates/BlockTemplatePage.d.ts

@@ -1 +1,2 @@
 export declare const BlockTemplatePage: () => JSX.Element;
+export declare const BlockTemplatesPane: () => JSX.Element;

package/lib/schema-templates/BlockTemplatePage.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.BlockTemplatePage = void 0;
+exports.BlockTemplatesPane = exports.BlockTemplatePage = void 0;
 
 var _antd = require("antd");
 
@@ -39,4 +39,14 @@ var BlockTemplatePage = function BlockTemplatePage() {
   }))));
 };
 
-exports.BlockTemplatePage = BlockTemplatePage;
+exports.BlockTemplatePage = BlockTemplatePage;
+
+var BlockTemplatesPane = function BlockTemplatesPane() {
+  return /*#__PURE__*/_react.default.createElement(_collectionManager.CollectionManagerProvider, {
+    collections: [_uiSchemaTemplates.uiSchemaTemplatesCollection]
+  }, /*#__PURE__*/_react.default.createElement(_schemaComponent.SchemaComponent, {
+    schema: _uiSchemaTemplates2.uiSchemaTemplatesSchema
+  }));
+};
+
+exports.BlockTemplatesPane = BlockTemplatesPane;

package/lib/schema-templates/SchemaTemplateShortcut.js

@@ -26,7 +26,7 @@ var SchemaTemplateShortcut = function SchemaTemplateShortcut() {
     icon: /*#__PURE__*/_react.default.createElement(_icons.LayoutOutlined, null),
     title: t('Block templates'),
     onClick: function onClick() {
-      history.push('/admin/plugins/block-templates');
+      history.push('/admin/settings/block-templates/list');
     }
   });
 };

package/lib/system-settings/SystemSettingsShortcut.d.ts

@@ -1 +1,3 @@
+export declare const SystemSettingsPane: () => JSX.Element;
 export declare const SystemSettingsShortcut: () => JSX.Element;
+export declare const SystemSettingsShortcut2: () => JSX.Element;

package/lib/system-settings/SystemSettingsShortcut.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SystemSettingsShortcut = void 0;
+exports.SystemSettingsShortcut2 = exports.SystemSettingsShortcut = exports.SystemSettingsPane = void 0;
 
 var _icons = require("@ant-design/icons");
 
@@ -13,12 +13,16 @@ var _react = require("@formily/react");
 
 var _shared = require("@formily/shared");
 
+var _antd = require("antd");
+
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var _react2 = _interopRequireWildcard(require("react"));
 
 var _reactI18next = require("react-i18next");
 
+var _reactRouterDom = require("react-router-dom");
+
 var _ = require(".");
 
 var _2 = require("..");
@@ -109,6 +113,10 @@ var useSaveSystemSettingsValues = function useSaveSystemSettingsValues() {
       data = _useSystemSettings.data;
 
   var api = (0, _2.useAPIClient)();
+
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+      t = _useTranslation.t;
+
   return {
     run: function run() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
@@ -135,6 +143,8 @@ var useSaveSystemSettingsValues = function useSaveSystemSettingsValues() {
                 });
 
               case 6:
+                _antd.message.success(t('Saved successfully'));
+
                 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) {
@@ -144,7 +154,7 @@ var useSaveSystemSettingsValues = function useSaveSystemSettingsValues() {
                   setVisible(false);
                 }
 
-              case 8:
+              case 9:
               case "end":
                 return _context2.stop();
             }
@@ -228,13 +238,103 @@ var schema = {
         type: 'void',
         'x-component': 'Action.Drawer.Footer',
         properties: {
+          submit: {
+            title: 'Submit',
+            'x-component': 'Action',
+            'x-component-props': {
+              type: 'primary',
+              htmlType: 'submit',
+              useAction: '{{ useSaveSystemSettingsValues }}'
+            }
+          },
           cancel: {
             title: 'Cancel',
             'x-component': 'Action',
             'x-component-props': {
               useAction: '{{ useCloseAction }}'
             }
-          },
+          }
+        }
+      }
+    }
+  })
+};
+var schema2 = {
+  type: 'object',
+  properties: _defineProperty({}, (0, _shared.uid)(), {
+    'x-decorator': 'Form',
+    'x-decorator-props': {
+      useValues: '{{ useSystemSettingsValues }}'
+    },
+    'x-component': 'div',
+    type: 'void',
+    title: '{{t("System settings")}}',
+    properties: {
+      title: {
+        type: 'string',
+        title: "{{t('System title')}}",
+        'x-decorator': 'FormItem',
+        'x-component': 'Input',
+        required: true
+      },
+      logo: {
+        type: 'string',
+        title: "{{t('Logo')}}",
+        'x-decorator': 'FormItem',
+        'x-component': 'Upload.Attachment',
+        'x-component-props': {
+          action: 'attachments:upload',
+          multiple: false // accept: 'jpg,png'
+
+        }
+      },
+      enabledLanguages: {
+        type: 'array',
+        title: '{{t("Enabled languages")}}',
+        'x-component': 'Select',
+        'x-component-props': {
+          mode: 'multiple'
+        },
+        'x-decorator': 'FormItem',
+        enum: langs,
+        'x-reactions': function xReactions(field) {
+          field.dataSource = langs.map(function (item) {
+            var _field$value2;
+
+            var label = item.label;
+
+            if (((_field$value2 = field.value) === null || _field$value2 === void 0 ? void 0 : _field$value2[0]) === item.value) {
+              label += "(".concat(_2.i18n.t('Default'), ")");
+            }
+
+            return {
+              label: label,
+              value: item.value
+            };
+          });
+        }
+      },
+      allowSignUp: {
+        type: 'boolean',
+        default: true,
+        'x-content': '{{t("Allow sign up")}}',
+        'x-component': 'Checkbox',
+        'x-decorator': 'FormItem'
+      },
+      smsAuthEnabled: {
+        type: 'boolean',
+        default: false,
+        'x-content': '{{t("Enable SMS authentication")}}',
+        'x-component': 'Checkbox',
+        'x-decorator': 'FormItem'
+      },
+      footer1: {
+        type: 'void',
+        'x-component': 'ActionBar',
+        'x-component-props': {
+          layout: 'one-column'
+        },
+        properties: {
           submit: {
             title: 'Submit',
             'x-component': 'Action',
@@ -243,21 +343,59 @@ var schema = {
               htmlType: 'submit',
               useAction: '{{ useSaveSystemSettingsValues }}'
             }
-          }
+          } // cancel: {
+          //   title: 'Cancel',
+          //   'x-component': 'Action',
+          //   'x-component-props': {
+          //     useAction: '{{ useCloseAction }}',
+          //   },
+          // },
+
         }
       }
     }
   })
 };
 
+var SystemSettingsPane = function SystemSettingsPane() {
+  return /*#__PURE__*/_react2.default.createElement(_antd.Card, {
+    bordered: false
+  }, /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponent, {
+    scope: {
+      useSaveSystemSettingsValues: useSaveSystemSettingsValues,
+      useSystemSettingsValues: useSystemSettingsValues,
+      useCloseAction: useCloseAction
+    },
+    schema: schema2
+  }));
+};
+
+exports.SystemSettingsPane = SystemSettingsPane;
+
 var SystemSettingsShortcut = function SystemSettingsShortcut() {
+  var _useTranslation2 = (0, _reactI18next.useTranslation)(),
+      t = _useTranslation2.t;
+
+  var history = (0, _reactRouterDom.useHistory)();
+  return /*#__PURE__*/_react2.default.createElement(_2.PluginManager.Toolbar.Item, {
+    icon: /*#__PURE__*/_react2.default.createElement(_icons.SettingOutlined, null),
+    title: t('System settings'),
+    onClick: function onClick() {
+      history.push('/admin/settings/system-settings/system-settings');
+    }
+  });
+};
+
+exports.SystemSettingsShortcut = SystemSettingsShortcut;
+
+var SystemSettingsShortcut2 = function SystemSettingsShortcut2() {
   var _useState = (0, _react2.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
       setVisible = _useState2[1];
 
-  var _useTranslation = (0, _reactI18next.useTranslation)(),
-      t = _useTranslation.t;
+  var _useTranslation3 = (0, _reactI18next.useTranslation)(),
+      t = _useTranslation3.t;
 
   return /*#__PURE__*/_react2.default.createElement(_schemaComponent.ActionContext.Provider, {
     value: {
@@ -281,4 +419,4 @@ var SystemSettingsShortcut = function SystemSettingsShortcut() {
   }));
 };
 
-exports.SystemSettingsShortcut = SystemSettingsShortcut;
+exports.SystemSettingsShortcut2 = SystemSettingsShortcut2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.7.7-alpha.1",
+  "version": "0.8.0-alpha.4",
   "license": "Apache-2.0",
   "licenses": [
     {
@@ -19,8 +19,8 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/sdk": "0.7.7-alpha.1",
-    "@nocobase/utils": "0.7.7-alpha.1",
+    "@nocobase/sdk": "0.8.0-alpha.4",
+    "@nocobase/utils": "0.8.0-alpha.4",
     "ahooks": "^3.0.5",
     "antd": "~4.19.5",
     "axios": "^0.26.1",
@@ -43,6 +43,7 @@
     "react-quill": "^1.3.5",
     "react-router-dom": "^5.2.0",
     "react-to-print": "^2.14.7",
+    "solarlunar-es": "^1.0.9",
     "use-deep-compare-effect": "^1.8.1"
   },
   "peerDependencies": {
@@ -57,5 +58,5 @@
     "@types/marked": "^4.0.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "f82374e6f9daaf71ba63eaf156468ea7ddc042da"
+  "gitHead": "433f068ce4479a53f51d3ceac3f22b710e7bb13e"
 }