From b3547d1c531e479021219fda5df153a11b9b52a3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 31 八月 2020 17:28:09 +0800
Subject: [PATCH] 2020-08-31

---
 src/templates/sharecomponent/tabscomponent/index.jsx |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/templates/sharecomponent/tabscomponent/index.jsx b/src/templates/sharecomponent/tabscomponent/index.jsx
index 79711ac..901b1b0 100644
--- a/src/templates/sharecomponent/tabscomponent/index.jsx
+++ b/src/templates/sharecomponent/tabscomponent/index.jsx
@@ -23,7 +23,7 @@
   }
 
   state = {
-    dict: (!localStorage.getItem('lang') || localStorage.getItem('lang') === 'zh-CN') ? zhCN : enUS,
+    dict: localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
     tabgroups: [],     // 鏍囩缁�
     card: [],          // 缂栬緫鏍囩
     group: [],         // 缂栬緫缁�
@@ -101,7 +101,7 @@
       if (group.uuid === _group.uuid) {
         isuptab = false
         group.sublist.forEach(tab => { // 鍙叧鑱旂殑鍚岀骇鏍囩
-          if (tab.level) {
+          if (tab.level || tab.level === 0) {
             levels[tab.uuid] = tab.level
           }
 
@@ -112,7 +112,7 @@
         })
       } else if (isuptab) {
         group.sublist.forEach(tab => {
-          if (tab.level) {
+          if (tab.level || tab.level === 0) {
             levels[tab.uuid] = tab.level
           }
 
@@ -226,8 +226,6 @@
 
     confirm({
       content: `纭畾鍒犻櫎<<${card.label}>>鍚楋紵`,
-      okText: this.state.dict['model.confirm'],
-      cancelText: this.state.dict['header.cancel'],
       onOk() {
         tabgroups = tabgroups.map(_group => {
           if (_group.uuid === group.uuid) {
@@ -250,7 +248,7 @@
         _this.setState({
           tabgroups: tabgroups
         }, () => {
-          _this.props.updatetabs({...config, tabgroups: tabgroups}, [card])
+          _this.props.updatetabs({...config, tabgroups: tabgroups})
         })
       },
       onCancel() {}
@@ -267,8 +265,6 @@
 
     confirm({
       content: `纭畾鏂板缓鏍囩缁勫悧锛焋,
-      okText: this.state.dict['model.confirm'],
-      cancelText: this.state.dict['header.cancel'],
       onOk() {
         if (_tabgroups.length === 1) {
           _tabgroups.forEach(group => {
@@ -301,8 +297,6 @@
 
     confirm({
       content: `纭畾鍒犻櫎鏍囩缁勫悧锛焋,
-      okText: this.state.dict['model.confirm'],
-      cancelText: this.state.dict['header.cancel'],
       onOk() {
         _tabgroups = _tabgroups.filter(_group => _group.uuid !== group.uuid)
 
@@ -376,6 +370,10 @@
     }
   }
 
+  shouldComponentUpdate (nextProps, nextState) {
+    return !is(fromJS(this.state), fromJS(nextState))
+  }
+
   /**
    * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊
    */
@@ -408,13 +406,13 @@
                 handleMenu={(card) => this.handleTab(card, group)}
                 deleteMenu={(card) => this.deleteElement(card, group)}
                 doubleClickCard={this.props.setSubConfig}
-                placeholder={this.state.dict['header.form.tab.placeholder']}
+                placeholder={dict['form.required.add'] + dict['model.form.tab']}
               />
             </div>)
         })}
         {/* 鏍囩缂栬緫 */}
         <Modal
-          title={this.state.dict['header.modal.tabs.edit']}
+          title={dict['header.modal.tabs.edit']}
           visible={visible}
           width={750}
           maskClosable={false}
@@ -423,7 +421,7 @@
           destroyOnClose
         >
           <TabForm
-            dict={this.state.dict}
+            dict={dict}
             card={this.state.card}
             tabs={this.props.tabs}
             levels={this.state.levels}

--
Gitblit v1.8.0