@lmzhen/dsh-evolution-merge-ui 0.32.3 → 0.32.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +17 -9
- package/lib/client.js +7 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -1,11 +1,19 @@
|
|
|
1
1
|
# @lmzhen/dsh-evolution-merge-ui
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
3
|
+
> 合并面板:看待批队列、A/B 正文和历史。
|
|
4
|
+
|
|
5
|
+
## 你会看到
|
|
6
|
+
|
|
7
|
+
左侧栏「技能合并」;动作按钮复制命令。
|
|
8
|
+
|
|
9
|
+
## 什么时候会用到
|
|
10
|
+
|
|
11
|
+
你想看合并提议/历史时。
|
|
12
|
+
|
|
13
|
+
## 默认 / 前提
|
|
14
|
+
|
|
15
|
+
只有 all 安装形态带这个面板。
|
|
16
|
+
|
|
17
|
+
## 边界
|
|
18
|
+
|
|
19
|
+
面板只读;实际合并用命令。
|
package/lib/client.js
CHANGED
|
@@ -12,7 +12,7 @@ window.__ModuleLoader__.load({
|
|
|
12
12
|
}
|
|
13
13
|
function injectStyles(doc, css, tagId) {
|
|
14
14
|
if (doc === void 0) return () => {};
|
|
15
|
-
|
|
15
|
+
doc.querySelector("style[data-plugin-css=\"" + tagId + "\"]")?.remove();
|
|
16
16
|
const tag = doc.createElement("style");
|
|
17
17
|
tag.setAttribute("data-plugin-css", tagId);
|
|
18
18
|
tag.textContent = css;
|
|
@@ -1769,12 +1769,14 @@ window.__ModuleLoader__.load({
|
|
|
1769
1769
|
});
|
|
1770
1770
|
return;
|
|
1771
1771
|
}
|
|
1772
|
+
const wasBlocked = this.snapshot.viewState === "blocked";
|
|
1772
1773
|
this.set({
|
|
1773
1774
|
...this.snapshot,
|
|
1774
1775
|
view: outcome.payload,
|
|
1775
1776
|
viewState: "ready",
|
|
1776
1777
|
viewFailure: void 0
|
|
1777
1778
|
});
|
|
1779
|
+
if (wasBlocked && this.snapshot.current.status === "idle") this.loadQueue(this.snapshot.queue, this.snapshot.expiredOnly);
|
|
1778
1780
|
}
|
|
1779
1781
|
async loadQueue(queue, expiredOnly, cursor) {
|
|
1780
1782
|
const key = keyOf(queue, expiredOnly);
|
|
@@ -1798,6 +1800,10 @@ window.__ModuleLoader__.load({
|
|
|
1798
1800
|
if (this.disposed || token !== this.tokens.get(key)) return;
|
|
1799
1801
|
if (!outcome.ok) {
|
|
1800
1802
|
if (outcome.failure.kind === "blocked") {
|
|
1803
|
+
for (const key of this.cache.keys()) this.cache.set(key, {
|
|
1804
|
+
status: "idle",
|
|
1805
|
+
rows: []
|
|
1806
|
+
});
|
|
1801
1807
|
this.set({
|
|
1802
1808
|
...this.snapshot,
|
|
1803
1809
|
viewState: "blocked",
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
]
|
|
12
12
|
}
|
|
13
13
|
},
|
|
14
|
-
"version": "0.32.
|
|
14
|
+
"version": "0.32.5",
|
|
15
15
|
"publishConfig": {
|
|
16
16
|
"access": "public"
|
|
17
17
|
},
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"react-dom": "^18.2.0"
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
|
-
"@lmzhen/dsh-evolution-client-kit": "^0.32.
|
|
54
|
+
"@lmzhen/dsh-evolution-client-kit": "^0.32.5"
|
|
55
55
|
},
|
|
56
56
|
"engines": {
|
|
57
57
|
"dsh": ">=0.2.1-rc.2 <0.2.2-0"
|