From a6fc2d55fc81302a900a702e70f2a18ea550eded Mon Sep 17 00:00:00 2001
From: Ldc <ldc@vci.com>
Date: 星期三, 10 四月 2024 11:38:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Bin/lib/thrid/bsf-2.3.0.jar | 0
Bin/lib/service/VciServiceMain.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java | 11
Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue | 9
Bin/lib/client/jgoodies-looks-2.5.3.jar | 0
Bin/lib/thrid/commons-dbcp-1.1.jar | 0
Bin/lib/client/uitheme-1.3.1.jar | 0
Bin/lib/thrid/XmlSchema-1.1.jar | 0
Bin/lib/thrid/jbpm-4.3.2.jar | 0
Bin/lib/thrid/livetribe-jsr223.jar | 0
Bin/lib/thrid/poi-scratchpad-3.9-20121203.jar | 0
Bin/lib/service/UIService.jar | 0
Bin/lib/thrid/ojdbc8.jar | 0
Bin/lib/client/jgraph.jar | 0
Source/ProjectWeb/src/actions/AddAction.js | 4
Bin/lib/client/plt-clientbase.jar | 0
Bin/lib/thrid/portalcustom.jar | 0
Bin/lib/common/plt-slice.jar | 0
Bin/lib/thrid/poi-3.9-20121203.jar | 0
Bin/lib/thrid/inforbroker-core-5.1.0.jar | 0
Bin/lib/thrid/jta-1.1.jar | 0
Bin/lib/client/poi-ooxml-3.9-20121203.jar | 0
Bin/lib/service/WFService.jar | 0
Bin/lib/thrid/jcommon-1.0.17.jar | 0
Bin/lib/common/junit-4.8.jar | 0
Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue | 13
Bin/lib/thrid/commons-codec-1.3.jar | 0
Bin/lib/thrid/antlr-2.7.6.jar | 0
Bin/lib/common/icegridgui.jar | 0
Bin/lib/common/plt-common.jar | 0
Bin/lib/thrid/xmlsec-1.3.0.jar | 0
Bin/lib/service/CacheService.jar | 0
Bin/lib/thrid/jms-1.1.jar | 0
Bin/lib/thrid/jedis-2.9.0.jar | 0
Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue | 1
Bin/lib/client/swixml.jar | 0
Bin/lib/client/poi-scratchpad-3.9-20121203.jar | 0
Bin/lib/thrid/commons-pool2-2.6.2.jar | 0
Bin/lib/thrid/javassist-3.12.0.GA.jar | 0
Bin/lib/common/dom4j-1.6.1.jar | 0
Bin/lib/thrid/rsyntax.jar | 0
Bin/lib/client/poi-3.9-20121203.jar | 0
Bin/lib/thrid/hibernate-jpa-2.0-api-1.0.1.Final.jar | 0
Bin/lib/thrid/jdsl.jar | 0
Bin/lib/client/flatlaf-2.3.jar | 0
Bin/lib/thrid/slf4j-jdk14-1.7.14.jar | 0
Bin/lib/thrid/logkit-1.2.jar | 0
Bin/lib/thrid/geronimo-stax-api_1.0_spec-1.0.jar | 0
Bin/lib/thrid/xml-apis.jar | 0
Bin/lib/thrid/axis.jar | 0
Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue | 17
Bin/lib/client/icegridgui.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java | 12
Bin/lib/client/nativeskin.jar | 0
Source/ProjectWeb/src/actions/BaseAction.js | 52 +
Bin/lib/thrid/xstream-1.3.1.jar | 0
Bin/lib/thrid/avalon-framework-4.1.5.jar | 0
Bin/lib/thrid/bsh.jar | 0
Bin/lib/thrid/commons-discovery-0.2.jar | 0
Bin/lib/common/log4j-api-2.12.4.jar | 0
Bin/lib/thrid/plugin.jar | 0
Bin/lib/client/plt-client.jar | 0
Bin/lib/thrid/activation.jar | 0
Bin/lib/thrid/commons-io-2.0.1.jar | 0
Bin/lib/thrid/picocontainer-1.2.jar | 0
Bin/lib/thrid/commons-fileupload-1.2.2.jar | 0
Bin/lib/thrid/ognl-2.6.11.jar | 0
Bin/lib/common/commons-lang3-3.1.jar | 0
Bin/lib/thrid/guava-20.0.jar | 0
Bin/lib/thrid/juel-engine.jar | 0
Bin/lib/thrid/commons-net-1.4.1.jar | 0
Bin/lib/thrid/jfreechart-1.0.14.jar | 0
Bin/lib/thrid/juel.jar | 0
Bin/lib/common/fastjson-1.2.83.jar | 0
Bin/lib/common/log4j-core-2.12.4.jar | 0
Bin/lib/thrid/jaxen-1.1-beta-9.jar | 0
Bin/lib/service/OQService.jar | 0
Bin/lib/thrid/poi-ooxml-3.9-20121203.jar | 0
Bin/lib/thrid/jcalendar-1.3.3.jar | 0
Bin/lib/thrid/commons-httpclient-3.0.jar | 0
Bin/lib/thrid/axis-ant.jar | 0
Bin/lib/client/swingx-1.6.1.jar | 0
Bin/lib/thrid/commons-collections-3.1.jar | 0
Source/ProjectWeb/src/page/index/index.vue | 4
Bin/lib/client/skinlf.jar | 0
Source/ProjectWeb/src/views/base/UIContentViewer.vue | 31
Bin/lib/service/BOFService.jar | 0
Bin/lib/thrid/jee-management-1.1.jar | 0
Bin/lib/thrid/IKAnalyzer2012FF_u1.jar | 0
Bin/lib/thrid/hibernate3.jar | 0
Bin/lib/thrid/quartz-all-1.8.6.jar | 0
Bin/lib/thrid/slf4j-api-1.7.14.jar | 0
Bin/lib/thrid/jdom-1.0.jar | 0
Bin/lib/service/WFPlugins.jar | 0
Bin/lib/thrid/jaxrpc.jar | 0
Bin/lib/thrid/juel-impl.jar | 0
Bin/lib/thrid/saaj.jar | 0
Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue | 11
Bin/lib/thrid/proxool-0.8.3.jar | 0
Bin/lib/service/VolumeService.jar | 0
Bin/lib/client/pinyin4j-2.5.0.jar | 0
Bin/lib/client/protege35.jar | 0
Source/ProjectWeb/src/page/index/layout.vue | 5
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java | 2
Bin/lib/client/jgoodies-common-1.8.1.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 49
Bin/lib/thrid/c3p0-0.9.1.jar | 0
Bin/lib/service/FrameService.jar | 0
Bin/lib/service/ServiceBase.jar | 0
Bin/lib/service/OMDService.jar | 0
Bin/lib/common/freemarker.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 1
/dev/null | 1469 --------------------------------------------------
Bin/lib/common/mail.jar | 0
Bin/lib/thrid/poi-ooxml-schemas-3.9-20121203.jar | 0
Bin/lib/client/poi-ooxml-schemas-3.9-20121203.jar | 0
Bin/lib/thrid/sapjco.jar | 0
Bin/lib/thrid/commons-logging-1.0.4.jar | 0
Bin/lib/thrid/xmlbeans-2.3.0.jar | 0
Bin/lib/client/jgraphx-3.1.0.0.jar | 0
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java | 11
121 files changed, 167 insertions(+), 1,535 deletions(-)
diff --git a/Bin/lib/client/flatlaf-2.3.jar b/Bin/lib/client/flatlaf-2.3.jar
new file mode 100644
index 0000000..9f292d2
--- /dev/null
+++ b/Bin/lib/client/flatlaf-2.3.jar
Binary files differ
diff --git a/Bin/lib/client/icegridgui.jar b/Bin/lib/client/icegridgui.jar
new file mode 100644
index 0000000..d9ede54
--- /dev/null
+++ b/Bin/lib/client/icegridgui.jar
Binary files differ
diff --git a/Bin/lib/client/jgoodies-common-1.8.1.jar b/Bin/lib/client/jgoodies-common-1.8.1.jar
new file mode 100644
index 0000000..f6a256e
--- /dev/null
+++ b/Bin/lib/client/jgoodies-common-1.8.1.jar
Binary files differ
diff --git a/Bin/lib/client/jgoodies-looks-2.5.3.jar b/Bin/lib/client/jgoodies-looks-2.5.3.jar
new file mode 100644
index 0000000..3339053
--- /dev/null
+++ b/Bin/lib/client/jgoodies-looks-2.5.3.jar
Binary files differ
diff --git a/Bin/lib/client/jgraph.jar b/Bin/lib/client/jgraph.jar
new file mode 100644
index 0000000..9af266c
--- /dev/null
+++ b/Bin/lib/client/jgraph.jar
Binary files differ
diff --git a/Bin/lib/client/jgraphx-3.1.0.0.jar b/Bin/lib/client/jgraphx-3.1.0.0.jar
new file mode 100644
index 0000000..6637aac
--- /dev/null
+++ b/Bin/lib/client/jgraphx-3.1.0.0.jar
Binary files differ
diff --git a/Bin/lib/client/nativeskin.jar b/Bin/lib/client/nativeskin.jar
new file mode 100644
index 0000000..acacc56
--- /dev/null
+++ b/Bin/lib/client/nativeskin.jar
Binary files differ
diff --git a/Bin/lib/client/pinyin4j-2.5.0.jar b/Bin/lib/client/pinyin4j-2.5.0.jar
new file mode 100644
index 0000000..e8ede13
--- /dev/null
+++ b/Bin/lib/client/pinyin4j-2.5.0.jar
Binary files differ
diff --git a/Bin/lib/client/plt-client.jar b/Bin/lib/client/plt-client.jar
new file mode 100644
index 0000000..d4286a6
--- /dev/null
+++ b/Bin/lib/client/plt-client.jar
Binary files differ
diff --git a/Bin/lib/client/plt-clientbase.jar b/Bin/lib/client/plt-clientbase.jar
new file mode 100644
index 0000000..50330af
--- /dev/null
+++ b/Bin/lib/client/plt-clientbase.jar
Binary files differ
diff --git a/Bin/lib/client/poi-3.9-20121203.jar b/Bin/lib/client/poi-3.9-20121203.jar
new file mode 100644
index 0000000..0f46288
--- /dev/null
+++ b/Bin/lib/client/poi-3.9-20121203.jar
Binary files differ
diff --git a/Bin/lib/client/poi-ooxml-3.9-20121203.jar b/Bin/lib/client/poi-ooxml-3.9-20121203.jar
new file mode 100644
index 0000000..8792d46
--- /dev/null
+++ b/Bin/lib/client/poi-ooxml-3.9-20121203.jar
Binary files differ
diff --git a/Bin/lib/client/poi-ooxml-schemas-3.9-20121203.jar b/Bin/lib/client/poi-ooxml-schemas-3.9-20121203.jar
new file mode 100644
index 0000000..eda4ef4
--- /dev/null
+++ b/Bin/lib/client/poi-ooxml-schemas-3.9-20121203.jar
Binary files differ
diff --git a/Bin/lib/client/poi-scratchpad-3.9-20121203.jar b/Bin/lib/client/poi-scratchpad-3.9-20121203.jar
new file mode 100644
index 0000000..1520855
--- /dev/null
+++ b/Bin/lib/client/poi-scratchpad-3.9-20121203.jar
Binary files differ
diff --git a/Bin/lib/client/protege35.jar b/Bin/lib/client/protege35.jar
new file mode 100644
index 0000000..8e99a2e
--- /dev/null
+++ b/Bin/lib/client/protege35.jar
Binary files differ
diff --git a/Bin/lib/client/skinlf.jar b/Bin/lib/client/skinlf.jar
new file mode 100644
index 0000000..9bdb00f
--- /dev/null
+++ b/Bin/lib/client/skinlf.jar
Binary files differ
diff --git a/Bin/lib/client/swingx-1.6.1.jar b/Bin/lib/client/swingx-1.6.1.jar
new file mode 100644
index 0000000..b0bcc87
--- /dev/null
+++ b/Bin/lib/client/swingx-1.6.1.jar
Binary files differ
diff --git a/Bin/lib/client/swixml.jar b/Bin/lib/client/swixml.jar
new file mode 100644
index 0000000..2f0fa2b
--- /dev/null
+++ b/Bin/lib/client/swixml.jar
Binary files differ
diff --git a/Bin/lib/client/uitheme-1.3.1.jar b/Bin/lib/client/uitheme-1.3.1.jar
new file mode 100644
index 0000000..caacb71
--- /dev/null
+++ b/Bin/lib/client/uitheme-1.3.1.jar
Binary files differ
diff --git a/Bin/lib/common/commons-lang3-3.1.jar b/Bin/lib/common/commons-lang3-3.1.jar
new file mode 100644
index 0000000..a85e539
--- /dev/null
+++ b/Bin/lib/common/commons-lang3-3.1.jar
Binary files differ
diff --git a/Bin/lib/common/dom4j-1.6.1.jar b/Bin/lib/common/dom4j-1.6.1.jar
new file mode 100644
index 0000000..c8c4dbb
--- /dev/null
+++ b/Bin/lib/common/dom4j-1.6.1.jar
Binary files differ
diff --git a/Bin/lib/common/fastjson-1.2.83.jar b/Bin/lib/common/fastjson-1.2.83.jar
new file mode 100644
index 0000000..fd843ae
--- /dev/null
+++ b/Bin/lib/common/fastjson-1.2.83.jar
Binary files differ
diff --git a/Bin/lib/common/freemarker.jar b/Bin/lib/common/freemarker.jar
new file mode 100644
index 0000000..b13671d
--- /dev/null
+++ b/Bin/lib/common/freemarker.jar
Binary files differ
diff --git a/Bin/lib/common/icegridgui.jar b/Bin/lib/common/icegridgui.jar
new file mode 100644
index 0000000..d9ede54
--- /dev/null
+++ b/Bin/lib/common/icegridgui.jar
Binary files differ
diff --git a/Bin/lib/common/junit-4.8.jar b/Bin/lib/common/junit-4.8.jar
new file mode 100644
index 0000000..efdaa58
--- /dev/null
+++ b/Bin/lib/common/junit-4.8.jar
Binary files differ
diff --git a/Bin/lib/common/log4j-api-2.12.4.jar b/Bin/lib/common/log4j-api-2.12.4.jar
new file mode 100644
index 0000000..d427c18
--- /dev/null
+++ b/Bin/lib/common/log4j-api-2.12.4.jar
Binary files differ
diff --git a/Bin/lib/common/log4j-core-2.12.4.jar b/Bin/lib/common/log4j-core-2.12.4.jar
new file mode 100644
index 0000000..53b1e9a
--- /dev/null
+++ b/Bin/lib/common/log4j-core-2.12.4.jar
Binary files differ
diff --git a/Bin/lib/common/mail.jar b/Bin/lib/common/mail.jar
new file mode 100644
index 0000000..463a64b
--- /dev/null
+++ b/Bin/lib/common/mail.jar
Binary files differ
diff --git a/Bin/lib/common/plt-common.jar b/Bin/lib/common/plt-common.jar
new file mode 100644
index 0000000..4a83711
--- /dev/null
+++ b/Bin/lib/common/plt-common.jar
Binary files differ
diff --git a/Bin/lib/common/plt-slice.jar b/Bin/lib/common/plt-slice.jar
new file mode 100644
index 0000000..96264cf
--- /dev/null
+++ b/Bin/lib/common/plt-slice.jar
Binary files differ
diff --git a/Bin/lib/service/BOFService.jar b/Bin/lib/service/BOFService.jar
new file mode 100644
index 0000000..02856bd
--- /dev/null
+++ b/Bin/lib/service/BOFService.jar
Binary files differ
diff --git a/Bin/lib/service/CacheService.jar b/Bin/lib/service/CacheService.jar
new file mode 100644
index 0000000..28856b3
--- /dev/null
+++ b/Bin/lib/service/CacheService.jar
Binary files differ
diff --git a/Bin/lib/service/FrameService.jar b/Bin/lib/service/FrameService.jar
new file mode 100644
index 0000000..e8bf9a2
--- /dev/null
+++ b/Bin/lib/service/FrameService.jar
Binary files differ
diff --git a/Bin/lib/service/OMDService.jar b/Bin/lib/service/OMDService.jar
new file mode 100644
index 0000000..a4a1419
--- /dev/null
+++ b/Bin/lib/service/OMDService.jar
Binary files differ
diff --git a/Bin/lib/service/OQService.jar b/Bin/lib/service/OQService.jar
new file mode 100644
index 0000000..64cc1fe
--- /dev/null
+++ b/Bin/lib/service/OQService.jar
Binary files differ
diff --git a/Bin/lib/service/ServiceBase.jar b/Bin/lib/service/ServiceBase.jar
new file mode 100644
index 0000000..9b3cc0d
--- /dev/null
+++ b/Bin/lib/service/ServiceBase.jar
Binary files differ
diff --git a/Bin/lib/service/UIService.jar b/Bin/lib/service/UIService.jar
new file mode 100644
index 0000000..3bdfbb9
--- /dev/null
+++ b/Bin/lib/service/UIService.jar
Binary files differ
diff --git a/Bin/lib/service/VciServiceMain.jar b/Bin/lib/service/VciServiceMain.jar
new file mode 100644
index 0000000..e4bd80e
--- /dev/null
+++ b/Bin/lib/service/VciServiceMain.jar
Binary files differ
diff --git a/Bin/lib/service/VolumeService.jar b/Bin/lib/service/VolumeService.jar
new file mode 100644
index 0000000..ab4afc4
--- /dev/null
+++ b/Bin/lib/service/VolumeService.jar
Binary files differ
diff --git a/Bin/lib/service/WFPlugins.jar b/Bin/lib/service/WFPlugins.jar
new file mode 100644
index 0000000..8042853
--- /dev/null
+++ b/Bin/lib/service/WFPlugins.jar
Binary files differ
diff --git a/Bin/lib/service/WFService.jar b/Bin/lib/service/WFService.jar
new file mode 100644
index 0000000..25dbf09
--- /dev/null
+++ b/Bin/lib/service/WFService.jar
Binary files differ
diff --git a/Bin/lib/thrid/IKAnalyzer2012FF_u1.jar b/Bin/lib/thrid/IKAnalyzer2012FF_u1.jar
new file mode 100644
index 0000000..9ec77c8
--- /dev/null
+++ b/Bin/lib/thrid/IKAnalyzer2012FF_u1.jar
Binary files differ
diff --git a/Bin/lib/thrid/XmlSchema-1.1.jar b/Bin/lib/thrid/XmlSchema-1.1.jar
new file mode 100644
index 0000000..a52c562
--- /dev/null
+++ b/Bin/lib/thrid/XmlSchema-1.1.jar
Binary files differ
diff --git a/Bin/lib/thrid/activation.jar b/Bin/lib/thrid/activation.jar
new file mode 100644
index 0000000..df8003b
--- /dev/null
+++ b/Bin/lib/thrid/activation.jar
Binary files differ
diff --git a/Bin/lib/thrid/antlr-2.7.6.jar b/Bin/lib/thrid/antlr-2.7.6.jar
new file mode 100644
index 0000000..3702b64
--- /dev/null
+++ b/Bin/lib/thrid/antlr-2.7.6.jar
Binary files differ
diff --git a/Bin/lib/thrid/avalon-framework-4.1.5.jar b/Bin/lib/thrid/avalon-framework-4.1.5.jar
new file mode 100644
index 0000000..a24b1c7
--- /dev/null
+++ b/Bin/lib/thrid/avalon-framework-4.1.5.jar
Binary files differ
diff --git a/Bin/lib/thrid/axis-ant.jar b/Bin/lib/thrid/axis-ant.jar
new file mode 100644
index 0000000..17527ff
--- /dev/null
+++ b/Bin/lib/thrid/axis-ant.jar
Binary files differ
diff --git a/Bin/lib/thrid/axis.jar b/Bin/lib/thrid/axis.jar
new file mode 100644
index 0000000..20b09a5
--- /dev/null
+++ b/Bin/lib/thrid/axis.jar
Binary files differ
diff --git a/Bin/lib/thrid/bsf-2.3.0.jar b/Bin/lib/thrid/bsf-2.3.0.jar
new file mode 100644
index 0000000..caa4dea
--- /dev/null
+++ b/Bin/lib/thrid/bsf-2.3.0.jar
Binary files differ
diff --git a/Bin/lib/thrid/bsh.jar b/Bin/lib/thrid/bsh.jar
new file mode 100644
index 0000000..e326510
--- /dev/null
+++ b/Bin/lib/thrid/bsh.jar
Binary files differ
diff --git a/Bin/lib/thrid/c3p0-0.9.1.jar b/Bin/lib/thrid/c3p0-0.9.1.jar
new file mode 100644
index 0000000..693667a
--- /dev/null
+++ b/Bin/lib/thrid/c3p0-0.9.1.jar
Binary files differ
diff --git a/Bin/lib/thrid/commons-codec-1.3.jar b/Bin/lib/thrid/commons-codec-1.3.jar
new file mode 100644
index 0000000..957b675
--- /dev/null
+++ b/Bin/lib/thrid/commons-codec-1.3.jar
Binary files differ
diff --git a/Bin/lib/thrid/commons-collections-3.1.jar b/Bin/lib/thrid/commons-collections-3.1.jar
new file mode 100644
index 0000000..41e230f
--- /dev/null
+++ b/Bin/lib/thrid/commons-collections-3.1.jar
Binary files differ
diff --git a/Bin/lib/thrid/commons-dbcp-1.1.jar b/Bin/lib/thrid/commons-dbcp-1.1.jar
new file mode 100644
index 0000000..c3c4d1f
--- /dev/null
+++ b/Bin/lib/thrid/commons-dbcp-1.1.jar
Binary files differ
diff --git a/Bin/lib/thrid/commons-discovery-0.2.jar b/Bin/lib/thrid/commons-discovery-0.2.jar
new file mode 100644
index 0000000..b885548
--- /dev/null
+++ b/Bin/lib/thrid/commons-discovery-0.2.jar
Binary files differ
diff --git a/Bin/lib/thrid/commons-fileupload-1.2.2.jar b/Bin/lib/thrid/commons-fileupload-1.2.2.jar
new file mode 100644
index 0000000..131f192
--- /dev/null
+++ b/Bin/lib/thrid/commons-fileupload-1.2.2.jar
Binary files differ
diff --git a/Bin/lib/thrid/commons-httpclient-3.0.jar b/Bin/lib/thrid/commons-httpclient-3.0.jar
new file mode 100644
index 0000000..54a9300
--- /dev/null
+++ b/Bin/lib/thrid/commons-httpclient-3.0.jar
Binary files differ
diff --git a/Bin/lib/thrid/commons-io-2.0.1.jar b/Bin/lib/thrid/commons-io-2.0.1.jar
new file mode 100644
index 0000000..5b64b7d
--- /dev/null
+++ b/Bin/lib/thrid/commons-io-2.0.1.jar
Binary files differ
diff --git a/Bin/lib/thrid/commons-logging-1.0.4.jar b/Bin/lib/thrid/commons-logging-1.0.4.jar
new file mode 100644
index 0000000..b73a80f
--- /dev/null
+++ b/Bin/lib/thrid/commons-logging-1.0.4.jar
Binary files differ
diff --git a/Bin/lib/thrid/commons-net-1.4.1.jar b/Bin/lib/thrid/commons-net-1.4.1.jar
new file mode 100644
index 0000000..9666a92
--- /dev/null
+++ b/Bin/lib/thrid/commons-net-1.4.1.jar
Binary files differ
diff --git a/Bin/lib/thrid/commons-pool2-2.6.2.jar b/Bin/lib/thrid/commons-pool2-2.6.2.jar
new file mode 100644
index 0000000..4233f08
--- /dev/null
+++ b/Bin/lib/thrid/commons-pool2-2.6.2.jar
Binary files differ
diff --git a/Bin/lib/thrid/geronimo-stax-api_1.0_spec-1.0.jar b/Bin/lib/thrid/geronimo-stax-api_1.0_spec-1.0.jar
new file mode 100644
index 0000000..0d6d374
--- /dev/null
+++ b/Bin/lib/thrid/geronimo-stax-api_1.0_spec-1.0.jar
Binary files differ
diff --git a/Bin/lib/thrid/guava-20.0.jar b/Bin/lib/thrid/guava-20.0.jar
new file mode 100644
index 0000000..632772f
--- /dev/null
+++ b/Bin/lib/thrid/guava-20.0.jar
Binary files differ
diff --git a/Bin/lib/thrid/hibernate-jpa-2.0-api-1.0.1.Final.jar b/Bin/lib/thrid/hibernate-jpa-2.0-api-1.0.1.Final.jar
new file mode 100644
index 0000000..1e9f71b
--- /dev/null
+++ b/Bin/lib/thrid/hibernate-jpa-2.0-api-1.0.1.Final.jar
Binary files differ
diff --git a/Bin/lib/thrid/hibernate3.jar b/Bin/lib/thrid/hibernate3.jar
new file mode 100644
index 0000000..73df7b1
--- /dev/null
+++ b/Bin/lib/thrid/hibernate3.jar
Binary files differ
diff --git a/Bin/lib/thrid/inforbroker-core-5.1.0.jar b/Bin/lib/thrid/inforbroker-core-5.1.0.jar
new file mode 100644
index 0000000..352b2a5
--- /dev/null
+++ b/Bin/lib/thrid/inforbroker-core-5.1.0.jar
Binary files differ
diff --git a/Bin/lib/thrid/javassist-3.12.0.GA.jar b/Bin/lib/thrid/javassist-3.12.0.GA.jar
new file mode 100644
index 0000000..8f692f4
--- /dev/null
+++ b/Bin/lib/thrid/javassist-3.12.0.GA.jar
Binary files differ
diff --git a/Bin/lib/thrid/jaxen-1.1-beta-9.jar b/Bin/lib/thrid/jaxen-1.1-beta-9.jar
new file mode 100644
index 0000000..e290706
--- /dev/null
+++ b/Bin/lib/thrid/jaxen-1.1-beta-9.jar
Binary files differ
diff --git a/Bin/lib/thrid/jaxrpc.jar b/Bin/lib/thrid/jaxrpc.jar
new file mode 100644
index 0000000..a2c13d9
--- /dev/null
+++ b/Bin/lib/thrid/jaxrpc.jar
Binary files differ
diff --git a/Bin/lib/thrid/jbpm-4.3.2.jar b/Bin/lib/thrid/jbpm-4.3.2.jar
new file mode 100644
index 0000000..21ccd58
--- /dev/null
+++ b/Bin/lib/thrid/jbpm-4.3.2.jar
Binary files differ
diff --git a/Bin/lib/thrid/jcalendar-1.3.3.jar b/Bin/lib/thrid/jcalendar-1.3.3.jar
new file mode 100644
index 0000000..2e13b77
--- /dev/null
+++ b/Bin/lib/thrid/jcalendar-1.3.3.jar
Binary files differ
diff --git a/Bin/lib/thrid/jcommon-1.0.17.jar b/Bin/lib/thrid/jcommon-1.0.17.jar
new file mode 100644
index 0000000..f1bd165
--- /dev/null
+++ b/Bin/lib/thrid/jcommon-1.0.17.jar
Binary files differ
diff --git a/Bin/lib/thrid/jdom-1.0.jar b/Bin/lib/thrid/jdom-1.0.jar
new file mode 100644
index 0000000..30d3977
--- /dev/null
+++ b/Bin/lib/thrid/jdom-1.0.jar
Binary files differ
diff --git a/Bin/lib/thrid/jdsl.jar b/Bin/lib/thrid/jdsl.jar
new file mode 100644
index 0000000..c225421
--- /dev/null
+++ b/Bin/lib/thrid/jdsl.jar
Binary files differ
diff --git a/Bin/lib/thrid/jedis-2.9.0.jar b/Bin/lib/thrid/jedis-2.9.0.jar
new file mode 100644
index 0000000..f4d27d3
--- /dev/null
+++ b/Bin/lib/thrid/jedis-2.9.0.jar
Binary files differ
diff --git a/Bin/lib/thrid/jee-management-1.1.jar b/Bin/lib/thrid/jee-management-1.1.jar
new file mode 100644
index 0000000..1911f08
--- /dev/null
+++ b/Bin/lib/thrid/jee-management-1.1.jar
Binary files differ
diff --git a/Bin/lib/thrid/jfreechart-1.0.14.jar b/Bin/lib/thrid/jfreechart-1.0.14.jar
new file mode 100644
index 0000000..0e4d020
--- /dev/null
+++ b/Bin/lib/thrid/jfreechart-1.0.14.jar
Binary files differ
diff --git a/Bin/lib/thrid/jms-1.1.jar b/Bin/lib/thrid/jms-1.1.jar
new file mode 100644
index 0000000..dad227f
--- /dev/null
+++ b/Bin/lib/thrid/jms-1.1.jar
Binary files differ
diff --git a/Bin/lib/thrid/jta-1.1.jar b/Bin/lib/thrid/jta-1.1.jar
new file mode 100644
index 0000000..6d225b7
--- /dev/null
+++ b/Bin/lib/thrid/jta-1.1.jar
Binary files differ
diff --git a/Bin/lib/thrid/juel-engine.jar b/Bin/lib/thrid/juel-engine.jar
new file mode 100644
index 0000000..d1de8a7
--- /dev/null
+++ b/Bin/lib/thrid/juel-engine.jar
Binary files differ
diff --git a/Bin/lib/thrid/juel-impl.jar b/Bin/lib/thrid/juel-impl.jar
new file mode 100644
index 0000000..53c3522
--- /dev/null
+++ b/Bin/lib/thrid/juel-impl.jar
Binary files differ
diff --git a/Bin/lib/thrid/juel.jar b/Bin/lib/thrid/juel.jar
new file mode 100644
index 0000000..6fda56c
--- /dev/null
+++ b/Bin/lib/thrid/juel.jar
Binary files differ
diff --git a/Bin/lib/thrid/livetribe-jsr223.jar b/Bin/lib/thrid/livetribe-jsr223.jar
new file mode 100644
index 0000000..8d38ba1
--- /dev/null
+++ b/Bin/lib/thrid/livetribe-jsr223.jar
Binary files differ
diff --git a/Bin/lib/thrid/logkit-1.2.jar b/Bin/lib/thrid/logkit-1.2.jar
new file mode 100644
index 0000000..67d4866
--- /dev/null
+++ b/Bin/lib/thrid/logkit-1.2.jar
Binary files differ
diff --git a/Bin/lib/thrid/ognl-2.6.11.jar b/Bin/lib/thrid/ognl-2.6.11.jar
new file mode 100644
index 0000000..19cd379
--- /dev/null
+++ b/Bin/lib/thrid/ognl-2.6.11.jar
Binary files differ
diff --git a/Bin/lib/thrid/ojdbc8.jar b/Bin/lib/thrid/ojdbc8.jar
new file mode 100644
index 0000000..bf41243
--- /dev/null
+++ b/Bin/lib/thrid/ojdbc8.jar
Binary files differ
diff --git a/Bin/lib/thrid/picocontainer-1.2.jar b/Bin/lib/thrid/picocontainer-1.2.jar
new file mode 100644
index 0000000..fbb1c92
--- /dev/null
+++ b/Bin/lib/thrid/picocontainer-1.2.jar
Binary files differ
diff --git a/Bin/lib/thrid/plugin.jar b/Bin/lib/thrid/plugin.jar
new file mode 100644
index 0000000..52a401b
--- /dev/null
+++ b/Bin/lib/thrid/plugin.jar
Binary files differ
diff --git a/Bin/lib/thrid/poi-3.9-20121203.jar b/Bin/lib/thrid/poi-3.9-20121203.jar
new file mode 100644
index 0000000..0f46288
--- /dev/null
+++ b/Bin/lib/thrid/poi-3.9-20121203.jar
Binary files differ
diff --git a/Bin/lib/thrid/poi-ooxml-3.9-20121203.jar b/Bin/lib/thrid/poi-ooxml-3.9-20121203.jar
new file mode 100644
index 0000000..8792d46
--- /dev/null
+++ b/Bin/lib/thrid/poi-ooxml-3.9-20121203.jar
Binary files differ
diff --git a/Bin/lib/thrid/poi-ooxml-schemas-3.9-20121203.jar b/Bin/lib/thrid/poi-ooxml-schemas-3.9-20121203.jar
new file mode 100644
index 0000000..eda4ef4
--- /dev/null
+++ b/Bin/lib/thrid/poi-ooxml-schemas-3.9-20121203.jar
Binary files differ
diff --git a/Bin/lib/thrid/poi-scratchpad-3.9-20121203.jar b/Bin/lib/thrid/poi-scratchpad-3.9-20121203.jar
new file mode 100644
index 0000000..1520855
--- /dev/null
+++ b/Bin/lib/thrid/poi-scratchpad-3.9-20121203.jar
Binary files differ
diff --git a/Bin/lib/thrid/portalcustom.jar b/Bin/lib/thrid/portalcustom.jar
new file mode 100644
index 0000000..2c0af22
--- /dev/null
+++ b/Bin/lib/thrid/portalcustom.jar
Binary files differ
diff --git a/Bin/lib/thrid/proxool-0.8.3.jar b/Bin/lib/thrid/proxool-0.8.3.jar
new file mode 100644
index 0000000..c4f700c
--- /dev/null
+++ b/Bin/lib/thrid/proxool-0.8.3.jar
Binary files differ
diff --git a/Bin/lib/thrid/quartz-all-1.8.6.jar b/Bin/lib/thrid/quartz-all-1.8.6.jar
new file mode 100644
index 0000000..86901d1
--- /dev/null
+++ b/Bin/lib/thrid/quartz-all-1.8.6.jar
Binary files differ
diff --git a/Bin/lib/thrid/rsyntax.jar b/Bin/lib/thrid/rsyntax.jar
new file mode 100644
index 0000000..6903d1a
--- /dev/null
+++ b/Bin/lib/thrid/rsyntax.jar
Binary files differ
diff --git a/Bin/lib/thrid/saaj.jar b/Bin/lib/thrid/saaj.jar
new file mode 100644
index 0000000..4ea696e
--- /dev/null
+++ b/Bin/lib/thrid/saaj.jar
Binary files differ
diff --git a/Bin/lib/thrid/sapjco.jar b/Bin/lib/thrid/sapjco.jar
new file mode 100644
index 0000000..e18912e
--- /dev/null
+++ b/Bin/lib/thrid/sapjco.jar
Binary files differ
diff --git a/Bin/lib/thrid/slf4j-api-1.7.14.jar b/Bin/lib/thrid/slf4j-api-1.7.14.jar
new file mode 100644
index 0000000..d5d64c4
--- /dev/null
+++ b/Bin/lib/thrid/slf4j-api-1.7.14.jar
Binary files differ
diff --git a/Bin/lib/thrid/slf4j-jdk14-1.7.14.jar b/Bin/lib/thrid/slf4j-jdk14-1.7.14.jar
new file mode 100644
index 0000000..720f7fd
--- /dev/null
+++ b/Bin/lib/thrid/slf4j-jdk14-1.7.14.jar
Binary files differ
diff --git a/Bin/lib/thrid/xml-apis.jar b/Bin/lib/thrid/xml-apis.jar
new file mode 100644
index 0000000..d42c0ea
--- /dev/null
+++ b/Bin/lib/thrid/xml-apis.jar
Binary files differ
diff --git a/Bin/lib/thrid/xmlbeans-2.3.0.jar b/Bin/lib/thrid/xmlbeans-2.3.0.jar
new file mode 100644
index 0000000..ccd8163
--- /dev/null
+++ b/Bin/lib/thrid/xmlbeans-2.3.0.jar
Binary files differ
diff --git a/Bin/lib/thrid/xmlsec-1.3.0.jar b/Bin/lib/thrid/xmlsec-1.3.0.jar
new file mode 100644
index 0000000..6b69b80
--- /dev/null
+++ b/Bin/lib/thrid/xmlsec-1.3.0.jar
Binary files differ
diff --git a/Bin/lib/thrid/xstream-1.3.1.jar b/Bin/lib/thrid/xstream-1.3.1.jar
new file mode 100644
index 0000000..4ef4219
--- /dev/null
+++ b/Bin/lib/thrid/xstream-1.3.1.jar
Binary files differ
diff --git a/Source/ProjectWeb/src/actions/AddAction.js b/Source/ProjectWeb/src/actions/AddAction.js
new file mode 100644
index 0000000..8d0e0e8
--- /dev/null
+++ b/Source/ProjectWeb/src/actions/AddAction.js
@@ -0,0 +1,4 @@
+/**
+ * 鎸夐挳澶勭悊 涓氬姟绫诲瀷鏂板
+ */
+import BaseAction from './BaseAction';
diff --git a/Source/ProjectWeb/src/actions/BaseAction.js b/Source/ProjectWeb/src/actions/BaseAction.js
new file mode 100644
index 0000000..a0005bc
--- /dev/null
+++ b/Source/ProjectWeb/src/actions/BaseAction.js
@@ -0,0 +1,52 @@
+import {validatenull} from "@/util/validate";
+import {findArray} from "@/util/util";
+
+/**
+ * 鎸夐挳鐨勫熀纭�鏈嶅姟
+ */
+
+/**
+ * 鏇挎崲鏂囨湰涓殑${xxx}
+ * @param text 鏂囨湰
+ * @param dataStore 閫夋嫨鐨勬暟鎹�
+ * @param sourceData 鏉ユ簮鏁版嵁
+ * @returns 鏇挎崲鍚庣殑鍊�,瀛楃涓�
+ */
+export const replaceFreeMarker = (text,dataStore,sourceData) => {
+ //鏇挎崲琛ㄨ揪寮�
+ if (!sourceData) {
+ sourceData = {};
+ }
+ if (!dataStore) {
+ dataStore = [];
+ }
+ let replaceData = dataStore.length > 0 ? dataStore[0] : {};
+ if (text && text.indexOf("${") > -1 && text.indexOf("}")) {
+ //js鍙兘浣跨敤${xxx}杩欑鐨勬柟寮�
+ let reg = "root.${";
+ while (text.indexOf(reg) > -1) {
+ let temp = text.substring(0, text.indexOf(reg));
+ let field = text.substring(text.indexOf(reg) + reg.length, text.indexOf("}"));
+ let end = text.substring(text.indexOf("}") + 1);
+ field = replaceData[field] || sourceData[field] || '';
+ text = temp + field + end;
+ }
+ reg = "sourceData.${";
+ while (text.indexOf(reg) > -1) {
+ let temp = text.substring(0, text.indexOf(reg));
+ let field = text.substring(text.indexOf(reg) + reg.length, text.indexOf("}"));
+ let end = text.substring(text.indexOf("}") + 1);
+ field = replaceData[field] || sourceData[field] || '';
+ text = temp + field + end;
+ }
+ reg = "${";
+ while (text.indexOf(reg) > -1) {
+ let temp = text.substring(0, text.indexOf(reg));
+ let field = text.substring(text.indexOf(reg) + reg.length, text.indexOf("}"));
+ let end = text.substring(text.indexOf("}") + 1);
+ field = replaceData[field] || sourceData[field] || '';
+ text = temp + field + end;
+ }
+ }
+ return text;
+};
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index 52bf1b5..d927238 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -39,6 +39,17 @@
{{ item.name }}
</el-button>
</div>
+ <div v-else-if="type === 'tree'" class="tree-buttons">
+ <el-button v-for="item in basicButtonList"
+ :key="item.oid"
+ :icon="item.paramVOS.webUiButtonIcon"
+ :type="(item.paramVOS.webUiButtonType !== 'text' ? item.paramVOS.webUiButtonType : 'primary') || 'primary'"
+ plain
+ size="small"
+ @click="buttonClick(item)">
+ {{ item.name }}
+ </el-button>
+ </div>
</div>
</template>
@@ -240,7 +251,7 @@
basicButtonList() {
const basicColumn = this.butttonList;
- if (this.type === 'form') {
+ if (this.type === 'form' || this.type=='tree') {
return basicColumn;
} else if (this.type === 'table' || this.type === 'TreeTable') {
const top = basicColumn.filter(item => item.paramVOS.webUiButtonLocation === 'top' || func.isEmpty(item.paramVOS.webUiButtonLocation)); // 杩囨护鍑烘潵琛ㄦ牸涓婇潰鍖哄煙灞曠ず鐨勬寜閽�
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
index 9d7d32f..c15d92f 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
@@ -1,6 +1,13 @@
<template>
<div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
- <div v-if="isError" style="color: #F56C6C">杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢╞s=缁勪欢name?type=xxx&context=yyy&pparam=zzz杩欑褰㈠紡</div>
+ <el-alert
+ class="alert"
+ v-if="isError"
+ title="鑷畾涔夌粍浠堕厤缃俊鎭敊璇紒"
+ type="error"
+ show-icon
+ description="杩欎釜鑷畾涔夐〉闈㈢殑鍦板潃鏍煎紡涓嶆纭�傛帹鑽愪娇鐢╞s=缁勪欢name?type=xxx&context=yyy&pparam=zzz杩欑褰㈠紡">
+ </el-alert>
<component v-else :is="currentComponent"
:btmType="btmType"
:content="content"
@@ -115,6 +122,6 @@
}
</script>
-<style scoped>
+<style scoped lang="scss">
</style>
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index 16d531f..5c04b55 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -25,7 +25,6 @@
</template>
<script>
-import {treeMenu} from '@/api/treeMyMenu'
import {validatenull} from '@/util/validate'
export default {
name: "dynamic-table",
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
index 30577f9..f6b272f 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-tree.vue
@@ -1,5 +1,6 @@
<template>
<div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
+ <dynamic-button v-if="componentVO.buttons && componentVO.buttons.length>0" :butttonList="componentVO.buttons" :selectList="checkDatas" type="tree" style="margin-bottom: 10px;"></dynamic-button>
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
v-model="filterText">
@@ -82,8 +83,7 @@
sourceData:{
handler(newval) {
//婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
- console.log(this.areasName);
- console.log(newval);
+ this.initData();
}
}
},
@@ -95,7 +95,7 @@
label: 'text'
},
lazy:this.componentVO.treeDefineVO.loadType == 'node',
- isMuti:true,
+ isMuti:false,
data:[],
checkDatas:[]
}
@@ -104,7 +104,9 @@
this.initData();
},
mounted() {
- console.log(this.$el.clientHeight)
+ if(this.componentVO.buttons && this.componentVO.buttons.length>0){
+ this.$children[2].$el.style.height = 'calc(100% - 50px - '+this.$children[0].$el.clientHeight+'px - 10px)';
+ }
},
methods: {
filterNode(value, data) {
@@ -2000,12 +2002,7 @@
//閫愮骇鍔犺浇
const parentOid = (node.level === 0) ? 0 : node.data.oid;
setTimeout(() => {
- const data = [{
- name: 'leaf',
- leaf: true
- }, {
- name: 'zone'
- }];
+ const data = this.data;
resolve(data);
}, 500);
diff --git a/Source/ProjectWeb/src/page/index/index.vue b/Source/ProjectWeb/src/page/index/index.vue
index 93689d3..93aec76 100644
--- a/Source/ProjectWeb/src/page/index/index.vue
+++ b/Source/ProjectWeb/src/page/index/index.vue
@@ -16,7 +16,7 @@
<search class="avue-view" v-show="isSearch"></search>
</transition>
<!-- 涓讳綋瑙嗗浘灞� -->
- <div style="height:100%;overflow-y:auto;overflow-x:hidden;" id="avue-view" v-show="!isSearch">
+ <div style="height:100%;overflow-y:auto;overflow-x:hidden;padding-bottom: 38px;box-sizing: border-box" id="avue-view" v-show="!isSearch">
<keep-alive>
<router-view class="avue-view" v-if="$route.meta.keepAlive"/>
</keep-alive>
@@ -152,6 +152,6 @@
<style lang="scss">
#avue-view > .avue-view{
height: 100%;
- padding: 0 6px !important;
+ padding: 0 !important;
}
</style>
diff --git a/Source/ProjectWeb/src/page/index/layout.vue b/Source/ProjectWeb/src/page/index/layout.vue
index 96976dd..bdd7cf2 100644
--- a/Source/ProjectWeb/src/page/index/layout.vue
+++ b/Source/ProjectWeb/src/page/index/layout.vue
@@ -6,3 +6,8 @@
<router-view class="avue-view" v-if="!$route.meta.keepAlive" />
</div>
</template>
+<style lang="scss">
+.avue-view{
+ padding: 0 6px!important;
+}
+</style>
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewer.vue b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
index 44104ce..a963086 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewer.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
@@ -1,6 +1,6 @@
<template>
<!--UI涓婁笅鏂囩殑灞曠ず鍣�-->
- <div style="height:calc(100% - 4px);min-width:1200px">
+ <div style="height:calc(100% - 4px);min-width:1200px" >
<el-header v-if="uiDefineVO.northAreas && uiDefineVO.northAreas.length>0">
<UIContentArea :key="'northArea-'+uiDefineVO.oid" :areasData="uiDefineVO.northAreas"
:dataStore="checkedData.northArea"
@@ -24,8 +24,8 @@
@setDataStore="setDataStore">
</UIContentArea>
</el-aside>
- <el-container style="height: 100%">
- <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'height: '+centerHeight">
+ <el-container style="height: 100%;display: block">
+ <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'min-height: 300px;height: '+centerHeight">
<UIContentArea :key="'centerArea-'+uiDefineVO.oid" :areasData="uiDefineVO.centerAreas"
:dataStore="checkedData.centerArea"
:inDialog="inDialog"
@@ -36,7 +36,7 @@
</UIContentArea>
</el-main>
<el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%"
- style="max-height: 300px">
+ style="min-height: 150px;">
<UIContentArea :key="'southArea-'+uiDefineVO.oid" :areasData="uiDefineVO.southAreas"
:dataStore="checkedData.southArea"
:inDialog="inDialog"
@@ -78,13 +78,9 @@
}
},
watch: {
- typeAContent:{
- handler(newV,oldV){
- if(oldV!=newV && !verifyNull(newV)){
- this.initUI();
- }
- },
- immediate: true,
+ $route(to, from) {
+ this.getTheParameters()
+ this.initUI();
}
},
computed: {
@@ -97,21 +93,24 @@
this.$message.error("閰嶇疆鐨勪俊鎭敊璇紝璇峰弬鑰僢s=缁勪欢name?type=xxx&context=yyy¶m=zzz杩欑褰㈠紡銆傚叾涓璽ype鏄笟鍔＄被鍨嬶紙鎴栭摼鎺ョ被鍨嬶級锛宑ontext鏄疷I涓婁笅鏂囩殑鍚嶇О");
return false;
}
- this.btmType = this.$route.query.type;
- this.content = this.$route.query.context || this.$route.query.content;
- this.sourceData = this.$route.query;
+ this.getTheParameters()
+ this.initUI();
},
methods: {
+ getTheParameters(){
+ this.btmType = this.$route.query.type;
+ this.content = this.$route.query.context || this.$route.query.content;
+ this.sourceData = this.$route.query;
+ },
initUI() {
getUIContent({btmType: this.btmType, id: this.content}).then(res => {
- console.log(res.data.obj)
this.uiDefineVO = res.data.obj;
this.initContent();
})
},
initContent() {
if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
- this.centerHeight = 'calc(100% - 310px)';
+ this.centerHeight = '65%';
} else {
this.centerHeight = '100%';
}
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index 56172a5..86c330a 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -23,8 +23,8 @@
@setDataStore="setDataStore">
</UIContentArea>
</el-aside>
- <el-container style="height: 100%">
- <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'height: '+centerHeight">
+ <el-container style="height: 100%;display: block">
+ <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'min-height: 260px;height: '+centerHeight">
<UIContentArea :key="'centerArea-'+uiDefineVO.oid" areas-name="centerAreaInDialog"
cradStyle=""
:areasData="uiDefineVO.centerAreas"
@@ -35,7 +35,7 @@
@setDataStore="setDataStore">
</UIContentArea>
</el-main>
- <el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%" style="max-height: 300px">
+ <el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%" style="min-height: 150px;">
<UIContentArea :key="'southArea-'+uiDefineVO.oid" areas-name="southAreaInDialog"
cradStyle=""
:areasData="uiDefineVO.southAreas"
@@ -122,14 +122,13 @@
methods: {
initUI() {
getUIContent({btmType: this.btmType, id: this.content}).then(res => {
- console.log(res.data.obj)
this.uiDefineVO = res.data.obj;
this.initContent();
})
},
initContent() {
if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
- this.centerHeight = 'calc(100% - 310px)';
+ this.centerHeight = '65%';
} else {
this.centerHeight = '100%';
}
diff --git a/Source/ProjectWeb/src/views/base/uiDefineVOInDialog.js b/Source/ProjectWeb/src/views/base/uiDefineVOInDialog.js
deleted file mode 100644
index 4558584..0000000
--- a/Source/ProjectWeb/src/views/base/uiDefineVOInDialog.js
+++ /dev/null
@@ -1,1469 +0,0 @@
-export const uiDefineVOData= {
- "btmTypeId": "processreview",
- "btmname": null,
- "centerAreas": [
- {
- "btmname": null,
- "checkInBy": null,
- "checkInTime": null,
- "checkOutBy": null,
- "checkOutTime": null,
- "componentVOs": [
- {
- "btmname": null,
- "buttons": [
- {
- "actionVO": {
- "actionCls": "",
- "actionUsedType": "business",
- "bsUrl": "RefreshAction",
- "createTime": "2014-10-16 13:07:56.000",
- "creator": "developer",
- "csClass": "",
- "description": "鍒锋柊椤甸潰",
- "id": "refresh",
- "lastModifier": "developer",
- "lastModifyTime": "2014-10-16 13:07:56.000",
- "licensors": null,
- "name": "鍒锋柊锛堥噸缃級",
- "oid": "526E913C-231F-E4CF-D90D-AB968F8C8D45"
- },
- "areaType": "tab",
- "authorization": true,
- "children": null,
- "createTime": "2022-07-18 17:30:52.000",
- "creator": "developer",
- "csUrl": "",
- "description": "",
- "displayMode": "textandimage",
- "hidden": false,
- "iconPath": "",
- "id": "refresh",
- "lastModifier": "developer",
- "lastModifyTime": "2022-07-18 17:30:52.000",
- "name": "鍒锋柊",
- "oid": "E20C314B-E741-FBE0-534A-D68E9C0D8E2C",
- "orderNum": 6,
- "paramVOS": {
- 'webUiButtonLocation': 'top',
- 'webUiButtonType': 'primary',
- 'webUiButtonMethods': 'refresh'
- },
- "pkComponent": "2D6D571B-BB6E-677D-9764-191BC5D5D3F1",
- "pkParentOid": "",
- "url": "RefreshAction"
- },
- {
- "actionVO": {
- "actionCls": "",
- "actionUsedType": "business",
- "bsUrl": "BaseEditAction#doAction",
- "createTime": "2013-11-09 10:32:41.000",
- "creator": "eddieliu",
- "csClass": "plm.uif.actions.client.EditAction",
- "description": "淇敼涓氬姟瀵硅薄",
- "id": "edit",
- "lastModifier": "developer",
- "lastModifyTime": "2013-11-09 10:32:41.000",
- "licensors": null,
- "name": "淇敼",
- "oid": "F8534EFE-130B-0CB3-D477-2AC7B19B7DC4"
- },
- "areaType": "tab",
- "authorization": true,
- "children": null,
- "createTime": "2022-07-18 17:30:52.000",
- "creator": "developer",
- "csUrl": "plm.uif.actions.client.EditAction",
- "description": "",
- "displayMode": "textandimage",
- "hidden": false,
- "iconPath": "",
- "id": "edit",
- "lastModifier": "developer",
- "lastModifyTime": "2022-07-18 17:30:52.000",
- "name": "淇敼",
- "oid": "43F34DC1-C229-359B-AED3-38CA9E7D1534",
- "orderNum": 1,
- "paramVOS": {
- "owner": "true",
- "context": "CreateAuditQuestionDocume",
- "type": "document",
- 'webUiButtonLocation': 'top',
- 'webUiButtonMethods': 'edit',
- },
- "pkComponent": "E00C3C31-D27F-E3AC-6C2B-1882EE8B6FEE",
- "pkParentOid": "",
- "url": "BaseEditAction#doAction"
- },
- {
- "actionVO": {
- "actionCls": "",
- "actionUsedType": "business",
- "bsUrl": "BaseEditAction#doAction",
- "createTime": "2013-11-09 10:32:41.000",
- "creator": "eddieliu",
- "csClass": "plm.uif.actions.client.EditAction",
- "description": "淇敼涓氬姟瀵硅薄",
- "id": "edit",
- "lastModifier": "developer",
- "lastModifyTime": "2013-11-09 10:32:41.000",
- "licensors": null,
- "name": "淇敼",
- "oid": "F8534EFE-130B-0CB3-D477-2AC7B19B7DC4"
- },
- "areaType": "tab",
- "authorization": true,
- "children": null,
- "createTime": "2022-07-18 17:30:52.000",
- "creator": "developer",
- "csUrl": "plm.uif.actions.client.EditAction",
- "description": "",
- "displayMode": "textandimage",
- "hidden": false,
- "iconPath": "",
- "id": "edit",
- "lastModifier": "developer",
- "lastModifyTime": "2022-07-18 17:30:52.000",
- "name": "淇敼",
- "oid": "43F34DC1-C229-359B-AED3-38CA9E7D1534",
- "orderNum": 1,
- "paramVOS": {
- "owner": "true",
- "context": "CreateAuditQuestionDocume",
- "type": "document",
- 'webUiButtonLocation': 'menu',
- 'webUiButtonMethods': 'edit',
- },
- "pkComponent": "E00C3C31-D27F-E3AC-6C2B-1882EE8B6FEE",
- "pkParentOid": "",
- "url": "BaseEditAction#doAction"
- },
- {
- "actionVO": {
- "actionCls": "",
- "actionUsedType": "business",
- "bsUrl": "",
- "createTime": "2021-12-03 15:28:19.000",
- "creator": "developer",
- "csClass": "net=VCI.Plugin.631.Actions.dll",
- "description": "鍒犻櫎宸ヨ壓闂",
- "id": "deleteprocessquestion",
- "lastModifier": "developer",
- "lastModifyTime": "2021-12-03 15:28:19.000",
- "licensors": null,
- "name": "鍒犻櫎宸ヨ壓闂",
- "oid": "FD73DF30-7269-8A85-1B62-B92435000280"
- },
- "areaType": "tab",
- "authorization": true,
- "children": null,
- "createTime": "2022-07-18 17:30:52.000",
- "creator": "developer",
- "csUrl": "net=VCI.Plugin.631.Actions.dll",
- "description": "",
- "displayMode": "textandimage",
- "hidden": false,
- "iconPath": "",
- "id": "deleteprocessquestion",
- "lastModifier": "developer",
- "lastModifyTime": "2022-07-18 17:30:52.000",
- "name": "鍒犻櫎",
- "oid": "BE973D4A-CB99-10FC-3E31-F3010259F823",
- "orderNum": 2,
- "paramVOS": {
- "owner": "true",
- 'webUiButtonLocation': 'menu',
- 'webUiButtonType': 'text',
- 'webUiButtonMethods': 'delete'
- },
- "pkComponent": "E00C3C31-D27F-E3AC-6C2B-1882EE8B6FEE",
- "pkParentOid": "",
- "url": ""
- },
- {
- "actionVO": {
- "actionCls": "",
- "actionUsedType": "business",
- "bsUrl": "",
- "createTime": "2021-12-03 15:28:19.000",
- "creator": "developer",
- "csClass": "net=VCI.Plugin.631.Actions.dll",
- "description": "鍒犻櫎宸ヨ壓闂",
- "id": "deleteprocessquestion",
- "lastModifier": "developer",
- "lastModifyTime": "2021-12-03 15:28:19.000",
- "licensors": null,
- "name": "鍒犻櫎宸ヨ壓闂",
- "oid": "FD73DF30-7269-8A85-1B62-B92435000280"
- },
- "areaType": "tab",
- "authorization": true,
- "children": null,
- "createTime": "2022-07-18 17:30:52.000",
- "creator": "developer",
- "csUrl": "net=VCI.Plugin.631.Actions.dll",
- "description": "",
- "displayMode": "textandimage",
- "hidden": false,
- "iconPath": "",
- "id": "deleteprocessquestion",
- "lastModifier": "developer",
- "lastModifyTime": "2022-07-18 17:30:52.000",
- "name": "鍒犻櫎",
- "oid": "BE973D4A-CB99-10FC-3E31-F3010259F823",
- "orderNum": 2,
- "paramVOS": {
- "owner": "true",
- 'webUiButtonLocation': 'top',
- 'webUiButtonMethods': 'delete'
- },
- "pkComponent": "E00C3C31-D27F-E3AC-6C2B-1882EE8B6FEE",
- "pkParentOid": "",
- "url": ""
- },
- ],
- "checkInBy": null,
- "checkInTime": null,
- "checkOutBy": null,
- "checkOutTime": null,
- "copyFromVersion": null,
- "createTime": null,
- "creator": null,
- "customClass": null,
- "data": null,
- "description": "璇勫浠诲姟鍒楄〃",
- "extendAttr": "",
- "firstR": null,
- "firstV": null,
- "formDefineVO": null,
- "id": null,
- "lastModifier": null,
- "lastModifyTime": null,
- "lastR": null,
- "lastV": null,
- "lcStatus": null,
- "lcStatusText": null,
- "lctid": null,
- "name": "璇勫浠诲姟鍒楄〃",
- "nameOid": null,
- "oid": "2D6D571B-BB6E-677D-9764-191BC5D5D3F11",
- "orderNum": 1,
- "owner": null,
- "pkLayout": "2692E26B-8584-4561-8A03-D5921A82E4901",
- "revisionOid": null,
- "revisionRule": null,
- "revisionSeq": 0,
- "revisionValue": null,
- "secretGrade": null,
- "secretGradeText": null,
- "tableDefineVO": {
- "btmType": "audittask",
- "cols": [
- [
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": "",
- "editConfig": null,
- "event": null,
- "field": "type",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "缁撴灉",
- "unresize": false,
- "width": 80
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": "",
- "editConfig": null,
- "event": null,
- "field": "assigner",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "鎸囨淳浜�",
- "unresize": false,
- "width": 80
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": "",
- "editConfig": null,
- "event": null,
- "field": "principal",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "璐熻矗浜�",
- "unresize": false,
- "width": 80
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": "yyyy-MM-dd",
- "edit": "",
- "editConfig": null,
- "event": null,
- "field": "planedstartdate",
- "fieldType": "date",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "寮�浼氭椂闂�",
- "unresize": false,
- "width": 150
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": "",
- "editConfig": null,
- "event": null,
- "field": "place",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "寮�浼氬湴鐐�",
- "unresize": false,
- "width": 150
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": "",
- "editConfig": null,
- "event": null,
- "field": "creator_name,(,creator,)",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": "creator",
- "style": null,
- "templet": null,
- "title": "鍒涘缓浜�",
- "unresize": false,
- "width": 80
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": "yyyy-MM-dd HH:mm:ss",
- "edit": "",
- "editConfig": null,
- "event": null,
- "field": "createtime",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "鍒涘缓鏃堕棿",
- "unresize": false,
- "width": 150
- }
- ]
- ],
- "displayFolder": false,
- "displayQueryArea": true,
- "folderParentField": "",
- "hasEditor": true,
- "id": "auditTaskTable",
- "limits": null,
- "linkTypeFlag": false,
- "oid": "0A8030A1-2E3F-5D7D-A599-961A3829E6C51",
- "pageVO": null,
- "queryColumns": [
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": null,
- "editConfig": null,
- "event": null,
- "field": "type",
- "fieldType": null,
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": "type",
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "缁撴灉",
- "unresize": false,
- "width": null
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": null,
- "editConfig": null,
- "event": null,
- "field": "assigner",
- "fieldType": null,
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": "assigner",
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "鎸囨淳浜�",
- "unresize": false,
- "width": null
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": null,
- "editConfig": null,
- "event": null,
- "field": "principal",
- "fieldType": null,
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": "principal",
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "璐熻矗浜�",
- "unresize": false,
- "width": null
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": "yyyy-MM-dd",
- "edit": "date",
- "editConfig": null,
- "event": null,
- "field": "planedstartdate",
- "fieldType": null,
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": "planedstartdate",
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "寮�浼氭椂闂�",
- "unresize": false,
- "width": null
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": null,
- "editConfig": null,
- "event": null,
- "field": "place",
- "fieldType": null,
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": "place",
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "寮�浼氬湴鐐�",
- "unresize": false,
- "width": null
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": null,
- "editConfig": null,
- "event": null,
- "field": "creator",
- "fieldType": null,
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": "creator",
- "referConfig": null,
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "鍒涘缓浜�",
- "unresize": false,
- "width": null
- }
- ],
- "queryTemplateName": "ProcessReviewFlow",
- "seniorQueryColumns": [
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": null,
- "editConfig": null,
- "event": null,
- "field": "type",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": {
- "backPath": null,
- "displayTable": null,
- "height": null,
- "initSort": null,
- "loadType": "all",
- "mapFields": null,
- "method": "GET",
- "muti": false,
- "onlyLeaf": false,
- "paramForFormKey": null,
- "parentFieldName": null,
- "parentUsedField": null,
- "parentValue": null,
- "referContent": null,
- "referType": null,
- "remoteSort": false,
- "tableConfig": null,
- "textField": "name",
- "type": null,
- "url": null,
- "useFormKey": null,
- "valueField": "oid",
- "where": null
- },
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "缁撴灉",
- "unresize": false,
- "width": 80
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": null,
- "editConfig": null,
- "event": null,
- "field": "assigner",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": {
- "backPath": null,
- "displayTable": null,
- "height": null,
- "initSort": null,
- "loadType": "all",
- "mapFields": null,
- "method": "GET",
- "muti": false,
- "onlyLeaf": false,
- "paramForFormKey": null,
- "parentFieldName": null,
- "parentUsedField": null,
- "parentValue": null,
- "referContent": null,
- "referType": null,
- "remoteSort": false,
- "tableConfig": null,
- "textField": "name",
- "type": null,
- "url": null,
- "useFormKey": null,
- "valueField": "oid",
- "where": null
- },
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "鎸囨淳浜�",
- "unresize": false,
- "width": 80
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": null,
- "editConfig": null,
- "event": null,
- "field": "principal",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": {
- "backPath": null,
- "displayTable": null,
- "height": null,
- "initSort": null,
- "loadType": "all",
- "mapFields": null,
- "method": "GET",
- "muti": false,
- "onlyLeaf": false,
- "paramForFormKey": null,
- "parentFieldName": null,
- "parentUsedField": null,
- "parentValue": null,
- "referContent": null,
- "referType": null,
- "remoteSort": false,
- "tableConfig": null,
- "textField": "name",
- "type": null,
- "url": null,
- "useFormKey": null,
- "valueField": "oid",
- "where": null
- },
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "璐熻矗浜�",
- "unresize": false,
- "width": 80
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": "yyyy-MM-dd",
- "edit": "date",
- "editConfig": null,
- "event": null,
- "field": "planedstartdate",
- "fieldType": "date",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": {
- "backPath": null,
- "displayTable": null,
- "height": null,
- "initSort": null,
- "loadType": "all",
- "mapFields": null,
- "method": "GET",
- "muti": false,
- "onlyLeaf": false,
- "paramForFormKey": null,
- "parentFieldName": null,
- "parentUsedField": null,
- "parentValue": null,
- "referContent": null,
- "referType": null,
- "remoteSort": false,
- "tableConfig": null,
- "textField": "name",
- "type": null,
- "url": null,
- "useFormKey": null,
- "valueField": "oid",
- "where": null
- },
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "寮�浼氭椂闂�",
- "unresize": false,
- "width": 150
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": null,
- "editConfig": null,
- "event": null,
- "field": "place",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": {
- "backPath": null,
- "displayTable": null,
- "height": null,
- "initSort": null,
- "loadType": "all",
- "mapFields": null,
- "method": "GET",
- "muti": false,
- "onlyLeaf": false,
- "paramForFormKey": null,
- "parentFieldName": null,
- "parentUsedField": null,
- "parentValue": null,
- "referContent": null,
- "referType": null,
- "remoteSort": false,
- "tableConfig": null,
- "textField": "name",
- "type": null,
- "url": null,
- "useFormKey": null,
- "valueField": "oid",
- "where": null
- },
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "寮�浼氬湴鐐�",
- "unresize": false,
- "width": 150
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": null,
- "edit": null,
- "editConfig": null,
- "event": null,
- "field": "creator_name,(,creator,)",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": {
- "backPath": null,
- "displayTable": null,
- "height": null,
- "initSort": null,
- "loadType": "all",
- "mapFields": null,
- "method": "GET",
- "muti": false,
- "onlyLeaf": false,
- "paramForFormKey": null,
- "parentFieldName": null,
- "parentUsedField": null,
- "parentValue": null,
- "referContent": null,
- "referType": null,
- "remoteSort": false,
- "tableConfig": null,
- "textField": "name",
- "type": null,
- "url": null,
- "useFormKey": null,
- "valueField": "oid",
- "where": null
- },
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": "creator",
- "style": null,
- "templet": null,
- "title": "鍒涘缓浜�",
- "unresize": false,
- "width": 80
- },
- {
- "align": "left",
- "colspan": 1,
- "comboxKey": null,
- "data": [],
- "dateFormate": "yyyy-MM-dd HH:mm:ss",
- "edit": null,
- "editConfig": null,
- "event": null,
- "field": "createtime",
- "fieldType": "text",
- "fixed": null,
- "hidden": false,
- "minWidth": null,
- "optionButtons": null,
- "optionField": false,
- "optionJsMap": null,
- "queryField": null,
- "referConfig": {
- "backPath": null,
- "displayTable": null,
- "height": null,
- "initSort": null,
- "loadType": "all",
- "mapFields": null,
- "method": "GET",
- "muti": false,
- "onlyLeaf": false,
- "paramForFormKey": null,
- "parentFieldName": null,
- "parentUsedField": null,
- "parentValue": null,
- "referContent": null,
- "referType": null,
- "remoteSort": false,
- "tableConfig": null,
- "textField": "name",
- "type": null,
- "url": null,
- "useFormKey": null,
- "valueField": "oid",
- "where": null
- },
- "rowspan": 1,
- "showField": null,
- "sort": false,
- "sortField": null,
- "style": null,
- "templet": null,
- "title": "鍒涘缓鏃堕棿",
- "unresize": false,
- "width": 150
- }
- ],
- "whereSql": ""
- },
- "treeDefineVO": null,
- "treeTableDefineVO": null,
- "ts": null,
- "uiComponentType": "table",
- "uiComponentTypeText": "琛ㄦ牸",
- "uiParseClass": "",
- "versionRule": null,
- "versionSeq": 0,
- "versionValue": null
- }
- ],
- "copyFromVersion": null,
- "createTime": "2022-02-08 10:40:50.000",
- "creator": "developer",
- "data": null,
- "description": "",
- "displayExpression": "",
- "enableStatus": true,
- "extendAttr": "",
- "firstR": null,
- "firstV": null,
- "id": "1",
- "international": null,
- "lastModifier": "developer",
- "lastModifyTime": "2022-07-18 17:30:51.000",
- "lastR": null,
- "lastV": null,
- "layoutAreaType": "center",
- "layoutAreaTypeText": null,
- "lcStatus": null,
- "lcStatusText": null,
- "lctid": null,
- "name": "璇勫浠诲姟鍒楄〃",
- "nameOid": null,
- "oid": "2692E26B-8584-4561-8A03-D5921A82E4901",
- "orderNum": 1,
- "owner": null,
- "pkContent": "DBB13AF7-021F-ED27-B285-03E8599548EB1",
- "revisionOid": null,
- "revisionRule": null,
- "revisionSeq": 0,
- "revisionValue": null,
- "secretGrade": null,
- "secretGradeText": null,
- "title": "璇勫浠诲姟鍒楄〃",
- "ts": null,
- "uiParseClass": "",
- "versionRule": null,
- "versionSeq": 0,
- "versionValue": null
- }
- ],
- "checkInBy": null,
- "checkInTime": null,
- "checkOutBy": null,
- "checkOutTime": null,
- "copyFromVersion": null,
- "createTime": "2022-02-08 10:40:50.000",
- "creator": "developer",
- "data": null,
- "description": "",
- "eastAreas": null,
- "firstR": null,
- "firstV": null,
- "id": "ProcessReviewList_web",
- "lastModifier": "developer",
- "lastModifyTime": "2022-07-18 17:30:51.000",
- "lastR": null,
- "lastV": null,
- "lcStatus": null,
- "lcStatusText": null,
- "lctid": null,
- "linkTypeFlag": false,
- "linkTypeId": null,
- "name": "宸ヨ壓璇勫鍒楄〃_web",
- "nameOid": null,
- "northAreas": [],
- "oid": "DBB13AF7-021F-ED27-B285-03E8599548EB",
- "owner": null,
- "revisionOid": null,
- "revisionRule": null,
- "revisionSeq": 0,
- "revisionValue": null,
- "secretGrade": null,
- "secretGradeText": null,
- "southAreas": null,
- "ts": null,
- "versionRule": null,
- "versionSeq": 0,
- "versionValue": null,
- "westAreas": [
- {
- "btmname": null,
- "checkInBy": null,
- "checkInTime": null,
- "checkOutBy": null,
- "checkOutTime": null,
- "componentVOs": [
- {
- "btmname": null,
- "buttons": [
- {
- "actionVO": {
- "actionCls": "",
- "actionUsedType": "business",
- "bsUrl": "BaseAddAction#doAction",
- "createTime": "2013-11-01 15:17:45.000",
- "creator": "eddieliu",
- "csClass": "plm.uif.actions.client.AddAction",
- "description": "鍒涘缓涓氬姟瀵硅薄",
- "id": "add",
- "lastModifier": "developer",
- "lastModifyTime": "2013-11-01 15:17:45.000",
- "licensors": null,
- "name": "鍒涘缓",
- "oid": "65274704-5557-231C-E3EA-0B32B9BD5A0B"
- },
- "areaType": "tab",
- "authorization": true,
- "children": null,
- "createTime": "2024-03-18 16:41:40.000",
- "creator": "developer",
- "csUrl": "plm.uif.actions.client.AddAction",
- "description": "娣诲姞鍒嗙被",
- "displayMode": "textandimage",
- "hidden": false,
- "iconPath": "",
- "id": "add",
- "lastModifier": "developer",
- "lastModifyTime": "2024-03-18 16:41:40.000",
- "name": "娣诲姞",
- "oid": "3FE96F2B-0A07-0340-0382-A3E5527A22DC",
- "orderNum": 1,
- "paramVOS": {
- "form": "editdocumentfolder_dept",
- "type": "folder",
- "initValue": "folderbusinesstype=閮ㄩ棬鍒嗙被"
- },
- "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
- "pkParentOid": "",
- "url": "BaseAddAction#doAction"
- },
- {
- "actionVO": {
- "actionCls": "",
- "actionUsedType": "business",
- "bsUrl": "BaseAddAction#doAction",
- "createTime": "2013-11-01 15:17:45.000",
- "creator": "eddieliu",
- "csClass": "plm.uif.actions.client.AddAction",
- "description": "鍒涘缓涓氬姟瀵硅薄",
- "id": "add",
- "lastModifier": "developer",
- "lastModifyTime": "2013-11-01 15:17:45.000",
- "licensors": null,
- "name": "鍒涘缓",
- "oid": "65274704-5557-231C-E3EA-0B32B9BD5A0B"
- },
- "areaType": "tab",
- "authorization": true,
- "children": null,
- "createTime": "2024-03-18 16:22:07.000",
- "creator": "developer",
- "csUrl": "plm.uif.actions.client.AddAction",
- "description": "娣诲姞鍒嗙被",
- "displayMode": "textandimage",
- "hidden": true,
- "iconPath": "",
- "id": "add",
- "lastModifier": "developer",
- "lastModifyTime": "2024-03-18 16:22:07.000",
- "name": "娣诲姞",
- "oid": "D6F4FD65-B0B8-3622-3928-A564010592DC",
- "orderNum": 2,
- "paramVOS": {
- "seccontext": "editdocumentfolder",
- "context": "editdocumentfolder",
- "querytemplate": "documentlibroot",
- "rootbusinesstype": "documentlib",
- "type": "folder",
- "initvalue": "folderoid=${oid};folderbusinesstype=${folderbusinesstype}"
- },
- "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
- "pkParentOid": "",
- "url": "BaseAddAction#doAction"
- },
- {
- "actionVO": {
- "actionCls": "",
- "actionUsedType": "business",
- "bsUrl": "BaseEditAction#doAction",
- "createTime": "2013-11-09 10:32:41.000",
- "creator": "eddieliu",
- "csClass": "plm.uif.actions.client.EditAction",
- "description": "淇敼涓氬姟瀵硅薄",
- "id": "edit",
- "lastModifier": "developer",
- "lastModifyTime": "2013-11-09 10:32:41.000",
- "licensors": null,
- "name": "淇敼",
- "oid": "F8534EFE-130B-0CB3-D477-2AC7B19B7DC4"
- },
- "areaType": "tab",
- "authorization": true,
- "children": null,
- "createTime": "2024-03-18 16:05:12.000",
- "creator": "secAdmin",
- "csUrl": "plm.uif.actions.client.EditAction",
- "description": "淇敼閫変腑鐨勫垎绫�",
- "displayMode": "textandimage",
- "hidden": false,
- "iconPath": "",
- "id": "edit",
- "lastModifier": "secAdmin",
- "lastModifyTime": "2024-03-18 16:05:12.000",
- "name": "淇敼",
- "oid": "4E6B22C5-BD68-A7F6-712F-900033A0A32D",
- "orderNum": 3,
- "paramVOS": {
- "context": "editdocumentfolder",
- "type": "folder",
- "initvalue": "folderoid=${oid}"
- },
- "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
- "pkParentOid": "",
- "url": "BaseEditAction#doAction"
- },
- {
- "actionVO": {
- "actionCls": "",
- "actionUsedType": "business",
- "bsUrl": "",
- "createTime": "2015-01-27 17:14:08.000",
- "creator": "developer",
- "csClass": "net=VCI.PPR.Actions.dll",
- "description": "鍒犻櫎鍒嗙被鑺傜偣",
- "id": "delfolder",
- "lastModifier": "developer",
- "lastModifyTime": "2015-01-27 17:14:08.000",
- "licensors": null,
- "name": "鍒犻櫎鍒嗙被鑺傜偣",
- "oid": "4DCA9256-1E79-A4DC-6E1F-723F55E44B35"
- },
- "areaType": "tab",
- "authorization": true,
- "children": null,
- "createTime": "2024-03-18 16:05:12.000",
- "creator": "developer",
- "csUrl": "net=VCI.PPR.Actions.dll",
- "description": "鍒犻櫎",
- "displayMode": "textandimage",
- "hidden": false,
- "iconPath": "",
- "id": "delfolder",
- "lastModifier": "developer",
- "lastModifyTime": "2024-03-18 16:05:12.000",
- "name": "鍒犻櫎",
- "oid": "60B88211-5E0C-26F8-0E0B-B25A52EADABE",
- "orderNum": 4,
- "paramVOS": {
- "deleteroot": "true"
- },
- "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
- "pkParentOid": "",
- "url": ""
- },
- {
- "actionVO": {
- "actionCls": "",
- "actionUsedType": "business",
- "bsUrl": "RefreshAction",
- "createTime": "2014-10-16 13:07:56.000",
- "creator": "developer",
- "csClass": "",
- "description": "鍒锋柊椤甸潰",
- "id": "refresh",
- "lastModifier": "developer",
- "lastModifyTime": "2014-10-16 13:07:56.000",
- "licensors": null,
- "name": "鍒锋柊锛堥噸缃級",
- "oid": "526E913C-231F-E4CF-D90D-AB968F8C8D45"
- },
- "areaType": "",
- "authorization": true,
- "children": null,
- "createTime": "2024-03-18 16:05:12.000",
- "creator": "developer",
- "csUrl": "",
- "description": "鍒锋柊",
- "displayMode": "textandimage",
- "hidden": false,
- "iconPath": "",
- "id": "refresh",
- "lastModifier": "developer",
- "lastModifyTime": "2024-03-18 16:05:12.000",
- "name": "鍒锋柊",
- "oid": "0AA227B2-79DF-13B3-9DDE-7ADAFA1AC4E7",
- "orderNum": 5,
- "paramVOS": {},
- "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
- "pkParentOid": "",
- "url": "RefreshAction"
- },
- {
- "actionVO": {
- "actionCls": "B1DD4B55-4210-29DD-2656-4B9DA12BDAD8",
- "actionUsedType": "business",
- "bsUrl": "",
- "createTime": "2021-03-23 17:38:34.000",
- "creator": "developer",
- "csClass": "net=VCI.PPR.Actions.dll",
- "description": "",
- "id": "movetootherfolder",
- "lastModifier": "developer",
- "lastModifyTime": "2021-03-23 17:38:34.000",
- "licensors": null,
- "name": "绉诲埌鍏朵粬鍒嗙被",
- "oid": "73C86108-0649-B649-518B-8294FCDD302E"
- },
- "areaType": "tab",
- "authorization": true,
- "children": null,
- "createTime": "2024-03-18 16:05:12.000",
- "creator": "secAdmin",
- "csUrl": "net=VCI.PPR.Actions.dll",
- "description": "",
- "displayMode": "textandimage",
- "hidden": false,
- "iconPath": "",
- "id": "movetootherfolder",
- "lastModifier": "secAdmin",
- "lastModifyTime": "2024-03-18 16:05:12.000",
- "name": "绉诲埌鍏朵粬鍒嗙被",
- "oid": "682D5C6F-9F2E-123E-6D4E-EB4C82B5A565",
- "orderNum": 6,
- "paramVOS": {},
- "pkComponent": "7170DFF8-C1DE-04A8-46F0-BC4379980BC7",
- "pkParentOid": "",
- "url": ""
- }
- ],
- "checkInBy": null,
- "checkInTime": null,
- "checkOutBy": null,
- "checkOutTime": null,
- "copyFromVersion": null,
- "createTime": null,
- "creator": null,
- "customClass": null,
- "data": null,
- "description": "鍒嗙被鏍�",
- "extendAttr": "",
- "firstR": null,
- "firstV": null,
- "formDefineVO": null,
- "id": null,
- "lastModifier": null,
- "lastModifyTime": null,
- "lastR": null,
- "lastV": null,
- "lcStatus": null,
- "lcStatusText": null,
- "lctid": null,
- "name": "鍒嗙被鏍�",
- "nameOid": null,
- "oid": "7170DFF8-C1DE-04A8-46F0-BC4379980BC71",
- "orderNum": 1,
- "owner": null,
- "pkLayout": "7DDAED74-95BC-FDCE-53F4-A5E72815D5E61",
- "revisionOid": null,
- "revisionRule": null,
- "revisionSeq": 0,
- "revisionValue": null,
- "secretGrade": null,
- "secretGradeText": null,
- "tableDefineVO": null,
- "treeDefineVO": {
- "btmType": "folder",
- "fieldSep": ",",
- "linkType": "",
- "loadType": "all",
- "orientation": false,
- "queryTemplateName": "querySubFolder",
- "rootContent": "${name}",
- "showImage": false,
- "showLinkAbs": "${name}",
- "treeNodeExpression": "${name}[${folderbusinesstype}]"
- },
- "treeTableDefineVO": null,
- "ts": null,
- "uiComponentType": "tree",
- "uiComponentTypeText": "鏍�",
- "uiParseClass": "",
- "versionRule": null,
- "versionSeq": 0,
- "versionValue": null
- }
- ],
- "copyFromVersion": null,
- "createTime": "2022-02-08 10:40:51.000",
- "creator": "developer",
- "data": null,
- "description": "",
- "displayExpression": "",
- "enableStatus": true,
- "extendAttr": "",
- "firstR": null,
- "firstV": null,
- "id": "1",
- "international": null,
- "lastModifier": "developer",
- "lastModifyTime": "2022-07-18 17:30:51.000",
- "lastR": null,
- "lastV": null,
- "layoutAreaType": "west",
- "layoutAreaTypeText": null,
- "lcStatus": null,
- "lcStatusText": null,
- "lctid": null,
- "name": "宸ヨ壓璇勫鍒楄〃",
- "nameOid": null,
- "oid": "E28B0555-FAF3-4F59-0EE8-64A30A77C9CB1",
- "orderNum": 1,
- "owner": null,
- "pkContent": "DBB13AF7-021F-ED27-B285-03E8599548EB1",
- "revisionOid": null,
- "revisionRule": null,
- "revisionSeq": 0,
- "revisionValue": null,
- "secretGrade": null,
- "secretGradeText": null,
- "title": "宸ヨ壓璇勫鍒楄〃",
- "ts": null,
- "uiParseClass": "",
- "versionRule": null,
- "versionSeq": 0,
- "versionValue": null
- }
- ]
-}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index 4b37f1d..3099962 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
@@ -13,8 +13,7 @@
import com.vci.web.constant.CacheKeyConstant;
import com.vci.web.pageModel.*;
import com.vci.web.service.*;
-import com.vci.web.util.PlatformClientUtil;
-import com.vci.web.util.WebUtil;
+import com.vci.web.util.*;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -140,9 +139,11 @@
vo.setCreator(btmItem.creator);
vo.setLastModifier(btmItem.modifier);
try {
- vo.setCreateTime(VciDateUtil.str2Date(String.valueOf(btmItem.createTime),VciDateUtil.DateTimeFormat));
- vo.setLastModifyTime(VciDateUtil.str2Date(String.valueOf(btmItem.modifyTime),VciDateUtil.DateTimeFormat));
- vo.setTs(VciDateUtil.str2Date(String.valueOf(btmItem.ts),VciDateUtil.DateTimeMillFormat));
+ // btmItem.createTime鎷垮埌鐨勬槸鏃堕棿鎴筹紝浣嗘槸杩欏効瑕佺殑鏄緥濡�2017-12-27 09:32:20.034杩欐牱鐨勬牸寮忥紝鎵�浠ヤ笉璋冪敤杩欎釜鏂规硶锛屾敼璋冪敤鍏朵粬鏂规硶
+ //vo.setCreateTime(VciDateUtil.str2Date(String.valueOf(btmItem.createTime),VciDateUtil.DateTimeFormat));
+ vo.setCreateTime(Func.parse(btmItem.createTime, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
+ vo.setLastModifyTime( Func.parse(btmItem.modifyTime, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
+ vo.setTs(Func.parse(btmItem.ts, ConcurrentDateFormat.of(VciDateUtil.DateTimeFormat)));
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
index 5e6e69a..7741d25 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
@@ -327,6 +327,7 @@
* 鏍戣妭鐐圭殑鍒嗛殧绗︿笉涓�鏍�
*/
private static final String TREE_NODE_ID_SEP = "@vcitreesep@";
+
/**
* 鑾峰彇鏍戝舰鏁版嵁
*
@@ -429,7 +430,6 @@
if (StringUtils.isNotBlank(queryTemplate)) {
thisChildren = boService.queryCBOByScheme(queryTemplate, treeQuery.getConditionMap(), replaceMap, null, queryFieldList);
} else {
-
thisChildren = boService.queryCBO(treeQuery.getParentBtmName(), treeQuery.getConditionMap(), null, queryFieldList);
}
return cbo2Trees(thisChildren, valueField, textField, parentFieldName, treeQuery.isShowCheckBox(), null);
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index 55b4ed4..cb1e6e2 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -2,12 +2,16 @@
import com.alibaba.fastjson.JSONObject;
import com.vci.base.common.utility.ObjectUtility;
+import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.VCIError;
+import com.vci.corba.omd.qtm.QTInfo;
+import com.vci.corba.query.ObjectQueryService;
+import com.vci.corba.query.ObjectQueryServicePrx;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.mw.client.InvocationUtility;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.constant.VciSystemVarConstants;
+import com.vci.corba.query.data.BtmRefQueryOption;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -19,10 +23,11 @@
import com.vci.web.pageModel.*;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
+import com.vci.web.util.Func;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
-import org.apache.tools.ant.taskdefs.condition.Os;
+import org.apache.poi.ss.formula.functions.T;
import org.dom4j.DocumentException;
import org.dom4j.DocumentHelper;
import org.omg.CORBA.IntHolder;
@@ -34,10 +39,8 @@
import plm.bs.bom.clientobject.ClientBusinessObject;
import plm.bs.bom.clientobject.ClientLinkObject;
import plm.bs.bom.common.*;
-import plm.corba.qt.BtmRefQueryOption;
import plm.corba.qt.KV;
import plm.corba.qt.QTServiceOperations;
-import plm.corba.qt.QTWrapper;
import plm.oq.objectQuery.common.*;
import java.lang.reflect.Field;
@@ -140,7 +143,6 @@
});
}
}
-
/**
* 鍒濆鍖栦笟鍔＄被鍨�
@@ -465,7 +467,6 @@
return checkDataExsitByColumn(btmName,columnName,Arrays.asList(columnValues.split(",")));
}
-
/**
* 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇笟鍔＄被鍨嬩笅鐨勬暟鎹�
* @param btmType 涓氬姟绫诲瀷鐨勫悕绉帮紝浼氳嚜鍔ㄥ彉鎴愬皬鍐�
@@ -567,7 +568,7 @@
clauseList.add("*");
}
setRightValueToQueryTemplate(qt,conditionMap);//璁剧疆瀵嗙骇鏌ヨ锛屽拰鏁版嵁鏉冮檺鎺у埗
- List<BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>();
+ List<com.vci.corba.query.data.BtmRefQueryOption> refOpts = new ArrayList<BtmRefQueryOption>();
List<String> enumAttrName = new ArrayList<String>();
List<String> thisQueryAttr = new ArrayList<String>();
if(clauseList!=null && clauseList.size()>0){
@@ -614,24 +615,27 @@
//璁剧疆鍒嗛〉淇℃伅鍜屾帓搴�
setPageAndOrderToQT(qt,ph);
try {
- QTServiceOperations qtService = platformClientUtil.getQueryService();
+ // QTServiceOperations qtService = platformClientUtil.getQueryService();
+ ObjectQueryServicePrx qtService = ServiceProvider.getOQService();
if(qtService == null){
logger.error("娌℃湁鎵惧埌鏌ヨ鏈嶅姟");
throw new VciBaseException(msgCodePrefix+"qtServerNull", new String[]{});
}
IntHolder count = new IntHolder();
- BusinessObject[] bos = null;
+ ObjectQueryService.FindBTMObjectsV3Result bos = null;
String invo = JSONObject.toJSONString(InvocationUtility.getInvocation());
try{
- bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
+ //bos = qtService.findBTMObjectsV3(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
+ bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
}catch (VCIError e){
- bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
+ //bos = qtService.findBTMObjectsV4(invo,qt.getId(), Tool.qtTOXMl(qt).asXML(),count,refOpts.toArray(new BtmRefQueryOption[0]));
+ bos = qtService.findBTMObjectsV3(qt.getId(), Tool.qtTOXMl(qt).asXML(), refOpts.toArray(new BtmRefQueryOption[0]));
}
-
- if (bos != null && bos.length > 0) {
- for (BusinessObject bo : bos) {
+ if (bos != null && bos.count > 0) {
+ for (com.vci.corba.omd.data.BusinessObject bo : bos.returnValue) {
ClientBusinessObject cbo = new ClientBusinessObject();
- cbo.setBusinessObject(bo);
+ BusinessObject businessObject = Func.copyProperties(bo, BusinessObject.class);
+ cbo.setBusinessObject(businessObject);
queryEnumText(cbo,enumAttrName);
allCbos.add(cbo);
}
@@ -639,8 +643,8 @@
}
queryLcStatus(allCbos);
} catch (VCIError e) {
-// logger.error(e.error_code,e);
-// throw WebUtil.getVciBaseException(e);
+ //logger.error(e.error_code,e);
+ throw WebUtil.getVciBaseException(e);
}
return allCbos;
}
@@ -942,14 +946,15 @@
QueryTemplate qt = null;
try{
VciBaseUtil.alertNotNull(name,"鏌ヨ妯℃澘鐨勫悕绉�");
- QTWrapper wrapper = platformClientUtil.getQueryService().getQT(name);
+ // QTWrapper wrapper = platformClientUtil.getQueryService().getQT(name);
+ QTInfo wrapper = ServiceProvider.getOMDService().getQTDService().getQT(name);
qt = Tool.getQTByDoc(DocumentHelper.parseText(wrapper.qtText), name);
//鍥犱负涔嬪墠骞冲彴鐨凾ool.replaceQTValues 娌℃湁澶勭悊 ${xxx}銆傦紝 涓轰簡蹇界暐澶у皬鍐欙紝鎴戜滑杩欓噷鍗曠嫭澶勭悊 weidy@2021-3-10
//鎴戜滑杞崲涓哄皬鍐�
Condition condition = qt.getCondition();
Map<String,String> replaceLowMap = new HashMap<>();
if(condition !=null && condition.getCIMap()!=null){
- Map<String, String> systemVarValueMap = VciSystemVarConstants.getSystemVarValueMap();
+ // Map<String, String> systemVarValueMap = VciSystemVarConstants.getSystemVarValueMap();
if(!CollectionUtils.isEmpty(replaceMap)){
replaceMap.forEach((key,value)->{
replaceLowMap.put(key.toLowerCase(),value);
@@ -963,7 +968,7 @@
if(StringUtils.isNotBlank(value)){
if(value.contains("#")){
//绯荤粺鍙橀噺.鏀寔涓�涓�
- lInfo.getValue().setOrdinaryValue(systemVarValueMap.getOrDefault(value.toUpperCase(),""));
+ //lInfo.getValue().setOrdinaryValue(systemVarValueMap.getOrDefault(value.toUpperCase(),""));
}else if(value.contains("${")){
//鏈�${xxxx}鐨勬柟寮�
if(!CollectionUtils.isEmpty(replaceLowMap)) {
@@ -981,8 +986,8 @@
});
}
}catch(VCIError e){
-// logger.error(e.error_code,e);
-// throw WebUtil.getVciBaseException(e);
+ //logger.error(e.error_code,e);
+ //throw WebUtil.getVciBaseException(e);
} catch (DocumentException e) {
logger.error("鏌ヨ妯℃澘杞崲",e);
throw new VciBaseException(this.msgCodePrefix + "qtError", new Object[]{name});
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
index 4a67660..b54c65b 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
@@ -127,7 +127,6 @@
@Autowired
private OsDDLExportWordFieldProperties wordFieldProperties;
-
/**
* 瀵煎叆涓氬姟绫诲瀷鍜岄摼鎺ョ被鍨嬶紝鍖呭惈灞炴�э紝鏋氫妇锛岀姸鎬侊紝鐢熷懡鍛ㄦ湡锛岀増鏈鍒欑瓑鍏ㄥ鍐呭
*
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java
index 6b86fbe..605868d 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/DateUtil.java
@@ -631,4 +631,16 @@
return NumberUtil.toInt(format(new Date(), "HH"));
}
+ /**
+ * 鏃堕棿鎴宠浆鎹负Date
+ * @return
+ */
+ public static Date parseByLong(Long dateLong, ConcurrentDateFormat format){
+ try {
+ return format.parse(format.format(new Date(dateLong)));
+ } catch (ParseException e) {
+ throw Exceptions.unchecked(e);
+ }
+ }
+
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java
index ffb3a4e..86007ae 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/Func.java
@@ -1727,6 +1727,17 @@
}
/**
+ * 灏嗘椂闂存埑杞崲涓篋ate鏃堕棿
+ *
+ * @param dateLong 鏃堕棿鎴�
+ * @param format ConcurrentDateFormat
+ * @return 鏃堕棿
+ */
+ public static Date parse(Long dateLong, ConcurrentDateFormat format) {
+ return DateUtil.parseByLong(dateLong, format);
+ }
+
+ /**
* 鏃ユ湡鏃堕棿鏍煎紡鍖�
*
* @param temporal 鏃堕棿
--
Gitblit v1.9.3