@lambo-design/shared 1.0.0-beta.219 → 1.0.0-beta.220

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/shared",
-  "version": "1.0.0-beta.219",
+  "version": "1.0.0-beta.220",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/utils/platform.js

@@ -1259,14 +1259,23 @@ export const changeSystemInfo = async (systemInfo) => {
     let showTheme = systemInfo.showTheme
     let split = showTheme.split('-')
     let systemForm = null
-    if (split[0]) {
-      let res = await ajax.get(config.upmsServerContext + '/anon/system/themeLineList?themeId=' + split[0])
+    let themeId = split[0];
+    let status = split[1];
+    let filterStatus = split[2];
+    if (themeId) {
+      let res = await ajax.get(config.upmsServerContext + '/anon/system/themeInfo?themeId=' + split[0])
       if (res.data.code == 1) {
         systemForm = res.data.data[0]
+        if (!status && systemForm.status) {
+          status = systemForm.status;
+        }
+        if (!filterStatus && systemForm.filterStatus) {
+          filterStatus = systemForm.filterStatus;
+        }
       }
     }
     if (systemForm) {
-      changeThemeByThemeId(split[0], split[1], split[2], systemForm)
+      changeThemeByThemeId(themeId, status, filterStatus, systemForm)
     }
   }
   if (!systemInfo.rightTopOptButtonList || systemInfo.rightTopOptButtonList.length <= 0) {

package/utils/theme.js

@@ -57,32 +57,32 @@ const changeByTheme = (theme) => {
 };
 
 const changeThemeByThemeId = (themeId, status, filterStatus, systemForm) => {
-    // 主题切换方式（区分新旧两种：1-旧 2-新）
-    if (typeof window !== 'undefined') {
-      localStorage.setItem('themeInStyle', '2')
-    }
-    // 一键滤镜功能 - 灰度状态;
-    let grayscaleVal = '0%'
-    if (filterStatus === '1') {
-      grayscaleVal = '100%'
-    }
-    // 记录当前主题
-    if (typeof window !== 'undefined') {
-      // localStorage.setItem('themeIdCurrent', themeId)
-      localStorage.setItem('themeIdCurrent', themeId)
-    }
-    // 顶部栏背景图处理
-    let background_image = config.upmsServerContext + '/anon/oss/file/getImage/' + systemForm.topBkImg + '?height=64&width=1920'
-    if (status === '2') {
-      if (background_image.includes('lan_navigator')) {
-        background_image = 'url(' + lan_navigator + ')'
-      } else if (background_image.includes('lv_navigator')) {
-        background_image = 'url(' + lv_navigator + ')'
-      }
-    } else if (status === '1') {
-      background_image = 'url(' + background_image + ')'
+  // 主题切换方式（区分新旧两种：1-旧 2-新）
+  if (typeof window !== 'undefined') {
+    localStorage.setItem('themeInStyle', '2')
+  }
+  // 一键滤镜功能 - 灰度状态;
+  let grayscaleVal = '0%'
+  if (filterStatus && filterStatus === '1') {
+    grayscaleVal = '100%'
+  }
+  // 记录当前主题
+  if (typeof window !== 'undefined') {
+    // localStorage.setItem('themeIdCurrent', themeId)
+    localStorage.setItem('themeIdCurrent', themeId)
+  }
+  // 顶部栏背景图处理
+  let background_image = config.upmsServerContext + '/anon/oss/file/getImage/' + systemForm.topBkImg + '?height=64&width=1920'
+  if (!status || status === '2') {
+    if (background_image.includes('lan_navigator')) {
+      background_image = 'url(' + lan_navigator + ')'
+    } else if (background_image.includes('lv_navigator')) {
+      background_image = 'url(' + lv_navigator + ')'
     }
-    handleSystemColor(grayscaleVal, systemForm, background_image)
+  } else if (status === '1') {
+    background_image = 'url(' + background_image + ')'
+  }
+  handleSystemColor(grayscaleVal, systemForm, background_image)
 }
 
 const getThemeConfig = (themeKey = 'default') =>{