Skip to content

Commit

Permalink
Merge pull request #30 from ivy-design/dev
Browse files Browse the repository at this point in the history
v1.7.2
  • Loading branch information
GuoJikun authored Jun 14, 2024
2 parents 0e14517 + d0ce223 commit 80eca72
Show file tree
Hide file tree
Showing 49 changed files with 3,193 additions and 700 deletions.
161 changes: 85 additions & 76 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -1,78 +1,87 @@
{
"default": true,
"MD007": { "indent": 4 },
"no-hard-tabs": false,
"MD013": { "line_length": 100 },
"MD030": { "ul_multi": 1, "ul_single": 1, "ol_multi": 1, "ol_single": 1 },
"MD033": {
"allowed_elements": [
"img",
"input",
"script",
"style",
"div",
"Badge",
"p",
"hr",
"ClientOnly",
"ivy-button",
"br",
"span",
"ivy-space",
"ivy-collapse",
"ivy-collapse-item",
"ivy-divider",
"textarea",
"ivy-radio",
"ivy-radio-group",
"ivy-checkbox",
"ivy-checkbox-group",
"ivy-aspect-ratio",
"ivy-icon",
"ivy-circle",
"ivy-pagination",
"ivy-carousel",
"ivy-carousel-item",
"ivy-image",
"ivy-description-item",
"ivy-description",
"ivy-rate",
"ivy-input",
"ivy-avatar",
"ivy-scrollbar",
"ivy-table",
"ivy-table-column",
"ivy-drawer",
"ivy-tooltip",
"ivy-details",
"ivy-tree",
"ivy-link",
"ivy-tag",
"ivy-text",
"ivy-affix",
"ivy-time-select",
"ivy-date-picker",
"ivy-time-picker",
"ivy-select",
"ivy-option",
"ivy-dropdown",
"ivy-dropdown-menu",
"ivy-dropdown-item",
"ivy-result",
"ivy-tabs",
"ivy-tab-pane",
"ivy-split",
"ivy-switch",
"ivy-badge",
"ivy-timeline",
"ivy-timeline-item",
"ivy-steps",
"ivy-step",
"ivy-tip",
"ivy-tour-step",
"ivy-tour",
"ivy-card",
"ivy-textarea"
]
}
"default": true,
"MD007": { "indent": 4 },
"no-hard-tabs": false,
"MD013": { "line_length": 100 },
"MD030": { "ul_multi": 1, "ul_single": 1, "ol_multi": 1, "ol_single": 1 },
"MD033": {
"allowed_elements": [
"img",
"input",
"script",
"style",
"div",
"Badge",
"p",
"hr",
"ClientOnly",
"ivy-button",
"br",
"span",
"ivy-space",
"ivy-collapse",
"ivy-collapse-item",
"ivy-divider",
"textarea",
"ivy-radio",
"ivy-radio-group",
"ivy-checkbox",
"ivy-checkbox-group",
"ivy-aspect-ratio",
"ivy-icon",
"ivy-circle",
"ivy-pagination",
"ivy-carousel",
"ivy-carousel-item",
"ivy-image",
"ivy-description-item",
"ivy-description",
"ivy-rate",
"ivy-input",
"ivy-avatar",
"ivy-scrollbar",
"ivy-table",
"ivy-table-column",
"ivy-drawer",
"ivy-tooltip",
"ivy-details",
"ivy-tree",
"ivy-link",
"ivy-tag",
"ivy-text",
"ivy-affix",
"ivy-time-select",
"ivy-date-picker",
"ivy-time-picker",
"ivy-select",
"ivy-option",
"ivy-dropdown",
"ivy-dropdown-menu",
"ivy-dropdown-item",
"ivy-result",
"ivy-tabs",
"ivy-tab-pane",
"ivy-split",
"ivy-switch",
"ivy-badge",
"ivy-timeline",
"ivy-timeline-item",
"ivy-steps",
"ivy-step",
"ivy-alert",
"ivy-tour-step",
"ivy-tour",
"ivy-card",
"ivy-textarea",
"ivy-command",
"ivy-command-dialog",
"ivy-command-list",
"ivy-command-group",
"ivy-command-item",
"ivy-command-separator",
"ivy-command-search",
"ivy-popover",
"ivy-color-picker"
]
}
}
3 changes: 0 additions & 3 deletions .vscode/extensions.json

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ pnpm test:unit
| Result | 结果 |
| Drawer | 抽屉 |
| Input | 输入框 |
| Tip | 提示 |
| Alert | 提示 |
| Select | 下拉选择 |
| Loading | 加载 |
| Details | 详情-同原生的 `details` |
Expand Down
6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@
},
"author": "",
"license": "MIT",
"dependencies": {
"@floating-ui/vue": "^1.0.6",
"@vueuse/core": "^10.6.1",
"dayjs": "^1.11.10",
"vue": "^3.3.8"
},
"devDependencies": {
"@changesets/cli": "^2.26.2",
"npm-run-all": "^4.1.5"
Expand Down
42 changes: 21 additions & 21 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"name": "docs",
"version": "1.0.0",
"description": "",
"main": "index.js",
"type": "module",
"private": true,
"scripts": {
"dev": "vitepress dev src",
"build": "vitepress build src",
"preview": "vitepress preview src"
},
"keywords": [],
"author": "",
"license": "MIT",
"dependencies": {
"@ivy-design/ce": "workspace:*",
"vue": "^3.3.8"
},
"devDependencies": {
"vitepress": "1.0.0-rc.41"
}
"name": "docs",
"version": "1.0.0",
"description": "",
"main": "index.js",
"type": "module",
"private": true,
"scripts": {
"dev": "vitepress dev src",
"build": "vitepress build src",
"preview": "vitepress preview src"
},
"keywords": [],
"author": "",
"license": "MIT",
"dependencies": {
"@ivy-design/ce": "workspace:*",
"vue": "^3.3.8"
},
"devDependencies": {
"vitepress": "1.2.0"
}
}
13 changes: 12 additions & 1 deletion packages/docs/src/.vitepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ import sidebar from "./config/sidebar";
import nav from "./config/nav";

export default defineConfig({
title: "ivy-design",
title: "ivyDesign",
description: "使用 vue3 开发的web component组件库",
head: [["link", { rel: "icon", href: "/favicon.png" }]],
themeConfig: {
logo: "/images/logo.png",
nav,
sidebar,
outline: [2, 3],
Expand All @@ -18,6 +20,15 @@ export default defineConfig({
provider: "local",
},
},
markdown: {
container: {
tipLabel: "提示",
warningLabel: "警告",
dangerLabel: "危险",
infoLabel: "信息",
detailsLabel: "详细信息",
},
},
vue: {
template: {
compilerOptions: {
Expand Down
Loading

0 comments on commit 80eca72

Please sign in to comment.