Skip to content

Commit

Permalink
Merge pull request #298 from jiewenhuang/dev
Browse files Browse the repository at this point in the history
v1.3.0
  • Loading branch information
jiewenhuang authored Jul 17, 2024
2 parents e694d26 + 469ba9a commit fd147df
Show file tree
Hide file tree
Showing 116 changed files with 14,421 additions and 6,578 deletions.
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx lint-staged
13 changes: 11 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
> 2、部分功能使用插件进行实现
> 3、请配合Halo2.8.0及以上版本使用
> 4、菜单栏的图标请使用[iconfont](https://www.iconfont.cn/)的图标,需要填入Font Family 和图标代码例如:`jiewen joe-icon-tupian`
> 5、使用自定义标签样式请安装[Tool-Bench](https://github.com/DioxideCN/Tool-Bench)插件,标签请参考[Joe3部分样式](https://www.jiewen.run/archives/joe3style)或者直接使用插件标签
> 5、使用自定义标签样式请以插入HTML文本形式使用,标签请参考[Joe3部分样式](https://www.jiewen.run/archives/joe3style)或者直接使用插件标签
- [x] 卡片化设计
- [x] 响应式主题
Expand Down Expand Up @@ -70,7 +70,8 @@ WIP
<br>

### 奉献提示
此仓库分为main和dev分支,如何您想奉献代码,请fork dev分支,开发完成后提交pr到dev分支,dev分支会定期合并到main分支,main分支为稳定版本且dev分支才是最新代码,不接受pr。
~~此仓库分为main和dev分支,如何您想奉献代码,请fork dev分支,开发完成后提交pr到dev分支,dev分支会定期合并到main分支,main分支为稳定版本且dev分支才是最新代码,不接受pr。~~
现在只维护main分支,dev分支不再维护,如有需要请直接提交pr到main分支。


### 🙆‍♂️ 感谢
Expand All @@ -92,3 +93,11 @@ WIP

<br>

### 交流群
QQ群号(929708466)欢迎大家前来交流分享

![QQ群](https://www.jiewen.run/upload/IMG_3508(20240717-140309).JPG)

### TinyTale小程序
[TinyTale Halo微信小程序正式版发布](https://www.jiewen.run/archives/TinyTale-formal-edition)
![TinyTale](https://www.jiewen.run/upload/111.png)
56 changes: 54 additions & 2 deletions annotation-setting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
label:
- $formkit: "select"
name: "enable_read_limit"
label: "是否开启评论后可见"
label: "是否开启登陆后评论可见"
value: "false"
options:
- value: "true"
Expand Down Expand Up @@ -208,7 +208,7 @@ spec:
label:
- $formkit: "select"
name: "enable_read_limit"
label: "是否开启评论后可见"
label: "是否开启登陆后评论可见"
value: "false"
options:
- value: "true"
Expand Down Expand Up @@ -292,6 +292,58 @@ spec:
name: "enable_fold_long_code"
label: "是否开启长代码块自动折叠"
value: "true"
options:
- value: "true"
label:
- value: "false"
label:


---

apiVersion: v1alpha1
kind: AnnotationSetting
metadata:
generateName: annotation-setting-
spec:
targetRef:
group: core.halo.run
kind: LinkGroup
formSchema:
- $formkit: "text"
name: "link_group_sort_seq"
label: "链接分类排序序号,数字越大越靠前,如果<=0,则按照默认排序方式进行排序"
value: "0"
- $formkit: "select"
name: "link_group_enable_show"
label: "是否显示"
value: "true"
options:
- value: "true"
label:
- value: "false"
label:


---

apiVersion: v1alpha1
kind: AnnotationSetting
metadata:
generateName: annotation-setting-
spec:
targetRef:
group: core.halo.run
kind: Link
formSchema:
- $formkit: "text"
name: "link_sort_seq"
label: "同一分类内链接排序序号,数字越大越靠前,如果<=0,则按照默认排序方式进行排序"
value: "0"
- $formkit: "select"
name: "link_enable_show"
label: "是否显示"
value: "true"
options:
- value: "true"
label:
Expand Down
Loading

0 comments on commit fd147df

Please sign in to comment.