File tree Expand file tree Collapse file tree 4 files changed +14
-10
lines changed
bpmnProcessDesigner/package/penal/task/task-components Expand file tree Collapse file tree 4 files changed +14
-10
lines changed Original file line number Diff line number Diff line change @@ -33,12 +33,15 @@ export default defineComponent({
33
33
if (! props .type ) {
34
34
return null
35
35
}
36
- if (! props .value ) {
36
+ // 解决自定义字典标签值为零时标签不渲染的问题
37
+ if (! props .value && props .value !== 0 ) {
37
38
return null
38
39
}
39
40
getDictObj (props .type , props .value .toString ())
41
+ // 添加标签的文字颜色为白色,解决自定义背景颜色时标签文字看不清的问题
40
42
return (
41
43
<ElTag
44
+ style = { dictData .value ?.cssClass ? ' color: #fff' : ' ' }
42
45
type = { dictData .value ?.colorType }
43
46
color = {
44
47
dictData .value ?.cssClass && isHexColor (dictData .value ?.cssClass )
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ const removeStyles = () => {
30
30
// 移除引入的文件名
31
31
const targetelement = ' style'
32
32
const targetattr = ' id'
33
- let allsuspects = document .getElementsByTagName (targetelement )
33
+ const allsuspects = document .getElementsByTagName (targetelement )
34
34
for (let i = allsuspects .length ; i >= 0 ; i -- ) {
35
35
if (
36
36
allsuspects [i ] &&
@@ -43,19 +43,19 @@ const removeStyles = () => {
43
43
}
44
44
}
45
45
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' )
48
48
style .innerText = styleCss
49
49
style .id = ' cssTheme'
50
50
head .appendChild (style )
51
51
}
52
52
watch (
53
53
() => appStore .getIsDark ,
54
54
() => {
55
- if (appStore .getIsDark == true ) {
55
+ if (appStore .getIsDark ) {
56
56
reImport ()
57
57
}
58
- if (appStore .getIsDark == false ) {
58
+ if (! appStore .getIsDark ) {
59
59
removeStyles ()
60
60
}
61
61
},
Original file line number Diff line number Diff line change 11
11
>
12
12
<el-select v-model =" bindMessageId" @change =" updateTaskMessage" >
13
13
<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 "
18
18
/>
19
19
</el-select >
20
20
<XButton
Original file line number Diff line number Diff line change
1
+ export { }
1
2
declare global {
2
3
declare interface Fn < T = any > {
3
4
( ...arg : T [ ] ) : T
You can’t perform that action at this time.
0 commit comments