mirror of
https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
synced 2024-12-05 21:49:23 +08:00
Merge remote-tracking branch 'origin/master' into master
This commit is contained in:
commit
8ab1065805
@ -1 +1 @@
|
|||||||
Subproject commit 57d6f78efa4b0300be188e8b024511ceef0873ed
|
Subproject commit 24047fea950a74f7848a9fdaa857a22b884c4ce2
|
BIN
frontend/src/assets/zentao.jpg
Normal file
BIN
frontend/src/assets/zentao.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.7 KiB |
@ -126,6 +126,7 @@ export default {
|
|||||||
let data = response.data;
|
let data = response.data;
|
||||||
this.total = data.itemCount;
|
this.total = data.itemCount;
|
||||||
this.tableData = data.listObject;
|
this.tableData = data.listObject;
|
||||||
|
this.selectRows.clear();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleSelectionChange(val) {
|
handleSelectionChange(val) {
|
||||||
@ -171,28 +172,13 @@ export default {
|
|||||||
this.$set(row, "showMore", true);
|
this.$set(row, "showMore", true);
|
||||||
this.selectRows.add(row);
|
this.selectRows.add(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
let arr = Array.from(this.selectRows);
|
|
||||||
|
|
||||||
// 选中1个以上的用例时显示更多操作
|
|
||||||
if (this.selectRows.size === 1) {
|
|
||||||
this.$set(arr[0], "showMore", false);
|
|
||||||
} else if (this.selectRows.size === 2) {
|
|
||||||
arr.forEach(row => {
|
|
||||||
this.$set(row, "showMore", true);
|
|
||||||
})
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
handleSelectAll(selection) {
|
handleSelectAll(selection) {
|
||||||
if (selection.length > 0) {
|
if (selection.length > 0) {
|
||||||
if (selection.length === 1) {
|
|
||||||
this.selectRows.add(selection[0]);
|
|
||||||
} else {
|
|
||||||
this.tableData.forEach(item => {
|
this.tableData.forEach(item => {
|
||||||
this.$set(item, "showMore", true);
|
this.$set(item, "showMore", true);
|
||||||
this.selectRows.add(item);
|
this.selectRows.add(item);
|
||||||
});
|
});
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
this.selectRows.clear();
|
this.selectRows.clear();
|
||||||
this.tableData.forEach(row => {
|
this.tableData.forEach(row => {
|
||||||
|
@ -222,28 +222,13 @@ export default {
|
|||||||
this.$set(row, "showMore", true);
|
this.$set(row, "showMore", true);
|
||||||
this.selectRows.add(row);
|
this.selectRows.add(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
let arr = Array.from(this.selectRows);
|
|
||||||
|
|
||||||
// 选中1个以上的用例时显示更多操作
|
|
||||||
if (this.selectRows.size === 1) {
|
|
||||||
this.$set(arr[0], "showMore", false);
|
|
||||||
} else if (this.selectRows.size === 2) {
|
|
||||||
arr.forEach(row => {
|
|
||||||
this.$set(row, "showMore", true);
|
|
||||||
})
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
handleSelectAll(selection) {
|
handleSelectAll(selection) {
|
||||||
if (selection.length > 0) {
|
if (selection.length > 0) {
|
||||||
if (selection.length === 1) {
|
|
||||||
this.selectRows.add(selection[0]);
|
|
||||||
} else {
|
|
||||||
this.tableData.forEach(item => {
|
this.tableData.forEach(item => {
|
||||||
this.$set(item, "showMore", true);
|
this.$set(item, "showMore", true);
|
||||||
this.selectRows.add(item);
|
this.selectRows.add(item);
|
||||||
});
|
});
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
this.selectRows.clear();
|
this.selectRows.clear();
|
||||||
this.tableData.forEach(row => {
|
this.tableData.forEach(row => {
|
||||||
|
@ -9,6 +9,9 @@
|
|||||||
<el-radio label="Jira">
|
<el-radio label="Jira">
|
||||||
<img class="platform" src="../../../../assets/jira.png" alt="Jira"/>
|
<img class="platform" src="../../../../assets/jira.png" alt="Jira"/>
|
||||||
</el-radio>
|
</el-radio>
|
||||||
|
<el-radio label="Zentao">
|
||||||
|
<img class="platform" src="../../../../assets/zentao.jpg" alt="Zentao"/>
|
||||||
|
</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -2,7 +2,7 @@
|
|||||||
<el-card>
|
<el-card>
|
||||||
<el-tabs class="system-setting" v-model="activeName">
|
<el-tabs class="system-setting" v-model="activeName">
|
||||||
<el-tab-pane :label="$t('organization.defect_manage')" name="defect">
|
<el-tab-pane :label="$t('organization.defect_manage')" name="defect">
|
||||||
<defect-management/>
|
<bug-management/>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
</el-card>
|
</el-card>
|
||||||
@ -10,12 +10,12 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
import DefectManagement from "./IssuesManagement";
|
import BugManagement from "./BugManagement";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "ServiceIntegration",
|
name: "ServiceIntegration",
|
||||||
components: {
|
components: {
|
||||||
DefectManagement
|
BugManagement
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit eb237fb6bfeba8d99e4db52450ae92f3cdd4ea33
|
Subproject commit b9091a47b197faef77c72b134b7cf604fe3209f0
|
Loading…
Reference in New Issue
Block a user