From e3376657b0f8c25fd04ec1d06f424160e67e20a2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 10 十二月 2024 17:21:36 +0800
Subject: [PATCH] 生命周期备选列表添加超出隐藏和提示文字&&表单定义查询模板切换不显示值问题
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 4 ++++
Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailPanel.vue | 1 -
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue | 1 +
Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ItemPanel.vue | 33 +++++++++++++++++++++------------
Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailForm.vue | 2 +-
5 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailForm.vue b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailForm.vue
index b78c6e4..9e88315 100644
--- a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailForm.vue
+++ b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailForm.vue
@@ -158,7 +158,7 @@
const canvas = document.createElement('canvas')
const canvasContext = canvas.getContext('2d')
canvasContext.font = this.fontSize + 'px System'
- let label = model.label.replace('\n', '')
+ let label = model.label ? model.label.replace('\n', '') : '';
let sourceWidth = this.formModel.width
let sourceHeight = this.formModel.height
const spacing = 10
diff --git a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailPanel.vue b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailPanel.vue
index 9a2aec4..849260d 100644
--- a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailPanel.vue
+++ b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/DetailPanel.vue
@@ -185,7 +185,6 @@
color: #409eff;
background-color: #ecf5ff;
}
-
}
.event {
diff --git a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ItemPanel.vue b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ItemPanel.vue
index 7a76262..e7a92e8 100644
--- a/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ItemPanel.vue
+++ b/Source/plt-web/plt-web-ui/src/components/flow-cycle/components/ItemPanel.vue
@@ -1,29 +1,32 @@
<template>
<div class="item_panel_box">
- <el-input size="mini" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
+ <el-input v-model="filterText" placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" size="mini">
</el-input>
<div class="box_item">
- <item-panel class="item-panel" v-loading="loading">
+ <item-panel v-loading="loading" class="item-panel">
<template v-for="(item, index) in nodeItems">
<item
:key="index"
- :type="item.type || 'node'"
- :size="item.size || '72*43'"
- :shape="item.shape || 'flow-rect'"
:model="{
// must have model property
color: item.color || '#1890FF',
label: item.id || '鑺傜偣'
}"
+ :shape="item.shape || 'flow-rect'"
+ :size="item.size || '72*43'"
+ :type="item.type || 'node'"
>
<template v-if="item.src">
<div class="item item-img">
- <img :src="item.src" :alt="item.id" />
+ <img :alt="item.id" :src="item.src"/>
</div>
</template>
<template v-else>
<div :class="'item item-' + (item.shape || 'flow-rect')">
- <span>{{ item.id }}</span>
+ <el-tooltip v-if="item.id.length > 9" :content="item.id" effect="light" placement="top">
+ <span class="spanValue">{{ item.id }}</span>
+ </el-tooltip>
+ <span v-else>{{ item.id }}</span>
</div>
</template>
</item>
@@ -34,16 +37,16 @@
</template>
<script>
-import { Item, ItemPanel } from 'vue-flowchart-editor'
+import {Item, ItemPanel} from 'vue-flowchart-editor'
// import { getPage } from '../../../api/omd/status'
export default {
name: 'EditorItemPanel',
- components: { ItemPanel, Item },
+ components: {ItemPanel, Item},
props: {
- nodeItems:{
- type:Array,
- default:() => [],
+ nodeItems: {
+ type: Array,
+ default: () => [],
}
},
data() {
@@ -118,4 +121,10 @@
.item-img {
max-width: 100px;
}
+
+.spanValue {
+ white-space: nowrap; // 闃叉鎹㈣
+ overflow: hidden; //闅愯棌瓒呭嚭閮ㄥ垎
+ text-overflow: ellipsis; //鏄剧ず鐪佺暐鍙�
+}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
index f67bc3d..02ed624 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
@@ -1026,6 +1026,7 @@
],
form: {},
topForm: {
+ itemQtName:'',
columnNumber: 8,
showColumn: '3',
viName: '',
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
index c1df775..8f4a109 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
@@ -604,6 +604,7 @@
dicUrl: '/api/uiManagerController/getBtmDatasByPage?page=1&limit=-1',
filterable: true,
change: (val) => {
+ console.log('showTypeChangeFlag',this.showTypeChangeFlag)
if (val.value) {
let params = {
'conditionMap[selectBtmType]': this.form.searchTarger === '1' ? this.form.showType : this.form.linkType
@@ -916,6 +917,8 @@
// 澧炲姞鍏抽棴瀵硅瘽妗� 娓呯┖event鏁扮粍
beforeClose(done) {
this.eventData = [];
+ this.showTypeChangeFlag = false;
+ this.linkTypeChangeFlag = false;
done();
},
@@ -935,6 +938,7 @@
};
});
}
+ console.log('row',row);
this.searchTargerChangeFlag = false;
this.$refs.crud.rowEdit(row);
},
--
Gitblit v1.9.3