@nocobase/client 0.7.6-alpha.2 → 0.8.0-alpha.10

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.6-alpha.2",
+  "version": "0.8.0-alpha.10",
   "license": "Apache-2.0",
   "licenses": [
     {
@@ -19,12 +19,13 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/sdk": "0.7.6-alpha.2",
-    "@nocobase/utils": "0.7.6-alpha.2",
+    "@nocobase/sdk": "0.8.0-alpha.10",
+    "@nocobase/utils": "0.8.0-alpha.10",
     "ahooks": "^3.0.5",
     "antd": "~4.19.5",
     "axios": "^0.26.1",
     "classnames": "^2.3.1",
+    "cron-parser": "^4.6.0",
     "cronstrue": "^2.11.0",
     "file-saver": "^2.0.5",
     "i18next": "^21.6.0",
@@ -43,6 +44,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 +59,5 @@
     "@types/marked": "^4.0.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "2cfccff9d3ff14c521bf317fa7ee4efa18444c92"
+  "gitHead": "a9723cdeadc764eba634b5815685177679025c83"
 }