From abdc9da743078c774941400e98b0b036ca7c1b1f Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Mon, 7 Nov 2022 19:11:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9FUI=E7=BE=8E=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/images/link.png | Bin 0 -> 4211 bytes
src/components/Form/src/BasicForm.vue | 19 +++++++-
src/components/Table/src/BasicTable.vue | 9 ++--
src/components/Table/src/props.ts | 2 +-
.../jeecg/JVxeTable/src/style/index.less | 4 ++
src/design/ant/pagination.less | 4 +-
src/design/theme.less | 18 +++++++-
src/hooks/setting/useHeaderSetting.ts | 4 ++
src/hooks/system/useListPage.ts | 2 +-
src/layouts/default/header/index.vue | 42 +++++++++++++++++-
src/settings/projectSetting.ts | 2 +-
11 files changed, 95 insertions(+), 11 deletions(-)
create mode 100644 src/assets/images/link.png
diff --git a/src/assets/images/link.png b/src/assets/images/link.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a0319cc0a29299d0fc76fe8dfea10c53a484cff
GIT binary patch
literal 4211
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
literal 0
HcmV?d00001
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 @@
<!-- antd v3 升级兼容，阻止数据的收集，防止控制台报错 -->
<!-- https://antdv.com/docs/vue/migration-v3-cn -->
<a-form-item-rest>
- <Table ref="tableElRef" v-bind="getBindValues" :rowClassName="getRowClassName" v-show="getEmptyDataIsShowTable" @change="handleTableChange">
+ <Table ref="tableElRef" v-bind="getBindValues" :rowClassName="getRowClassName" v-show="getEmptyDataIsShowTable" @resizeColumn="handleResizeColumn" @change="handleTableChange">
<template #[item]="data" v-for="item in Object.keys($slots)" :key="item">
<slot :name="item" v-bind="data || {}"></slot>
</template>
@@ -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"
/>
<LayoutBreadcrumb v-if="getShowContent && getShowBread" :theme="getHeaderTheme" />
+ <!-- 欢迎语 -->
+ <span v-if="getShowContent && getShowBreadTitle" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> 欢迎进入 {{ title }} </span>
</div>
<!-- left end -->
@@ -42,7 +44,7 @@
</template>
<script lang="ts">
import { defineComponent, unref, computed, ref, onMounted, toRaw } from 'vue';
-
+ import { useGlobSetting } from '/@/hooks/setting';
import { propTypes } from '/@/utils/propTypes';
import { Layout } from 'ant-design-vue';
@@ -98,7 +100,8 @@
const userStore = useUserStore();
const { getShowTopMenu, getShowHeaderTrigger, getSplit, getIsMixMode, getMenuWidth, getIsMixSidebar } = useMenuSetting();
const { getUseErrorHandle, getShowSettingButton, getSettingButtonPosition } = useRootSetting();
-
+ const { title } = useGlobSetting();
+
const {
getHeaderTheme,
getShowFullScreen,
@@ -109,6 +112,7 @@
getShowHeader,
getShowSearch,
getUseLockPage,
+ getShowBreadTitle,
} = useHeaderSetting();
const { getShowLocalePicker } = useLocale();
@@ -185,6 +189,7 @@
getHeaderTheme,
getShowHeaderTrigger,
getIsMobile,
+ getShowBreadTitle,
getShowBread,
getShowContent,
getSplitType,
@@ -203,10 +208,43 @@
getUseLockPage,
loginSelectOk,
loginSelectRef,
+ title
};
},
});
</script>
<style lang="less">
@import './index.less';
+ //update-begin---author:scott ---date:2022-09-30 for：默认隐藏顶部菜单面包屑-----------
+ //顶部欢迎语展示样式
+ @prefix-cls: ~'@{namespace}-layout-header';
+
+ .@{prefix-cls} {
+ display: flex;
+ padding: 0 8px;
+ align-items: center;
+
+ .headerIntroductionClass {
+ margin-right: 4px;
+ margin-bottom: 2px;
+ border-bottom: 0px;
+ border-left: 0px;
+ }
+
+ &--light {
+ .headerIntroductionClass {
+ color: @breadcrumb-item-normal-color;
+ }
+ }
+
+ &--dark {
+ .headerIntroductionClass {
+ color: rgba(255, 255, 255, 0.6);
+ }
+ .anticon {
+ color: rgba(255, 255, 255, 0.8);
+ }
+ }
+ //update-end---author:scott ---date::2022-09-30 for：默认隐藏顶部菜单面包屑--------------
+ }
</style>
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,