From 83e67ff491fd9a789cfecd5b271a83602a134469 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 19 十一月 2024 11:14:55 +0800
Subject: [PATCH] 调整tab浏览的传参
---
Source/plt-web/plt-web-ui/src/components/actions/base/ViewAction.js | 12 +++++++-----
Source/plt-web/plt-web-ui/src/views/base/ViewTab.vue | 10 +++++-----
Source/plt-web/plt-web-ui/src/App.vue | 12 +++++++++++-
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue | 10 ++++++----
Source/plt-web/plt-web-ui/src/components/actions/base/ViewDialog.vue | 5 +++--
5 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/App.vue b/Source/plt-web/plt-web-ui/src/App.vue
index a5f2aa1..4678407 100644
--- a/Source/plt-web/plt-web-ui/src/App.vue
+++ b/Source/plt-web/plt-web-ui/src/App.vue
@@ -26,7 +26,17 @@
overflow: hidden;
}
.el-menu--vertical .el-menu--popup-right-start{
- background: #ffffff !important;
+ background: #20222a !important;
+}
+.el-menu--popup-right-start .menu-wrapper .el-submenu__title:focus, .el-menu--popup-right-start .menu-wrapper .el-submenu__title:hover {
+ outline: 0;
+ background-color: #060708;
+}
+.el-menu--popup-right-start .menu-wrapper .el-submenu__title i, .el-menu--popup-right-start .menu-wrapper .el-submenu__title span {
+ color: rgba(255, 255, 255, 0.7);
+}
+.el-menu--popup-right-start .menu-wrapper:hover .el-submenu__title i, .el-menu--popup-right-start .menu-wrapper:hover .el-submenu__title span {
+ color: #ffffff;
}
.el-card__body {
padding: 15px;
diff --git a/Source/plt-web/plt-web-ui/src/components/actions/base/ViewAction.js b/Source/plt-web/plt-web-ui/src/components/actions/base/ViewAction.js
index 6c39ceb..9b8a46c 100644
--- a/Source/plt-web/plt-web-ui/src/components/actions/base/ViewAction.js
+++ b/Source/plt-web/plt-web-ui/src/components/actions/base/ViewAction.js
@@ -57,12 +57,14 @@
const name="鏌ョ湅銆�"+replaceFreeMarker(paramVOS.showname,options.dataStore,options.sourceData)+"銆�";
paramVOS.title=name;
}
-
const params= {
- options:options,
- paramVOS:paramVOS,
- saveCallback:callback,
- title:paramVOS.title
+ options: {
+ sourceData: options.sourceData,
+ dataStore: options.dataStore,
+ paramVOS: paramVOS
+ },
+ saveCallback: callback,
+ title: paramVOS.title
}
store.dispatch("setViewtabparams", params);
diff --git a/Source/plt-web/plt-web-ui/src/components/actions/base/ViewDialog.vue b/Source/plt-web/plt-web-ui/src/components/actions/base/ViewDialog.vue
index 29ddc1a..1f73f02 100644
--- a/Source/plt-web/plt-web-ui/src/components/actions/base/ViewDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/components/actions/base/ViewDialog.vue
@@ -17,7 +17,7 @@
:context="paramVOS.context"
:inDialog="true"
:canEdit="false"
- actionType="view"
+ actionType="viewDialog"
:sourceData="sourceData"
:dataStore="dataStore"
:paramVOS="paramVOS"></component>
@@ -101,7 +101,8 @@
}
},
created() {
-
+ this.sourceData = this.paramVOS.usesourcedata == "true" ? this.dataStore[0] : this.sourceData;
+ this.dataStore = this.paramVOS.usesourcedata == "true" ? [] : this.dataStore;
},
mounted() {
this.loadCompoent();
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
index 58fe016..0e751cd 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
@@ -167,7 +167,7 @@
if (!value) return true;
return data[this.defaultProps.label].indexOf(value) !== -1;
},
- sourceDataMap: function () {
+ sourceDataMap: function () {debugger;
const sourceDataMap = {};
if (Object.keys(this.sourceData).length > 0) {
if (this.sourceData.oid) {
@@ -194,11 +194,13 @@
}
return sourceDataMap;
},
- getParams: function () {
+ getParams: function () {debugger;
let parentFieldName = "";
if (this.componentVO.treeDefineVO.showLinkAbs) {
parentFieldName = this.componentVO.treeDefineVO.showLinkAbs.split(",")[0];
}
+ const queryTemplate=this.sourceData.querytemplate || this.paramVOS.querytemplate;
+ const linkTypeFlag=this.sourceData.queryType==0?false:(!validatenull(this.sourceData.linkType)?true:(this.paramVOS.querytype==0?false:true));
const treeParams = {
queryAllLevel: !this.lazy,
loadType: this.componentVO.treeDefineVO.loadType,
@@ -211,8 +213,8 @@
valueField: this.componentVO.treeDefineVO.valueField || 'oid',
parentFieldName: parentFieldName,
textField: this.componentVO.treeDefineVO.treeNodeExpression,
- queryTemplate: this.sourceData.querytemplate,
- linkTypeFlag: validatenull(this.sourceData.queryType) ? (validatenull(this.sourceData.linkType) ? false : true) : (this.sourceData.queryType == 0 ? false : true),
+ queryTemplate: queryTemplate,
+ linkTypeFlag: linkTypeFlag,
rootExpress: this.componentVO.treeDefineVO.rootExpress || ''
}
const sourceDataMapList = this.sourceDataMapParams;
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 3bc6a78..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"
@@ -37,10 +37,10 @@
} else {
config = getStore({ name:'viewtabparams'});
}
- if(config){
- 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() {
--
Gitblit v1.9.3