Merge branch 'master' of https://github.com/jumpserver/lina

LICENSE

@@ -1,21 +1,339 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-Copyright (c) 2017-present PanJiaChen
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+                            Preamble
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+  The licenses for most software are designed to take away your
-copies or substantial portions of the Software.
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  When we speak of free software, we are referring to freedom, not
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+price.  Our General Public Licenses are designed to make sure that you
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+have the freedom to distribute copies of free software (and charge for
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+this service if you wish), that you receive source code or can get it
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+if you want it, that you can change the software or use pieces of it
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+in new free programs; and that you know you can do these things.
-SOFTWARE.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    {description}
+    Copyright (C) {year}  {fullname}
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  {signature of Ty Coon}, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

src/components/DetailCard/index.vue

@@ -3,7 +3,9 @@
     <div class="content">
       <el-row v-for="item in items" :key="'card-' + item.key" class="item" :gutter="10">
         <el-col :span="6"><div class="item-label" :style="{ 'text-align': align}"><label>{{ item.key }}: </label></div></el-col>
-        <el-col :span="18"><div class="item-text">{{ item.value }}</div></el-col>
+        <el-col :span="18"><div class="item-text">
+          <ItemValue :value="item.value" :item="item" />
+        </div></el-col>
       </el-row>
     </div>
   </IBox>
@@ -11,10 +13,11 @@
 
 <script>
 import IBox from '../IBox'
+import ItemValue from './value'
 
 export default {
   name: 'DetailCard',
-  components: { IBox },
+  components: { IBox, ItemValue },
   props: {
     title: {
       type: String,

src/components/DetailCard/value.vue

@@ -0,0 +1,25 @@
+<script>
+export default {
+  name: 'ItemValue',
+  props: {
+    value: {
+      type: [String, Function],
+      required: true
+    },
+    item: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  render(h) {
+    if (typeof this.value === 'function') {
+      return this.value(this.item)
+    }
+    return <span>{this.value}</span>
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/QuickActions/action.vue

@@ -0,0 +1,59 @@
+<template>
+  <tr>
+    <td>{{ action.title }}:</td>
+    <td>
+      <span>
+        <component :is="iType" v-model="action.attrs.model" v-bind="action.attrs" v-on="callbacks">{{ label }}</component>
+      </span>
+    </td>
+  </tr>
+</template>
+
+<script>
+import Switcher from '../Swicher'
+export default {
+  name: 'ActionItem',
+  components: {
+    Switcher
+  },
+  props: {
+    action: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      empty: () => {}
+    }
+  },
+  computed: {
+    iType() {
+      switch (this.action.type) {
+        case 'switcher':
+          return 'Switcher'
+        default:
+          return 'el-button'
+      }
+    },
+    label() {
+      return this.action.attrs ? this.action.attrs.label : ''
+    },
+    model() {
+      return this.action.attrs ? this.action.attrs.model : ''
+    },
+    callbacks() {
+      const wrappers = {}
+      const callbacks = this.action.callbacks || {}
+      for (const [event, callback] of Object.entries(callbacks)) {
+        wrappers[event] = (e) => callback(e, this.action)
+      }
+      return wrappers
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/QuickActions/index.vue

@@ -1,18 +1,23 @@
 <template>
   <IBox fa="fa-edit" :title="title" v-bind="$attrs">
     <div class="quick-actions">
-      <slot />
+      <table>
+        <ActionItem v-for="action of actions" :key="action.title" :action="action" />
+      </table>
     </div>
   </IBox>
 </template>
 
 <script>
 import { IBox } from '@/components'
+import ActionItem from './action'
 
+// 查看 views/users/users/UserDetail/UserInfo.vue 使用样例
 export default {
   name: 'QuickActions',
   components: {
-    IBox
+    IBox,
+    ActionItem
   },
   props: {
     title: {
@@ -20,6 +25,10 @@ export default {
       default() {
         return this.$tc('Quick update')
       }
+    },
+    actions: {
+      type: Array,
+      default: () => []
     }
   }
 }
@@ -42,6 +51,7 @@ export default {
   }
 
   .quick-actions >>> button {
-    padding: 1px 13px;
+    padding: 2px 10px;
+    font-size: 13px;
   }
 </style>

src/components/Swicher/index.vue

@@ -4,6 +4,7 @@
     :active-color="activeColor"
     inactive-color="#dcdfe6"
     v-bind="$attrs"
+    v-on="$listeners"
   />
 </template>
 

src/i18n/langs/cn.js

@@ -225,11 +225,16 @@ const cn = {
     'Date password updated': '更新密码日期',
     'MFA': '多因子认证',
     'Source': '用户来源',
-    'Reset MFA': '重置多因子认证',
+    'resetMFATitle': '重置多因子认证',
     'Send reset password mail': '发送重置密码邮件',
-    'Send reset ssh key mail': '发送重置密钥邮件',
+    'resetPublicKeyTitle': '发送重置密钥邮件',
+    'resetPasswordTitle': '发送重置密码邮件',
     'Unblock user': '解除登录限制',
-    'Force enabled MFA': '强制启用多因子认证'
+    'Force enabled MFA': '强制启用多因子认证',
+    'resetPasswordWarningMsg': '将失效用户当前密码，并发送重设密码邮件到用户邮箱',
+    'resetPasswordSuccessMsg': '已发送邮件到用户邮箱',
+    'resetPublicKeyWarningMsg': '将会失效用户当前密钥，并发送重置邮件到用户邮箱',
+    'resetPublicKeySuccessMsg': '已发送邮件到用户邮箱'
   },
   // 用户组
   assets: {

src/i18n/langs/en.js

@@ -83,7 +83,14 @@ const en = {
     'remote_app_granted': 'RemoteApp granted',
     'remote_app_permission': 'RemoteApp permission',
     'database_app_granted': 'DatabaseApp granted',
-    'database_app_permission': 'DatabaseApp permission'
+    'database_app_permission': 'DatabaseApp permission',
+    'resetPublicKeyTitle': 'Send reset ssh key mail',
+    'resetPasswordTitle': 'Send reset password mail',
+    'resetPasswordWarningMsg': 'This will reset the user password and send a reset mail',
+    'resetPasswordSuccessMsg': 'An e-mail has been sent to the user`s mailbox',
+    'resetPublicKeyWarningMsg': 'This will reset the user public key and send a reset mail',
+    'resetPublicKeySuccessMsg': 'An e-mail has been sent to the user`s mailbox',
+    'resetMFATitle': 'Reset MFA'
   },
   usergroup: {
     'user_group_list': 'User group list',

src/layout/components/GenericCreateUpdatePage/index.vue

@@ -18,8 +18,4 @@ export default {
 </script>
 
 <style scoped>
-  .ibox >>> .el-card__body {
-    padding-top: 30px;
-  }
-
 </style>

src/layout/components/GenericListPage/index.vue

@@ -1,7 +1,6 @@
 <template>
-  <Page>
+  <Page v-bind="$attrs">
-    <el-alert v-if="helpMessage" type="success"> {{ helpMessage }} </el-alert>
+    <ListTable v-bind="$attrs" />
-    <ListTable :table-config="tableConfig" :header-actions="headerActions" />
   </Page>
 </template>
 
@@ -12,15 +11,7 @@ export default {
   name: 'GenericListPage',
   components: {
     Page, ListTable
-  },
-  props: {
-    ...ListTable.props,
-    helpMessage: {
-      type: String,
-      default: null
-    }
   }
-
 }
 </script>
 

src/layout/components/Page/index.vue

@@ -1,13 +1,14 @@
 <template>
   <div class="page">
     <PageHeading>
-      <slot name="title">{{ pageTitle }}</slot>
+      <slot name="title">{{ iTitle }}</slot>
-      <span slot="rightSide">
+      <template #rightSide>
         <slot name="headingRightSide" />
-      </span>
+      </template>
     </PageHeading>
     <PageContent>
-      <slot name="default" />
+      <el-alert v-if="helpMessage" type="success"> {{ helpMessage }} </el-alert>
+      <slot />
     </PageContent>
   </div>
 </template>
@@ -15,7 +16,6 @@
 <script>
 import PageHeading from './PageHeading'
 import PageContent from './PageContent'
-// import PageSubMenu from './PageSubMenu'
 export default {
   name: 'Page',
   components: {
@@ -27,17 +27,13 @@ export default {
       type: String,
       default: ''
     },
-    submenu: {
+    helpMessage: {
-      type: Array,
-      default: () => []
-    },
-    activeMenu: {
       type: String,
-      default: () => ''
+      default: ''
     }
   },
   computed: {
-    pageTitle() {
+    iTitle() {
       // return ''
       return this.title || this.$tr(this.$route.meta.title)
     }

src/styles/element-ui.scss

@@ -92,11 +92,11 @@ td .el-button.el-button--mini {
   font-weight: 600;
 }
 
-.el-button.el-button--default:focus:not(.is-disabled), .el-button.el-button--default:hover:not(.is-disabled) {
+//.el-button.el-button--default:focus:not(.is-disabled), .el-button.el-button--default:hover:not(.is-disabled) {
-  color: #606266;
+//  color: #606266;
-  border-color: #d2d2d2;
+//  border-color: #d2d2d2;
-  background-color: #e6e6e6;
+//  background-color: #e6e6e6;
-}
+//}
 
 .el-button-group>.el-dropdown>.el-button {
   border-top-left-radius: 0;

src/utils/common.js

@@ -81,3 +81,24 @@ export function getApiPath(that) {
   const pagePath = that.$route.path
   return `/api/v1${pagePath}/`
 }
+
+export function confirm({ msg, title, perform, success, failed, type = 'warning' }) {
+  this.$alert(msg, title, {
+    type: type,
+    confirmButtonClass: 'el-button--info',
+    showCancelButton: true,
+    beforeClose: async(action, instance, done) => {
+      if (action !== 'confirm') return done()
+      instance.confirmButtonLoading = true
+      try {
+        await perform()
+        done()
+        if (typeof success === 'string') {
+          this.$message.success(success)
+        }
+      } finally {
+        instance.confirmButtonLoading = false
+      }
+    }
+  })
+}

src/views/audits/LoginLogList.vue

@@ -15,12 +15,12 @@ export default {
         url: '/api/v1/audits/login-logs/',
         columns: ['id', 'username', 'type', 'ip', 'city', 'user_agent', 'mfa', 'reason', 'status', 'datetime'],
         columnsMeta: {
-          'user_agent': {
+          id: {
+            type: 'index'
+          },
+          user_agent: {
             formatter: (row, column, cellValue) => cellValue.slice(0, 20),
             width: '150px'
-          },
-          'id': {
-            type: 'index'
           }
         },
         hasSelection: false

src/views/users/users/UserDetail/UserInfo.vue

@@ -4,73 +4,21 @@
       <DetailCard :items="detailItems" />
     </el-col>
     <el-col :md="10" :sm="24">
-      <QuickActions type="primary">
+      <QuickActions type="primary" :actions="quickActions" />
-        <table>
-          <tr>
-            <td>{{ $tc('Active') }}:</td>
-            <td>
-              <span>
-                <Switcher v-model="isActive" :width="50" />
-              </span>
-            </td>
-          </tr>
-          <tr>
-            <td>{{ $t('users.Force enabled MFA') }}:</td>
-            <td>
-              <span>
-                <Switcher v-model="isForceEnableMFA" :width="50" />
-              </span>
-            </td>
-          </tr>
-          <tr>
-            <td>{{ $t('users.Reset MFA') }}:</td>
-            <td>
-              <span>
-                <el-button type="primary" size="mini">{{ $tc('Reset') }}</el-button>
-              </span>
-            </td>
-          </tr>
-          <tr>
-            <td>{{ $t('users.Send reset password mail') }}:</td>
-            <td>
-              <span>
-                <el-button type="primary" size="mini">{{ $tc('Send') }}</el-button>
-              </span>
-            </td>
-          </tr>
-          <tr>
-            <td>{{ $t('users.Send reset ssh key mail') }}:</td>
-            <td>
-              <span>
-                <el-button type="primary" size="mini">{{ $tc('Send') }}</el-button>
-              </span>
-            </td>
-          </tr>
-          <tr>
-            <td>{{ $t('users.Unblock user') }}</td>
-            <td>
-              <span>
-                <el-button type="primary" size="mini">{{ $tc('Unblock') }}</el-button>
-              </span>
-            </td>
-          </tr>
-        </table>
-      </QuickActions>
       <RelationCard type="info" style="margin-top: 15px" v-bind="relationConfig" />
     </el-col>
   </el-row>
 </template>
 
 <script>
-import { DetailCard, RelationCard, QuickActions, Switcher } from '@/components'
+import { DetailCard, RelationCard, QuickActions } from '@/components'
 
 export default {
   name: 'UserInfo',
   components: {
     DetailCard,
     RelationCard,
-    QuickActions,
+    QuickActions
-    Switcher
   },
   props: {
     object: {
@@ -79,9 +27,112 @@ export default {
     }
   },
   data() {
+    const vm = this
     return {
-      isActive: this.object.is_active,
+      quickActions: [
-      isForceEnableMFA: this.object.mfa_level === 2,
+        {
+          title: this.$tc('Active'),
+          type: 'switcher',
+          attrs: {
+            model: this.object.is_active
+          },
+          callbacks: {
+            change: function(v, item) {
+              const url = `/api/v1/users/users/${vm.object.id}/`
+              const data = { is_active: v }
+              vm.$axios.patch(url, data).catch(() => {
+                item.attrs.model = !v
+              })
+            }
+          }
+        },
+        {
+          title: this.$t('users.resetMFATitle'),
+          attrs: {
+            type: 'primary',
+            label: this.$tc('Reset')
+          },
+          callbacks: {
+            click: function() {
+              console.log('click')
+            }
+          }
+        },
+        {
+          title: this.$t('users.resetPasswordTitle'),
+          attrs: {
+            type: 'primary',
+            label: this.$tc('Send')
+          },
+          callbacks: {
+            click: function() {
+              const warnMsg = vm.$t('users.resetPasswordWarningMsg')
+              const warnTitle = vm.$tc('Info')
+              const url = `/api/v1/users/users/${vm.object.id}/password/reset/`
+              const successMsg = vm.$t('users.resetPasswordSuccessMsg')
+              vm.$confirm(warnMsg, warnTitle, {
+                type: 'warning',
+                confirmButtonClass: 'el-button--warning',
+                showCancelButton: true,
+                beforeClose: async(action, instance, done) => {
+                  if (action !== 'confirm') return done()
+                  instance.confirmButtonLoading = true
+                  try {
+                    await vm.$axios.patch(url, {})
+                    done()
+                    vm.$message.success(successMsg)
+                  } finally {
+                    instance.confirmButtonLoading = false
+                  }
+                }
+              })
+            }
+          }
+        },
+        {
+          title: this.$t('users.resetPublicKeyTitle'),
+          attrs: {
+            type: 'primary',
+            label: this.$tc('Send')
+          },
+          callbacks: {
+            click: function() {
+              const warnMsg = vm.$t('users.resetPublicKeyWarningMsg')
+              const warnTitle = vm.$tc('Info')
+              const url = `/api/v1/users/users/${vm.object.id}/pubkey/reset/`
+              const successMsg = vm.$t('users.resetPasswordSuccessMsg')
+              vm.$confirm(warnMsg, warnTitle, {
+                type: 'warning',
+                confirmButtonClass: 'el-button--warning',
+                showCancelButton: true,
+                beforeClose: async(action, instance, done) => {
+                  if (action !== 'confirm') return done()
+                  instance.confirmButtonLoading = true
+                  try {
+                    await vm.$axios.patch(url, {})
+                    done()
+                    vm.$message.success(successMsg)
+                  } finally {
+                    instance.confirmButtonLoading = false
+                  }
+                }
+              })
+            }
+          }
+        },
+        {
+          title: this.$t('users.Unblock user'),
+          attrs: {
+            type: 'primary',
+            label: this.$tc('Unblock')
+          },
+          callbacks: {
+            click: function() {
+              console.log('click')
+            }
+          }
+        }
+      ],
       relationConfig: {
         icon: 'fa-user',
         title: this.$t('users.User groups'),