From dac21f9a9941681ccdc87220c2ed12ff277446d3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 24 六月 2020 11:00:42 +0800
Subject: [PATCH] 2020-06-24

---
 src/tabviews/tabmanage/transferform/index.scss                    |    0 
 src/templates/headerconfig/index.jsx                              |    2 
 src/locales/zh-CN/main.js                                         |    6 ++
 src/tabviews/rolemanage/index.jsx                                 |    6 +-
 src/templates/zshare/basetransferform/index.jsx                   |   13 ++--
 src/templates/modalconfig/settingform/index.jsx                   |    2 
 src/templates/zshare/formconfig.jsx                               |    6 +-
 src/templates/sharecomponent/actioncomponent/actionform/index.jsx |    4 
 src/templates/formtabconfig/actionform/index.jsx                  |    2 
 src/templates/zshare/editcomponent/index.jsx                      |   20 +++---
 /dev/null                                                         |    8 --
 src/locales/zh-CN/model.js                                        |    6 +
 src/templates/menuconfig/editsecmenu/index.jsx                    |    2 
 src/locales/en-US/model.js                                        |    6 +
 src/tabviews/tabmanage/index.jsx                                  |    6 +-
 src/templates/menuconfig/editthdmenu/index.jsx                    |    2 
 src/components/404/index.jsx                                      |    6 +-
 src/locales/en-US/main.js                                         |    6 ++
 src/tabviews/tabmanage/transferform/index.jsx                     |   13 ++--
 src/utils/option.js                                               |   14 ++--
 20 files changed, 70 insertions(+), 60 deletions(-)

diff --git a/src/components/404/index.jsx b/src/components/404/index.jsx
index 397b7d5..4f3ac7d 100644
--- a/src/components/404/index.jsx
+++ b/src/components/404/index.jsx
@@ -1,7 +1,7 @@
 import React, {Component} from 'react'
 import Lostsvg from '@/components/lostsvg'
-import zhCN from '@/locales/zh-CN/share.js'
-import enUS from '@/locales/en-US/share.js'
+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
@@ -15,7 +15,7 @@
             <Lostsvg />
           </div>
           <div className="ant-result-title">404</div>
-          <div className="ant-result-subtitle">{this.props.msg ? this.props.msg : _dict['view.notFound']}</div>
+          <div className="ant-result-subtitle">{this.props.msg ? this.props.msg : _dict['main.view.notFound']}</div>
         </div>
       </main>
     )
diff --git a/src/locales/en-US/main.js b/src/locales/en-US/main.js
index 933991d..d26a8a5 100644
--- a/src/locales/en-US/main.js
+++ b/src/locales/en-US/main.js
@@ -49,6 +49,12 @@
   'main.excel.content.limitmax': '澶т簬鏈�澶у��',
   'main.form.link.error': '鑱斿姩鑿滃崟璁剧疆閿欒锛�',
   'main.form.picture.check': '鏌ョ湅鍥剧墖',
+  'main.thawmenu.source': 'Frozen',
+  'main.thawmenu.target': 'Unfreeze',
+  'main.thawmenu.itemUnit': 'item',
+  'main.thawmenu.itemsUnit': 'items',
+  '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/en-US/model.js b/src/locales/en-US/model.js
index 8080b84..06ea6b4 100644
--- a/src/locales/en-US/model.js
+++ b/src/locales/en-US/model.js
@@ -30,10 +30,15 @@
   'model.openway': 'Open ',
   'model.new': 'New ',
   'model.window': 'Window',
+  'model.empty': 'Empty',
   'model.switch.open': 'Open',
   'model.switch.close': 'Close',
   'model.menu.level1': 'Level 1 menu',
   'model.menu.level2': 'Level 2 menu',
+  'model.menu.all': 'All',
+  'model.menu.selected': 'Selected',
+  'model.menu.itemUnit': 'Item',
+  'model.menu.itemsUnit': 'Items',
   'model.menu.close': 'Are you sure to delete the menu <<@M>> ?',
   'model.menu.resetorder': 'Are you sure to adjust the menu sequence ?',
   'header.menu.basemsg': 'Please complete the basic information !',
@@ -131,7 +136,6 @@
   'header.form.initval': 'Initial Value',
   'header.form.decimal': '灏忔暟浣�',
   'header.form.format': '鏍煎紡鍖�',
-  'header.form.empty': '绌�',
   'header.form.thdSeparator': '鍗冨垎浣�',
   'header.form.prefix': '鍓嶇紑',
   'header.form.postfix': '鍚庣紑',
diff --git a/src/locales/en-US/role.js b/src/locales/en-US/role.js
deleted file mode 100644
index 70e1e5f..0000000
--- a/src/locales/en-US/role.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-  'role.title': 'The role list',
-}
\ No newline at end of file
diff --git a/src/locales/en-US/share.js b/src/locales/en-US/share.js
deleted file mode 100644
index 06cce28..0000000
--- a/src/locales/en-US/share.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default {
-  'view.notFound': '鎶辨瓑锛屼綘璁块棶鐨勯〉闈笉瀛樺湪锛岃鑱旂郴绠$悊鍛樸��',
-  'date.empty': '绌�',
-  'thawmenu.source': 'Frozen',
-  'thawmenu.target': 'Unfreeze',
-  'thawmenu.itemUnit': 'item',
-  'thawmenu.itemsUnit': 'items',
-}
\ No newline at end of file
diff --git a/src/locales/zh-CN/main.js b/src/locales/zh-CN/main.js
index 61353bb..c6c950b 100644
--- a/src/locales/zh-CN/main.js
+++ b/src/locales/zh-CN/main.js
@@ -50,6 +50,12 @@
   'main.excel.content.limitmax': '澶т簬鏈�澶у��',
   'main.form.link.error': '鑱斿姩鑿滃崟璁剧疆閿欒锛�',
   'main.form.picture.check': '鏌ョ湅鍥剧墖',
+  'main.thawmenu.source': '鍏ㄩ儴',
+  'main.thawmenu.target': '宸查�夋嫨',
+  'main.thawmenu.itemUnit': '椤�',
+  'main.thawmenu.itemsUnit': '椤�',
+  'main.role.title': '瑙掕壊鍒楄〃',
+  'main.view.notFound': '鎶辨瓑锛屼綘璁块棶鐨勯〉闈笉瀛樺湪锛岃鑱旂郴绠$悊鍛樸��',
   'form.required.input': '璇疯緭鍏�',
   'form.required.select': '璇烽�夋嫨'
 }
\ No newline at end of file
diff --git a/src/locales/zh-CN/model.js b/src/locales/zh-CN/model.js
index 29787fa..b2bdb7c 100644
--- a/src/locales/zh-CN/model.js
+++ b/src/locales/zh-CN/model.js
@@ -30,10 +30,15 @@
   'model.openway': '鎵撳紑鏂瑰紡',
   'model.new': '鏂�',
   'model.window': '绐楀彛',
+  'model.empty': '绌�',
   'model.switch.open': '寮�',
   'model.switch.close': '鍏�',
   'model.menu.level1': '涓�绾ц彍鍗�',
   'model.menu.level2': '浜岀骇鑿滃崟',
+  'model.menu.all': '鍏ㄩ儴',
+  'model.menu.selected': '宸查�夋嫨',
+  'model.menu.itemUnit': '椤�',
+  'model.menu.itemsUnit': '椤�',
   'model.menu.close': '纭畾鍒犻櫎銆夽M銆嬭彍鍗曞悧锛�',
   'model.menu.resetorder': '纭璋冩暣鑿滃崟椤哄簭鍚楋紵',
   'header.menu.basemsg': '璇峰畬鍠勮彍鍗曞熀鏈俊鎭紒',
@@ -131,7 +136,6 @@
   'header.form.initval': '鍒濆鍊�',
   'header.form.decimal': '灏忔暟浣�',
   'header.form.format': '鏍煎紡鍖�',
-  'header.form.empty': '绌�',
   'header.form.thdSeparator': '鍗冨垎浣�',
   'header.form.prefix': '鍓嶇紑',
   'header.form.postfix': '鍚庣紑',
diff --git a/src/locales/zh-CN/role.js b/src/locales/zh-CN/role.js
deleted file mode 100644
index 8948835..0000000
--- a/src/locales/zh-CN/role.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-  'role.title': '瑙掕壊鍒楄〃',
-}
\ No newline at end of file
diff --git a/src/locales/zh-CN/share.js b/src/locales/zh-CN/share.js
deleted file mode 100644
index 229d0c1..0000000
--- a/src/locales/zh-CN/share.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default {
-  'view.notFound': '鎶辨瓑锛屼綘璁块棶鐨勯〉闈笉瀛樺湪锛岃鑱旂郴绠$悊鍛樸��',
-  'date.empty': '绌�',
-  'thawmenu.source': '鍏ㄩ儴',
-  'thawmenu.target': '宸查�夋嫨',
-  'thawmenu.itemUnit': '椤�',
-  'thawmenu.itemsUnit': '椤�',
-}
\ No newline at end of file
diff --git a/src/tabviews/rolemanage/index.jsx b/src/tabviews/rolemanage/index.jsx
index 792d229..59eb71c 100644
--- a/src/tabviews/rolemanage/index.jsx
+++ b/src/tabviews/rolemanage/index.jsx
@@ -5,8 +5,8 @@
 
 import Api from '@/api'
 import Utils from '@/utils/utils.js'
-import zhCN from '@/locales/zh-CN/role.js'
-import enUS from '@/locales/en-US/role.js'
+import zhCN from '@/locales/zh-CN/main.js'
+import enUS from '@/locales/en-US/main.js'
 import './index.scss'
 
 const { Search } = Input
@@ -511,7 +511,7 @@
               title={
                 <span className="role-title">
                   <Icon type="bank" />
-                  <span className="title">{this.state.dict['role.title']}</span>
+                  <span className="title">{this.state.dict['main.role.title']}</span>
                   <Search placeholder="" onSearch={value => this.setState({primarykey: value})} />
                 </span>
               }
diff --git a/src/tabviews/tabmanage/index.jsx b/src/tabviews/tabmanage/index.jsx
index 1f58a50..9240441 100644
--- a/src/tabviews/tabmanage/index.jsx
+++ b/src/tabviews/tabmanage/index.jsx
@@ -8,9 +8,9 @@
 import zhCN from '@/locales/zh-CN/main.js'
 import enUS from '@/locales/en-US/main.js'
 import Utils from '@/utils/utils.js'
-import TransferForm from '@/components/transferform'
-import subtableurl from '@/assets/img/subtable.jpg'
+import TransferForm from './transferform'
 import MutilForm from './mutilform'
+import subtableurl from '@/assets/img/subtable.jpg'
 
 import './index.scss'
 
@@ -547,7 +547,7 @@
           destroyOnClose
         >
           {!this.state.thawmenulist && <Spin style={{marginLeft: 'calc(50% - 22px)', marginTop: '70px', marginBottom: '70px'}} size="large" />}
-          {this.state.thawmenulist && <TransferForm ref="trawmenu" menulist={this.state.thawmenulist}/>}
+          {this.state.thawmenulist && <TransferForm ref="trawmenu" dict={this.state.dict} menulist={this.state.thawmenulist}/>}
         </Modal>
       </div>
     )
diff --git a/src/components/transferform/index.jsx b/src/tabviews/tabmanage/transferform/index.jsx
similarity index 69%
rename from src/components/transferform/index.jsx
rename to src/tabviews/tabmanage/transferform/index.jsx
index 96907cd..14b3a82 100644
--- a/src/components/transferform/index.jsx
+++ b/src/tabviews/tabmanage/transferform/index.jsx
@@ -2,17 +2,15 @@
 import PropTypes from 'prop-types'
 import { Transfer } from 'antd'
 
-import zhCN from '@/locales/zh-CN/share.js'
-import enUS from '@/locales/en-US/share.js'
 import './index.scss'
 
 class TransferForm extends Component {
   static propTypes = {
-    menulist: PropTypes.array
+    menulist: PropTypes.array,
+    dict: PropTypes.object
   }
 
   state = {
-    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
     targetKeys: [],
     selectedKeys: []
   }
@@ -26,15 +24,16 @@
   }
 
   render() {
-    const { targetKeys, selectedKeys, dict } = this.state
+    const { dict } = this.props
+    const { targetKeys, selectedKeys } = this.state
 
     return (
       <div className="trawmenutransfer">
         <Transfer
           dataSource={this.props.menulist}
-          titles={[dict['thawmenu.source'], dict['thawmenu.target']]}
+          titles={[dict['main.thawmenu.source'], dict['main.thawmenu.target']]}
           targetKeys={targetKeys}
-          locale={{itemUnit: dict['thawmenu.itemUnit'], itemsUnit: dict['thawmenu.itemsUnit']}}
+          locale={{itemUnit: dict['main.thawmenu.itemUnit'], itemsUnit: dict['main.thawmenu.itemsUnit']}}
           selectedKeys={selectedKeys}
           onChange={this.handleChange}
           onSelectChange={this.handleSelectChange}
diff --git a/src/components/transferform/index.scss b/src/tabviews/tabmanage/transferform/index.scss
similarity index 100%
rename from src/components/transferform/index.scss
rename to src/tabviews/tabmanage/transferform/index.scss
diff --git a/src/templates/formtabconfig/actionform/index.jsx b/src/templates/formtabconfig/actionform/index.jsx
index c766a7f..cebb652 100644
--- a/src/templates/formtabconfig/actionform/index.jsx
+++ b/src/templates/formtabconfig/actionform/index.jsx
@@ -22,7 +22,7 @@
     interType: null, // 鎺ュ彛绫诲瀷锛氬唴閮ㄣ�佸閮�
     insertUpdateOptions: [{
       value: '',
-      text: this.props.dict['header.form.empty']
+      text: this.props.dict['model.empty']
     }, {
       value: 'insert',
       text: this.props.dict['header.form.action.insert']
diff --git a/src/templates/headerconfig/index.jsx b/src/templates/headerconfig/index.jsx
index d44b08e..baa7b2c 100644
--- a/src/templates/headerconfig/index.jsx
+++ b/src/templates/headerconfig/index.jsx
@@ -375,7 +375,7 @@
           destroyOnClose
         >
           {!this.state.thawmenulist && <Spin style={{marginLeft: 'calc(50% - 22px)', marginTop: '70px', marginBottom: '70px'}} size="large" />}
-          {this.state.thawmenulist && <TransferForm ref="trawmenu" menulist={this.state.thawmenulist}/>}
+          {this.state.thawmenulist && <TransferForm ref="trawmenu" dict={dict} menulist={this.state.thawmenulist}/>}
         </Modal>
         {/* 缂栬緫鑿滃崟妯℃�佹 */}
         <Modal
diff --git a/src/templates/menuconfig/editsecmenu/index.jsx b/src/templates/menuconfig/editsecmenu/index.jsx
index b4807aa..ab01748 100644
--- a/src/templates/menuconfig/editsecmenu/index.jsx
+++ b/src/templates/menuconfig/editsecmenu/index.jsx
@@ -451,7 +451,7 @@
           onCancel={this.thawMemuCancel}
         >
           {!this.state.thawmenulist && <Spin style={{marginLeft: 'calc(50% - 22px)', marginTop: '70px', marginBottom: '70px'}} size="large" />}
-          {this.state.thawmenulist && <TransferForm ref="trawmenu" menulist={this.state.thawmenulist}/>}
+          {this.state.thawmenulist && <TransferForm ref="trawmenu" dict={dict} menulist={this.state.thawmenulist}/>}
         </Modal>
       </div>
     )
diff --git a/src/templates/menuconfig/editthdmenu/index.jsx b/src/templates/menuconfig/editthdmenu/index.jsx
index 99a7f89..6850d6b 100644
--- a/src/templates/menuconfig/editthdmenu/index.jsx
+++ b/src/templates/menuconfig/editthdmenu/index.jsx
@@ -913,7 +913,7 @@
           destroyOnClose
         >
           {!this.state.thawmenulist && <Spin style={{marginLeft: 'calc(50% - 22px)', marginTop: '70px', marginBottom: '70px'}} size="large" />}
-          {this.state.thawmenulist && <TransferForm ref="trawmenu" menulist={this.state.thawmenulist}/>}
+          {this.state.thawmenulist && <TransferForm ref="trawmenu" dict={dict} menulist={this.state.thawmenulist}/>}
         </Modal>
         {/* 娣诲姞绯荤粺鑿滃崟 */}
         <Modal
diff --git a/src/templates/modalconfig/settingform/index.jsx b/src/templates/modalconfig/settingform/index.jsx
index 5fda89b..c5af7aa 100644
--- a/src/templates/modalconfig/settingform/index.jsx
+++ b/src/templates/modalconfig/settingform/index.jsx
@@ -112,7 +112,7 @@
                   filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
                 >
                   <Select.Option value="">
-                    {dict['header.form.empty']}
+                    {dict['model.empty']}
                   </Select.Option>
                   {fields.map(option =>
                     <Select.Option id={option.uuid} title={option.label} key={option.uuid} value={option.field}>
diff --git a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
index 982b65c..99d286c 100644
--- a/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/actionform/index.jsx
@@ -38,7 +38,7 @@
     }],
     insertUpdateOptions: [{
       value: '',
-      text: this.props.dict['header.form.empty']
+      text: this.props.dict['model.empty']
     }, {
       value: 'insert',
       text: this.props.dict['header.form.action.insert']
@@ -51,7 +51,7 @@
     }],
     deleteOptions: [{
       value: '',
-      text: this.props.dict['header.form.empty']
+      text: this.props.dict['model.empty']
     }, {
       value: 'LogicDelete',
       text: this.props.dict['header.form.action.LogicDelete']
diff --git a/src/templates/zshare/basetransferform/index.jsx b/src/templates/zshare/basetransferform/index.jsx
index 96907cd..14851f5 100644
--- a/src/templates/zshare/basetransferform/index.jsx
+++ b/src/templates/zshare/basetransferform/index.jsx
@@ -2,17 +2,15 @@
 import PropTypes from 'prop-types'
 import { Transfer } from 'antd'
 
-import zhCN from '@/locales/zh-CN/share.js'
-import enUS from '@/locales/en-US/share.js'
 import './index.scss'
 
 class TransferForm extends Component {
   static propTypes = {
-    menulist: PropTypes.array
+    menulist: PropTypes.array,
+    dict: PropTypes.object
   }
 
   state = {
-    dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
     targetKeys: [],
     selectedKeys: []
   }
@@ -26,15 +24,16 @@
   }
 
   render() {
-    const { targetKeys, selectedKeys, dict } = this.state
+    const { dict } = this.props
+    const { targetKeys, selectedKeys } = this.state
 
     return (
       <div className="trawmenutransfer">
         <Transfer
           dataSource={this.props.menulist}
-          titles={[dict['thawmenu.source'], dict['thawmenu.target']]}
+          titles={[dict['model.menu.all'], dict['model.menu.selected']]}
           targetKeys={targetKeys}
-          locale={{itemUnit: dict['thawmenu.itemUnit'], itemsUnit: dict['thawmenu.itemsUnit']}}
+          locale={{itemUnit: dict['model.menu.itemUnit'], itemsUnit: dict['model.menu.itemsUnit']}}
           selectedKeys={selectedKeys}
           onChange={this.handleChange}
           onSelectChange={this.handleSelectChange}
diff --git a/src/templates/zshare/editcomponent/index.jsx b/src/templates/zshare/editcomponent/index.jsx
index 635dd93..bf29357 100644
--- a/src/templates/zshare/editcomponent/index.jsx
+++ b/src/templates/zshare/editcomponent/index.jsx
@@ -96,14 +96,14 @@
    */
   thawBtnSubmit = () => {
     const { thawButtons } = this.props
-    const { thawbtnlist } = this.state
+    const { thawbtnlist, dict } = this.state
     let config = JSON.parse(JSON.stringify(this.props.config))
 
     // 涓夌骇鑿滃崟瑙i櫎鍐荤粨
     if (this.refs.trawmenu.state.targetKeys.length === 0) {
       notification.warning({
         top: 92,
-        message: this.props.dict['form.required.select'] + this.props.dict['header.form.thawbutton'],
+        message: dict['form.required.select'] + dict['header.form.thawbutton'],
         duration: 5
       })
     } else {
@@ -189,8 +189,8 @@
     const { dict } = this.state
     const menu = (
       <Menu onClick={this.handleMenuClick}>
-        {this.props.type !== 'TreePage' ? <Menu.Item key="thaw"><Icon type="unlock" />{this.props.dict['header.form.thawbutton']}</Menu.Item> : null}
-        <Menu.Item key="paste"><Icon type="snippets" />{this.props.dict['header.form.paste']}</Menu.Item>
+        {this.props.type !== 'TreePage' ? <Menu.Item key="thaw"><Icon type="unlock" />{dict['header.form.thawbutton']}</Menu.Item> : null}
+        <Menu.Item key="paste"><Icon type="snippets" />{dict['header.form.paste']}</Menu.Item>
         {/* <Menu.Item key="replace"><Icon type="retweet" />鏇挎崲</Menu.Item> */}
       </Menu>
     )
@@ -204,20 +204,20 @@
         </Dropdown>
         {/* 瑙e喕鎸夐挳妯℃�佹 */}
         <Modal
-          title={this.props.dict['header.form.thawbutton']}
-          okText={this.props.dict['model.confirm']}
-          cancelText={this.props.dict['model.cancel']}
+          title={dict['header.form.thawbutton']}
+          okText={dict['model.confirm']}
+          cancelText={dict['model.cancel']}
           visible={this.state.thawVisible}
           onOk={this.thawBtnSubmit}
           onCancel={() => {this.setState({thawVisible: false, thawbtnlist: null})}}
           destroyOnClose
         >
           {!this.state.thawbtnlist && <Spin style={{marginLeft: 'calc(50% - 22px)', marginTop: '70px', marginBottom: '70px'}} size="large" />}
-          {this.state.thawbtnlist && <TransferForm ref="trawmenu" menulist={this.state.thawbtnlist}/>}
+          {this.state.thawbtnlist && <TransferForm ref="trawmenu" dict={dict} menulist={this.state.thawbtnlist}/>}
         </Modal>
         {/* 鎸夐挳閰嶇疆淇℃伅绮樿创澶嶅埗 */}
         <Modal
-          title={this.props.dict['header.form.paste']}
+          title={dict['header.form.paste']}
           visible={this.state.pasteVisible}
           width={600}
           maskClosable={false}
@@ -226,7 +226,7 @@
           destroyOnClose
         >
           <PasteForm
-            dict={this.props.dict}
+            dict={dict}
             wrappedComponentRef={(inst) => this.pasteFormRef = inst}
           />
         </Modal>
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 1251e4e..9c16255 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -1452,7 +1452,7 @@
       initVal: card.format || '',
       options: [{
         value: '',
-        text: Formdict['header.form.empty']
+        text: Formdict['model.empty']
       }, {
         value: 'thdSeparator',
         text: Formdict['header.form.thdSeparator']
@@ -2221,7 +2221,7 @@
       initVal: card.regular || '',
       options: [{
         value: '',
-        text: Formdict['header.form.empty']
+        text: Formdict['model.empty']
       }, {
         value: 'number',
         text: Formdict['model.form.number']
@@ -2440,7 +2440,7 @@
       required: false,
       options: [{
         value: '',
-        text: Formdict['header.form.empty']
+        text: Formdict['model.empty']
       }, {
         value: 'table',
         text: 'table'
diff --git a/src/utils/option.js b/src/utils/option.js
index 2624b2c..10b4a1d 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -1,5 +1,5 @@
-import zhCN from '@/locales/zh-CN/share.js'
-import enUS from '@/locales/en-US/share.js'
+import zhCN from '@/locales/zh-CN/model.js'
+import enUS from '@/locales/en-US/model.js'
 import nortable from '@/assets/img/normaltable.jpg'
 import mainsubtable from '@/assets/img/mainsubtable.jpg'
 import treepage from '@/assets/img/treepage.jpg'
@@ -81,7 +81,7 @@
 // 鏃ユ湡榛樿鍊奸�夋嫨鑼冨洿
 export const dateOptions = {
   date: [
-    {value: '', text: _dict['date.empty']},
+    {value: '', text: _dict['model.empty']},
     {value: '0', text: '褰撳ぉ'},
     {value: 1, text: '鏄ㄥぉ'},
     {value: 2, text: '鍓嶅ぉ'},
@@ -92,7 +92,7 @@
     {value: -2, text: '鍚庡ぉ'}
   ],
   dateweek: [
-    {value: '', text: _dict['date.empty']},
+    {value: '', text: _dict['model.empty']},
     {value: '0', text: '鏈懆'},
     {value: 1, text: '涓婂懆'},
     {value: 3, text: '鍓嶄笁鍛�'},
@@ -100,7 +100,7 @@
     {value: -1, text: '涓嬪懆'}
   ],
   datemonth: [
-    {value: '', text: _dict['date.empty']},
+    {value: '', text: _dict['model.empty']},
     {value: '0', text: '鏈湀'},
     {value: 1, text: '涓婃湀'},
     {value: 3, text: '鍓嶄笁鏈�'},
@@ -108,7 +108,7 @@
     {value: -1, text: '涓嬫湀'}
   ],
   daterange: [
-    {value: '', text: _dict['date.empty']},
+    {value: '', text: _dict['model.empty']},
     {value: '[0, 0]', text: '浠婂ぉ'},
     {value: '[1, 1]', text: '鏄ㄥぉ'},
     {value: '[3, 0]', text: '杩戜笁澶�'},
@@ -121,7 +121,7 @@
     {value: '[-2, -2]', text: '鍚庡ぉ'}
   ],
   datetime: [
-    {value: '', text: _dict['date.empty']},
+    {value: '', text: _dict['model.empty']},
     {value: '0', text: '鐜板湪'},
     {value: 1, text: '鏄ㄥぉ'},
     {value: 3, text: '鍓嶄笁澶�'},

--
Gitblit v1.8.0