From b47023713b4a6dbca2b460c1d1237779b054c50c Mon Sep 17 00:00:00 2001
From: lxyer <237809796@qq.com>
Date: Thu, 13 Jun 2019 19:13:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 root/metadata/metaLink.html            |  9 ++++++---
 root/metadata/metaService.html         | 21 +++++++++++++++++----
 root/metadata/metatable/import.html    | 12 ++----------
 root/metadata/metatable/metaTable.html | 10 ++++++++--
 root/plat/db.html                      |  8 ++++----
 root/plat/index.html                   |  4 ++--
 root/qtask/debug.html                  |  2 +-
 root/qtask/list.html                   |  8 ++++----
 8 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/root/metadata/metaLink.html b/root/metadata/metaLink.html
index 4b8cf80..933704f 100644
--- a/root/metadata/metaLink.html
+++ b/root/metadata/metaLink.html
@@ -33,9 +33,12 @@
         <!--<p v-show="ckTable && ckTable.length">已选择 <code v-text="ckTable.length||0"></code> 个实体待导入</p>-->
     </div>
     <div class="col-xs-10">
-        <div style="padding-left: 10px;background-color: #ccc;width: 100%"> 关联关系管理 </div>
+        <div style="padding-left: 10px;background-color: #ccc;width: 100%"> 已关联的表 </div>
         <!-- 关联表列表 -->
-        <button v-for="link in linkInfos" @click="aliasB=link.alias" :class="['btn', {'btn-primary' :aliasB==link.alias}]" v-text="link.comment" style="margin: 5px"> </button>
+        <button v-for="link in linkInfos" @click="aliasB=link.alias" :class="['btn', {'btn-primary' :aliasB==link.alias}]" style="margin: 5px">
+            <i class="icon icon-table"></i>
+            <span v-text="link.comment"></span>
+        </button>
 
         <div class="pull-right" style="margin: 5px;">
             <button @click="status=1" v-show="status==0 && aliasB" class="btn">修改关联关系</button>
@@ -44,7 +47,7 @@
             <button @click="saveLink()" v-show="status==1" class="btn btn-primary" style="margin-left: 15px">保存</button>
         </div>
         <!--<div class="clearfix"></div>-->
-        <table class="table-bordered" style="width: 100%;">
+        <table v-show="linkInfos && linkInfos.length != 0" class="table-bordered" style="width: 100%;">
             <tr>
                 <th v-text="tableInfo[aliasA] && tableInfo[aliasA]['comment']"></th>
                 <th v-text="tableInfo[aliasB] && tableInfo[aliasB]['comment']"></th>
diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html
index cc64304..b3b58b4 100644
--- a/root/metadata/metaService.html
+++ b/root/metadata/metaService.html
@@ -71,9 +71,20 @@
             <span class="input-group-btn">
                 <button class="btn btn-default" type="button">选择业务类型</button>
             </span>
-            <select class="form-control" v-model="service" style="width: 180px;">
+
+            <div class="input-group-btn dropdown dropdown-hover">
+                <button class="btn" type="button" data-toggle="dropdown"><span v-text="serviceLabel"></span> <span class="caret"></span></button>
+                <ul class="dropdown-menu">
+                    <li v-for="item in services" @click="service=item.name;serviceLabel=item.comment;"><a href="javascript:;" v-text="`${item.comment}`"></a></li>
+                </ul>
+            </div>
+
+            <!--
+                <option v-for="item in services" :value="item.name"> {{item.name}}&nbsp;&nbsp;&nbsp;[{{item.comment}}]</option>
+            <select class="form-control dropdown-hover" v-model="service" style="width: 180px;">
                 <option v-for="item in services" :value="item.name"> {{item.name}}&nbsp;&nbsp;&nbsp;[{{item.comment}}]</option>
             </select>
+            -->
 
             <span class="input-group-btn pull-left" style="padding-left: 5px">
                 <button @click="createService()" :class="['btn']" type="button"> 新建业务</button>
@@ -422,7 +433,7 @@
                 <div class="modal-body">
                     <form class="form-horizontal">
                         <div class="form-group">
-                            <label class="col-sm-3">选择业务主表</label>
+                            <label class="col-sm-3 required">选择业务主表</label>
                             <div class="col-sm-6">
                                 <select class="form-control" v-model="createRow.table">
                                     <option v-for="x in tables" :value="x.alias" v-text="x.name + ' --- ' + x.comment"></option>
@@ -430,14 +441,14 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-3">业务名称</label>
+                            <label class="col-sm-3 required">业务名称</label>
                             <div class="col-sm-6">
                                 <input v-model="createRow.comment" class="form-control" placeholder="请输入 业务名称">
 
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-3">业务标识码</label>
+                            <label class="col-sm-3 required">业务标识码</label>
                             <div class="col-sm-6">
                                 <input v-model="createRow.name" class="form-control" placeholder="请输入 业务标识码,如:user_service">
                             </div>
@@ -500,6 +511,7 @@
             status: 0, //页面默认状态 0:默认 3:导出 4:导入 5:列表配置 6:查询配置 detail:详情配置 edit:表单配置 del:删除策略配置
             services: [],//业务列表
             service: "", //页面选择的业务类型
+            serviceLabel: "",
             table: "",//表别名
 
             //filter
@@ -530,6 +542,7 @@
             services: function (v) {
                 if (v.length > 0 && !vm.service) {
                     vm.service = v[0]["name"];
+                    vm.serviceLabel = v[0]["comment"]
                 }
             },
             service: function (v) {
diff --git a/root/metadata/metatable/import.html b/root/metadata/metatable/import.html
index 32aeae3..067f9ca 100644
--- a/root/metadata/metatable/import.html
+++ b/root/metadata/metatable/import.html
@@ -54,7 +54,7 @@
             </div>
         </div>
     </div>
-
+    <button @click="back()" type="button" class="btn btn-primary pull-right" data-dismiss="modal">返回</button>
     <ul class="nav nav-tabs">
         <li @click="cate = 'excel'" :class="{active: cate=='excel'}"><a href="javascript:;">从本地上传</a></li>
         <li @click="cate = 'mysql'" :class="{active: cate=='mysql'}"><a href="javascript:;">从数据源导入</a></li>
@@ -70,14 +70,7 @@
                 </div>-->
 
                 <!-- 文件上传 -->
-                <table class="table table-bordered">
-                    <thead>
-                    <tr>
-                        <th colspan="3">选择上传文件</th>
-                        <!--<th style="width: 100px">大小</th>
-                        <th style="width: 160px; text-align: center;">状态/操作</th>-->
-                    </tr>
-                    </thead>
+                <table class="table table-bordered" style="margin-top: 15px;">
                     <tbody class="uploader-files">
                     <tr class="file template">
                         <td style="width: 38px; padding: 3px"><div class="file-icon"></div></td>
@@ -260,7 +253,6 @@
 
     <div class="modal-footer" v-show="cate=='excel'">
         <button @click="ck=[]" type="button" class="btn btn-default" data-dismiss="modal">取消选择</button>
-        <button @click="back()" type="button" class="btn btn-default" data-dismiss="modal">取消</button>
         <button @click="saveTable()" type="button" class="btn btn-primary">确定</button>
     </div>
     <div class="modal-footer" v-show="cate=='mysql'">
diff --git a/root/metadata/metatable/metaTable.html b/root/metadata/metatable/metaTable.html
index 190348d..1564126 100644
--- a/root/metadata/metatable/metaTable.html
+++ b/root/metadata/metatable/metaTable.html
@@ -24,7 +24,7 @@
         <div class="input-group list-head">
             <div class="pull-left">
                 <span class="input-group-btn">
-                    <button @click="loadImportPage()" :class="['btn']" type="button"> 导入实体</button>
+                    <button @click="loadImportPage()" :class="['btn','btn-primary']" type="button"> <i class="icon icon-signin"></i>导入实体</button>
                 </span>
             </div>
 
@@ -70,8 +70,10 @@
                 <th>字段名</th>
                 <th>中文名</th>
                 <th>数据类型</th>
+                <!--
                 <th>输入类型</th>
                 <th>附加属性</th>
+                -->
                 <th>主键</th>
             </tr>
             <tr v-for="(item, index) in meta.items" class="item">
@@ -79,8 +81,10 @@
                 <td v-show="status!=2" v-text="item.name" style="background-color: rgb(235, 235, 228);"></td>
                 <td v-show="status!=2" v-text="item.label"></td>
                 <td v-show="status!=2" v-text="item.type"></td>
+                <!--
                 <td v-show="status!=2" v-text="item.inType"></td>
                 <td v-show="status!=2" v-text="item.inExt"></td>
+                -->
                 <td v-show="status!=2">
                     <i v-if="item.pk" class="icon icon-check"></i>
                 </td>
@@ -94,13 +98,15 @@
                 </td>
                 <td v-show="status==2"><input v-model="item.label" class="form-control"></td>
                 <td v-show="status==2"><input v-model="item.type" class="form-control"></td>
-                <td v-show="status==2"><!--<input v-model="item.inType">-->
+                <!--
+                <td v-show="status==2">
                     <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 v-show="status==2"><input v-model="item.inExt" class="form-control"></td>
+                -->
                 <td v-show="status==2" style="text-align: center">
                     <label>
                         <input v-model="item.pk" type="checkbox">
diff --git a/root/plat/db.html b/root/plat/db.html
index 875742b..780307f 100644
--- a/root/plat/db.html
+++ b/root/plat/db.html
@@ -79,13 +79,13 @@
                 <div class="modal-body">
                     <form class="form-horizontal">
                         <div class="form-group">
-                            <label for="queryId" class="col-sm-2">平台名称</label>
+                            <label for="queryId" class="col-sm-2 required">平台名称</label>
                             <div class="col-md-6 col-sm-10">
                                 <input v-model="row.name" class="form-control" id="queryId" placeholder="请输入 平台名称">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="queryId" class="col-sm-2">平台类型</label>
+                            <label for="queryId" class="col-sm-2 required">平台类型</label>
                             <div class="col-md-2 col-sm-10">
                                 <select class="form-control" v-model="row.cate">
                                     <option value="mysql">MySql</option>
@@ -97,13 +97,13 @@
                         </div>
 
                         <div class="form-group">
-                            <label for="url" class="col-sm-2">连接URL</label>
+                            <label for="url" class="col-sm-2 required">连接URL</label>
                             <div class="col-md-6">
                                 <input v-model="row.url" class="form-control" id="url" placeholder="请输入 连接URL">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="user" class="col-sm-2">连接账号</label>
+                            <label for="user" class="col-sm-2 required">连接账号</label>
                             <div class="col-md-2">
                                 <input v-model="row.user" class="form-control" id="user" placeholder="用户">
                             </div>
diff --git a/root/plat/index.html b/root/plat/index.html
index 9ba0756..ef0d498 100644
--- a/root/plat/index.html
+++ b/root/plat/index.html
@@ -46,13 +46,13 @@
                 <div class="modal-body">
                     <form class="form-horizontal">
                         <div class="form-group">
-                            <label for="queryId" class="col-md-2">平台名称</label>
+                            <label for="queryId" class="col-md-2 required">平台名称</label>
                             <div class="col-md-8">
                                 <input v-model="row.name" class="form-control" id="queryId" placeholder="请输入 平台名称">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="token" class="col-md-2">平台 Token</label>
+                            <label for="token" class="col-md-2 required">平台 Token</label>
                             <div class="col-md-8 col-sm-10">
                                 <input v-model="row.token" class="form-control" id="token" placeholder="请输入 Token">
                             </div>
diff --git a/root/qtask/debug.html b/root/qtask/debug.html
index 0e231d4..bc27d72 100644
--- a/root/qtask/debug.html
+++ b/root/qtask/debug.html
@@ -36,7 +36,7 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="para" class="col-sm-2">数据平台</label>
+                    <label for="para" class="col-sm-2 required">数据平台</label>
                     <div class="col-md-6">
                         <select v-model="row.dbPlatId" class="form-control">
                             <option></option>
diff --git a/root/qtask/list.html b/root/qtask/list.html
index bb76e50..7d350fc 100644
--- a/root/qtask/list.html
+++ b/root/qtask/list.html
@@ -62,19 +62,19 @@
                     <div class="modal-body">
                         <form class="form-horizontal">
                             <div class="form-group">
-                                <label class="col-sm-2">任务名称</label>
+                                <label class="col-sm-2 required">任务名称</label>
                                 <div class="col-md-6 col-sm-10">
                                     <input v-model="row.comment" class="form-control" placeholder="请输入 业务名称">
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label class="col-sm-2">任务标识码</label>
+                                <label class="col-sm-2 required">任务标识码</label>
                                 <div class="col-md-6 col-sm-10">
                                     <input v-model="row.name" :readonly="row.key" class="form-control" placeholder="请输入 任务标识码">
                                 </div>
                             </div>
                             <div class="form-group" style="margin-bottom: 0">
-                                <label class="col-md-2">执行内容</label>
+                                <label class="col-md-2 required">执行内容</label>
                                 <div class="col-md-10">
                                     <textarea v-model="row.content" class="form-control layui-code" rows="10" placeholder="请输入 SQL  (支持jfinal-enjoy模板语法)" > </textarea>
                                 </div>
@@ -86,7 +86,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="para" class="col-sm-2">数据平台</label>
+                                <label for="para" class="col-sm-2 required">数据平台</label>
                                 <div class="col-md-6">
                                     <select v-model="row.dbPlatId" class="form-control">
                                         <option></option>