@nocobase/plugin-theme-editor 0.11.1-alpha.2 → 0.11.1-alpha.4

package/lib/client/antd-token-previewer/locale/fr-FR.d.ts

@@ -0,0 +1,3 @@
+import type { Locale } from './interface';
+declare const locale: Locale;
+export default locale;

package/lib/client/antd-token-previewer/locale/fr-FR.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+const locale = {
+  _lang: 'fr-FR',
+  followPrimary: 'Suivre la couleur du branding',
+  reset: 'Réinitialiser',
+  next: 'Suivant',
+  groupView: 'Vue groupe',
+  fill: 'Remplir',
+  border: 'Bordure',
+  background: 'Arrière-plan',
+  text: 'Texte',
+  demo: {
+    overview: 'Aperçu',
+    components: 'Composants',
+    relatedTokens: 'Jetons associés'
+  }
+};
+var _default = locale;
+exports.default = _default;

package/lib/client/hooks/useThemeSettings.js

@@ -51,7 +51,6 @@ const useThemeSettings = () => {
 };
 exports.useThemeSettings = useThemeSettings;
 function Label() {
-  var _currentUser$data, _currentUser$data$dat, _systemSettings$data, _systemSettings$data$;
   const _useTranslation = (0, _locale.useTranslation)(),
     t = _useTranslation.t;
   const currentUser = (0, _client().useCurrentUserContext)();
@@ -105,11 +104,11 @@ function Label() {
     (0, _client2().error)(err);
     return null;
   }
-  if (!(currentUser !== null && currentUser !== void 0 && (_currentUser$data = currentUser.data) !== null && _currentUser$data !== void 0 && (_currentUser$data$dat = _currentUser$data.data) !== null && _currentUser$data$dat !== void 0 && _currentUser$data$dat.systemSettings)) {
+  if (!currentUser) {
     (0, _client2().error)('Please check if provide `CurrentUserProvider` in your app.');
     throw new Error('Please check if provide `CurrentUserProvider` in your app.');
   }
-  if (!(systemSettings !== null && systemSettings !== void 0 && (_systemSettings$data = systemSettings.data) !== null && _systemSettings$data !== void 0 && (_systemSettings$data$ = _systemSettings$data.data) !== null && _systemSettings$data$ !== void 0 && _systemSettings$data$.options)) {
+  if (!systemSettings) {
     (0, _client2().error)('Please check if provide `SystemSettingsProvider` in your app.');
     throw new Error('Please check if provide `SystemSettingsProvider` in your app.');
   }

package/lib/client/hooks/useUpdateThemeSettings.js

@@ -38,20 +38,21 @@ function useUpdateThemeSettings() {
   const systemSettings = (0, _client().useSystemSettings)();
   const updateUserThemeSettings = (0, _react().useCallback)( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(function* (themeId) {
-      if (themeId === currentUser.data.data.systemSettings.themeId) {
+      var _currentUser$data$dat;
+      if (themeId === ((_currentUser$data$dat = currentUser.data.data.systemSettings) === null || _currentUser$data$dat === void 0 ? void 0 : _currentUser$data$dat.themeId)) {
         return;
       }
       try {
         yield api.resource('users').updateProfile({
           values: {
-            systemSettings: _objectSpread(_objectSpread({}, currentUser.data.data.systemSettings), {}, {
+            systemSettings: _objectSpread(_objectSpread({}, currentUser.data.data.systemSettings || {}), {}, {
               themeId
             })
           }
         });
         currentUser.mutate({
           data: _objectSpread(_objectSpread({}, currentUser.data.data), {}, {
-            systemSettings: _objectSpread(_objectSpread({}, currentUser.data.data.systemSettings), {}, {
+            systemSettings: _objectSpread(_objectSpread({}, currentUser.data.data.systemSettings || {}), {}, {
               themeId
             })
           })
@@ -66,21 +67,22 @@ function useUpdateThemeSettings() {
   }(), [api, currentUser]);
   const updateSystemThemeSettings = (0, _react().useCallback)( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(function* (themeId) {
-      if (themeId === systemSettings.data.data.options.themeId) {
+      var _systemSettings$data$;
+      if (themeId === ((_systemSettings$data$ = systemSettings.data.data.options) === null || _systemSettings$data$ === void 0 ? void 0 : _systemSettings$data$.themeId)) {
         return;
       }
       yield api.request({
         url: 'systemSettings:update/1',
         method: 'post',
         data: {
-          options: _objectSpread(_objectSpread({}, systemSettings.data.data.options), {}, {
+          options: _objectSpread(_objectSpread({}, systemSettings.data.data.options || {}), {}, {
             themeId
           })
         }
       });
       systemSettings.mutate({
         data: _objectSpread(_objectSpread({}, systemSettings.data.data), {}, {
-          options: _objectSpread(_objectSpread({}, systemSettings.data.data.options), {}, {
+          options: _objectSpread(_objectSpread({}, systemSettings.data.data.options || {}), {}, {
             themeId
           })
         })

package/lib/locale/fr-FR.d.ts

@@ -0,0 +1,23 @@
+declare const locale: {
+    Theme: string;
+    Local: string;
+    'Dark theme': string;
+    Optional: string;
+    'Non-optional': string;
+    Current: string;
+    Default: string;
+    'Theme Editor': string;
+    Save: string;
+    Close: string;
+    Edit: string;
+    Export: string;
+    'edit Theme Config': string;
+    'The theme of the JSON format is incorrect': string;
+    'Edited successfully': string;
+    'Saved successfully': string;
+    'Initializing Editor...': string;
+    'Save theme': string;
+    'Please set a name for this theme': string;
+    'Please input the theme name': string;
+};
+export default locale;

package/lib/locale/fr-FR.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+const locale = {
+  Theme: 'Thème',
+  Local: 'Local',
+  'Dark theme': 'Thème sombre',
+  Optional: 'Optionnel',
+  'Non-optional': 'Non-optionnel',
+  Current: 'Actuel',
+  Default: 'Par défaut',
+  // 主题编辑器
+  'Theme Editor': 'Éditeur de thème',
+  Save: 'Enregistrer',
+  Close: 'Fermer',
+  Edit: 'Modifier',
+  Export: 'Exporter',
+  'edit Theme Config': 'Modifier la configuration du thème',
+  'The theme of the JSON format is incorrect': 'Le thème au format JSON est incorrect',
+  'Edited successfully': 'Modifié avec succès',
+  'Saved successfully': 'Enregistré avec succès',
+  'Initializing Editor...': "Initialisation de l'éditeur...",
+  'Save theme': 'Enregistrer le thème',
+  'Please set a name for this theme': 'Veuillez définir un nom pour ce thème',
+  'Please input the theme name': 'Veuillez saisir le nom du thème'
+};
+var _default = locale;
+exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-theme-editor",
-  "version": "0.11.1-alpha.2",
+  "version": "0.11.1-alpha.4",
   "main": "lib/server/index.js",
   "displayName": "Theme editor",
   "displayName.zh-CN": "主题编辑器",
@@ -21,14 +21,14 @@
     "@ant-design/cssinjs": "^1.11.1",
     "@ant-design/icons": "^5.1.4",
     "@emotion/css": "^11.11.2",
-    "@nocobase/client": "0.11.1-alpha.2",
-    "@nocobase/database": "0.11.1-alpha.2",
-    "@nocobase/server": "0.11.1-alpha.2",
-    "@nocobase/test": "0.11.1-alpha.2",
-    "@nocobase/utils": "0.11.1-alpha.2",
+    "@nocobase/client": "0.11.1-alpha.4",
+    "@nocobase/database": "0.11.1-alpha.4",
+    "@nocobase/server": "0.11.1-alpha.4",
+    "@nocobase/test": "0.11.1-alpha.4",
+    "@nocobase/utils": "0.11.1-alpha.4",
     "antd": "^5.6.4",
     "lodash": "4.17.21",
     "react": "^18.2.0"
   },
-  "gitHead": "8482aa720ea1c3abbbb9fe1208e73778bd63f1cf"
+  "gitHead": "d9b5bde913013f1057e1aab49587eb0ad3dcb06e"
 }

package/src/client/antd-token-previewer/locale/fr-FR.ts

@@ -0,0 +1,20 @@
+import type { Locale } from './interface';
+
+const locale: Locale = {
+  _lang: 'fr-FR',
+  followPrimary: 'Suivre la couleur du branding',
+  reset: 'Réinitialiser',
+  next: 'Suivant',
+  groupView: 'Vue groupe',
+  fill: 'Remplir',
+  border: 'Bordure',
+  background: 'Arrière-plan',
+  text: 'Texte',
+  demo: {
+    overview: 'Aperçu',
+    components: 'Composants',
+    relatedTokens: 'Jetons associés',
+  },
+};
+
+export default locale;

package/src/client/hooks/useThemeSettings.tsx

@@ -68,12 +68,12 @@ function Label() {
     return null;
   }
 
-  if (!currentUser?.data?.data?.systemSettings) {
+  if (!currentUser) {
     error('Please check if provide `CurrentUserProvider` in your app.');
     throw new Error('Please check if provide `CurrentUserProvider` in your app.');
   }
 
-  if (!systemSettings?.data?.data?.options) {
+  if (!systemSettings) {
     error('Please check if provide `SystemSettingsProvider` in your app.');
     throw new Error('Please check if provide `SystemSettingsProvider` in your app.');
   }

package/src/client/hooks/useUpdateThemeSettings.tsx

@@ -9,14 +9,14 @@ export function useUpdateThemeSettings() {
 
   const updateUserThemeSettings = useCallback(
     async (themeId: number | null) => {
-      if (themeId === currentUser.data.data.systemSettings.themeId) {
+      if (themeId === currentUser.data.data.systemSettings?.themeId) {
         return;
       }
       try {
         await api.resource('users').updateProfile({
           values: {
             systemSettings: {
-              ...currentUser.data.data.systemSettings,
+              ...(currentUser.data.data.systemSettings || {}),
               themeId,
             },
           },
@@ -25,7 +25,7 @@ export function useUpdateThemeSettings() {
           data: {
             ...currentUser.data.data,
             systemSettings: {
-              ...currentUser.data.data.systemSettings,
+              ...(currentUser.data.data.systemSettings || {}),
               themeId,
             },
           },
@@ -39,7 +39,7 @@ export function useUpdateThemeSettings() {
 
   const updateSystemThemeSettings = useCallback(
     async (themeId: number | null) => {
-      if (themeId === systemSettings.data.data.options.themeId) {
+      if (themeId === systemSettings.data.data.options?.themeId) {
         return;
       }
       await api.request({
@@ -47,7 +47,7 @@ export function useUpdateThemeSettings() {
         method: 'post',
         data: {
           options: {
-            ...systemSettings.data.data.options,
+            ...(systemSettings.data.data.options || {}),
             themeId,
           },
         },
@@ -56,7 +56,7 @@ export function useUpdateThemeSettings() {
         data: {
           ...systemSettings.data.data,
           options: {
-            ...systemSettings.data.data.options,
+            ...(systemSettings.data.data.options || {}),
             themeId,
           },
         },

package/src/locale/fr-FR.ts

@@ -0,0 +1,26 @@
+const locale = {
+  Theme: 'Thème',
+  Local: 'Local',
+  'Dark theme': 'Thème sombre',
+  Optional: 'Optionnel',
+  'Non-optional': 'Non-optionnel',
+  Current: 'Actuel',
+  Default: 'Par défaut',
+
+  // 主题编辑器
+  'Theme Editor': 'Éditeur de thème',
+  Save: 'Enregistrer',
+  Close: 'Fermer',
+  Edit: 'Modifier',
+  Export: 'Exporter',
+  'edit Theme Config': 'Modifier la configuration du thème',
+  'The theme of the JSON format is incorrect': 'Le thème au format JSON est incorrect',
+  'Edited successfully': 'Modifié avec succès',
+  'Saved successfully': 'Enregistré avec succès',
+  'Initializing Editor...': "Initialisation de l'éditeur...",
+  'Save theme': 'Enregistrer le thème',
+  'Please set a name for this theme': 'Veuillez définir un nom pour ce thème',
+  'Please input the theme name': 'Veuillez saisir le nom du thème',
+};
+
+export default locale;