Skip to content

GEM: エンタープライズ版機能との互換性対応 #2075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CHENHAOWEN0105 merged 11 commits into from
Jun 3, 2026
Merged

GEM: エンタープライズ版機能との互換性対応 #2075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7b29cd1
ExcelView：FilterItemタイプの拡充関連のパース追加対応 (#1987)
xnie-yabin2 Mar 19, 2026
929c086
Merge branch 'master' into feature/excelView-dev
xnie-yabin2 Mar 19, 2026
5acaef9
現行Options対応のリネーム (#2006)
CHENHAOWEN0105 Apr 1, 2026
76e9c65
Merge branch 'master' into feature/excelView-dev
xnie-yabin2 Apr 2, 2026
dcf48f6
Merge branch 'master' into feature/excelView-dev
xnie-yabin2 Apr 3, 2026
b005a67
コードフォーマット (#2013)
xnie-yabin2 Apr 7, 2026
7aac0a1
Merge branch 'master' into feature/excelView-dev
xnie-yabin2 May 7, 2026
e3b47c0
Merge branch 'master' into feature/excelView-dev
xnie-yabin2 May 21, 2026
defe2eb
Merge branch 'master' into feature/excelView-dev
xnie-yabin2 May 25, 2026
295eb56
GEM: SpreadSheet関連の実装対応 (#2073)
CHENHAOWEN0105 Jun 3, 2026
430669e
Revert "GEM: SpreadSheet関連の実装対応 (#2073)" (#2074)
CHENHAOWEN0105 Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions iplass-gem/src/main/java/org/iplass/mtp/view/generic/ViewConst.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ public class ViewConst {
public static final String DESIGN_TYPE = "designType";
public static final String DESIGN_TYPE_GEM = "gem";
public static final String DESIGN_TYPE_GEM_AGGREGATION = "gem_aggregation";
public static final String DESIGN_TYPE_GEM_SPREADSHEET = "gem_spreadsheet";

}
5 changes: 4 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/AutoNumberPropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@
@XmlAccessorType(XmlAccessType.FIELD)
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/AutoNumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/AutoNumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/AutoNumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterAutoNumberPropertyEditor.jsp",
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
public class AutoNumberPropertyEditor extends PrimitivePropertyEditor implements LabelablePropertyEditor {

Expand Down
5 changes: 4 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/BooleanPropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@
*/
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/BooleanPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/BooleanPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/BooleanPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterBooleanPropertyEditor.jsp",
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
public class BooleanPropertyEditor extends PrimitivePropertyEditor implements LabelablePropertyEditor {

Expand Down
3 changes: 2 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/DatePropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
@XmlAccessorType(XmlAccessType.FIELD)
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/DatePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/DatePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/DatePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterDatePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
public class DatePropertyEditor extends DateTimePropertyEditor {

Expand Down
6 changes: 5 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/DecimalPropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@
@XmlAccessorType(XmlAccessType.FIELD)
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/DecimalPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/DecimalPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/DecimalPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterDecimalPropertyEditor.jsp",
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.

})
public class DecimalPropertyEditor extends NumberPropertyEditor {

Expand Down
5 changes: 4 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/ExpressionPropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@
@XmlAccessorType(XmlAccessType.FIELD)
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/ExpressionPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/ExpressionPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/ExpressionPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterExpressionPropertyEditor.jsp",
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
public class ExpressionPropertyEditor extends PrimitivePropertyEditor implements LabelablePropertyEditor {

Expand Down
5 changes: 4 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/FloatPropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
@XmlAccessorType(XmlAccessType.FIELD)
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterNumberPropertyEditor.jsp",
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
public class FloatPropertyEditor extends NumberPropertyEditor {

Expand Down
5 changes: 4 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/IntegerPropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
@XmlAccessorType(XmlAccessType.FIELD)
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterNumberPropertyEditor.jsp",
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
public class IntegerPropertyEditor extends NumberPropertyEditor {

Expand Down
5 changes: 4 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/LongTextPropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@
@XmlAccessorType(XmlAccessType.FIELD)
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/StringPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/StringPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/StringPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterStringPropertyEditor.jsp",
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
@IgnoreField({ "searchInRange", "hideSearchConditionFrom", "hideSearchConditionTo", "hideSearchConditionRangeSymbol", "searchExactMatchCondition" })
public class LongTextPropertyEditor extends StringPropertyEditor {
Expand Down
5 changes: 4 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/ReferencePropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@
@XmlAccessorType(XmlAccessType.FIELD)
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/ReferencePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/ReferencePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/ReferencePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterReferencePropertyEditor.jsp",
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
public class ReferencePropertyEditor extends PropertyEditor implements HasNestProperty, LabelablePropertyEditor {

Expand Down
5 changes: 4 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/SelectPropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@
@XmlAccessorType(XmlAccessType.FIELD)
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/SelectPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/SelectPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/SelectPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterSelectPropertyEditor.jsp",
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
public class SelectPropertyEditor extends PrimitivePropertyEditor implements LabelablePropertyEditor {

Expand Down
5 changes: 4 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/StringPropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,10 @@
@XmlSeeAlso({ LongTextPropertyEditor.class })
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/StringPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/StringPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/StringPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterStringPropertyEditor.jsp",
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
public class StringPropertyEditor extends PrimitivePropertyEditor implements LabelablePropertyEditor {

Expand Down
3 changes: 2 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/TimePropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
@XmlAccessorType(XmlAccessType.FIELD)
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/TimePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/TimePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/TimePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterTimePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
public class TimePropertyEditor extends DateTimePropertyEditor {

Expand Down
5 changes: 4 additions & 1 deletion iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/TimestampPropertyEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@
@XmlAccessorType(XmlAccessType.FIELD)
@Jsps({
@Jsp(path = "/jsp/gem/generic/editor/TimestampPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
@Jsp(path = "/jsp/gem/aggregation/unit/editor/TimestampPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
@Jsp(path = "/jsp/gem/aggregation/unit/editor/TimestampPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
@Jsp(
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterTimestampPropertyEditor.jsp",
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
Comment thread
CHENHAOWEN0105 marked this conversation as resolved.
})
public class TimestampPropertyEditor extends DateTimePropertyEditor {

Expand Down
Loading