Skip to content

Commit 1a80f8b

Browse files
author
张晨曦
committed
fix bugs 開發中心配置不可點擊問題
1 parent 4dc1154 commit 1a80f8b

File tree

6 files changed

+29
-16
lines changed

6 files changed

+29
-16
lines changed

web/src/apps/workflows/assets/styles/workflow.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
overflow-x: hidden;
114114
&-top {
115115
display: flex;
116-
height: 65px;
116+
// height: 65px;
117117
width: 250px;
118118
padding: 0 12px;
119119
flex-direction: column;

web/src/apps/workflows/module/common/tabList/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
cursor: pointer;
151151
min-width: 90px;
152152
max-width: 200px;
153+
padding: 0 10px;
153154
overflow: hidden;
154155
margin-right: 8px;
155156
background: #e1e5ea;

web/src/apps/workflows/module/common/tabList/tabs.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ export default {
5454
align-items: center;
5555
justify-content: flex-start;
5656
padding: 0 12px;
57-
// padding-right: 35px;
5857
font-size: 14px;
5958
height: 24px;
6059
.tabs-title-text {
@@ -66,7 +65,7 @@ export default {
6665
}
6766
.tabs-title-button {
6867
position: $absolute;
69-
right: 10px;
68+
right: -5px;
7069
top: 0;
7170
font-size: $font-size-large;
7271
margin-top: -1px;

web/src/apps/workflows/module/common/voidPage/void.vue

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,20 @@ export default {
6060
},
6161
mounted() {
6262
let workspaceId = this.$route.query.workspaceId
63-
this.lastWorkflowList = JSON.parse(localStorage.getItem(`work_flow_lists_${workspaceId}`)) || [];
63+
let workFlowLists = JSON.parse(localStorage.getItem(`work_flow_lists_${workspaceId}`)) || [];
64+
if ( workFlowLists.length > 5 ) {
65+
workFlowLists = workFlowLists.slice(0, 5)
66+
}
67+
this.lastWorkflowList = workFlowLists;
6468
eventbus.on("tabListChange", list => {
6569
if( list.length > 0 ) {
6670
this.lastWorkflowList = list.slice();
6771
} else {
68-
this.lastWorkflowList = JSON.parse(localStorage.getItem(`work_flow_lists_${workspaceId}`)) || [];
72+
let workFlowLists = JSON.parse(localStorage.getItem(`work_flow_lists_${workspaceId}`)) || [];
73+
if ( workFlowLists.length > 5 ) {
74+
workFlowLists = workFlowLists.slice(0, 5)
75+
}
76+
this.lastWorkflowList = workFlowLists
6977
}
7078
});
7179
},
@@ -86,7 +94,7 @@ export default {
8694
align-items: center;
8795
width: 100%;
8896
height: 100%;
89-
background-color: #fff;
97+
@include bg-color(#fff, $dark-workspace-body-bg-color);
9098
.void-page-left {
9199
min-width: 240px;
92100
margin-right: 106px;
@@ -95,10 +103,11 @@ export default {
95103
height: 33px;
96104
line-height: 33px;
97105
text-align: left;
106+
@include font-color($light-text-color, $dark-text-color);
98107
99108
font-family: PingFangSC-Regular;
100109
font-size: 24px;
101-
color: rgba(0, 0, 0, 0.65);
110+
@include border-color(rgba(0, 0, 0, 0.65), $dark-border-color-base);
102111
font-weight: 400;
103112
}
104113
&-main {
@@ -109,13 +118,14 @@ export default {
109118
&-tip {
110119
font-family: PingFangSC-Regular;
111120
font-size: 14px;
112-
color: rgba(0, 0, 0, 0.45);
121+
@include border-color(rgba(0, 0, 0, 0.65), $dark-border-color-base);
113122
letter-spacing: 0;
114123
text-align: center;
115124
line-height: 28px;
116125
height: 28px;
117126
font-weight: 400;
118127
margin: 16px 0px;
128+
@include font-color($light-text-color, $dark-text-color);
119129
}
120130
&-button {
121131
text-align: left;
@@ -131,10 +141,11 @@ export default {
131141
height: 25px;
132142
line-height: 25px;
133143
padding: 16px 0px;
144+
@include font-color($light-text-color, $dark-text-color);
134145
135146
font-family: PingFangSC-Regular;
136147
font-size: 18px;
137-
color: rgba(0, 0, 0, 0.65);
148+
@include border-color(rgba(0, 0, 0, 0.65), $dark-border-color-base);
138149
font-weight: 400;
139150
}
140151
.void-page-right-main {

web/src/apps/workflows/module/workflow/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,9 +577,11 @@ export default {
577577
this.ProjectShow = true;
578578
this.actionType = "modify";
579579
this.currentOrchetratorData = project;
580+
debugger
580581
this.currentOrchetratorData.taxonomyID = classifyId;
581582
},
582583
workflowModify(params) {
584+
debugger
583585
const classifyId = this.$refs.projectConentItem[0].currentData.id;
584586
const _params = this.dataList[0]["dwsFlowList"].filter(item => {
585587
return (

web/src/apps/workflows/view/workflow/index.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
/>
2727
</span>
2828
</div>
29-
<div class="project-nav-tree-top-b">
29+
<!-- <div class="project-nav-tree-top-b">
3030
<SvgIcon icon-class="search-icon" style="opacity: 0.25" />
3131
<input
3232
type="text"
3333
class="project-nav-tree-top-b-input"
3434
placeholder="请输入"
3535
/>
36-
</div>
36+
</div> -->
3737
</div>
3838
<Tree
3939
class="tree-container"
@@ -294,11 +294,11 @@ export default {
294294
tabList(val, oldVal) {
295295
let workspaceId = this.$route.query.workspaceId
296296
let workFlowLists = JSON.parse(localStorage.getItem(`work_flow_lists_${workspaceId}`)) || [];
297+
if (workFlowLists.length > 5) {
298+
workFlowLists = workFlowLists.slice(0,5)
299+
}
297300
val.forEach( item => {
298301
if( workFlowLists.every(i => i.id !== item.id) ) {
299-
if( workFlowLists.length > 6 ) {
300-
workFlowLists.pop()
301-
}
302302
workFlowLists.unshift(item)
303303
} else {
304304
let _workFlowLists = workFlowLists.slice()
@@ -754,8 +754,8 @@ export default {
754754
});
755755
},
756756
onConfigFlow(params) {
757-
// this.$refs.workflow.projectModify(params.id, params);
758-
this.$refs.workflow.workflowModify(params);
757+
this.$refs.workflow.projectModify(params.id, params);
758+
// this.$refs.workflow.workflowModify(params);
759759
},
760760
onDeleteFlow(params) {
761761
this.$refs.workflow.deleteWorkflow(params);

0 commit comments

Comments
 (0)