From 3683e1475e8d74f690172a468518d88d91a69ccc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 20 八月 2020 20:15:48 +0800
Subject: [PATCH] 2020-08-20

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

diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 86ac880..cddb597 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -512,8 +512,11 @@
       let contents = []
       let images = []
 
-      item.subColumn.forEach(col => {
+      item.subColumn.forEach((col, index) => {
         if (!col.field || !record.hasOwnProperty(col.field)) return
+        if (index) {
+          col.Align = 'right'
+        }
         
         if (col.type === 'number') {
           let content = ''
@@ -558,7 +561,7 @@
             content = md5(content)
           }
 
-          contents.push(content)
+          contents.push({content, align: col.Align})
         } else if (col.type === 'picture') {
           let photos = []
           try {
@@ -568,7 +571,7 @@
           }
 
           photos.forEach(photo => {
-            images.push({url: photo, scale: col.scale === 'true', maxHeight: col.maxHeight || 128})
+            images.push({url: photo, align: col.Align, scale: col.scale === 'true', maxHeight: col.maxHeight || 128})
           })
         } else if (col.type === 'text') {
           let content = record[col.field]
@@ -601,7 +604,7 @@
             content = md5(content)
           }
 
-          contents.push(content)
+          contents.push({content, align: col.Align})
         } else if (col.type === 'link') {
           let content = col.nameField ? record[col.nameField] : ''
           let _href = record[col.field] || ''
@@ -631,7 +634,7 @@
 
           content = _href ? <a href={_href} target="_blank" rel="noopener noreferrer">{content}</a> : null
 
-          contents.push(content)
+          contents.push({content, align: col.Align})
         } else {
           let content = record[col.field]
 
@@ -643,7 +646,7 @@
             content = md5(content)
           }
 
-          contents.push(content)
+          contents.push({content, align: col.Align})
         }
       })
 
@@ -663,8 +666,8 @@
 
   getCospanContent = (type, contents, images) => {
     if (type === 'vertical') {
-      return contents.map((content, index) => {
-        return (<p key={index}>{content}</p>)
+      return contents.map((cont, index) => {
+        return (<p key={index} style={{textAlign: cont.align}}>{cont.content}</p>)
       })
     } else if (type === 'horizontal') {
       return contents.map((content, index) => {
@@ -674,18 +677,18 @@
       return (
         <div className="content-fence">
           <div className="content-fence-left">
-            {contents.map((content, index) => {
+            {contents.map((cont, index) => {
               if (index % 2 === 0) {
-                return (<p key={index}>{content}</p>)
+                return (<p key={index} style={{textAlign: cont.align}}>{cont.content}</p>)
               } else {
                 return ''
               }
             })}
           </div>
           <div className="content-fence-right">
-            {contents.map((content, index) => {
+            {contents.map((cont, index) => {
               if (index % 2 === 1) {
-                return (<p key={index}>{content}</p>)
+                return (<p key={index} style={{textAlign: cont.align}}>{cont.content}</p>)
               } else {
                 return ''
               }
@@ -696,7 +699,7 @@
     } else if (type === 'topPicBottomText') {
       return (
         <div className="content-fence">
-          <div className="content-fence-top">
+          <div className="content-fence-top" style={images[0] ? {textAlign: images[0].align} : null}>
             {images.map((_img, index) => {
               if (!_img.url) return ''
               if (_img.scale) {
@@ -707,8 +710,8 @@
             })}
           </div>
           <div className="content-fence-bottom">
-            {contents.map((content, index) => {
-              return (<p key={index}>{content}</p>)
+            {contents.map((cont, index) => {
+              return (<p key={index} style={{textAlign: cont.align}}>{cont.content}</p>)
             })}
           </div>
         </div>
@@ -716,7 +719,7 @@
     } else if (type === 'leftPicRightText') {
       return (
         <div className="content-fence">
-          <div className="content-fence-left">
+          <div className="content-fence-left" style={images[0] ? {textAlign: images[0].align} : null}>
             {images.map((_img, index) => {
               if (!_img.url) return ''
               if (_img.scale) {
@@ -727,8 +730,8 @@
             })}
           </div>
           <div className="content-fence-right">
-            {contents.map((content, index) => {
-              return (<p key={index}>{content}</p>)
+            {contents.map((cont, index) => {
+              return (<p key={index} style={{textAlign: cont.align}}>{cont.content}</p>)
             })}
           </div>
         </div>

--
Gitblit v1.8.0