diff --git a/src/App.vue b/src/App.vue index f75478cd..500a2d6d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -38,10 +38,11 @@ $prefix-cls: #{$namespace}-app; html, body { + @extend .size; + padding: 0 !important; margin: 0; overflow: hidden; - @extend .size; #app { @extend .size; diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 8ca59684..37cebc69 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -302,6 +302,7 @@ export default defineComponent({ margin-left: 0; padding: 8px 4px; } + :deep(.el-button.is-link) { margin-left: 0; padding: 8px 4px; diff --git a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue index a90d468e..97a163e0 100644 --- a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue +++ b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue @@ -403,6 +403,7 @@ watch( stroke-dasharray: 4px !important; fill-opacity: 0.2 !important; } + .highlight-todo.djs-shape .djs-visual > :nth-child(1) { fill: #1890ff !important; stroke: #1890ff !important; @@ -414,8 +415,9 @@ watch( stroke: #1890ff !important; stroke-dasharray: 4px !important; fill-opacity: 0.2 !important; - marker-end: url(#sequenceflow-end-_E7DFDF-_E7DFDF-803g1kf6zwzmcig1y2ulm5egr); + marker-end: url('#sequenceflow-end-_E7DFDF-_E7DFDF-803g1kf6zwzmcig1y2ulm5egr'); } + :deep(.highlight-todo.djs-shape .djs-visual > :nth-child(1)) { fill: #1890ff !important; stroke: #1890ff !important; @@ -429,14 +431,17 @@ watch( stroke: green !important; fill-opacity: 0.2 !important; } + .highlight.djs-shape .djs-visual > :nth-child(2) { fill: green !important; } + .highlight.djs-shape .djs-visual > path { fill: green !important; fill-opacity: 0.2 !important; stroke: green !important; } + .highlight.djs-connection > .djs-visual > path { stroke: green !important; } @@ -450,14 +455,17 @@ watch( stroke: green !important; fill-opacity: 0.2 !important; } + :deep(.highlight.djs-shape .djs-visual > :nth-child(2)) { fill: green !important; } + :deep(.highlight.djs-shape .djs-visual > path) { fill: green !important; fill-opacity: 0.2 !important; stroke: green !important; } + :deep(.highlight.djs-connection > .djs-visual > path) { stroke: green !important; } @@ -468,14 +476,17 @@ watch( stroke: red !important; fill-opacity: 0.2 !important; } + .highlight-reject.djs-shape .djs-visual > :nth-child(2) { fill: red !important; } + .highlight-reject.djs-shape .djs-visual > path { fill: red !important; fill-opacity: 0.2 !important; stroke: red !important; } + .highlight-reject.djs-connection > .djs-visual > path { stroke: red !important; } @@ -489,14 +500,17 @@ watch( stroke: red !important; fill-opacity: 0.2 !important; } + :deep(.highlight-reject.djs-shape .djs-visual > :nth-child(2)) { fill: red !important; } + :deep(.highlight-reject.djs-shape .djs-visual > path) { fill: red !important; fill-opacity: 0.2 !important; stroke: red !important; } + :deep(.highlight-reject.djs-connection > .djs-visual > path) { stroke: red !important; } @@ -507,14 +521,17 @@ watch( stroke: grey !important; fill-opacity: 0.2 !important; } + .highlight-cancel.djs-shape .djs-visual > :nth-child(2) { fill: grey !important; } + .highlight-cancel.djs-shape .djs-visual > path { fill: grey !important; fill-opacity: 0.2 !important; stroke: grey !important; } + .highlight-cancel.djs-connection > .djs-visual > path { stroke: grey !important; } @@ -528,14 +545,17 @@ watch( stroke: grey !important; fill-opacity: 0.2 !important; } + :deep(.highlight-cancel.djs-shape .djs-visual > :nth-child(2)) { fill: grey !important; } + :deep(.highlight-cancel.djs-shape .djs-visual > path) { fill: grey !important; fill-opacity: 0.2 !important; stroke: grey !important; } + :deep(.highlight-cancel.djs-connection > .djs-visual > path) { stroke: grey !important; } @@ -543,7 +563,7 @@ watch( .element-overlays { box-sizing: border-box; padding: 8px; - background: rgba(0, 0, 0, 0.6); + background: rgb(0 0 0 / 60%); border-radius: 4px; color: #fafafa; width: 200px; diff --git a/src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue b/src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue index 38e4ba17..23a8e923 100644 --- a/src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue +++ b/src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue @@ -30,12 +30,13 @@ const addTask = (event, options: any = {}) => {