test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1.8' into v1.8

This commit is contained in:
Captain.B 2021-03-30 15:29:45 +08:00
parent d556c722ad 2a70396bf8
commit 02af3f1fe9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/resources/db/migration/V79__v1.8.1_release.sql
View File

@ -1,2 +1,4 @@
ALTER TABLE file_metadata ALTER TABLE file_metadata
MODIFY name VARCHAR(250) NOT NULL COMMENT 'File name'; MODIFY name VARCHAR(250) NOT NULL COMMENT 'File name';
-- api_scenario_report modify column length
ALTER TABLE api_scenario_report MODIFY COLUMN name VARCHAR(300);

6
frontend/src/business/components/track/common/NodeTree.vue
View File

@ -32,7 +32,7 @@
<span v-if="!disabled" class="node-operate child"> <span v-if="!disabled" class="node-operate child">
<el-tooltip <el-tooltip
v-if="data.id != 'root' && data.id !='default-module'" v-if="data.id != 'root' && data.name !='默认模块'"
class="item" class="item"
effect="dark" effect="dark"
:open-delay="200" :open-delay="200"
@ -49,7 +49,7 @@
<i @click.stop="append(node, data)" class="el-icon-circle-plus-outline"></i> <i @click.stop="append(node, data)" class="el-icon-circle-plus-outline"></i>
</el-tooltip> </el-tooltip>
<el-tooltip <el-tooltip
v-if="data.id != 'root' && data.id !='default-module'" v-if="data.id != 'root' && data.name !='默认模块'"
class="item" effect="dark" class="item" effect="dark"
:open-delay="200" :open-delay="200"
:content="$t('commons.delete')" :content="$t('commons.delete')"
@ -230,7 +230,7 @@ export default {
if (dropType === "none" || dropType === undefined) { if (dropType === "none" || dropType === undefined) {
return; return;
} }
if (dropNode.data.id === 'root' && dropType === 'before') { if (dropNode.data.id === 'root' && dropType === 'before' || draggingNode.data.name==='默认模块') {
this.$emit('refresh'); this.$emit('refresh');
return false; return false;
} }