merge

zhangmrit · Jun 18, 2019 · 2db3285 · 2db3285
2 parents dbfcdd7 + 8504ef5
commit 2db3285
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -7,8 +7,9 @@ module.exports = {
         'useBuiltIns': 'entry'
       }
     ]
-  ], // if your use import on Demand, Use this code
-
+  ]
+  // if your use import on Demand, Use this code
+  // ,
   // plugins: [
   //   [ 'import', {
   //     'libraryName': 'ant-design-vue',

diff --git a/public/index.html b/public/index.html
@@ -7,10 +7,13 @@
     <link rel="icon" href="<%= BASE_URL %>logo.png">
     <title>RUOYI ANT</title>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vue.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/axios.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vue-router.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/vuex.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/moment.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/locale/zh-cn.js"></script>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/antd.min.css"/>
-    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/antd.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/antd-with-locales.min.js"></script>
     <style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
   </head>
   <body>

diff --git a/src/core/directives/action.js b/src/core/directives/action.js
@@ -10,7 +10,6 @@ import { checkPermission } from '@/utils/permissions'
  */
 const has = Vue.directive('has', {
   bind: function (el, binding, vnode) {
-    console.log('checkPermission', binding.value)
     if (!checkPermission(binding.value)) {
       el.parentNode && el.parentNode.removeChild(el) || (el.style.display = 'none')
     }

diff --git a/src/views/monitor/LoginLogList.vue b/src/views/monitor/LoginLogList.vue
@@ -36,11 +36,11 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <a-popconfirm title="确认清空吗？" @confirm="clean">
+      <a-popconfirm v-has="'monitor:logininfor:remove'" title="确认清空吗？" @confirm="clean">
         <a-icon slot="icon" type="question-circle-o" style="color: red" />
         <a-button type="danger" ghost icon="close">清空</a-button>
       </a-popconfirm>
-      <a-dropdown v-has="'role:del'" v-if="selectedRowKeys.length > 0">
+      <a-dropdown v-has="'monitor:logininfor:remove'" v-if="selectedRowKeys.length > 0">
         <a-button type="danger" icon="delete" @click="delByIds(selectedRowKeys)">删除</a-button>
       </a-dropdown>
     </div>

diff --git a/src/views/monitor/OperLogList.vue b/src/views/monitor/OperLogList.vue
@@ -40,11 +40,11 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <a-popconfirm title="确认清空吗？" @confirm="clean">
+      <a-popconfirm v-has="'monitor:operlog:remove'" title="确认清空吗？" @confirm="clean">
         <a-icon slot="icon" type="question-circle-o" style="color: red" />
         <a-button type="danger" ghost icon="close">清空</a-button>
       </a-popconfirm>
-      <a-dropdown v-has="'role:del'" v-if="selectedRowKeys.length > 0">
+      <a-dropdown v-has="'monitor:operlog:remove'" v-if="selectedRowKeys.length > 0">
         <a-button type="danger" icon="delete" @click="delByIds(selectedRowKeys)">删除</a-button>
       </a-dropdown>
     </div>

diff --git a/vue.config.js b/vue.config.js
@@ -14,6 +14,9 @@ module.exports = {
       // key表示包名(import foo from 'xx' 里的xx)
       // value表示window下的全局变量名(库暴露出来的namespace,可查lib对应的webpack配置里的library字段)
       'vue': 'Vue',
+      'axios': 'axios',
+      'vue-router': 'VueRouter',
+      'vuex': 'Vuex',
       'moment': 'moment',
       'ant-design-vue': 'antd'
     },