Skip to content

Commit de9b78f

Browse files
authored
Merge branch 'opentiny:dev' into dev
2 parents 364f3d1 + 04edfe7 commit de9b78f

File tree

503 files changed

+2821
-1365
lines changed

Some content is hidden

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

503 files changed

+2821
-1365
lines changed

.github/workflows/auto-all-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
run: pnpm build:runtime
7575

7676
- name: Publish Vue3 And Vue2 components
77-
run: pnpm pub:all && pnpm pub:utils && pnpm pub:hooks
77+
run: pnpm pub:all && pnpm pub:runtime && pnpm pub:utils && pnpm pub:hooks
7878
env:
7979
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
8080

.github/workflows/dispatch-all-publish-alpha.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@ jobs:
8989
run: pnpm release:alpha
9090

9191
- name: Publish Vue3 And Vue2 components
92-
run: pnpm pub:all && pnpm pub:utils && pnpm pub:hooks && pnpm pub:site
92+
run: pnpm pub:all && pnpm pub:runtime && pnpm pub:utils && pnpm pub:hooks && pnpm pub:site
9393
env:
9494
NODE_AUTH_TOKEN: ${{ secrets.NPM_OPENTINY_VUE_TOKEN }}

.github/workflows/dispatch-renderless-theme-publish-alpha.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@ jobs:
101101
env:
102102
NODE_AUTH_TOKEN: ${{ secrets.NPM_OPENTINY_VUE_TOKEN }}
103103

104+
- name: Publish Runtime
105+
if: contains(inputs.components, 'runtime') == true
106+
run: |
107+
pnpm pub:runtime
108+
env:
109+
NODE_AUTH_TOKEN: ${{ secrets.NPM_OPENTINY_VUE_TOKEN }}
110+
104111
- name: Publish Hooks
105112
if: contains(inputs.components, 'hooks') == true
106113
run: |

examples/sites/demos/apis/button-group.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export default {
163163
code: `
164164
interface IButtonGroupData {
165165
text: string // 显示文本
166-
value: number | number // 选中的值
166+
value: number | string // 选中的值
167167
disabled?: boolean // 是否禁用
168168
tip?: string // 按钮悬浮提示 v3.17.0版本增加此功能
169169
// 配置选块角标

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,20 @@ export default {
171171
mode: ['pc', 'mobile-first'],
172172
pcDemo: 'basic-usage',
173173
mfDemo: 'basic-usage'
174+
},
175+
{
176+
name: 'show-back-today',
177+
type: 'boolean',
178+
defaultValue: 'true',
179+
desc: {
180+
'zh-CN': '是否展示左上侧按钮显示,默认展示',
181+
'en-US': 'Should the upper left button be displayed, Default Display'
182+
},
183+
meta: {
184+
stable: '3.22.0'
185+
},
186+
mode: ['mobile-first'],
187+
mfDemo: 'calendar-mode'
174188
}
175189
],
176190
events: [

examples/sites/demos/apis/grid.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,6 +1692,20 @@ export default {
16921692
mode: ['pc', 'mobile-first'],
16931693
pcDemo: 'grid-tree-table#tree-table-tree-grid-insert-delete-update'
16941694
},
1695+
{
1696+
name: 'getTreeExpandeds',
1697+
type: '() => IRow[]',
1698+
defaultValue: '',
1699+
meta: {
1700+
stable: '3.22.0'
1701+
},
1702+
desc: {
1703+
'zh-CN': '获取展开的行数据',
1704+
'en-US': 'Get the expanded row data'
1705+
},
1706+
mode: ['pc', 'mobile-first'],
1707+
pcDemo: 'grid-tree-table#tree-table-tree-grid-expand'
1708+
},
16951709
{
16961710
name: 'closeFilter',
16971711
type: '() => void',

examples/sites/demos/apis/progress.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,20 @@ export default {
140140
],
141141
events: [],
142142
methods: [],
143-
slots: []
143+
slots: [
144+
{
145+
name: 'statusIcon',
146+
desc: {
147+
'zh-CN': '状态插槽,successIcon / exceptionIcon / warningIcon',
148+
'en-US': 'Status slot, successIcon / exceptionIcon / warningIcon'
149+
},
150+
mode: ['pc', 'mobile-first'],
151+
pcDemo: 'slot-icon-status',
152+
meta: {
153+
stable: '3.22.0'
154+
}
155+
}
156+
]
144157
}
145158
],
146159
types: [

examples/sites/demos/mobile-first/app/calendar-view/calendar-mode.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<template>
2-
<tiny-calendar-view :events="eventslist" :year="2023" :month="6" :modes="['month', 'timeline', 'schedule']">
2+
<tiny-calendar-view
3+
:show-back-today="false"
4+
:events="eventslist"
5+
:year="2023"
6+
:month="6"
7+
:modes="['month', 'timeline', 'schedule']"
8+
>
39
</tiny-calendar-view>
410
</template>
511

examples/sites/demos/mobile-first/app/calendar-view/webdoc/calendar-view.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ export default {
2222
},
2323
desc: {
2424
'zh-CN':
25-
'<p>通过 <code>mode</code> 属性指定以年的形式显示,将展示当年的每个月份。可选值有 <code>month</code> / <code>timeline</code> / <code>schedule</code>。</p>\n',
25+
'<p>通过 <code>mode</code> 属性指定以年的形式显示,将展示当年的每个月份。可选值有 <code>month</code> / <code>timeline</code> / <code>schedule</code>。通过<code>show-back-today</code> 属性控制左侧按钮显示。</p>\n',
2626
'en-US':
27-
'<p>The <code>mode</code> attribute specifies that each month of the current year is displayed. The options are <code>month</code> / <code>timeline</code> / <code>schedule</code>. </p>\n'
27+
'<p>The <code>mode</code> attribute specifies that each month of the current year is displayed. The options are <code>month</code> / <code>timeline</code> / <code>schedule</code>. Control the display of the left button through the<code>show back today</code>attribute.</p>\n'
2828
},
2929
codeFiles: ['calendar-mode.vue']
3030
},
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<template>
2+
<div>
3+
<tiny-progress class="progress" :stroke-width="12" :percentage="100" status="success">
4+
<template #successIcon>
5+
<TinyIconSmile />
6+
</template>
7+
</tiny-progress>
8+
<br />
9+
<tiny-progress class="progress" :stroke-width="12" :percentage="80" status="warning">
10+
<template #warningIcon>
11+
<TinyIconMeh />
12+
</template>
13+
</tiny-progress>
14+
<br />
15+
<tiny-progress class="progress" :stroke-width="12" :percentage="50" status="exception">
16+
<template #exceptionIcon>
17+
<TinyIconFrown />
18+
</template>
19+
</tiny-progress>
20+
</div>
21+
</template>
22+
23+
<script lang="jsx">
24+
import { TinyProgress } from '@opentiny/vue'
25+
import { IconFrown, IconMeh, IconSmile } from '@opentiny/vue-icon'
26+
27+
export default {
28+
components: {
29+
TinyProgress,
30+
TinyIconSmile: IconSmile(),
31+
TinyIconMeh: IconMeh(),
32+
TinyIconFrown: IconFrown()
33+
}
34+
}
35+
</script>

0 commit comments

Comments
 (0)