Merge pull request 'fix:弹框样式加首页阴影' (#318) from fix/change_task into test

Reviewed-on: #318
pull/320/head
yaoshuli 1 year ago
commit 57838ba5d1

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="64px" height="64px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>置顶</title>
<defs>
<rect id="path-1" x="0" y="0" width="64" height="64"></rect>
</defs>
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="PrevailCloud-Design-图标集" transform="translate(-1458.000000, -7071.000000)">
<g id="置顶" transform="translate(1458.000000, 7071.000000)">
<mask id="mask-2" fill="white">
<use xlink:href="#path-1"></use>
</mask>
<g id="蒙版" transform="translate(32.000000, 32.000000) scale(-1, -1) translate(-32.000000, -32.000000) "></g>
<g mask="url(#mask-2)">
<g transform="translate(7.000000, 7.000000)">
<rect id="矩形" fill="#000000" fill-rule="nonzero" opacity="0" x="0" y="0" width="50" height="50"></rect>
<path d="M28.3949655,8.5018668 L44.5313115,28.2388739 C46.3968076,30.5206364 45.5262263,32.3700781 42.5747338,32.3697162 L35.4991082,32.3686468 L35.5,48 C35.5,49.1045695 34.6045695,50 33.5,50 L16.5,50 C15.3954305,50 14.5,49.1045695 14.5,48 L14.4991082,32.3656468 L7.42526618,32.3654055 C4.47918211,32.3650442 3.60403243,30.5171355 5.47376022,28.234084 L21.634335,8.50103768 C23.5026321,6.21973312 26.5280409,6.218357 28.3949655,8.5018668 Z M46,0 C46.5522847,1.01453063e-16 47,0.44771525 47,1 L47,1 L47,4 C47,4.55228475 46.5522847,5 46,5 L46,5 L4,5 C3.44771525,5 3,4.55228475 3,4 L3,4 L3,1 C3,0.44771525 3.44771525,-1.01453063e-16 4,0 L4,0 Z" id="矩形备份-11" fill="#DDDDDD" fill-rule="evenodd"></path>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 997 B

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 977 B

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 692 B

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 902 B

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 904 B

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 661 B

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 52 KiB

@ -303,8 +303,8 @@ const indeterminate = computed(() => {
<span :style="{ 'margin-left': '18px' }">字段信息</span>
</div>
</div>
<n-grid cols="4" class="mt-4 proCard" responsive="screen" :x-gap="24">
<n-grid-item span="3">
<n-grid cols="24" class="mt-4 proCard" responsive="screen" :x-gap="24">
<n-grid-item span="17">
<NCard
:title="allCount"
class="dragcardStyle"
@ -312,7 +312,7 @@ const indeterminate = computed(() => {
size="small"
:bordered="false"
>
<div>
<div class="left">
<n-input placeholder="搜索关键字">
<template #suffix>
<SvgIcon size="14px" name="magnifying-1" color="#999999" />
@ -347,7 +347,7 @@ const indeterminate = computed(() => {
</div>
</NCard>
</n-grid-item>
<n-grid-item>
<n-grid-item span="7">
<NCard
:title="selectCount"
class="dragcardStyle"
@ -358,7 +358,7 @@ const indeterminate = computed(() => {
<template #header-extra>
<span class="textbtnStyle" @click="clearDragSource"></span>
</template>
<div>
<div style="height:477px; border: 1px solid #cad2dd !important;; overflow:auto">
<n-input placeholder="搜索关键字">
<template #suffix>
<SvgIcon size="14px" name="magnifying-1" />
@ -404,6 +404,20 @@ const indeterminate = computed(() => {
>
<SvgIcon name="drag" size="14" color="#666666" />
<span class="ml-2">{{ item.name }}</span>
<div class="zhiding">
<n-popover trigger="hover" placement="bottom">
<template #trigger>
<SvgIcon
v-if="!item.fix"
size="16px"
style="display: block; cursor: pointer;position:absolute; right: 50px; top:14.5px"
name="topbt"
/>
</template>
<span>置顶</span>
</n-popover>
</div>
<SvgIcon
v-if="!item.fix"
size="16px"
@ -522,6 +536,7 @@ const indeterminate = computed(() => {
color: #333;
display: flex;
align-items: center;
position: relative;
// border-bottom: 1px solid #e8e8e8;
}
@ -541,6 +556,16 @@ const indeterminate = computed(() => {
.left-wrap {
border: 1px solid #cbd3de;
}
.left{
border: 1px solid #cad2dd;
::v-deep(.draggable-ul) {
height: 444px;
}
.right{
height: 444px;
background: red;
}
}
::v-deep(.n-card > .n-card-header .n-card-header__main) {
font-weight: lighter !important;
font-size: 14px;
@ -572,4 +597,41 @@ const indeterminate = computed(() => {
::v-deep(.checkAll .n-checkbox-icon svg) {
display: none !important;
}
::v-deep(.drag-wrapper){
border:none
}
.zhiding{
display: none;
}
.draggable-item:hover {
.zhiding{
display: block;
}}
/* 定义滚动条的宽度及背景颜色 */
::-webkit-scrollbar {
position: fixed;
width: 5px; /* for vertical scrollbars */
height: 10px; /* for horizontal scrollbars */
background: #f1f1f1;
}
/* 定义滚动条轨道的样式 */
::-webkit-scrollbar-track {
background-color: #e1e1e1;
border-radius: 10px; /* 圆角 */
}
/* 定义滚动条滑块的样式 */
::-webkit-scrollbar-thumb {
background-color: #888;
border-radius: 10px; /* 圆角 */
}
/* 滑块hover时的样式 */
::-webkit-scrollbar-thumb:hover {
background-color: #555;
}
::v-deep(.draggable-ul){
border: none;
}
</style>

@ -507,8 +507,7 @@ defineExpose({
width: 248px;
height: 288px;
position: absolute;
left: 0;
top: -10px;
left: -60px;
border: 1px solid #f3f8ff;
z-index: 10000;
background: #fff;

@ -485,6 +485,7 @@ function forget() {
</template>
<template #suffix>
<div
:style="formSms.phone.length== 11?{color:'#507AFD'}:{color:'#507afd9c'}"
:class="{
'code-count':
countTime !== '获取验证码' || !(formSms.phone.length == 11),

@ -297,7 +297,8 @@ defineExpose({
v-if="!(detailobj?.historyStates == 2 || detailobj?.historyStates == 3)" type="info"
style="
width:72px;
height:38px; "
height:38px;
margin-right:16px "
@click="passfun"
>
通过
@ -307,7 +308,8 @@ defineExpose({
style="
width:72px;
height:38px;
background-color: #FF4E4F;"
background-color: #FF4E4F;
margin-right:16px"
@click="nopassfun"
>
不通过
@ -317,10 +319,10 @@ defineExpose({
style="
width:72px;
height:38px;
position: absolute;
border: 1px solid #cad2dd;
color:black;
right: 36px;" @click="closeModal"
" @click="closeModal"
>
取消
</n-button>
@ -343,7 +345,7 @@ defineExpose({
height: 1px;
width: 1200px;
position: absolute;
bottom: 83px;
bottom: 69px;
left: 0px;
}
.big-mark {
@ -549,8 +551,11 @@ padding-top: 24px;
margin-bottom:0px;
display: flex;
float: right;
margin-right: 90px;
justify-content: space-between;
position: absolute;
bottom: 16px;
right: 115px;
justify-content: space-around;
}
::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
@ -599,6 +604,9 @@ padding-top: 24px;
::v-deep(.n-card__content){
padding: 0 32px !important;
}
::v-deep(.n-divider--no-title){
display: none;
}
.btn3{
border: 1px solid #cad2dd !important;
color: black;

@ -318,16 +318,17 @@ const indeterminate = computed(() => {
<span :style="{ 'margin-left': '18px' }">字段信息</span>
</div>
</div>
<n-grid cols="4" class="mt-4 proCard" responsive="screen" :x-gap="24">
<n-grid-item span="3">
<n-grid cols="24" class="mt-4 proCard" responsive="screen" :x-gap="24">
<n-grid-item span="17">
<NCard
:title="allCount"
class="dragcardStyle"
:segmented="{ content: true, footer: true }"
size="small"
:bordered="false"
>
<div>
<div class="left">
<n-input v-model:value="searchKey" placeholder="搜索关键词">
<template #suffix>
<SvgIcon size="14px" name="magnifying-1" />
@ -346,7 +347,7 @@ const indeterminate = computed(() => {
<div
v-for="item in showOffList"
:key="item.id"
style="width: 170px"
style="width: 165px"
:class="{ 'disable-check': item.fix }"
class="draggable-li"
>
@ -366,6 +367,7 @@ const indeterminate = computed(() => {
<NCard
:title="selectCount"
class="dragcardStyle"
style="width: 216px;"
:segmented="{ content: true, footer: true }"
size="small"
:bordered="false"
@ -373,12 +375,13 @@ const indeterminate = computed(() => {
<template #header-extra>
<span class="textbtnStyle" @click="clearDragSource"></span>
</template>
<div>
<div class="overstyle">
<n-input v-model:value="searchFixVal" placeholder="搜索关键词">
<template #suffix>
<SvgIcon size="14px" name="magnifying-1" />
</template>
</n-input>
<div class="titletwo">系统默认</div>
<div class="draggable-ul">
<div
v-for="item in showFixList"
@ -389,6 +392,7 @@ const indeterminate = computed(() => {
<span class="ml-2" style="color: #666">{{ item.name }}</span>
</div>
</div>
<div class="titletwo">自定义配置</div>
<VueDraggable
v-model="showOnList"
class="draggable-ul"
@ -401,8 +405,23 @@ const indeterminate = computed(() => {
:class="{ fix: item.fix }"
class="cursor-move draggable-item"
>
<SvgIcon name="drag" size="24" />
<SvgIcon name="drag" size="14" />
<span class="ml-2">{{ item.name }}</span>
<div class="zhiding">
<n-popover trigger="hover" placement="bottom">
<template #trigger>
<SvgIcon
v-if="!item.fix"
size="16px"
style="display: block; cursor: pointer;position:absolute; right: 50px; top:14.5px"
name="topbt"
/>
</template>
<span>置顶</span>
</n-popover>
</div>
<SvgIcon
v-if="!item.fix"
size="16px"
@ -484,7 +503,8 @@ const indeterminate = computed(() => {
}
.cardstyle {
width: 820px;
width: 808px;
height:746px;
--n-padding-bottom: 20px;
--n-padding-left: 24px;
}
@ -496,6 +516,7 @@ const indeterminate = computed(() => {
.draggable-ul {
width: 100%;
overflow: hidden;
border: 1px solid #cad2dd;
border-top: 0px;
@ -517,16 +538,66 @@ const indeterminate = computed(() => {
color: #333;
display: flex;
align-items: center;
border-bottom: 1px solid #e8e8e8;
position: relative;
}
.disable-check {
color: gainsboro;
}
}
.overstyle{
height: 474px;
overflow: auto;
border:1px solid #cad2dd
}
/* 定义滚动条的宽度及背景颜色 */
::-webkit-scrollbar {
position: fixed;
width: 5px; /* for vertical scrollbars */
height: 10px; /* for horizontal scrollbars */
background: #f1f1f1;
}
/* 定义滚动条轨道的样式 */
::-webkit-scrollbar-track {
background-color: #e1e1e1;
border-radius: 10px; /* 圆角 */
}
/* 定义滚动条滑块的样式 */
::-webkit-scrollbar-thumb {
background-color: #888;
border-radius: 10px; /* 圆角 */
}
/* 滑块hover时的样式 */
::-webkit-scrollbar-thumb:hover {
background-color: #555;
}
::v-deep(.draggable-ul){
border: none;
}
.left{
::v-deep(.draggable-ul){
height: 444px;
border: 1px solid #cad2dd;
}
}
.titletwo{
margin: 10px;
height: 20px;
font-size: 14px;
font-family: PingFang SC, PingFang SC-Regular;
font-weight: Regular;
text-align: left;
color: #999999;
line-height: 20px;
margin-left: 20px;
}
::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
border: 0px;
}
::v-deep(.n-card > .n-card-header) {
@ -568,4 +639,13 @@ const indeterminate = computed(() => {
background-color: #fff !important;
border: 1px solid #cad2dd !important;
}
.zhiding{
display: none;
}
.draggable-item:hover {
.zhiding{
display: block;
}
}
</style>

Loading…
Cancel
Save