@lambo-design/shared 1.0.0-beta.135 → 1.0.0-beta.136

package/package.json

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

package/utils/theme.js

@@ -3,6 +3,8 @@ import cssVars from "css-vars-ponyfill";
 import lan_navigator from '../styles/image/lan_navigator.png'
 import lv_navigator from '../styles/image/lv_navigator.png'
 import {handleSystemColor} from "./util";
+import config from "@lambo-design/shared/config/config";
+
 
 const changeByThemeKey = (themeKey) => {
   if (themeKey) {
@@ -49,7 +51,7 @@ const changeByTheme = (theme) => {
   }
 };
 
-const changeThemeByThemeId = (themeId, status, filterStatus, systemForm, upmsServerContext) => {
+const changeThemeByThemeId = (themeId, status, filterStatus, systemForm) => {
     // 主题切换方式（区分新旧两种：1-旧 2-新）
     localStorage.setItem('themeInStyle', '2')
     // 一键滤镜功能 - 灰度状态;
@@ -60,7 +62,7 @@ const changeThemeByThemeId = (themeId, status, filterStatus, systemForm, upmsSer
     // 记录当前主题
     localStorage.setItem('themeIdCurrent', themeId)
     // 顶部栏背景图处理
-    let background_image = upmsServerContext + '/anon/oss/file/getImage/' + systemForm.topBkImg + '?height=64&width=1920'
+    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 + ')'

package/utils/util.js

@@ -1,5 +1,7 @@
 // import {changeByThemeKey} from "packages/shared/utils/theme";
 import {changeByThemeKey} from "./theme";
+import config from "@lambo-design/shared/config/config";
+
 
 function tintColorDef(hexColor, tintPercentage) {
   // 转换十六进制颜色到RGB
@@ -218,12 +220,12 @@ export function handleDefineColor() {
   varStyleTag.innerHTML = `:root {${_}}`;
 }
 
-export function initThemeStyle(themeColor) {
+export function initThemeStyle() {
   let themeInStyleVal = localStorage.getItem('themeInStyle')
   if (themeInStyleVal === '2') {
     handleDefineColor()
   } else {
-    changeByThemeKey(localStorage.getItem('theme') || themeColor)
+    changeByThemeKey(localStorage.getItem('theme') || config.themeColor)
   }
 }