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/components/dynamic-components/dynamic-table.vue | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue index 19fd485..36bbd88 100644 --- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue +++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue @@ -339,7 +339,7 @@ }, getParams: function () { const tableParams = { - btmname: this.currentDefineVO.btmType, + btmName: this.currentDefineVO.btmType, btmType:this.currentDefineVO.btmType, tableDefineId: this.currentDefineVO.id, componentOid: this.componentVO.oid, @@ -356,7 +356,11 @@ if (Object.keys(this.sourceData).length>0 && this.isShow) { this.tableList = []; this.loading = true; - getList(page.currentPage, page.pageSize, Object.assign({},this.params,this.query,params)).then(res => { + let url=''; + if(this.componentVO.bsDataModel && this.componentVO.bsDataModel.indexOf('/')!=-1){ + url=this.componentVO.bsDataModel; + } + getList(page.currentPage, page.pageSize, Object.assign({},this.params,this.query,params),url).then(res => { let data = []; if (res.data && res.data.data) { data = res.data.data; -- Gitblit v1.9.3