From 7590f73651f05f139137c46baf8dc93c1c9bc03f Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Wed, 12 Jun 2019 11:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/metadata/metaService.html                | 19 +++++++++++++++----
 src/main/java/net/tccn/base/MetaKit.java      |  2 +-
 .../java/net/tccn/base/MetaListenter.java     | 13 ++++++++-----
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html
index 8087ba0..1b1af4d 100644
--- a/root/metadata/metaService.html
+++ b/root/metadata/metaService.html
@@ -283,7 +283,8 @@
                     <th></th>
                     <th>数据字段</th>
                     <th>展示名称</th>
-                    <th>格式化</th>
+                    <th>格式化类型</th>
+                    <th>附加参数</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -293,7 +294,16 @@
                     </td>
                     <td v-text="item.col" style="background-color: rgb(235, 235, 228);"></td>
                     <td style="padding: 1px;"><input v-model="item.label" class="form-control" style="width: 130px;padding: 0px"></td>
-                    <td style="padding: 1px;"><input v-model="item.fmt" class="form-control" style="width: 130px;padding: 0px"></td>
+                    <td style="padding: 1px;">
+                        <select v-model="item.inType" class="form-control" style="width: 130px">
+                            <option></option>
+                            <option v-for="x in inTypes" :value="x">{{x}}</option>
+                        </select>
+                    </td>
+                    <td style="padding: 1px;" title="格式化类型为：funs或qtask的时候需要填写附加参数">
+                        <input v-show="item.inType == 'FUNC' || item.inType == 'QTASK' || item.inType == 'DICT'" v-model="item.inExt" class="form-control" style="width: 130px;padding: 0px">
+                        <input disabled v-show="item.inType != 'FUNC' && item.inType != 'QTASK' && item.inType != 'DICT'" v-model="item.inExt" class="form-control" style="width: 130px;padding: 0px">
+                    </td>
                 </tr>
                 </tbody>
             </table>
@@ -326,8 +336,9 @@
                             <option v-for="x in inTypes" :value="x">{{x}}</option>
                         </select>
                     </td>
-                    <td style="padding: 1px;">
-                        <input v-model="item.fmt" class="form-control" style="width: 130px;padding: 0px">
+                    <td style="padding: 1px;" title="格式化类型为：funs或qtask的时候需要填写附加参数">
+                        <input v-show="item.inType == 'FUNC' || item.inType == 'QTASK' || item.inType == 'DICT'" v-model="item.inExt" class="form-control" style="width: 130px;padding: 0px">
+                        <input disabled v-show="item.inType != 'FUNC' && item.inType != 'QTASK' && item.inType != 'DICT'" v-model="item.inExt" class="form-control" style="width: 130px;padding: 0px">
                     </td>
                     <td style="padding: 1px;overflow: inherit;">
                         <div class="dropdown dropdown-hover">
diff --git a/src/main/java/net/tccn/base/MetaKit.java b/src/main/java/net/tccn/base/MetaKit.java
index 06f0f57..7abe579 100644
--- a/src/main/java/net/tccn/base/MetaKit.java
+++ b/src/main/java/net/tccn/base/MetaKit.java
@@ -338,7 +338,7 @@ public final class MetaKit {
                 .set("pk", _pks.toString())
                 .set("title", comment)
                 .set("items", _items2)
-                .set("shows", _shows)
+                .set("shows", shows)
                 .set("filters", _filters)
                 .set("edits", edits)
                 .set("details", details);
diff --git a/src/main/java/net/tccn/base/MetaListenter.java b/src/main/java/net/tccn/base/MetaListenter.java
index 992c487..dc65d48 100644
--- a/src/main/java/net/tccn/base/MetaListenter.java
+++ b/src/main/java/net/tccn/base/MetaListenter.java
@@ -6,6 +6,7 @@ import org.redkale.util.ResourceFactory;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * @author: liangxianyou
@@ -19,12 +20,14 @@ public class MetaListenter implements ApplicationListener {
 
     @Override
     public void preStart(Application application) {
-        ResourceFactory rf = application.getResourceFactory();
-        rf.inject(this);
+        CompletableFuture.runAsync(()-> {
+            ResourceFactory rf = application.getResourceFactory();
+            rf.inject(this);
 
-        MetaKit.dcate = dcate;
-        MetaKit.init();
-        TplKit.use(true).addTpl(new File(FileKit.rootPath(), tplPath));
+            MetaKit.dcate = dcate;
+            MetaKit.init();
+            TplKit.use(true).addTpl(new File(FileKit.rootPath(), tplPath));
+        });
     }
 
     @Override