【fix】修改sidebar背景色；修复pixi例子报错

chenxianhuii · chenxianhuii · commit a8296b6d573c · 2023-06-27T17:41:36.000+08:00
diff --git a/build/jsdocs/template/static/styles/jaguar.css b/build/jsdocs/template/static/styles/jaguar.css
@@ -48,8 +48,7 @@ a:hover, a:active, a:focus{
     width: 240px;
     height: 100%;
     padding-top: 0px;
-    background-color: var(--background-color);
-
+    background-color: var(--sidebar-background-color)
 }
 
 .main-sidebar .applicationName {
@@ -114,7 +113,7 @@ a:hover, a:active, a:focus{
 }
 
 .main-sidebar li.item a:hover {
-    color: #282828 ;
+    color: var(--active-color) ;
 }
 
 .main-sidebar li.item .title {
diff --git a/examples/css/sideBar.css b/examples/css/sideBar.css
@@ -14,7 +14,7 @@
 }
 
 .skin-blue .main-sidebar {
-    background-color: var(--background-color);
+    background-color: var(--sidebar-background-color);
 }
 
 .skin-blue .sidebar-menu > li.treeview:hover > a {
@@ -62,7 +62,7 @@ a.sidebar-toggle {
     height: 36px;
     line-height: 36px;
     text-align: center;
-    background-color: var(--background-color);
+    background-color: var(--sidebar-background-color);
     color: var(--text-color) !important;
     display: block;
 }
@@ -86,7 +86,7 @@ a.sidebar-toggle {
   color: var(--active-color);
 }
 .skin-blue .treeview-menu li > a {
-    border-left: 3px solid var(--background-color);
+    border-left: 3px solid var(--sidebar-background-color);
 }
   
 .skin-blue .treeview-menu li > a:hover,
@@ -107,11 +107,11 @@ a.sidebar-toggle {
 
 .skin-blue .sidebar-menu > li > .treeview-menu {
     margin: 0;
-    background: var(--background-color);
+    background: var(--sidebar-background-color);
 }
 
 .sidebar-menu li.active > .treeview-menu {
-    background: var(--background-color);
+    background: var(--sidebar-background-color);
 }
 
 .sidebar-title-bar .fa-angle-down,
@@ -143,7 +143,7 @@ a.sidebar-toggle {
 .skin-blue .sidebar-menu > li:hover > a,
 .skin-blue .sidebar-menu > li.active > a {
     color: var(--text-color);
-    background: var(--background-color);
+    background: var(--sidebar-background-color);
 }
 
 .skin-blue .treeview-menu > li.active > a,
diff --git a/examples/js/theme/theme.js b/examples/js/theme/theme.js
@@ -47,12 +47,13 @@ function setRootStyle (theme) {
   rootStyleTag.innerHTML = rootStyle;
 }
 
+var getCookie = utils.getCookie;
 document.addEventListener("DOMContentLoaded", function() {
   initSkin();
 });
 
 function initSkin() {
-  var skin = utils.getCookie('theme') || 'dark';
+  var skin = getCookie('theme') || 'dark';
   var bodyElem = document.querySelector('body');
   bodyElem.classList.remove("light", "dark");
   bodyElem.classList.add(skin);
diff --git a/examples/js/theme/themeConfig.js b/examples/js/theme/themeConfig.js
@@ -23,6 +23,7 @@ window.themeConfig = [
     "activeColor": "rgba(255,72,62,0.85)",
     "backgroundColor": "#FFFFFF",
     "headerBackgroundColor": "#FFFFFF",
+    "sidebarBackgroundColor": "#FFFFFF",
     "wrapperBackgroundColor": "#F5F6F6",
     "shadowColor": "var(--alpha04)",
     "borderColor": "var(--alpha08)",
@@ -60,6 +61,7 @@ window.themeConfig = [
     "activeColor": "rgba(224,76,64,1)",
     "backgroundColor": "#1F1F1F",
     "headerBackgroundColor": "#333333",
+    "sidebarBackgroundColor": "#333333",
     "wrapperBackgroundColor": "#F5F6F6",
     "shadowColor": "rgba(0, 0, 0, 0.04)",
     "borderColor": "var(--alpha08)",
diff --git a/examples/js/utils.js b/examples/js/utils.js
@@ -19,8 +19,8 @@ var utils = {
 
     //设置语言。参数："zh_CN"，"en-US"
     function setLanguage(language) {
-        //默认设置过期时间为1个小时
-        setCookie(cKey, language, 60 * 60 * 1000);
+        //默认设置过期时间为7天
+        setCookie(cKey, language, 7 * 24 * 60 * 60 * 1000);
     }
 
     //获取当前语言。默认从cookie读取，没有则读取浏览器默认语言
diff --git a/examples/leaflet/l_pixiOverlay_taxi.html b/examples/leaflet/l_pixiOverlay_taxi.html
@@ -3,12 +3,12 @@
     <head>
         <meta charset="UTF-8" />
         <title data-i18n="resources.title_pixiOverlay_taxi"></title>
-        <script type="text/javascript" include="jquery,bootstrap,papaparse,widgets" src="../js/include-web.js"></script>
     </head>
     <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
         <div id="map" style="margin:0 auto;width: 100%;height: 100%" class="cartes"></div>
         <!-- 引入 pixi.js 、L.PixiOverlay.js等相关js -->
         <script type="text/javascript" include="pixi" src="../../dist/leaflet/include-leaflet.js"></script>
+        <script type="text/javascript" include="jquery,bootstrap,papaparse,widgets" src="../js/include-web.js"></script>
         <script>
             let host = window.isLocal ? window.server : 'https://iserver.supermap.io';
             var url = host + '/iserver/services/map-china400/rest/maps/China';

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ a:hover, a:active, a:focus{`
`48`	`48`	`width: 240px;`
`49`	`49`	`height: 100%;`
`50`	`50`	`padding-top: 0px;`
`51`		`- background-color: var(--background-color);`
`52`		`-`
	`51`	`+ background-color: var(--sidebar-background-color)`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`.main-sidebar .applicationName {`
`@@ -114,7 +113,7 @@ a:hover, a:active, a:focus{`
`114`	`113`	`}`
`115`	`114`
`116`	`115`	`.main-sidebar li.item a:hover {`
`117`		`- color: #282828 ;`
	`116`	`+ color: var(--active-color) ;`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`.main-sidebar li.item .title {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`.skin-blue .main-sidebar {`
`17`		`- background-color: var(--background-color);`
	`17`	`+ background-color: var(--sidebar-background-color);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`.skin-blue .sidebar-menu > li.treeview:hover > a {`
`@@ -62,7 +62,7 @@ a.sidebar-toggle {`
`62`	`62`	`height: 36px;`
`63`	`63`	`line-height: 36px;`
`64`	`64`	`text-align: center;`
`65`		`- background-color: var(--background-color);`
	`65`	`+ background-color: var(--sidebar-background-color);`
`66`	`66`	`color: var(--text-color) !important;`
`67`	`67`	`display: block;`
`68`	`68`	`}`
`@@ -86,7 +86,7 @@ a.sidebar-toggle {`
`86`	`86`	`color: var(--active-color);`
`87`	`87`	`}`
`88`	`88`	`.skin-blue .treeview-menu li > a {`
`89`		`- border-left: 3px solid var(--background-color);`
	`89`	`+ border-left: 3px solid var(--sidebar-background-color);`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`.skin-blue .treeview-menu li > a:hover,`
`@@ -107,11 +107,11 @@ a.sidebar-toggle {`
`107`	`107`
`108`	`108`	`.skin-blue .sidebar-menu > li > .treeview-menu {`
`109`	`109`	`margin: 0;`
`110`		`- background: var(--background-color);`
	`110`	`+ background: var(--sidebar-background-color);`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`.sidebar-menu li.active > .treeview-menu {`
`114`		`- background: var(--background-color);`
	`114`	`+ background: var(--sidebar-background-color);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`.sidebar-title-bar .fa-angle-down,`
`@@ -143,7 +143,7 @@ a.sidebar-toggle {`
`143`	`143`	`.skin-blue .sidebar-menu > li:hover > a,`
`144`	`144`	`.skin-blue .sidebar-menu > li.active > a {`
`145`	`145`	`color: var(--text-color);`
`146`		`- background: var(--background-color);`
	`146`	`+ background: var(--sidebar-background-color);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`.skin-blue .treeview-menu > li.active > a,`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ var utils = {`
`19`	`19`
`20`	`20`	`//设置语言。参数："zh_CN"，"en-US"`
`21`	`21`	`function setLanguage(language) {`
`22`		`- //默认设置过期时间为1个小时`
`23`		`- setCookie(cKey, language, 60 * 60 * 1000);`
	`22`	`+ //默认设置过期时间为7天`
	`23`	`+ setCookie(cKey, language, 7 * 24 * 60 * 60 * 1000);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`//获取当前语言。默认从cookie读取，没有则读取浏览器默认语言`