画布属性编辑,组织机构修改

public/drawio/extention/js/exGraph.js

@@ -74,8 +74,8 @@
 								if(res.cnName) {
 								if(res.cnName) {
 									attr_.push(
 									attr_.push(
 										{
 										{
-											name: res.cnName,
-											value: res.propertyValue,
+											cnName: res.cnName,
+											value_: res.propertyValue,
 											id: res.propertyId,
 											id: res.propertyId,
 											controlType: res.controlType,
 											controlType: res.controlType,
 											dataType: res.dataType,
 											dataType: res.dataType,
@@ -141,42 +141,54 @@
 					item.eleDtos.forEach(item2 => {
 					item.eleDtos.forEach(item2 => {
 						if(item2.assets) { //  && item2.dicys
 						if(item2.assets) { //  && item2.dicys
 							let fns = [];
 							let fns = [];
-							let attr_ = [];
-							item2.dicys && item2.dicys.forEach(res => {
-								if(res.cnName) {
-									attr_.push(
-										{
-											name: res.cnName,
-											value: res.propertyValue,
-											id: res.propertyId,
-											controlType: res.controlType,
-										}
-									)
-								}
-							})
+							// let attr_ = [];
+							// item2.dicys && item2.dicys.forEach(res => {
+							// 	if(res.cnName) {
+							// 		attr_.push(
+							// 			{
+							// 				name: res.cnName,
+							// 				value: res.propertyValue,
+							// 				id: res.propertyId,
+							// 				controlType: res.controlType,
+							// 			}
+							// 		)
+							// 	}
+							// })
 							
 							
 							item2.assets.forEach(item3 => {
 							item2.assets.forEach(item3 => {
                 let info__ = [{
                 let info__ = [{
                   name: '资产名称',
                   name: '资产名称',
-                  value: item3.assetName || ''
+                  value: item3.assetName || '',
+                  element: 'input'
                 },{
                 },{
                   name: '资产编号',
                   name: '资产编号',
-                  value: item3.assetNumber || ''
+                  value: item3.assetNumber || '',
+                  element: 'input'
                 },{
                 },{
                   name: '所属元素',
                   name: '所属元素',
-                  value: item3.eleName || ''
+                  value: item3.archiEleId || '',
+                  element: 'select'
                 },{
                 },{
                   name: '上级元素',
                   name: '上级元素',
-                  value: item3.parentElement || ''
+                  value: item3.parentElement && item3.parentElement.replace(/\]|\[|\/?]/g, '').replace('null', '') || '',
+                  element: 'select'
                 },{
                 },{
                   name: '上级资产',
                   name: '上级资产',
-                  value: item3.parentAssetName || ''
+                  value: item3.parentAssetName || '',
+                  element: 'tree'
                 }];
                 }];
+                const saveDataParams = {
+                  assetId: item3.assetId,
+                  archiBelongId: item3.archiBelongId,
+                  state: item3.state,
+                  version: item3.version,
+                  archiAssetState: item3.archiAssetState
+                }
 								// console.log(item3.fieldsValue)
 								// console.log(item3.fieldsValue)
 								fns.push(
 								fns.push(
 									this.createVertexTemplateEntry(
 									this.createVertexTemplateEntry(
                     // 'html=1;outlineConnect=0;whiteSpace=wrap;fillColor=#99ffff;shape=mxgraph.archimate3.application;appType=rightTopTriangle;archiType=rounded',
                     // 'html=1;outlineConnect=0;whiteSpace=wrap;fillColor=#99ffff;shape=mxgraph.archimate3.application;appType=rightTopTriangle;archiType=rounded',
-										item3.iconName + (item3.color ? `;fillColor=${item3.color};` : '') + 'attr=' + JSON.stringify(attr_) + ';info__=' + JSON.stringify(info__) + ';assetId=' + item3.assetId + ';archiBelongId=' + item3.archiBelongId + ';assetName=[' + item3.assetName + '];eleName=' + item2.eleName +';elementId=' + item2.elementId + ';eaLevel=' + item2.eaLevel + ';', 
+										item3.iconName + (item3.color ? `;fillColor=${item3.color};` : '') + 'attr=' + (item3.fieldsValue && item3.fieldsValue != 'null' ? item3.fieldsValue : '[]') + ';info__=' + JSON.stringify(info__) + ';assetName=[' + item3.assetName + '];eleName=' + item2.eleName +';elementId=' + item2.elementId + ';eaLevel=' + item2.eaLevel + ';' + 'saveDataParams=' + JSON.stringify(saveDataParams)+ ';', 
 										item2.shapeWidth ? item2.shapeWidth : 150, 
 										item2.shapeWidth ? item2.shapeWidth : 150, 
 										item2.shapeHeight ? item2.shapeHeight : 75, 
 										item2.shapeHeight ? item2.shapeHeight : 75, 
 										null, 
 										null, 

src/views/organizationManagement/index.vue

@@ -4,7 +4,7 @@
  * @Autor: pan
  * @Autor: pan
  * @Date: 2024-04-16 15:09:52
  * @Date: 2024-04-16 15:09:52
  * @LastEditors: pan
  * @LastEditors: pan
- * @LastEditTime: 2024-04-16 19:33:58
+ * @LastEditTime: 2024-04-19 10:02:44
 -->
 -->
 <template>
 <template>
   <div class="searchTable">
   <div class="searchTable">
@@ -176,10 +176,10 @@ export default {
     },
     },
     treeItemClick(data) {
     treeItemClick(data) {
       console.log('data', data)
       console.log('data', data)
-      if(!data.children) {
-        this.query.queryParam.parentOrgId = data.orgId
-        this.querySearch()
-      }
+      // if(!data.children) {
+      this.query.queryParam.parentOrgId = data.orgId
+      this.querySearch()
+      // }
     },
     },
     fnTopOperation(type) {
     fnTopOperation(type) {
       switch (type) {
       switch (type) {