Skip to content

Commit

Permalink
Merge branch 'main' into gavin/v4-dev-customrouter
Browse files Browse the repository at this point in the history
* main:
  feat(Menu): Add custom images to menu  (vbenjs#3158)
  fix: 修复Modal.confirm的返回类型问题,需要有destroy,update的方法 (vbenjs#3161)
  chore: fix type:check error (vbenjs#3159)
  fix(BasicForm): useForm 中 scheme 选项 slot 与 component冲突 (vbenjs#3133)
  chore: replace intro.js with driver.js (vbenjs#3151)
  fix(ApiSelect): type warning
  feat(ApiTree): 完善ApiTree组件的重置回显功能. close vbenjs#2307
  chore(Demo): restore ApiTree schema show
  fix(ApiTree): Modify Trigger Selection Event Name
  fix: ApiTransfer 不支持disabled (vbenjs#3149)
  fix: vbenjs#3144 Drawer的footer样式错位问题 (vbenjs#3148)
  feat(BasicButton):  BasicButton组件支持icon插槽. close vbenjs#1377
  chore(Pagination): Remove the unnecessary pagesize attribute

# Conflicts:
#	pnpm-lock.yaml
#	src/components/Form/src/components/ApiSelect.vue
  • Loading branch information
gavinZhang001 committed Oct 17, 2023
2 parents 0ed0875 + b3a6ef6 commit 6eedcb4
Show file tree
Hide file tree
Showing 35 changed files with 681 additions and 5,161 deletions.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@
"cropperjs": "^1.5.13",
"crypto-js": "^4.1.1",
"dayjs": "^1.11.9",
"driver.js": "^1.3.0",
"echarts": "^5.4.2",
"exceljs": "^4.3.0",
"intro.js": "^7.0.1",
"lodash-es": "^4.17.21",
"mockjs": "^1.1.0",
"nprogress": "^0.2.0",
Expand Down Expand Up @@ -104,7 +104,6 @@
"@purge-icons/generated": "^0.9.0",
"@types/codemirror": "^5.60.8",
"@types/crypto-js": "^4.1.1",
"@types/intro.js": "^5.1.1",
"@types/lodash-es": "^4.17.7",
"@types/mockjs": "^1.0.7",
"@types/nprogress": "^0.2.0",
Expand Down
Loading

0 comments on commit 6eedcb4

Please sign in to comment.