Skip to content

Commit 28c18e1

Browse files
CHENHAOWEN0105xnie-yabin2lismyrxkazama-yukio3Jenkins-sys00361
authored
GEM: SpreadSheet関連の実装対応 (#2075)
* ExcelView：FilterItemタイプの拡充関連のパース追加対応 (#1987) * 現行Options対応のリネーム (#2006) * excel → spreadsheet のリネーム * 指摘対応 * 指摘対応 * 指摘対応 * 指摘対応 * 指摘対応 --------- Co-authored-by: lismyr <lismyr@isidgp1937.snet.isid.co.jp> * コードフォーマット (#2013) * GEM: SpreadSheet関連の実装対応 (#2073) * GEM: 検索条件のReferencePropertyEditorが表示タイプ「UNIQUE」かつ多重度=1の場合、削除ボタンが動作しない修正 (#2069) * [Gradle Release Plugin] - pre tag commit: '4.0.20'. * [Gradle Release Plugin] - new version commit: '4.0.21-SNAPSHOT'. * Update README * Update README-EN Updated version number for iplass-gem in Gradle and Maven examples. * 4.1.0 マイナーバージョンアップ (#2071) - gradle.properties のバージョン変更 --------- Co-authored-by: Yukio Kazama <xkazama.yukio3@contract.dentsusoken.com> Co-authored-by: Jenkins-sys00361 <sys00361@isid.co.jp> Co-authored-by: HiguchiKiyoshi <higuchi.kiyoshi@dentsusoken.com> Co-authored-by: SEKIGUCHI Naoya <xsekiguchi.naoya2@contract.dentsusoken.com> * Revert "GEM: SpreadSheet関連の実装対応 (#2073)" (#2074) This reverts commit 295eb56. --------- Co-authored-by: xnie-yabin2 <xnie.yabin2@contract.dentsusoken.com> Co-authored-by: lismyr <lismyr@isidgp1937.snet.isid.co.jp> Co-authored-by: Yukio Kazama <xkazama.yukio3@contract.dentsusoken.com> Co-authored-by: Jenkins-sys00361 <sys00361@isid.co.jp> Co-authored-by: HiguchiKiyoshi <higuchi.kiyoshi@dentsusoken.com> Co-authored-by: SEKIGUCHI Naoya <xsekiguchi.naoya2@contract.dentsusoken.com>
1 parent 7a072ec commit 28c18e1

14 files changed

Lines changed: 50 additions & 13 deletions

‎iplass-gem/src/main/java/org/iplass/mtp/view/generic/ViewConst.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ public class ViewConst {
2525
public static final String DESIGN_TYPE = "designType";
2626
public static final String DESIGN_TYPE_GEM = "gem";
2727
public static final String DESIGN_TYPE_GEM_AGGREGATION = "gem_aggregation";
28+
public static final String DESIGN_TYPE_GEM_SPREADSHEET = "gem_spreadsheet";
2829

2930
}

‎iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/AutoNumberPropertyEditor.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@
3939
@XmlAccessorType(XmlAccessType.FIELD)
4040
@Jsps({
4141
@Jsp(path = "/jsp/gem/generic/editor/AutoNumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
42-
@Jsp(path = "/jsp/gem/aggregation/unit/editor/AutoNumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
42+
@Jsp(path = "/jsp/gem/aggregation/unit/editor/AutoNumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
43+
@Jsp(
44+
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterAutoNumberPropertyEditor.jsp",
45+
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
4346
})
4447
public class AutoNumberPropertyEditor extends PrimitivePropertyEditor implements LabelablePropertyEditor {
4548

‎iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/BooleanPropertyEditor.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@
4242
*/
4343
@Jsps({
4444
@Jsp(path = "/jsp/gem/generic/editor/BooleanPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
45-
@Jsp(path = "/jsp/gem/aggregation/unit/editor/BooleanPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
45+
@Jsp(path = "/jsp/gem/aggregation/unit/editor/BooleanPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
46+
@Jsp(
47+
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterBooleanPropertyEditor.jsp",
48+
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
4649
})
4750
public class BooleanPropertyEditor extends PrimitivePropertyEditor implements LabelablePropertyEditor {
4851

‎iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/DatePropertyEditor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
@XmlAccessorType(XmlAccessType.FIELD)
4040
@Jsps({
4141
@Jsp(path = "/jsp/gem/generic/editor/DatePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
42-
@Jsp(path = "/jsp/gem/aggregation/unit/editor/DatePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
42+
@Jsp(path = "/jsp/gem/aggregation/unit/editor/DatePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
43+
@Jsp(path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterDatePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
4344
})
4445
public class DatePropertyEditor extends DateTimePropertyEditor {
4546

‎iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/DecimalPropertyEditor.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@
3434
@XmlAccessorType(XmlAccessType.FIELD)
3535
@Jsps({
3636
@Jsp(path = "/jsp/gem/generic/editor/DecimalPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
37-
@Jsp(path = "/jsp/gem/aggregation/unit/editor/DecimalPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
37+
@Jsp(path = "/jsp/gem/aggregation/unit/editor/DecimalPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
38+
@Jsp(
39+
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterDecimalPropertyEditor.jsp",
40+
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
41+
3842
})
3943
public class DecimalPropertyEditor extends NumberPropertyEditor {
4044

‎iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/ExpressionPropertyEditor.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@
4040
@XmlAccessorType(XmlAccessType.FIELD)
4141
@Jsps({
4242
@Jsp(path = "/jsp/gem/generic/editor/ExpressionPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
43-
@Jsp(path = "/jsp/gem/aggregation/unit/editor/ExpressionPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
43+
@Jsp(path = "/jsp/gem/aggregation/unit/editor/ExpressionPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
44+
@Jsp(
45+
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterExpressionPropertyEditor.jsp",
46+
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
4447
})
4548
public class ExpressionPropertyEditor extends PrimitivePropertyEditor implements LabelablePropertyEditor {
4649

‎iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/FloatPropertyEditor.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
@XmlAccessorType(XmlAccessType.FIELD)
3535
@Jsps({
3636
@Jsp(path = "/jsp/gem/generic/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
37-
@Jsp(path = "/jsp/gem/aggregation/unit/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
37+
@Jsp(path = "/jsp/gem/aggregation/unit/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
38+
@Jsp(
39+
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterNumberPropertyEditor.jsp",
40+
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
3841
})
3942
public class FloatPropertyEditor extends NumberPropertyEditor {
4043

‎iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/IntegerPropertyEditor.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@
3434
@XmlAccessorType(XmlAccessType.FIELD)
3535
@Jsps({
3636
@Jsp(path = "/jsp/gem/generic/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
37-
@Jsp(path = "/jsp/gem/aggregation/unit/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
37+
@Jsp(path = "/jsp/gem/aggregation/unit/editor/NumberPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
38+
@Jsp(
39+
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterNumberPropertyEditor.jsp",
40+
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
3841
})
3942
public class IntegerPropertyEditor extends NumberPropertyEditor {
4043

‎iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/LongTextPropertyEditor.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@
3636
@XmlAccessorType(XmlAccessType.FIELD)
3737
@Jsps({
3838
@Jsp(path = "/jsp/gem/generic/editor/StringPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
39-
@Jsp(path = "/jsp/gem/aggregation/unit/editor/StringPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
39+
@Jsp(path = "/jsp/gem/aggregation/unit/editor/StringPropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
40+
@Jsp(
41+
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterStringPropertyEditor.jsp",
42+
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
4043
})
4144
@IgnoreField({ "searchInRange", "hideSearchConditionFrom", "hideSearchConditionTo", "hideSearchConditionRangeSymbol", "searchExactMatchCondition" })
4245
public class LongTextPropertyEditor extends StringPropertyEditor {

‎iplass-gem/src/main/java/org/iplass/mtp/view/generic/editor/ReferencePropertyEditor.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@
4545
@XmlAccessorType(XmlAccessType.FIELD)
4646
@Jsps({
4747
@Jsp(path = "/jsp/gem/generic/editor/ReferencePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM),
48-
@Jsp(path = "/jsp/gem/aggregation/unit/editor/ReferencePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION)
48+
@Jsp(path = "/jsp/gem/aggregation/unit/editor/ReferencePropertyEditor.jsp", key = ViewConst.DESIGN_TYPE_GEM_AGGREGATION),
49+
@Jsp(
50+
path = "/jsp/gem/spreadsheet/element/section/editor/SpreadSheetFilterReferencePropertyEditor.jsp",
51+
key = ViewConst.DESIGN_TYPE_GEM_SPREADSHEET)
4952
})
5053
public class ReferencePropertyEditor extends PropertyEditor implements HasNestProperty, LabelablePropertyEditor {
5154

0 commit comments

Comments
 (0)