Skip to content

Commit 7ad17d8

Browse files
authored
Merge pull request #2518 from opentiny/sync-3.19.0-zzc-1112
feat: sync 3.19.0 to dev
2 parents ccd9ce6 + 15bec74 commit 7ad17d8

File tree

218 files changed

+2282
-848
lines changed

Some content is hidden

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

218 files changed

+2282
-848
lines changed

examples/sites/demos/apis/drawer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ export default {
172172
{
173173
name: 'height',
174174
type: 'string',
175-
defaultValue: "'500px'",
175+
defaultValue: "'100vh'",
176176
desc: {
177177
'zh-CN': '设置抽屉的高度',
178178
'en-US': 'Set the height of the drawer'

examples/sites/demos/pc/app/action-menu/icon-composition-api.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<p>场景1:只显示图标</p>
3+
<p>场景1:显示图标</p>
44
<tiny-action-menu
55
class="custom-icon"
66
:options="options"

examples/sites/demos/pc/app/action-menu/icon.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div>
3-
<p>场景1:只显示图标</p>
3+
<p>场景1:显示图标</p>
44
<tiny-action-menu
55
class="custom-icon"
66
:options="options"

examples/sites/demos/pc/app/amount/size-composition-api.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<template>
22
<tiny-amount size="medium" v-model="value" :date="date"></tiny-amount>
3+
<br />
4+
<tiny-amount v-model="value" :date="date"></tiny-amount>
5+
<br />
6+
<tiny-amount size="small" v-model="value" :date="date"></tiny-amount>
7+
<br />
8+
<tiny-amount size="mini" v-model="value" :date="date"></tiny-amount>
39
</template>
410

511
<script setup lang="jsx">

examples/sites/demos/pc/app/amount/size.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<template>
22
<tiny-amount size="medium" v-model="value" :date="date"></tiny-amount>
3+
<br />
4+
<tiny-amount v-model="value" :date="date"></tiny-amount>
5+
<br />
6+
<tiny-amount size="small" v-model="value" :date="date"></tiny-amount>
7+
<br />
8+
<tiny-amount size="mini" v-model="value" :date="date"></tiny-amount>
39
</template>
410

511
<script lang="jsx">

examples/sites/demos/pc/app/area/custom-service-composition-api.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function getJCR() {
2323
id: '3623',
2424
id_and_type: '3623JCR',
2525
parent_and_type: null,
26-
name: 'A公司 Marketing与销售服务部',
26+
name: 'A公司销售服务部',
2727
date_from: '2005/06/21 00:00:00',
2828
name_en: 'Consumer BG Marketing and Sales Service Dept',
2929
parent_type: null,
@@ -36,7 +36,7 @@ function getJCR() {
3636
id: '650561',
3737
id_and_type: '650561JCR',
3838
parent_and_type: null,
39-
name: 'A公司 Marketing与销售服务部(东莞)',
39+
name: 'A公司销售服务部(东莞)',
4040
date_from: '2012/09/27 00:00:00',
4141
name_en: 'Consumer BG Marketing and Sales Service Dept (Dongguan)',
4242
parent_type: null,

examples/sites/demos/pc/app/area/custom-service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ test('测试自定义服务', async ({ page }) => {
3434
await getSelectItem(areaRep).first().click()
3535
await areaInput.nth(3).click()
3636
await getSelectItem(areaOffice).first().click()
37-
await expect(areaInput.first()).toHaveValue('A公司 Marketing与销售服务部')
37+
await expect(areaInput.first()).toHaveValue('A公司销售服务部')
3838
await expect(areaInput.nth(1)).toHaveValue('火星终端子公司')
3939
await expect(areaInput.nth(2)).toHaveValue('北京代表处')
4040
await expect(areaInput.nth(3)).toHaveValue('牙买加办事处')

examples/sites/demos/pc/app/area/custom-service.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default {
3030
id: '3623',
3131
id_and_type: '3623JCR',
3232
parent_and_type: null,
33-
name: 'A公司 Marketing与销售服务部',
33+
name: 'A公司销售服务部',
3434
date_from: '2005/06/21 00:00:00',
3535
name_en: 'Consumer BG Marketing and Sales Service Dept',
3636
parent_type: null,
@@ -43,7 +43,7 @@ export default {
4343
id: '650561',
4444
id_and_type: '650561JCR',
4545
parent_and_type: null,
46-
name: 'A公司 Marketing与销售服务部(东莞)',
46+
name: 'A公司销售服务部(东莞)',
4747
date_from: '2012/09/27 00:00:00',
4848
name_en: 'Consumer BG Marketing and Sales Service Dept (Dongguan)',
4949
parent_type: null,

examples/sites/demos/pc/app/company/basic-usage-composition-api.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div>
2+
<div class="demo-company-class">
33
<tiny-company
44
v-model="value"
55
placeholder="请选择"
@@ -32,6 +32,9 @@ function change(value) {
3232
</script>
3333

3434
<style scoped>
35+
.demo-company-class {
36+
width: 280px;
37+
}
3538
p {
3639
font-size: 14px;
3740
line-height: 1.5;

examples/sites/demos/pc/app/company/basic-usage.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div>
2+
<div class="demo-company-class">
33
<tiny-company
44
v-model="value"
55
placeholder="请选择"
@@ -39,6 +39,9 @@ export default {
3939
</script>
4040

4141
<style scoped>
42+
.demo-company-class {
43+
width: 280px;
44+
}
4245
p {
4346
font-size: 14px;
4447
line-height: 1.5;

0 commit comments

Comments
 (0)