From 3aae81075a18a11d6b605c7583eb03b75366b466 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 18 四月 2024 00:08:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/Business.vue | 134 +++++++++++++++++++++++++-------------------
1 files changed, 76 insertions(+), 58 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index fb9fdec..5e8f486 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -1,31 +1,40 @@
<template>
<el-container>
-<!-- <el-header class="businessHeader" style="height: 40px;padding:0 8px">-->
+ <!-- <el-header class="businessHeader" style="height: 40px;padding:0 8px">-->
-<!-- </el-header>-->
+ <!-- </el-header>-->
<el-container>
- <el-aside style="width: 20%">
+ <el-aside style="width: 300px">
<basic-container class="businessTreeContainer">
- <div class="app">
+ <div class="app"style="height: calc(100vh - 145px);">
<div style="display: flex;margin-bottom: 10px;justify-content: space-around;">
- <el-button v-if="permissionList.addBtn" size="mini" type="primary" @click="businessAdd" plain style="width: 60px">
+ <el-button v-if="permissionList.addBtn" plain size="mini" type="primary"
+ @click="businessAdd">
鏂板
</el-button>
- <el-button v-if="permissionList.editBtn" size="mini" type="primary" @click="businessEdit" plain style="width: 60px">
+ <el-button v-if="permissionList.editBtn" plain size="mini" type="primary"
+ @click="businessEdit">
淇敼
</el-button>
- <el-button v-if="permissionList.table" size="mini" type="primary"
- @click="selectFromTable" plain> 浠庡凡鏈変腑鑾峰彇
+ <el-button v-if="permissionList.table" plain size="mini"
+ type="primary" @click="selectFromTable"> 浠庡凡鏈変腑鑾峰彇
</el-button>
</div>
- <avue-tree :data="treeData" :option="treeOption" class="businessTree" @node-click="nodeClick" style="width: fit-content;">
- <template slot-scope="{ node, data }" class="el-tree-node__label">
- <span>
+ <div style="height: calc(100vh - 220px);overflow: auto">
+ <avue-tree :data="treeData" :option="treeOption" class="businessTree"
+ @node-click="nodeClick">
+ <template slot-scope="{ node, data }" class="el-tree-node__label">
+ <el-tooltip :content="$createElement('div', { domProps: { innerHTML: node.label } })" class="item" effect="dark"
+ open-delay="250"
+ placement="top-start">
+ <span style="font-size: 15px;">
<i :class="(node || {}).level === 2 ? 'el-icon-star-off' : 'el-icon-folder-opened'"></i>
{{ (node || {}).label }}
</span>
- </template>
- </avue-tree>
+ </el-tooltip>
+ </template>
+ </avue-tree>
+ </div>
</div>
</basic-container>
@@ -87,24 +96,6 @@
</template>
{{ obj.lifeCycleName ? obj.lifeCycleName + '(' + obj.lifeCycleId + ')' : '' }}
</el-descriptions-item>
-<!-- <el-descriptions-item :contentStyle="descriptionOption.contentStyle"-->
-<!-- :labelStyle="descriptionOption.labelStyle">-->
-<!-- <template slot="label">-->
-<!-- <i :class="icons.view"></i>-->
-<!-- 瑙嗗浘-->
-<!-- </template>-->
-<!-- <el-tag v-if="obj.viewText" size="small">-->
-<!-- {{ obj.viewText }}-->
-<!-- </el-tag>-->
-<!-- <span v-else></span>-->
-<!-- </el-descriptions-item>-->
- <!-- <el-descriptions-item>
- <template slot="label">
- <i class="el-icon-arrow-down"></i>
- 瀹炵幇绫�
- </template>
- {{ obj.implClass }}
- </el-descriptions-item> -->
<el-descriptions-item :contentStyle="descriptionOption.contentStyle"
:labelStyle="descriptionOption.labelStyle">
<template slot="label">
@@ -118,14 +109,16 @@
<!-- 灞炴�у垪琛�-->
<basic-container>
<p style="margin-top: 10px;font-weight: 570;font-size: 19px">灞炴�у垪琛�</p>
- <avue-crud v-model="obj" :data="obj.attributes" :option="loadOption" class="attributeCrud">
+<!-- style="height: calc(100vh - 435px)"-->
+ <avue-crud v-model="obj" :data="obj.attributes" :option="loadOption" class="attributeCrud">
<template slot="attrDataTypeText" slot-scope="{row}">
<el-tag>{{ row.attrDataTypeText }}</el-tag>
</template>
</avue-crud>
</basic-container>
</el-main>
- <el-dialog :visible="ref.visible" append-to-body title="浠庢暟鎹簱涓坊鍔�" width="700px" @close="dialoghandelfalse" top="9vh">
+ <el-dialog :visible="ref.visible" append-to-body title="浠庢暟鎹簱涓坊鍔�" top="4vh" width="600px"
+ @close="dialoghandelfalse">
閫夋嫨棰嗗煙锛�
<el-select v-model="domain" placeholder="璇烽�夋嫨" size="small" @change="refOnLoad">
<el-option v-for="item in domainOptions" :key="item.value" :label="item.label" :value="item.value">
@@ -144,9 +137,13 @@
</el-dialog>
</el-container>
</el-container>
- <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions" :icons="icons"
+ <business-add ref="btmAdd" :btmType="addOption.btmType" :domainOption="domainOptions" :icons="icons" :type="type"
@refreshTable="initTreeOnLoad">
</business-add>
+ <business-edit ref="btmEdit" :btmType="addOption.btmEditType" :domainOption="domainOptions" :icons="icons" :type="type"
+ @refreshTable="initTreeOnLoad">
+
+ </business-edit>
</el-container>
</template>
<script>
@@ -163,6 +160,7 @@
name: "Business",
data() {
return {
+ type: "",
//鐢熷懡鍛ㄦ湡瀵硅瘽妗嗙姸鎬�
packageLifeBox: false,
//鐗堟湰瑙勫垯鐘舵��
@@ -171,6 +169,7 @@
selectionList: [],
treeData: [],
treeOption: {
+ height:'auto',
defaultExpandAll: false,
title: '涓氬姟绫诲瀷鏍�',
addBtn: false,
@@ -183,10 +182,16 @@
}
},
addOption: {
- btmType: {},
+ btmType: {
+ attributes:[]
+ },
+ btmEditType:{
+ attributes:[]
+ }
},
loadOption: {
- height:'auto',
+ height: 'auto',
+ calcHeight: 0,
border: true,
editBtn: false,
addBtn: false,
@@ -253,6 +258,7 @@
tabs: true,
addBtn: false,
menu: false,
+ refreshBtn:false,
highlightCurrentRow: true,
column: [
{
@@ -292,6 +298,18 @@
if (data.oid) {
getDetail(data.oid).then(res => {
this.obj = res.data.data;
+ this.addOption.btmEditType = res.data.data;
+ // if(this.addOption.btmEditType.domainText){
+ // this.$refs.btmEdit.getDefaultData('reVersionRule', 'ruleData', 'ruleFirstSelection');
+ // }
+ // //鐗堟湰瑙勫垯
+ // if(this.addOption.btmEditType.revisionRuleName && this.addOption.btmEditType.revisionRuleId){
+ // this.$refs.btmEdit.getDefaultData('reVersionRule', 'ruleData', 'ruleFirstSelection');
+ // }
+ // //鐢熷懡鍛ㄦ湡
+ // if(this.addOption.btmEditType.lifeCycleId && this.addOption.btmEditType.lifeCycleName){
+ // this.$refs.btmEdit.getDefaultData('lifeCycle', 'lifeData', 'lifeCycleSelection')
+ // }
})
} else {
this.$message.warning('璇风偣鍑诲瓙鑺傜偣');
@@ -362,6 +380,7 @@
businessAdd() {
this.$refs.btmAdd.showSubmitDialog = true;
this.$refs.btmAdd.btmType = {};
+ this.type = 'add';
this.ifRefreshBtmAddRefresh();
},
businessEdit() {
@@ -369,9 +388,10 @@
this.$message.warning("璇烽�夋嫨涓�鏉″彾瀛愯妭鐐圭殑涓氬姟绫诲瀷");
return;
}
- const json = JSON.stringify(this.obj);
- this.$refs.btmAdd.btmType = JSON.parse(json);
- this.$refs.btmAdd.showSubmitDialog = true;
+ // const json = JSON.stringify(this.obj);
+ // this.$refs.btmAdd.btmType = JSON.parse(json);
+ this.$refs.btmEdit.showSubmitDialog = true;
+ this.type = 'edit'
this.ifRefreshBtmAddRefresh();
},
ifRefreshBtmAddRefresh() {
@@ -392,27 +412,25 @@
}
-.app {
- overflow: auto;
- height: 84.3vh;
-}
-.app::-webkit-scrollbar {
- height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
- background: white;
- border: white;
- width: 10px;
-}
-
-// 婊氬姩鏉＄殑婊戝潡
-.app::-webkit-scrollbar-thumb {
- width: 10px;
- height: 10px;
- background-color: #ececec;
- border-radius: 20px;
- border: #ececec;
-}
+//
+//.app::-webkit-scrollbar {
+// height: 15px; // 绾靛悜婊氬姩鏉� 蹇呭啓
+// background: white;
+// border: white;
+// width: 10px;
+//
+//}
+//
+//// 婊氬姩鏉＄殑婊戝潡
+//.app::-webkit-scrollbar-thumb {
+// width: 10px;
+// height: 10px;
+// background-color: #ececec;
+// border-radius: 20px;
+// border: #ececec;
+//}
</style>
--
Gitblit v1.9.3