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 | 88 +++++++++++++++++++++++++++-----------------
1 files changed, 54 insertions(+), 34 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 706fd41..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
@@ -41,7 +41,7 @@
<el-main>
<basic-container>
- <div>
+ <div style="height: 380px">
<el-descriptions :column="2" border class="margin-top" size="medium">
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -94,11 +94,13 @@
<i :class="icons.from"></i>
From绔被鍨�
</template>
- <span v-for="item in nodeRow.btmItemsFrom" style="margin-left:2px;">
- <el-tag effect="plain" style="margin-top: 2px;">
+ <div style="height: 60px;overflow-y: auto;display: flex;flex-wrap: wrap">
+ <span v-for="item in nodeRow.btmItemsFrom" style="margin-left:3px;">
+ <el-tag effect="plain" style="margin-top: 3px;">
{{ item }}
</el-tag>
- </span>
+ </span>
+ </div>
</el-descriptions-item>
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -128,11 +130,13 @@
<i :class="icons.to"></i>
To绔被鍨�
</template>
- <span v-for="item in nodeRow.btmItemsTo" style="margin-left:2px;">
- <el-tag effect="plain" style="margin-top: 2px;">
+ <div style="height: 60px;overflow-y: auto;display: flex;flex-wrap: wrap">
+ <span v-for="item in nodeRow.btmItemsTo" style="margin-left:2px;">
+ <el-tag effect="plain" style="margin-top: 2px;">
{{ item }}
- </el-tag>
- </span>
+ </el-tag>
+ </span>
+ </div>
</el-descriptions-item>
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
@@ -155,7 +159,7 @@
</el-descriptions>
</div>
- <div style="margin-top: 20px">
+ <div style="margin-top: 30px">
<h3>灞炴�ф睜鍒楄〃</h3>
<avue-crud
:data="tableData"
@@ -197,10 +201,6 @@
<div class="centerForm">
<el-form-item label="Form绔被鍨嬶細" label-width="110px">
- <!-- <el-button v-if="!form.btmItemsFrom" plain size="mini" type="success"-->
- <!-- @click="FormItemReferChange('form')">娣诲姞-->
- <!-- </el-button>-->
- <!-- <el-input v-if="form.btmItemsFrom" v-model="form.btmItemsFrom"></el-input>-->
<div style="display: flex; align-items: center">
<div style="height: 200px; width: 280px; border: 1px solid #bdbbbb;overflow-y: auto">
<!-- 鍐呭 -->
@@ -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: [
@@ -597,6 +598,7 @@
{
label: '璇存槑',
prop: 'description',
+ overHidden: true
}
]
},
@@ -623,6 +625,7 @@
// index:false,
addBtn: false,
menu: false,
+ calcHeight: -40,
column: [
{
label: '灞炴�у悕',
@@ -642,6 +645,7 @@
{
label: '璇存槑',
prop: 'description',
+ overHidden: true
}
]
},
@@ -661,7 +665,7 @@
desc: 'el-icon-chat-line-square'
},
bizLastIndex: null,
- attrLastIndex:null
+ attrLastIndex: null
}
},
created() {
@@ -873,8 +877,12 @@
row,
this.$refs.dialogAttrCrud,
this.attrLastIndex,
- (newIndex) => { this.attrLastIndex = newIndex; },
- () => { this.selectList = []; }
+ (newIndex) => {
+ this.attrLastIndex = newIndex;
+ },
+ () => {
+ this.selectList = [];
+ }
);
},
@@ -904,8 +912,6 @@
this.bizFormData = [];
this.bizToData = [];
this.dialogBottomData = [];
- console.log(this.form);
- console.log('--', this.nodeRow)
},
// 娣诲姞灞炴�ф睜 淇濆瓨
@@ -955,9 +961,13 @@
//娣诲姞灞炴�ф睜 鎼滅储
attrHandleSearch(params, done) {
- this.searchAttrParams = {
- "conditionMap[id]": "*" + params.id + "*"
- };
+ if (func.isEmptyObject(params)) {
+ this.searchAttrParams = {};
+ } else {
+ this.searchAttrParams = {
+ "conditionMap[id]": "*" + params.id + "*"
+ };
+ }
this.getAttrDialogDta();
done();
},
@@ -1011,8 +1021,12 @@
row,
this.$refs.bizTypeCrud,
this.bizLastIndex,
- (newIndex) => { this.bizLastIndex = newIndex; },
- () => { this.selectList = []; }
+ (newIndex) => {
+ this.bizLastIndex = newIndex;
+ },
+ () => {
+ this.selectList = [];
+ }
);
},
@@ -1087,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