From d503069a62723647351548b7ae6fc3879f8f4df8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 09 十二月 2024 16:31:13 +0800
Subject: [PATCH] plt-common包调整后，ui配置管理对应属性也做了相应的调整
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/UIDataBaseServiceI.java | 2 +-
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/UITools.java | 16 ++++++++--------
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PLDefination.java | 20 ++++++++++----------
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PLDefination.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PLDefination.java
index 3c7770c..0a0b6f5 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PLDefination.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PLDefination.java
@@ -162,12 +162,12 @@
/**
* cs绔娇鐢ㄧ殑鑷畾涔夋煡璇㈢被鍚嶆垨URL
*/
- private String csCustQueryCLsOrUrl = "";
+ private String csDataModel = "";
/**
* bs绔娇鐢ㄧ殑鑷畾涔夋煡璇㈢被鍚嶆垨URL
*/
- private String bsCustQueryCLsOrUrl = "";
+ private String bsDataModel = "";
/**
* 瀛怳I鐨勪笟鍔＄被鍨�
@@ -473,20 +473,20 @@
this.queryTemplateName = queryTemplateName;
}
- public void setCsCustQueryCLsOrUrl(String csCustQueryCLsOrUrl) {
- this.csCustQueryCLsOrUrl = csCustQueryCLsOrUrl;
+ public void setCsDataModel(String csDataModel) {
+ this.csDataModel = csDataModel;
}
- public void setBsCustQueryCLsOrUrl(String bsCustQueryCLsOrUrl) {
- this.bsCustQueryCLsOrUrl = bsCustQueryCLsOrUrl;
+ public void setBsDataModel(String bsDataModel) {
+ this.bsDataModel = bsDataModel;
}
- public String getCsCustQueryCLsOrUrl() {
- return csCustQueryCLsOrUrl;
+ public String getCsDataModel() {
+ return csDataModel;
}
- public String getBsCustQueryCLsOrUrl() {
- return bsCustQueryCLsOrUrl;
+ public String getBsDataModel() {
+ return bsDataModel;
}
/**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/UIDataBaseServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/UIDataBaseServiceI.java
index 30422e6..48c462d 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/UIDataBaseServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/UIDataBaseServiceI.java
@@ -49,7 +49,7 @@
*/
default boolean isCustomClass(String bsCustomClassOrUrl){
//鏈�.灏变唬琛ㄦ槸绫昏矾寰�
- if(bsCustomClassOrUrl.contains(".")){
+ if(bsCustomClassOrUrl.contains(".") && bsCustomClassOrUrl.contains("\\")){
return true;
}
return false;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/UITools.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/UITools.java
index 84b7a58..ff98e88 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/UITools.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/UITools.java
@@ -540,11 +540,11 @@
node = rootNode.addElement(PLDefinationConstants.QUERYTEMPLATENAME);
node.setText(obj.getQueryTemplateName());
- node = rootNode.addElement(PLDefinationConstants.QUERYTEMPLATENAME);
- node.setText(obj.getBsCustQueryCLsOrUrl());
+ node = rootNode.addElement(PLDefinationConstants.BSDATAMODEL);
+ node.setText(obj.getBsDataModel());
- node = rootNode.addElement(PLDefinationConstants.QUERYTEMPLATENAME);
- node.setText(obj.getCsCustQueryCLsOrUrl());
+ node = rootNode.addElement(PLDefinationConstants.CSDATAMODEL);
+ node.setText(obj.getCsDataModel());
node = rootNode.addElement(PLDefinationConstants.SUBUIOBJTYPE);
node.setText(obj.getSubUiObjType());
@@ -666,11 +666,11 @@
elementText = root.elementText(PLDefinationConstants.QUERYTEMPLATENAME);
obj.setQueryTemplateName(elementText == null ? "" : elementText);
- elementText = root.elementText(PLDefinationConstants.BSCUSTQUERYCLSORURL);
- obj.setBsCustQueryCLsOrUrl(elementText == null ? "" : elementText);
+ elementText = root.elementText(PLDefinationConstants.BSDATAMODEL);
+ obj.setBsDataModel(elementText == null ? "" : elementText);
- elementText = root.elementText(PLDefinationConstants.CSCUSTQUERYCLSORURL);
- obj.setCsCustQueryCLsOrUrl(elementText == null ? "" : elementText);
+ elementText = root.elementText(PLDefinationConstants.CSDATAMODEL);
+ obj.setCsDataModel(elementText == null ? "" : elementText);
elementText = root.elementText(PLDefinationConstants.SUBUILAYOUT);
obj.setSubUILayout(elementText == null ? "" : elementText);
--
Gitblit v1.9.3