Skip to content

Commit 17d7e6c

Browse files
Youyou-smilesYouyou-smiles
committed
Merge branch 'dev' of github.com:opentiny/tiny-vue into lty/feat-datePicker
2 parents 963ab8f + d3fcc60 commit 17d7e6c

File tree

1,503 files changed

+57811
-3875
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,503 files changed

+57811
-3875
lines changed

‎commitlint.config.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
module.exports = { extends: ['@commitlint/config-conventional'] }
1+
module.exports = {
2+
extends: ['@commitlint/config-conventional'],
3+
rules: {
4+
'header-max-length': [1, 'always', 150]
5+
}
6+
}

‎examples/blocks/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@opentiny/unplugin-tiny-vue": "~0.0.2",
1717
"@vitejs/plugin-vue": "^4.5.2",
1818
"typescript": "^5.2.2",
19-
"vite": "^5.0.8",
19+
"vite": "catalog:",
2020
"vue-tsc": "^1.8.25"
2121
}
2222
}

‎examples/openinula-docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"eslint-plugin-react-hooks": "^4.6.0",
2424
"postcss": "^8.4.16",
2525
"typescript": "^5.0.2",
26-
"vite": "^4.3.8",
26+
"vite": "catalog:",
2727
"vite-plugin-svgr": "^3.2.0"
2828
}
2929
}

‎examples/react-docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"postcss": "^8.4.16",
2727
"tailwindcss": "^3.3.3",
2828
"typescript": "^5.0.2",
29-
"vite": "^4.3.8",
29+
"vite": "catalog:",
3030
"vite-plugin-react": "^4.0.1",
3131
"vite-plugin-svgr": "^3.2.0"
3232
}

‎examples/react-site/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"unplugin-auto-import": "0.8.7",
6060
"unplugin-vue-components": "^0.19.9",
6161
"uslug": "^1.0.4",
62-
"vite": "^4.3.8",
62+
"vite": "catalog:",
6363
"vite-plugin-html": "^2.0.0",
6464
"vite-plugin-inspect": "^0.5.0",
6565
"vite-plugin-md": "0.13.1"

‎examples/sites/demos/apis/calendar-view.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default {
4343
},
4444
{
4545
name: 'height',
46-
type: 'string',
46+
type: 'string | number',
4747
defaultValue: '',
4848
desc: {
4949
'zh-CN': '日历高度',

‎examples/sites/demos/apis/form.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default {
4444
{
4545
name: 'hide-required-asterisk',
4646
type: 'boolean',
47-
defaultValue: 'true',
47+
defaultValue: 'false',
4848
desc: {
4949
'zh-CN': '是否隐藏必填字段的标签旁边的红色星号',
5050
'en-US': 'Whether to hide the red asterisk next to the label of mandatory fields'

‎examples/sites/demos/apis/grid-select.js‎

Lines changed: 108 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,40 @@ export default {
55
name: 'grid-select',
66
type: 'component',
77
props: [
8+
{
9+
name: 'clearable',
10+
type: 'boolean',
11+
defaultValue: 'false',
12+
desc: {
13+
'zh-CN': '是否启用一键清除的功能',
14+
'en-US': 'Whether to display the one click clear button, only applicable to radio selection'
15+
},
16+
mode: ['pc'],
17+
pcDemo: 'clearable',
18+
mfDemo: 'clearable'
19+
},
20+
{
21+
name: 'filterable',
22+
type: 'boolean',
23+
defaultValue: 'false',
24+
desc: {
25+
'zh-CN': '是否可搜索',
26+
'en-US': 'Is it searchable'
27+
},
28+
mode: ['pc'],
29+
pcDemo: 'filter-method'
30+
},
31+
{
32+
name: 'filter-method',
33+
type: '(query: string) => void',
34+
defaultValue: '',
35+
desc: {
36+
'zh-CN': '自定义过滤方法',
37+
'en-US': 'Custom filtering method'
38+
},
39+
mode: ['pc'],
40+
pcDemo: 'filter-method'
41+
},
842
{
943
name: 'grid-op',
1044
typeAnchorName: 'IGridOption',
@@ -39,6 +73,64 @@ export default {
3973
mode: ['pc'],
4074
pcDemo: 'multiple'
4175
},
76+
{
77+
name: 'radio-config',
78+
typeAnchorName: 'IRadioConfig',
79+
type: 'IRadioConfig',
80+
defaultValue: '',
81+
desc: {
82+
'zh-CN': '单选配置项',
83+
'en-US': 'Radio config'
84+
},
85+
mode: ['pc'],
86+
pcDemo: 'config'
87+
},
88+
{
89+
name: 'remote',
90+
type: 'boolean',
91+
defaultValue: 'false',
92+
desc: {
93+
'zh-CN': '是否为远程搜索',
94+
'en-US': 'Is it a remote search'
95+
},
96+
mode: ['pc'],
97+
pcDemo: 'remote-method'
98+
},
99+
{
100+
name: 'remote-method',
101+
type: '(query:string) => void',
102+
defaultValue: '',
103+
desc: {
104+
'zh-CN': '远程搜索的方法',
105+
'en-US': 'Remote search methods'
106+
},
107+
mode: ['pc'],
108+
pcDemo: 'remote-method'
109+
},
110+
{
111+
name: 'reserve-keyword',
112+
type: 'boolean',
113+
defaultValue: 'false',
114+
desc: {
115+
'zh-CN': '多选可搜索时，是否在选中一个选项后仍然保留当前的搜索关键词',
116+
'en-US':
117+
'When selecting multiple searchable options, do you still keep the current search keywords after selecting one option'
118+
},
119+
mode: ['pc'],
120+
pcDemo: 'remote-method'
121+
},
122+
{
123+
name: 'select-config',
124+
typeAnchorName: 'ISelectConfig',
125+
type: 'ISelectConfig',
126+
defaultValue: '',
127+
desc: {
128+
'zh-CN': '多选配置项',
129+
'en-US': 'Select config'
130+
},
131+
mode: ['pc'],
132+
pcDemo: 'config'
133+
},
42134
{
43135
name: 'text-field',
44136
type: 'string',
@@ -70,14 +162,23 @@ export default {
70162
type: 'interface',
71163
code: `
72164
interface IGridOption {
73-
data: Record<string, any>
74-
columns: {
75-
type: string
76-
field: string
77-
title: string
78-
width: number
79-
}[] // 表格列数据，用法同 Grid
165+
data: Record<string, unknown>
166+
columns: IColumnConfig[] // 表格列数据，同 Grid 组件的 IColumnConfig：https://opentiny.design/tiny-vue/zh-CN/smb-theme/components/grid#api
80167
}
168+
`
169+
},
170+
{
171+
name: 'IRadioConfig',
172+
type: 'interface',
173+
code: `
174+
同 Grid 组件的 IRadioConfig：https://opentiny.design/tiny-vue/zh-CN/smb-theme/components/grid#api
175+
`
176+
},
177+
{
178+
name: 'ISelectConfig',
179+
type: 'interface',
180+
code: `
181+
同 Grid 组件的 ISelectConfig：https://opentiny.design/tiny-vue/zh-CN/smb-theme/components/grid#api
81182
`
82183
}
83184
]

‎examples/sites/demos/apis/grid.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,10 @@ export default {
724724
mfDemo: ''
725725
},
726726
{
727-
name: 'IResizableConfig',
727+
name: 'resizable-config',
728+
meta: {
729+
stable: '3.19.0'
730+
},
728731
typeAnchorName: 'IResizableConfig',
729732
type: 'IResizableConfig',
730733
defaultValue: '',

‎examples/sites/demos/apis/input.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ export default {
129129
type: 'string',
130130
defaultValue: '',
131131
desc: {
132-
'zh-CN': '设置只读态时的文本内容区，如果没有则会使用 modelVale 的值作为只读文本',
132+
'zh-CN': '设置只读态时的文本内容区，如果没有则会使用 modelValue 的值作为只读文本',
133133
'en-US':
134134
"Sets the text content area in the read-only state, if not, modelVale's value is used as the read-only text"
135135
},
@@ -416,7 +416,7 @@ export default {
416416
type: "'medium' | 'small' | 'mini'",
417417
defaultValue: '',
418418
desc: {
419-
'zh-CN': '输入框尺寸，只在 type!="textarea" 时有效',
419+
'zh-CN': '输入框尺寸，只在 type 为 "textarea" 时有效',
420420
'en-US': 'Size of the text box. This parameter is valid only when type!="textarea". '
421421
},
422422
mode: ['pc', 'mobile-first'],

0 commit comments

Comments
 (0)