WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

Browse Source
This commit is contained in:
wangzhijiang
2022-08-16 09:55:13 +08:00
parent bf0978aa5d 78c1bf9ebd
commit 90dcde5c70
6 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/tableCollection/index.vue
+1
View File
@@ -875,6 +875,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
word-break: break-word;
color: #040B29; color: #040B29;
font-weight: 400; font-weight: 400;
} }
jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+5 -2
View File
@@ -22,7 +22,7 @@
<a-select class="box-input" <a-select class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:placeholder="$t('PleaseSelect')+$t('applicableMarket')" :placeholder="$t('PleaseSelect')+$t('applicableMarket')"
style="width: 100%" style="width: 100%;"
v-model="queryParam.applyMarket"> v-model="queryParam.applyMarket">
<a-select-option v-for="(item, key) in applyMarketList" <a-select-option v-for="(item, key) in applyMarketList"
:key="key" :key="key"
@@ -42,7 +42,7 @@
<a-select class="box-input" <a-select class="box-input"
:getPopupContainer="triggerNode=> triggerNode.parentNode" :getPopupContainer="triggerNode=> triggerNode.parentNode"
:placeholder="$t('PleaseSelect')+$t('releaseStatus')" :placeholder="$t('PleaseSelect')+$t('releaseStatus')"
style="width: 100%" style="width: 100%;"
v-model="queryParam.releaseStatus"> v-model="queryParam.releaseStatus">
<a-select-option v-for="(item, key) in releaseStatusList" <a-select-option v-for="(item, key) in releaseStatusList"
:key="key" :key="key"
@@ -476,4 +476,7 @@
.text-operation { .text-operation {
margin-right: 8px; margin-right: 8px;
} }
::v-deep .ant-select-dropdown{
z-index: 100;
}
</style> </style>
jero-web/src/views/documentManage/library/docDetail/index.vue
+2
View File
@@ -590,6 +590,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
word-break: break-word;
color: #040B29; color: #040B29;
font-weight: 400; font-weight: 400;
} }
@@ -618,6 +619,7 @@
font-size: 16px; font-size: 16px;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-word;
overflow: visible; overflow: visible;
float: left; float: left;
color: #040B29; color: #040B29;
jero-web/src/views/processCenter/components/projectInformation.vue
+1
View File
@@ -145,6 +145,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
word-break: break-word;
color: #040B29; color: #040B29;
font-weight: 400; font-weight: 400;
} }
jero-web/src/views/processCenter/components/standardContent.vue
+2
View File
@@ -138,6 +138,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
word-break: break-word;
color: #040B29; color: #040B29;
font-weight: 400; font-weight: 400;
} }
@@ -172,6 +173,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: pre-wrap; white-space: pre-wrap;
overflow: visible; overflow: visible;
word-break: break-word;
float: left; float: left;
color: #040B29; color: #040B29;
font-weight: 400; font-weight: 400;
jero-web/src/views/projectManagement/components/ProjectDetails.vue
+1
View File
@@ -268,6 +268,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
word-break: break-word;
color: #040B29; color: #040B29;
font-weight: 400; font-weight: 400;
} }