修改画布

liuyong
Commit 3e31709b authored Jan 31, 2024 by liuyong
Showing with 193 additions and 29 deletions
public/drawio/js/diagramly/EditorUi.js
public/drawio/js/grapheditor/Sidebar.js
src/api/index.js
src/directive/index.js
src/router/index.js
src/views/Main/index.vue
src/views/archi-asset-manage/index.vue
src/views/archi-ele-list/index.vue
src/views/busi-assets-list/index.vue
src/views/current-assets-list/index.vue
src/views/metaModelDic/pages/page1.vue
--- a/public/drawio/js/diagramly/EditorUi.js
+++ b/public/drawio/js/diagramly/EditorUi.js
@@ -4043,8 +4043,21 @@
 		title.appendChild(buttons);
 		title.style.paddingRight = (buttons.childNodes.length * btnWidth) + 'px';
 		this.editor.fireEvent(new mxEventObject('libraryLoaded'));
-		$("img[valign='absmiddle']").eq(2).css('display', 'none');//二次开发，隐藏便签本的删除图标
+		if($(title).text() == '便笺本?') {
+			$("img[valign='absmiddle']").eq(2).css('display', 'none');//二次开发，隐藏便签本的删除图标
+		}else {
+			$("img[valign='absmiddle']").eq(0).css('display', 'none');//二次开发，隐藏标准图元的添加图标
+			$("img[valign='absmiddle']").eq(1).css('display', 'none');//二次开发，隐藏标准图元的编辑图标
+			$("img[valign='absmiddle']").eq(2).css('display', 'none');//二次开发，隐藏标准图元的删除图标
+		}
+		if($(title).text() == '业务架构') {
+			title.style.borderTop = '2px solid #ccc';
+		}
+		if($(title).text() == '安全架构') {
+			title.style.borderBottom = '2px solid #ccc';
+		}
 	};
 	/**

--- a/public/drawio/js/grapheditor/Sidebar.js
+++ b/public/drawio/js/grapheditor/Sidebar.js
@@ -2189,14 +2189,19 @@ Sidebar.prototype.createTitle = function(label)
 	var elt = document.createElement('a');
 	elt.setAttribute('title', mxResources.get('sidebarTooltip'));
 	elt.className = 'geTitle';
+	console.log(label)
 	//二次开发，设置样式--------------------开始
 	if(label == '架构元素关系') {
 		elt.style.borderTop = '2px solid #ccc';
 		elt.style.borderBottom = '2px solid #ccc';
+	}else if(label == '安全架构'){
+		// elt.style.borderTop = '2px solid #ccc';
 	}else {
 		elt.style.border = 'none';
 	}
 	//二次开发，设置样式--------------------结束
 	mxUtils.write(elt, label);
 	return elt;
 };

--- a/src/api/index.js
+++ b/src/api/index.js
@@ -221,6 +221,11 @@ export function getDianXingAnLiSelectData(params) {
    // return post('/shared/vi/dict/gDictByKey', params);
    return post('/file/dict/gDictByKey', params);
 }
+//所有下拉值
+export function gAllDictKey(params) {
+    // return post('/shared/vi/dict/gDictByKey', params);
+    return post('/file/dict/gAllDictKey', params);
+}
 // 典型案例库管理-导出
 export function exportFileDianXingAnLiSelectData(params) {
    // return download('/knowledge/vi/excel/etTc', params);
@@ -366,7 +371,40 @@ export function getComCenterServeList(params) {
 export function getComCenterServeDetail(params) {
    return post('/network/arc-aby-iy/', params);
 }
-// 资产架构表格
+// 资产架构，表格
 export function getZiChanJiaGouTable(params) {
    return post('/network/arc-ast-cn/', params);
 }
+// 资产架构编辑
+export function editZiChanJiaGouTable(params) {
+    return post('/network/arc-ast-cn/upd', params);
+}
+// 资产架构，删除，批量删除
+export function deleteMoreZiChanJiaGouTable(params) {
+    return post('/network/arc-ast-cn/delBatch', params);
+}
+// 资产架构，新增
+export function addMoreZiChanJiaGouTable(params) {
+    return post('/network/arc-ast-cn/ad', params);
+}
+// 资产架构，上级节点
+export function queryZiChanJiaGouShangJiJieDian(params) {
+    return post('/network/framework/treeForNode', params);
+}
+// 资产架构，组件类型
+export function queryZiChanJiaGouZuJianLeiXing(params) {
+    return post('/network/ele/archi-ele-list', params);
+}
+// 资产架构，组件类型选择后查询表单
+export function queryZuJianLeiXingBelongForm(params) {
+    return post('/network/ma-ml-dicy/proy-list', params);
+}
+// 资产架构，模版下载
+export function exportZhiChanJiaGou(params) {
+    return download('/network/framework/execlTemplate', params);
+}
+// 资产架构，导入
+export function importZhiChanJiaGou(params) {
+    return download('/network/framework/easyExeclImport', params);
+}
--- a/src/directive/index.js
+++ b/src/directive/index.js
@@ -32,7 +32,7 @@ export default function initDirective(vue) {
 			el.addEventListener('input', function (event) {
 				// 获取输入的值
 				const value = event.target.value;
-				console.log(value)
 				// 使用正则表达式检测特殊字（根据需要匹配相应限制字符）
 				const regex = /(?:')|(?:-- )|(\/\*(?:.|[\n\r])*?\*\/)|(\b(select|update|and|or|delete|insert|truncate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute)\b)/i;
 				// 如果输入值包含特殊字符，则替换为空格

--- a/src/router/index.js
+++ b/src/router/index.js
@@ -135,6 +135,11 @@ const routes = [
 				name: 'comCenterServeList',
 				component: () => import('@/views/comCenterServeList/index.vue'),
 			},
+			{
+				path: '/main/currentAssetsList',//现状架构资产管理
+				name: 'currentAssetsList',
+				component: () => import('@/views/current-assets-list/index.vue'),
+			},
 		]
 	}
 ]

--- a/src/views/Main/index.vue
+++ b/src/views/Main/index.vue
@@ -88,7 +88,7 @@
 							<img src="@/assets/main/3img.png" alt="">
 							<span style="margin-left: 5px;">企业中台服务清单</span>
 						</div>
-						<div class="menu_1_item_subtitle">
+						<div class="menu_1_item_subtitle" @click="jumpPage('总体架构资产设计与维护', '总体架构资产维护', '现状架构资产管理')">
 							<img src="@/assets/main/3img.png" alt="">
 							<span style="margin-left: 5px;">现状架构资产管理</span>
 						</div>
@@ -544,6 +544,10 @@
 						this.$router.push( '/main/busiAssetslist', () => {}, () => {} );
 						this.visible1 = false;
 						break;
+					case '现状架构资产管理':
+						this.$router.push( '/main/currentAssetsList', () => {}, () => {} );
+						this.visible1 = false;
+						break;
 					case '在线文档编制':
 						this.$router.push( '/main/doc-demo', () => {}, () => {} );
 						break;

--- a/src/views/archi-asset-manage/index.vue
+++ b/src/views/archi-asset-manage/index.vue
--- a/src/views/archi-ele-list/index.vue
+++ b/src/views/archi-ele-list/index.vue
@@ -191,11 +191,26 @@
 			:before-close="closeGraphDialog"
 			:close-on-click-modal="false"
 			width="60%">
-			<el-tabs type="border-card">
+			<el-tabs type="border-card" v-model="tabType" @tab-click="tabsClick">
-				<el-tab-pane label="标准图元" style="height: 400px;">
+				<el-tab-pane label="标准图元" name="标准图元" style="height: 400px;">
+					<div style="height: 400px;display: flex;align-items: center;">
+						<div style="width: 20%;height: 100%;border-left: 1px solid #ccc;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;overflow: auto;text-align: center;">
+							<div :style="{ 'cursor': 'pointer', 'padding': '4px', 'background-color': nameIndex2 == index ? 'rgb(13,134,127)' : '#fff', 'color': nameIndex2 == index ? '#fff' : '#000' }" 
+								v-for="(item, index) in standardGraph" 
+								:key="item.arciBelongId"
+								@click="showCurrentGraph2(item.arciBelongName, index)">
+								{{ item.arciBelongName }}
+							</div>
+						</div>
+						<div style="width: 80%;height: 100%;border: 1px solid #ccc;overflow: auto;text-align: left;">
+							<div :style="{ 'display': 'inline-block','margin': '10px', 'border': graphIndex2 == index ? '2px solid #0D867F' : 'none','padding': '8px', 'border-radius': '6px' }" 
+								v-for="(item, index) in standardList" :key="item.eleBelongId">
+								<img @click="clickGraph2(index)" class="tu_biao_icon" :src="item.icon" alt="" />
+							</div>
+						</div>
+					</div>
 				</el-tab-pane>
-				<el-tab-pane label="常规图元" style="height: 400px;">
+				<el-tab-pane label="常规图元" name="常规图元" style="height: 400px;">
 					<div style="height: 400px;display: flex;align-items: center;">
 						<div style="width: 20%;height: 100%;border-left: 1px solid #ccc;border-top: 1px solid #ccc;border-bottom: 1px solid #ccc;overflow: auto;text-align: center;">
 							<div :style="{ 'cursor': 'pointer', 'padding': '4px', 'background-color': nameIndex == index ? 'rgb(13,134,127)' : '#fff', 'color': nameIndex == index ? '#fff' : '#000' }" 
@@ -233,7 +248,8 @@ import {
 	add_jia_gou_yuan_su,
 	version_release_jia_gou_gui_shu,
 	edit_jia_gou_yuan_su,
-	query_jia_gou_gui_shu_belong_icon
+	query_jia_gou_gui_shu_belong_icon,
+	getDrawioLeftStandardGraph
 } from '@/api/index.js';
 import { MessageBox, Message } from 'element-ui';
 import $ from 'jquery';
@@ -245,6 +261,8 @@ export default {
 	},
 	data() {
 		return {
+			standardGraph: [],
+			standardList: [],
 			graph_dialog: false,
 			ruleForm: {
 				let1: null,
@@ -295,9 +313,12 @@ export default {
 			tableHeight: null,
 			graphList: [],
 			nameIndex: 0,
+			nameIndex2: 0,
 			graphIndex: -1,
+			graphIndex2: -1,
 			selectGraphSrc: '',
-			selectGraphShape: ''
+			selectGraphShape: '',
+			tabType: '标准图元'
 		};
 	},
 	mounted(){
@@ -311,9 +332,14 @@ export default {
 		openGraphDialog() {//打开图形选择窗口
 			this.graph_dialog = true;
 			this.showCurrentGraph(this.search_select1[0].name, 0);
+			this.queryDrawioGraph2();
+		},
+		tabsClick(data) {
+			console.log(data)
+			console.log(this.tabType)
 		},
 		save_graph() {//图形选择窗口的保存
-			if(this.graphIndex == -1) {
+			if(this.graphIndex == -1 && this.graphIndex2 == -1) {
 				Message({
 					type: 'error',
 					message: '请选择一种图形'
@@ -321,8 +347,13 @@ export default {
 				return;
 			}
 			this.graph_dialog = false;
-			this.selectGraphSrc = 'data:image/svg+xml;base64,' + this.graphList[this.graphIndex].icon;
+			if(this.tabType == '标准图元') {
-			this.selectGraphShape = this.graphList[this.graphIndex].graphName;
+				this.selectGraphSrc = this.standardList[this.graphIndex2].icon;
+				this.selectGraphShape = this.standardList[this.graphIndex2].iconName;
+			}else {
+				this.selectGraphSrc = 'data:image/svg+xml;base64,' + this.graphList[this.graphIndex].icon;
+				this.selectGraphShape = this.graphList[this.graphIndex].graphName;
+			}
 		},
 		closeGraphDialog() {//图形选择窗口的取消
@@ -330,7 +361,27 @@ export default {
 			this.nameIndex = 0;
 			this.graph_dialog = false;
 		},
-		showCurrentGraph(name, idx) {//图形选择窗口的文字点击
+		queryDrawioGraph2() {//查询画布左侧标准图形
+			getDrawioLeftStandardGraph({}).then(res => {
+				if(res.code == 200) {
+					res.data.dataEle.pop();
+					this.standardGraph = res.data.dataEle;
+					this.showCurrentGraph2(res.data.dataEle[0].arciBelongName, 0);
+				}else {
+					Message({
+						type: 'error',
+						message: res.msg
+					});
+				}
+			})
+		},
+		showCurrentGraph2(name, idx) {//标准图形选择窗口的文字点击
+			this.nameIndex2 = idx;
+			this.graphIndex2 = -1;
+			const res = this.standardGraph.find(item => item.arciBelongName == name);
+			this.standardList = res.eleDtos;
+		},
+		showCurrentGraph(name, idx) {//常规图形选择窗口的文字点击
 			this.nameIndex = idx;
 			this.graphIndex = -1;
 			const params = {
@@ -344,9 +395,12 @@ export default {
 				}
 			});
 		},
-		clickGraph(idx) {////图形选择窗口的图形点击
+		clickGraph(idx) {//常规图形选择窗口的图形点击
 			this.graphIndex = idx;
 		},
+		clickGraph2(idx) {//标准图形选择窗口的图形点击
+			this.graphIndex2 = idx;
+		},
 		set_table_height() {//动态设置表格高度
 			const table_container_height = $(".table_container").height();
 			const search_menu_height = $(".search_menu").height();
@@ -437,6 +491,12 @@ export default {
 						});
 						return;
 					}
+					let iconName;
+					if(this.tabType == '标准图元') {
+						iconName = this.selectGraphShape;
+					}else {
+						iconName = this.selectGraphShape + 'fillColor='+this.ruleForm.let6+';';
+					}
 					const params = {
 						elementName: this.ruleForm.let1,
 						archiLevelId: this.ruleForm.let2,
@@ -444,7 +504,7 @@ export default {
 						content: this.ruleForm.let4,
 						eaLevel: this.ruleForm.let5,
 						icon: this.selectGraphSrc,
-						iconName: this.selectGraphShape + 'fillColor='+this.ruleForm.let6+';',
+						iconName: iconName,
 						color: this.ruleForm.let6,
 						state: 1,
 					};
@@ -497,6 +557,12 @@ export default {
 						});
 						return;
 					}
+					let iconName;
+					if(this.tabType == '标准图元') {
+						iconName = this.selectGraphShape;
+					}else {
+						iconName = this.selectGraphShape + 'fillColor='+this.ruleForm.let6+';';
+					}
 					const params = {
 						elementName: this.ruleForm.let1,
 						archiLevelId: this.ruleForm.let2,
@@ -504,7 +570,7 @@ export default {
 						content: this.ruleForm.let4,
 						eaLevel: this.ruleForm.let5,
 						icon: this.selectGraphSrc,
-						iconName: this.selectGraphShape + 'fillColor='+this.ruleForm.let6+';',
+						iconName: iconName,
 						color: this.ruleForm.let6,
 						state: 2,
 					};

--- a/src/views/busi-assets-list/index.vue
+++ b/src/views/busi-assets-list/index.vue
--- a/src/views/current-assets-list/index.vue
+++ b/src/views/current-assets-list/index.vue
--- a/src/views/metaModelDic/pages/page1.vue
+++ b/src/views/metaModelDic/pages/page1.vue
@@ -172,7 +172,7 @@
 			:title="title2"
 			:visible.sync="add_dialog2"
 			:center="false"
-			width="40%">
+			width="50%">
 			<div class="add_dialog_content">
 				<el-form :model="formData2" :rules="rules" ref="page1Form">
 					<div class="form_item_container">
@@ -188,11 +188,28 @@
 						<el-form-item class="cross" label="长度:" prop="contentLength">
 							<el-input v-model="formData2.contentLength" maxlength="100"></el-input>
 						</el-form-item>
+						<el-form-item class="cross" label="是否可以为空:" prop="notNull">
+							<el-radio-group v-model="formData2.notNull">
+								<el-radio label="0">是</el-radio>
+								<el-radio label="1">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+						<el-form-item class="cross" label="是否显示:" prop="isShow">
+							<el-radio-group v-model="formData2.isShow">
+								<el-radio label="0">显示</el-radio>
+								<el-radio label="1">不显示</el-radio>
+							</el-radio-group>
+						</el-form-item>
 						<el-form-item class="cross" label="控件:" prop="controlType">
 							<el-select v-model="formData2.controlType" placeholder="请选择" clearable>
 								<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value"></el-option>
 							</el-select>
 						</el-form-item>
+						<el-form-item v-if="formData2.controlType == 2" class="cross" label="控件值:" prop="dictKey">
+							<el-select v-model="formData2.dictKey" placeholder="请选择" clearable>
+								<el-option v-for="(item,idnex) in controlValueSelect" :key="idnex" :label="item.name" :value="item.typeValue"></el-option>
+							</el-select>
+						</el-form-item>
 					</div>
 				</el-form>
 			</div>
@@ -217,6 +234,7 @@ import {
  getYMXZDGLProyDel,
  getYMXZDGLProyAdd,
  getYMXZDGLProyUpdate,
+  gAllDictKey
 } from "@/api/index.js";
 export default {
@@ -252,6 +270,9 @@ export default {
 				displayOrder: "",
 				contentLength: "",
 				controlType: "",
+				dictKey: "",
+				notNull: 0,
+				isShow: 0,
 			},
 			rules: {
 				fieldName: [
@@ -296,13 +317,6 @@ export default {
 					2: "设计层",
 					3: "实施层",
 				},
-				archiBelongId: {
-					3: "业务架构",
-					4: "应用架构",
-					5: "数据架构",
-					6: "技术架构",
-					7: "安全架构",
-				},
 				controlType: {
 					0: "单行文本框",
 					1: "多行文本框",
@@ -339,6 +353,7 @@ export default {
 					value: 2,
 				},
 			],
+			controlValueSelect: [],
 			columnIsShow: false,
      		editIndex: -1,    // 当前编辑行
 		};
@@ -366,7 +381,7 @@ export default {
 						this.get_dialog_select2().then(res2 => {
 							res.data.records.map(item => {
 								const result = res2.find(item2 => item2.belongId == item.archiBelongId);
-								item['archiBelongName'] = result.name;
+								item['archiBelongName'] = result ? result.name : null;
 							})
 							this.tableData = res.data.records;
 						});
@@ -511,6 +526,8 @@ export default {
 				displayOrder: "",
 				contentLength: "",
 				controlType: "",
+				notNull: 0,
+				isShow: 0,
 			};
 		},
@@ -548,7 +565,11 @@ export default {
 				});
 			})
 		},
+		queryAllKey() {//查询下拉框值
+			gAllDictKey().then(res => {
+				this.controlValueSelect = res.data;
+			})
+		},
 		// 对话表格操作
 		operateDia( type, scopeRow, index){
 			switch (type) {
@@ -560,18 +581,23 @@ export default {
 					this.$nextTick(() => {
 						this.$refs.page1Form.resetFields();
 					});
+					this.queryAllKey();
 				break;
 				// 编辑
 				case 'edit':
 					this.add_dialog2 = true;
 					this.title2 = "编辑字典属性";
 					this.formData2 = scopeRow;
+					if(scopeRow.controlType == 2) {
+						this.queryAllKey();
+					}
 				break;
 				// 保存
 				case 'save':
 					this.$refs.page1Form.validate(valid => {
 						if(valid) {
 							if (this.formData2.propertyId) {
 								let params = {
 									fieldName: this.formData2.fieldName,
 									cnName: this.formData2.cnName,
@@ -583,7 +609,11 @@ export default {
 									typeId: this.formData.typeId,
 									version: this.formData.version,
 									dicyId: this.formData.dicyId,
-									state: this.formData.state,
+									state: this.formData.state,
+									dictKey: this.formData2.dictKey,
+									notNull: this.formData2.notNull,
+									isShow: this.formData2.isShow,
 								}
 								// 编辑保存
 								getYMXZDGLProyUpdate(params).then(res => {
@@ -607,7 +637,10 @@ export default {
 									typeId: this.formData.typeId,
 									version: this.formData.version,
 									dicyId: this.formData.dicyId,
-									state: this.formData.state,
+									state: this.formData.state,
+									dictKey: this.formData2.dictKey,
+									notNull: this.formData2.notNull,
+									isShow: this.formData2.isShow,
 								}
 								// 新建保存
 								getYMXZDGLProyAdd(params).then(res => {