Merge branch 'main_dev' into 'main'

Main dev

See merge request yunteng/thingskit-scada!265

+FROM nginx:latest
+
+COPY ./dist/ /usr/share/nginx/html/
+COPY default.conf /etc/nginx/conf.d/default.conf
+
+EXPOSE  8083

+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  192.168.1.48;
+    #charset koi8-r;
+    #access_log  /var/log/nginx/host.access.log  main;
+   
+	root    /usr/share/nginx/html; 
+	index  index.html index.htm;
+	try_files $uri $uri/ /index.html;
+    
+
+	
+	location /api/ {
+		proxy_pass http://192.168.1.48:8080;
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection "Upgrade";
+		proxy_set_header Host $host;
+		proxy_cache_bypass $http_upgrade;
+	}
+	
+	location /yt/ {
+		proxy_pass http://192.168.1.48:8080;
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection "Upgrade";
+		proxy_set_header Host $host;
+		proxy_cache_bypass $http_upgrade;
+	}
+	
+	location /upload/ {
+		proxy_pass http://192.168.1.48:8080;
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection "Upgrade";
+		proxy_set_header Host $host;
+		proxy_cache_bypass $http_upgrade;
+	}
+	
+	#error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}
\ No newline at end of file

@@ -4296,8 +4296,13 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
     document.getElementById('first-text-animation-text').querySelector('text').innerHTML = platformInfo?.name || window.PROJECT_ENV?.shortName
     document.getElementById('first-text-animation').style.display = 'block'
     if (this.appIcon) {
-      this.appIcon.style.backgroundImage = `url(${platformInfo?.logo || `${getProxyPrefix()}/logo.png`})`
+      this.appIcon.style.backgroundImage = `url(${this.getAppIcon()})`
     }
+    
+    const favicon = this.getAppFavicon()
+    const faviconEl = document.querySelector('link[rel~="icon"]')
+    faviconEl.href = favicon
+
     const handleLoadContent = async () => {
       /**
        * @typedef ConfigurationContentListItemType
@@ -5672,16 +5677,36 @@ App.prototype.save = function (name, done) {
             // const data = `${Graph.xmlDeclaration}\n${this.getFileData(true, null, null, null, true, true, null, null, null, false)}`;
             // this.currentFile.setData(data)
 
-            const allCells = this.editor.graph.getModel().cells || {}
+            const graph = this.editor.graph
+            const model = graph.model
+            const pages = this.pages
+
+            const currentPageContentId = this.ui.currentPage.getId()
+            let originalPage
+            const contentPageInfos = pages.map(page => {
+              this.ui.selectPage(page)
+              const cells = model.getChildCells(graph.getDefaultParent())
+              const nodeIds = cells.map(cell => cell.getId())
+              const contentId = this.ui.currentPage.getId()
+
+              if (contentId === currentPageContentId)
+                originalPage = page
+
+              return {
+                nodeIds,
+                contentId
+              }
+            })
+            originalPage && this.ui.selectPage(originalPage)
+
             await doSaveConfigurationContent({
               configurationContentList: [
                 {
                   id: currentFile.getHash(),
                   content: this.currentFile.getData(),
-                  contentId: this.currentPage.getId(),
                   type: 1,
-                  nodeIds: Object.keys(allCells),
-                  name: this.currentPage.getName()
+                  name: this.currentPage.getName(),
+                  contentPageInfos
                 }
               ],
               configurationName: currentFile.title,
@@ -6192,20 +6217,51 @@ App.prototype.convertFile = function (url, filename, mimeType, extension, succes
   }
 }
 
+App.prototype.isFromEdge = function () {
+  const params = useParseParams()
+  return params?.from === 'edge'
+}
+
+App.prototype.getAppIcon = function () {
+  const platformInfo = getPlatformInfo()
+
+  if (this.isFromEdge()) {
+    if (platformInfo && platformInfo?.image) {
+      return platformInfo?.image
+    }
+    return Editor.edgeLogoImage
+  } else {
+    if (platformInfo && platformInfo?.logo) {
+      return platformInfo.logo
+    }
+
+    return Editor.logoImage
+  }
+}
+
+App.prototype.getAppFavicon = function () {
+  const platformInfo = getPlatformInfo()
+  if (this.isFromEdge()) {
+    if (platformInfo && platformInfo?.favicon) {
+      return platformInfo?.favicon
+    }
+    return Editor.edgeLogoImage
+  } else {
+    if (platformInfo && platformInfo?.icon) {
+      return platformInfo.icon
+    }
+    return Editor.logoImage
+  }
+}
+
 /**
  * Adds the listener for automatically saving the diagram for local changes.
  */
 App.prototype.updateHeader = function () {
   if (this.menubar != null) {
     // TODO Thingskit 修改logo
-    Editor.logoImage = ''
-    const platformInfo = getPlatformInfo()
-    if (platformInfo && platformInfo?.logo) {
-      const { logo } = platformInfo
-      Editor.logoImage = logo
-    }
 
-    const logo = `url(${Editor.logoImage})`
+    const logo = `url(${this.getAppIcon()})`
     this.appIcon = document.createElement('a')
     this.appIcon.style.display = 'block'
     this.appIcon.style.position = 'absolute'

@@ -1554,6 +1554,7 @@ var BackgroundImageDialog = function (editorUi, applyFn, img, color, showColor)
 	widthInput.style.marginLeft = '8px';
 	widthInput.style.marginRight = '16px';
 	widthInput.value = (img != null && !isPageLink) ? img.width : '';
+	widthInput.setAttribute('disabled', true)
 
 	div.appendChild(widthInput);
 
@@ -1565,6 +1566,7 @@ var BackgroundImageDialog = function (editorUi, applyFn, img, color, showColor)
 	heightInput.style.marginLeft = '8px';
 	heightInput.style.marginRight = '16px';
 	heightInput.value = (img != null && !isPageLink) ? img.height : '';
+	heightInput.setAttribute('disabled', true)
 
 	div.appendChild(heightInput);
 	mxUtils.br(div);

@@ -140,7 +140,9 @@
 	/**
 	 * 
 	 */
-	Editor.logoImage = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIKICAgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzA2LjE4NSAxMjAuMjk2IgogICB2aWV3Qm94PSIyNCAyNiA2OCA2OCIKICAgeT0iMHB4IgogICB4PSIwcHgiCiAgIHZlcnNpb249IjEuMSI+CiAgIAkgPGc+PGxpbmUKICAgICAgIHkyPSI3Mi4zOTQiCiAgICAgICB4Mj0iNDEuMDYxIgogICAgICAgeTE9IjQzLjM4NCIKICAgICAgIHgxPSI1OC4wNjkiCiAgICAgICBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiCiAgICAgICBzdHJva2Utd2lkdGg9IjMuNTUyOCIKICAgICAgIHN0cm9rZT0iI0ZGRkZGRiIKICAgICAgIGZpbGw9Im5vbmUiIC8+PGxpbmUKICAgICAgIHkyPSI3Mi4zOTQiCiAgICAgICB4Mj0iNzUuMDc2IgogICAgICAgeTE9IjQzLjM4NCIKICAgICAgIHgxPSI1OC4wNjgiCiAgICAgICBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiCiAgICAgICBzdHJva2Utd2lkdGg9IjMuNTAwOCIKICAgICAgIHN0cm9rZT0iI0ZGRkZGRiIKICAgICAgIGZpbGw9Im5vbmUiIC8+PGc+PHBhdGgKICAgICAgICAgZD0iTTUyLjc3Myw3Ny4wODRjMCwxLjk1NC0xLjU5OSwzLjU1My0zLjU1MywzLjU1M0gzNi45OTljLTEuOTU0LDAtMy41NTMtMS41OTktMy41NTMtMy41NTN2LTkuMzc5ICAgIGMwLTEuOTU0LDEuNTk5LTMuNTUzLDMuNTUzLTMuNTUzaDEyLjIyMmMxLjk1NCwwLDMuNTUzLDEuNTk5LDMuNTUzLDMuNTUzVjc3LjA4NHoiCiAgICAgICAgIGZpbGw9IiNGRkZGRkYiIC8+PC9nPjxnCiAgICAgICBpZD0iZzM0MTkiPjxwYXRoCiAgICAgICAgIGQ9Ik02Ny43NjIsNDguMDc0YzAsMS45NTQtMS41OTksMy41NTMtMy41NTMsMy41NTNINTEuOTg4Yy0xLjk1NCwwLTMuNTUzLTEuNTk5LTMuNTUzLTMuNTUzdi05LjM3OSAgICBjMC0xLjk1NCwxLjU5OS0zLjU1MywzLjU1My0zLjU1M0g2NC4yMWMxLjk1NCwwLDMuNTUzLDEuNTk5LDMuNTUzLDMuNTUzVjQ4LjA3NHoiCiAgICAgICAgIGZpbGw9IiNGRkZGRkYiIC8+PC9nPjxnPjxwYXRoCiAgICAgICAgIGQ9Ik04Mi43NTIsNzcuMDg0YzAsMS45NTQtMS41OTksMy41NTMtMy41NTMsMy41NTNINjYuOTc3Yy0xLjk1NCwwLTMuNTUzLTEuNTk5LTMuNTUzLTMuNTUzdi05LjM3OSAgICBjMC0xLjk1NCwxLjU5OS0zLjU1MywzLjU1My0zLjU1M2gxMi4yMjJjMS45NTQsMCwzLjU1MywxLjU5OSwzLjU1MywzLjU1M1Y3Ny4wODR6IgogICAgICAgICBmaWxsPSIjRkZGRkZGIiAvPjwvZz48L2c+PC9zdmc+';
+	// Editor.logoImage = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIKICAgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzA2LjE4NSAxMjAuMjk2IgogICB2aWV3Qm94PSIyNCAyNiA2OCA2OCIKICAgeT0iMHB4IgogICB4PSIwcHgiCiAgIHZlcnNpb249IjEuMSI+CiAgIAkgPGc+PGxpbmUKICAgICAgIHkyPSI3Mi4zOTQiCiAgICAgICB4Mj0iNDEuMDYxIgogICAgICAgeTE9IjQzLjM4NCIKICAgICAgIHgxPSI1OC4wNjkiCiAgICAgICBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiCiAgICAgICBzdHJva2Utd2lkdGg9IjMuNTUyOCIKICAgICAgIHN0cm9rZT0iI0ZGRkZGRiIKICAgICAgIGZpbGw9Im5vbmUiIC8+PGxpbmUKICAgICAgIHkyPSI3Mi4zOTQiCiAgICAgICB4Mj0iNzUuMDc2IgogICAgICAgeTE9IjQzLjM4NCIKICAgICAgIHgxPSI1OC4wNjgiCiAgICAgICBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiCiAgICAgICBzdHJva2Utd2lkdGg9IjMuNTAwOCIKICAgICAgIHN0cm9rZT0iI0ZGRkZGRiIKICAgICAgIGZpbGw9Im5vbmUiIC8+PGc+PHBhdGgKICAgICAgICAgZD0iTTUyLjc3Myw3Ny4wODRjMCwxLjk1NC0xLjU5OSwzLjU1My0zLjU1MywzLjU1M0gzNi45OTljLTEuOTU0LDAtMy41NTMtMS41OTktMy41NTMtMy41NTN2LTkuMzc5ICAgIGMwLTEuOTU0LDEuNTk5LTMuNTUzLDMuNTUzLTMuNTUzaDEyLjIyMmMxLjk1NCwwLDMuNTUzLDEuNTk5LDMuNTUzLDMuNTUzVjc3LjA4NHoiCiAgICAgICAgIGZpbGw9IiNGRkZGRkYiIC8+PC9nPjxnCiAgICAgICBpZD0iZzM0MTkiPjxwYXRoCiAgICAgICAgIGQ9Ik02Ny43NjIsNDguMDc0YzAsMS45NTQtMS41OTksMy41NTMtMy41NTMsMy41NTNINTEuOTg4Yy0xLjk1NCwwLTMuNTUzLTEuNTk5LTMuNTUzLTMuNTUzdi05LjM3OSAgICBjMC0xLjk1NCwxLjU5OS0zLjU1MywzLjU1My0zLjU1M0g2NC4yMWMxLjk1NCwwLDMuNTUzLDEuNTk5LDMuNTUzLDMuNTUzVjQ4LjA3NHoiCiAgICAgICAgIGZpbGw9IiNGRkZGRkYiIC8+PC9nPjxnPjxwYXRoCiAgICAgICAgIGQ9Ik04Mi43NTIsNzcuMDg0YzAsMS45NTQtMS41OTksMy41NTMtMy41NTMsMy41NTNINjYuOTc3Yy0xLjk1NCwwLTMuNTUzLTEuNTk5LTMuNTUzLTMuNTUzdi05LjM3OSAgICBjMC0xLjk1NCwxLjU5OS0zLjU1MywzLjU1My0zLjU1M2gxMi4yMjJjMS45NTQsMCwzLjU1MywxLjU5OSwzLjU1MywzLjU1M1Y3Ny4wODR6IgogICAgICAgICBmaWxsPSIjRkZGRkZGIiAvPjwvZz48L2c+PC9zdmc+';
+	Editor.logoImage = 'data:image/png;base64,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';
+	Editor.edgeLogoImage = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMjZweCIgaGVpZ2h0PSIyNnB4IiB2aWV3Qm94PSIwIDAgMjYgMjYiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgICA8dGl0bGU+TG9nby1jZTE8L3RpdGxlPgogICAgPGRlZnM+CiAgICAgICAgPHBvbHlnb24gaWQ9InBhdGgtMSIgcG9pbnRzPSIwIDAgMjYgMCAyNiAyNiAwIDI2Ij48L3BvbHlnb24+CiAgICAgICAgPGxpbmVhckdyYWRpZW50IHgxPSI1MCUiIHkxPSIxMDAlIiB4Mj0iNTAlIiB5Mj0iMCUiIGlkPSJsaW5lYXJHcmFkaWVudC0zIj4KICAgICAgICAgICAgPHN0b3Agc3RvcC1jb2xvcj0iIzdGNTZEOSIgb2Zmc2V0PSIzNS4yMzgwMDA4JSI+PC9zdG9wPgogICAgICAgICAgICA8c3RvcCBzdG9wLWNvbG9yPSIjRTk2OUZGIiBvZmZzZXQ9IjgwLjIzODAwMjUlIj48L3N0b3A+CiAgICAgICAgPC9saW5lYXJHcmFkaWVudD4KICAgICAgICA8cG9seWdvbiBpZD0icGF0aC00IiBwb2ludHM9IjAgMCAzLjI1IDAgMy4yNSAzLjI1IDAgMy4yNSI+PC9wb2x5Z29uPgogICAgPC9kZWZzPgogICAgPGcgaWQ9IkFJb1RlZGdlIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4KICAgICAgICA8ZyBpZD0iTWVkaXVtIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMTgsIC0yNCkiPgogICAgICAgICAgICA8ZyBpZD0i6aaW6aG1LS0tMSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCwgLTUpIj4KICAgICAgICAgICAgICAgIDxnIGlkPSLnu4QtMTEyNDEiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDE4LCAyNikiPgogICAgICAgICAgICAgICAgICAgIDxnIGlkPSJMb2dvLWNlMSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCwgMykiPgogICAgICAgICAgICAgICAgICAgICAgICA8cmVjdCBpZD0i6Lev5b6EIiB4PSIwIiB5PSIwIiB3aWR0aD0iMjYiIGhlaWdodD0iMjYiPjwvcmVjdD4KICAgICAgICAgICAgICAgICAgICAgICAgPG1hc2sgaWQ9Im1hc2stMiIgZmlsbD0id2hpdGUiPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPHVzZSB4bGluazpocmVmPSIjcGF0aC0xIj48L3VzZT4KICAgICAgICAgICAgICAgICAgICAgICAgPC9tYXNrPgogICAgICAgICAgICAgICAgICAgICAgICA8dXNlIGlkPSLot6/lvoQiIGZpbGwtb3BhY2l0eT0iMCIgZmlsbD0iIzAwMDAwMCIgeGxpbms6aHJlZj0iI3BhdGgtMSI+PC91c2U+CiAgICAgICAgICAgICAgICAgICAgICAgIDxnIGlkPSLnu4QtMTEwODIiIG1hc2s9InVybCgjbWFzay0yKSIgZmlsbD0idXJsKCNsaW5lYXJHcmFkaWVudC0zKSI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwLCAxLjc3MjkpIiBpZD0i6Lev5b6ELTEwMTIzIj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cGF0aCBkPSJNMCwyMi40NTQzIEw0LjcyNzI1LDIyLjQ1NDMgTDEzLDguMjcyNTggTDIxLjI3MjcsMjIuNDU0MyBMMjUuOTk5OSwyMi40NTQzIEwxMywwIEwwLDIyLjQ1NDMgWiBNMTAuMjQyOCwyMi40NTQzIEwxMywxNy43MjcyIEwxNS43NTcxLDIyLjQ1NDMgTDIwLjUyNTgsMjIuNDU0MyBMMTMsOS40NTQzNSBMNS40NzQxNywyMi40NTQzIEwxMC4yNDI4LDIyLjQ1NDMgWiI+PC9wYXRoPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9nPgogICAgICAgICAgICAgICAgICAgICAgICA8L2c+CiAgICAgICAgICAgICAgICAgICAgICAgIDxnIGlkPSLnu4QtMTEwODQiIG1hc2s9InVybCgjbWFzay0yKSI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSgxMS4zNzUsIDEzLjQ4NzUpIj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8cmVjdCBpZD0i6Lev5b6EIiBzdHJva2U9Im5vbmUiIGZpbGw9Im5vbmUiIHg9IjAiIHk9IjAiIHdpZHRoPSIzLjI1IiBoZWlnaHQ9IjMuMjUiPjwvcmVjdD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bWFzayBpZD0ibWFzay01IiBmaWxsPSJ3aGl0ZSI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDx1c2UgeGxpbms6aHJlZj0iI3BhdGgtNCI+PC91c2U+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9tYXNrPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDx1c2UgaWQ9Iui3r+W+hCIgc3Ryb2tlPSJub25lIiBmaWxsLW9wYWNpdHk9IjAiIGZpbGw9IiMwMDAwMDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIgeGxpbms6aHJlZj0iI3BhdGgtNCI+PC91c2U+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGcgaWQ9Iue7hC0xMTA4MyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgbWFzaz0idXJsKCNtYXNrLTUpIj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMC42NzcsIDAuMTM1NSkiIGZpbGw9IiNGRkZGRkYiIGlkPSLot6/lvoQtMTAxMjQiPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTAuNDA2Mjc4NDE4LDEuMjUzMTcgTDAuNDA2Mjc4NDE4LDAuNTQxMzgyIEMwLjQwNjI3ODQxOCwwLjI0MjQzMiAwLjY0ODgwMTQxOCwwIDAuOTQ3OTY1NDE4LDAgQzEuMjQ3MTI3NDIsMCAxLjQ4OTY0NzQyLDAuMjQyNDMyIDEuNDg5NjQ3NDIsMC41NDEzODIgTDEuNDg5NjQ3NDIsMS4yNTMxNyBDMS45NTU1OTc0MiwxLjU3NzUxIDIuMDMzNzE3NDIsMi4yMzU5NiAxLjY1NjYxNzQyLDIuNjYwNzcgQzEuMjc5NTM3NDIsMy4wODUyMSAwLjYxNjM5MTQxOCwzLjA4NTIxIDAuMjM5MzE2NDE4LDIuNjYwNzcgQy0wLjEzNzc4OTU4MiwyLjIzNTk2IC0wLjA1OTY2NDQ4MTksMS41Nzc1MSAwLjQwNjI3ODQxOCwxLjI1MzE3IFogTTAuODEyNTI4NDE4LDEuNTA2NzEgQzAuNTQ5MTAwNDE4LDEuNTc1MiAwLjM3NzYyMjQxOCwxLjgyOTEgMC40MTE5NTQ0MTgsMi4wOTkxMiBDMC40NDYyMjU0MTgsMi4zNjkyNiAwLjY3NTY4NzQxOCwyLjU3MjAyIDAuOTQ3OTY1NDE4LDIuNTcyNjMwNTEgQzEuMjIwOTQ3NDIsMi41NzMgMS40NTE0NDc0MiwyLjM3MDI0IDEuNDg1ODM3NDIsMi4wOTk0OSBDMS41MjAyNTc0MiwxLjgyODM3IDEuMzQ3NzQ3NDIsMS41NzQ1OCAxLjA4MzM5NzQyLDEuNTA2NzEgTDEuMDgzMzk3NDIsMC41NDEzODIgTDAuODEyNTI4NDE4LDAuNTQxMzgyIEwwLjgxMjUyODQxOCwxLjUwNjcxIFoiPjwvcGF0aD4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9nPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgICAgICAgICAgICAgPC9nPgogICAgICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+';
 	Editor.saveImage = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0iYmxhY2siIHdpZHRoPSIxOHB4IiBoZWlnaHQ9IjE4cHgiPjxwYXRoIGQ9Ik0wIDBoMjR2MjRIMHoiIGZpbGw9Im5vbmUiLz48cGF0aCBkPSJNMTkgMTJ2N0g1di03SDN2N2MwIDEuMS45IDIgMiAyaDE0YzEuMSAwIDItLjkgMi0ydi03aC0yem0tNiAuNjdsMi41OS0yLjU4TDE3IDExLjVsLTUgNS01LTUgMS40MS0xLjQxTDExIDEyLjY3VjNoMnoiLz48L3N2Zz4=';
 	Editor.globeImage = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0Ij48cGF0aCBkPSJNMTEuOTkgMkM2LjQ3IDIgMiA2LjQ4IDIgMTJzNC40NyAxMCA5Ljk5IDEwQzE3LjUyIDIyIDIyIDE3LjUyIDIyIDEyUzE3LjUyIDIgMTEuOTkgMnptNi45MyA2aC0yLjk1Yy0uMzItMS4yNS0uNzgtMi40NS0xLjM4LTMuNTYgMS44NC42MyAzLjM3IDEuOTEgNC4zMyAzLjU2ek0xMiA0LjA0Yy44MyAxLjIgMS40OCAyLjUzIDEuOTEgMy45NmgtMy44MmMuNDMtMS40MyAxLjA4LTIuNzYgMS45MS0zLjk2ek00LjI2IDE0QzQuMSAxMy4zNiA0IDEyLjY5IDQgMTJzLjEtMS4zNi4yNi0yaDMuMzhjLS4wOC42Ni0uMTQgMS4zMi0uMTQgMiAwIC42OC4wNiAxLjM0LjE0IDJINC4yNnptLjgyIDJoMi45NWMuMzIgMS4yNS43OCAyLjQ1IDEuMzggMy41Ni0xLjg0LS42My0zLjM3LTEuOS00LjMzLTMuNTZ6bTIuOTUtOEg1LjA4Yy45Ni0xLjY2IDIuNDktMi45MyA0LjMzLTMuNTZDOC44MSA1LjU1IDguMzUgNi43NSA4LjAzIDh6TTEyIDE5Ljk2Yy0uODMtMS4yLTEuNDgtMi41My0xLjkxLTMuOTZoMy44MmMtLjQzIDEuNDMtMS4wOCAyLjc2LTEuOTEgMy45NnpNMTQuMzQgMTRIOS42NmMtLjA5LS42Ni0uMTYtMS4zMi0uMTYtMiAwLS42OC4wNy0xLjM1LjE2LTJoNC42OGMuMDkuNjUuMTYgMS4zMi4xNiAyIDAgLjY4LS4wNyAxLjM0LS4xNiAyem0uMjUgNS41NmMuNi0xLjExIDEuMDYtMi4zMSAxLjM4LTMuNTZoMi45NWMtLjk2IDEuNjUtMi40OSAyLjkzLTQuMzMgMy41NnpNMTYuMzYgMTRjLjA4LS42Ni4xNC0xLjMyLjE0LTIgMC0uNjgtLjA2LTEuMzQtLjE0LTJoMy4zOGMuMTYuNjQuMjYgMS4zMS4yNiAycy0uMSAxLjM2LS4yNiAyaC0zLjM4eiIvPjwvc3ZnPg==';
 	Editor.commentImage = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0Ij48cGF0aCBkPSJNMjEuOTkgNGMwLTEuMS0uODktMi0xLjk5LTJINGMtMS4xIDAtMiAuOS0yIDJ2MTJjMCAxLjEuOSAyIDIgMmgxNGw0IDQtLjAxLTE4ek0xOCAxNEg2di0yaDEydjJ6bTAtM0g2VjloMTJ2MnptMC0zSDZWNmgxMnYyeiIvPjxwYXRoIGQ9Ik0wIDBoMjR2MjRIMHoiIGZpbGw9Im5vbmUiLz48L3N2Zz4=';

@@ -167,26 +167,36 @@ LocalFile.prototype.saveFile = function (title, revision, success, error, useCur
 		const handleSaveContent = async () => {
 			const { doSaveConfigurationContent, configurationId } = useContentData()
 			try {
-				const allCells = this.ui.editor.graph.getModel().cells || {}
-				// const allCells = this.shadowPages
-				// 	.map(item => {
-				// 		console.log(item)
-				// 		return this.ui.editor.graph.createCellLookup([item.root])
-				// 	})
-				// 	.map(obj => Object.values(obj))
-				// 	.reduce((prev, next) => [...prev, ...next], [])
- 
+				const graph = this.ui.editor.graph
+				const model = graph.model
+				const pages = this.ui.pages
+
+				const currentPageContentId = this.ui.currentPage.getId()
+				let originalPage
+				const contentPageInfos = pages.map(page => {
+					this.ui.selectPage(page)
+					const cells = model.getChildCells(graph.getDefaultParent())
+					const nodeIds = cells.map(cell => cell.getId())
+					const contentId = this.ui.currentPage.getId()
+
+					if (contentId === currentPageContentId)
+						originalPage = page
+
+					return {
+						nodeIds,
+						contentId
+					}
+				})
+				originalPage && this.ui.selectPage(originalPage)
+
 				await doSaveConfigurationContent({
 					configurationContentList: [
 						{
 							id: this.ui.configurationContentId,
 							content: savedData,
-							// contentId: this.ui.configurationContentId,
-							contentId: this.ui.currentPage.getId(),
 							type: 1,
-							// nodeIds: Array.from(new Set(allCells)),
-							nodeIds: Object.keys(allCells),
-							name: this.ui.currentPage.getName()
+							name: this.ui.currentPage.getName(),
+							contentPageInfos
 						}
 					],
 					configurationName: this.ui.currentFile.title,

@@ -1309,7 +1309,7 @@ operationPassword=操作密码
 dataSource=数据源
 dataInteraction=数据交互
 display=显示
-actHidden=隐藏
+acrHidden=隐藏
 flow=流动
 stop=停止
 actOpen=开启

@@ -165,7 +165,15 @@ function getProxyPrefix() {
   return window.urlParams.isProxyMode ? window.urlParams.proxyPrefix : ''
 }
 
-const drawioConfig = JSON.parse(localStorage.getItem('.drawio-config') || null)
+const drawioConfig = (
+  () => {
+    try {
+      return JSON.parse(localStorage.getItem('.drawio-config') || null)
+    } catch {
+      return {}
+    }
+  }
+)()
 
 const localLang = drawioConfig?.language
 

@@ -13,7 +13,7 @@ enum Api {
   GET_DEVICE_BY_DEVICE_PROFILED_IDS = '/device/getListByDeviceProfileIds',
   GET_THINGS_MODEL_SERVICES = '/things_model/get_services/',
 
-  RPC_COMMAND = '/rpc/',
+  RPC_COMMAND = '/rpc',
   GET_DEVICE_ACTIVE = '/plugins/telemetry/DEVICE/',
   RPC_ONEWAY = '/rpc/oneway',
   RPC_TWOWAY = '/rpc/twoway',

@@ -25,28 +25,28 @@ export const doSaveNodeAllData = (data: SaveNodeDataParamsType) => {
 }
 
 export const doSaveNodeAct = (params: SaveNodeActParamsType) => {
-  const { configurationId, contentId, id, data } = params
+  const { configurationId, contentId, configurationNodeId, data } = params
   return defHttp.post({
     url: Api.SAVE_NODE_ACT,
-    params: { configurationId, contentId, id },
+    params: { configurationId, contentId, configurationNodeId },
     data,
   })
 }
 
 export const doSaveNodeDataSource = (params: SaveNodeDataSourceParamsType) => {
-  const { configurationId, contentId, id, data } = params
+  const { configurationId, contentId, configurationNodeId, data } = params
   return defHttp.post({
     url: Api.SAVE_NODE_DATASOURCE,
-    params: { configurationId, contentId, id },
+    params: { configurationId, contentId, configurationNodeId },
     data,
   })
 }
 
 export const doSaveNodeEvent = (params: SaveNodeEventParamsType) => {
-  const { configurationId, contentId, id, data } = params
+  const { configurationId, contentId, configurationNodeId, data } = params
   return defHttp.post({
     url: Api.SAVE_NODE_EVENT,
-    params: { configurationId, contentId, id },
+    params: { configurationId, contentId, configurationNodeId },
     data,
   })
 }

@@ -11,9 +11,10 @@ export enum DeleteNodeDataTypeEnum {
 }
 
 export interface BasicNodeBindType {
-  id: string
   contentId: string
+  configurationNodeId: string
   configurationId: string
+  id?: string
 }
 
 export interface SaveNodeDataParamsType extends BasicNodeBindType {
@@ -45,6 +46,7 @@ export interface NodeDataBasicType {
   enabled: boolean
   tenantId: string
   configurationId: string
+  configurationNodeId: string
   contentId: string
 }
 

 <script lang="ts" setup>
 import { Button } from 'ant-design-vue'
 import { basicProps } from '../props'
+import { useTranslation } from '@/hooks/useTranslation'
 defineProps(basicProps)
 const emit = defineEmits(['ok', 'cancel'])
+
+const { t } = useTranslation()
 function handleOk(e: Event) {
   emit('ok', e)
 }
@@ -16,17 +19,11 @@ function handleCancel(e: Event) {
   <div>
     <slot name="insertFooter" />
     <Button v-if="showCancelBtn" v-bind="cancelButtonProps" @click="handleCancel">
-      {{ cancelText }}
+      {{ cancelText || t('cancel') }}
     </Button>
     <slot name="centerFooter" />
-    <Button
-      v-if="showOkBtn"
-      :type="okType"
-      :loading="confirmLoading"
-      v-bind="okButtonProps"
-      @click="handleOk"
-    >
-      {{ okText }}
+    <Button v-if="showOkBtn" :type="okType" :loading="confirmLoading" v-bind="okButtonProps" @click="handleOk">
+      {{ okText || t('ok') }}
     </Button>
     <slot name="appendFooter" />
   </div>

@@ -3,9 +3,7 @@ import type { ButtonProps } from 'ant-design-vue/es/button/buttonTypes'
 import type { ButtonType } from 'ant-design-vue/lib/button'
 import type { VueNode } from 'ant-design-vue/es/_util/type'
 import type { ModalWrapperProps } from './typing'
-import { useTranslation } from '@/hooks/useTranslation'
 
-const { t } = useTranslation()
 export const modalProps = {
   open: { type: Boolean },
   scrollTop: { type: Boolean, default: true },
@@ -14,8 +12,8 @@ export const modalProps = {
   // open drag
   draggable: { type: Boolean, default: true },
   centered: { type: Boolean },
-  cancelText: { type: String, default: t('cancel') },
-  okText: { type: String, default: t('ok') },
+  cancelText: { type: String },
+  okText: { type: String },
 
   closeFunc: Function as PropType<() => Promise<boolean>>,
 }

 <script setup lang="ts">
 import { ref, unref } from 'vue'
 import type { ComponentExposeType } from '../../..'
+import { usePublicFormContext } from '../../../usePublicFormContext'
 import ImageSettingTable from './ImageSettingTable.vue'
 import { formSchemas } from './config'
 import { BasicForm, useForm } from '@/components/Form'
 import { FormLayoutEnum } from '@/components/Form/src/enum'
 import type { RangeItemType, VariableImageActDataType } from '@/api/node/model'
+import { NodeUtils } from '@/hooks/business/useNodeUtils'
+import type { ImageSelectorDataType } from '@/core/Library/components/ImageSelector'
+import { CellAttributeKeyEnum } from '@/enums/cellAttributeEnum'
 
 const imageSettingTableElRef = ref<InstanceType<typeof ImageSettingTable>>()
 
+const { getCellInfo } = usePublicFormContext()
+
+const nodeUtils = new NodeUtils()
+
 const [register, formActionType] = useForm({
   schemas: formSchemas,
   showActionButtonGroup: false,
@@ -16,6 +24,17 @@ const [register, formActionType] = useForm({
   baseColProps: { span: 12 },
 })
 
+function savaDefaultImageToNodeAttribute(defaultImages: ImageSelectorDataType) {
+  const node = nodeUtils.getCellById(unref(getCellInfo).id)
+
+  if (!node)
+    return
+
+  node.setAttribute(CellAttributeKeyEnum.DEFAULT_IMAGE, JSON.stringify(defaultImages))
+
+  nodeUtils.refreshCell(node)
+}
+
 const validate = async () => {
   await formActionType.validate()
   await unref(imageSettingTableElRef)?.validate()
@@ -24,6 +43,8 @@ const validate = async () => {
 const getFieldsValue = (): VariableImageActDataType => {
   const value = formActionType.getFieldsValue() as VariableImageActDataType
   const tableValue = unref(imageSettingTableElRef)?.getFieldsValue() as RangeItemType[]
+
+  savaDefaultImageToNodeAttribute(value.defaultImage)
   return {
     ...value,
     rangeList: tableValue,
@@ -51,11 +72,11 @@ defineExpose<ComponentExposeType>({
 </template>
 
 <style lang="less" scoped>
-  .variable-image-form {
-    >:deep(.ant-row) {
-      >.ant-col {
-        @apply px-4;
-      }
+.variable-image-form {
+  >:deep(.ant-row) {
+    >.ant-col {
+      @apply px-4;
     }
   }
+}
 </style>

@@ -17,7 +17,7 @@ export const tableColumns = (): BasicColumn[] => {
       title: t('state'),
       dataIndex: 'type',
       format(text) {
-        return ActRangListItemTypeNameEnum[text as ActRangListItemTypeEnum]
+        return t(ActRangListItemTypeNameEnum[text as ActRangListItemTypeEnum])
       },
     },
     {

@@ -52,6 +52,7 @@ async function getResult() {
     objectModel: unref(objectModelTsl),
     deviceDetail: unref(deviceInfo),
     value,
+    way: unref(commandWay),
   })
 
   const { createMessage } = useMessage()

@@ -37,7 +37,7 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
       componentProps: {
         allowClear: false,
         options: [
-          { label: EventTypeNameEnum[event], value: EventTypeEnum[event] },
+          { label: t(EventTypeNameEnum[event]), value: EventTypeEnum[event] },
         ],
       },
     },

@@ -177,8 +177,8 @@ defineExpose<ComponentExposeType>({
               :validate-status="getValidateStatus(record[TableColumnFieldEnum.DEVICE_PROFILE_ID])"
             >
               <Select
-                v-model:value="record[TableColumnFieldEnum.DEVICE_PROFILE_ID]" :options="productList" :field-names="{ label: 'name', value: 'profileId' }" placeholder="请选择产品"
-                class="w-full"
+                v-model:value="record[TableColumnFieldEnum.DEVICE_PROFILE_ID]" :options="productList"
+                :field-names="{ label: 'name', value: 'profileId' }" placeholder="请选择产品" class="w-full"
                 @change="(value, option) => handleSelectProduct(value, option, record as TableRecordItemType)"
               />
             </FormItem>
@@ -189,8 +189,8 @@ defineExpose<ComponentExposeType>({
               :validate-status="getValidateStatus(record[TableColumnFieldEnum.DEVICE_ID])"
             >
               <Select
-                v-model:value="record[TableColumnFieldEnum.DEVICE_ID]" :options="deviceList" :placeholder="t('chooseDevice')"
-                class="w-full"
+                v-model:value="record[TableColumnFieldEnum.DEVICE_ID]" :options="deviceList"
+                :placeholder="t('chooseDevice')" class="w-full"
                 @change="(value, option) => handleSelectDevice(value, option, record as TableRecordItemType)"
               />
             </FormItem>
@@ -198,8 +198,8 @@ defineExpose<ComponentExposeType>({
           <template v-if="column.key === TableColumnFieldEnum.WAY">
             <RadioGroup
               v-model:value="record[TableColumnFieldEnum.WAY]" :options="[
-                { label: CommandWayNameEnum.ONE_WAY, value: CommandWayEnum.ONE_WAY },
-                { label: CommandWayNameEnum.TWO_WAY, value: CommandWayEnum.TWO_WAY },
+                { label: t(CommandWayNameEnum.ONE_WAY), value: CommandWayEnum.ONE_WAY },
+                { label: t(CommandWayNameEnum.TWO_WAY), value: CommandWayEnum.TWO_WAY },
               ]"
             />
           </template>

@@ -2,6 +2,7 @@ import { isBoolean } from '@wry-smile/utils-is'
 import type { BasicContentComponentProps } from '../..'
 import type { PublicFormSettingType } from '../../..'
 import { DataSourceTypeEnum, EventTypeEnum, EventTypeNameEnum } from '@/enums/datasource'
+import { useTranslation } from '@/hooks/useTranslation'
 
 export interface DynamicEffectItemType {
   label: string
@@ -10,29 +11,31 @@ export interface DynamicEffectItemType {
   componentProps?: BasicContentComponentProps
 }
 
+const { t } = useTranslation()
+
 export const getEventItem = (formSetting?: PublicFormSettingType): DynamicEffectItemType[] => {
   const list = [
     {
-      label: EventTypeNameEnum.DOWN,
+      label: t(EventTypeNameEnum.DOWN),
       key: EventTypeEnum.DOWN,
       component: () => import('./MouseDownOrUpSetting/index.vue'),
       componentProps: { event: EventTypeEnum.DOWN, type: DataSourceTypeEnum.EVENT },
     },
     {
-      label: EventTypeNameEnum.UP,
+      label: t(EventTypeNameEnum.UP),
       key: EventTypeEnum.UP,
       component: () => import('./MouseDownOrUpSetting/index.vue'),
       componentProps: { event: EventTypeEnum.UP, type: DataSourceTypeEnum.EVENT },
 
     },
     {
-      label: EventTypeNameEnum.SINGLE,
+      label: t(EventTypeNameEnum.SINGLE),
       key: EventTypeEnum.SINGLE,
       component: () => import('./SingleClickOrDoubleClickSetting/index.vue'),
       componentProps: { event: EventTypeEnum.SINGLE, type: DataSourceTypeEnum.EVENT },
     },
     {
-      label: EventTypeNameEnum.DOUBLE,
+      label: t(EventTypeNameEnum.DOUBLE),
       key: EventTypeEnum.DOUBLE,
       component: () => import('./SingleClickOrDoubleClickSetting/index.vue'),
       componentProps: { event: EventTypeEnum.DOUBLE, type: DataSourceTypeEnum.EVENT },

@@ -7,9 +7,10 @@ import type { ModalProps } from '@/components/Modal'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import type { ActTypeEnum, EventTypeEnum } from '@/enums/datasource'
 import { DataSourceTypeEnum } from '@/enums/datasource'
-import type { NodeDataActJsonType, NodeDataEventJsonType, SingleClickEventDataType } from '@/api/node/model'
+import type { NodeDataActJsonType, NodeDataEventJsonType } from '@/api/node/model'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import { useTranslation } from '@/hooks/useTranslation'
+import { BasicComponentEnum } from '@/core/Library/packages/Basic'
 
 defineEmits(['register'])
 
@@ -17,7 +18,7 @@ const { t } = useTranslation()
 
 const contentDataStore = useContentDataStoreWithOut()
 
-const { getNodeData, getNodeAllData, saveNodeAllData } = usePublicFormContext()
+const { getNodeData, getNodeAllData, saveNodeAllData, getCellInfo } = usePublicFormContext()
 
 const contentComponent = shallowRef()
 
@@ -63,6 +64,10 @@ const handleOk = async () => {
       await handleDoSaveEventData()
 
     await getNodeAllData()
+
+    if (unref(getCellInfo).componentKey === BasicComponentEnum.VARIABLE_IMAGE)
+      window.DrawApp?.saveButton.click()
+
     closeModal()
     contentComponent.value = null
   }
@@ -93,7 +98,10 @@ const handleCancel = () => {
 <template>
   <BasicModal destroy-on-close v-bind="modalProps" @register="register" @ok="handleOk" @cancel="handleCancel">
     <!-- <Spin :spinning="spinning"> -->
-    <component :is="contentComponent" v-bind="componentProps" ref="componentInstance" @vue:mounted="handleComponentMounted" />
+    <component
+      :is="contentComponent" v-bind="componentProps" ref="componentInstance"
+      @vue:mounted="handleComponentMounted"
+    />
     <!-- </Spin> -->
     <!--  -->
   </BasicModal>

@@ -219,10 +219,13 @@ createPublicFormContext(nodeDataActinType)
       <Divider orientation="left">
         {{ t('dataInteraction') }}
       </Divider>
-      <DataEvents ref="dataEventsElRef" :before-click="handleBeforeOpenEventOrActModal" :form-setting="getFormSetting" />
+      <DataEvents
+        ref="dataEventsElRef" :before-click="handleBeforeOpenEventOrActModal"
+        :form-setting="getFormSetting"
+      />
       <div
-        v-if="getCellInfo.category === PackageCategoryEnum.CONTROL" class="flex flex-col justify-center passwordInput"
-        :class="getFormSetting?.actSetting === false && 'mb-4'"
+        v-if="getCellInfo.category === PackageCategoryEnum.CONTROL"
+        class="flex flex-col justify-center passwordInput" :class="getFormSetting?.actSetting === false && 'mb-4'"
       >
         <Checkbox v-model:checked="operationPassword.checked" :disabled="getSetPasswordStatus">
           <div class="flex">
@@ -254,10 +257,10 @@ createPublicFormContext(nodeDataActinType)
 
 <style lang="less" scoped>
 .form-container {
-@apply text-sm;
+  @apply text-sm;
 
   :deep(.ant-divider) {
-  @apply text-sm;
+    @apply text-sm;
   }
 }
 

@@ -52,17 +52,23 @@ export function useNodeData({ cell, immediate = true }: UseNodeDataParamsType) {
   }
 
   const basicNodeBindData = (type: ActionType): BasicNodeBindType => {
-    return {
-      id: type === ActionType.GET ? getSourceCellID () || getCellID () : getCellID(),
+    const res: BasicNodeBindType = {
+      configurationNodeId: type === ActionType.GET ? getSourceCellID() || getCellID() : getCellID(),
       contentId: window.DrawApp.currentPage.getId(),
       configurationId,
     }
+
+    if (unref(nodeData)?.id)
+      res.id = unref(nodeData)?.id
+
+    return res
   }
 
   const getCellInfo = computed(() => {
     return {
       [CellAttributeKeyEnum.CATEGORY]: cell.getAttribute(CellAttributeKeyEnum.CATEGORY),
       [CellAttributeKeyEnum.COMPONENT_KEY]: cell.getAttribute(CellAttributeKeyEnum.COMPONENT_KEY),
+      id: cell.getId(),
     }
   })
 

@@ -88,7 +88,7 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
 
       if (nodeUtils.getNodeComponentKey(cell) === ControlComponentEnum.SWITCH) {
         const contentDataStore = useContentDataStoreWithOut()
-        const currentData = contentDataStore.contentData.find(item => item.id === cell.getId())
+        const currentData = contentDataStore.contentData.find(item => item.configurationNodeId === cell.getId())
         if (!currentData) return
         const { actJson } = currentData
         const { rangeList } = actJson.STATUS_SETTING

@@ -33,7 +33,7 @@ const initOptions = reactive<{
 const { t } = useTranslation()
 const fetchAlarmListConfig = computed(() => {
   return contentDataStore?.contentData.find((item) => {
-    return props.config.cellInfo?.id === item.id
+    return props.config.cellInfo?.id === item.configurationNodeId
   })
 })
 

 <script setup lang="ts">
 import { ref } from 'vue'
-import type { RenderComponentExposeType } from '@/core/Library/types'
+import type { RenderComponentExposeType, RenderComponentProps } from '@/core/Library/types'
 import type { CommandSource } from '@/core/websocket/processor'
 import { NodeUtils } from '@/hooks/business/useNodeUtils'
 import { getMeetTheConditionsRange } from '@/core/Library/utils'
@@ -9,8 +9,29 @@ import type { VariableImageActDataType } from '@/api/node/model'
 import { useLatestMessageValue } from '@/core/Library/hook/useLatestMessageValue'
 import { useOnMessage } from '@/core/Library/hook/useOnMessage'
 import type { SubscriptionUpdateMsg } from '@/core/websocket/type/message'
+import { CellAttributeKeyEnum } from '@/enums/cellAttributeEnum'
+import { useJsonParse } from '@/hooks/business/useJSONParse'
+import type { ImageSelectorDataType } from '@/core/Library/components/ImageSelector'
 
-const imgSrc = ref('data:image/svg+xml,%3Csvg xmlns="http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg" width="48" height="48" viewBox="0 0 48 48"%3E%3Cpath fill="%238CBCD6" d="M31 41H8c-2.2 0-4-1.8-4-4V11c0-2.2 1.8-4 4-4h32c2.2 0 4 1.8 4 4v17c0 7.2-5.8 13-13 13z"%2F%3E%3Ccircle cx="35" cy="16" r="3" fill="%23B3DDF5"%2F%3E%3Cpath fill="%239AC9E3" d="M20 16L9 32h22z"%2F%3E%3Cpath fill="%23B3DDF5" d="m31 22l-8 10h16z"%2F%3E%3Cpath fill="%23E57373" d="m47.7 29.1l-2.8-2.8c-.4-.4-1.1-.4-1.6 0L42 27.6l4.4 4.4l1.3-1.3c.4-.4.4-1.1 0-1.6z"%2F%3E%3Cpath fill="%23FF9800" d="M27.467 42.167L39.77 29.865l4.384 4.384L31.85 46.55z"%2F%3E%3Cpath fill="%23B0BEC5" d="m46.4 32.038l-2.192 2.192l-4.383-4.384l2.192-2.191z"%2F%3E%3Cpath fill="%23FFC107" d="M27.5 42.2L26 48l5.8-1.5z"%2F%3E%3Cpath fill="%2337474F" d="m26.7 45l-.7 3l3-.7z"%2F%3E%3C%2Fsvg%3E')
+const props = defineProps<RenderComponentProps>()
+const nodeUtils = new NodeUtils()
+
+const imgSrc = ref(getDefaultImage() || 'data:image/svg+xml,%3Csvg xmlns="http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg" width="48" height="48" viewBox="0 0 48 48"%3E%3Cpath fill="%238CBCD6" d="M31 41H8c-2.2 0-4-1.8-4-4V11c0-2.2 1.8-4 4-4h32c2.2 0 4 1.8 4 4v17c0 7.2-5.8 13-13 13z"%2F%3E%3Ccircle cx="35" cy="16" r="3" fill="%23B3DDF5"%2F%3E%3Cpath fill="%239AC9E3" d="M20 16L9 32h22z"%2F%3E%3Cpath fill="%23B3DDF5" d="m31 22l-8 10h16z"%2F%3E%3Cpath fill="%23E57373" d="m47.7 29.1l-2.8-2.8c-.4-.4-1.1-.4-1.6 0L42 27.6l4.4 4.4l1.3-1.3c.4-.4.4-1.1 0-1.6z"%2F%3E%3Cpath fill="%23FF9800" d="M27.467 42.167L39.77 29.865l4.384 4.384L31.85 46.55z"%2F%3E%3Cpath fill="%23B0BEC5" d="m46.4 32.038l-2.192 2.192l-4.383-4.384l2.192-2.191z"%2F%3E%3Cpath fill="%23FFC107" d="M27.5 42.2L26 48l5.8-1.5z"%2F%3E%3Cpath fill="%2337474F" d="m26.7 45l-.7 3l3-.7z"%2F%3E%3C%2Fsvg%3E')
+
+function getDefaultImage() {
+  const cell = nodeUtils.getCellById(props.config.cellInfo!.id)
+
+  if (!cell) return
+
+  const defaultImage = cell.getAttribute(CellAttributeKeyEnum.DEFAULT_IMAGE)
+
+  if (!defaultImage)
+    return
+
+  const { imageSource, libPath, path } = useJsonParse(defaultImage).value as ImageSelectorDataType
+
+  return imageSource === VariableImageSourceEnum.GALLERY ? libPath : path
+}
 
 const onReceiveActMessage = (commandSource: CommandSource, message: SubscriptionUpdateMsg) => {
   const { node, data, type } = commandSource
@@ -50,6 +71,6 @@ defineExpose<RenderComponentExposeType>({
 
 <template>
   <div class="w-full h-full flex justify-center items-center">
-    <img class="w-full" :src="imgSrc">
+    <img class="w-full h-full object-contain" :src="imgSrc">
   </div>
 </template>

@@ -53,7 +53,8 @@ export const getVideoTypeByUrl = (url: string) => {
 export async function getPlayUrl(
   params: VideoItemRecordType,
 ): Promise<Undefineable<{ url: string; type: StreamType }>> {
-  const { accessMode } = params
+  let { accessMode } = params
+  accessMode = Number(accessMode)
   if (accessMode === VideoAccessModeEnum.ManuallyEnter) {
     const { videoUrl } = params
     if (params.videoUrl) {

@@ -99,7 +99,7 @@ const [register, { getFieldsValue, validate, setFieldsValue }] = useForm({
     {
       field: VideoFormFieldsEnum.ACCESS_MODE,
       label: t(VideoFormFieldsNameEnum.ACCESS_MODE),
-      component: ComponentEnum.INPUT,
+      component: ComponentEnum.INPUT_NUMBER,
       ifShow: false,
     },
     {

@@ -25,7 +25,7 @@ const loading = ref(false)
 // 存储视频数据
 const videoConfig = computed(() => {
   return contentDataStore?.contentData.filter((item) => {
-    return props.config.cellInfo?.id === item.id
+    return props.config.cellInfo?.id === item.configurationNodeId
   })
 })
 

 export enum BasicComponentEnum {
   TITLE = 'Title',
   VARIABLE = 'Variable',
+  VARIABLE_IMAGE = 'VariableImage',
 }
 
 export enum BasicComponentNameEnum {
   TITLE = '标题',
   VARIABLE = '变量',
+  VARIABLE_IMAGE = '变量图片',
+
 }

@@ -30,10 +30,10 @@ export default class Config implements CreateComponentType {
 }
 
 export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (telemetryService, nodeData) => {
-  const { dataSourceJson, id } = nodeData
+  const { dataSourceJson, configurationNodeId } = nodeData
   const { deviceId, attr, chartOption } = dataSourceJson
   const { agg, interval, effectScope = 0 } = chartOption!
-  const subscribe = TelemetrySubscriber.createHistorySubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(id, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
+  const subscribe = TelemetrySubscriber.createHistorySubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(configurationNodeId, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
 
   const subscriptionCommand = subscribe.subscriptionCommand as HistorySubscriptionCmd
   subscriptionCommand.agg = agg

@@ -30,15 +30,15 @@ export default class Config implements CreateComponentType {
 }
 
 export const dataSubscribers: ComponentConfigModuleType['dataSubscribers'] = (telemetryService, nodeData) => {
-  const { dataSourceJson, id } = nodeData
+  const { dataSourceJson, configurationNodeId } = nodeData
   const { deviceId, attr, chartOption } = dataSourceJson
   const { agg, interval, effectScope = 0, queryType } = chartOption!
 
   let subscribe
   if (queryType === SocketSubscriberEnum.HISTORY_CMDS)
-    subscribe = TelemetrySubscriber.createHistorySubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(id, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
+    subscribe = TelemetrySubscriber.createHistorySubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(configurationNodeId, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
   else
-    subscribe = TelemetrySubscriber.createTimeseriesSubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(id, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
+    subscribe = TelemetrySubscriber.createTimeseriesSubscription(telemetryService, { id: deviceId, entityType: EntityType.DEVICE }, attr, telemetryService.getCommandSource(configurationNodeId, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
 
   const subscriptionCommand = subscribe.subscriptionCommand as HistorySubscriptionCmd
   subscriptionCommand.agg = agg

@@ -101,4 +101,3 @@ createPublicFormContext(nodeDataActinType)
   }
 }
 </style>
-

+import { isFromEdge } from './useParseParams'
 import { getCurrentRolePermission } from '@/api/sys'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import { isShareMode } from '@/utils/env'
@@ -6,6 +7,10 @@ export function useAuth() {
   const contentDataStore = useContentDataStoreWithOut()
   const getAuthInfo = async () => {
     const result = { permissions: [] as string[], hasPreview: true, hasDesign: true }
+
+    if (isFromEdge())
+      return Object.assign(result, { hasDesignAuth: true, hasPreviewAuth: true })
+
     if (isShareMode()) return result
 
     const permissions = await getCurrentRolePermission()

+import { isFromEdge } from './useParseParams'
 import type { PlatformInfo } from '#/store'
-import { PLATFORM_INFO_CACHE_KEY } from '@/enums/cacheEnum'
+import { APP_LOCAL_CACHE_KEY, EDGE_PLATFORM_INFO_CACHE_KEY, PLATFORM_INFO_CACHE_KEY } from '@/enums/cacheEnum'
 import { createStorage } from '@/utils/cache'
 import { getPlatformInfo as getPlatform } from '@/api/sys'
 
-const storage = createStorage()
-export const getPlatformInfo = () => storage.get(PLATFORM_INFO_CACHE_KEY) as PlatformInfo
+const storage = createStorage(localStorage)
+export const getPlatformInfo = (): PlatformInfo => {
+  if (isFromEdge()) {
+    const common = storage.get(APP_LOCAL_CACHE_KEY)
+    return common?.[EDGE_PLATFORM_INFO_CACHE_KEY]?.value || {}
+  }
+  else {
+    return storage.get(PLATFORM_INFO_CACHE_KEY) as PlatformInfo
+  }
+}
+
 export const setPlatformInfo = (info: Recordable) => storage.set(PLATFORM_INFO_CACHE_KEY, info)
 
 export const usePlatform = async () => {

@@ -67,7 +67,7 @@ export class EventHandler {
     if (!cell) return
     const id = cell.getId()
 
-    const node = this.service.dataSource.find(item => item.id === id)
+    const node = this.service.dataSource.find(item => item.configurationNodeId === id)
 
     if (node && node.eventJson) {
       const instanceId = getAppInstanceId(cell)

@@ -56,8 +56,8 @@ export class LightboxModeWebsocketService extends TelemetryWebsockerService {
    * @returns
    */
   getNodeDataSubscribers(nodeData: NodeDataType) {
-    const { dataSourceJson, actJson, id } = nodeData
-    const cell = this.nodeUtils.getCellById(id)
+    const { dataSourceJson, actJson, configurationNodeId } = nodeData
+    const cell = this.nodeUtils.getCellById(configurationNodeId)
     if (!cell) return []
     const componentKey = this.nodeUtils.getNodeComponentKey(cell)
     const categoryKey = this.nodeUtils.getNodeCategory(cell)
@@ -77,7 +77,7 @@ export class LightboxModeWebsocketService extends TelemetryWebsockerService {
         const { deviceId, attr } = actJson[key as ActTypeEnum]
         // 无entityId及属性时不订阅
         if (deviceId && attr) {
-          const subscribe = TelemetrySubscriber.createTimeseriesSubscription(this, { id: deviceId, entityType: EntityType.DEVICE }, attr, this.getCommandSource(id, DataSourceTypeEnum.ACT, actJson[key as ActTypeEnum], key as ActTypeEnum))
+          const subscribe = TelemetrySubscriber.createTimeseriesSubscription(this, { id: deviceId, entityType: EntityType.DEVICE }, attr, this.getCommandSource(configurationNodeId, DataSourceTypeEnum.ACT, actJson[key as ActTypeEnum], key as ActTypeEnum))
           subscribers.push(subscribe)
         }
       }
@@ -86,7 +86,7 @@ export class LightboxModeWebsocketService extends TelemetryWebsockerService {
     const { deviceId, attr } = dataSourceJson || {}
 
     if (deviceId && attr) {
-      const subscribe = TelemetrySubscriber.createTimeseriesSubscription(this, { id: deviceId, entityType: EntityType.DEVICE }, attr, this.getCommandSource(id, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
+      const subscribe = TelemetrySubscriber.createTimeseriesSubscription(this, { id: deviceId, entityType: EntityType.DEVICE }, attr, this.getCommandSource(configurationNodeId, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
       subscribers.push(subscribe)
     }
 

@@ -24,7 +24,6 @@ export class MessageHandler {
     const telemetrySubscriber = this.service.subscribersMap.get(subscriptionId)
 
     if (!telemetrySubscriber) return
-
     const { commandSource } = telemetrySubscriber
     const { dataType } = commandSource
     if (dataType === DataSourceTypeEnum.DATASOURCE)

@@ -23,7 +23,9 @@ export const APP_DARK_MODE_KEY = '__APP__DARK__MODE__'
 export const APP_LOCAL_CACHE_KEY = 'COMMON__LOCAL__KEY__'
 
 // base global session key
-export const PLATFORM_INFO_CACHE_KEY = 'PLATFORM_INFO'
+export const PLATFORM_INFO_CACHE_KEY = 'PLATFORMINFO'
+
+export const EDGE_PLATFORM_INFO_CACHE_KEY = 'PLATFORM__INFO'
 
 export const APP_SESSION_CACHE_KEY = 'COMMON__SESSION__KEY__'
 

@@ -3,4 +3,5 @@ export enum CellAttributeKeyEnum {
   CATEGORY = 'category',
   SHAPE_KEY = 'shapeKey',
   COPY_SOURCE = 'copySource',
+  DEFAULT_IMAGE = 'defaultImage',
 }

@@ -54,6 +54,10 @@ export class NodeUtils {
     model.setVisible(cell, value)
   }
 
+  refreshCell(cell: MxCell) {
+    this.graph.refresh(cell)
+  }
+
   getNodeComponentKey(node: string | MxCell): Nullable<ComponentKey> {
     const cell = isString(node) ? this.getCellById(node) : node
     const cellValue = cell.getValue() as Element

+import { isFromEdge } from '@/core/LoadData/module/useParseParams'
 import { isDevMode } from '@/utils/env'
 
 // System default cache time, in seconds
@@ -10,5 +11,5 @@ export const cacheCipher = {
 }
 
 // Whether the system cache is encrypted using aes
-export const enableStorageEncryption = !isDevMode()
+export const enableStorageEncryption = !isFromEdge() && !isDevMode()
 

@@ -34,7 +34,7 @@ export const useContentDataStore = defineStore('app-content-data', {
   actions: {
 
     getNodeDataById(id: string): Undefineable<NodeDataType> {
-      const data = this.contentData.find(item => item.id === id)
+      const data = this.contentData.find(item => item.configurationNodeId === id)
       return data
     },
 
@@ -68,7 +68,7 @@ export const useContentDataStore = defineStore('app-content-data', {
       const { cellInfo } = config
       const { id } = cellInfo || {}
       if (!id) return null
-      return this.contentData.find(item => item.id === id) || null
+      return this.contentData.find(item => item.configurationNodeId === id) || null
     },
 
     setPermissions(string: string[]) {

@@ -39,7 +39,7 @@ export function getShareRefreshToken(): string {
 }
 
 export function getLocale() {
-  const { language } = (JSON.parse(localStorage.getItem('.drawio-config') || '') || {}) as DrawioConfig
+  const { language } = (JSON.parse(localStorage.getItem('.drawio-config') || '{}') || {}) as DrawioConfig
 
   return language
 }