Merge branch 'dev' of github.com:jumpserver/lina into dev

package.json

@@ -18,7 +18,9 @@
     "vue-i18n-report": "vue-i18n-extract report -v './src/**/*.?(js|vue)' -l './src/i18n/langs/**/*.json'"
   },
   "dependencies": {
+    "@ztree/ztree_v3": "3.5.44",
     "axios": "0.18.1",
+    "babel-polyfill": "^6.26.0",
     "deepmerge": "^4.2.2",
     "echarts": "^4.7.0",
     "element-ui": "2.13.2",
@@ -52,8 +54,7 @@
     "vuejs-logger": "^1.5.4",
     "vuex": "3.1.0",
     "xterm": "^4.5.0",
-    "xterm-addon-fit": "^0.3.0",
-    "@ztree/ztree_v3": "3.5.44"
+    "xterm-addon-fit": "^0.3.0"
   },
   "devDependencies": {
     "@babel/core": "7.0.0",

src/components/AssetUserTable/index.vue

@@ -150,9 +150,10 @@ export default {
                   title: this.$t('common.Delete'),
                   type: 'primary',
                   callback: (val) => {
-                    this.$axios.delete(`/api/v1/assets/asset-users/${val.cellValue}/`).then(
+                    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')))
                   }
                 },
                 {

src/i18n/langs/cn.json

@@ -265,6 +265,7 @@
     },
     "updateErrorMsg": "更新失败",
     "getErrorMsg": "获取失败",
+    "MFAErrorMsg": "MFA 认证失败",
     "updateSelected": "更新所选",
     "updateSuccessMsg": "更新成功",
     "Disable": "禁用",

src/i18n/langs/en.json

@@ -160,6 +160,7 @@
     "MFARequireForSecurity": "MFA required for security",
     "TestSuccessMsg": "Test Success",
     "DateLastWeek": "Last week",
+    "MFAConfirm": "MFA Confirm",
     "DateLastMonth": "Last month",
     "DateLast3Months": "Last 3 months",
     "removeErrorMsg": "Remove failed: ",

src/main.js

@@ -5,7 +5,7 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 import locale from 'element-ui/lib/locale/lang/en' // lang i18n
-
+import 'babel-polyfill'
 import '@/styles/index.scss' // global css
 
 import App from './App'

src/views/sessions/SessionList/BaseList.vue

@@ -82,6 +82,7 @@ export default {
       headerActions: {
         hasLeftActions: false,
         hasImport: false,
+        hasExport: false,
         hasDatePicker: true,
         datePicker: {
           dateStart: dateTo,

vue.config.js

@@ -37,6 +37,9 @@ module.exports = {
       warnings: false,
       errors: true
     },
+    entry: {
+      app: ['babel-polyfill', './src/main.js']
+    },
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy

yarn.lock

@@ -1810,6 +1810,15 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
+babel-polyfill@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
+  dependencies:
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
+
 babel-preset-jest@^23.2.0:
   version "23.2.0"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
@@ -8049,6 +8058,11 @@ regenerate@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
 
+regenerator-runtime@^0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
+
 regenerator-runtime@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"