build_linux.sh: Forward Arguments After -- to the CMake Configure Step

Everything after `--` is appended, unchanged and last, to the cmake
configure line of the deps and OrcaSlicer builds, so a custom compiler,
compile flags or linker can be passed without adding an option to the
script for each one. The arguments are kept as an array, so a value with
spaces such as -DCMAKE_CXX_FLAGS="-O2 -march=native" survives, and they are
forwarded into the -g container. A stray argument without `--` aborts with
a message instead of reaching cmake as a path.

The existing DEPS_EXTRA_BUILD_ARGS and ORCA_EXTRA_BUILD_ARGS hooks are
unchanged and now mentioned in the usage text.

build_linux.sh

@@ -8,7 +8,7 @@ SCRIPT_PATH=$(dirname "$(readlink -f "${0}")")
 pushd "${SCRIPT_PATH}" > /dev/null
 
 function usage() {
-    echo "Usage: ./${SCRIPT_NAME} [-1][-b][-c][-d][-D][-e][-F][-g][-h][-i][-j N][-J N][-p][-r][-s][-t][-u][-l][-L]"
+    echo "Usage: ./${SCRIPT_NAME} [-1][-b][-c][-d][-D][-e][-F][-g][-h][-i][-j N][-J N][-p][-r][-s][-t][-u][-l][-L] [-- CMAKE_ARGS...]"
     echo "   -1: limit builds to one core (where possible)"
     echo "   -j N: limit builds to N cores (where possible)"
     echo "   -J N: build up to N dependencies at a time, each still using -j jobs (default: 1)"
@@ -29,11 +29,15 @@ function usage() {
     echo "   -u: install system dependencies (asks for sudo password; build prerequisite)"
     echo "   -l: use Clang instead of GCC (default: GCC)"
     echo "   -L: use ld.lld as linker (if available)"
+    echo "   -- CMAKE_ARGS...: pass everything after '--' to the cmake configure step of the deps (-d) and OrcaSlicer (-s/-t) builds,"
+    echo "       e.g. -DCMAKE_CXX_FLAGS=\"-O2 -march=native\", -DCMAKE_CXX_COMPILER=g++-14, -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=mold."
+    echo "       They come last on the cmake command line, so they override what -l and -L set."
     echo "For a first use, you want to './${SCRIPT_NAME} -u'"
     echo "   and then './${SCRIPT_NAME} -dsi'"
     echo "For a GitHub Actions-like Linux build locally, use './${SCRIPT_NAME} -g -istrlL'"
     echo "Use './${SCRIPT_NAME} -gF -istrlL' to rebuild the cached runner image first."
     echo "Set ORCA_CONTAINER_CLI, ORCA_DOCKER_IMAGE, ORCA_DOCKER_BASE_IMAGE, or ORCA_DOCKER_CMAKE_VERSION to override the container runtime, cached image tag, base image, or CMake version."
+    echo "DEPS_EXTRA_BUILD_ARGS and ORCA_EXTRA_BUILD_ARGS add whitespace-separated cmake configure arguments to the deps and OrcaSlicer builds; prefer '--' for arguments that contain spaces."
 }
 
 SLIC3R_PRECOMPILED_HEADERS="ON"
@@ -131,6 +135,20 @@ while getopts ":1j:J:bcCdDeFghiprstulL" opt ; do
   esac
 done
 
+# getopts stops at '--'; whatever follows is handed to cmake unchanged.
+if [[ ${OPTIND} -le $# ]] ; then
+    separator_index=$((OPTIND-1))
+    if [[ "${!separator_index}" != "--" ]] ; then
+        echo "Unexpected argument '${!OPTIND}': cmake arguments must follow '--', aborting."
+        exit 1
+    fi
+fi
+shift $((OPTIND-1))
+EXTRA_CMAKE_ARGS=("$@")
+if [[ ${#EXTRA_CMAKE_ARGS[@]} -gt 0 ]] ; then
+    FORWARDED_ARGS+=("--" "${EXTRA_CMAKE_ARGS[@]}")
+fi
+
 if [ ${OPTIND} -eq 1 ] ; then
     usage
     exit 1
@@ -547,7 +565,7 @@ if [[ -n "${BUILD_DEPS}" ]] ; then
         BUILD_ARGS+=(-DCMAKE_BUILD_TYPE="${BUILD_CONFIG}")
     fi
 
-    print_and_run cmake -S deps -B deps/$BUILD_DIR "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" "${CMAKE_CCACHE_ARGS[@]}" -G Ninja "${COLORED_OUTPUT}" "${BUILD_ARGS[@]}"
+    print_and_run cmake -S deps -B deps/$BUILD_DIR "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" "${CMAKE_CCACHE_ARGS[@]}" -G Ninja "${COLORED_OUTPUT}" "${BUILD_ARGS[@]}" "${EXTRA_CMAKE_ARGS[@]}"
     # The top-level build runs one dependency at a time by default, which keeps the console
     # output readable and lets that dependency's own build use all of CMAKE_BUILD_PARALLEL_LEVEL.
     # -J raises the top level instead, and -j still applies in full to every dependency, so the
@@ -593,7 +611,8 @@ if [[ -n "${BUILD_ORCA}" ]] || [[ -n "${BUILD_TESTS}" ]] ; then
 -DSLIC3R_PCH=${SLIC3R_PRECOMPILED_HEADERS} \
 -DORCA_TOOLS=ON \
 "${COLORED_OUTPUT}" \
-"${BUILD_ARGS[@]}"
+"${BUILD_ARGS[@]}" \
+"${EXTRA_CMAKE_ARGS[@]}"
     echo "done"
     if [[ -n "${BUILD_ORCA}" ]]; then
 	echo "Building OrcaSlicer ..."

resources/web/dialog/ExportPresetDialog/index.html

@@ -11,7 +11,7 @@
     <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
     <script type="text/javascript" src="../js/json2.js"></script>	
     <script type="text/javascript" src="../../include/i18n.js"></script>	
-    <script type="text/javascript" src="../../include/globalapi.js"></script>	
+    <script type="text/javascript" src="../js/globalapi.js"></script>	
     <script type="text/javascript" src="../js/common.js"></script>
      <script src="./index.js"></script>
 </head>

resources/web/dialog/PluginsDialog/index.html

@@ -13,7 +13,7 @@
   <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
   <script type="text/javascript" src="../js/json2.js"></script>
   <script type="text/javascript" src="../../include/i18n.js"></script>
-  <script type="text/javascript" src="../../include/globalapi.js"></script>
+  <script type="text/javascript" src="../js/globalapi.js"></script>
   <script type="text/javascript" src="../js/common.js"></script>
   <script src="../js/plugin-config-ui.js"></script>
   <script src="./index.js"></script>

resources/web/dialog/PresetBundleDialog/index.html

@@ -12,7 +12,7 @@
     <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
     <script type="text/javascript" src="../js/json2.js"></script>	
     <script type="text/javascript" src="../../include/i18n.js"></script>	
-    <script type="text/javascript" src="../../include/globalapi.js"></script>	
+    <script type="text/javascript" src="../js/globalapi.js"></script>	
     <script type="text/javascript" src="../js/common.js"></script>
     <!-- <script type="text/javascript" src="./23.js"></script>	 -->
      <script src="./index.js"></script>

resources/web/dialog/TerminalDialog/index.html

@@ -12,7 +12,7 @@
   <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
   <script type="text/javascript" src="../js/json2.js"></script>
   <script type="text/javascript" src="../../include/i18n.js"></script>
-  <script type="text/javascript" src="../../include/globalapi.js"></script>
+  <script type="text/javascript" src="../js/globalapi.js"></script>
   <script type="text/javascript" src="../../include/xterm/xterm.js"></script>
   <script type="text/javascript" src="../../include/xterm/xterm-addon-fit.js"></script>
   <script src="./index.js"></script>

resources/web/dialog/js/globalapi.js

@@ -0,0 +1,339 @@
+
+/*------------------ Date Function ------------------------*/
+function GetFullToday( )
+{
+	var d=new Date();
+	
+	var nday=d.getDate();
+	var nmonth=d.getMonth()+1;
+	var nyear=d.getFullYear();
+	
+	var strM=nmonth+'';
+	if( nmonth<10 )
+		strM='0'+nmonth;
+
+    var strD=nday+'';
+    if( nday<10 )
+	    strD='0'+nday;
+		
+	return nyear+'-'+strM+'-'+strD;
+}
+
+function GetFullDate()
+{
+	var d=new Date();
+	
+	var tDate={};
+	
+	tDate.nyear=d.getFullYear();
+	tDate.nmonth=d.getMonth()+1;
+	tDate.nday=d.getDate();
+	
+	tDate.nhour=d.getHours();
+	tDate.nminute=d.getMinutes();
+	tDate.nsecond=d.getSeconds();	
+	
+	tDate.nweek=d.getDay();
+	tDate.ndate=d.getDate();
+	
+	var strM=tDate.nmonth+'';
+	if( tDate.nmonth<10 )
+		strM='0'+tDate.nmonth;
+
+    var strD=tDate.nday+'';
+    if( tDate.nday<10 )
+	    strD='0'+tDate.nday;
+	
+	var strH=tDate.nhour+'';
+	if( tDate.nhour<10 )
+		strH='0'+tDate.nhour;
+
+	var strMin=tDate.nminute+'';
+	if( tDate.nminute<10 )
+		strMin='0'+tDate.nminute;
+
+	var strS=tDate.nsecond+'';
+	if( tDate.nsecond<10 )
+		strS='0'+tDate.nsecond;					
+	
+	tDate.strdate=tDate.nyear+'-'+strM+'-'+strD;
+	tDate.strFulldate=tDate.strdate+' '+strH+':'+strMin+':'+strS;
+	
+	return tDate;
+}
+
+
+function Unixtimestamp2Date( nSecond )
+{
+	var d=new Date(nSecond*1000);
+	
+	var tDate={};
+	
+	tDate.nyear=d.getFullYear();
+	tDate.nmonth=d.getMonth()+1;
+	tDate.nday=d.getDate();
+	
+	tDate.nhour=d.getHours();
+	tDate.nminute=d.getMinutes();
+	tDate.nsecond=d.getSeconds();	
+	
+	tDate.nweek=d.getDay();
+	tDate.ndate=d.getDate();
+	
+	var strM=tDate.nmonth+'';
+	if( tDate.nmonth<10 )
+		strM='0'+tDate.nmonth;
+
+    var strD=tDate.nday+'';
+    if( tDate.nday<10 )
+	    strD='0'+tDate.nday;
+				
+	tDate.strdate=tDate.nyear+'-'+strM+'-'+strD;
+	
+	return tDate.strdate;
+}
+
+
+//------------Array Function-------------
+Array.prototype.in_array = function (e) {
+    let sArray= ',' + this.join(this.S) + ',';
+	let skey=','+e+',';
+	
+	if(sArray.indexOf(skey)>=0)
+		return true;
+	else
+		return false;
+ }
+
+
+
+//------------String Function------------------
+/**
+* Delete Left/Right Side Blank
+*/
+String.prototype.trim=function()
+{
+     return this.replace(/(^\s*)|(\s*$)/g, '');
+}
+/**
+* Delete Left Side Blank
+*/
+String.prototype.ltrim=function()
+{
+     return this.replace(/(^\s*)/g,'');
+}
+/**
+* Delete Right Side Blank
+*/
+String.prototype.rtrim=function()
+{
+     return this.replace(/(\s*$)/g,'');
+}
+
+
+//----------------Get Param-------------
+function GetQueryString(name) 
+{
+	var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)"); 
+    var r = window.location.search.substr(1).match(reg); 
+    if (r!=null)
+	{
+		return unescape(r[2]);
+	}
+    else
+	{
+		return null; 
+    }
+} 
+
+function GetGetStr()
+{
+	let strGet="";
+	
+	//获取当前URL
+    let url = document.location.href;
+
+    //获取?的位置
+    let index = url.indexOf("?")
+    if(index != -1) {
+        //截取出?后面的字符串
+        strGet = url.substr(index + 1);	
+	}
+	
+	return strGet;
+}
+
+
+/*--------------------JSON  Function------------*/
+
+/*
+功能：检查一个字符串是不是标准的JSON格式
+参数： strJson          被检查的字符串
+返回值： 如果字符串是一个标准的JSON格式，则返回JSON对象
+        如果字符串不是标准JSON格式，则返回null
+*/
+function IsJson( strJson )
+{
+	var tJson=null;
+	try
+	{
+		tJson=JSON.parse(strJson);
+	}
+	catch(exception)
+	{
+	    return null;
+	}	
+	
+	return tJson;
+}
+
+/*-----------------------Ajax Function--------------------*/
+/*对JQuery的Ajax函数的封装，只支持异步
+参数说明：
+    url      目标地址
+	action   post/get
+	data     字符串格式的发送内容
+	asyn     true---异步模式;false-----同步模式;
+*/
+function HttpReq( url,action, data,callbackfunc)
+{
+	var strAction=action.toLowerCase();
+	
+	if( strAction=="post")
+	{
+		$.post(url,data,callbackfunc);			
+	}
+	else if( strAction=="get")
+    {
+		$.get(url,callbackfunc);
+	}
+}
+
+/*---------------Cookie Function-------------------*/ 
+function setCookie(name, value, time='',path='') {
+    if(time && path){
+        var strsec = time * 1000;
+        var exp = new Date();
+        exp.setTime(exp.getTime() + strsec * 1);
+        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString() + ";path="+path;
+    }else if(time){
+        var strsec = time * 1000;
+        var exp = new Date();
+        exp.setTime(exp.getTime() + strsec * 1);
+        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString();
+    }else if(path){
+        document.cookie = name + "=" + escape(value) + ";path="+path;
+    }else{
+        document.cookie = name + "=" + escape(value);
+    }
+}
+
+function getCookie(c_name) 
+{
+	if(document.cookie.length > 0) {
+		c_start = document.cookie.indexOf(c_name + "=");//获取字符串的起点
+	    if(c_start != -1) {
+			c_start = c_start + c_name.length + 1;//获取值的起点
+			c_end = document.cookie.indexOf(";", c_start);//获取结尾处
+			if(c_end == -1) c_end = document.cookie.length;//如果是最后一个，结尾就是cookie字符串的结尾
+			return decodeURI(document.cookie.substring(c_start, c_end));//截取字符串返回
+	    }
+	}
+	
+	return "";
+}
+
+function checkCookie(c_name) {     
+    username = getCookie(c_name);     
+    console.log(username);     
+    if (username != null && username != "")     
+    { return true; }     
+    else     
+    { return false;  }
+}
+
+function clearCookie(name) {     
+    setCookie(name, "", -1); 
+}
+
+
+/*--------Studio WX Message-------*/
+function IsInSlicer()
+{
+	let bMatch=navigator.userAgent.match(  RegExp('BBL-Slicer','i') );
+	
+	return bMatch;
+}
+
+
+
+function SendWXMessage( strMsg )
+{
+	let bCheck=IsInSlicer();
+	
+	if(bCheck!=null)
+	{
+		window.wx.postMessage(strMsg);
+	}
+}
+
+/*------CSS Link Control----*/
+function RemoveCssLink( LinkPath )
+{
+	let pNow=$("head link[href='"+LinkPath+"']");
+	
+	let nTotal=pNow.length;
+    for( let n=0;n<nTotal;n++ )
+	{
+		pNow[n].remove();
+	}	
+}
+
+function AddCssLink( LinkPath )
+{	
+	var head = document.getElementsByTagName('head')[0];
+	var link = document.createElement('link');
+	link.href = LinkPath;
+	link.rel = 'stylesheet';
+	link.type = 'text/css';
+	head.appendChild(link);
+}
+
+function CheckCssLinkExist( LinkPath )
+{
+	let pNow=$("head link[href='"+LinkPath+"']");
+	let nTotal=pNow.length;
+	
+	return nTotal;
+}
+
+
+/*------Dark Mode------*/
+
+function SwitchDarkMode( DarkCssPath )
+{		
+	ExecuteDarkMode( DarkCssPath );
+    setInterval("ExecuteDarkMode('"+DarkCssPath+"')",1000);	
+}
+
+function ExecuteDarkMode( DarkCssPath )
+{
+    let nMode=0;
+	let bDarkMode=navigator.userAgent.match(  RegExp('dark','i') );	
+	if( bDarkMode!=null )
+		nMode=1;
+	
+	let nNow=CheckCssLinkExist(DarkCssPath);
+	if( nMode==0 )
+	{
+		if(nNow>0)
+			RemoveCssLink(DarkCssPath);
+	}
+	else
+	{
+		if(nNow==0)
+			AddCssLink(DarkCssPath);
+	}	
+}
+
+// Dialog pages are themed by the injected --orca-* contract + theme.css; the legacy dark.css poll is fully retired.

resources/web/guide/0/index.html

@@ -10,7 +10,7 @@
 <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
 <script type="text/javascript" src="../../include/i18n.js"></script>	
-<script type="text/javascript" src="../../include/globalapi.js"></script>	
+<script type="text/javascript" src="../js/globalapi.js"></script>	
 <script type="text/javascript" src="../js/common.js"></script>
 <script type="text/javascript" src="load.js"></script>		
 </head>

resources/web/guide/1/index.html

@@ -10,7 +10,7 @@
 <link rel="stylesheet" type="text/css" href="1.css" />
 <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../../include/i18n.js"></script>	
-<script type="text/javascript" src="../../include/globalapi.js"></script>	
+<script type="text/javascript" src="../js/globalapi.js"></script>	
 <script type="text/javascript" src="../js/common.js"></script>
 </head>
 <body onLoad="TranslatePage()">

resources/web/guide/11/index.html

@@ -11,7 +11,7 @@
 <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
 <script type="text/javascript" src="../../include/i18n.js"></script>	
-<script type="text/javascript" src="../../include/globalapi.js"></script>	
+<script type="text/javascript" src="../js/globalapi.js"></script>	
 <script type="text/javascript" src="../js/common.js"></script>
 <script type="text/javascript" src="11.js"></script>		
 </head>

resources/web/guide/21/index.html

@@ -13,7 +13,7 @@
 <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
 <script type="text/javascript" src="../../include/i18n.js"></script>	
-<script type="text/javascript" src="../../include/globalapi.js"></script>	
+<script type="text/javascript" src="../js/globalapi.js"></script>	
 <script type="text/javascript" src="../js/common.js"></script>
 <script type="text/javascript" src="../21/common.js"></script> <!-- ORCA use common sources for setup guide and standalone dialog -->
 <script type="text/javascript" src="21.js"></script>	

resources/web/guide/22/index.html

@@ -13,7 +13,7 @@
 <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
 <script type="text/javascript" src="../../include/i18n.js"></script>	
-<script type="text/javascript" src="../../include/globalapi.js"></script>	
+<script type="text/javascript" src="../js/globalapi.js"></script>	
 <script type="text/javascript" src="../js/common.js"></script>
 <script type="text/javascript" src="../22/common.js"></script> <!-- ORCA use common sources for setup guide and standalone dialog -->
 <script type="text/javascript" src="./22.js"></script>	

resources/web/guide/23/index.html

@@ -12,7 +12,7 @@
 <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
 <script type="text/javascript" src="../../include/i18n.js"></script>	
-<script type="text/javascript" src="../../include/globalapi.js"></script>	
+<script type="text/javascript" src="../js/globalapi.js"></script>	
 <script type="text/javascript" src="../js/common.js"></script>
 <script type="text/javascript" src="../22/common.js"></script> <!-- ORCA use common sources for setup guide and standalone dialog -->
 <script type="text/javascript" src="./23.js"></script>	

resources/web/guide/24/index.html

@@ -13,7 +13,7 @@
 <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
 <script type="text/javascript" src="../../include/i18n.js"></script>	
-<script type="text/javascript" src="../../include/globalapi.js"></script>	
+<script type="text/javascript" src="../js/globalapi.js"></script>	
 <script type="text/javascript" src="../js/common.js"></script>
 <script type="text/javascript" src="../21/common.js"></script> <!-- ORCA use common sources for setup guide and standalone dialog -->
 <script type="text/javascript" src="24.js"></script>	

resources/web/guide/4orca/index.html

@@ -11,7 +11,7 @@
 <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
 <script type="text/javascript" src="../../include/i18n.js"></script>	
-<script type="text/javascript" src="../../include/globalapi.js"></script>	
+<script type="text/javascript" src="../js/globalapi.js"></script>	
 <script type="text/javascript" src="../js/common.js"></script>
 <script type="text/javascript" src="4orca.js"></script>	
 </head>

resources/web/guide/5/index.html

@@ -11,7 +11,7 @@
 <script type="text/javascript" src="../../include/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../js/json2.js"></script>	
 <script type="text/javascript" src="../../include/i18n.js"></script>	
-<script type="text/javascript" src="../../include/globalapi.js"></script>	
+<script type="text/javascript" src="../js/globalapi.js"></script>	
 <script type="text/javascript" src="../js/common.js"></script>
 <script type="text/javascript" src="5.js"></script>	
 </head>

resources/web/guide/js/globalapi.js

@@ -0,0 +1,339 @@
+
+/*------------------ Date Function ------------------------*/
+function GetFullToday( )
+{
+	var d=new Date();
+	
+	var nday=d.getDate();
+	var nmonth=d.getMonth()+1;
+	var nyear=d.getFullYear();
+	
+	var strM=nmonth+'';
+	if( nmonth<10 )
+		strM='0'+nmonth;
+
+    var strD=nday+'';
+    if( nday<10 )
+	    strD='0'+nday;
+		
+	return nyear+'-'+strM+'-'+strD;
+}
+
+function GetFullDate()
+{
+	var d=new Date();
+	
+	var tDate={};
+	
+	tDate.nyear=d.getFullYear();
+	tDate.nmonth=d.getMonth()+1;
+	tDate.nday=d.getDate();
+	
+	tDate.nhour=d.getHours();
+	tDate.nminute=d.getMinutes();
+	tDate.nsecond=d.getSeconds();	
+	
+	tDate.nweek=d.getDay();
+	tDate.ndate=d.getDate();
+	
+	var strM=tDate.nmonth+'';
+	if( tDate.nmonth<10 )
+		strM='0'+tDate.nmonth;
+
+    var strD=tDate.nday+'';
+    if( tDate.nday<10 )
+	    strD='0'+tDate.nday;
+	
+	var strH=tDate.nhour+'';
+	if( tDate.nhour<10 )
+		strH='0'+tDate.nhour;
+
+	var strMin=tDate.nminute+'';
+	if( tDate.nminute<10 )
+		strMin='0'+tDate.nminute;
+
+	var strS=tDate.nsecond+'';
+	if( tDate.nsecond<10 )
+		strS='0'+tDate.nsecond;					
+	
+	tDate.strdate=tDate.nyear+'-'+strM+'-'+strD;
+	tDate.strFulldate=tDate.strdate+' '+strH+':'+strMin+':'+strS;
+	
+	return tDate;
+}
+
+
+function Unixtimestamp2Date( nSecond )
+{
+	var d=new Date(nSecond*1000);
+	
+	var tDate={};
+	
+	tDate.nyear=d.getFullYear();
+	tDate.nmonth=d.getMonth()+1;
+	tDate.nday=d.getDate();
+	
+	tDate.nhour=d.getHours();
+	tDate.nminute=d.getMinutes();
+	tDate.nsecond=d.getSeconds();	
+	
+	tDate.nweek=d.getDay();
+	tDate.ndate=d.getDate();
+	
+	var strM=tDate.nmonth+'';
+	if( tDate.nmonth<10 )
+		strM='0'+tDate.nmonth;
+
+    var strD=tDate.nday+'';
+    if( tDate.nday<10 )
+	    strD='0'+tDate.nday;
+				
+	tDate.strdate=tDate.nyear+'-'+strM+'-'+strD;
+	
+	return tDate.strdate;
+}
+
+
+//------------Array Function-------------
+Array.prototype.in_array = function (e) {
+    let sArray= ',' + this.join(this.S) + ',';
+	let skey=','+e+',';
+	
+	if(sArray.indexOf(skey)>=0)
+		return true;
+	else
+		return false;
+ }
+
+
+
+//------------String Function------------------
+/**
+* Delete Left/Right Side Blank
+*/
+String.prototype.trim=function()
+{
+     return this.replace(/(^\s*)|(\s*$)/g, '');
+}
+/**
+* Delete Left Side Blank
+*/
+String.prototype.ltrim=function()
+{
+     return this.replace(/(^\s*)/g,'');
+}
+/**
+* Delete Right Side Blank
+*/
+String.prototype.rtrim=function()
+{
+     return this.replace(/(\s*$)/g,'');
+}
+
+
+//----------------Get Param-------------
+function GetQueryString(name) 
+{
+	var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)"); 
+    var r = window.location.search.substr(1).match(reg); 
+    if (r!=null)
+	{
+		return unescape(r[2]);
+	}
+    else
+	{
+		return null; 
+    }
+} 
+
+function GetGetStr()
+{
+	let strGet="";
+	
+	//获取当前URL
+    let url = document.location.href;
+
+    //获取?的位置
+    let index = url.indexOf("?")
+    if(index != -1) {
+        //截取出?后面的字符串
+        strGet = url.substr(index + 1);	
+	}
+	
+	return strGet;
+}
+
+
+/*--------------------JSON  Function------------*/
+
+/*
+功能：检查一个字符串是不是标准的JSON格式
+参数： strJson          被检查的字符串
+返回值： 如果字符串是一个标准的JSON格式，则返回JSON对象
+        如果字符串不是标准JSON格式，则返回null
+*/
+function IsJson( strJson )
+{
+	var tJson=null;
+	try
+	{
+		tJson=JSON.parse(strJson);
+	}
+	catch(exception)
+	{
+	    return null;
+	}	
+	
+	return tJson;
+}
+
+/*-----------------------Ajax Function--------------------*/
+/*对JQuery的Ajax函数的封装，只支持异步
+参数说明：
+    url      目标地址
+	action   post/get
+	data     字符串格式的发送内容
+	asyn     true---异步模式;false-----同步模式;
+*/
+function HttpReq( url,action, data,callbackfunc)
+{
+	var strAction=action.toLowerCase();
+	
+	if( strAction=="post")
+	{
+		$.post(url,data,callbackfunc);			
+	}
+	else if( strAction=="get")
+    {
+		$.get(url,callbackfunc);
+	}
+}
+
+/*---------------Cookie Function-------------------*/ 
+function setCookie(name, value, time='',path='') {
+    if(time && path){
+        var strsec = time * 1000;
+        var exp = new Date();
+        exp.setTime(exp.getTime() + strsec * 1);
+        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString() + ";path="+path;
+    }else if(time){
+        var strsec = time * 1000;
+        var exp = new Date();
+        exp.setTime(exp.getTime() + strsec * 1);
+        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString();
+    }else if(path){
+        document.cookie = name + "=" + escape(value) + ";path="+path;
+    }else{
+        document.cookie = name + "=" + escape(value);
+    }
+}
+
+function getCookie(c_name) 
+{
+	if(document.cookie.length > 0) {
+		c_start = document.cookie.indexOf(c_name + "=");//获取字符串的起点
+	    if(c_start != -1) {
+			c_start = c_start + c_name.length + 1;//获取值的起点
+			c_end = document.cookie.indexOf(";", c_start);//获取结尾处
+			if(c_end == -1) c_end = document.cookie.length;//如果是最后一个，结尾就是cookie字符串的结尾
+			return decodeURI(document.cookie.substring(c_start, c_end));//截取字符串返回
+	    }
+	}
+	
+	return "";
+}
+
+function checkCookie(c_name) {     
+    username = getCookie(c_name);     
+    console.log(username);     
+    if (username != null && username != "")     
+    { return true; }     
+    else     
+    { return false;  }
+}
+
+function clearCookie(name) {     
+    setCookie(name, "", -1); 
+}
+
+
+/*--------Studio WX Message-------*/
+function IsInSlicer()
+{
+	let bMatch=navigator.userAgent.match(  RegExp('BBL-Slicer','i') );
+	
+	return bMatch;
+}
+
+
+
+function SendWXMessage( strMsg )
+{
+	let bCheck=IsInSlicer();
+	
+	if(bCheck!=null)
+	{
+		window.wx.postMessage(strMsg);
+	}
+}
+
+/*------CSS Link Control----*/
+function RemoveCssLink( LinkPath )
+{
+	let pNow=$("head link[href='"+LinkPath+"']");
+	
+	let nTotal=pNow.length;
+    for( let n=0;n<nTotal;n++ )
+	{
+		pNow[n].remove();
+	}	
+}
+
+function AddCssLink( LinkPath )
+{	
+	var head = document.getElementsByTagName('head')[0];
+	var link = document.createElement('link');
+	link.href = LinkPath;
+	link.rel = 'stylesheet';
+	link.type = 'text/css';
+	head.appendChild(link);
+}
+
+function CheckCssLinkExist( LinkPath )
+{
+	let pNow=$("head link[href='"+LinkPath+"']");
+	let nTotal=pNow.length;
+	
+	return nTotal;
+}
+
+
+/*------Dark Mode------*/
+
+function SwitchDarkMode( DarkCssPath )
+{		
+	ExecuteDarkMode( DarkCssPath );
+    setInterval("ExecuteDarkMode('"+DarkCssPath+"')",1000);	
+}
+
+function ExecuteDarkMode( DarkCssPath )
+{
+    let nMode=0;
+	let bDarkMode=navigator.userAgent.match(  RegExp('dark','i') );	
+	if( bDarkMode!=null )
+		nMode=1;
+	
+	let nNow=CheckCssLinkExist(DarkCssPath);
+	if( nMode==0 )
+	{
+		if(nNow>0)
+			RemoveCssLink(DarkCssPath);
+	}
+	else
+	{
+		if(nNow==0)
+			AddCssLink(DarkCssPath);
+	}	
+}
+
+SwitchDarkMode( "../css/dark.css" );

resources/web/homepage/js/globalapi.js

@@ -0,0 +1,340 @@
+
+/*------------------ Date Function ------------------------*/
+function GetFullToday( )
+{
+	var d=new Date();
+	
+	var nday=d.getDate();
+	var nmonth=d.getMonth()+1;
+	var nyear=d.getFullYear();
+	
+	var strM=nmonth+'';
+	if( nmonth<10 )
+		strM='0'+nmonth;
+
+    var strD=nday+'';
+    if( nday<10 )
+	    strD='0'+nday;
+		
+	return nyear+'-'+strM+'-'+strD;
+}
+
+function GetFullDate()
+{
+	var d=new Date();
+	
+	var tDate={};
+	
+	tDate.nyear=d.getFullYear();
+	tDate.nmonth=d.getMonth()+1;
+	tDate.nday=d.getDate();
+	
+	tDate.nhour=d.getHours();
+	tDate.nminute=d.getMinutes();
+	tDate.nsecond=d.getSeconds();	
+	
+	tDate.nweek=d.getDay();
+	tDate.ndate=d.getDate();
+	
+	var strM=tDate.nmonth+'';
+	if( tDate.nmonth<10 )
+		strM='0'+tDate.nmonth;
+
+    var strD=tDate.nday+'';
+    if( tDate.nday<10 )
+	    strD='0'+tDate.nday;
+	
+	var strH=tDate.nhour+'';
+	if( tDate.nhour<10 )
+		strH='0'+tDate.nhour;
+
+	var strMin=tDate.nminute+'';
+	if( tDate.nminute<10 )
+		strMin='0'+tDate.nminute;
+
+	var strS=tDate.nsecond+'';
+	if( tDate.nsecond<10 )
+		strS='0'+tDate.nsecond;					
+	
+	tDate.strdate=tDate.nyear+'-'+strM+'-'+strD;
+	tDate.strFulldate=tDate.strdate+' '+strH+':'+strMin+':'+strS;
+	
+	return tDate;
+}
+
+
+function Unixtimestamp2Date( nSecond )
+{
+	var d=new Date(nSecond*1000);
+	
+	var tDate={};
+	
+	tDate.nyear=d.getFullYear();
+	tDate.nmonth=d.getMonth()+1;
+	tDate.nday=d.getDate();
+	
+	tDate.nhour=d.getHours();
+	tDate.nminute=d.getMinutes();
+	tDate.nsecond=d.getSeconds();	
+	
+	tDate.nweek=d.getDay();
+	tDate.ndate=d.getDate();
+	
+	var strM=tDate.nmonth+'';
+	if( tDate.nmonth<10 )
+		strM='0'+tDate.nmonth;
+
+    var strD=tDate.nday+'';
+    if( tDate.nday<10 )
+	    strD='0'+tDate.nday;
+				
+	tDate.strdate=tDate.nyear+'-'+strM+'-'+strD;
+	
+	return tDate.strdate;
+}
+
+
+//------------Array Function-------------
+Array.prototype.in_array = function (e) {
+    let sArray= ',' + this.join(this.S) + ',';
+	let skey=','+e+',';
+	
+	if(sArray.indexOf(skey)>=0)
+		return true;
+	else
+		return false;
+ }
+
+
+
+//------------String Function------------------
+/**
+* Delete Left/Right Side Blank
+*/
+String.prototype.trim=function()
+{
+     return this.replace(/(^\s*)|(\s*$)/g, '');
+}
+/**
+* Delete Left Side Blank
+*/
+String.prototype.ltrim=function()
+{
+     return this.replace(/(^\s*)/g,'');
+}
+/**
+* Delete Right Side Blank
+*/
+String.prototype.rtrim=function()
+{
+     return this.replace(/(\s*$)/g,'');
+}
+
+
+//----------------Get Param-------------
+function GetQueryString(name) 
+{
+	var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)"); 
+    var r = window.location.search.substr(1).match(reg); 
+    if (r!=null)
+	{
+		return unescape(r[2]);
+	}
+    else
+	{
+		return null; 
+    }
+} 
+
+function GetGetStr()
+{
+	let strGet="";
+	
+	//获取当前URL
+    let url = document.location.href;
+
+    //获取?的位置
+    let index = url.indexOf("?")
+    if(index != -1) {
+        //截取出?后面的字符串
+        strGet = url.substr(index + 1);	
+	}
+	
+	return strGet;
+}
+
+
+/*--------------------JSON  Function------------*/
+
+/*
+功能：检查一个字符串是不是标准的JSON格式
+参数： strJson          被检查的字符串
+返回值： 如果字符串是一个标准的JSON格式，则返回JSON对象
+        如果字符串不是标准JSON格式，则返回null
+*/
+function IsJson( strJson )
+{
+	var tJson=null;
+	try
+	{
+		tJson=JSON.parse(strJson);
+	}
+	catch(exception)
+	{
+	    return null;
+	}	
+	
+	return tJson;
+}
+
+/*-----------------------Ajax Function--------------------*/
+/*对JQuery的Ajax函数的封装，只支持异步
+参数说明：
+    url      目标地址
+	action   post/get
+	data     字符串格式的发送内容
+	asyn     true---异步模式;false-----同步模式;
+*/
+function HttpReq( url,action, data,callbackfunc)
+{
+	var strAction=action.toLowerCase();
+	
+	if( strAction=="post")
+	{
+		$.post(url,data,callbackfunc);			
+	}
+	else if( strAction=="get")
+    {
+		$.get(url,callbackfunc);
+	}
+}
+
+/*---------------Cookie Function-------------------*/ 
+function setCookie(name, value, time='',path='') {
+    if(time && path){
+        var strsec = time * 1000;
+        var exp = new Date();
+        exp.setTime(exp.getTime() + strsec * 1);
+        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString() + ";path="+path;
+    }else if(time){
+        var strsec = time * 1000;
+        var exp = new Date();
+        exp.setTime(exp.getTime() + strsec * 1);
+        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString();
+    }else if(path){
+        document.cookie = name + "=" + escape(value) + ";path="+path;
+    }else{
+        document.cookie = name + "=" + escape(value);
+    }
+}
+
+function getCookie(c_name) 
+{
+	if(document.cookie.length > 0) {
+		c_start = document.cookie.indexOf(c_name + "=");//获取字符串的起点
+	    if(c_start != -1) {
+			c_start = c_start + c_name.length + 1;//获取值的起点
+			c_end = document.cookie.indexOf(";", c_start);//获取结尾处
+			if(c_end == -1) c_end = document.cookie.length;//如果是最后一个，结尾就是cookie字符串的结尾
+			return decodeURI(document.cookie.substring(c_start, c_end));//截取字符串返回
+	    }
+	}
+	
+	return "";
+}
+
+function checkCookie(c_name) {     
+    username = getCookie(c_name);     
+    console.log(username);     
+    if (username != null && username != "")     
+    { return true; }     
+    else     
+    { return false;  }
+}
+
+function clearCookie(name) {     
+    setCookie(name, "", -1); 
+}
+
+
+/*--------Studio WX Message-------*/
+function IsInSlicer()
+{
+	let bMatch=navigator.userAgent.match(  RegExp('BBL-Slicer','i') );
+	
+	return bMatch;
+}
+
+
+
+function SendWXMessage( strMsg )
+{
+	let bCheck=IsInSlicer();
+	
+	if(bCheck!=null)
+	{
+		window.wx.postMessage(strMsg);
+	}
+}
+
+
+/*------CSS Link Control----*/
+function RemoveCssLink( LinkPath )
+{
+	let pNow=$("head link[href='"+LinkPath+"']");
+	
+	let nTotal=pNow.length;
+    for( let n=0;n<nTotal;n++ )
+	{
+		pNow[n].remove();
+	}	
+}
+
+function AddCssLink( LinkPath )
+{	
+	var head = document.getElementsByTagName('head')[0];
+	var link = document.createElement('link');
+	link.href = LinkPath;
+	link.rel = 'stylesheet';
+	link.type = 'text/css';
+	head.appendChild(link);
+}
+
+function CheckCssLinkExist( LinkPath )
+{
+	let pNow=$("head link[href='"+LinkPath+"']");
+	let nTotal=pNow.length;
+	
+	return nTotal;
+}
+
+
+/*------Dark Mode------*/
+
+function SwitchDarkMode( DarkCssPath )
+{		
+	ExecuteDarkMode( DarkCssPath );
+    setInterval("ExecuteDarkMode('"+DarkCssPath+"')",1000);	
+}
+
+function ExecuteDarkMode( DarkCssPath )
+{
+    let nMode=0;
+	let bDarkMode=navigator.userAgent.match(  RegExp('dark','i') );	
+	if( bDarkMode!=null )
+		nMode=1;
+	
+	let nNow=CheckCssLinkExist(DarkCssPath);
+	if( nMode==0 )
+	{
+		if(nNow>0)
+			RemoveCssLink(DarkCssPath);
+	}
+	else
+	{
+		if(nNow==0)
+			AddCssLink(DarkCssPath);
+	}	
+}
+
+SwitchDarkMode("css/dark.css");

resources/web/include/globalapi.js

@@ -1,373 +1,427 @@
-
-/*------------------ Date Function ------------------------*/
-function GetFullToday( )
-{
-	var d=new Date();
-	
-	var nday=d.getDate();
-	var nmonth=d.getMonth()+1;
-	var nyear=d.getFullYear();
-	
-	var strM=nmonth+'';
-	if( nmonth<10 )
-		strM='0'+nmonth;
-
-    var strD=nday+'';
-    if( nday<10 )
-	    strD='0'+nday;
-		
-	return nyear+'-'+strM+'-'+strD;
-}
-
-function GetFullDate()
-{
-	var d=new Date();
-	
-	var tDate={};
-	
-	tDate.nyear=d.getFullYear();
-	tDate.nmonth=d.getMonth()+1;
-	tDate.nday=d.getDate();
-	
-	tDate.nhour=d.getHours();
-	tDate.nminute=d.getMinutes();
-	tDate.nsecond=d.getSeconds();	
-	
-	tDate.nweek=d.getDay();
-	tDate.ndate=d.getDate();
-	
-	var strM=tDate.nmonth+'';
-	if( tDate.nmonth<10 )
-		strM='0'+tDate.nmonth;
-
-    var strD=tDate.nday+'';
-    if( tDate.nday<10 )
-	    strD='0'+tDate.nday;
-	
-	var strH=tDate.nhour+'';
-	if( tDate.nhour<10 )
-		strH='0'+tDate.nhour;
-
-	var strMin=tDate.nminute+'';
-	if( tDate.nminute<10 )
-		strMin='0'+tDate.nminute;
-
-	var strS=tDate.nsecond+'';
-	if( tDate.nsecond<10 )
-		strS='0'+tDate.nsecond;					
-	
-	tDate.strdate=tDate.nyear+'-'+strM+'-'+strD;
-	tDate.strFulldate=tDate.strdate+' '+strH+':'+strMin+':'+strS;
-	
-	return tDate;
-}
-
-
-function Unixtimestamp2Date( nSecond )
-{
-	var d=new Date(nSecond*1000);
-	
-	var tDate={};
-	
-	tDate.nyear=d.getFullYear();
-	tDate.nmonth=d.getMonth()+1;
-	tDate.nday=d.getDate();
-	
-	tDate.nhour=d.getHours();
-	tDate.nminute=d.getMinutes();
-	tDate.nsecond=d.getSeconds();	
-	
-	tDate.nweek=d.getDay();
-	tDate.ndate=d.getDate();
-	
-	var strM=tDate.nmonth+'';
-	if( tDate.nmonth<10 )
-		strM='0'+tDate.nmonth;
-
-    var strD=tDate.nday+'';
-    if( tDate.nday<10 )
-	    strD='0'+tDate.nday;
-				
-	tDate.strdate=tDate.nyear+'-'+strM+'-'+strD;
-	
-	return tDate.strdate;
-}
-
-
-//------------Array Function-------------
-Array.prototype.in_array = function (e) {
-    let sArray= ',' + this.join(this.S) + ',';
-	let skey=','+e+',';
-	
-	if(sArray.indexOf(skey)>=0)
-		return true;
-	else
-		return false;
- }
-
-
-
-//------------String Function------------------
-/**
-* Delete Left/Right Side Blank
-*/
-String.prototype.trim=function()
-{
-     return this.replace(/(^\s*)|(\s*$)/g, '');
-}
-/**
-* Delete Left Side Blank
-*/
-String.prototype.ltrim=function()
-{
-     return this.replace(/(^\s*)/g,'');
-}
-/**
-* Delete Right Side Blank
-*/
-String.prototype.rtrim=function()
-{
-     return this.replace(/(\s*$)/g,'');
-}
-
-
-//----------------Get Param-------------
-function GetQueryString(name) 
-{
-	var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)"); 
-    var r = window.location.search.substr(1).match(reg); 
-    if (r!=null)
-	{
-		return unescape(r[2]);
-	}
-    else
-	{
-		return null; 
-    }
-} 
-
-function GetGetStr()
-{
-	let strGet="";
-	
-	//获取当前URL
-    let url = document.location.href;
-
-    //获取?的位置
-    let index = url.indexOf("?")
-    if(index != -1) {
-        //截取出?后面的字符串
-        strGet = url.substr(index + 1);	
-	}
-	
-	return strGet;
-}
-
-/*--------------File Function--------------*/
-function getFileName(path) 
-{ 
-    var pos1 = path.lastIndexOf('/'); 
-    var pos2 = path.lastIndexOf('\\'); 
-    var pos = Math.max(pos1, pos2); 
-    if (pos < 0) { 
-      return null; 
-    } 
-    else 
-	{ 
-      return path.substring(pos + 1); 
-    } 
-}
-
-function getFileTail(path) 
-{ 
-    var pos = path.lastIndexOf('.');
-    if (pos < 0) { 
-		return null; 
-    } 
-    else 
-	{ 
-        return path.substring(pos + 1); 
-    } 
-}
-
-/*--------------String Function-----------*/
-function html_encode(str) 
-{
-	var s = ""; 
-    if (str.length == 0) return ""; 
-    s = str.replace(/&/g, "&amp;"); 
-    s = s.replace(/</g, "&lt;"); 
-    s = s.replace(/>/g, "&gt;"); 
-    s = s.replace(/ /g, "&nbsp;"); 
-    s = s.replace(/\'/g, "&#39;"); 
-    s = s.replace(/\"/g, "&quot;"); 
-    s = s.replace(/\n/g, "<br/>"); 
-    
-	return s; 
-} 
-
-function html_decode(str) 
-{ 
-	var s = ""; 
-	if (str.length == 0) return ""; 
-	s = str.replace(/&amp;/g, "&"); 
-	s = s.replace(/&lt;/g, "<"); 
-	s = s.replace(/&gt;/g, ">"); 
-	s = s.replace(/&nbsp;/g, " "); 
-	s = s.replace(/&#39;/g, "\'"); 
-	s = s.replace(/&quot;/g, "\""); 
-	s = s.replace(/<br\/>/g, "\n"); 
-
-	return s; 
-} 
-
-/*--------------------JSON  Function------------*/
-
-/*
-功能：检查一个字符串是不是标准的JSON格式
-参数： strJson          被检查的字符串
-返回值： 如果字符串是一个标准的JSON格式，则返回JSON对象
-        如果字符串不是标准JSON格式，则返回null
-*/
-function IsJson( strJson )
-{
-	var tJson=null;
-	try
-	{
-		tJson=JSON.parse(strJson);
-	}
-	catch(exception)
-	{
-	    return null;
-	}	
-	
-	return tJson;
-}
-
-function DecodeJsonObject( pJson )
-{
-	let tmpJson=JSON.stringify(pJson);
-	tmpJson=decodeURIComponent(tmpJson);
-	
-	pJson=JSON.parse(tmpJson);
-	
-	return pJson;
-}
-
-/*-----------------------Ajax Function--------------------*/
-/*对JQuery的Ajax函数的封装，只支持异步
-参数说明：
-    url      目标地址
-	action   post/get
-	data     字符串格式的发送内容
-	asyn     true---异步模式;false-----同步模式;
-*/
-function HttpReq( url,action, data,callbackfunc)
-{
-	var strAction=action.toLowerCase();
-	
-	if( strAction=="post")
-	{
-		$.post(url,data,callbackfunc);			
-	}
-	else if( strAction=="get")
-    {
-		$.get(url,callbackfunc);
-	}
-}
-
-/*---------------Cookie Function-------------------*/ 
-function setCookie(name, value, time='',path='') {
-    if(time && path){
-        var strsec = time * 1000;
-        var exp = new Date();
-        exp.setTime(exp.getTime() + strsec * 1);
-        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString() + ";path="+path;
-    }else if(time){
-        var strsec = time * 1000;
-        var exp = new Date();
-        exp.setTime(exp.getTime() + strsec * 1);
-        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString();
-    }else if(path){
-        document.cookie = name + "=" + escape(value) + ";path="+path;
-    }else{
-        document.cookie = name + "=" + escape(value);
-    }
-}
-
-function getCookie(c_name) 
-{
-	if(document.cookie.length > 0) {
-		c_start = document.cookie.indexOf(c_name + "=");//获取字符串的起点
-	    if(c_start != -1) {
-			c_start = c_start + c_name.length + 1;//获取值的起点
-			c_end = document.cookie.indexOf(";", c_start);//获取结尾处
-			if(c_end == -1) c_end = document.cookie.length;//如果是最后一个，结尾就是cookie字符串的结尾
-			return decodeURI(document.cookie.substring(c_start, c_end));//截取字符串返回
-	    }
-	}
-	
-	return "";
-}
-
-function checkCookie(c_name) {     
-    username = getCookie(c_name);     
-    console.log(username);     
-    if (username != null && username != "")     
-    { return true; }     
-    else     
-    { return false;  }
-}
-
-function clearCookie(name) {     
-    setCookie(name, "", -1); 
-}
-
-
-/*--------Studio WX Message-------*/
-function IsInSlicer()
-{
-	// window.wx is the host's message handler, registered on every webview OrcaSlicer creates.
-	return !!(window.wx && window.wx.postMessage);
-}
-
-
-
-function SendWXMessage( strMsg )
-{
-	if( IsInSlicer() )
-		window.wx.postMessage(strMsg);
-}
-
-function SendWXDebugInfo( strMsg )
-{
-	var tSend={};
-	tSend['sequence_id']=Math.round(new Date() / 1000);
-	tSend['command']="debug_info";
-	tSend['msg']=strMsg;
-
-	SendWXMessage( JSON.stringify(tSend) );		
-}
-
-function OpenUrlInLocalBrowser( strUrl )
-{
-	var tSend={};
-	tSend['sequence_id']=Math.round(new Date() / 1000);
-	tSend['command']="common_openurl";
-	tSend['url']=strUrl;
-
-	SendWXMessage( JSON.stringify(tSend) );		
-}
-
-
-/*------Dark Mode------*/
-// The host sets window.__orcaTheme at document start (WebView::AddHostThemeScript) and reloads the
-// page when the theme changes. Every legacy page links its dark.css up front; it is switched on and
-// off here instead of being added and removed, so the page's own path to it does not matter.
-function ExecuteDarkMode()
-{
-	let bDarkMode = window.__orcaTheme === "dark";
-	document.querySelectorAll('head link[href$="dark.css"]').forEach( function(link) { link.disabled = !bDarkMode; } );
-}
-
-ExecuteDarkMode();
+
+/*------------------ Date Function ------------------------*/
+function GetFullToday( )
+{
+	var d=new Date();
+	
+	var nday=d.getDate();
+	var nmonth=d.getMonth()+1;
+	var nyear=d.getFullYear();
+	
+	var strM=nmonth+'';
+	if( nmonth<10 )
+		strM='0'+nmonth;
+
+    var strD=nday+'';
+    if( nday<10 )
+	    strD='0'+nday;
+		
+	return nyear+'-'+strM+'-'+strD;
+}
+
+function GetFullDate()
+{
+	var d=new Date();
+	
+	var tDate={};
+	
+	tDate.nyear=d.getFullYear();
+	tDate.nmonth=d.getMonth()+1;
+	tDate.nday=d.getDate();
+	
+	tDate.nhour=d.getHours();
+	tDate.nminute=d.getMinutes();
+	tDate.nsecond=d.getSeconds();	
+	
+	tDate.nweek=d.getDay();
+	tDate.ndate=d.getDate();
+	
+	var strM=tDate.nmonth+'';
+	if( tDate.nmonth<10 )
+		strM='0'+tDate.nmonth;
+
+    var strD=tDate.nday+'';
+    if( tDate.nday<10 )
+	    strD='0'+tDate.nday;
+	
+	var strH=tDate.nhour+'';
+	if( tDate.nhour<10 )
+		strH='0'+tDate.nhour;
+
+	var strMin=tDate.nminute+'';
+	if( tDate.nminute<10 )
+		strMin='0'+tDate.nminute;
+
+	var strS=tDate.nsecond+'';
+	if( tDate.nsecond<10 )
+		strS='0'+tDate.nsecond;					
+	
+	tDate.strdate=tDate.nyear+'-'+strM+'-'+strD;
+	tDate.strFulldate=tDate.strdate+' '+strH+':'+strMin+':'+strS;
+	
+	return tDate;
+}
+
+
+function Unixtimestamp2Date( nSecond )
+{
+	var d=new Date(nSecond*1000);
+	
+	var tDate={};
+	
+	tDate.nyear=d.getFullYear();
+	tDate.nmonth=d.getMonth()+1;
+	tDate.nday=d.getDate();
+	
+	tDate.nhour=d.getHours();
+	tDate.nminute=d.getMinutes();
+	tDate.nsecond=d.getSeconds();	
+	
+	tDate.nweek=d.getDay();
+	tDate.ndate=d.getDate();
+	
+	var strM=tDate.nmonth+'';
+	if( tDate.nmonth<10 )
+		strM='0'+tDate.nmonth;
+
+    var strD=tDate.nday+'';
+    if( tDate.nday<10 )
+	    strD='0'+tDate.nday;
+				
+	tDate.strdate=tDate.nyear+'-'+strM+'-'+strD;
+	
+	return tDate.strdate;
+}
+
+
+//------------Array Function-------------
+Array.prototype.in_array = function (e) {
+    let sArray= ',' + this.join(this.S) + ',';
+	let skey=','+e+',';
+	
+	if(sArray.indexOf(skey)>=0)
+		return true;
+	else
+		return false;
+ }
+
+
+
+//------------String Function------------------
+/**
+* Delete Left/Right Side Blank
+*/
+String.prototype.trim=function()
+{
+     return this.replace(/(^\s*)|(\s*$)/g, '');
+}
+/**
+* Delete Left Side Blank
+*/
+String.prototype.ltrim=function()
+{
+     return this.replace(/(^\s*)/g,'');
+}
+/**
+* Delete Right Side Blank
+*/
+String.prototype.rtrim=function()
+{
+     return this.replace(/(\s*$)/g,'');
+}
+
+
+//----------------Get Param-------------
+function GetQueryString(name) 
+{
+	var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)"); 
+    var r = window.location.search.substr(1).match(reg); 
+    if (r!=null)
+	{
+		return unescape(r[2]);
+	}
+    else
+	{
+		return null; 
+    }
+} 
+
+function GetGetStr()
+{
+	let strGet="";
+	
+	//获取当前URL
+    let url = document.location.href;
+
+    //获取?的位置
+    let index = url.indexOf("?")
+    if(index != -1) {
+        //截取出?后面的字符串
+        strGet = url.substr(index + 1);	
+	}
+	
+	return strGet;
+}
+
+/*--------------File Function--------------*/
+function getFileName(path) 
+{ 
+    var pos1 = path.lastIndexOf('/'); 
+    var pos2 = path.lastIndexOf('\\'); 
+    var pos = Math.max(pos1, pos2); 
+    if (pos < 0) { 
+      return null; 
+    } 
+    else 
+	{ 
+      return path.substring(pos + 1); 
+    } 
+}
+
+function getFileTail(path) 
+{ 
+    var pos = path.lastIndexOf('.');
+    if (pos < 0) { 
+		return null; 
+    } 
+    else 
+	{ 
+        return path.substring(pos + 1); 
+    } 
+}
+
+/*--------------String Function-----------*/
+function html_encode(str) 
+{
+	var s = ""; 
+    if (str.length == 0) return ""; 
+    s = str.replace(/&/g, "&amp;"); 
+    s = s.replace(/</g, "&lt;"); 
+    s = s.replace(/>/g, "&gt;"); 
+    s = s.replace(/ /g, "&nbsp;"); 
+    s = s.replace(/\'/g, "&#39;"); 
+    s = s.replace(/\"/g, "&quot;"); 
+    s = s.replace(/\n/g, "<br/>"); 
+    
+	return s; 
+} 
+
+function html_decode(str) 
+{ 
+	var s = ""; 
+	if (str.length == 0) return ""; 
+	s = str.replace(/&amp;/g, "&"); 
+	s = s.replace(/&lt;/g, "<"); 
+	s = s.replace(/&gt;/g, ">"); 
+	s = s.replace(/&nbsp;/g, " "); 
+	s = s.replace(/&#39;/g, "\'"); 
+	s = s.replace(/&quot;/g, "\""); 
+	s = s.replace(/<br\/>/g, "\n"); 
+
+	return s; 
+} 
+
+/*--------------------JSON  Function------------*/
+
+/*
+功能：检查一个字符串是不是标准的JSON格式
+参数： strJson          被检查的字符串
+返回值： 如果字符串是一个标准的JSON格式，则返回JSON对象
+        如果字符串不是标准JSON格式，则返回null
+*/
+function IsJson( strJson )
+{
+	var tJson=null;
+	try
+	{
+		tJson=JSON.parse(strJson);
+	}
+	catch(exception)
+	{
+	    return null;
+	}	
+	
+	return tJson;
+}
+
+function DecodeJsonObject( pJson )
+{
+	let tmpJson=JSON.stringify(pJson);
+	tmpJson=decodeURIComponent(tmpJson);
+	
+	pJson=JSON.parse(tmpJson);
+	
+	return pJson;
+}
+
+/*-----------------------Ajax Function--------------------*/
+/*对JQuery的Ajax函数的封装，只支持异步
+参数说明：
+    url      目标地址
+	action   post/get
+	data     字符串格式的发送内容
+	asyn     true---异步模式;false-----同步模式;
+*/
+function HttpReq( url,action, data,callbackfunc)
+{
+	var strAction=action.toLowerCase();
+	
+	if( strAction=="post")
+	{
+		$.post(url,data,callbackfunc);			
+	}
+	else if( strAction=="get")
+    {
+		$.get(url,callbackfunc);
+	}
+}
+
+/*---------------Cookie Function-------------------*/ 
+function setCookie(name, value, time='',path='') {
+    if(time && path){
+        var strsec = time * 1000;
+        var exp = new Date();
+        exp.setTime(exp.getTime() + strsec * 1);
+        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString() + ";path="+path;
+    }else if(time){
+        var strsec = time * 1000;
+        var exp = new Date();
+        exp.setTime(exp.getTime() + strsec * 1);
+        document.cookie = name + "=" + escape(value) + ";expires=" + exp.toGMTString();
+    }else if(path){
+        document.cookie = name + "=" + escape(value) + ";path="+path;
+    }else{
+        document.cookie = name + "=" + escape(value);
+    }
+}
+
+function getCookie(c_name) 
+{
+	if(document.cookie.length > 0) {
+		c_start = document.cookie.indexOf(c_name + "=");//获取字符串的起点
+	    if(c_start != -1) {
+			c_start = c_start + c_name.length + 1;//获取值的起点
+			c_end = document.cookie.indexOf(";", c_start);//获取结尾处
+			if(c_end == -1) c_end = document.cookie.length;//如果是最后一个，结尾就是cookie字符串的结尾
+			return decodeURI(document.cookie.substring(c_start, c_end));//截取字符串返回
+	    }
+	}
+	
+	return "";
+}
+
+function checkCookie(c_name) {     
+    username = getCookie(c_name);     
+    console.log(username);     
+    if (username != null && username != "")     
+    { return true; }     
+    else     
+    { return false;  }
+}
+
+function clearCookie(name) {     
+    setCookie(name, "", -1); 
+}
+
+
+/*--------Studio WX Message-------*/
+function IsInSlicer()
+{
+	let bMatch=navigator.userAgent.match(  RegExp('BBL-Slicer','i') );
+	
+	return bMatch;
+}
+
+
+
+function SendWXMessage( strMsg )
+{
+	let bCheck=IsInSlicer();
+	
+	if(bCheck!=null)
+	{
+		window.wx.postMessage(strMsg);
+	}
+}
+
+function SendWXDebugInfo( strMsg )
+{
+	var tSend={};
+	tSend['sequence_id']=Math.round(new Date() / 1000);
+	tSend['command']="debug_info";
+	tSend['msg']=strMsg;
+
+	SendWXMessage( JSON.stringify(tSend) );		
+}
+
+function OpenUrlInLocalBrowser( strUrl )
+{
+	var tSend={};
+	tSend['sequence_id']=Math.round(new Date() / 1000);
+	tSend['command']="common_openurl";
+	tSend['url']=strUrl;
+
+	SendWXMessage( JSON.stringify(tSend) );		
+}
+
+
+/*------CSS Link Control----*/
+function RemoveCssLink( LinkPath )
+{
+	let pNow=$("head link[href='"+LinkPath+"']");
+	
+	let nTotal=pNow.length;
+    for( let n=0;n<nTotal;n++ )
+	{
+		pNow[n].remove();
+	}	
+}
+
+function AddCssLink( LinkPath )
+{	
+	var head = document.getElementsByTagName('head')[0];
+	var link = document.createElement('link');
+	link.href = LinkPath;
+	link.rel = 'stylesheet';
+	link.type = 'text/css';
+	head.appendChild(link);
+}
+
+function CheckCssLinkExist( LinkPath )
+{
+	let pNow=$("head link[href='"+LinkPath+"']");
+	let nTotal=pNow.length;
+	
+	return nTotal;
+}
+
+
+/*------Dark Mode------*/
+
+function SwitchDarkMode( DarkCssPath )
+{		
+	ExecuteDarkMode( DarkCssPath );
+    setInterval("ExecuteDarkMode('"+DarkCssPath+"')",1000);	
+}
+
+function ExecuteDarkMode( DarkCssPath )
+{
+    let nMode=0;
+	let bDarkMode=navigator.userAgent.match(  RegExp('dark','i') );	
+	if( bDarkMode!=null )
+		nMode=1;
+	
+	let nNow=CheckCssLinkExist(DarkCssPath);
+	if( nMode==0 )
+	{
+		if(nNow>0)
+			RemoveCssLink(DarkCssPath);
+	}
+	else
+	{
+		if(nNow==0)
+			AddCssLink(DarkCssPath);
+	}	
+}
+
+SwitchDarkMode( "./css/dark.css" );

resources/web/orca/missing_connection.html

@@ -9,7 +9,7 @@
 <script type="text/javascript" src="../include/i18n.js"></script>	
 <script type="text/javascript" src="../include/jquery-3.6.0.min.js"></script>
 <script type="text/javascript" src="../homepage/js/json2.js"></script>
-<script type="text/javascript" src="../include/globalapi.js"></script>
+<script type="text/javascript" src="../homepage/js/globalapi.js"></script>
 <script type="text/javascript" src="../homepage/js/home.js"></script>
 </head>
 <body onLoad="OnInit()">

src/slic3r/GUI/PrinterWebView.cpp

@@ -288,7 +288,6 @@ void PrinterWebView::SendAPIKey()
         WebView::MarkScriptMessageHandlerAdded(m_browser);
     else
         wxLogError("Could not add script message handler");
-    WebView::AddHostThemeScript(m_browser);
 
 #ifdef __linux__
     // Re-inject the vue-resize/WebKitGTK workaround that RemoveAllUserScripts just cleared.

src/slic3r/GUI/Widgets/WebView.cpp

@@ -284,25 +284,6 @@ static WebViewRef *webview_ref(wxWebView *webView)
     return webView ? static_cast<WebViewRef *>(webView->GetRefData()) : nullptr;
 }
 
-#ifndef __linux__
-// The User-Agent Windows and macOS have always sent, with the app's version, dark mode and language
-// appended. No bundled page reads it any more (they get the theme from the script below), so Linux
-// sends WebKitGTK's own, which Cloudflare accepts on third-party print-host pages.
-static wxString tagged_user_agent(bool dark)
-{
-    const wxString language_code = Slic3r::GUI::wxGetApp().current_language_code().BeforeFirst('_');
-    return wxString::Format("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) BBL-Slicer/v%s (%s) BBL-Language/%s",
-                            Slic3r::GUI::wxGetApp().get_bbl_client_version(), dark ? "dark" : "light", language_code);
-}
-#endif
-
-// Document-start script the legacy pages read their theme from (globalapi.js). Plugin pages have
-// their own, richer contract in WebViewHostDialog.
-static wxString host_theme_script()
-{
-    return wxString::Format("window.__orcaTheme=\"%s\";", Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light");
-}
-
 wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
 {
 #if wxUSE_WEBVIEW_EDGE
@@ -333,8 +314,9 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
     if (webView) {
         webView->SetBackgroundColour(StateColor::darkModeColorFor(*wxWHITE));
 
+        wxString language_code = Slic3r::GUI::wxGetApp().current_language_code().BeforeFirst('_');
+        language_code          = language_code.ToStdString();
 #ifdef __WIN32__
-        const wxString language_code = Slic3r::GUI::wxGetApp().current_language_code().BeforeFirst('_');
         webView->SetUserAgent(wxString::Format("Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
                                                "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.52 BBL-Slicer/v%s (%s) BBL-Language/%s",
                                                Slic3r::GUI::wxGetApp().get_bbl_client_version(), Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light", language_code.mb_str()));
@@ -355,10 +337,10 @@ wxWebView* WebView::CreateWebView(wxWindow * parent, wxString const & url)
         }
         webView->Create(parent, wxID_ANY, url2, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
 #ifndef __linux__
-        webView->SetUserAgent(tagged_user_agent(Slic3r::GUI::wxGetApp().dark_mode()));
+        webView->SetUserAgent(wxString::Format("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) BBL-Slicer/v%s (%s) BBL-Language/%s",
+                                               Slic3r::GUI::wxGetApp().get_bbl_client_version(), Slic3r::GUI::wxGetApp().dark_mode() ? "dark" : "light", language_code.mb_str()));
 #endif
 #endif
-        WebView::AddHostThemeScript(webView);
 #ifdef __WXMAC__
         WKWebView * wkWebView = (WKWebView *) webView->GetNativeBackend();
         Slic3r::GUI::WKWebView_setTransparentBackground(wkWebView);
@@ -411,11 +393,6 @@ void WebView::MarkScriptMessageHandlerAdded(wxWebView * webView)
         ref->m_script_handler_added = true;
 }
 
-void WebView::AddHostThemeScript(wxWebView *webView)
-{
-    webView->AddUserScript(host_theme_script(), wxWEBVIEW_INJECT_AT_DOCUMENT_START);
-}
-
 bool WebView::NeedsRecreateOnShow()
 {
     const bool recreating = Slic3r::GUI::wxGetApp().is_recreating_gui();
@@ -491,16 +468,14 @@ bool WebView::RunScript(wxWebView *webView, wxString const &javascript)
 
 void WebView::RecreateAll()
 {
-#ifndef __linux__
-    const wxString user_agent = tagged_user_agent(Slic3r::GUI::wxGetApp().dark_mode());
-#endif
+    auto dark = Slic3r::GUI::wxGetApp().dark_mode();
+    wxString language_code = Slic3r::GUI::wxGetApp().current_language_code().BeforeFirst('_');
+    language_code          = language_code.ToStdString();
     for (auto webView : g_webviews) {
 #ifndef __linux__
-        webView->SetUserAgent(user_agent);
+        webView->SetUserAgent(wxString::Format("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) BBL-Slicer/v%s (%s) BBL-Language/%s",
+                                               Slic3r::GUI::wxGetApp().get_bbl_client_version(), dark ? "dark" : "light", language_code.mb_str()));
 #endif
-        // User scripts run in the order they were added, so the newest theme assignment wins on the
-        // reload below; the earlier ones are a few bytes each.
-        AddHostThemeScript(webView);
         // A host-themed WebViewHostDialog re-themes in place (no reload). If it handles
         // the event, skip the reload; legacy pages fall through and reload as before
         // (their own dark.css swap re-themes them on reload).

src/slic3r/GUI/Widgets/WebView.hpp

@@ -26,10 +26,6 @@ public:
     // Marks "wx" as registered so CreateWebView's deferred add skips the duplicate.
     static void MarkScriptMessageHandlerAdded(wxWebView * webView);
 
-    // Tells the page the app's theme at document start (window.__orcaTheme). Added by CreateWebView and
-    // again on a theme change; a view that cleared its user scripts has to add it back.
-    static void AddHostThemeScript(wxWebView *webView);
-
     // On Windows, a WebView2 backend created during a GUI rebuild (language switch) can come up
     // ignoring every navigation. A panel that gets true here recreates its view on first Show().
     static bool NeedsRecreateOnShow();