优化DataviewJS查询语句

Author: 王一帆

src/reader/dataview-reader.ts

@@ -1,4 +1,4 @@
-import { App, Notice, TAbstractFile } from "obsidian";
+import { App, Notice } from "obsidian";
 import { Action } from "src/action/action";
 import { Readable } from "./readable";
 import { getAPI } from "obsidian-dataview";
@@ -26,9 +26,24 @@ export class DataviewReader implements Readable {
 
         let idx = this.queryStr.indexOf(".pages(");
         if (idx > 0) {
-            let tmpStr = this.queryStr.substring(idx + 8);
+            // DataviewJS
+            let tmpStr = this.queryStr.substring(idx + 7);
             let tmpIdx = tmpStr.indexOf(")");
-            tmpStr = tmpStr.substring(0, tmpIdx - 1);
+            tmpStr = tmpStr.substring(0, tmpIdx);
+            if (tmpStr.indexOf("'") >= 0 || tmpStr.indexOf("\"") >= 0) {
+                // pages()方法中的参数是字符串，直接处理    
+                tmpStr = tmpStr.substring(1, tmpStr.length - 1);
+            } else {
+                // pages()方法中的参数是变量，根据变量查找字符串  
+                let nTmpStr = this.queryStr.substring(0, idx);
+                idx = nTmpStr.indexOf(tmpStr);
+                tmpStr = nTmpStr.substring(idx + tmpStr.length);
+                idx = tmpStr.indexOf("'");
+                tmpStr = tmpStr.substring(idx + 1);
+                idx = tmpStr.indexOf("'");
+                tmpStr = tmpStr.substring(0, idx);
+            }
+
             try {
                 let resArr = api.pages(tmpStr);
                 resArr.values.forEach((it: { file: { path: string; }; }) => {