From c46e208fc65742bf02d43235a28143abbf3eb7ea Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 九月 2024 22:23:17 +0800
Subject: [PATCH] 2024-09-25

---
 src/index.js                          |   14 +++++++-------
 src/tabviews/custom/popview/index.jsx |    2 ++
 src/utils/utils-custom.js             |    2 +-
 src/utils/utils.js                    |    6 +++++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/index.js b/src/index.js
index 78cea1c..89c1f87 100644
--- a/src/index.js
+++ b/src/index.js
@@ -188,14 +188,14 @@
       GLOB.baseurl = GLOB.location + '/' + GLOB.service
       GLOB.linkurl = GLOB.baseurl + 'index.html'
       GLOB.dataFormat = false
-
-      let mark = sessionStorage.getItem('system_mark')
-      let _mark = `sys_${GLOB.service.replace('/', '') || 'service'}`
-      if (mark && mark !== _mark) {
-        sessionStorage.clear()
-      }
-      sessionStorage.setItem('system_mark', _mark)
     }
+    
+    let mark = sessionStorage.getItem('system_mark')
+    let _mark = `sys_${GLOB.service.replace('/', '') || 'service'}`
+    if (mark && mark !== _mark) {
+      sessionStorage.clear()
+    }
+    sessionStorage.setItem('system_mark', _mark)
 
     if (config.mainkey && GLOB.sysType !== 'cloud' && config.mainkey !== options.cakey) {
       GLOB.localkey = GLOB.appkey
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index de34bf6..71b9453 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -895,6 +895,8 @@
 
       if (component.setting.interType !== 'system') return component
 
+      component.setting.uuid = component.uuid
+      
       // dataName 绯荤粺鐢熸垚鐨勬暟鎹簮鍚嶇О
       if (component.setting.sync === 'true') {
         component.dataName = 'mk' + component.uuid.slice(-18)
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index b95f217..3d88af4 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -3083,7 +3083,7 @@
             if (['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(cell.type) && cell.resourceType === '1' && cell.dataSource) {
               let msg = getFormSql(cell, '鎼滅储')
       
-              sqls.push({uuid: cell.uuid, type: 'sForm', ...msg})
+              sqls.push({uuid: md5(item.uuid + cell.uuid), type: 'sForm', ...msg})
             }
           })
         }
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 48c79b6..47394e2 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -416,7 +416,11 @@
           item.$first = true
         }
       }
-      
+
+      if (window.backend && ['select', 'link', 'multiselect', 'checkcard', 'radio'].includes(item.type) && item.resourceType === '1') {
+        item.uuid = md5(config.uuid + item.uuid)
+      }
+
       item.oriInitval = item.initval
 
       if (values) {

--
Gitblit v1.8.0