From b0ae01cc69c5d88c48a9c321ab4ec88ec7664cbf Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Thu, 13 Jun 2019 18:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3[=E8=A1=A8=E5=8D=95=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEinExt]=E5=A1=AB=E5=86=99=E6=97=A0=E6=95=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/metadata/metaService.html            | 23 +++++++++++------------
 src/main/java/net/tccn/meta/FromItem.java |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html
index 1b1af4d..cc64304 100644
--- a/root/metadata/metaService.html
+++ b/root/metadata/metaService.html
@@ -647,15 +647,15 @@
                             if (!shows[j]['label']) {
                                 shows[j]['label'] = this.getFieldLabel(v[i])
                             }
-                            if (!shows[j]['fmt']) {
+                            /*if (!shows[j]['fmt']) {
                                 shows[j]['fmt'] = this.getFiledInExt(v[i])
-                            }
+                            }*/
                             continue a
                         }
                     }
                     let label = this.getFieldLabel(v[i])
-                    let fmt = this.getFiledInExt(v[i])
-                    shows.push({col: v[i], label: label, fmt: fmt})
+                    //let fmt = this.getFiledInExt(v[i])
+                    shows.push({col: v[i], label: label})
                 }
 
                 //去除删除的
@@ -711,15 +711,15 @@
                             if (!details[j]['label']) {
                                 details[j]['label'] = this.getFieldLabel(v[i])
                             }
-                            if (!details[j]['fmt']) {
+                            /*if (!details[j]['fmt']) {
                                 details[j]['fmt'] = this.getFiledInExt(v[i])
-                            }
+                            }*/
                             continue a
                         }
                     }
                     // 新的
                     let label = this.getFieldLabel(v[i])
-                    let fmt = this.getFiledInExt(v[i])
+                    //let fmt = this.getFiledInExt(v[i])
                     /*c:for (let j in details) {
                         if (v[i] == details[j]['col']) {
                             if (details[j]['label']) {
@@ -732,7 +732,7 @@
                             continue c
                         }
                     }*/
-                    details.push({col: v[i], label: label, fmt: fmt})
+                    details.push({col: v[i], label: label})
                 }
 
                 //去除删除的
@@ -758,16 +758,15 @@
                             if (!edits[j]['label']) {
                                 edits[j]['label'] = this.getFieldLabel(v[i])
                             }
-                            if (!edits[j]['fmt']) {
+                            /*if (!edits[j]['fmt']) {
                                 edits[j]['fmt'] = this.getFiledInExt(v[i])
-                            }
+                            }*/
                             continue a
                         }
                     }
                     // 新的
                     let label = this.getFieldLabel(v[i])
-                    let fmt = this.getFiledInExt(v[i]) || ""
-                    edits.push({col: v[i], label: label, fmt: fmt, cks:[]})
+                    edits.push({col: v[i], label: label, cks:[]})
                 }
 
                 //去除删除的
diff --git a/src/main/java/net/tccn/meta/FromItem.java b/src/main/java/net/tccn/meta/FromItem.java
index 715f00e..c6a28a3 100644
--- a/src/main/java/net/tccn/meta/FromItem.java
+++ b/src/main/java/net/tccn/meta/FromItem.java
@@ -12,7 +12,7 @@ public class FromItem {
     private String col;
     private String label;
     private String inType;
-    private String fmt;
+    private String InExt;
     private List<String> cks;
 
 }