From 2ad5ca0811c67728b8958174fbeb8f0010ee0e6a Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期四, 15 六月 2023 16:43:35 +0800
Subject: [PATCH] 对象建模相关的bug修正
---
Source/UBCS-WEB/src/views/modeling/Business.vue | 157 +++++++++++++++++++++++++++++++--------------------
1 files changed, 95 insertions(+), 62 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index eca59a8..35923fd 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -1,14 +1,18 @@
<template>
<el-container>
- <el-header>
- <el-button type="primary" @click="businessAdd">鏂板</el-button>
- <el-button type="primary" @click="businessEdit">淇敼</el-button>
- <el-button type="primary" @click="selectFromTable">浠庡凡鏈変腑鑾峰彇</el-button>
+ <el-header class="businessHeader" style="height: 40px;">
+ <el-button-group>
+ <el-button type="primary" @click="businessAdd" size="small"> <i class="el-icon-plus"></i> 鏂板</el-button>
+ <el-button type="primary" @click="businessEdit" size="small"><i class="el-icon-edit"></i> 淇敼</el-button>
+ <el-button type="primary" @click="selectFromTable" size="small"><i class="el-icon-thumb"></i>
+ 浠庡凡鏈変腑鑾峰彇</el-button>
+ </el-button-group>
</el-header>
<el-container>
<el-aside width="240px">
- <basic-container>
- <avue-tree id="basic" :data="treeData" :option="treeOption" @node-click="nodeClick">
+ <basic-container class="businessTreeContainer">
+ <p style="margin-top: 10px;font-weight: 570;font-size: 19px">{{ treeOption.title }}</p>
+ <avue-tree id="basic" :data="treeData" :option="treeOption" @node-click="nodeClick" class="businessTree">
<span class="el-tree-node__label" slot-scope="{ node, data }">
<span>
<i class="el-icon-star-on"></i>
@@ -24,35 +28,39 @@
<basic-container>
<p style="margin-top: 10px;font-weight: 570;font-size: 19px">鍩烘湰淇℃伅</p>
<el-descriptions class="margin-top" :column="3" :size="size" border>
- <el-descriptions-item>
+ <el-descriptions-item :labelStyle="descriptionOption.labelStyle"
+ :contentStyle="descriptionOption.contentStyle">
<template slot="label">
- <i class="el-icon-finished"></i>
+ <i :class="icons.key"></i>
鑻辨枃鍚嶇О
</template>
{{ obj.id }}
</el-descriptions-item>
- <el-descriptions-item>
+ <el-descriptions-item :labelStyle="descriptionOption.labelStyle"
+ :contentStyle="descriptionOption.contentStyle">
<template slot="label">
- <i class="el-icon-info"></i>
+ <i :class="icons.name"></i>
涓枃鍚嶇О
</template>
{{ obj.name }}
</el-descriptions-item>
<el-descriptions-item>
- <template slot="label">
- <i class="el-icon-date"></i>
+ <template slot="label" :labelStyle="descriptionOption.labelStyle"
+ :contentStyle="descriptionOption.contentStyle">
+ <i :class="icons.tableName"></i>
鏁版嵁搴撹〃鍚�
</template>
{{ obj.tableName }}
</el-descriptions-item>
- <el-descriptions-item>
+ <el-descriptions-item :labelStyle="descriptionOption.labelStyle"
+ :contentStyle="descriptionOption.contentStyle">
<template slot="label">
- <i class="el-icon-folder-opened"></i>
+ <i :class="icons.domain"></i>
鎵�灞為鍩�
</template>
- <el-tag size="small">
- {{ obj.domainText }}
- </el-tag>
+ <el-tag size="small">
+ {{ obj.domainText }}
+ </el-tag>
</el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">
@@ -68,28 +76,31 @@
</template>
{{ obj.sss }}
</el-descriptions-item> -->
- <el-descriptions-item>
+ <el-descriptions-item :labelStyle="descriptionOption.labelStyle"
+ :contentStyle="descriptionOption.contentStyle">
<template slot="label">
- <i class="el-icon-s-check"></i>
+ <i :class="icons.revisionRule"></i>
鐗堟湰瑙勫垯
</template>
{{ obj.versionRule }}
</el-descriptions-item>
- <el-descriptions-item>
+ <el-descriptions-item :labelStyle="descriptionOption.labelStyle"
+ :contentStyle="descriptionOption.contentStyle">
<template slot="label">
- <i class="el-icon-refresh-right"></i>
+ <i :class="icons.lifeCycle"></i>
鐢熷懡鍛ㄦ湡
</template>
{{ obj.lifeCycleId }}
</el-descriptions-item>
- <el-descriptions-item>
+ <el-descriptions-item :labelStyle="descriptionOption.labelStyle"
+ :contentStyle="descriptionOption.contentStyle">
<template slot="label">
- <i class="el-icon-view"></i>
+ <i :class="icons.view"></i>
瑙嗗浘
</template>
- <el-tag size="small">
+ <el-tag size="small">
{{ obj.viewText }}
- </el-tag>
+ </el-tag>
</el-descriptions-item>
<!-- <el-descriptions-item>
<template slot="label">
@@ -98,9 +109,10 @@
</template>
{{ obj.implClass }}
</el-descriptions-item> -->
- <el-descriptions-item>
+ <el-descriptions-item :labelStyle="descriptionOption.labelStyle"
+ :contentStyle="descriptionOption.contentStyle">
<template slot="label">
- <i class="el-icon-chat-line-square"></i>
+ <i :class="icons.desc"></i>
鎻忚堪
</template>
{{ obj.description }}
@@ -111,36 +123,34 @@
<basic-container>
<p style="margin-top: 10px;font-weight: 570;font-size: 19px">灞炴�у垪琛�</p>
<avue-crud class="attributeCrud" v-model="obj" :data="obj.attributes" :option="loadOption">
- <template slot="attrDataType" slot-scope="{row}" >
- <el-tag>{{row.attrDataType}}</el-tag>
- </template>
+ <template slot="attrDataTypeText" slot-scope="{row}">
+ <el-tag>{{ row.attrDataTypeText }}</el-tag>
+ </template>
</avue-crud>
</basic-container>
</el-main>
<el-dialog :visible="ref.visible" title="浠庢暟鎹簱涓坊鍔�" width="700px" append-to-body @close="dialoghandelfalse">
閫夋嫨棰嗗煙锛�
- <el-select v-model="domain" placeholder="璇烽�夋嫨" @change="refOnLoad">
+ <el-select v-model="domain" placeholder="璇烽�夋嫨" @change="refOnLoad" size="small">
<el-option v-for="item in domainOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
- <avue-crud class="businessCrud" v-model="ref.form" :option="ref.option" :data="ref.data" @selection-change="selectionChange">
+ <div class="sep" style="height:7px">
+
+ </div>
+ <avue-crud class="businessCrud" v-model="ref.form" :option="ref.option" :data="ref.data"
+ @selection-change="selectionChange">
</avue-crud>
-<<<<<<< Updated upstream
- <div slot="footer" class="dialog-footer">
- <el-button @click="dialoghandeltrue">纭畾</el-button>
- <el-button @click="dialoghandelfalse">鍙栨秷</el-button>
- </div>
-=======
<span slot="footer" class="dialog-footer">
<el-button @click="dialoghandelfalse">鍙� 娑�</el-button>
<el-button type="primary" @click="dialoghandeltrue">纭� 瀹�</el-button>
</span>
->>>>>>> Stashed changes
</el-dialog>
</el-container>
</el-container>
- <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions">
- </business-add>
+ <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions" :icons="icons"
+ @refreshTable="initTreeOnLoad">
+ </business-add>
</el-container>
</template>
<script>
@@ -165,15 +175,16 @@
treeOption: {
defaultExpandAll: true,
title: '涓氬姟绫诲瀷鏍�',
+ addBtn: false,
props: {
labelText: '',
- label: 'name',
+ label: 'label',
value: 'oid',
children: 'childList',
}
},
- addOption:{
- btmType:{},
+ addOption: {
+ btmType: {},
},
loadOption: {
border: true,
@@ -182,8 +193,8 @@
addBtn: false,
menu: false,
highlightCurrentRow: true,
- refreshBtn:false,
- columnBtn:false,
+ refreshBtn: false,
+ columnBtn: false,
column: [
{
label: '鑻辨枃鍚嶇О',
@@ -196,7 +207,7 @@
},
{
label: "绫诲瀷",
- prop: "attrDataType",
+ prop: "attrDataTypeText",
align: 'center',
slot: true
},
@@ -212,8 +223,22 @@
}
]
},
+ descriptionOption: {
+ labelStyle: 'text-align:center;width:120px',
+ contentStyle: 'width:240px;text-align:center;word-break;break-all;'
+ },
domain: null,
domainOptions: [],
+ icons: {
+ key: 'el-icon-finished',
+ name: 'el-icon-tickets',
+ tableName: 'el-icon-date',
+ domain: 'el-icon-folder-opened',
+ revisionRule: 'el-icon-s-check',
+ lifeCycle: 'el-icon-refresh-right',
+ view: 'el-icon-view',
+ desc: 'el-icon-chat-line-square'
+ },
ref: {
// 浠庤〃涓�夋嫨dialog鐘舵��
visible: false,
@@ -244,10 +269,7 @@
}
]
},
- data: [{
- tableName: '1',
- description: '2'
- }]
+ data: [],
}
}
},
@@ -257,9 +279,13 @@
},
methods: {
nodeClick(data) {
- getDetail(data.oid).then(res => {
- this.obj = res.data.data;
- })
+ if (data.oid) {
+ getDetail(data.oid).then(res => {
+ this.obj = res.data.data;
+ })
+ }else{
+ this.$message.warning('璇风偣鍑诲瓙鑺傜偣');
+ }
},
// 鍩烘湰淇℃伅娣诲姞
basicSave(row, done, loading) {
@@ -319,17 +345,18 @@
this.initTreeOnLoad();
})
},
- businessAdd(){
+ businessAdd() {
this.$refs.btmAdd.showSubmitDialog = true;
this.ifRefreshBtmAddRefresh();
},
- businessEdit(){
- this.$refs.btmAdd.btmType = this.obj;
+ businessEdit() {
+ var json = JSON.stringify(this.obj);
+ this.$refs.btmAdd.btmType = JSON.parse(json);
this.$refs.btmAdd.showSubmitDialog = true;
this.ifRefreshBtmAddRefresh();
},
- ifRefreshBtmAddRefresh(){
- this.$refs.btmAdd.refreshAttrTable();
+ ifRefreshBtmAddRefresh() {
+ // this.$refs.btmAdd.refreshAttrTable();
}
},
}
@@ -341,8 +368,14 @@
border-radius: 10px;
}
-.businessCrud > .el-card > .el-card__body > .avue-crud_menu{
- display: none!important;
+.businessCrud>.el-card:nth-of-type(2)>.el-card__body>.avue-crud__menu {
+ display: none !important;
}
-</style>
+.attributeCrud>.el-card:nth-of-type(2)>.el-card__body>.avue-crud__menu {
+ display: none !important;
+}
+
+.businessTreeContainer>.el-card>.el-card__body {
+ height: 775px;
+}</style>
--
Gitblit v1.9.3