diff --git a/src/assets/images/link.png b/src/assets/images/link.png new file mode 100644 index 0000000..4a0319c Binary files /dev/null and b/src/assets/images/link.png differ diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue index c4cf1ea..2ff4a4a 100644 --- a/src/components/Form/src/BasicForm.vue +++ b/src/components/Form/src/BasicForm.vue @@ -322,7 +322,24 @@ } } } - + /*【美化表单】form的字体改小一号*/ + .ant-form-item-label > label{ + font-size: 13px; + } + .ant-form-item .ant-select { + font-size: 13px; + } + .ant-select-item-option-selected { + font-size: 13px; + } + .ant-select-item-option-content { + font-size: 13px; + } + .ant-input { + font-size: 13px; + } + /*【美化表单】form的字体改小一号*/ + .ant-form-explain { font-size: 14px; } diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue index 7bacaef..39546cf 100644 --- a/src/components/Table/src/BasicTable.vue +++ b/src/components/Table/src/BasicTable.vue @@ -17,7 +17,7 @@ - +
@@ -289,6 +289,9 @@ wrapRef, tableAction, redoHeight, + handleResizeColumn: (w, col) => { + col.width = w; + }, getFormProps: getFormProps as any, replaceFormSlotKey, getFormSlotKeys, @@ -406,8 +409,8 @@ //表格选择工具栏样式 .alert { height: 38px; - background-color: #f3f3f3; - border-color: #e3e3e3; + background-color: #e6f7ff; + border-color: #91d5ff; } &--inset { .ant-table-wrapper { diff --git a/src/components/Table/src/props.ts b/src/components/Table/src/props.ts index 5089bb5..2d409fc 100644 --- a/src/components/Table/src/props.ts +++ b/src/components/Table/src/props.ts @@ -20,7 +20,7 @@ export const basicProps = { }, showTableSetting: propTypes.bool, autoCreateKey: propTypes.bool.def(true), - striped: propTypes.bool.def(true), + striped: propTypes.bool.def(false), showSummary: propTypes.bool, summaryFunc: { type: [Function, Array] as PropType<(...arg: any[]) => any[]>, diff --git a/src/components/jeecg/JVxeTable/src/style/index.less b/src/components/jeecg/JVxeTable/src/style/index.less index aba9fa6..510209a 100644 --- a/src/components/jeecg/JVxeTable/src/style/index.less +++ b/src/components/jeecg/JVxeTable/src/style/index.less @@ -94,5 +94,9 @@ width: 17px; height: 17px; } + /*【美化表单】行编辑table的title字体改小一号*/ + .vxe-header--column.col--ellipsis>.vxe-cell .vxe-cell--title{ + font-size: 13px; + } } diff --git a/src/design/ant/pagination.less b/src/design/ant/pagination.less index b3580f9..388edcc 100644 --- a/src/design/ant/pagination.less +++ b/src/design/ant/pagination.less @@ -50,7 +50,9 @@ html[data-theme='dark'] { .ant-pagination-next, .ant-pagination-item { margin: 0 4px !important; - background-color: #f4f4f5 !important; + //update-begin---author:scott ---date:2022-09-30 for:【美化】Table分页页面默认背景色丑,去掉----------- + //background-color: #f4f4f5 !important; + //update-end---author:scott ---date::2022-09-30 for:【美化】Table分页页面默认背景色丑,去掉------------ border: none; border-radius: none !important; diff --git a/src/design/theme.less b/src/design/theme.less index 7f348bf..aa1f1ad 100644 --- a/src/design/theme.less +++ b/src/design/theme.less @@ -6,7 +6,23 @@ html[data-theme='light'] { .text-secondary { color: rgba(0, 0, 0, 0.45); } - + /*【美化】自定义table字体颜色*/ + .ant-table { + color: rgba(0, 0, 0, 0.65); + } + /*【美化】自定义table字体颜色*/ + /*【美化】自定义form字体颜色*/ + .ant-select-multiple .ant-select-selection-item-content { + color: rgba(0, 0, 0, 0.65); + } + .ant-input-affix-wrapper > input.ant-input { + color: rgba(0, 0, 0, 0.65); + } + .ant-select-single.ant-select-show-arrow .ant-select-selection-item, .ant-select-single.ant-select-show-arrow .ant-select-selection-placeholder{ + color: rgba(0, 0, 0, 0.65); + } + /*【美化】自定义form字体颜色*/ + .ant-alert-success { background-color: #f6ffed; border: 1px solid #b7eb8f; diff --git a/src/hooks/setting/useHeaderSetting.ts b/src/hooks/setting/useHeaderSetting.ts index 4ed6023..098ed39 100644 --- a/src/hooks/setting/useHeaderSetting.ts +++ b/src/hooks/setting/useHeaderSetting.ts @@ -50,6 +50,9 @@ export function useHeaderSetting() { const getShowBread = computed(() => { return unref(getMenuMode) !== MenuModeEnum.HORIZONTAL && unref(getShowBreadCrumb) && !unref(getSplit); }); + const getShowBreadTitle = computed(() => { + return unref(getMenuMode) !== MenuModeEnum.HORIZONTAL && !unref(getShowBreadCrumb) && !unref(getSplit); + }); const getShowHeaderLogo = computed(() => { return unref(getShowLogo) && !unref(getIsSidebarType) && !unref(getIsMixSidebar); @@ -82,5 +85,6 @@ export function useHeaderSetting() { getShowInsetHeaderRef, getUnFixedAndFull, getHeaderBgColor, + getShowBreadTitle }; } diff --git a/src/hooks/system/useListPage.ts b/src/hooks/system/useListPage.ts index 6d09d6c..81cc60f 100644 --- a/src/hooks/system/useListPage.ts +++ b/src/hooks/system/useListPage.ts @@ -235,7 +235,7 @@ export function useListTable(tableProps: TableProps): [ }, }, // 斑马纹 - striped: true, + striped: false, // 是否可以自适应高度 canResize: true, // 表格最小高度 diff --git a/src/layouts/default/header/index.vue b/src/layouts/default/header/index.vue index dcbc1e3..8d26c49 100644 --- a/src/layouts/default/header/index.vue +++ b/src/layouts/default/header/index.vue @@ -10,6 +10,8 @@ :sider="false" /> + + 欢迎进入 {{ title }} @@ -42,7 +44,7 @@ diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts index 111ec50..1c3c942 100644 --- a/src/settings/projectSetting.ts +++ b/src/settings/projectSetting.ts @@ -167,7 +167,7 @@ const setting: ProjectConfig = { lockTime: 0, // 显示面包屑 - showBreadCrumb: true, + showBreadCrumb: false, // 显示面包屑图标 showBreadCrumbIcon: true,