From 62a575ae69d2f77d0bd8d9f30c4a5e0d4dcb9a7e Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Fri, 14 Jun 2019 19:29:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E[=E6=9C=8D=E5=8A=A1=E7=AB=AF?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=89=8B=E5=8A=A8=E6=9B=B4=E6=96=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/api/meta.js                                    |  5 +++++
 root/index.html                                     | 11 ++++++++++-
 root/metadata/dataList.html                         |  7 ++++++-
 src/main/java/net/tccn/base/MetaKit.java            |  2 +-
 src/main/java/net/tccn/service/MetadataService.java |  7 +++++++
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/root/api/meta.js b/root/api/meta.js
index d219d1a..d196d9f 100644
--- a/root/api/meta.js
+++ b/root/api/meta.js
@@ -111,6 +111,11 @@ const meta = {
 
     dataSave({name, data}) {
         return red.postX('/data/save', {name, data: JSON.stringify(data)})
+    },
+
+    // 刷新服务端缓存数据
+    refresh() {
+        return red.postX("/meta/refresh", {})
     }
 }
 
diff --git a/root/index.html b/root/index.html
index 4d00795..4946570 100644
--- a/root/index.html
+++ b/root/index.html
@@ -21,6 +21,12 @@
                     <a data-tab href="#" v-text="item.name"></a>
                 </li>
 
+                <li class="pull-right" title="刷新服务端缓存数据">
+                    <a @click="refresh()" href="javascript:;" style="padding: 6px 15px;border: 0;background-color: #404a53;color: #fff;">
+                        <i class="icon icon-repeat"></i>
+                    </a>
+                </li>
+
                 <li class="pull-right">
                     <a @click="logout()" href="javascript:;" style="padding: 6px 15px;border: 0;background-color: #404a53;color: #fff;">
                         <i class="icon icon-user"></i> 退出
@@ -78,7 +84,7 @@
 <script src="./res/zui/lib/sortable/zui.sortable.js"></script>
 <script src="./res/zui/lib/uploader/zui.uploader.min.js"></script>
 <script type="module">
-    import { logout } from './api/user.js'
+    let { refresh } = meta
     let { platList } = plat
     /*import meta from './api/meta.js'*/
     //import { getServiceInfo, getServiceDetail, getServiceList } from './api/meta.js'
@@ -159,6 +165,9 @@
                 this.menus = item.nodes || [item];
                 this.pageId = item.name;
             },
+            refresh() {
+                refresh().then(res => red.showOk())
+            },
             logout() {
                 console.log(12321)
                 logout()
diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html
index c126757..5319295 100644
--- a/root/metadata/dataList.html
+++ b/root/metadata/dataList.html
@@ -61,7 +61,12 @@
                     <option v-for="(t, index) in filter.filterType" :value="t.name" v-text="t.remark"></option>
                 </select>
                 <span class="input-group-addon fix-border fix-padding"></span>
-                <input type="text" class="form-control" v-model="filter['value']">
+                <input v-if="!filter.inType || filter.inType == 'INPUT'" type="text" class="form-control" v-model="filter['value']">
+                <select v-if="filter.inType == 'DICT'" class="form-control" v-model="filter['value']" style="width: 100px">
+                    <!-- option v-for="(t, index) in filter.filterType" :value="t.name" v-text="t.remark"></option -->
+                    <option value=""> 字典值一</option>
+                    <option value=""> 字典值二</option>
+                </select>
 
                 <span class="input-group-addon fix-border fix-padding" style="padding: 5px" title="删除过滤条件">
                 <a href="javascript:;" @click="filter.checked = false;"><i class="icon icon-trash"></i></a>
diff --git a/src/main/java/net/tccn/base/MetaKit.java b/src/main/java/net/tccn/base/MetaKit.java
index a696ee7..e77f9c4 100644
--- a/src/main/java/net/tccn/base/MetaKit.java
+++ b/src/main/java/net/tccn/base/MetaKit.java
@@ -46,7 +46,7 @@ public final class MetaKit {
     protected static String dcate;
     private static final JsonConvert convert = JsonConvert.root();
     // -----------------------------------
-    protected static void init() {
+    public static void init() {
         reload(MetaTable.class);
         reload(MetaLink.class);
         reload(MetaService.class);
diff --git a/src/main/java/net/tccn/service/MetadataService.java b/src/main/java/net/tccn/service/MetadataService.java
index 5405e13..219cc79 100644
--- a/src/main/java/net/tccn/service/MetadataService.java
+++ b/src/main/java/net/tccn/service/MetadataService.java
@@ -299,6 +299,13 @@ public class MetadataService extends BaseService { //arango
         return jBean.setBody(plats);
     }
 
+    @RestMapping(name = "refresh", comment = "刷新服务端缓存数据")
+    public JBean refresh() {
+        JBean jBean = new JBean();
+        MetaKit.init();
+        return jBean;
+    }
+
     // ------------------------------------ 对外服务 --------------------------------------
     @RestMapping(name = "cfg", auth = false, comment = " 功能配置")
     public JBean cfg(String name, @RestParam(name = "platToken") String token) {