xuziqiang
/
SaaS-lib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: table Search 样式调整

temp
xuziqiang 7 months ago
parent
bf4a3fd581
commit
a83f8d868a
5 changed files with 31 additions and 179 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 180
      hx-ai-intelligent/src/App.vue
  2. 6
      hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts
  3. 9
      hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
  4. 2
      lib/component/form/form/props.ts
  5. 13
      lib/saas/config/form.config.ts

180
hx-ai-intelligent/src/App.vue
View File

@ -53,169 +53,19 @@
text-overflow: ellipsis;
text-wrap: nowrap;
}
// :deep(.ant-menu-item),
// :deep(.ant-menu-submenu-title) {
// &:not(.ant-menu-item-selected) {
// // &:not(.ant-menu-item-active) {
// .anticon {
// color: rgb(141, 150, 163);
// }
// }
// }
// :deep(.ns-content) {
// // padding-top: 80px !important;
// }
// #app {
// width: 100%;
// height: 100%;
// }
// :deep(.ant-menu-title-content) {
// background: unset !important;
// z-index: 9 !important;
// }
// :deep(.ns-left-menu) {
// .ant-menu-item-selected {
// // color: #fff !important;
// background: @primary-color;
// border-radius: 12px;
// // height: 40px;
// // line-height: 40px;
// padding: 5px @ns-gap;
// position: relative;
// a {
// color: @white !important;
// }
// }
// .ant-menu-item-active,
// .ant-submenu-item-active {
// // color: rgba(@primary-color, 0.1) !important;
// }
// }
// :deep(.ant-menu-light.ant-menu-horizontal > .ant-menu-item:hover) {
// // background: @primary-color;
// }
// // :deep(.ant-menu-inline .ant-menu-submenu-title) {
// // color: rgba(255, 255, 255, 0.9) !important;
// // }
// :deep(.ns-left-menu .ant-layout-sider-children .ant-menu-sub.ant-menu-inline) {
// // position: relative;
// // &::before {
// // display: flex;
// // width: 2px;
// // height: calc(100% - 40px);
// // position: absolute;
// // top: 20px;
// // left: 20px;
// // content: '';
// // background-color: rgba(255, 255, 255, 0.2);
// // }
// }
// //*************************含tab的 list列表样式 */
// :deep(.tabListTable) {
// .ns-table-title {
// text-align: left;
// height: 46px;
// line-height: 46px;
// font-size: 18px;
// font-weight: bold;
// user-select: text;
// padding-left: 16px;
// background: #fff;
// width: calc(100% + 32px);
// margin-left: -16px;
// }
// .tabs-list {
// overflow: visible !important;
// }
// .ant-tabs-nav {
// width: calc(100% + 32px);
// margin-left: -16px !important;
// background: #fff;
// }
// .ant-tabs-nav-wrap {
// padding: 0 16px;
// }
// }
// //*********************详情页返回修改 */
// :deep(.nsDetailView) {
// min-height: 100%;
// height: 100%;
// .ns-detail-content {
// padding: 0px 24px;
// border-top: 16px solid #e5ebf0;
// }
// .ant-descriptions-item-label {
// color: rgba(0, 0, 0, 0.5);
// font-family: PingFang SC;
// font-size: 14px;
// }
// .ant-descriptions-item-content {
// color: rgba(0, 0, 0, 0.95);
// font-family: PingFang SC;
// font-size: 14px;
// }
// .ant-descriptions-title {
// &::after {
// content: '';
// width: 75px;
// height: 7px;
// display: block;
// background: linear-gradient(90deg, #537fff 0%, #fff 82.67%);
// margin-left: 2px;
// margin-top: -2px;
// }
// }
// .ant-descriptions-row > th,
// .ant-descriptions-row > td {
// padding-bottom: 8px;
// }
// .ns-page-header {
// margin-bottom: 0 !important;
// padding-top: 7px !important;
// padding-bottom: 7px !important;
// width: calc(100% + 32px);
// margin-left: -16px;
// .title {
// cursor: pointer;
// font-size: 18px !important;
// }
// }
// .ant-descriptions-header {
// margin: 16px 0 16px 0 !important;
// .ant-descriptions-title {
// line-height: 16px;
// font-size: 16px;
// }
// }
// }
// :deep(.ns-detail .ant-descriptions-header .descriptions-title) {
// &:after {
// content: '';
// width: 75px;
// height: 7px;
// display: block;
// background: linear-gradient(90deg, @primary-color 0%, #fff 82.67%);
// margin-left: 2px;
// margin-top: -2px;
// }
// }
// :deep(.ant-descriptions-header .descriptions-title) {
// &:after {
// content: '';
// width: 75px;
// height: 7px;
// display: block;
// background: linear-gradient(90deg, @primary-color 0%, #fff 82.67%);
// margin-left: 2px;
// margin-top: -2px;
// }
// }
:deep(.ns-table-search) {
.ns-flexv2-form {
.ns-operate {
text-align: left;
margin-left: 0;
.ant-btn {
margin: 0;
margin-right: 6px;
}
}
}
.ns-form-body {
max-width: 1000px;
}
}
</style>

6
hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts
View File

@ -242,7 +242,7 @@ export const tableConfig = (orgId) => {
fieldMap: ['manufactureBeginDate', 'manufactureEndDate'],
componentProps: {
valueFormat: 'YYYY-MM-DD',
placeholder: ['设备生产开始日期', '设备生产结束日期'],
placeholder: ['生产开始日期', '生产结束日期'],
},
},
{
@ -252,7 +252,7 @@ export const tableConfig = (orgId) => {
fieldMap: ['purchaseBeginDate', 'purchaseEndDate'],
componentProps: {
valueFormat: 'YYYY-MM-DD',
placeholder: ['设备采购开始日期', '设备采购结束日期'],
placeholder: ['采购开始日期', '采购结束日期'],
},
},
{
@ -262,7 +262,7 @@ export const tableConfig = (orgId) => {
fieldMap: ['startBeginDate', 'startEndDate'],
componentProps: {
valueFormat: 'YYYY-MM-DD',
placeholder: ['设备启用开始日期', '设备启用结束日期'],
placeholder: ['启用开始日期', '启用结束日期'],
},
},
],

9
hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue
View File

@ -343,22 +343,23 @@
customRender: (text: any) => {
return text.index + 1;
},
sorter: true,
textNumber: 3,
// sorter: true,
},
{
title: '账号',
dataIndex: 'accountNo',
sorter: true,
// sorter: true,
},
{
title: '姓名',
dataIndex: 'realName',
sorter: true,
// sorter: true,
},
{
title: '性别',
dataIndex: 'sex',
sorter: true,
// sorter: true,
textNumber: 4,
},
{

2
lib/component/form/form/props.ts
View File

@ -12,7 +12,7 @@ export const formProps = {
},
model: PropTypes.object.def(() => reactive({})),
loading: PropTypes.bool.def(false),
formLayout: PropTypes.string.def('flex'),
formLayout: PropTypes.string.def('flexv2'),
expand: PropTypes.bool.def(true),
showExpand: PropTypes.bool.def(false),
// 收起全部

13
lib/saas/config/form.config.ts
View File

@ -35,13 +35,14 @@ export const formConfig = {
},
flexv2: {
// layout: 'horizontal',
class: 'ns-flex-form ns-flex-form-horizontal',
wrapperCol: { span: 16 },
class: 'ns-flex-form ns-flex-form-horizontal ns-flexv2-form',
wrapperCol: { span: 24 },
labelCol: { span: 0 },
span: 6,
sm: 8, //≥576px <=768
lg: 6, //>= 768
gutter: [16, 16],
justify: 'space-between',
// sm: 8, //≥576px <=768
// lg: 6, //>= 768
gutter: [20, 0],
justify: 'flex-start',
},
flexVertical: {
layout: 'vertical',

Write Preview
Loading…
Cancel
Save