From 94cd90e22facb0e75a6e255ce125aa4ea6aca260 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 10 十二月 2021 15:20:44 +0800
Subject: [PATCH] 2021-12-10
---
src/components/tabview/index.jsx | 3 -
src/pc/components/navbar/normal-navbar/index.jsx | 3 -
src/pc/transfer/index.jsx | 8 --
src/mob/components/navbar/normal-navbar/index.jsx | 3 -
src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx | 5 -
src/menu/components/timeline/normal-timeline/index.jsx | 3 -
src/menu/components/card/table-card/index.jsx | 3 -
src/mob/components/tabs/antv-tabs/index.jsx | 3 -
src/menu/padcontroller/index.jsx | 3 -
src/tabviews/zshare/chartcomponent/index.jsx | 3 -
src/tabviews/custom/components/table/edit-table/index.jsx | 3 -
src/tabviews/zshare/actionList/index.jsx | 6 -
src/menu/components/tree/antd-tree/index.jsx | 3 -
src/tabviews/iframe/index.jsx | 5 -
src/views/design/sidemenu/index.jsx | 3 -
src/locales/en-US/main.js | 1
src/mob/searchconfig/groupform/index.jsx | 1
src/menu/stylecombcontroller/index.jsx | 3 -
src/menu/bgcontroller/index.jsx | 3 -
src/menu/components/carousel/data-card/index.jsx | 3 -
src/menu/components/card/balcony/index.jsx | 3 -
src/pc/transfer/settingform/index.jsx | 1
src/locales/zh-CN/main.js | 1
src/pc/bgcontroller/index.jsx | 3 -
src/menu/stylecontroller/index.jsx | 3 -
src/tabviews/rolemanage/index.jsx | 3 -
src/pc/components/login/normal-login/loginform.jsx | 1
src/mob/components/menubar/normal-menubar/index.jsx | 3 -
src/tabviews/custom/components/table/normal-table/index.jsx | 3 -
src/menu/components/carousel/prop-card/index.jsx | 3 -
src/tabviews/zshare/topSearch/dategroup/yearpicker/index.jsx | 1
src/menu/components/card/data-card/index.jsx | 3 -
src/pc/components/login/normal-login/index.jsx | 7 -
src/components/breadview/index.jsx | 3 -
src/tabviews/zshare/mutilform/index.jsx | 1
src/mob/searchconfig/settingform/index.jsx | 1
src/tabviews/zshare/topSearch/dategroup/quarterpicker/index.jsx | 1
src/mob/components/topbar/normal-navbar/index.jsx | 3 -
src/components/404/index.jsx | 8 --
src/menu/components/editor/braft-editor/index.jsx | 3 -
src/menu/components/share/clockcomponent/index.jsx | 3 -
src/components/sidemenu/index.jsx | 3 -
src/menu/components/card/prop-card/index.jsx | 3 -
src/menu/components/table/normal-table/index.jsx | 3 -
src/menu/components/tabs/antv-tabs/index.jsx | 3 -
src/menu/components/group/normal-group/index.jsx | 3 -
46 files changed, 8 insertions(+), 133 deletions(-)
diff --git a/src/components/404/index.jsx b/src/components/404/index.jsx
index 4f3ac7d..3177018 100644
--- a/src/components/404/index.jsx
+++ b/src/components/404/index.jsx
@@ -1,10 +1,6 @@
-import React, {Component} from 'react'
+import React, { Component } from 'react'
import Lostsvg from '@/components/lostsvg'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import './index.scss'
-
-const _dict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
class NotFound extends Component {
render () {
@@ -15,7 +11,7 @@
<Lostsvg />
</div>
<div className="ant-result-title">404</div>
- <div className="ant-result-subtitle">{this.props.msg ? this.props.msg : _dict['main.view.notFound']}</div>
+ <div className="ant-result-subtitle">{this.props.msg ? this.props.msg : '鎶辨瓑锛屾偍璁块棶鐨勯〉闈笉瀛樺湪锛岃鑱旂郴绠＄悊鍛樸��'}</div>
</div>
</main>
)
diff --git a/src/components/breadview/index.jsx b/src/components/breadview/index.jsx
index a772bb6..81c67b9 100644
--- a/src/components/breadview/index.jsx
+++ b/src/components/breadview/index.jsx
@@ -7,8 +7,6 @@
import asyncComponent from '@/utils/asyncLoadComponent'
import NotFount from '@/components/404'
import options from '@/store/options.js'
-import mzhCN from '@/locales/zh-CN/main.js'
-import menUS from '@/locales/en-US/main.js'
import MKEmitter from '@/utils/events.js'
import { initActionPermission } from '@/store/action'
import Api from '@/api'
@@ -34,7 +32,6 @@
class BreadView extends Component {
state = {
tabview: null, // 鏍囩
- dict: sessionStorage.getItem('lang') !== 'en-US' ? mzhCN : menUS,
hasNavBar: window.GLOB.navBar === 'linkage_navigation'
}
diff --git a/src/components/sidemenu/index.jsx b/src/components/sidemenu/index.jsx
index fcbc8f2..779ba7c 100644
--- a/src/components/sidemenu/index.jsx
+++ b/src/components/sidemenu/index.jsx
@@ -5,8 +5,6 @@
import { Menu, Icon } from 'antd'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import './index.scss'
const { SubMenu } = Menu
@@ -17,7 +15,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
subMenulist: [], // 浜岀骇鑿滃崟
rootSubmenuKeys: null,
openKeys: null,
diff --git a/src/components/tabview/index.jsx b/src/components/tabview/index.jsx
index 199b2a6..58f4ffa 100644
--- a/src/components/tabview/index.jsx
+++ b/src/components/tabview/index.jsx
@@ -10,8 +10,6 @@
import asyncComponent from '@/utils/asyncLoadComponent'
import NotFount from '@/components/404'
import options from '@/store/options.js'
-import mzhCN from '@/locales/zh-CN/main.js'
-import menUS from '@/locales/en-US/main.js'
import MKEmitter from '@/utils/events.js'
import Api from '@/api'
import './index.scss'
@@ -45,7 +43,6 @@
activeId: '',
tabviews: null, // 鏍囩闆�
iFrameHeight: 0,
- dict: sessionStorage.getItem('lang') !== 'en-US' ? mzhCN : menUS,
}
// 鍏抽棴tab椤碉紝閲嶆柊閫夋嫨鏄剧ず椤�
diff --git a/src/locales/en-US/main.js b/src/locales/en-US/main.js
index 56ae0f9..e9b8e2f 100644
--- a/src/locales/en-US/main.js
+++ b/src/locales/en-US/main.js
@@ -46,7 +46,6 @@
'main.form.link.error': '鑱斿姩鑿滃崟璁剧疆閿欒锛�',
'main.form.picture.check': '鏌ョ湅鍥剧墖',
'main.role.title': 'The role list',
- 'main.view.notFound': '鎶辨瓑锛屾偍璁块棶鐨勯〉闈笉瀛樺湪锛岃鑱旂郴绠＄悊鍛樸��',
'form.required.input': 'Please enter the ',
'form.required.select': 'Please select a '
}
\ No newline at end of file
diff --git a/src/locales/zh-CN/main.js b/src/locales/zh-CN/main.js
index f2404cb..ca4522e 100644
--- a/src/locales/zh-CN/main.js
+++ b/src/locales/zh-CN/main.js
@@ -46,7 +46,6 @@
'main.form.link.error': '鑱斿姩鑿滃崟璁剧疆閿欒锛�',
'main.form.picture.check': '鏌ョ湅鍥剧墖',
'main.role.title': '瑙掕壊鍒楄〃',
- 'main.view.notFound': '鎶辨瓑锛屾偍璁块棶鐨勯〉闈笉瀛樺湪锛岃鑱旂郴绠＄悊鍛樸��',
'form.required.input': '璇疯緭鍏�',
'form.required.select': '璇烽�夋嫨'
}
\ No newline at end of file
diff --git a/src/menu/bgcontroller/index.jsx b/src/menu/bgcontroller/index.jsx
index 7018a0c..ef3cdd6 100644
--- a/src/menu/bgcontroller/index.jsx
+++ b/src/menu/bgcontroller/index.jsx
@@ -3,8 +3,6 @@
import { is, fromJS } from 'immutable'
import { Form, Select } from 'antd'
-import zhCN from '@/locales/zh-CN/mob.js'
-import enUS from '@/locales/en-US/mob.js'
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
@@ -19,7 +17,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
backgroundColor: '',
backgroundImage: '',
backgroundSize: '',
diff --git a/src/menu/components/card/balcony/index.jsx b/src/menu/components/card/balcony/index.jsx
index bd38d08..705871a 100644
--- a/src/menu/components/card/balcony/index.jsx
+++ b/src/menu/components/card/balcony/index.jsx
@@ -9,8 +9,6 @@
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from './options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
@@ -29,7 +27,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
diff --git a/src/menu/components/card/data-card/index.jsx b/src/menu/components/card/data-card/index.jsx
index 236ce8a..1a44355 100644
--- a/src/menu/components/card/data-card/index.jsx
+++ b/src/menu/components/card/data-card/index.jsx
@@ -9,8 +9,6 @@
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from './options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
@@ -34,7 +32,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
appType: sessionStorage.getItem('appType'),
back: false
diff --git a/src/menu/components/card/prop-card/index.jsx b/src/menu/components/card/prop-card/index.jsx
index 9ece805..dcd3eac 100644
--- a/src/menu/components/card/prop-card/index.jsx
+++ b/src/menu/components/card/prop-card/index.jsx
@@ -9,8 +9,6 @@
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from '../data-card/options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
@@ -33,7 +31,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
card: null,
back: false
diff --git a/src/menu/components/card/table-card/index.jsx b/src/menu/components/card/table-card/index.jsx
index aa04e92..75c8138 100644
--- a/src/menu/components/card/table-card/index.jsx
+++ b/src/menu/components/card/table-card/index.jsx
@@ -9,8 +9,6 @@
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from '../data-card/options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
@@ -34,7 +32,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
appType: sessionStorage.getItem('appType'),
back: false
diff --git a/src/menu/components/carousel/data-card/index.jsx b/src/menu/components/carousel/data-card/index.jsx
index 2144877..432596e 100644
--- a/src/menu/components/carousel/data-card/index.jsx
+++ b/src/menu/components/carousel/data-card/index.jsx
@@ -9,8 +9,6 @@
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from './options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
@@ -30,7 +28,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
card: null,
back: false
diff --git a/src/menu/components/carousel/prop-card/index.jsx b/src/menu/components/carousel/prop-card/index.jsx
index dd686fb..feb97d1 100644
--- a/src/menu/components/carousel/prop-card/index.jsx
+++ b/src/menu/components/carousel/prop-card/index.jsx
@@ -9,8 +9,6 @@
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from '../data-card/options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
@@ -31,7 +29,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
card: null,
back: false
diff --git a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
index a4d79f5..c07b6f2 100644
--- a/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-pie/chartcompile/formconfig.jsx
@@ -1,8 +1,3 @@
-// import zhCN from '@/locales/zh-CN/model.js'
-// import enUS from '@/locales/en-US/model.js'
-
-// const Formdict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
-
/**
* @description 鑾峰彇鍥捐〃瑙嗗浘閰嶇疆琛ㄥ崟
* @param {object} card // 鍥捐〃瀵硅薄
diff --git a/src/menu/components/editor/braft-editor/index.jsx b/src/menu/components/editor/braft-editor/index.jsx
index 85c223b..1800a22 100644
--- a/src/menu/components/editor/braft-editor/index.jsx
+++ b/src/menu/components/editor/braft-editor/index.jsx
@@ -7,8 +7,6 @@
import asyncIconComponent from '@/utils/asyncIconComponent'
import getWrapForm from './options'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
@@ -28,7 +26,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
diff --git a/src/menu/components/group/normal-group/index.jsx b/src/menu/components/group/normal-group/index.jsx
index 41dc6ed..e5fc975 100644
--- a/src/menu/components/group/normal-group/index.jsx
+++ b/src/menu/components/group/normal-group/index.jsx
@@ -8,8 +8,6 @@
import asyncIconComponent from '@/utils/asyncIconComponent'
import { resetStyle } from '@/utils/utils-custom.js'
import getSettingForm from './options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
@@ -25,7 +23,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
group: null,
editab: null,
}
diff --git a/src/menu/components/share/clockcomponent/index.jsx b/src/menu/components/share/clockcomponent/index.jsx
index c73e5ab..ee53e1a 100644
--- a/src/menu/components/share/clockcomponent/index.jsx
+++ b/src/menu/components/share/clockcomponent/index.jsx
@@ -3,8 +3,6 @@
import { is, fromJS } from 'immutable'
import { Icon, Modal } from 'antd'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import ClockForm from './settingform'
import './index.scss'
@@ -14,7 +12,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
visible: false
}
diff --git a/src/menu/components/table/normal-table/index.jsx b/src/menu/components/table/normal-table/index.jsx
index 2aaef69..85c8445 100644
--- a/src/menu/components/table/normal-table/index.jsx
+++ b/src/menu/components/table/normal-table/index.jsx
@@ -9,8 +9,6 @@
import MKEmitter from '@/utils/events.js'
import getWrapForm from './options'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
@@ -33,7 +31,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
card: null,
back: false
diff --git a/src/menu/components/tabs/antv-tabs/index.jsx b/src/menu/components/tabs/antv-tabs/index.jsx
index ffa7b25..6bf696c 100644
--- a/src/menu/components/tabs/antv-tabs/index.jsx
+++ b/src/menu/components/tabs/antv-tabs/index.jsx
@@ -11,8 +11,6 @@
import MenuUtils from '@/utils/utils-custom.js'
import Utils from '@/utils/utils.js'
import { getTabForm, getTabsSetForm } from './options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
@@ -31,7 +29,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
tabs: null,
editab: null,
diff --git a/src/menu/components/timeline/normal-timeline/index.jsx b/src/menu/components/timeline/normal-timeline/index.jsx
index 441a556..d7a3a57 100644
--- a/src/menu/components/timeline/normal-timeline/index.jsx
+++ b/src/menu/components/timeline/normal-timeline/index.jsx
@@ -9,8 +9,6 @@
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from './options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
@@ -28,7 +26,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
diff --git a/src/menu/components/tree/antd-tree/index.jsx b/src/menu/components/tree/antd-tree/index.jsx
index 06040f1..e2dca19 100644
--- a/src/menu/components/tree/antd-tree/index.jsx
+++ b/src/menu/components/tree/antd-tree/index.jsx
@@ -8,8 +8,6 @@
import { resetStyle } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
import getWrapForm from './options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
@@ -30,7 +28,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
diff --git a/src/menu/padcontroller/index.jsx b/src/menu/padcontroller/index.jsx
index 8bca837..1b2c41b 100644
--- a/src/menu/padcontroller/index.jsx
+++ b/src/menu/padcontroller/index.jsx
@@ -3,8 +3,6 @@
import { is, fromJS } from 'immutable'
import { Form, Col, Icon } from 'antd'
-import zhCN from '@/locales/zh-CN/mob.js'
-import enUS from '@/locales/en-US/mob.js'
import StyleInput from '../stylecontroller/styleInput'
import './index.scss'
@@ -15,7 +13,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
paddingTop: '',
paddingBottom: '',
paddingLeft: '',
diff --git a/src/menu/stylecombcontroller/index.jsx b/src/menu/stylecombcontroller/index.jsx
index 6a9d18a..f7b3ffa 100644
--- a/src/menu/stylecombcontroller/index.jsx
+++ b/src/menu/stylecombcontroller/index.jsx
@@ -4,8 +4,6 @@
import { Collapse, Form, Col, Icon, InputNumber, Select, Radio, Drawer, Button } from 'antd'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/mob.js'
-import enUS from '@/locales/en-US/mob.js'
import ColorSketch from '@/mob/colorsketch'
import StyleInput from './styleInput'
import './index.scss'
@@ -20,7 +18,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
options: [],
style: {},
borposition: 'outer'
diff --git a/src/menu/stylecontroller/index.jsx b/src/menu/stylecontroller/index.jsx
index d1c5585..046b8ed 100644
--- a/src/menu/stylecontroller/index.jsx
+++ b/src/menu/stylecontroller/index.jsx
@@ -4,8 +4,6 @@
import { Collapse, Form, Col, Icon, InputNumber, Select, Radio, Drawer, Button } from 'antd'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/mob.js'
-import enUS from '@/locales/en-US/mob.js'
import asyncComponent from '@/utils/asyncComponent'
import StyleInput from './styleInput'
import './index.scss'
@@ -22,7 +20,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
comIds: [],
backgroundImage: '',
diff --git a/src/mob/components/menubar/normal-menubar/index.jsx b/src/mob/components/menubar/normal-menubar/index.jsx
index 43d1e85..2ad9a87 100644
--- a/src/mob/components/menubar/normal-menubar/index.jsx
+++ b/src/mob/components/menubar/normal-menubar/index.jsx
@@ -9,8 +9,6 @@
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from './options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
@@ -31,7 +29,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
diff --git a/src/mob/components/navbar/normal-navbar/index.jsx b/src/mob/components/navbar/normal-navbar/index.jsx
index 21cf498..d80c2fc 100644
--- a/src/mob/components/navbar/normal-navbar/index.jsx
+++ b/src/mob/components/navbar/normal-navbar/index.jsx
@@ -6,8 +6,6 @@
import asyncIconComponent from '@/utils/asyncIconComponent'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import getWrapForm from './options'
import './index.scss'
@@ -23,7 +21,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
diff --git a/src/mob/components/tabs/antv-tabs/index.jsx b/src/mob/components/tabs/antv-tabs/index.jsx
index 4d9f345..87c3979 100644
--- a/src/mob/components/tabs/antv-tabs/index.jsx
+++ b/src/mob/components/tabs/antv-tabs/index.jsx
@@ -11,8 +11,6 @@
import MenuUtils from '@/utils/utils-custom.js'
import Utils from '@/utils/utils.js'
import { getTabForm, getTabsSetForm } from './options'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
@@ -31,7 +29,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
tabs: null,
editab: null,
diff --git a/src/mob/components/topbar/normal-navbar/index.jsx b/src/mob/components/topbar/normal-navbar/index.jsx
index fc6c79b..a6d7bc0 100644
--- a/src/mob/components/topbar/normal-navbar/index.jsx
+++ b/src/mob/components/topbar/normal-navbar/index.jsx
@@ -7,8 +7,6 @@
import asyncIconComponent from '@/utils/asyncIconComponent'
import getWrapForm from './options'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import './index.scss'
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
@@ -22,7 +20,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
diff --git a/src/mob/searchconfig/groupform/index.jsx b/src/mob/searchconfig/groupform/index.jsx
index 44598bc..635893c 100644
--- a/src/mob/searchconfig/groupform/index.jsx
+++ b/src/mob/searchconfig/groupform/index.jsx
@@ -9,7 +9,6 @@
class SettingForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
config: PropTypes.object, // 琛ㄥ崟閰嶇疆淇℃伅
inputSubmit: PropTypes.any // 鍥炶溅鎻愪氦浜嬩欢
}
diff --git a/src/mob/searchconfig/settingform/index.jsx b/src/mob/searchconfig/settingform/index.jsx
index 7f27665..52653f6 100644
--- a/src/mob/searchconfig/settingform/index.jsx
+++ b/src/mob/searchconfig/settingform/index.jsx
@@ -7,7 +7,6 @@
class SettingForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
config: PropTypes.object, // 琛ㄥ崟閰嶇疆淇℃伅
inputSubmit: PropTypes.any // 鍥炶溅鎻愪氦浜嬩欢
}
diff --git a/src/pc/bgcontroller/index.jsx b/src/pc/bgcontroller/index.jsx
index b77b775..717c932 100644
--- a/src/pc/bgcontroller/index.jsx
+++ b/src/pc/bgcontroller/index.jsx
@@ -3,8 +3,6 @@
import { is, fromJS } from 'immutable'
import { Form, Icon, Select } from 'antd'
-import zhCN from '@/locales/zh-CN/mob.js'
-import enUS from '@/locales/en-US/mob.js'
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
@@ -20,7 +18,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
backgroundColor: '',
backgroundImage: '',
backgroundSize: '',
diff --git a/src/pc/components/login/normal-login/index.jsx b/src/pc/components/login/normal-login/index.jsx
index 1ffb207..dcc63e2 100644
--- a/src/pc/components/login/normal-login/index.jsx
+++ b/src/pc/components/login/normal-login/index.jsx
@@ -7,8 +7,6 @@
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import { resetStyle } from '@/utils/utils-custom.js'
import getWrapForm from './options'
import './index.scss'
@@ -24,7 +22,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
@@ -161,7 +158,7 @@
}
render() {
- const { card, dict } = this.state
+ const { card } = this.state
let style = resetStyle(card.style)
if (card.wrap.maxWidth) {
style.maxWidth = card.wrap.maxWidth
@@ -187,7 +184,7 @@
} trigger="hover">
<Icon type="tool" />
</Popover>
- <LoginForm loginWays={card.loginWays} wrap={card.wrap} menuId={card.uuid} dict={dict} />
+ <LoginForm loginWays={card.loginWays} wrap={card.wrap} menuId={card.uuid} />
</div>
)
}
diff --git a/src/pc/components/login/normal-login/loginform.jsx b/src/pc/components/login/normal-login/loginform.jsx
index 536b883..8a225ec 100644
--- a/src/pc/components/login/normal-login/loginform.jsx
+++ b/src/pc/components/login/normal-login/loginform.jsx
@@ -11,7 +11,6 @@
class LoginTabForm extends Component {
static propTpyes = {
- dict: PropTypes.object,
menuId: PropTypes.string,
loginWays: PropTypes.array,
wrap: PropTypes.array,
diff --git a/src/pc/components/navbar/normal-navbar/index.jsx b/src/pc/components/navbar/normal-navbar/index.jsx
index 6e1d078..a1eebd4 100644
--- a/src/pc/components/navbar/normal-navbar/index.jsx
+++ b/src/pc/components/navbar/normal-navbar/index.jsx
@@ -6,8 +6,6 @@
import asyncIconComponent from '@/utils/asyncIconComponent'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import getWrapForm from './options'
import './index.scss'
@@ -25,7 +23,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
card: null,
back: false
}
diff --git a/src/pc/transfer/index.jsx b/src/pc/transfer/index.jsx
index 655e0a9..8cb6de5 100644
--- a/src/pc/transfer/index.jsx
+++ b/src/pc/transfer/index.jsx
@@ -3,8 +3,6 @@
import { is, fromJS } from 'immutable'
import { Button, Modal, notification } from 'antd'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import SettingForm from './settingform'
import Api from '@/api'
@@ -14,7 +12,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
visible: false,
loading: false,
translist: []
@@ -101,7 +98,7 @@
}
render () {
- const { visible, dict, loading, translist } = this.state
+ const { visible, loading, translist } = this.state
return (
<div className="transfer-wrap">
@@ -111,14 +108,13 @@
visible={visible}
width={500}
maskClosable={false}
- okText={dict['model.submit']}
+ okText="鎻愪氦"
onOk={this.verifySubmit}
onCancel={() => { this.setState({ visible: false }) }}
confirmLoading={loading}
destroyOnClose
>
<SettingForm
- dict={dict}
translist={translist}
wrappedComponentRef={(inst) => this.verifyRef = inst}
/>
diff --git a/src/pc/transfer/settingform/index.jsx b/src/pc/transfer/settingform/index.jsx
index 614887c..d4698f1 100644
--- a/src/pc/transfer/settingform/index.jsx
+++ b/src/pc/transfer/settingform/index.jsx
@@ -6,7 +6,6 @@
class SettingForm extends Component {
static propTpyes = {
- dict: PropTypes.object,
translist: PropTypes.array,
}
diff --git a/src/tabviews/custom/components/table/edit-table/index.jsx b/src/tabviews/custom/components/table/edit-table/index.jsx
index f21e91a..083affa 100644
--- a/src/tabviews/custom/components/table/edit-table/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/index.jsx
@@ -6,8 +6,6 @@
import Api from '@/api'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
@@ -29,7 +27,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
BID: '', // 涓婄骇ID
BData: '', // 涓婄骇缁勪欢琛屾暟鎹�
config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index 2f53d2c..63af99d 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -6,8 +6,6 @@
import Api from '@/api'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
@@ -31,7 +29,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
BID: '', // 涓婄骇ID
BData: '', // 涓婄骇缁勪欢琛屾暟鎹�
config: {}, // 椤甸潰閰嶇疆淇℃伅锛屽寘鎷寜閽�佹悳绱€�佹樉绀哄垪銆佹爣绛剧瓑
diff --git a/src/tabviews/iframe/index.jsx b/src/tabviews/iframe/index.jsx
index 391c0de..fddf2a7 100644
--- a/src/tabviews/iframe/index.jsx
+++ b/src/tabviews/iframe/index.jsx
@@ -2,8 +2,6 @@
import PropTypes from 'prop-types'
import { Button, message } from 'antd'
import MKEmitter from '@/utils/events.js'
-import mzhCN from '@/locales/zh-CN/main.js'
-import menUS from '@/locales/en-US/main.js'
class Iframe extends Component {
static propTypes = {
@@ -15,7 +13,6 @@
state = {
visible: true,
- dict: sessionStorage.getItem('lang') !== 'en-US' ? mzhCN : menUS,
debug: sessionStorage.getItem('debug') === 'true'
}
@@ -54,7 +51,7 @@
document.execCommand('Copy')
oInput.className = 'oInput'
oInput.style.display = 'none'
- message.success(this.state.dict['main.copy.success'])
+ message.success('澶嶅埗鎴愬姛')
}
render () {
diff --git a/src/tabviews/rolemanage/index.jsx b/src/tabviews/rolemanage/index.jsx
index 9b138ec..6798ccf 100644
--- a/src/tabviews/rolemanage/index.jsx
+++ b/src/tabviews/rolemanage/index.jsx
@@ -8,8 +8,6 @@
import options from '@/store/options.js'
import Utils from '@/utils/utils.js'
import MKEmitter from '@/utils/events.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import './index.scss'
const { Search } = Input
@@ -26,7 +24,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
loading: true,
loadingTree: false,
loadingAppTree: false,
diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index 3c7d4e1..f446b69 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -4,8 +4,6 @@
import { Affix } from 'antd'
import asyncComponent from './asyncButtonComponent'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import './index.scss'
const NormalButton = asyncComponent(() => import('./normalbutton'))
@@ -30,9 +28,7 @@
ContainerId: PropTypes.any // tab椤甸潰ID锛岀敤浜庡脊绐楁帶鍒�
}
- state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
- }
+ state = {}
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
diff --git a/src/tabviews/zshare/chartcomponent/index.jsx b/src/tabviews/zshare/chartcomponent/index.jsx
index 231654d..058b831 100644
--- a/src/tabviews/zshare/chartcomponent/index.jsx
+++ b/src/tabviews/zshare/chartcomponent/index.jsx
@@ -7,8 +7,6 @@
import asyncComponent from './asyncButtonComponent'
import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import './index.scss'
const ExcelOutButton = asyncComponent(() => import('@/tabviews/zshare/actionList/exceloutbutton'))
@@ -25,7 +23,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, // 瀛楀吀
empty: true, // 鍥捐〃鏁版嵁涓虹┖
actions: [], // 鍥捐〃缁戝畾鐨勬寜閽粍
chartId: Utils.getuuid(), // 鍥捐〃Id
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index e652120..f6d7439 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -30,7 +30,6 @@
static propTpyes = {
menuType: PropTypes.object, // 鑿滃崟绫诲瀷锛屾槸鍚︿负HS
action: PropTypes.object, // 鎸夐挳淇℃伅銆佽〃鍗曞垪琛�
- dict: PropTypes.object, // 瀛楀吀椤�
data: PropTypes.any, // 琛ㄦ牸鏁版嵁
BID: PropTypes.any, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
diff --git a/src/tabviews/zshare/topSearch/dategroup/quarterpicker/index.jsx b/src/tabviews/zshare/topSearch/dategroup/quarterpicker/index.jsx
index d81e866..07c9cdd 100644
--- a/src/tabviews/zshare/topSearch/dategroup/quarterpicker/index.jsx
+++ b/src/tabviews/zshare/topSearch/dategroup/quarterpicker/index.jsx
@@ -6,7 +6,6 @@
class QuarterPicker extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
card: PropTypes.object, // 鎼滅储閰嶇疆
onChange: PropTypes.func
}
diff --git a/src/tabviews/zshare/topSearch/dategroup/yearpicker/index.jsx b/src/tabviews/zshare/topSearch/dategroup/yearpicker/index.jsx
index 94c2bf6..f01b64e 100644
--- a/src/tabviews/zshare/topSearch/dategroup/yearpicker/index.jsx
+++ b/src/tabviews/zshare/topSearch/dategroup/yearpicker/index.jsx
@@ -6,7 +6,6 @@
class QuarterPicker extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
card: PropTypes.object, // 鎼滅储閰嶇疆
onChange: PropTypes.func
}
diff --git a/src/views/design/sidemenu/index.jsx b/src/views/design/sidemenu/index.jsx
index 46ef739..34ecc90 100644
--- a/src/views/design/sidemenu/index.jsx
+++ b/src/views/design/sidemenu/index.jsx
@@ -7,8 +7,6 @@
import { resetEditLevel, modifyMenuTree, modifyMainMenu } from '@/store/action'
import { SySMenuList } from './config'
import options from '@/store/options.js'
-import zhCN from '@/locales/zh-CN/main.js'
-import enUS from '@/locales/en-US/main.js'
import Api from '@/api'
import MKEmitter from '@/utils/events.js'
import './index.scss'
@@ -19,7 +17,6 @@
class Sidemenu extends Component {
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
subMenulist: [], // 浜岀骇鑿滃崟
editMenu: null, // 缂栬緫涓夌骇鑿滃崟鏃惰缃�
rootSubmenuKeys: null,
--
Gitblit v1.8.0