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/Client/PLTClient/src/com/vci/client/uif/actions/client/UIFUtils.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Source/Client/PLTClient/src/com/vci/client/uif/actions/client/UIFUtils.java b/Source/Client/PLTClient/src/com/vci/client/uif/actions/client/UIFUtils.java
index b465a69..85a9739 100644
--- a/Source/Client/PLTClient/src/com/vci/client/uif/actions/client/UIFUtils.java
+++ b/Source/Client/PLTClient/src/com/vci/client/uif/actions/client/UIFUtils.java
@@ -8,7 +8,6 @@
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -35,17 +34,14 @@
import com.vci.client.common.FreemarkerParamObject;
import com.vci.client.common.PositionMessager;
import com.vci.client.common.oq.OQTool;
+import com.vci.client.common.providers.ServiceProvider;
import com.vci.client.omd.attribpool.ui.APClient;
import com.vci.client.omd.btm.ui.BtmClient;
-import com.vci.client.omd.enumManager.ui.EnumClient;
import com.vci.client.omd.lifecycle.LifeCycleStart;
import com.vci.client.oq.QTClient;
import com.vci.client.oq.QTDClient;
import com.vci.client.portal.utility.PRM;
import com.vci.client.portal.utility.PRMItem;
-import com.vci.client.ui.excel.ExcelCellStyleSettingCallback;
-import com.vci.client.ui.excel.ExcelFileOperation;
-import com.vci.client.ui.excel.WorkboolStyleSetting;
import com.vci.client.ui.exception.VCIException;
import com.vci.client.ui.locale.LocaleDisplay;
import com.vci.client.ui.swing.VCIOptionPane;
@@ -55,8 +51,11 @@
import com.vci.client.uif.engine.client.combobox.IComboBoxDataProvider;
import com.vci.client.uif.engine.common.IDataNode;
import com.vci.client.uif.engine.common.UIFUtilsCommon;
+import com.vci.client.utils.excel.ExcelCellStyleSettingCallback;
import com.vci.client.utils.excel.ExcelDocumentUtils;
+import com.vci.client.utils.excel.ExcelFileOperation;
import com.vci.client.utils.excel.SheetDataSet;
+import com.vci.client.utils.excel.WorkboolStyleSetting;
import com.vci.common.qt.object.Condition;
import com.vci.common.qt.object.ConditionItem;
import com.vci.common.qt.object.LeafInfo;
@@ -1705,7 +1704,7 @@
if(cvs[0].trim().equalsIgnoreCase("enumName")){
String enumName = cvs[1].trim();
//EnumItemFilter filter = new EnumItemFilter(enumName);
- EnumItem[] enumItems = EnumClient.getService().getEmItems(enumName, 1, 1);
+ EnumItem[] enumItems = ServiceProvider.getOMDService().getEnumService().getEmItems(enumName, 1, 1);
for(EnumItem ei : enumItems){
for(EnumChild ec : ei.children){
sysEnumMap.put(btmName + "#" + attrName + "#" + ec.value, ec.name);
@@ -1867,7 +1866,7 @@
public static QueryTemplate getQueryTemplateByName(String queryTemplateName){
QueryTemplate qt = null;
try{
- QTInfo wrapper = QTDClient.getService().getQT(queryTemplateName);
+ QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(queryTemplateName);
qt = OQTool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), queryTemplateName);
} catch (VCIError e) {
e.printStackTrace();
--
Gitblit v1.9.3