修改忽略文件

před 4 roky · 63f875bea4
--- a/.gitignore
+++ b/.gitignore
@ -31,21 +31,4 @@ docs/.vuepress/dist
 # IDEA 插件文件
 **/rebel.xml

-# 忽略static文件夹
-/.metadata/
-/purchase.frontend/src/main/purchase-data-ui/package-lock.json
-/purchase.frontend/src/main/purchase-data-ui/package.json
-/purchase.frontend/src/main/purchase-data-ui/yarn.lock
-target
-/supplier.service/supplier.service.common/target
-/supplier.service/supplier.service.client/target
-/supplier.service/supplier.service.server/*.project
-/supplier.service/supplier.service.server/*.classpath
-/supplier.service/supplier.service.common/.classpath
-/supplier.service/supplier.service.common/.project
-/supplier.service/supplier.service.client/.project
-/supplier.service/supplier.service.client/.classpath
-/supplier.frontend/src/main/purchase-data-ui
-/purchase.frontend/src/main/product-ui/purchase-synergy-ui/vue.config.js
-/purchase.frontend/src/main/product-ui/purchase-data-ui/yarn.lock
-/purchase.frontend/src/main/product-ui/purchase-plan-ui/*.lock
+
--- a/ureport2-core/target/classes/com/bstek/ureport/CellRenderer.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/CellRenderer.class
--- a/ureport2-core/target/classes/com/bstek/ureport/Range.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/Range.class
--- a/ureport2-core/target/classes/com/bstek/ureport/UReportPropertyPlaceholderConfigurer.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/UReportPropertyPlaceholderConfigurer.class
--- a/ureport2-core/target/classes/com/bstek/ureport/Utils.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/Utils.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/BindData.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/BindData.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/Context.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/Context.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/DataCompute.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/DataCompute.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/Dataset.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/Dataset.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/DatasetUtils.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/DatasetUtils.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/HideRowColumnBuilder.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/HideRowColumnBuilder.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/ReportBuilder.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/ReportBuilder.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/Splash.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/Splash.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/Aggregate$1.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/Aggregate$1.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/Aggregate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/Aggregate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/AvgAggregate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/AvgAggregate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/CountAggregate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/CountAggregate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/CustomGroupAggregate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/CustomGroupAggregate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/GroupAggregate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/GroupAggregate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/MaxAggregate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/MaxAggregate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/MinAggregate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/MinAggregate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/RegroupAggregate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/RegroupAggregate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/ReselectAggregate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/ReselectAggregate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/SelectAggregate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/SelectAggregate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/SumAggregate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/aggregate/SumAggregate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/AbstractAssertor.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/AbstractAssertor.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/Assertor.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/Assertor.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsAssertor.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsAssertor.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsGreatThenAssertor.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsGreatThenAssertor.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsLessThenAssertor.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/EqualsLessThenAssertor.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/GreatThenAssertor.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/GreatThenAssertor.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/InAssertor.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/InAssertor.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/LessThenAssertor.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/LessThenAssertor.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/LikeAssertor.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/LikeAssertor.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/NotEqualsAssertor.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/NotEqualsAssertor.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/assertor/NotInAssertor.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/assertor/NotInAssertor.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/CellBuilder.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/CellBuilder.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/DuplicateType.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/DuplicateType.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/ExpandBuilder.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/ExpandBuilder.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/NoneExpandBuilder.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/NoneExpandBuilder.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicateUnit.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicateUnit.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicator$1.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicator$1.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicator.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/CellDownDuplicator.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownBlankCellApply.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownBlankCellApply.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownDuplicate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownDuplicate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownDuplocatorWrapper.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownDuplocatorWrapper.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownExpandBuilder.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/down/DownExpandBuilder.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicateUnit.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicateUnit.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicator$1.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicator$1.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicator.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/CellRightDuplicator.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightBlankCellApply.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightBlankCellApply.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightDuplicate.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightDuplicate.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightDuplocatorWrapper.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightDuplocatorWrapper.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightExpandBuilder.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/cell/right/RightExpandBuilder.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/compute/ChartValueCompute.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/compute/ChartValueCompute.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/compute/DatasetValueCompute.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/compute/DatasetValueCompute.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/compute/ExpressionValueCompute.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/compute/ExpressionValueCompute.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/compute/ImageValueCompute.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/compute/ImageValueCompute.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/compute/SimpleValueCompute.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/compute/SimpleValueCompute.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/compute/SlashValueCompute.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/compute/SlashValueCompute.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/compute/ValueCompute.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/compute/ValueCompute.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/compute/ZxingValueCompute.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/compute/ZxingValueCompute.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/paging/BasePagination.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/paging/BasePagination.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/paging/FitPagePagination.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/paging/FitPagePagination.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/paging/FixRowsPagination.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/paging/FixRowsPagination.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/paging/HeaderFooter.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/paging/HeaderFooter.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/paging/Page.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/paging/Page.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/paging/Pagination.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/paging/Pagination.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/paging/PagingBuilder.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/paging/PagingBuilder.class
--- a/ureport2-core/target/classes/com/bstek/ureport/build/paging/RepeatRows.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/build/paging/RepeatRows.class
--- a/ureport2-core/target/classes/com/bstek/ureport/cache/CacheUtils.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/cache/CacheUtils.class
--- a/ureport2-core/target/classes/com/bstek/ureport/cache/DefaultMemoryReportDefinitionCache.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/cache/DefaultMemoryReportDefinitionCache.class
--- a/ureport2-core/target/classes/com/bstek/ureport/cache/ReportCache.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/cache/ReportCache.class
--- a/ureport2-core/target/classes/com/bstek/ureport/cache/ReportDefinitionCache.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/cache/ReportDefinitionCache.class
--- a/ureport2-core/target/classes/com/bstek/ureport/cache/ResourceCache.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/cache/ResourceCache.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/Chart.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/Chart.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/ChartData.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/ChartData.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/FontStyle.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/FontStyle.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/Axes.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/Axes.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/BaseAxes.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/BaseAxes.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/ScaleLabel.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/ScaleLabel.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/XPosition.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/XPosition.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/YPosition.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/YPosition.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/impl/XAxes.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/impl/XAxes.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/axes/impl/YAxes.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/axes/impl/YAxes.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/BaseDataset.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/BaseDataset.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/BubbleData.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/BubbleData.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/CollectType.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/CollectType.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/Dataset.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/Dataset.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/PointStyle.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/PointStyle.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/ScatterData.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/ScatterData.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/BubbleDataset.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/BubbleDataset.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/MixDataset.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/MixDataset.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/ScatterDataset.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/ScatterDataset.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/AreaDataset.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/AreaDataset.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/BarDataset.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/BarDataset.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/CategoryDataset$1.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/CategoryDataset$1.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/CategoryDataset.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/CategoryDataset.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/DoughnutDataset.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/DoughnutDataset.class
--- a/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/HorizontalBarDataset.class
+++ b/ureport2-core/target/classes/com/bstek/ureport/chart/dataset/impl/category/HorizontalBarDataset.class