Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

public/drawio/js/diagramly/sidebar/Sidebar.js

@@ -1207,7 +1207,7 @@
 		this.addWebIconsPalette();
 		this.addWebLogosPalette();
 		this.addSignsPalette(signs, dir);
-		this.addEAPalette(); //二次开发，增加动态读取架构设计要素
+		// this.addEAPalette(); //二次开发，增加动态读取架构设计要素
 		// LATER: Check if conflicts with restore libs after loading file
 		this.showEntries();
 		

src/views/JiaGouSTPZ/index.vue

@@ -95,8 +95,9 @@
 			title="新建架构视图配置"
 			:visible.sync="add_dialog"
 			:center="false"
-			width="40%">
+			width="50%">
 			<div class="add_dialog_content">
+				<div class="dialog_content_1">
 					<div class="dialog_form_item">
 						<div class="dialog_form_item_title">*架构层次</div>
 						<el-select v-model="query_item4" placeholder="请选择" class="search_item">
@@ -117,9 +118,30 @@
 						</el-select>
 					</div>
 					<div class="dialog_form_item">
+						<div class="dialog_form_item_title">架构视图:</div>
+						<el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="let1" :disabled="true"></el-input>
+					</div>
+				</div>
+				<div class="dialog_form_item">
 					<div class="dialog_form_item_title">*描述</div>
 					<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="let4"></el-input>
 				</div>
+				<div class="dialog_form_item">
+					<div class="dialog_form_item_title">*元素范围</div>
+					<el-table :data="tableData2" border>
+						<el-table-column type="selection" width="55"></el-table-column>
+						<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
+						<el-table-column prop="name" label="元素名称" align="center"></el-table-column>
+					</el-table>
+				</div>
+				<div class="dialog_form_item">
+					<div class="dialog_form_item_title">*包含元素</div>
+					<el-table :data="tableData2" border>
+						<el-table-column type="selection" width="55"></el-table-column>
+						<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
+						<el-table-column prop="name" label="元素名称" align="center"></el-table-column>
+					</el-table>
+				</div>
 			</div>
 			<span slot="footer" class="dialog-footer">
 				<el-button class="greenButton" @click="add_dialog = false">发布</el-button>
@@ -144,11 +166,21 @@ export default {
 				{ let1: '支撑', let2: '业务域', let7: '业务职能', let3: '业务架构', let4: '业务职能的描述', let5: '2023.10.31', let6: '已发布' },
 				{ let1: '聚合', let2: '应用域', let7: '应用职能', let3: '应用架构', let4: '应用交互的基本描述', let5: '2023.10.31', let6: '已发布' },
 			],
+			tableData1: [
+				{ name: '业务域'},
+				{ name: '业务职能'},
+				{ name: '业务流程'},
+			],
+			tableData2: [
+				{ name: '业务域'},
+				{ name: '业务职能'},
+				{ name: '业务流程'},
+			],
 			add_dialog: false,
 			query_item1: null,
 			query_item3: null,
 			query_item4: null,
-			let1: '',
+			let1: '带出',
 			let2: '',
 			let3: '',
 			let4: '',
@@ -166,6 +198,10 @@ export default {
     	justify-content: flex-start;
     	align-items: center;
 	}
+	.dialog_content_1{
+		display: flex;
+    	justify-content: space-between;
+	}
 	.search_menu{
 		display: flex;
 		justify-content: space-between;