Skip to content

Commit b4175ac

Browse files
xingyan95xingyan95
committed
Merge branch 'dev' into main
2 parents 28677ed + 0ab83ed commit b4175ac

File tree

6 files changed

+58
-44
lines changed

6 files changed

+58
-44
lines changed

‎packages/devui-vue/devui-cli/commands/build.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ const baseConfig = defineConfig({
2121
resolve: {
2222
alias: [
2323
{ find: '@devui/theme', replacement: path.resolve(__dirname, '../../../devui-theme/src') },
24-
{ find: '@devui/shared/components', replacement: path.resolve(__dirname, '../../../devui') }
24+
{ find: '@devui/shared/components', replacement: path.resolve(__dirname, '../../devui') },
25+
{ find: '@devui', replacement: path.resolve(__dirname, '../../devui') },
2526
]
2627
}
2728
});

‎packages/devui-vue/devui/alert/__tests__/alert.spec.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { mount } from '@vue/test-utils';
2-
import { useNamespace } from '../../shared/hooks/use-namespace';
2+
import { useNamespace } from '@devui/shared/utils';
33
import { h } from 'vue';
44
import Alert from '../src/alert';
55

66
const ns = useNamespace('alert', true);
7+
const close = useNamespace('close', true);
78

89
const baseClass = ns.b();
9-
const closeClass = ns.e('close-icon');
10+
const closeClass = close.b();
1011
const iconClass = ns.e('icon');
1112
const successIconClass = ns.em('icon', 'success');
1213
const warningIconClass = ns.em('icon', 'warning');

‎packages/devui-vue/devui/alert/src/alert.scss‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
}
1919

2020
.#{$devui-prefix}-alert__content {
21-
display: flex;
2221
padding: 0 16px 0 4px;
2322
word-break: normal;
2423
word-wrap: break-word;
@@ -46,7 +45,6 @@
4645

4746
&.#{$devui-prefix}-alert--success {
4847
background-color: $devui-success-bg;
49-
border-color: $devui-success-line;
5048
color: $devui-text;
5149

5250
.#{$devui-prefix}-alert__close-icon {
@@ -58,7 +56,6 @@
5856

5957
&.#{$devui-prefix}-alert--info {
6058
background-color: $devui-info-bg;
61-
border-color: $devui-info-line;
6259
color: $devui-text;
6360

6461
.#{$devui-prefix}-alert__close-icon {
@@ -70,7 +67,6 @@
7067

7168
&.#{$devui-prefix}-alert--warning {
7269
background-color: $devui-warning-bg;
73-
border-color: $devui-warning-line;
7470
color: $devui-text;
7571

7672
.#{$devui-prefix}-alert__close-icon {
@@ -82,7 +78,6 @@
8278

8379
&.#{$devui-prefix}-alert--danger {
8480
background-color: $devui-danger-bg;
85-
border-color: $devui-danger-line;
8681
color: $devui-text;
8782

8883
.#{$devui-prefix}-alert__close-icon {
@@ -93,7 +88,6 @@
9388
}
9489

9590
&.#{$devui-prefix}-alert--simple {
96-
border-color: $devui-line;
9791
color: $devui-text;
9892

9993
.#{$devui-prefix}-alert__close-icon {
@@ -167,7 +161,7 @@
167161
margin-right: 4px;
168162
}
169163

170-
.#{$devui-prefix}-alter--close {
164+
.#{$devui-prefix}-alert--close {
171165
margin: 0;
172166
padding-top: 0;
173167
padding-bottom: 0;

‎packages/devui-vue/devui/alert/src/alert.tsx‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { defineComponent, ref, Transition, onMounted } from 'vue';
22
import AlertCloseIcon from './components/alert-close-icon';
33
import AlertTypeIcon from './components/alert-type-icon';
44
import { alertProps } from './alert-types';
5-
import { useNamespace } from '../../shared/hooks/use-namespace';
5+
import { useNamespace } from '@devui/shared/utils';
66
import './alert.scss';
77

88
export default defineComponent({
@@ -47,14 +47,12 @@ export default defineComponent({
4747
<AlertTypeIcon type={props.type} />
4848
</span>
4949
) : null}
50-
<div class={ns.e('content')}>
51-
<span>{ctx.slots.default?.()}</span>
52-
{props.closeable ? (
53-
<div class={ns.e('close-icon')} onClick={close}>
54-
<AlertCloseIcon />
55-
</div>
56-
) : null}
57-
</div>
50+
<div class={ns.e('content')}>{ctx.slots.default?.()} </div>
51+
{props.closeable ? (
52+
<div class={ns.e('close-icon')} onClick={close}>
53+
<AlertCloseIcon />
54+
</div>
55+
) : null}
5856
</div>
5957
</Transition>
6058
) : null;

‎packages/devui-vue/devui/alert/src/components/alert-type-icon.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { AlertType } from '../alert-types';
2-
import { useNamespace } from '../../../shared/hooks/use-namespace';
2+
import { useNamespace } from '@devui/shared/utils';
33

44
const ns = useNamespace('alert');
55
const AlertTypeIcon = (props: { type: AlertType }): JSX.Element => (

‎packages/devui-vue/docs/components/alert/index.md‎

Lines changed: 44 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,19 @@
1414

1515
```vue
1616
<template>
17-
<div>
18-
<d-alert class="mb-2" type="success" :closeable="false">success</d-alert>
19-
<d-alert class="mb-2" type="danger" :closeable="false">danger</d-alert>
20-
<d-alert class="mb-2" type="warning" :closeable="false">warning</d-alert>
21-
<d-alert class="mb-2" type="info" :closeable="false">info</d-alert>
22-
<d-alert class="mb-2" type="simple" :closeable="false">simple</d-alert>
17+
<div class="alert-demo-1">
18+
<d-alert type="success" :closeable="false">success</d-alert>
19+
<d-alert type="danger" :closeable="false">danger</d-alert>
20+
<d-alert type="warning" :closeable="false">warning</d-alert>
21+
<d-alert type="info" :closeable="false">info</d-alert>
22+
<d-alert type="simple" :closeable="false">simple</d-alert>
2323
</div>
2424
</template>
25+
<style scoped>
26+
.alert-demo-1 > * {
27+
margin-bottom: 20px;
28+
}
29+
</style>
2530
```
2631

2732
:::
@@ -34,12 +39,12 @@
3439

3540
```vue
3641
<template>
37-
<div>
38-
<d-alert class="mb-2" type="success" @close="handleClose">success</d-alert>
39-
<d-alert class="mb-2" type="danger" @close="handleClose">danger</d-alert>
40-
<d-alert class="mb-2" type="warning" @close="handleClose">warning</d-alert>
41-
<d-alert class="mb-2" type="info" @close="handleClose">info</d-alert>
42-
<d-alert class="mb-2" type="simple" @close="handleClose">simple</d-alert>
42+
<div class="alert-demo-2">
43+
<d-alert type="success" @close="handleClose">success</d-alert>
44+
<d-alert type="danger" @close="handleClose">danger</d-alert>
45+
<d-alert type="warning" @close="handleClose">warning</d-alert>
46+
<d-alert type="info" @close="handleClose">info</d-alert>
47+
<d-alert type="simple" @close="handleClose">simple</d-alert>
4348
</div>
4449
</template>
4550
<script>
@@ -54,6 +59,11 @@ export default {
5459
},
5560
};
5661
</script>
62+
<style scoped>
63+
.alert-demo-2 > * {
64+
margin-bottom: 20px;
65+
}
66+
</style>
5767
```
5868

5969
:::
@@ -66,14 +76,19 @@ export default {
6676

6777
```vue
6878
<template>
69-
<div>
70-
<d-alert class="mb-2" type="success" :show-icon="false">success</d-alert>
71-
<d-alert class="mb-2" type="danger" :show-icon="false">danger</d-alert>
72-
<d-alert class="mb-2" type="warning" :show-icon="false">warning</d-alert>
73-
<d-alert class="mb-2" type="info" :show-icon="false">info</d-alert>
74-
<d-alert class="mb-2" type="simple" :show-icon="false">simple</d-alert>
79+
<div class="alert-demo-3">
80+
<d-alert type="success" :show-icon="false">success</d-alert>
81+
<d-alert type="danger" :show-icon="false">danger</d-alert>
82+
<d-alert type="warning" :show-icon="false">warning</d-alert>
83+
<d-alert type="info" :show-icon="false">info</d-alert>
84+
<d-alert type="simple" :show-icon="false">simple</d-alert>
7585
</div>
7686
</template>
87+
<style scoped>
88+
.alert-demo-3 > * {
89+
margin-bottom: 20px;
90+
}
91+
</style>
7792
```
7893

7994
:::
@@ -84,14 +99,19 @@ export default {
8499

85100
```vue
86101
<template>
87-
<div>
88-
<d-alert class="mb-2" type="success" center>success</d-alert>
89-
<d-alert class="mb-2" type="danger" center>danger</d-alert>
90-
<d-alert class="mb-2" type="warning" center>warning</d-alert>
91-
<d-alert class="mb-2" type="info" center>info</d-alert>
92-
<d-alert class="mb-2" type="simple" center>simple</d-alert>
102+
<div class="alert-demo-4">
103+
<d-alert type="success" center>success</d-alert>
104+
<d-alert type="danger" center>danger</d-alert>
105+
<d-alert type="warning" center>warning</d-alert>
106+
<d-alert type="info" center>info</d-alert>
107+
<d-alert type="simple" center>simple</d-alert>
93108
</div>
94109
</template>
110+
<style scoped>
111+
.alert-demo-4 > * {
112+
margin-bottom: 20px;
113+
}
114+
</style>
95115
```
96116

97117
:::

0 commit comments

Comments
 (0)