修bug

std-microblock · Aug 5, 2022 · bf2afb3 · bf2afb3
1 parent 61d4619
commit bf2afb3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/addons/cssLoader.js b/addons/cssLoader.js
@@ -58,7 +58,7 @@ class CSSLoader {
             for (let configName in localConfigs) {
                 let config = localConfigs[configName];
                 if (typeof config === "string") {
-                    localConfigs[configName] = localConfigs[configName] || config;
+                    configs[styleObj.get_name()][configName] = configs[styleObj.get_name()][configName] || config;
                     configsHTML += `<div>${configName}:
               <input class="txt u-txt __cssLoader__config__input__" 
               onkeyup='window["configs"]["${styleObj.get_name()}"]["${configName}"]=event.target.value'
@@ -67,12 +67,12 @@ class CSSLoader {
               </div>`;
                 }
                 else {
-                    localConfigs[configName] = localConfigs[configName] || config.default || "";
+                    configs[styleObj.get_name()][configName] = configs[styleObj.get_name()][configName] || config.default || "";
                     configsHTML += `<div>${configName}:
           <input class="txt u-txt __cssLoader__config__input__ __cssLoader__config__${styleObj.get_name()}_${configName}" 
           onkeyup='window["configs"]["${styleObj.get_name()}"]["${configName}"]=event.target.value'
           value="${htmlEscape(configs[styleObj.get_name()][configName])}">`;
-                    if (config.type.includes("cssfile")) {
+                    if (config.type && config.type.includes("cssfile")) {
                         configsHTML += `<button class='u-ibtn5' onclick="selectFile('${styleObj.get_name()}','${configName}')">选择文件</button>`;
                     }
                     configsHTML += "</div>";

diff --git a/addons/cssLoader.ts b/addons/cssLoader.ts
@@ -1,6 +1,6 @@
 interface StyleSheetConfig2 {
   default: string | undefined;
-
+  type:string[] | undefined;
 }
 
 type SSConfigs2 = { [name: string]: StyleSheetConfig2 };
@@ -92,7 +92,7 @@ class CSSLoader {
       for (let configName in localConfigs) {
         let config = localConfigs[configName];
         if (typeof config === "string") {
-          localConfigs[configName] = localConfigs[configName] || config
+          configs[styleObj.get_name()][configName] = configs[styleObj.get_name()][configName] || config
 
           configsHTML += `<div>${configName}:
               <input class="txt u-txt __cssLoader__config__input__" 
@@ -101,13 +101,14 @@ class CSSLoader {
               
               </div>`;
         } else {
-          localConfigs[configName] = localConfigs[configName] || config.default || ""
+          configs[styleObj.get_name()][configName] = configs[styleObj.get_name()][configName] || config.default || ""
           configsHTML += `<div>${configName}:
           <input class="txt u-txt __cssLoader__config__input__ __cssLoader__config__${styleObj.get_name()}_${configName}" 
           onkeyup='window["configs"]["${styleObj.get_name()}"]["${configName}"]=event.target.value'
           value="${htmlEscape(configs[styleObj.get_name()][configName])}">`;
 
-          if (config.type.includes("cssfile")) {
+
+          if (config.type&&config.type.includes("cssfile")) {
             configsHTML += `<button class='u-ibtn5' onclick="selectFile('${styleObj.get_name()}','${configName}')">选择文件</button>`
           }
 

diff --git a/betterncm/src/main.rs b/betterncm/src/main.rs
@@ -25,6 +25,8 @@ use std::process::Command;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
+
+    write_assets::write_assets();
     let mut args = std::env::args();
     args.next();
     fs::write(
@@ -47,7 +49,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     match Mutex::create_named("BetterNCM") {
         Ok(_) => {
-            write_assets::write_assets();
             create_cert::create()?;
             tracing_subscriber::fmt::init();