Merge remote-tracking branch 'origin/v1.8' into v1.8
This commit is contained in:
commit
02af3f1fe9
|
@ -1,2 +1,4 @@
|
|||
ALTER TABLE file_metadata
|
||||
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);
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
<span v-if="!disabled" class="node-operate child">
|
||||
<el-tooltip
|
||||
v-if="data.id != 'root' && data.id !='default-module'"
|
||||
v-if="data.id != 'root' && data.name !='默认模块'"
|
||||
class="item"
|
||||
effect="dark"
|
||||
:open-delay="200"
|
||||
|
@ -49,7 +49,7 @@
|
|||
<i @click.stop="append(node, data)" class="el-icon-circle-plus-outline"></i>
|
||||
</el-tooltip>
|
||||
<el-tooltip
|
||||
v-if="data.id != 'root' && data.id !='default-module'"
|
||||
v-if="data.id != 'root' && data.name !='默认模块'"
|
||||
class="item" effect="dark"
|
||||
:open-delay="200"
|
||||
:content="$t('commons.delete')"
|
||||
|
@ -230,7 +230,7 @@ export default {
|
|||
if (dropType === "none" || dropType === undefined) {
|
||||
return;
|
||||
}
|
||||
if (dropNode.data.id === 'root' && dropType === 'before') {
|
||||
if (dropNode.data.id === 'root' && dropType === 'before' || draggingNode.data.name==='默认模块') {
|
||||
this.$emit('refresh');
|
||||
return false;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue