no message

Former-commit-id: b632d6424f412c396322c6dcba4c30a9e49a1259 [formerly 9518a76bf3cc2caf82d0c7c21a7c574c326a1e7d] [formerly b632d6424f412c396322c6dcba4c30a9e49a1259 [formerly 9518a76bf3cc2caf82d0c7c21a7c574c326a1e7d] [formerly b632d6424f412c396322c6dcba4c30a9e49a1259 [formerly 9518a76bf3cc2caf82d0c7c21a7c574c326a1e7d] [formerly 9518a76bf3cc2caf82d0c7c21a7c574c326a1e7d [formerly af1a65d4356d15f94c9bc7a91ce1f4d484a80fcf [formerly efb8c71eca3e74dcae10402308de8b6bfe39153e]]]]]
Former-commit-id: 4828ba46103d0a7c8e63ee8eb585ff2bf9f5884c
Former-commit-id: 6e4b91c1f6f0fb38689a61a7949e1dd15579270d
Former-commit-id: aae30e98a077fe2f2d117fddd1cf37c4aafadbd3 [formerly 18be65e9ba9d8a8d66a8fdc12b38e669a2a4c42b]
Former-commit-id: ff755de34fb6e691b9dbbf4ce3eca9be4574da24
Former-commit-id: 9d6328bb28adeb12574a46ce9f1762ebd06c9ddd
Former-commit-id: 825f14bed9c794c4d92b34b620ee5a30b910f246
Former-commit-id: 1598f53f9c914a477a9dc2d262b038449f43ecd4
Former-commit-id: ec19d1d3a4ef2346434ddbf30aaeea3c87d32601

src/store/modules/d2admin.js

@@ -10,7 +10,7 @@ export default {
     isGrayMode: false,
     // 主题
     themeList,
-    themeActive: themeList[1],
+    themeActiveName: themeList[0].name, // 这应该是一个名字 不是对象
     // 可以在多页 tab 模式下显示的页面
     tagPool: [],
     // 当前显示的多页面列表
@@ -20,6 +20,15 @@ export default {
     // 当前页面
     pageCurrent: ''
   },
+  getters: {
+    /**
+     * @description 返回当前的主题信息 不是一个名字 而是所有的主题数据
+     * @param {state} state vuex state
+     */
+    themeActiveSetting (state) {
+      return state.themeList.find(theme => theme.name === state.themeActiveName)
+    }
+  },
   mutations: {
     /**
      * @class 通用工具
@@ -198,29 +207,34 @@ export default {
       state.isGrayMode = value
     },
     /**
-     * @class themeActive
+     * @class themeActiveName
      * @description 激活一个主题（应用到dom上）
      * @param {state} state vuex state
      * @param {string} themeValue 需要激活的主题名称
      */
-    d2adminThemeSet (state, themeValue) {
-      // 从列表里找到需要激活的主题的数据
-      const theme = state.themeList.find(e => e.value === themeValue) || state.themeList[0]
-      // 设置 state
-      state.themeActive = theme
+    d2adminThemeSet (state, themeName) {
+      // 检查这个主题在主题列表里是否存在
+      const theme = state.themeList.find(e => e.name === themeName)
+      if (theme) {
+        // 设置 state
+        state.themeActiveName = themeName
+      } else {
+        // 设置为列表第一个主题
+        state.themeActiveName = state.themeList[0].name
+      }
       // 设置 dom
-      document.body.className = `theme-${state.themeActive.value}`
+      document.body.className = `theme-${state.themeActiveName}`
       // 保存到数据库
-      this.commit('d2adminVuex2Db', 'themeActive')
+      this.commit('d2adminVuex2Db', 'themeActiveName')
     },
     /**
-     * @class themeActive
+     * @class themeActiveName
      * @description 从数据库加载主题设置
      * @param {state} state vuex state
      */
     d2adminThemeLoad (state) {
-      const themeActive = db.get('themeActive').find({uuid: util.uuid()}).value()
-      this.commit('d2adminThemeSet', themeActive ? themeActive.value : state.themeList[0].value)
+      const themeActiveName = db.get('themeActiveName').find({uuid: util.uuid()}).value()
+      this.commit('d2adminThemeSet', themeActiveName.value || state.themeList[0].name)
     }
   }
 }