From 83aa382fd3b88ec7a564f14d41a9c8e5d43beeb3 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 09 十二月 2024 10:26:31 +0800
Subject: [PATCH] 修改表单定义样式&&修改ui上下文btmName&&添加登录密码即将过期进入首页并提醒
---
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
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 527e2e5..90313c3 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
@@ -179,16 +179,19 @@
}
for (let i in this.sourceData) {
const item = this.sourceData[i]
- if (item && item.constructor === Object) continue;
- if (i == 'type' || i == 'context' || i == 'content') continue;
- sourceDataMap['sourceData["' + i + '"]'] = item
+ if (['type', 'context', 'content', 'querytemplate', 'querytype'].includes(i)) continue;
+ if (item && item.constructor === Object) {
+ sourceDataMap['sourceData["' + i + '"]'] = JSON.stringify(item)
+ }else {
+ sourceDataMap['sourceData["' + i + '"]'] = item
+ }
}
}
if (Object.keys(this.paramVOS).length > 0) {
for (let j in this.paramVOS) {
if (this.paramVOS[j] && this.paramVOS[j].constructor === Object) continue;
- if (j == 'type' || j == 'context' || j == 'content' || j == "getdataurl" || j == "getdatamethod" || j == "url" || j == "method" || j == "uploadfileurl" || j == "title") continue;
+ if (['type', 'context', 'content', "getdataurl", "getdatamethod", "url", "method", "uploadfileurl", "title", 'querytemplate', 'querytype', 'usesourcedata','component'].includes(j)) continue;
sourceDataMap['sourceData["' + j + '"]'] = this.paramVOS[j]
}
}
@@ -199,21 +202,23 @@
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,
multipleSelect: this.isMuti,
isMuti: this.isMuti,
isQueryAllColumn: true,
- btmname: this.componentVO.treeDefineVO.btmType,
+ btmName: this.componentVO.treeDefineVO.btmType,
componentOid: this.componentVO.oid,
uiDefineId: this.uiContext,
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),
- rootExpress: this.componentVO.treeDefineVO.rootExpress || ''
+ queryTemplate: queryTemplate,
+ linkTypeFlag: linkTypeFlag,
+ rootExpress: this.componentVO.treeDefineVO.rootContent || ''
}
const sourceDataMapList = this.sourceDataMapParams;
@@ -237,22 +242,40 @@
if (parentOid != 0 && parentOid.indexOf('@vcitreesep@') > -1) {
parentOid = parentOid.split('@vcitreesep@')[1];
}
- const parentBtmName = (node.level === 0) ? '' : node.data.attributes.btmname;
+
+ const parentBtmName = (node.level === 0)
+ ? ''
+ : (node.data.attributes.part && node.data.attributes.part.btmname)
+ || (node.data.attributes.folder && node.data.attributes.folder.btmname)
+ || (node.data.attributes && node.data.attributes.btmname)
+ || '';
const params = this.params;
+ let url='';debugger;
+ if(this.componentVO.bsCustQueryCLsOrUrl && this.componentVO.bsCustQueryCLsOrUrl.indexOf('/')!=-1){
+ url=this.componentVO.bsCustQueryCLsOrUrl;
+ }
if (node.level === 0) {
params.queryRoot = true;
+ if(this.paramVOS.querytemplate){
+ //璇存槑鏄�氳繃鎸夐挳鐐瑰嚮鎵撳紑鐨勶紝Action鍙傛暟涓厤缃湁this.paramVOS.querytemplate
+ url="/api/uiDataController/getDataByTemp";
+ }
} else {
delete params.queryRoot;
+ if(this.paramVOS.querytemplate){
+ //璇存槑鏄�氳繃鎸夐挳鐐瑰嚮鎵撳紑鐨勶紝Action鍙傛暟涓厤缃湁this.paramVOS.querytemplate
+ delete params.queryTemplate;
+ delete params.linkTypeFlag;
+ }
}
- getTree(parentOid, parentBtmName, params).then(res => {
- resolve(res.data.treeData)
+ getTree(parentOid, parentBtmName, params,url).then(res => {
+ resolve(res.data.treeData || res.data.obj || [])
this.$nextTick(()=>{
if (this.isRefresh) {
this.$refs.tree.setCurrentKey(this.currentClickNode.data.oid);
this.isRefresh=false;
}
})
-
}).catch(error => {
this.$message.error(error);
})
@@ -288,6 +311,7 @@
node.loaded = false;
node.expand();
this.isRefresh=true;
+ this.$refs.tree.setCurrentNode(this.currentClickNode);
}
}
}
--
Gitblit v1.9.3