Skip to content

Commit e2895ba

Browse files
YunaiVgitee-org
authored andcommitted
!15 修复了一些小问题
Merge pull request !15 from puhui999/master
2 parents 03bf50d + 585a667 commit e2895ba

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

src/components/DictTag/src/DictTag.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,15 @@ export default defineComponent({
3333
if (!props.type) {
3434
return null
3535
}
36-
if (!props.value) {
36+
// 解决自定义字典标签值为零时标签不渲染的问题
37+
if (!props.value && props.value !== 0) {
3738
return null
3839
}
3940
getDictObj(props.type, props.value.toString())
41+
// 添加标签的文字颜色为白色,解决自定义背景颜色时标签文字看不清的问题
4042
return (
4143
<ElTag
44+
style={dictData.value?.cssClass ? 'color: #fff' : ''}
4245
type={dictData.value?.colorType}
4346
color={
4447
dictData.value?.cssClass && isHexColor(dictData.value?.cssClass)

src/components/XTable/src/XTable.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const removeStyles = () => {
3030
//移除引入的文件名
3131
const targetelement = 'style'
3232
const targetattr = 'id'
33-
let allsuspects = document.getElementsByTagName(targetelement)
33+
const allsuspects = document.getElementsByTagName(targetelement)
3434
for (let i = allsuspects.length; i >= 0; i--) {
3535
if (
3636
allsuspects[i] &&
@@ -43,19 +43,19 @@ const removeStyles = () => {
4343
}
4444
}
4545
const reImport = () => {
46-
let head = document.getElementsByTagName('head')[0]
47-
let style = document.createElement('style')
46+
const head = document.getElementsByTagName('head')[0]
47+
const style = document.createElement('style')
4848
style.innerText = styleCss
4949
style.id = 'cssTheme'
5050
head.appendChild(style)
5151
}
5252
watch(
5353
() => appStore.getIsDark,
5454
() => {
55-
if (appStore.getIsDark == true) {
55+
if (appStore.getIsDark) {
5656
reImport()
5757
}
58-
if (appStore.getIsDark == false) {
58+
if (!appStore.getIsDark) {
5959
removeStyles()
6060
}
6161
},

src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
>
1212
<el-select v-model="bindMessageId" @change="updateTaskMessage">
1313
<el-option
14-
v-for="item in Object.keys(messageMap)"
15-
:value="item"
16-
:label="messageMap[item]"
17-
:key="item"
14+
v-for="key in Object.keys(messageMap)"
15+
:value="key"
16+
:label="messageMap[key]"
17+
:key="key"
1818
/>
1919
</el-select>
2020
<XButton

types/global.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
export {}
12
declare global {
23
declare interface Fn<T = any> {
34
(...arg: T[]): T

0 commit comments

Comments
 (0)