From ce70be666bcd78a7e16e739040488cf7e7256cc2 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 31 五月 2021 15:49:43 +0800
Subject: [PATCH] 2021-05-31

---
 src/tabviews/custom/components/tree/antd-tree/index.jsx |   54 ++++++++++++++++++------------------------------------
 1 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/src/tabviews/custom/components/tree/antd-tree/index.jsx b/src/tabviews/custom/components/tree/antd-tree/index.jsx
index 1ab48b4..743a5af 100644
--- a/src/tabviews/custom/components/tree/antd-tree/index.jsx
+++ b/src/tabviews/custom/components/tree/antd-tree/index.jsx
@@ -76,15 +76,6 @@
         _data = nextProps.data[config.dataName] || []
       }
 
-      // _data = [
-      //   {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '1', nvarchar2: '1', nvarchar3: ''},
-      //   {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '1-1', nvarchar2: '1-1', nvarchar3: '1'},
-      //   {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '1-2', nvarchar2: '1-2', nvarchar3: '1'},
-      //   {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '2', nvarchar2: '2', nvarchar3: ''},
-      //   {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '2-1', nvarchar2: '2-1', nvarchar3: '2'},
-      //   {ID: 'dsdsagsgfs32ed2dqd61', nvarchar1: '2-2', nvarchar2: '2-2', nvarchar3: '2'},
-      // ]
-
       this.setState({sync: false, data: _data}, () => {
         this.handleData()
       })
@@ -124,16 +115,7 @@
 
     if (!config.timer) return
 
-    const _change = {
-      '15s': 15000,
-      '30s': 30000,
-      '1min': 60000,
-      '5min': 300000,
-      '10min': 600000,
-      '15min': 900000,
-      '30min': 1800000,
-      '1hour': 3600000
-    }
+    const _change = { '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
 
     let timer = _change[config.timer]
 
@@ -284,16 +266,16 @@
       if (pval === config.wrap.mark) {
         parentNodes.push({
           // ...item,
-          title: item[config.wrap.labelField] || '',
-          key: val,
-          parentId: ''
+          $title: item[config.wrap.labelField] || '',
+          $key: val,
+          $parentId: ''
         })
       } else if (pval) {
         _options.push({
           // ...item,
-          title: item[config.wrap.labelField] || '',
-          key: val,
-          parentId: pval
+          $title: item[config.wrap.labelField] || '',
+          $key: val,
+          $parentId: pval
         })
       }
     })
@@ -336,9 +318,9 @@
   getFilterTree = (parents, searchkey) => {
     return parents.filter(node => {
       if (!node.children) {
-        return (node.title.toLowerCase().indexOf(searchkey) >= 0 || node.key.toLowerCase().indexOf(searchkey) >= 0)
+        return (node.$title.toLowerCase().indexOf(searchkey) >= 0 || node.$key.toLowerCase().indexOf(searchkey) >= 0)
       } else {
-        if (node.title.toLowerCase().indexOf(searchkey) >= 0 || node.key.toLowerCase().indexOf(searchkey) >= 0) {
+        if (node.$title.toLowerCase().indexOf(searchkey) >= 0 || node.$key.toLowerCase().indexOf(searchkey) >= 0) {
           return true
         }
         
@@ -360,7 +342,7 @@
       parent.children = []
       // 娣诲姞鑿滃崟鐨勫瓙鍏冪礌
       options = options.filter(option => {
-        if (option.parentId === parent.key) {
+        if (option.$parentId === parent.$key) {
           parent.children.push(option)
           return false
         }
@@ -383,12 +365,12 @@
     return nodes.map(item => {
       if (item.children) {
         return (
-          <TreeNode icon={<span><Icon type="folder-open" /><Icon type="folder" /></span>} title={item.title} key={item.key} dataRef={item}>
+          <TreeNode icon={<span><Icon type="folder-open" /><Icon type="folder" /></span>} title={item.$title} key={item.$key} dataRef={item}>
             {this.renderTreeNodes(item.children)}
           </TreeNode>
         )
       }
-      return <TreeNode icon={<Icon type="file" />} key={item.key} title={item.title} dataRef={item} isLeaf />
+      return <TreeNode icon={<Icon type="file" />} key={item.$key} title={item.$title} dataRef={item} isLeaf />
     })
   }
 
@@ -414,7 +396,7 @@
 
   getExpandKeys = (node, keys) => {
     if (node.children) {
-      keys.push(node.key)
+      keys.push(node.$key)
       node.children.forEach(_node => {
         this.getExpandKeys(_node, keys)
       })
@@ -426,22 +408,22 @@
     let _expandedKeys = fromJS(this.state.expandedKeys).toJS()
     let _data = fromJS(node.props.dataRef).toJS()
 
-    if (_expandedKeys.indexOf(_data.key) >= 0) {
-      _expandedKeys = _expandedKeys.filter(key => key !== _data.key)
+    if (_expandedKeys.indexOf(_data.$key) >= 0) {
+      _expandedKeys = _expandedKeys.filter(key => key !== _data.$key)
     } else {
       if (_data.children) {
-        _expandedKeys.push(_data.key)
+        _expandedKeys.push(_data.$key)
         _expandedKeys = Array.from(new Set(_expandedKeys))
       }
     }
 
     if (selected) {
-      MKEmitter.emit('resetSelectLine', config.uuid, (_data ? _data.key : ''), _data)
+      MKEmitter.emit('resetSelectLine', config.uuid, (_data ? _data.$key : ''), _data)
     }
 
     this.setState({
       expandedKeys: _expandedKeys,
-      selectedKeys: [_data.key]
+      selectedKeys: [_data.$key]
     })
   }
 

--
Gitblit v1.8.0