From 8b7c75249a83b45dd53cc2177bb61bfa3d7e55cb Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 02 Mar 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/attestation/app.html |   30 ++++++++++++++++--------------
 1 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/attestation/app.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/attestation/app.html
index 4ba4d01..ae1206c 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/attestation/app.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/attestation/app.html
@@ -10,7 +10,7 @@
         <div class="layui-form toolbar">
         搜索：<input id="app-edit-search" class="layui-input search-input" type="text" placeholder="输入关键字"/>&emsp;
         <button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
-        <button id="app-btn-add" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
+        <button id="app-btn-add" class="layui-btn icon-btn permissions" permissions="saveOrUpdate"><i class="layui-icon">&#xe654;</i>添加</button>
         </div>
 
         <!-- 数据表格 -->
@@ -20,8 +20,8 @@
 
 <!-- 表格操作列 -->
 <script type="text/html" id="app-table-bar">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+    <a class="layui-btn layui-btn-primary layui-btn-xs permissions" permissions="saveOrUpdate" lay-event="edit">修改</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs permissions" permissions="clients-del" lay-event="del">删除</a>
 </script>
 
 <!-- 表单弹窗 -->
@@ -80,13 +80,16 @@
             page: true,
             cols: [[
                 {type: 'numbers'},
-                {field: 'clientId',width:180, sort: true, title: '应用标识'},
-                {field: 'clientName',width:200, sort: true, title: '应用名称'},
-                {field: 'clientSecretStr', width:180, sort: true, title: '应用密钥'},
-                {field: 'webServerRedirectUri',sort: true, title: '回调地址'},
-                {field: 'authorizedGrantTypes',width:250, sort: true, title: 'oauth授权方式'},
-                {align: 'center',width:150, toolbar: '#app-table-bar', title: '操作'}
-            ]]
+                {field: 'clientId',width:"10%", sort: true, title: '应用标识'},
+                {field: 'clientName',width:"10%", sort: true, title: '应用名称'},
+                {field: 'clientSecretStr', width:"10%", sort: true, title: '应用密钥'},
+                {field: 'webServerRedirectUri',width:"25%",sort: true, title: '回调地址'},
+                {field: 'authorizedGrantTypes',width:"35%", sort: true, title: 'oauth授权方式'},
+                {align: 'center',width:"10%", toolbar: '#app-table-bar', title: '操作'}
+            ]],
+            done:function(res){
+                permissionsInput(res,config);
+            }
         });
 
         // 工具条点击事件
@@ -109,7 +112,7 @@
                 layer.load(2);
                 admin.req('api-uaa/clients/' + obj.data.id, {}, function (data) {
                     layer.closeAll('loading');
-                    layer.msg('成功', {icon: 1, time: 500});
+                    layer.msg('成功', {icon: 1, time: 2000});
                     obj.del();
                 }, 'DELETE');
             });
@@ -154,13 +157,12 @@
             layer.load(2);
             admin.req('api-uaa/clients/saveOrUpdate', JSON.stringify(data.field), function (data) {
                 layer.closeAll('loading');
-                console.log(data);
                 if (data.code == 0) {
-                    layer.msg(data.msg, {icon: 1, time: 500});
+                    layer.msg(data.msg, {icon: 1, time: 2000});
                     table.reload('app-table');
                     layer.closeAll('page');
                 } else {
-                    layer.msg(data.msg, {icon: 2, time: 500});
+                    layer.msg(data.msg, {icon: 2, time: 2000});
                 }
             }, $('#app-form').attr('method'));
             return false;

--
Gitblit v1.8.0