From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/base/ViewTab.vue | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/base/ViewTab.vue b/Source/plt-web/plt-web-ui/src/views/base/ViewTab.vue
index b948b58..01ce3c5 100644
--- a/Source/plt-web/plt-web-ui/src/views/base/ViewTab.vue
+++ b/Source/plt-web/plt-web-ui/src/views/base/ViewTab.vue
@@ -5,7 +5,7 @@
key="ViewTab"
:btmType="paramVOS.type"
:context="paramVOS.context"
- :inDialog="false"
+ :inDialog="true"
:canEdit="false"
actionType="view"
:sourceData="sourceData"
@@ -15,7 +15,7 @@
<script>
import {validatenull} from "@/util/validate";
-import { getStore } from "@/util/store.js";
+import { getStore ,removeStore} from "@/util/store.js";
export default {
name: "ViewTab",
@@ -29,23 +29,25 @@
}
},
computed:{
- title(){
- return this.paramVOS.title || "鏌ョ湅璇︽儏"
- }
},
created() {
let config = {};
if (!validatenull(this.$store.state.viewtabparams)) {
config = this.$store.state.viewtabparams;
} else {
- config = getStore('viewtabparams');
+ config = getStore({ name:'viewtabparams'});
}
- this.sourceData = config.options.sourceData;
- this.dataStore = config.options.dataStore;
- this.paramVOS = config.paramVOS;
+ if(config) {
+ this.paramVOS = config.options.paramVOS;
+ this.sourceData = this.paramVOS.usesourcedata == "true" ? config.options.dataStore[0] : config.options.sourceData;
+ this.dataStore = this.paramVOS.usesourcedata == "true" ? [] : config.options.dataStore;
+ }
},
mounted() {
this.loadCompoent();
+ },
+ beforeDestroy() {
+ //removeStore({ name:'viewtabparams', type:'session'});
},
methods: {
loadCompoent(){
@@ -58,7 +60,8 @@
console.log('缁勪欢鍔犺浇澶辫触:', error);
});
}
- }
+ },
+
}
</script>
--
Gitblit v1.9.3