From 539333922cc1a1b2b5de75a3a5a4dcac90b3b064 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 30 一月 2024 11:31:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/modeling/Business.vue | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/modeling/Business.vue b/Source/UBCS-WEB/src/views/modeling/Business.vue
index 433d618..5e8f486 100644
--- a/Source/UBCS-WEB/src/views/modeling/Business.vue
+++ b/Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -6,7 +6,7 @@
<el-container>
<el-aside style="width: 300px">
<basic-container class="businessTreeContainer">
- <div class="app"style="overflow: auto;height: 84.3vh;">
+ <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" plain size="mini" type="primary"
@click="businessAdd">
@@ -20,19 +20,21 @@
type="primary" @click="selectFromTable"> 浠庡凡鏈変腑鑾峰彇
</el-button>
</div>
- <avue-tree :data="treeData" :option="treeOption" class="businessTree" style="height: 74.3vh"
- @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>
+ <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>
- </el-tooltip>
- </template>
- </avue-tree>
+ </el-tooltip>
+ </template>
+ </avue-tree>
+ </div>
</div>
</basic-container>
@@ -107,7 +109,8 @@
<!-- 灞炴�у垪琛�-->
<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>
@@ -166,6 +169,7 @@
selectionList: [],
treeData: [],
treeOption: {
+ height:'auto',
defaultExpandAll: false,
title: '涓氬姟绫诲瀷鏍�',
addBtn: false,
@@ -178,11 +182,16 @@
}
},
addOption: {
- btmType: {},
- btmEditType:{}
+ btmType: {
+ attributes:[]
+ },
+ btmEditType:{
+ attributes:[]
+ }
},
loadOption: {
height: 'auto',
+ calcHeight: 0,
border: true,
editBtn: false,
addBtn: false,
@@ -290,6 +299,17 @@
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('璇风偣鍑诲瓙鑺傜偣');
--
Gitblit v1.9.3