From b19fab639f82d33776e58b541c17a17be75325e7 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 15 八月 2024 23:23:29 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue index 9d717d3..aa5e091 100644 --- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue +++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue @@ -445,6 +445,7 @@ highlightCurrentRow: true, searchMenuSpan: 8, searchLabelWidth: 100, + calcHeight: 30, column: [ { label: '涓氬姟绫诲瀷鍚�', @@ -575,7 +576,7 @@ editBtn: false, refreshBtn: false, selection: false, - height: 300, + height: 200, addBtn: false, // index:false, column: [ @@ -911,8 +912,6 @@ this.bizFormData = []; this.bizToData = []; this.dialogBottomData = []; - console.log(this.form); - console.log('--', this.nodeRow) }, // 娣诲姞灞炴�ф睜 淇濆瓨 @@ -1102,16 +1101,22 @@ this.$message.error('form绔笟鍔$被鍨嬪拰to绔被鍨嬪潎涓嶈兘涓虹┖锛�') return; } - this.form.btmItemsFrom = this.bizFormData.map(item => item.name); - this.form.btmItemsTo = this.bizToData.map(item => item.name); - this.form.attributes = this.dialogBottomData.map(item => item.id); - let flag = this.title === 'add' ? true : false; - addAndEditLink(flag, this.form).then(res => { - if (res.data.code === 200) { - this.visible = false; - this.$message.success(res.data.msg); - this.resetForm(); - this.getTreeList(); + this.$refs.form.validate((valid) => { + if (valid) { + this.form.btmItemsFrom = this.bizFormData.map(item => item.name); + this.form.btmItemsTo = this.bizToData.map(item => item.name); + this.form.attributes = this.dialogBottomData.map(item => item.id); + let flag = this.title === 'add' ? true : false; + addAndEditLink(flag, this.form).then(res => { + if (res.data.code === 200) { + this.visible = false; + this.$message.success(res.data.msg); + this.resetForm(); + this.getTreeList(); + } + }); + } else { + return false; } }); }, -- Gitblit v1.9.3