fix: fix can not echo data source after group cell

ww
1 parent e2b7a950
Showing 2 changed files with 23 additions and 15 deletions
src/main/webapp/js/diagramly/LocalFile.js
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/diagramly/LocalFile.js
View file @66cfc26
+++ b/src/main/webapp/js/diagramly/LocalFile.js
View file @66cfc26
@@ -195,8 +195,7 @@ LocalFile.prototype.saveFile = function (title, revision, success, error, useCur
 					this.removeDraft();
 					Editor.defaultContent = savedData;
 					var configurationContentList = [];
-					const basicAttr = Sidebar.prototype.enumCellBasicAttribute
-					const allCell = (this.ui.editor.graph.getDefaultParent().children || []).filter(item => item.getAttribute(basicAttr.COMPONENT_TYPE))
+					const allCell = this.ui.editor.graph.getModel().cells || {}
 					const contentId = this.ui.currentPage.node.id
 					var configurationContent = {
 						name: "第 1 页",
@@ -204,12 +203,12 @@ LocalFile.prototype.saveFile = function (title, revision, success, error, useCur
 						contentId,
 						content: savedData,
 						type: 1,
-						nodeIds: allCell.map(item => item.id)
+						nodeIds: Object.keys(allCell)
 					};
 					configurationContentList.push(configurationContent);
 					var parmam = { configurationId: Editor.configurationId, configurationContentList };
 					defHttp.put("/yt/configuration/content", parmam).then(res => {
-						console.log(res)
+						// console.log(res)
 					})
 				}
 				catch (e) {
--- a/src/main/webapp/js/grapheditor/Format.js
View file @66cfc26
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @66cfc26
@@ -6164,6 +6164,11 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          */
         let orgId = null
+        const recordData = {
+            orgId: null,
+            enabled: false
+        }
+
         const getRowFilter = (rowNumber) => `${enumActionEl.ROW_FILTER}${rowNumber}`
         /**
@@ -6208,8 +6213,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 创建回显数据 查询出所有网关设备和直连设备
          */
         async function getAllGatewayDeviceAndConnectionDevice() {
-            if (!orgId) return
-            const [err, res] = await to(ConfigurationNodeApi.getAllGatewayDeviceAndConnectionDevice(orgId))
+            if (!recordData.orgId) return
+            const [err, res] = await to(ConfigurationNodeApi.getAllGatewayDeviceAndConnectionDevice(recordData.orgId))
             allDeviceOptions = res
             mountAllDeviceToSelect()
         }
@@ -6259,7 +6264,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     data: treeList,
                     onlyIconControl: true,
                     click(node) {
-                        orgId = node.data.id
+                        recordData.orgId = node.data.id
                         getAllGatewayDeviceAndConnectionDevice()
                     },
                 },
@@ -6369,7 +6374,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 回显表单数据
          */
         function echoFormData(info) {
-            const { content: { data = [] } = {}, orgId } = info
+            const { content: { data = [] } = {} } = info
             data.forEach((datum, index) => {
                 addRecord(datum)
                 form.val(getRowFilter(index), datum)
@@ -6380,9 +6385,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 回显组织树
          */
         function echoOrgTree(id) {
-            orgId = id
+            recordData.orgId = id
             const node = UseLayUi.findTreeObjectByField(treeList, id)
-            UseLayUi.nextTick(() => $(`#${enumActionEl.ORG_EL} input[name="${enumConst.ORG_ID}"]`).val(orgId).parent().find('span').html(node?.name))
+            UseLayUi.nextTick(() => $(`#${enumActionEl.ORG_EL} input[name="${enumConst.ORG_ID}"]`).val(recordData.orgId).parent().find('span').html(node?.name))
         }
         /**
@@ -6426,6 +6431,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             return validateFlag
         }
+
+
         /**
          * @description 保存
          */
@@ -6433,8 +6440,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             const data = Array.from({ length: addRowNumber }).map((_, row) => form.val(getRowFilter(row))).filter(item => Object.keys(item).length)
             if (!validate(data)) return
             const formModal = {
+                ...recordData,
                 configurationId,
-                orgId,
+                // orgId,
                 contentId: currentPageId.id,
                 id: graphId,
                 content: {
@@ -6525,8 +6533,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     })
                     createOrgTreeSelect()
                     const info = getLayerBindInfo('event', type)
-                    const { content: { data = [] } = {}, orgId: recordOrgId } = info
-                    orgId = recordOrgId
+                    const { content: { data = [] } = {}, orgId, enabled } = info
+                    Object.assign(recordData, { orgId, enabled })
                     await getAllGatewayDeviceAndConnectionDevice()
                     if (!info || !data.length) {
                         addRecord()
@@ -6535,7 +6543,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     }
                     generatorEventListen()
                     form.render()
-                    echoOrgTree(recordOrgId)
+                    echoOrgTree(orgId)
                 },
             })
         }
@@ -11570,7 +11578,7 @@ class UseLayUi {
     static createTreeSelect(options) {
         const CLASS_NAME = 'things-kit-tree-select'
         const SELECT_CLS = 'things-kit-tree-select__tree'
-        const { tree, jquery: $ } = layui
+        const { tree, jquery: $, form } = layui
         const {
             layFilter,
@@ -11670,6 +11678,7 @@ class UseLayUi {
                     onReady(setValue)
                 }
             })
+            form.render()
         }
         mount()