From b5e70973340bf912b733acd737f55f90653dece8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 七月 2021 09:48:25 +0800
Subject: [PATCH] 2021-07-03

---
 src/menu/components/table/normal-table/columns/editColumn/index.jsx |   27 ++++++++-------------------
 1 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/menu/components/table/normal-table/columns/editColumn/index.jsx b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
index 3a18837..bf74079 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/index.jsx
@@ -42,24 +42,13 @@
   }
 
   editColumn = (column) => {
-    let menulist = sessionStorage.getItem('fstMenuList')
-    if (menulist) {
-      try {
-        menulist = JSON.parse(menulist)
-      } catch {
-        menulist = []
-      }
-    } else {
-      menulist = []
-    }
-
-    let formlist = getColumnForm(column, menulist, this.props.fields)
+    let formlist = getColumnForm(column, this.props.fields)
     let _options = fromJS(columnTypeOptions[column.type]).toJS()
     if (column.type === 'text' || column.type === 'number') {
       if (column.perspective === 'linkmenu') {
-        _options.push('linkmenu', 'linkfields')
+        _options.push('linkmenu', 'linkfields', 'open')
       } else if (column.perspective === 'linkurl') {
-        _options.push('linkurl', 'linkfields')
+        _options.push('linkurl', 'linkfields', 'open')
       }
     }
 
@@ -143,9 +132,9 @@
       let _options = fromJS(columnTypeOptions[this.state.type]).toJS()
 
       if (value === 'linkmenu') {
-        _options.push('linkmenu', 'linkfields')
+        _options.push('linkmenu', 'linkfields', 'open')
       } else if (value === 'linkurl') {
-        _options.push('linkurl', 'linkfields')
+        _options.push('linkurl', 'linkfields', 'open')
       }
 
       this.setState({
@@ -219,7 +208,7 @@
             </Form.Item>
           </Col>
         )
-      } else if (item.type === 'select') { // 涓嬫媺鎼滅储
+      } else if (item.type === 'select') {
         fields.push(
           <Col span={12} key={index}>
             <Form.Item label={item.label}>
@@ -239,8 +228,8 @@
                   getPopupContainer={() => document.getElementById('columnwinter')}
                 >
                   {item.options.map((option, index) =>
-                    <Select.Option key={`${option.value || option.field}${index}`} datatype={option.datatype || ''} value={option.value || option.field}>
-                      {option.text || option.label}
+                    <Select.Option key={index} datatype={option.datatype || ''} value={(option.value || option.field || option.MenuID)}>
+                      {(option.text || option.label || option.MenuName)}
                     </Select.Option>
                   )}
                 </Select>

--
Gitblit v1.8.0