From d92f3dc5194265cff0b0b1c83018f922247fc10e Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Sat, 1 Sep 2018 17:48:54 +0800
Subject: [PATCH] defaultSetting => defaultSettings

---
 config/config.js                              | 4 ++--
 src/{defaultSetting.js => defaultSettings.js} | 0
 src/locales/en-US.js                          | 5 +++--
 src/locales/zh-CN.js                          | 5 +++--
 src/models/setting.js                         | 8 ++++----
 5 files changed, 12 insertions(+), 10 deletions(-)
 rename src/{defaultSetting.js => defaultSettings.js} (100%)

diff --git a/config/config.js b/config/config.js
index c796308c..fab44a84 100644
--- a/config/config.js
+++ b/config/config.js
@@ -2,7 +2,7 @@
 const os = require('os');
 const pageRoutes = require('./router.config');
 const webpackplugin = require('./plugin.config');
-const defaultSetting = require('../src/defaultSetting');
+const defaultSettings = require('../src/defaultSettings');
 
 export default {
   // add for transfer to umi
@@ -35,7 +35,7 @@ export default {
   // Theme for antd
   // https://ant.design/docs/react/customize-theme-cn
   theme: {
-    'primary-color': defaultSetting.primaryColor,
+    'primary-color': defaultSettings.primaryColor,
   },
   externals: {
     '@antv/data-set': 'DataSet',
diff --git a/src/defaultSetting.js b/src/defaultSettings.js
similarity index 100%
rename from src/defaultSetting.js
rename to src/defaultSettings.js
diff --git a/src/locales/en-US.js b/src/locales/en-US.js
index 2a7e29c3..af8273c6 100644
--- a/src/locales/en-US.js
+++ b/src/locales/en-US.js
@@ -167,6 +167,7 @@ export default {
   'app.setting.othersettings': 'Other Settings',
   'app.setting.weakmode': 'Weak Mode',
   'app.setting.copy': 'Copy Setting',
-  'app.setting.copyinfo': 'copy success，please replace defaultSetting in src/models/setting.js',
-  'app.setting.production.hint': 'Setting panel show in development enviorment only, please modify src/defaultSetting.js mannually.',
+  'app.setting.copyinfo': 'copy success，please replace defaultSettings in src/models/setting.js',
+  'app.setting.production.hint':
+    'Setting panel show in development enviorment only, please modify src/defaultSettings.js mannually.',
 };
diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js
index d1593443..6b6ec550 100644
--- a/src/locales/zh-CN.js
+++ b/src/locales/zh-CN.js
@@ -163,6 +163,7 @@ export default {
   'app.setting.othersettings': '其他设置',
   'app.setting.weakmode': '色弱模式',
   'app.setting.copy': '拷贝设置',
-  'app.setting.copyinfo': '拷贝成功，请到 src/defaultSetting.js 中替换默认配置',
-  'app.setting.production.hint': '配置栏只在开发环境用于预览，请拷贝后手动修改 src/defaultSetting.js',
+  'app.setting.copyinfo': '拷贝成功，请到 src/defaultSettings.js 中替换默认配置',
+  'app.setting.production.hint':
+    '配置栏只在开发环境用于预览，请拷贝后手动修改 src/defaultSettings.js',
 };
diff --git a/src/models/setting.js b/src/models/setting.js
index 3f6c2a07..106c2369 100644
--- a/src/models/setting.js
+++ b/src/models/setting.js
@@ -1,5 +1,5 @@
 import { message } from 'antd';
-import defaultSetting from '../defaultSetting';
+import defaultSettings from '../defaultSettings';
 
 let lessNodesAppended;
 const updateTheme = primaryColor => {
@@ -64,7 +64,7 @@ const updateColorWeak = colorWeak => {
 
 export default {
   namespace: 'setting',
-  state: defaultSetting,
+  state: defaultSettings,
   reducers: {
     getSetting(state) {
       const setting = {};
@@ -87,7 +87,7 @@ export default {
     },
     changeSetting(state, { payload }) {
       const urlParams = new URL(window.location.href);
-      Object.keys(defaultSetting).forEach(key => {
+      Object.keys(defaultSettings).forEach(key => {
         if (urlParams.searchParams.has(key)) {
           urlParams.searchParams.delete(key);
         }
@@ -100,7 +100,7 @@ export default {
         if (value === true) {
           value = 1;
         }
-        if (defaultSetting[key] !== value) {
+        if (defaultSettings[key] !== value) {
           urlParams.searchParams.set(key, value);
         }
       });
-- 
GitLab