From 24184110472071a492e0ad56254ab7765647cb35 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 9 Aug 2018 15:30:03 +0800
Subject: [PATCH] ua

Former-commit-id: febed2d1acecf257367a1686f38e15c243c03efa [formerly febed2d1acecf257367a1686f38e15c243c03efa [formerly febed2d1acecf257367a1686f38e15c243c03efa [formerly febed2d1acecf257367a1686f38e15c243c03efa [formerly c4c3d1f003ff78af77b81665e0d1348ea428dfab [formerly e4b1427e414700915452b62e0ebd52672ca3f040]]]]]
Former-commit-id: e169aa76fb72163abe19183d517b91109fb4d613
Former-commit-id: e704e42ea987b65eaeea5f7d5199866f96771e9b
Former-commit-id: aea5c30d34b1e614d6f974dd1146843fd2e9a5ab [formerly cb089b076728c3cf65bea25e88f4d77287884592]
Former-commit-id: e325d443fd4eb2f011d5185cf201964a542ea190
Former-commit-id: d9da04c2f530ade77a00c0dc3fd938f8e0c2b4b2
Former-commit-id: c6514caa81e81291750100653548d8f333d3eb03
Former-commit-id: ea441446931522168551669865eb268a5b2aa900
Former-commit-id: 2dfd9e2c4bb020ce8ad3c0569e6acd591ef35be3
---
 src/libs/util.js                               |  8 --------
 src/main.js                                    |  2 +-
 src/pages/demo/playground/store/sys/index.vue  |  3 +--
 src/pages/demo/playground/store/ua/index.vue   | 12 ++++++------
 .../modules/d2admin/index.js.REMOVED.git-id    |  2 +-
 src/store/modules/d2admin/modules/ua.js        | 18 ++++++++++++++++++
 6 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 src/store/modules/d2admin/modules/ua.js

diff --git a/src/libs/util.js b/src/libs/util.js
index dfb043be..4fc81800 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -1,6 +1,5 @@
 import axios from 'axios'
 import semver from 'semver'
-import UaParser from 'ua-parser-js'
 import { version } from '../../package.json'
 import log from './util.log.js'
 import cookies from './util.cookies.js'
@@ -18,13 +17,6 @@ util.title = function (titleText) {
   window.document.title = `${process.env.VUE_APP_TITLE}${titleText ? ` | ${titleText}` : ''}`
 }
 
-/**
- * @description 获取所有的 UA 信息
- */
-util.ua = function () {
-  return new UaParser().getResult()
-}
-
 /**
  * @description 判断是否在其内
  * @param {*} ele element
diff --git a/src/main.js b/src/main.js
index a2214d24..8ef9c4fe 100644
--- a/src/main.js
+++ b/src/main.js
@@ -58,7 +58,7 @@ new Vue({
     // D2Admin 开发环境检查更新
     util.checkUpdate(this)
     // 获取并记录用户 UA
-    this.$store.commit('d2admin/uaGet')
+    this.$store.commit('d2admin/ua/get')
     // 展示系统信息
     util.showInfo()
     // 用户登陆后从数据库加载一系列的设置
diff --git a/src/pages/demo/playground/store/sys/index.vue b/src/pages/demo/playground/store/sys/index.vue
index b69befb2..d51a9cf0 100644
--- a/src/pages/demo/playground/store/sys/index.vue
+++ b/src/pages/demo/playground/store/sys/index.vue
@@ -153,8 +153,7 @@ export default {
       'isGrayMode',
       'pagePool',
       'pageOpenedList',
-      'pageCurrent',
-      'ua'
+      'pageCurrent'
     ]),
     ...mapGetters('d2admin', {
       keepAliveInclude: 'keepAliveInclude',
diff --git a/src/pages/demo/playground/store/ua/index.vue b/src/pages/demo/playground/store/ua/index.vue
index 957f5d2a..700f15f4 100644
--- a/src/pages/demo/playground/store/ua/index.vue
+++ b/src/pages/demo/playground/store/ua/index.vue
@@ -1,8 +1,8 @@
 <template>
   <d2-container>
     <p class="d2-mt-0">useragent</p>
-    <el-input :value="ua.ua"></el-input>
-    <p>格式化数据 in vuex: state.d2admin.ua</p>
+    <el-input :value="uaData.ua"></el-input>
+    <p>格式化数据 in vuex: state.d2admin.ua.data</p>
     <d2-highlight :code="uaStr"/>
   </d2-container>
 </template>
@@ -11,11 +11,11 @@
 import { mapState } from 'vuex'
 export default {
   computed: {
-    ...mapState('d2admin', [
-      'ua'
-    ]),
+    ...mapState('d2admin/ua', {
+      uaData: 'data'
+    }),
     uaStr () {
-      const { browser, engine, os, device, cpu } = this.ua
+      const { browser, engine, os, device, cpu } = this.uaData
       return JSON.stringify({ browser, engine, os, device, cpu }, null, 2)
     }
   }
diff --git a/src/store/modules/d2admin/index.js.REMOVED.git-id b/src/store/modules/d2admin/index.js.REMOVED.git-id
index 91f75821..df881c23 100644
--- a/src/store/modules/d2admin/index.js.REMOVED.git-id
+++ b/src/store/modules/d2admin/index.js.REMOVED.git-id
@@ -1 +1 @@
-4d21835fa9e3352a4c11053634775c7e45774fae
\ No newline at end of file
+33558b2365f6936e850cfc9012fbe3de139d35db
\ No newline at end of file
diff --git a/src/store/modules/d2admin/modules/ua.js b/src/store/modules/d2admin/modules/ua.js
new file mode 100644
index 00000000..05c50d7a
--- /dev/null
+++ b/src/store/modules/d2admin/modules/ua.js
@@ -0,0 +1,18 @@
+import UaParser from 'ua-parser-js'
+
+export default {
+  namespaced: true,
+  state: {
+    // 用户 UA
+    data: {}
+  },
+  mutations: {
+    /**
+     * @description 记录 UA
+     * @param {Object} state vuex state
+     */
+    get (state) {
+      state.data = new UaParser().getResult()
+    }
+  }
+}