From 7407f7fd5b9d8e52edf4d1398eae710a0dd08ce9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 15 八月 2024 16:01:47 +0800
Subject: [PATCH] 整合代码
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/linkType/index.vue | 72 ++++++++++++++++++++++++++----------
1 files changed, 52 insertions(+), 20 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 4acc188..b4c4e52 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
@@ -16,7 +16,8 @@
</el-button>
<el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">瀵煎叆
</el-button>
- <el-button class="smallBtn" style="padding-left: 7px !important;" icon="el-icon-circle-plus-outline" plain size="small"
+ <el-button class="smallBtn" icon="el-icon-circle-plus-outline" plain size="small"
+ style="padding-left: 7px !important;"
type="primary" @click="createViewClickHandler">鍒涘缓瑙嗗浘
</el-button>
<el-button class="smallBtn" icon="el-icon-menu" plain size="small" style="padding-left: 1px"
@@ -40,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">
@@ -93,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">
@@ -127,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">
@@ -154,7 +159,7 @@
</el-descriptions>
</div>
- <div style="margin-top: 20px">
+ <div style="margin-top: 30px">
<h3>灞炴�ф睜鍒楄〃</h3>
<avue-crud
:data="tableData"
@@ -196,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">
<!-- 鍐呭 -->
@@ -444,6 +445,7 @@
highlightCurrentRow: true,
searchMenuSpan: 8,
searchLabelWidth: 100,
+ calcHeight:30,
column: [
{
label: '涓氬姟绫诲瀷鍚�',
@@ -574,7 +576,7 @@
editBtn: false,
refreshBtn: false,
selection: false,
- height: 300,
+ height: 200,
addBtn: false,
// index:false,
column: [
@@ -596,6 +598,7 @@
{
label: '璇存槑',
prop: 'description',
+ overHidden: true
}
]
},
@@ -622,6 +625,7 @@
// index:false,
addBtn: false,
menu: false,
+ calcHeight: -40,
column: [
{
label: '灞炴�у悕',
@@ -641,6 +645,7 @@
{
label: '璇存槑',
prop: 'description',
+ overHidden: true
}
]
},
@@ -659,6 +664,8 @@
main: 'el-icon-warning-outline',
desc: 'el-icon-chat-line-square'
},
+ bizLastIndex: null,
+ attrLastIndex: null
}
},
created() {
@@ -865,7 +872,18 @@
// 娣诲姞灞炴�ф睜 琛岀偣鍑�
dialogAttrRowClickHandler(row) {
- this.$refs.dialogAttrCrud.toggleRowSelection(row);
+
+ func.rowClickHandler(
+ row,
+ this.$refs.dialogAttrCrud,
+ this.attrLastIndex,
+ (newIndex) => {
+ this.attrLastIndex = newIndex;
+ },
+ () => {
+ this.selectList = [];
+ }
+ );
},
// 娣诲姞灞炴�ф睜 鍏抽棴瀵硅瘽妗�
@@ -945,9 +963,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();
},
@@ -997,7 +1019,17 @@
// form to 绫诲瀷琛岀偣鍑�
bizTypeRowClick(row) {
- this.$refs.bizTypeCrud.toggleRowSelection(row);
+ func.rowClickHandler(
+ row,
+ this.$refs.bizTypeCrud,
+ this.bizLastIndex,
+ (newIndex) => {
+ this.bizLastIndex = newIndex;
+ },
+ () => {
+ this.selectList = [];
+ }
+ );
},
// form to 绫诲瀷淇濆瓨
--
Gitblit v1.9.3