Skip to content

Commit db5b3d4

Browse files
refactor: badge, collapse, comment (#1666)
* refactor: badge, collapse, comment * fix(carousel): button import --------- Co-authored-by: huaweidevcloud <[email protected]>
1 parent bded725 commit db5b3d4

File tree

8 files changed

+10
-9
lines changed

8 files changed

+10
-9
lines changed

packages/devui-vue/devui/badge/src/badge.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { defineComponent, computed } from 'vue';
22
import { badgeProps, BadgeProps } from './badge-types';
3-
import { useNamespace } from '../../shared/hooks/use-namespace';
3+
import { useNamespace } from '@devui/shared/utils';
44
import './badge.scss';
55

66
type IStyleMap = Pick<BadgeProps, 'bgColor' | 'textColor'>;

packages/devui-vue/devui/carousel/src/carousel.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { defineComponent, ref, watch, onMounted, onBeforeUnmount, Fragment, Comment, toRefs } from 'vue';
22
import type { VNode } from 'vue';
33
import { carouselProps, DotTrigger, CarouselProps } from './types';
4-
import Icon from '@devui/shared/components/icon';
4+
import { Icon } from '@devui/shared/components/icon';
55
import { useNamespace } from '@devui/shared/utils';
66
import './carousel.scss';
77

packages/devui-vue/devui/collapse/src/collapse-item.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { defineComponent, computed, inject, Transition, onMounted, shallowRef } from 'vue';
22
import { collapseItemProps } from './collapse-types';
3-
import { useNamespace } from '../../shared/hooks/use-namespace';
3+
import { useNamespace } from '@devui/shared/utils';
44
import OpenIcon from './collapse-open-icon';
55
import { SELECT_TOKEN } from './const';
66

@@ -24,7 +24,6 @@ export default defineComponent({
2424
});
2525
const handlerTitleClick = (e: MouseEvent) => {
2626
e.preventDefault();
27-
e.stopPropagation();
2827
if (!props.disabled) {
2928
collapse?.collapseItemClick(props.name);
3029
}

packages/devui-vue/devui/collapse/src/collapse.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
line-height: 45px;
2929
color: $devui-text;
3030
background-color: $devui-base-bg;
31+
box-sizing: border-box;
3132
cursor: pointer;
3233

3334
&.#{$devui-prefix}-collapse__item--disabled {

packages/devui-vue/devui/collapse/src/collapse.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { defineComponent, provide, reactive, toRefs } from 'vue';
22
import { SELECT_TOKEN } from './const';
33
import { collapseProps, CollapseContext, CollapseActiveData } from './collapse-types';
4-
import { useNamespace } from '../../shared/hooks/use-namespace';
4+
import { useNamespace } from '@devui/shared/utils';
55
import './collapse.scss';
66

77
export default defineComponent({

packages/devui-vue/devui/comment/src/comment.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
&__content {
3333
margin-top: 8px;
3434
line-height: 20px;
35-
font-size: $devui-text;
35+
font-size: $devui-font-size;
36+
color: $devui-text;
3637
}
3738

3839
&__actions {

packages/devui-vue/devui/comment/src/comment.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import { defineComponent, toRefs } from 'vue';
22
import { commentProps, CommentProps } from './comment-types';
3-
import { useNamespace } from '../../shared/hooks/use-namespace';
4-
import { isUrl, isBase64 } from '../../shared/utils/url';
5-
import { Avatar } from '../../avatar';
3+
import { useNamespace, isUrl, isBase64 } from '@devui/shared/utils';
4+
import { Avatar } from '@devui/shared/components/avatar';
65
import './comment.scss';
76

87
export default defineComponent({

packages/devui-vue/devui/shared/utils/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ export * from './is';
1212
export * from './wait';
1313
export * from './omit';
1414
export * from './use-namespace';
15+
export * from './url';

0 commit comments

Comments
 (0)