From 2b14cf022520243cc7afe4b13fab20d52a1d7cc5 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 9 Jul 2020 16:25:42 +0800
Subject: [PATCH 01/22] =?UTF-8?q?ci(docker):=20=E4=BF=AE=E6=94=B9docker?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 409c50475..4456a3ca0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,7 @@
 FROM node:10 as stage-build
+ARG VERSION
+ENV VERSION=$VERSION
+
 WORKDIR /data
 ADD . /data
 RUN cd utils && bash -ix build.sh

From 8c6d2a1150e781525b5a01d9392e05b99d8f366f Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 9 Jul 2020 17:05:47 +0800
Subject: [PATCH 02/22] =?UTF-8?q?ci(build):=20=E4=BF=AE=E6=94=B9=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=EF=BC=8C=E4=BD=BF=E7=94=A8=E4=B8=A5=E6=A0=BC=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile     | 5 ++---
 utils/build.sh | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4456a3ca0..fe66281a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,8 @@ ENV VERSION=$VERSION
 
 WORKDIR /data
 ADD . /data
-RUN cd utils && bash -ix build.sh
-
+RUN cd utils && bash -xieu build.sh
 
 FROM nginx:alpine
-COPY --from=stage-build /data/release/lina /opt/lina/
+COPY --from=stage-build /data/release/lina /opt/lina
 COPY nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/utils/build.sh b/utils/build.sh
index e5ebb35be..cf4a45641 100644
--- a/utils/build.sh
+++ b/utils/build.sh
@@ -16,7 +16,7 @@ function change_version() {
 }
 
 # 修改版本号文件
-if [[ -n ${VERSION} ]]; then
+if [[ -n ${VERSION-''} ]]; then
   change_version || exit 2
 fi
 

From 57b6e029606c3d4524f53824eba9e60f615dc1d0 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 9 Jul 2020 15:35:44 +0800
Subject: [PATCH 03/22] =?UTF-8?q?fix(Docker):=20=E4=BF=AE=E6=94=B9Dockerfi?=
 =?UTF-8?q?le=EF=BC=8C=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8build.sh?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 82bb15c9a..409c50475 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,9 @@
 FROM node:10 as stage-build
 WORKDIR /data
-ADD ./package.json /data/package.json
-ADD ./yarn.lock /data/yarn.lock
-RUN yarn
 ADD . /data
-RUN yarn build:prod
+RUN cd utils && bash -ix build.sh
 
 
 FROM nginx:alpine
-COPY --from=stage-build /data/lina /opt/lina/
+COPY --from=stage-build /data/release/lina /opt/lina/
 COPY nginx.conf /etc/nginx/conf.d/default.conf

From bbccba37311791a5bee3dcd10c5b8cfde3f4aae1 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 9 Jul 2020 16:25:42 +0800
Subject: [PATCH 04/22] =?UTF-8?q?ci(docker):=20=E4=BF=AE=E6=94=B9docker?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 409c50475..4456a3ca0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,7 @@
 FROM node:10 as stage-build
+ARG VERSION
+ENV VERSION=$VERSION
+
 WORKDIR /data
 ADD . /data
 RUN cd utils && bash -ix build.sh

From 4289c36bd4955a9e4a98f3b827f0096fc794c7ca Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 9 Jul 2020 17:05:47 +0800
Subject: [PATCH 05/22] =?UTF-8?q?ci(build):=20=E4=BF=AE=E6=94=B9=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=EF=BC=8C=E4=BD=BF=E7=94=A8=E4=B8=A5=E6=A0=BC=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile     | 5 ++---
 utils/build.sh | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4456a3ca0..fe66281a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,8 @@ ENV VERSION=$VERSION
 
 WORKDIR /data
 ADD . /data
-RUN cd utils && bash -ix build.sh
-
+RUN cd utils && bash -xieu build.sh
 
 FROM nginx:alpine
-COPY --from=stage-build /data/release/lina /opt/lina/
+COPY --from=stage-build /data/release/lina /opt/lina
 COPY nginx.conf /etc/nginx/conf.d/default.conf
diff --git a/utils/build.sh b/utils/build.sh
index e5ebb35be..cf4a45641 100644
--- a/utils/build.sh
+++ b/utils/build.sh
@@ -16,7 +16,7 @@ function change_version() {
 }
 
 # 修改版本号文件
-if [[ -n ${VERSION} ]]; then
+if [[ -n ${VERSION-''} ]]; then
   change_version || exit 2
 fi
 

From 4973c6261897604bc574bda16d099be3741cd0d5 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Mon, 13 Jul 2020 19:26:40 +0800
Subject: [PATCH 06/22] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E4=B8=8D=E4=B8=BALocal=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E7=A6=81=E6=AD=A2=E6=9B=B4=E6=96=B0=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/jumpserver/trello/issues/44
---
 src/views/users/User/UserCreateUpdate.vue    | 2 +-
 src/views/users/User/UserDetail/UserInfo.vue | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue
index 611ddd6fa..b6d73695b 100644
--- a/src/views/users/User/UserCreateUpdate.vue
+++ b/src/views/users/User/UserCreateUpdate.vue
@@ -40,7 +40,7 @@ export default {
             if (formValue.update_password) {
               return true
             }
-            return this.$route.meta.action !== 'update'
+            return this.$route.meta.action !== 'update' || formValue.source !== 'local'
           }
         },
         password: {
diff --git a/src/views/users/User/UserDetail/UserInfo.vue b/src/views/users/User/UserDetail/UserInfo.vue
index bb3ff808a..b2afb6d3b 100644
--- a/src/views/users/User/UserDetail/UserInfo.vue
+++ b/src/views/users/User/UserDetail/UserInfo.vue
@@ -56,6 +56,7 @@ export default {
           title: this.$t('users.quickUpdate.resetMFA'),
           attrs: {
             type: 'primary',
+            disabled: !this.object.mfa_enabled,
             label: this.$t('common.Reset')
           },
           callbacks: {
@@ -87,6 +88,7 @@ export default {
           title: this.$t('users.quickUpdate.resetPassword'),
           attrs: {
             type: 'primary',
+            disabled: this.object.source !== 'local',
             label: this.$t('users.quickUpdate.send')
           },
           callbacks: {

From f976800cdefea5cc2bf63d81bc24a51c1899eba4 Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 15 Jul 2020 17:47:22 +0800
Subject: [PATCH 07/22] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=8C=89=E9=92=AE=E9=AB=98=E4=BA=AE=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=20(#187)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/element-ui.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 19bbf6233..e6482470c 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -96,7 +96,7 @@ 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:hover:not(.is-disabled) {
   color: #606266;
   border-color: #d2d2d2;
   background-color: #e6e6e6;
@@ -431,7 +431,7 @@ a {
 
 .el-button--danger.is-plain {
   color: $--color-danger;
-  background: white;
+  background: #ffffff;
   border-color: $--color-danger;
 }
 

From b82231f3ea250b7393e2b8b9c53da887fea1a549 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Tue, 14 Jul 2020 11:32:10 +0800
Subject: [PATCH 08/22] =?UTF-8?q?fix(Userlist):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A6=81=E6=AD=A2=E6=9B=B4=E6=96=B0=E5=92=8C=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/jumpserver/trello/issues/29
---
 src/views/users/User/UserList.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue
index cc6eab91e..913348c60 100644
--- a/src/views/users/User/UserList.vue
+++ b/src/views/users/User/UserList.vue
@@ -46,12 +46,21 @@ export default {
           actions: {
             formatterArgs: {
               hasDelete: () => this.currentOrgIsDefault,
+              canUpdate: function(row, cellValue) {
+                return row.can_update
+              },
+              canDelete: function(row, cellValue) {
+                return row.can_delete
+              },
               extraActions: [
                 {
                   title: this.$t('users.Remove'),
                   name: 'remove',
                   type: 'warning',
                   has: () => !this.currentOrgIsDefault,
+                  can: function(row, cellValue) {
+                    return row.can_delete
+                  },
                   callback: this.removeUserFromOrg
                 }
               ]

From be213268fa48f20be293a3a0ab571a3548c43903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=AB=E5=8D=83=E6=B5=81?=
 <40739051+jym503558564@users.noreply.github.com>
Date: Wed, 15 Jul 2020 17:51:10 +0800
Subject: [PATCH 09/22] =?UTF-8?q?fix(firefox=5Ftime=5Ffix):=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=9C=89=E4=BA=9B=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E5=9C=A8firefox=E4=B8=8A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=87=BA=E6=9D=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#189)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ListTable/formatters/DateFormatter.vue | 4 ++--
 src/views/audits/CommandExecutionList.vue             | 7 ++-----
 src/views/audits/FTPLogList.vue                       | 7 +------
 src/views/audits/LoginLogList.vue                     | 7 ++-----
 src/views/audits/OperateLogList.vue                   | 7 ++-----
 src/views/audits/PasswordChangeLogList.vue            | 7 ++-----
 src/views/sessions/SessionList/BaseList.vue           | 7 ++-----
 7 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/src/components/ListTable/formatters/DateFormatter.vue b/src/components/ListTable/formatters/DateFormatter.vue
index 31e041ae3..88a2f4156 100644
--- a/src/components/ListTable/formatters/DateFormatter.vue
+++ b/src/components/ListTable/formatters/DateFormatter.vue
@@ -4,14 +4,14 @@
 
 <script>
 import BaseFormatter from './base'
+import { toSafeLocalDateStr } from '@/utils/common'
 export default {
   name: 'DateFormatter',
   extends: BaseFormatter,
   data() {
     let value
     if (this.cellValue) {
-      const dt = new Date(this.cellValue)
-      value = this.$d(dt, 'medium')
+      value = toSafeLocalDateStr(this.cellValue)
     } else {
       value = ''
     }
diff --git a/src/views/audits/CommandExecutionList.vue b/src/views/audits/CommandExecutionList.vue
index 17b94a14a..b5554dc07 100644
--- a/src/views/audits/CommandExecutionList.vue
+++ b/src/views/audits/CommandExecutionList.vue
@@ -9,7 +9,7 @@
 
 <script type="text/jsx">
 import GenericListPage from '@/layout/components/GenericListPage'
-import { getDaysAgo, toSafeLocalDateStr } from '@/utils/common'
+import { getDaysAgo } from '@/utils/common'
 import { Dialog, ListTable } from '@/components'
 import { DisplayFormatter } from '@/components/ListTable/formatters'
 import { setUrlParam } from '@/utils/common'
@@ -66,10 +66,7 @@ export default {
             }
           },
           date_start: {
-            width: '160px',
-            formatter: function(row, cell, value) {
-              return toSafeLocalDateStr(value)
-            }
+            width: '160px'
           }
         },
         extraQuery: {
diff --git a/src/views/audits/FTPLogList.vue b/src/views/audits/FTPLogList.vue
index 56c203d58..2673969c9 100644
--- a/src/views/audits/FTPLogList.vue
+++ b/src/views/audits/FTPLogList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import GenericListPage from '@/layout/components/GenericListPage'
-import { getDaysAgo, toSafeLocalDateStr } from '@/utils/common'
+import { getDaysAgo } from '@/utils/common'
 
 export default {
   components: {
@@ -42,11 +42,6 @@ export default {
           },
           is_success: {
             width: '80px'
-          },
-          date_start: {
-            formatter: function(row, cell, value) {
-              return toSafeLocalDateStr(value)
-            }
           }
         },
         extraQuery: {
diff --git a/src/views/audits/LoginLogList.vue b/src/views/audits/LoginLogList.vue
index f83212e1f..c6b2ad252 100644
--- a/src/views/audits/LoginLogList.vue
+++ b/src/views/audits/LoginLogList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import GenericListPage from '@/layout/components/GenericListPage'
-import { getDaysAgo, toSafeLocalDateStr } from '@/utils/common'
+import { getDaysAgo } from '@/utils/common'
 
 export default {
   components: {
@@ -40,10 +40,7 @@ export default {
             width: '100px'
           },
           datetime: {
-            width: '160px',
-            formatter: function(row, cell, value) {
-              return toSafeLocalDateStr(value)
-            }
+            width: '160px'
           },
           reason: {
             showOverflowTooltip: true
diff --git a/src/views/audits/OperateLogList.vue b/src/views/audits/OperateLogList.vue
index dc476bdb6..3cd99a2be 100644
--- a/src/views/audits/OperateLogList.vue
+++ b/src/views/audits/OperateLogList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import GenericListPage from '@/layout/components/GenericListPage'
-import { getDaysAgo, toSafeLocalDateStr } from '@/utils/common'
+import { getDaysAgo } from '@/utils/common'
 
 export default {
   components: {
@@ -29,10 +29,7 @@ export default {
             showOverflowTooltip: true
           },
           datetime: {
-            width: '160px',
-            formatter: function(row, cell, value) {
-              return toSafeLocalDateStr(value)
-            }
+            width: '160px'
           },
           remote_addr: {
             width: '140px'
diff --git a/src/views/audits/PasswordChangeLogList.vue b/src/views/audits/PasswordChangeLogList.vue
index 00a808508..9558ffd37 100644
--- a/src/views/audits/PasswordChangeLogList.vue
+++ b/src/views/audits/PasswordChangeLogList.vue
@@ -4,7 +4,7 @@
 
 <script>
 import GenericListPage from '@/layout/components/GenericListPage'
-import { getDaysAgo, toSafeLocalDateStr } from '@/utils/common'
+import { getDaysAgo } from '@/utils/common'
 
 export default {
   components: {
@@ -29,10 +29,7 @@ export default {
             showOverflowTooltip: true
           },
           datetime: {
-            width: '180px',
-            formatter: function(row, cell, value) {
-              return toSafeLocalDateStr(value)
-            }
+            width: '180px'
           }
         },
         extraQuery: {
diff --git a/src/views/sessions/SessionList/BaseList.vue b/src/views/sessions/SessionList/BaseList.vue
index cb46f54d3..9e45081d6 100644
--- a/src/views/sessions/SessionList/BaseList.vue
+++ b/src/views/sessions/SessionList/BaseList.vue
@@ -4,7 +4,7 @@
 
 <script type="text/jsx">
 import ListTable from '@/components/ListTable'
-import { timeOffset, toSafeLocalDateStr, getDaysAgo } from '@/utils/common'
+import { timeOffset, getDaysAgo } from '@/utils/common'
 import { ActionsFormatter } from '@/components/ListTable/formatters'
 export default {
   name: 'BaseList',
@@ -71,10 +71,7 @@ export default {
             formatter: null
           },
           date_start: {
-            width: '100px',
-            formatter: function(row) {
-              return toSafeLocalDateStr(row.date_start)
-            }
+            width: '100px'
           },
           duration: {
             label: this.$t('sessions.duration'),

From 326302ea5f9328a7deafc607547dd9af4584d6ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=AB=E5=8D=83=E6=B5=81?=
 <40739051+jym503558564@users.noreply.github.com>
Date: Wed, 15 Jul 2020 17:52:54 +0800
Subject: [PATCH 10/22] =?UTF-8?q?fix(setting):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=89=E5=85=A8=E8=AE=BE=E7=BD=AE=E7=9A=84=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8F=90=E9=86=92=20(#190)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json          |  5 +++++
 src/i18n/langs/en.json          |  5 +++++
 src/views/settings/Security.vue | 24 +++++++++++++++++++++---
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 33d1a2f37..a74039290 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -636,6 +636,11 @@
       "securityPasswordUpperCase": "开启后，用户密码修改、重置必须包含大写字母",
       "securityServiceAccountRegistration": "允许使用bootstrap token注册终端, 当终端注册成功后可以禁止"
     },
+    "validatorMessage": {
+      "EnsureThisValueIsGreaterThanOrEqualTo3": "请确保该值大于或者等于 3",
+      "EnsureThisValueIsGreaterThanOrEqualTo5": "请确保该值大于或者等于 5",
+      "EnsureThisValueIsGreaterThanOrEqualTo6": "请确保该值大于或者等于 6"
+    },
     "import": "导入",
     "importLdapUserTip": "请先提交LDAP配置再进行导入",
     "importLdapUserTitle": "LDAP 用户列表",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index ea0b83dbc..78f136609 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -635,6 +635,11 @@
       "securityPasswordUpperCase": "After opening, the user password changes and resets must contain uppercase letters",
       "securityServiceAccountRegistration": "Allow using bootstrap token register service account, when terminal setup, can disable it"
     },
+    "validatorMessage": {
+      "EnsureThisValueIsGreaterThanOrEqualTo3": "Ensure this value is greater than or equal to 3",
+      "EnsureThisValueIsGreaterThanOrEqualTo5": "Ensure this value is greater than or equal to 5",
+      "EnsureThisValueIsGreaterThanOrEqualTo6": "Ensure this value is greater than or equal to 6"
+    },
     "import": "Import",
     "importLdapUserTip": "Please submit the LDAP configuration before import",
     "importLdapUserTitle": "LDAP user list",
diff --git a/src/views/settings/Security.vue b/src/views/settings/Security.vue
index 1b0ce49d9..e1ce66a55 100644
--- a/src/views/settings/Security.vue
+++ b/src/views/settings/Security.vue
@@ -29,6 +29,21 @@ export default {
     }
   },
   data() {
+    var validatorLoginLimitCount = (rule, value, callback) => {
+      if (parseInt(value) < 3) {
+        return callback(new Error(this.$t('setting.validatorMessage.EnsureThisValueIsGreaterThanOrEqualTo3')))
+      }
+    }
+    var validatorLoginLimitTime = (rule, value, callback) => {
+      if (parseInt(value) < 5) {
+        return callback(new Error(this.$t('setting.validatorMessage.EnsureThisValueIsGreaterThanOrEqualTo5')))
+      }
+    }
+    var validatorPasswordMinLength = (rule, value, callback) => {
+      if (parseInt(value) < 6) {
+        return callback(new Error(this.$t('setting.validatorMessage.EnsureThisValueIsGreaterThanOrEqualTo6')))
+      }
+    }
     return {
       selectFields: [
         [this.$t('setting.SecuritySetting'), ['SECURITY_MFA_AUTH', 'SECURITY_COMMAND_EXECUTION', 'SECURITY_SERVICE_ACCOUNT_REGISTRATION',
@@ -57,13 +72,15 @@ export default {
         SECURITY_LOGIN_LIMIT_COUNT: {
           label: this.$t('setting.securityLoginLimitCount'),
           rules: [
-            { required: true }
+            { required: true },
+            { validator: validatorLoginLimitCount }
           ]
         },
         SECURITY_LOGIN_LIMIT_TIME: {
           label: this.$t('setting.securityLoginLimitTime'),
           rules: [
-            { required: true }
+            { required: true },
+            { validator: validatorLoginLimitTime }
           ],
           helpText: this.$t('setting.helpText.securityLoginLimitTime')
         },
@@ -81,7 +98,8 @@ export default {
         SECURITY_PASSWORD_MIN_LENGTH: {
           label: this.$t('setting.securityPasswordMinLength'),
           rules: [
-            { required: true }
+            { required: true },
+            { validator: validatorPasswordMinLength }
           ]
         },
         SECURITY_PASSWORD_UPPER_CASE: {

From ad423e921a49d90f2f416be98cc7932b9d30e6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=AB=E5=8D=83=E6=B5=81?=
 <40739051+jym503558564@users.noreply.github.com>
Date: Wed, 15 Jul 2020 17:54:11 +0800
Subject: [PATCH 11/22] =?UTF-8?q?fix(highlight):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=B5=84=E6=BA=90=E5=90=8E=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0=E5=88=97=E8=A1=A8=E9=A1=B5=E4=B8=96=EF=BC=8C=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E8=8F=9C=E5=8D=95=E6=B2=A1=E6=9C=89=E9=AB=98=E4=BA=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#191)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/applications.js |  2 +-
 src/router/assets.js       | 10 +++++-----
 src/router/perms.js        |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/router/applications.js b/src/router/applications.js
index 77c5b690f..ed5791d1b 100644
--- a/src/router/applications.js
+++ b/src/router/applications.js
@@ -11,7 +11,7 @@ export default [
       {
         path: '',
         name: 'RemoteAppList',
-        meta: { title: i18n.t('route.RemoteApp') },
+        meta: { title: i18n.t('route.RemoteApp'), activeMenu: '/applications/remote-apps' },
         component: () => import('@/views/applications/RemoteApp/RemoteAppList')
       },
       {
diff --git a/src/router/assets.js b/src/router/assets.js
index 30fd2e4ed..2bed8d2c8 100644
--- a/src/router/assets.js
+++ b/src/router/assets.js
@@ -12,7 +12,7 @@ export default [
         path: '',
         name: 'AssetList',
         component: () => import('@/views/assets/Asset/AssetList.vue'),
-        meta: { title: i18n.t('route.AssetList') }
+        meta: { title: i18n.t('route.AssetList'), activeMenu: '/assets/assets' }
       },
       {
         path: 'create',
@@ -47,7 +47,7 @@ export default [
         path: '',
         name: 'DomainList',
         component: () => import('@/views/assets/Domain/DomainList.vue'),
-        meta: { title: i18n.t('route.DomainList') }
+        meta: { title: i18n.t('route.DomainList'), activeMenu: '/assets/domains' }
       },
       {
         path: 'create',
@@ -104,7 +104,7 @@ export default [
         path: '',
         name: 'AdminUserList',
         component: () => import('@/views/assets/AdminUser/AdminUserList'),
-        meta: { title: i18n.t('route.AdminUserList') }
+        meta: { title: i18n.t('route.AdminUserList'), activeMenu: '/assets/admin-users' }
       },
       {
         path: 'create',
@@ -174,7 +174,7 @@ export default [
         path: '',
         name: 'CommandFilterList',
         component: () => import('@/views/assets/CommandFilter/CommandFilterList.vue'),
-        meta: { title: i18n.t('route.CommandFilterList') }
+        meta: { title: i18n.t('route.CommandFilterList'), activeMenu: '/assets/cmd-filters' }
       },
       {
         path: ':id/update',
@@ -265,7 +265,7 @@ export default [
         path: '',
         name: 'LabelList',
         component: () => import('@/views/assets/Label/LabelList.vue'),
-        meta: { title: i18n.t('route.LabelList') }
+        meta: { title: i18n.t('route.LabelList'), activeMenu: '/assets/labels' }
       },
       {
         path: 'create',
diff --git a/src/router/perms.js b/src/router/perms.js
index 32d86c6d5..d3f047ef0 100644
--- a/src/router/perms.js
+++ b/src/router/perms.js
@@ -42,7 +42,7 @@ const remoteAppPermissionRoutes = [
         path: '',
         name: 'RemoteAppPermissionList',
         component: () => import('@/views/perms/RemoteAppPermission/RemoteAppPermissionList'),
-        meta: { title: i18n.t('route.RemoteAppPermission') }
+        meta: { title: i18n.t('route.RemoteAppPermission'), activeMenu: '/perms/remote-app-permissions' }
 
       },
       {

From 58b891773980a1f709080c66245561534fbb0756 Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 14 Jul 2020 17:01:38 +0800
Subject: [PATCH 12/22] =?UTF-8?q?fix(ldap):=20=E4=BF=AE=E5=A4=8DLDAP?=
 =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=AF=BC=E5=85=A5=E4=B8=8D=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=EF=BC=8C=E5=AF=BC=E5=85=A5=E4=BA=86=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E7=94=A8=E6=88=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json      |  1 +
 src/i18n/langs/en.json      |  1 +
 src/views/settings/Ldap.vue | 10 +++++++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index 33d1a2f37..aae4e63a8 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -584,6 +584,7 @@
     "authLdapSearchOu": "用户OU",
     "authLdapServerUri": "LDAP地址",
     "authLdapUserAttrMap": "LDAP属性映射",
+    "unselectedUser": "没有选择用户",
     "auto": "自动",
     "basicSetting": "基本设置",
     "communityEdition": "社区版",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index ea0b83dbc..87eb3634e 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -583,6 +583,7 @@
     "authLdapSearchOu": "User OU",
     "authLdapServerUri": "LDAP server",
     "authLdapUserAttrMap": "User attr map",
+    "unselectedUser": "Unselected user",
     "auto": "Auto",
     "basicSetting": "Basic setting",
     "communityEdition": "Community edition",
diff --git a/src/views/settings/Ldap.vue b/src/views/settings/Ldap.vue
index 08ce3bc20..80fef4f40 100644
--- a/src/views/settings/Ldap.vue
+++ b/src/views/settings/Ldap.vue
@@ -237,9 +237,13 @@ export default {
       const data = {
         username_list: selectIds
       }
-      importLdapUser(data).then(res => {
-        this.$message.success(res.msg)
-      })
+      if (selectIds.length === 0) {
+        this.$message.error(this.$t('setting.unselectedUser'))
+      } else {
+        importLdapUser(data).then(res => {
+          this.$message.success(res.msg)
+        })
+      }
     },
     handlerListTableXHRError(errMsg) {
       if (this.dialogLdapUserImport) {

From e251127f6e35cdefb224d7f8d2db64855642455c Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Tue, 14 Jul 2020 17:54:28 +0800
Subject: [PATCH 13/22] =?UTF-8?q?fix(AssetUserTable):=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B5=84=E4=BA=A7=E7=9A=84=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=94=B9=E4=B8=BA=E7=94=B1=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/jumpserver/trello/issues/30
---
 src/components/AssetUserTable/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AssetUserTable/index.vue b/src/components/AssetUserTable/index.vue
index b80be5efb..e88b04f52 100644
--- a/src/components/AssetUserTable/index.vue
+++ b/src/components/AssetUserTable/index.vue
@@ -176,7 +176,7 @@ export default {
                     this.$axios.delete(`/api/v1/assets/asset-users/${val.cellValue}/`).then(() => {
                       this.$message.success(this.$t('common.deleteSuccessMsg'))
                       this.$refs.ListTable.reloadTable()
-                    }).catch(() => this.$message.error(this.$t('common.deleteFailedMsg')))
+                    })
                   }
                 },
                 {

From e16d3c2e3f9f5b41f671ed736475b70580f376dd Mon Sep 17 00:00:00 2001
From: jym503558564 <503558564@qq.com>
Date: Tue, 14 Jul 2020 18:01:03 +0800
Subject: [PATCH 14/22] =?UTF-8?q?fix(changePasswd):=20=E6=B7=BB=E5=8A=A0ch?=
 =?UTF-8?q?angePassword=E5=88=9B=E5=BB=BA=E9=A1=B5=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/cn.json | 3 +++
 src/i18n/langs/en.json | 3 +++
 src/views/xpack        | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index aae4e63a8..b177484fb 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -806,6 +806,9 @@
       "ExecutionDetail": "执行详情",
       "ExecutionList": "执行列表",
       "ExecutionTimes": "执行次数",
+      "validatorMessage": {
+        "EnsureThisValueIsGreaterThanOrEqualTo1": "请确保该值大于或者等于 1"
+      },
       "HelpText": {
         "CrontabOfCreateUpdatePage": "例如：每周日 03:05 执行 <5 3 * * 0> <br/> 使用5位 Linux crontab 表达式 <分 时 日 月 星期> （<a href=\"https://tool.lu/crontab/\" target=\"_blank\">在线工具</a>） <br/> 如果同时设置了定期执行和周期执行，优先使用定期执行",
         "IntervalOfCreateUpdatePage": "单位：时",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 87eb3634e..86307ad65 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -804,6 +804,9 @@
       "ExecutionDetail": "Execution detail",
       "ExecutionList": "Execution list",
       "ExecutionTimes": "Execution times",
+      "validatorMessage": {
+        "EnsureThisValueIsGreaterThanOrEqualTo1": "Ensure this value is greater than or equal to 1"
+      },
       "HelpText": {
         "CrontabOfCreateUpdatePage": "For example: every Sunday at 03:05 execute <5 3 * * 0> <br/> Using the 5-bit Linux crontab expression <minute hour day month week> (<a href=\"https://tool.lu/crontab/\" target=\"_blank\"> Online tool </a>) <br/> If both regularly perform and cycle perform execution are set, use regularly perform first",
         "IntervalOfCreateUpdatePage": "Unit: hour",
diff --git a/src/views/xpack b/src/views/xpack
index 10b240694..0de2d9cf5 160000
--- a/src/views/xpack
+++ b/src/views/xpack
@@ -1 +1 @@
-Subproject commit 10b24069424f198271cf359907267c1b728cdc3c
+Subproject commit 0de2d9cf5610ac676b388dee8ef355d6214b11bd

From a3d45fd4b90d873587ec9c66726693d124affe48 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Tue, 14 Jul 2020 18:25:15 +0800
Subject: [PATCH 15/22] =?UTF-8?q?fix(UserProfile):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=AF=86=E7=A0=81=E5=90=8E=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E6=8F=90=E7=A4=BA=E9=80=80=E5=87=BA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/jumpserver/trello/issues/23
---
 src/userviews/users/UserProfile/PasswordUpdate.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/userviews/users/UserProfile/PasswordUpdate.vue b/src/userviews/users/UserProfile/PasswordUpdate.vue
index 8b38dc15d..798960f52 100644
--- a/src/userviews/users/UserProfile/PasswordUpdate.vue
+++ b/src/userviews/users/UserProfile/PasswordUpdate.vue
@@ -7,6 +7,7 @@
       :url="url"
       :get-method="getMethod"
       class="password-update"
+      :update-success-next-route="updateSuccessNextRoute"
     />
   </IBox>
 </template>
@@ -50,6 +51,9 @@ export default {
             type: 'password'
           }
         }
+      },
+      updateSuccessNextRoute: {
+        path: '/'
       }
     }
   },

From c597bc1dcaf7a266048e5e8cedfbe260b39f9b4d Mon Sep 17 00:00:00 2001
From: Orange <orangemtony@gmail.com>
Date: Wed, 15 Jul 2020 18:31:13 +0800
Subject: [PATCH 16/22] =?UTF-8?q?fix(SessionList):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E8=AF=A6=E6=83=85=E5=8F=82=E6=95=B0=E5=8F=8A?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E4=BC=9A=E8=AF=9D=E5=BF=AB=E6=8D=B7=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E7=BB=84=E4=BB=B6=20(#198)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(SessionList): 修复命令详情参数及在线会话快捷操作组件

Closes https://github.com/jumpserver/trello/issues/72

* fix: 更新API参数
---
 src/i18n/langs/cn.json                        |  4 +-
 src/i18n/langs/en.json                        |  2 +
 .../SessionDetail/SessionDetailCard.vue       | 89 ++++++++++++++-----
 3 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index b177484fb..687962ff5 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -546,6 +546,7 @@
     "terminalDetail": "终端详情",
     "terminalUpdate": "更新终端",
     "terminate": "终断",
+    "sessionTerminate": "会话终断",
     "test": "测试",
     "type": "类型",
     "user": "用户",
@@ -553,7 +554,8 @@
       "common": "普通"
     },
     "Monitor": "监控",
-    "TerminateTaskSendSuccessMsg": "终断任务已下发，请稍后刷新表格查看"
+    "sessionMonitor": "监控",
+    "TerminateTaskSendSuccessMsg": "终断任务已下发，请稍后刷新查看"
   },
   "setting": {
     "ApiKeyList": "API Key 列表",
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 86307ad65..9cfc5e457 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -545,6 +545,7 @@
     "terminalDetail": "Terminal detail",
     "terminalUpdate": "Update terminal",
     "terminate": "Terminate",
+    "sessionTerminate": "Session Terminate",
     "test": "Test",
     "type": "Type",
     "user": "Use",
@@ -552,6 +553,7 @@
       "common": "common"
     },
     "Monitor": "Monitor",
+    "sessionMonitor": "Session Monitor",
     "TerminateTaskSendSuccessMsg": "Terminate task has been send, Please check later"
   },
   "setting": {
diff --git a/src/views/sessions/SessionDetail/SessionDetailCard.vue b/src/views/sessions/SessionDetail/SessionDetailCard.vue
index 41667262f..6fe35f4f0 100644
--- a/src/views/sessions/SessionDetail/SessionDetailCard.vue
+++ b/src/views/sessions/SessionDetail/SessionDetailCard.vue
@@ -12,6 +12,7 @@
 <script>
 import DetailCard from '@/components/DetailCard/index'
 import QuickActions from '@/components/QuickActions'
+import { terminateSession } from '@/api/sessions'
 export default {
   name: 'SessionDetailCard',
   components: {
@@ -68,33 +69,75 @@ export default {
     },
     quickActions() {
       const vm = this
-      return [
-        {
-          title: this.$t('sessions.replaySession'),
-          attrs: {
-            type: 'primary',
-            label: this.$t('sessions.go')
-          },
-          callbacks: {
-            click: function() {
-              vm.openReplaySession(vm.sessionData.id)
-            }
+      if (vm.sessionData.is_finished) {
+        return [
+          {
+            title: this.$t('sessions.replaySession'),
+            attrs: {
+              type: 'primary',
+              label: this.$t('sessions.go')
+            },
+            callbacks: {
+              click: function() {
+                vm.openReplaySession(vm.sessionData.id)
+              }
 
-          }
-        },
-        {
-          title: this.$t('sessions.downloadReplay'),
-          attrs: {
-            type: 'primary',
-            label: this.$t('sessions.download')
+            }
           },
-          callbacks: {
-            click: function() {
-              vm.openReplayDownload(vm.sessionData.id)
+          {
+            title: this.$t('sessions.downloadReplay'),
+            attrs: {
+              type: 'primary',
+              label: this.$t('sessions.download')
+            },
+            callbacks: {
+              click: function() {
+                vm.openReplayDownload(vm.sessionData.id)
+              }
             }
           }
-        }
-      ]
+        ]
+      } else {
+        return [
+          {
+            title: this.$t('sessions.sessionTerminate'),
+            attrs: {
+              type: 'danger',
+              label: this.$t('sessions.terminate')
+            },
+            callbacks: {
+              click: function() {
+              // 终断 session reload
+                terminateSession(vm.sessionData.id).then(res => {
+                  const msg = vm.$t('sessions.TerminateTaskSendSuccessMsg')
+                  vm.$message.success(msg)
+                  window.setTimeout(function() {
+                    window.location.reload()
+                  }, 50000)
+                }
+                )
+              }
+            }
+          },
+          {
+            title: this.$t('sessions.sessionMonitor'),
+            attrs: {
+              type: 'primary',
+              label: this.$t('sessions.Monitor')
+            },
+            can: () => {
+              return vm.sessionData.can_join
+            },
+            callbacks: {
+              click: function() {
+              // 跳转到luna页面
+                const joinUrl = '/luna/join/?shareroom=' + vm.sessionData.id
+                window.open(joinUrl, 'height=600, width=800, top=400, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')
+              }
+            }
+          }
+        ]
+      }
     }
   },
   methods: {

From 4d86edd65efbd81b7b93db4c63cd14da64295e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=AB=E5=8D=83=E6=B5=81?=
 <40739051+jym503558564@users.noreply.github.com>
Date: Wed, 15 Jul 2020 18:34:17 +0800
Subject: [PATCH 17/22] =?UTF-8?q?fix(ldapUserListFix):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96ldap=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E5=90=8E=E5=85=B3=E9=97=AD=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E6=97=B6=EF=BC=8C=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E9=80=89=E4=B8=AD=E7=9A=84=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E8=BF=98=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98=20(#192)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(ldapUserListFix): 优化ldap用户列表勾选后关闭页面，再次打开时，上一次选中的状态还存在的问题
---
 src/views/settings/Ldap.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/settings/Ldap.vue b/src/views/settings/Ldap.vue
index 80fef4f40..efe6851ff 100644
--- a/src/views/settings/Ldap.vue
+++ b/src/views/settings/Ldap.vue
@@ -48,7 +48,7 @@
         <el-button type="primary" @click="testUerLoginClick">{{ $t('common.Confirm') }}</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogLdapUserImport" center>
+    <el-dialog :visible.sync="dialogLdapUserImport" :destroy-on-close="true" center>
       <div slot="title">
         {{ $t('setting.importLdapUserTitle') }}
         <el-alert type="success"> {{ $t('setting.importLdapUserTip') }}</el-alert>
@@ -60,7 +60,7 @@
         @error="handlerListTableXHRError($event)"
       />
       <div slot="footer">
-        <el-button @click="dialogLdapUserImport = false">{{ $t('common.Cancel') }}</el-button>
+        <el-button @click="dialogLdapUserImport=false">{{ $t('common.Cancel') }}</el-button>
         <el-button type="primary" @click="importUserClick">{{ $t('common.Import') }}</el-button>
       </div>
     </el-dialog>

From a0a592f0642db6e679881eb092d7849f0acf1eba Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Wed, 15 Jul 2020 20:07:49 +0800
Subject: [PATCH 18/22] =?UTF-8?q?fix(AssetUpdate):=20=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=BD=91=E5=9F=9F=E9=80=89=E9=A1=B9=E5=8F=AF?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/jumpserver/lina/issues/141
---
 src/views/assets/Asset/AssetCreateUpdate.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/assets/Asset/AssetCreateUpdate.vue b/src/views/assets/Asset/AssetCreateUpdate.vue
index 3fd520958..b2615f1d0 100644
--- a/src/views/assets/Asset/AssetCreateUpdate.vue
+++ b/src/views/assets/Asset/AssetCreateUpdate.vue
@@ -50,6 +50,7 @@ export default {
         domain: {
           el: {
             multiple: false,
+            clearable: true,
             ajax: {
               url: '/api/v1/assets/domains/'
             }

From a023e0307400d5d854169397a900fc3dadcebea3 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Wed, 15 Jul 2020 20:39:39 +0800
Subject: [PATCH 19/22] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0Xpack=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81&&=E7=94=A8=E6=88=B7=E7=95=8C=E9=9D=A2=E8=B5=84?=
 =?UTF-8?q?=E4=BA=A7=E6=B7=BB=E5=8A=A0=E5=A4=87=E6=B3=A8=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes https://github.com/jumpserver/trello/issues/75
---
 src/userviews/assets/index.vue | 10 ++++++++--
 src/views/xpack                |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/userviews/assets/index.vue b/src/userviews/assets/index.vue
index 47317c974..7ce76350f 100644
--- a/src/userviews/assets/index.vue
+++ b/src/userviews/assets/index.vue
@@ -86,6 +86,12 @@ export default {
               }
             }
           },
+          {
+            prop: 'comment',
+            label: this.$t('assets.Comment'),
+            showOverflowTooltip: true,
+            width: '180px'
+          },
           {
             prop: 'id',
             align: 'center',
@@ -136,10 +142,10 @@ export default {
   },
   methods: {
     refreshAllFavorites() {
-      this.tableConfig.columns[3].formatterArgs.loading = true
+      this.tableConfig.columns[4].formatterArgs.loading = true
       this.$axios.get('/api/v1/assets/favorite-assets/').then(resp => {
         this.allFavorites = resp
-        this.tableConfig.columns[3].formatterArgs.loading = false
+        this.tableConfig.columns[4].formatterArgs.loading = false
       })
     },
     addOrDeleteFavorite(assetId) {
diff --git a/src/views/xpack b/src/views/xpack
index 0de2d9cf5..27e18c255 160000
--- a/src/views/xpack
+++ b/src/views/xpack
@@ -1 +1 @@
-Subproject commit 0de2d9cf5610ac676b388dee8ef355d6214b11bd
+Subproject commit 27e18c255c9f83c654a471b456bcd7c3987faabd

From 50e8dfc86df578f7c6417faf5b590b35fd5dffed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=AB=E5=8D=83=E6=B5=81?=
 <40739051+jym503558564@users.noreply.github.com>
Date: Wed, 15 Jul 2020 20:46:01 +0800
Subject: [PATCH 20/22] =?UTF-8?q?fix(timeFormat):=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=20(#197)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(timeFormat): 统一时间格式

* fix: 更新Xpack代码

Co-authored-by: OrangeM21 <orangemtony@gmail.com>
---
 .../ListTable/formatters/ChoicesFormatter.vue          |  3 ++-
 src/views/ops/TaskDetail/TaskDetail.vue                |  5 +++--
 src/views/ops/TaskDetail/TaskHistory.vue               |  4 ++++
 src/views/users/Group/UserGroupDetail/GroupInfo.vue    |  4 +++-
 src/views/users/User/UserDetail/UserInfo.vue           | 10 ++++++----
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/components/ListTable/formatters/ChoicesFormatter.vue b/src/components/ListTable/formatters/ChoicesFormatter.vue
index 97ee0a54d..ec1d22bd0 100644
--- a/src/components/ListTable/formatters/ChoicesFormatter.vue
+++ b/src/components/ListTable/formatters/ChoicesFormatter.vue
@@ -10,6 +10,7 @@
 
 <script>
 import BaseFormatter from './base'
+import { toSafeLocalDateStr } from '@/utils/common'
 export default {
   name: 'ChoicesFormatter',
   extends: BaseFormatter,
@@ -54,7 +55,7 @@ export default {
       return this.formatterArgs.tipStatus(this.cellValue, vm)
     },
     tipTime() {
-      return this.cellValue.datetime
+      return toSafeLocalDateStr(this.cellValue.datetime)
     }
   }
 }
diff --git a/src/views/ops/TaskDetail/TaskDetail.vue b/src/views/ops/TaskDetail/TaskDetail.vue
index ef0f85231..a85a5d025 100644
--- a/src/views/ops/TaskDetail/TaskDetail.vue
+++ b/src/views/ops/TaskDetail/TaskDetail.vue
@@ -14,6 +14,7 @@
 import DetailCard from '@/components/DetailCard'
 import RunInfoCard from '../RunInfoCard/index'
 import { toLastFailureDisplay, toLastSucessDisplay } from './business'
+import { toSafeLocalDateStr } from '@/utils/common'
 
 export default {
   name: 'TaskDetail',
@@ -58,7 +59,7 @@ export default {
         },
         {
           key: this.$t('common.dateCreated'),
-          value: this.$d(new Date(this.object.date_created))
+          value: toSafeLocalDateStr(this.object.date_created)
         },
         {
           key: this.$t('ops.totalVersions'),
@@ -74,7 +75,7 @@ export default {
         },
         {
           key: this.$t('ops.lastRun'),
-          value: this.$d(new Date(this.object.latest_execution.date_finished))
+          value: toSafeLocalDateStr(this.object.latest_execution.date_finished)
         },
         {
           key: this.$t('ops.timeDelta'),
diff --git a/src/views/ops/TaskDetail/TaskHistory.vue b/src/views/ops/TaskDetail/TaskHistory.vue
index bbcae315c..96db24c6d 100644
--- a/src/views/ops/TaskDetail/TaskHistory.vue
+++ b/src/views/ops/TaskDetail/TaskHistory.vue
@@ -5,6 +5,7 @@
 <script type="text/jsx">
 import ListTable from '@/components/ListTable'
 import { DetailFormatter } from '@/components/ListTable/formatters'
+import { toSafeLocalDateStr } from '@/utils/common'
 
 export default {
   name: 'TaskHistory',
@@ -25,6 +26,9 @@ export default {
           'date_start', 'stat', 'ratio', 'is_finished', 'is_success', 'timedelta', 'adhoc_short_id', 'actions'
         ],
         columnsMeta: {
+          date_start: {
+            formatter: (row) => toSafeLocalDateStr(row.date_start)
+          },
           stat: {
             label: this.$t('ops.stat'),
             align: 'center',
diff --git a/src/views/users/Group/UserGroupDetail/GroupInfo.vue b/src/views/users/Group/UserGroupDetail/GroupInfo.vue
index 004a0a12b..b539e3cc2 100644
--- a/src/views/users/Group/UserGroupDetail/GroupInfo.vue
+++ b/src/views/users/Group/UserGroupDetail/GroupInfo.vue
@@ -12,6 +12,8 @@
 <script>
 import DetailCard from '@/components/DetailCard'
 import RelationCard from '@/components/RelationCard'
+import { toSafeLocalDateStr } from '@/utils/common'
+
 export default {
   name: 'GroupInfo',
   components: {
@@ -69,7 +71,7 @@ export default {
         },
         {
           key: this.$t('common.dateCreated'),
-          value: this.object.date_created
+          value: toSafeLocalDateStr(this.object.date_created)
         },
         {
           key: this.$t('common.Comment'),
diff --git a/src/views/users/User/UserDetail/UserInfo.vue b/src/views/users/User/UserDetail/UserInfo.vue
index b2afb6d3b..857fa52f5 100644
--- a/src/views/users/User/UserDetail/UserInfo.vue
+++ b/src/views/users/User/UserDetail/UserInfo.vue
@@ -15,6 +15,8 @@
 import DetailCard from '@/components/DetailCard'
 import QuickActions from '@/components/QuickActions'
 import RelationCard from '@/components/RelationCard'
+import { toSafeLocalDateStr } from '@/utils/common'
+
 export default {
   name: 'UserInfo',
   components: {
@@ -252,19 +254,19 @@ export default {
         },
         {
           key: this.$t('users.DateJoined'),
-          value: this.object.date_joined
+          value: toSafeLocalDateStr(this.object.date_joined)
         },
         {
           key: this.$t('users.DateExpired'),
-          value: this.object.date_expired
+          value: toSafeLocalDateStr(this.object.date_expired)
         },
         {
           key: this.$t('users.DatePasswordUpdated'),
-          value: this.object.date_password_last_updated
+          value: toSafeLocalDateStr(this.object.date_password_last_updated)
         },
         {
           key: this.$t('users.DateLastLogin'),
-          value: this.object.last_login
+          value: toSafeLocalDateStr(this.object.last_login)
         },
         {
           key: this.$t('common.Comment'),

From 226d118d28cbad249c6fae1087a39c2b4797c04b Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Thu, 16 Jul 2020 10:58:49 +0800
Subject: [PATCH 21/22] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0Xpack=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/xpack b/src/views/xpack
index dcb3e4d6d..27e18c255 160000
--- a/src/views/xpack
+++ b/src/views/xpack
@@ -1 +1 @@
-Subproject commit dcb3e4d6d27987c9e14dbaecb46eeb791057523d
+Subproject commit 27e18c255c9f83c654a471b456bcd7c3987faabd

From c94a5dfa1ffccb51218f5f9491b7e157fdf7dd17 Mon Sep 17 00:00:00 2001
From: OrangeM21 <orangemtony@gmail.com>
Date: Thu, 16 Jul 2020 11:08:24 +0800
Subject: [PATCH 22/22] update:Xpack

---
 src/views/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/xpack b/src/views/xpack
index 27e18c255..b346f8668 160000
--- a/src/views/xpack
+++ b/src/views/xpack
@@ -1 +1 @@
-Subproject commit 27e18c255c9f83c654a471b456bcd7c3987faabd
+Subproject commit b346f86681d99a97e10be35737c7e60ffbd058ab