From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31

---
 src/tabviews/zshare/normalTable/index.jsx |   66 +++++++++------------------------
 1 files changed, 18 insertions(+), 48 deletions(-)

diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 3746355..21feaa5 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -3,7 +3,7 @@
 import md5 from 'md5'
 import { connect } from 'react-redux'
 import { is, fromJS } from 'immutable'
-import { Table, Affix, Typography, Modal, Icon } from 'antd'
+import { Table, Affix, Typography, Icon } from 'antd'
 
 import { modifyTabview } from '@/store/action'
 import asyncComponent from '@/utils/asyncComponent'
@@ -44,8 +44,6 @@
     pageIndex: 1,         // 鍒濆椤甸潰绱㈠紩
     pageSize: 10,         // 姣忛〉鏁版嵁鏉℃暟
     columns: null,        // 鏄剧ず鍒�
-    imgShow: false,       // 鍥剧墖鏀惧ぇ妯℃�佹
-    imgSrc: '',           // 鍥剧墖璺緞
     lineMarks: null,      // 琛屾爣璁�
     activeIndex: null,    // 鏍囪褰撳墠閫変腑琛�
     rowspans: null        // 琛屽悎骞跺瓧娈典俊鎭�
@@ -139,7 +137,10 @@
         if (item.rowspan === 'true') {
           rowspans.push(item.field)
         }
-        if (_format && !Math.floor(Math.random() * radio)) {
+        if (item.type === 'index') {
+          item.field = '$Index'
+          item.type = 'text'
+        } else if (_format && !Math.floor(Math.random() * radio)) {
           item.blur = true
         }
 
@@ -165,14 +166,6 @@
           render: (text, record) => {
             return this.getContent(item, record)
           }
-        }
-      }
-      
-      if (item.fixed === true || item.fixed === 'true') {
-        if (index < columns.length / 2) {
-          cell.fixed = 'left'
-        } else {
-          cell.fixed = 'right'
         }
       }
       
@@ -552,7 +545,7 @@
       let photos = ''
       if (item.field && record.hasOwnProperty(item.field)) {
         photos = record[item.field] + ''
-        photos = photos.split(',')
+        photos = photos.split(',').filter(Boolean)
       } else {
         photos = ''
       }
@@ -562,7 +555,10 @@
         <div className="picture-col">
           {photos && photos.map((url, i) => {
             if (item.scale === 'true') {
-              return <img style={{maxHeight: maxHeight}} className="image-scale" onClick={this.imgScale} key={`${i}`} src={url} alt=""/>
+              return <img style={{maxHeight: maxHeight}} className="image-scale" onClick={(e) => {
+                e.stopPropagation()
+                MKEmitter.emit('mkImageScale', url, photos)
+              }} key={`${i}`} src={url} alt=""/>
             } else {
               return <img style={{maxHeight: maxHeight}} key={`${i}`} src={url} alt=""/>
             }
@@ -738,7 +734,7 @@
           let photos = []
           try {
             photos = record[col.field] + ''
-            photos = photos.split(',')
+            photos = photos.split(',').filter(Boolean)
           } catch {
             photos = []
           }
@@ -874,9 +870,11 @@
         <div className="content-fence">
           <div className="content-fence-top" style={images[0] ? {textAlign: images[0].align} : null}>
             {images.map((_img, index) => {
-              if (!_img.url) return ''
               if (_img.scale) {
-                return <img style={{maxHeight: _img.maxHeight}} className="image-scale" onClick={this.imgScale} key={`${index}`} src={_img.url} alt=""/>
+                return <img style={{maxHeight: _img.maxHeight}} className="image-scale" onClick={(e) => {
+                  e.stopPropagation()
+                  MKEmitter.emit('mkImageScale', _img.url, images.map(g => g.url))
+                }} key={`${index}`} src={_img.url} alt=""/>
               } else {
                 return (<img style={{maxHeight: _img.maxHeight}} key={`${index}`} src={_img.url} alt=""/>)
               }
@@ -894,9 +892,10 @@
         <div className="content-fence">
           <div className="content-fence-left" style={images[0] ? {textAlign: images[0].align} : null}>
             {images.map((_img, index) => {
-              if (!_img.url) return ''
               if (_img.scale) {
-                return <img style={{maxHeight: _img.maxHeight}} className="image-scale" onClick={this.imgScale} key={`${index}`} src={_img.url} alt=""/>
+                return <img style={{maxHeight: _img.maxHeight}} className="image-scale" onClick={() => {
+                  MKEmitter.emit('mkImageScale', _img.url, images.map(g => g.url))
+                }} key={`${index}`} src={_img.url} alt=""/>
               } else {
                 return (<img style={{maxHeight: _img.maxHeight}} key={`${index}`} src={_img.url} alt=""/>)
               }
@@ -909,23 +908,6 @@
           </div>
         </div>
       )
-    }
-  }
-
-  /**
-   * @description 鍥剧墖缂╂斁
-   */
-  imgScaleClose = () => {
-    this.setState({
-     imgShow: false
-    })
-  }
-  imgScale = (e) => {
-    if (e.target.nodeName === 'IMG') {
-      this.setState({
-        imgShow: true,
-        imgSrc: e.target.src
-      })
     }
   }
 
@@ -1237,18 +1219,6 @@
           pagination={_pagination}
         />
         {_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
-        <Modal
-          className="image-scale-modal"
-          visible={this.state.imgShow}
-          width="70vw"
-          maskClosable={true}
-          onCancel={this.imgScaleClose}
-          title={this.props.dict['main.form.picture.check']}
-          footer={[<span key="close" onClick={this.imgScaleClose}>{this.props.dict['main.close']}</span>]}
-          destroyOnClose
-        >
-         <img style={{maxWidth:'100%'}} src={this.state.imgSrc} alt="" />
-        </Modal>
       </div>
     )
   }

--
Gitblit v1.8.0