yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wip: antdv 4.0

pull/28/head
xingyu 2023-07-30 11:40:29 +08:00
parent 320c6ee043
commit bc61e8c86f
5 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/Basic/index.ts
View File

@ -1,8 +1,9 @@
import basicArrow from './src/BasicArrow.vue' import basicArrow from './src/BasicArrow.vue'
import basicTitle from './src/BasicTitle.vue'
import basicHelp from './src/BasicHelp.vue' import basicHelp from './src/BasicHelp.vue'
import basicTitle from './src/BasicTitle.vue'
import { withInstall } from '@/utils' import { withInstall } from '@/utils'
export const BasicArrow = withInstall(basicArrow) export const BasicArrow = withInstall(basicArrow)
export const BasicTitle = withInstall(basicTitle)
export const BasicHelp = withInstall(basicHelp) export const BasicHelp = withInstall(basicHelp)
export const BasicTitle = withInstall(basicTitle)

2
src/components/Basic/src/BasicTitle.vue
View File

@ -50,7 +50,7 @@ const getClass = computed(() => [
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
line-height: 24px; line-height: 24px;
color: @text-color-base; // color: @text-color-base;
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;

8
src/components/Drawer/src/BasicDrawer.vue
View File

@ -1,4 +1,4 @@
<script lang="ts" setup inheritAttrs="false"> <script lang="ts" setup>
import type { CSSProperties } from 'vue' import type { CSSProperties } from 'vue'
import { computed, getCurrentInstance, nextTick, ref, toRaw, unref, watch } from 'vue' import { computed, getCurrentInstance, nextTick, ref, toRaw, unref, watch } from 'vue'
import { Drawer } from 'ant-design-vue' import { Drawer } from 'ant-design-vue'
@ -13,6 +13,8 @@ import { isFunction, isNumber } from '@/utils/is'
import { useDesign } from '@/hooks/web/useDesign' import { useDesign } from '@/hooks/web/useDesign'
import { useAttrs } from '@/hooks/core/useAttrs' import { useAttrs } from '@/hooks/core/useAttrs'
defineOptions({ inheritAttrs: false })
const props = defineProps(basicProps) const props = defineProps(basicProps)
const emit = defineEmits(['visible-change', 'ok', 'close', 'register']) const emit = defineEmits(['visible-change', 'ok', 'close', 'register'])
@ -52,10 +54,8 @@ const getProps = computed((): DrawerProps => {
const detailCls = `${prefixCls}__detail` const detailCls = `${prefixCls}__detail`
opt.class = wrapClassName ? `${wrapClassName} ${detailCls}` : detailCls opt.class = wrapClassName ? `${wrapClassName} ${detailCls}` : detailCls
if (!getContainer) { if (!getContainer)
// TODO type error?
opt.getContainer = `.${prefixVar}-layout-content` as any opt.getContainer = `.${prefixVar}-layout-content` as any
}
} }
return opt as DrawerProps return opt as DrawerProps
}) })

35
src/components/Modal/src/index.less
View File

@ -50,6 +50,7 @@
} }
&-content { &-content {
padding: 12px 8px !important;
box-shadow: box-shadow:
0 4px 8px 0 rgb(0 0 0 / 20%), 0 4px 8px 0 rgb(0 0 0 / 20%),
0 6px 20px 0 rgb(0 0 0 / 19%); 0 6px 20px 0 rgb(0 0 0 / 19%);
@ -62,7 +63,9 @@
} }
&-close { &-close {
width: auto !important;
font-weight: normal; font-weight: normal;
// background: #fff !important;
outline: none; outline: none;
} }
@ -73,21 +76,37 @@
line-height: 56px; line-height: 56px;
} }
&-confirm-body { // &-confirm-body {
.ant-modal-confirm-content { // .ant-modal-confirm-content {
// color: #fff; // // color: #fff;
> * { // > * {
color: @text-color-help-dark; // color: @text-color-help-dark;
} // }
} // }
} // }
// &-confirm-confirm.error .ant-modal-confirm-body > .anticon {
// color: @error-color;
// }
&-confirm-btns { &-confirm-btns {
.ant-btn:last-child { .ant-btn:last-child {
margin-right: 0; margin-right: 0;
} }
} }
// &-confirm-info {
// .ant-modal-confirm-body > .anticon {
// color: @warning-color;
// }
// }
// &-confirm-confirm.success {
// .ant-modal-confirm-body > .anticon {
// color: @success-color;
// }
// }
} }
.ant-modal-confirm .ant-modal-body { .ant-modal-confirm .ant-modal-body {

4
src/components/Table/src/BasicTable.vue
View File

@ -340,7 +340,7 @@ emit('register', tableAction, formActions)
width: 100%; width: 100%;
padding: 12px 10px 6px; padding: 12px 10px 6px;
margin-bottom: 16px; margin-bottom: 16px;
background-color: @component-background; // background-color: @component-background;
border-radius: 2px; border-radius: 2px;
} }
} }
@ -353,7 +353,7 @@ emit('register', tableAction, formActions)
.ant-table-wrapper { .ant-table-wrapper {
padding: 6px; padding: 6px;
background-color: @component-background; // background-color: @component-background;
border-radius: 2px; border-radius: 2px;
.ant-table-title { .ant-table-title {