Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Unverified
Commit
e2895baf
authored
Mar 07, 2023
by
芋道源码
Committed by
Gitee
Mar 07, 2023
Browse files
Options
Browse Files
Download
Plain Diff
!15 修复了一些小问题
Merge pull request !15 from puhui999/master
parents
03bf50d6
585a6673
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
10 deletions
+14
-10
src/components/DictTag/src/DictTag.vue
+4
-1
src/components/XTable/src/XTable.vue
+5
-5
src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue
+4
-4
types/global.d.ts
+1
-0
No files found.
src/components/DictTag/src/DictTag.vue
View file @
e2895baf
...
@@ -33,12 +33,15 @@ export default defineComponent({
...
@@ -33,12 +33,15 @@ export default defineComponent({
if
(
!
props
.
type
)
{
if
(
!
props
.
type
)
{
return
null
return
null
}
}
if
(
!
props
.
value
)
{
// 解决自定义字典标签值为零时标签不渲染的问题
if
(
!
props
.
value
&&
props
.
value
!==
0
)
{
return
null
return
null
}
}
getDictObj
(
props
.
type
,
props
.
value
.
toString
())
getDictObj
(
props
.
type
,
props
.
value
.
toString
())
// 添加标签的文字颜色为白色,解决自定义背景颜色时标签文字看不清的问题
return
(
return
(
<
ElTag
<
ElTag
style
=
{
dictData
.
value
?.
cssClass
?
'color: #fff'
:
''
}
type
=
{
dictData
.
value
?.
colorType
}
type
=
{
dictData
.
value
?.
colorType
}
color
=
{
color
=
{
dictData
.
value
?.
cssClass
&&
isHexColor
(
dictData
.
value
?.
cssClass
)
dictData
.
value
?.
cssClass
&&
isHexColor
(
dictData
.
value
?.
cssClass
)
...
...
src/components/XTable/src/XTable.vue
View file @
e2895baf
...
@@ -30,7 +30,7 @@ const removeStyles = () => {
...
@@ -30,7 +30,7 @@ const removeStyles = () => {
//移除引入的文件名
//移除引入的文件名
const
targetelement
=
'style'
const
targetelement
=
'style'
const
targetattr
=
'id'
const
targetattr
=
'id'
le
t
allsuspects
=
document
.
getElementsByTagName
(
targetelement
)
cons
t
allsuspects
=
document
.
getElementsByTagName
(
targetelement
)
for
(
let
i
=
allsuspects
.
length
;
i
>=
0
;
i
--
)
{
for
(
let
i
=
allsuspects
.
length
;
i
>=
0
;
i
--
)
{
if
(
if
(
allsuspects
[
i
]
&&
allsuspects
[
i
]
&&
...
@@ -43,8 +43,8 @@ const removeStyles = () => {
...
@@ -43,8 +43,8 @@ const removeStyles = () => {
}
}
}
}
const
reImport
=
()
=>
{
const
reImport
=
()
=>
{
le
t
head
=
document
.
getElementsByTagName
(
'head'
)[
0
]
cons
t
head
=
document
.
getElementsByTagName
(
'head'
)[
0
]
le
t
style
=
document
.
createElement
(
'style'
)
cons
t
style
=
document
.
createElement
(
'style'
)
style
.
innerText
=
styleCss
style
.
innerText
=
styleCss
style
.
id
=
'cssTheme'
style
.
id
=
'cssTheme'
head
.
appendChild
(
style
)
head
.
appendChild
(
style
)
...
@@ -52,10 +52,10 @@ const reImport = () => {
...
@@ -52,10 +52,10 @@ const reImport = () => {
watch
(
watch
(
()
=>
appStore
.
getIsDark
,
()
=>
appStore
.
getIsDark
,
()
=>
{
()
=>
{
if
(
appStore
.
getIsDark
==
true
)
{
if
(
appStore
.
getIsDark
)
{
reImport
()
reImport
()
}
}
if
(
appStore
.
getIsDark
==
false
)
{
if
(
!
appStore
.
getIsDark
)
{
removeStyles
()
removeStyles
()
}
}
},
},
...
...
src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue
View file @
e2895baf
...
@@ -11,10 +11,10 @@
...
@@ -11,10 +11,10 @@
>
>
<el-select
v-model=
"bindMessageId"
@
change=
"updateTaskMessage"
>
<el-select
v-model=
"bindMessageId"
@
change=
"updateTaskMessage"
>
<el-option
<el-option
v-for=
"
item
in Object.keys(messageMap)"
v-for=
"
key
in Object.keys(messageMap)"
:value=
"
item
"
:value=
"
key
"
:label=
"messageMap[
item
]"
:label=
"messageMap[
key
]"
:key=
"
item
"
:key=
"
key
"
/>
/>
</el-select>
</el-select>
<XButton
<XButton
...
...
types/global.d.ts
View file @
e2895baf
export
{}
declare
global
{
declare
global
{
declare
interface
Fn
<
T
=
any
>
{
declare
interface
Fn
<
T
=
any
>
{
(...
arg
:
T
[]):
T
(...
arg
:
T
[]):
T
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment