diff --git a/changelog.md b/changelog.md
index 08868a3..f117b32 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,6 +9,7 @@
# 1.05.2203070-10 / 2022-04-22
- fix: 修正命令行入口
+- fix: gsettings子进程未退出转为孤儿进程
- update: 优化主题监听
# 1.05.2203070-8 / 2022-04-10
diff --git a/compiler/nodejs/wcc b/compiler/nodejs/wcc
index 932e82f..fcaf34f 100755
--- a/compiler/nodejs/wcc
+++ b/compiler/nodejs/wcc
@@ -396,6 +396,7 @@ if (args.includes("-llw")) {
__COMMON__: funcName,
},
};
+ // 取分割符
const split_mark = argss[argss.indexOf("--split") + 1];
// ./miniprogram_npm/miniprogram-barrage/index>_<4685./m
const needArr = argss
@@ -403,11 +404,14 @@ if (args.includes("-llw")) {
(arg) => arg.includes(split_mark) && arg.startsWith("./")
)[0]
.split(split_mark);
+ // 获取x数组并解析
const indexArr = eval(str.match(/var x=(\[.*\]);/)[1]);
const pageConfig = {};
let i = 0;
indexArr.forEach((ele, index) => {
+ // 非 ../ 开头
if (!ele.startsWith("../")) {
+ // a/b/c -> {}
pageConfig[ele.substring(2, ele.length - 5)] = {
funcName: `${funcName}_XC_${i}`,
num: i,
@@ -416,20 +420,20 @@ if (args.includes("-llw")) {
i++;
}
});
- // 引入解析
+ // 获取所有依赖 _ai函数 被引入的文件, 文件
const deps = str.matchAll(
/_ai\(.*?,x\[(\d+)\],.*?,x\[(\d+)\],\d+,\d+\)/g
);
+ // 处理依赖
for (let dep of deps) {
- // console.log(dep[1]) // 被引用文件下标
- // console.log(dep[2]) // 引用文件下标
const target = indexArr[dep[2]];
pageConfig[target.substring(2, target.length - 5)].deps.unshift(
"./" + path.join(path.dirname(target), indexArr[dep[1]])
);
}
+ // 生成函数内容
for (let key in pageConfig) {
- if (needArr.includes("./" + key)) {
+ if (needArr.includes(`./${key}`)) {
resultObj.generateFunctionName[key] =
pageConfig[key].funcName;
resultObj.generateFunctionContent[key] =
@@ -441,6 +445,7 @@ if (args.includes("-llw")) {
);
}
}
+ // 生成common
resultObj.generateFunctionContent.__COMMON__ = genCommonContent_LLW(
str,
pageConfig,
diff --git a/readme.md b/readme.md
index 31048d9..5ebecd7 100644
--- a/readme.md
+++ b/readme.md
@@ -10,14 +10,13 @@
----
[](https://github.com/msojocs/wechat-devtools-linux/actions/workflows/release.yml)
-[](https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html)
+[](https://developers.weixin.qq.com/miniprogram/dev/devtools/download.html)
[](https://nwjs.io/downloads/)
[](https://nodejs.org/en/)
-[](https://aur.archlinux.org/packages/wechat-devtools)
+[](https://aur.archlinux.org/packages/wechat-devtools)
这是微信开发者工具 Linux版
- 图标作者[dragonation](https://github.com/dragonation), 由于是基于其项目修改，未经授权。
diff --git a/res/icons/wechat-devtools.png b/res/icons/wechat-devtools.png
index b210139..5402884 100644
Binary files a/res/icons/wechat-devtools.png and b/res/icons/wechat-devtools.png differ
diff --git a/res/icons/wechat-devtools.svg b/res/icons/wechat-devtools.svg
index b561436..315afcb 100644
--- a/res/icons/wechat-devtools.svg
+++ b/res/icons/wechat-devtools.svg
@@ -1,71 +1,123 @@
-
-
\ No newline at end of file
+
+
+
diff --git a/res/icons/wechat-devtools128.png b/res/icons/wechat-devtools128.png
index 2f1db41..f853084 100644
Binary files a/res/icons/wechat-devtools128.png and b/res/icons/wechat-devtools128.png differ
diff --git a/res/icons/wechat-devtools256.png b/res/icons/wechat-devtools256.png
index 2fe5a7b..ad2a25c 100644
Binary files a/res/icons/wechat-devtools256.png and b/res/icons/wechat-devtools256.png differ
diff --git a/res/icons/wechat-devtools512.png b/res/icons/wechat-devtools512.png
index 64715c7..0585021 100644
Binary files a/res/icons/wechat-devtools512.png and b/res/icons/wechat-devtools512.png differ
diff --git a/res/icons/wechat-devtools64.png b/res/icons/wechat-devtools64.png
index 309ceb1..7592fda 100644
Binary files a/res/icons/wechat-devtools64.png and b/res/icons/wechat-devtools64.png differ