From f0616c0783c54043be7da18fc185527c93b95696 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 02 三月 2024 12:51:46 +0800
Subject: [PATCH] 2024-03-02
---
src/tabviews/custom/popview/index.jsx | 3 +++
src/utils/utils-datamanage.js | 4 +---
src/menu/picturecontroller/index.jsx | 2 ++
src/mob/colorsketch/index.jsx | 5 +++++
src/tabviews/custom/index.jsx | 2 ++
public/manifest.json | 2 +-
6 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/public/manifest.json b/public/manifest.json
index aa4803e..f3adf88 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -6,5 +6,5 @@
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff",
- "mk_version": "20240203"
+ "mk_version": "20240302"
}
diff --git a/src/menu/picturecontroller/index.jsx b/src/menu/picturecontroller/index.jsx
index 1dac26d..34ffe8a 100644
--- a/src/menu/picturecontroller/index.jsx
+++ b/src/menu/picturecontroller/index.jsx
@@ -132,6 +132,7 @@
this.resetVideo(result.data || [])
} else if (card.typecharone === 'color') {
window.GLOB.app_colors = result.data || []
+ sessionStorage.setItem('app_colors', JSON.stringify(result.data || []))
this.resetColor(result.data || [])
}
this.setState({editvisible: false})
@@ -186,6 +187,7 @@
_this.resetVideo(res.data || [])
} else if (item.typecharone === 'color') {
window.GLOB.app_colors = res.data || []
+ sessionStorage.setItem('app_colors', JSON.stringify(res.data || []))
_this.resetColor(res.data || [])
}
} else {
diff --git a/src/mob/colorsketch/index.jsx b/src/mob/colorsketch/index.jsx
index 35822cb..ac0a99e 100644
--- a/src/mob/colorsketch/index.jsx
+++ b/src/mob/colorsketch/index.jsx
@@ -50,6 +50,10 @@
if (app_colors) {
this.getColors(app_colors)
+ } else if (sessionStorage.getItem('app_colors')) {
+ let app_colors = JSON.parse(sessionStorage.getItem('app_colors'))
+ window.GLOB.app_colors = app_colors
+ this.getColors(app_colors)
} else {
if (loading) {
this.getColors([])
@@ -66,6 +70,7 @@
Api.getCloudConfig(param).then(res => {
loading = false
window.GLOB.app_colors = res.data || []
+ sessionStorage.setItem('app_colors', JSON.stringify(res.data || []))
this.getColors(res.data || [])
})
}
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index d41d649..983d3c3 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -451,6 +451,8 @@
}
}
+ tab.$menuname = (MenuName || '') + '-' + (tab.label || '')
+
return true
})
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 2e3bdff..ca70341 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -70,6 +70,7 @@
config = JSON.stringify(config)
config = config.replace(/@mywebsite@\//ig, window.GLOB.baseurl)
config = JSON.parse(config)
+ config.MenuName = Tab.logLabel || Tab.label || ''
} catch (e) {
console.warn('Parse Failure')
config = ''
@@ -227,6 +228,8 @@
}
}
+ tab.$menuname = (Tab.logLabel || Tab.label || '') + '-' + (tab.label || '')
+
return true
})
diff --git a/src/utils/utils-datamanage.js b/src/utils/utils-datamanage.js
index 11c38b3..91dfd4a 100644
--- a/src/utils/utils-datamanage.js
+++ b/src/utils/utils-datamanage.js
@@ -572,9 +572,7 @@
fullName: sessionStorage.getItem('Full_Name') || ''
}
- if (config.MenuName) {
- param.menuname = config.MenuName
- }
+ param.menuname = config.MenuName || config.$menuname || ''
param.exec_type = window.GLOB.execType || 'y'
param.LText = Utils.formatOptions(_LText.join(' union all '), param.exec_type)
--
Gitblit v1.8.0