Skip to content

Commit cd2e560

Browse files
authored
Merge pull request #92 from ccagml/main
2.10.3 上锁题目过滤问题
2 parents de35828 + e6dc03b commit cd2e560

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

.github/workflows/update_version.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
1-
name: debug
1+
name: update_version
22

33
on:
44
workflow_dispatch:
55
inputs:
66
tag:
7-
description: "test Tag"
8-
required: true
7+
description: "版本号"
8+
type: string
9+
change:
10+
description: "提交内容"
11+
type: string
912

1013
jobs:
11-
linux:
14+
jobA:
1215
name: Linux
1316
runs-on: ubuntu-latest
14-
timeout-minutes: 30
17+
if: github.event.inputs.tag != '' && github.event.inputs.change != ''
1518
steps:
1619
- uses: actions/checkout@v2
1720
- run: |
1821
ls
1922
sed -i "s/\"version\":.*$/\"version\": \"${{ github.event.inputs.tag }}\",/" package.json
20-
git config user.name github-actions
21-
git config user.email [email protected]
23+
echo -e "## version ${{ github.event.inputs.tag }}\n\n- ${{ github.event.inputs.change }}\n\n$(cat CHANGELOG.md)" > CHANGELOG.md
24+
git config user.name ccagml
25+
git config user.email [email protected]
2226
git add .
23-
git commit -m "update version"
27+
git commit -m ${{ github.event.inputs.change }}
2428
git push

src/controller/TreeViewController.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,10 @@ class TreeViewController implements Disposable {
483483
const showLockedFlag: boolean = isShowLocked();
484484
const useEndpointTranslation: boolean = isUseEndpointTranslation();
485485
const result: string = await executeService.getAllProblems(showLockedFlag, useEndpointTranslation);
486-
const all_problem_info = JSON.parse(result);
486+
let all_problem_info = JSON.parse(result);
487+
if (!showLockedFlag) {
488+
all_problem_info = all_problem_info.filter((p) => !p.locked);
489+
}
487490
const problems: IProblem[] = [];
488491
const AllScoreData = treeDataService.getScoreData();
489492
// 增加直接在线获取分数数据

0 commit comments

Comments
 (0)