✨ misc(setting-utils)

src/index.ts

@@ -164,13 +164,6 @@ export default class PluginSample extends Plugin {
         });
 
         this.settingUtils = new SettingUtils(this, STORAGE_NAME);
-
-        try {
-            this.settingUtils.load();
-        } catch (error) {
-            console.error("Error loading settings storage, probably empty config json:", error);
-        }
-
         this.settingUtils.addItem({
             key: "Input",
             value: "",
@@ -274,6 +267,13 @@ export default class PluginSample extends Plugin {
             description: this.i18n.hintDesc,
         });
 
+        try {
+            this.settingUtils.load();
+        } catch (error) {
+            console.error("Error loading settings storage, probably empty config json:", error);
+        }
+
+
         this.protyleSlash = [{
             filter: ["insert emoji 😊", "插入表情 😊", "crbqwx"],
             html: `<div class="b3-list-item__first"><span class="b3-list-item__text">${this.i18n.insertEmoji}</span><span class="b3-list-item__meta">😊</span></div>`,

src/libs/setting-utils.ts

@@ -3,12 +3,44 @@
  * @Author       : frostime
  * @Date         : 2023-12-17 18:28:19
  * @FilePath     : /src/libs/setting-utils.ts
- * @LastEditTime : 2024-04-27 16:38:09
+ * @LastEditTime : 2024-04-28 17:43:43
  * @Description  : 
  */
 
 import { Plugin, Setting } from 'siyuan';
 
+const valueOf = (ele: HTMLElement) => {
+    if (ele instanceof HTMLInputElement) {
+        if (ele.type === 'checkbox') {
+            return ele.checked;
+        } else {
+            return ele.value;
+        }
+    } else if (ele instanceof HTMLSelectElement) {
+        return ele.value;
+    } else if (ele instanceof HTMLTextAreaElement) {
+        return ele.value;
+    } else {
+        return ele.textContent;
+    }
+}
+
+const setValue = (ele: HTMLElement, value: any) => {
+    if (ele instanceof HTMLInputElement) {
+        if (ele.type === 'checkbox') {
+            ele.checked = value;
+        } else {
+            ele.value = value;
+        }
+    } else if (ele instanceof HTMLSelectElement) {
+        ele.value = value;
+    } else if (ele instanceof HTMLTextAreaElement) {
+        ele.value = value;
+    } else {
+        ele.textContent = value;
+    }
+}
+
 export class SettingUtils {
     plugin: Plugin;
     name: string;
@@ -31,10 +63,9 @@ export class SettingUtils {
                 let data = this.dump();
                 if (callback !== undefined) {
                     callback(data);
-                } else {
+                }
                 this.plugin.data[this.name] = data;
                 this.save();
-                }
             },
             destroyCallback: () => {
                 //从值恢复元素
@@ -73,21 +104,6 @@ export class SettingUtils {
         return this.settings.get(key)?.value;
     }
 
-    /**
-      * Read in real time, 
-      * do not read from the configuration file
-      * @param key key name
-      * @returns value in html 
-      */
-    take(key: string) {
-        let element = this.elements.get(key) as any;
-        if (!element){
-            return
-        }
-        this.settings.set(key, element.value)
-        return element.value 
-    }
-
     /**
      * Set data to this.settings, 
      * but do not save it to the configuration file
@@ -113,10 +129,28 @@ export class SettingUtils {
         if (item) {
             item.value = value;
             this.updateElementFromValue(key);
-            await this.save()
+            await this.save();
         }
     }
 
+    /**
+      * Read in the value of element instead of setting obj in real time
+      * @param key key name
+      * @param apply whether to apply the value to the setting object
+      *        if true, the value will be applied to the setting object
+      * @returns value in html
+      */
+    take(key: string, apply: boolean = false) {
+        let element = this.elements.get(key) as any;
+        if (!element){
+            return
+        }
+        if (apply) {
+            this.updateValueFromElement(key);
+        }
+        return valueOf(element)
+    }
+
     /**
      * Read data from html and save it
      * @param key key name
@@ -124,9 +158,9 @@ export class SettingUtils {
      * @return value in html
      */
     async takeAndSave(key: string) {
-        let value = this.take(key)
+        let value = this.take(key, true);
-        await this.save()
+        await this.save();
-        return value
+        return value;
     }
 
     /**
@@ -248,6 +282,7 @@ export class SettingUtils {
             title: item.title,
             description: item?.description,
             createActionElement: () => {
+                this.updateElementFromValue(item.key);
                 let element = this.getElement(item.key);
                 return element;
             }
@@ -255,40 +290,19 @@ export class SettingUtils {
     }
 
     /**
-     * Set the value in the setting to the value of the element 
+     * return the setting element
-     * and return the element information
      * @param key key name
      * @returns element
      */
     getElement(key: string) {
-        let item = this.settings.get(key);
+        // let item = this.settings.get(key);
         let element = this.elements.get(key) as any;
-        switch (item.type) {
-            case 'checkbox':
-                element.value = element.checked ? true : false;
-                element.checked = item.value;
-                break;
-            case 'select':
-                element.value = item.value;
-                break;
-            case 'slider':
-                element.value = item.value;
-                element.ariaLabel = item.value;
-                break;
-            case 'textinput':
-                element.value = item.value;
-                break;
-            case 'textarea':
-                element.value = item.value;
-                break;
-        }
         return element;
     }
 
     private updateValueFromElement(key: string) {
         let item = this.settings.get(key);
         let element = this.elements.get(key) as any;
-        // console.debug(element, element?.value);
         switch (item.type) {
             case 'checkbox':
                 item.value = element.checked;
@@ -305,6 +319,9 @@ export class SettingUtils {
             case 'textarea':
                 item.value = element.value;
                 break;
+            case 'number':
+                item.value = parseInt(element.value);
+                break;
         }
     }
 
@@ -327,6 +344,9 @@ export class SettingUtils {
             case 'textarea':
                 element.value = item.value;
                 break;
+            case 'number':
+                element.value = item.value;
+                break;
         }
     }
 }