Merge pull request #53 from wwt/Issue52

Fixed Issue #52: add `showOtherItem` and `showNoneItem` support to `Dropdown`
goxiaoy · Apr 23, 2023 · 58ceacf · 58ceacf
2 parents 6fc2315 + 2024103
commit 58ceacf
Show file tree

Hide file tree

Showing 14 changed files with 485 additions and 42 deletions.
diff --git a/example/assets/complex.json b/example/assets/complex.json
@@ -29,7 +29,9 @@
           "name": "dropdown_question",
           "choices": [
             "item1"
-          ]
+          ],
+          "showOtherItem": true,
+          "showNoneItem": true
         },
         {
           "type": "comment",

diff --git a/example/assets/single_page.json b/example/assets/single_page.json
@@ -28,7 +28,11 @@
           "name": "dropdown_question",
           "choices": [
             "item1"
-          ]
+          ],
+          "showOtherItem": true,
+          "showNoneItem": true,
+          "otherText": "Other (Feedback)",
+          "noneText": "Nothing"
         },
         {
           "type": "comment",

diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
@@ -24,6 +24,9 @@ class MessageLookup extends MessageLookupByLibrary {
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
         "add": MessageLookupByLibrary.simpleMessage("Add"),
         "nextPage": MessageLookupByLibrary.simpleMessage("Next Page"),
+        "noneItemText": MessageLookupByLibrary.simpleMessage("None"),
+        "otherItemText":
+            MessageLookupByLibrary.simpleMessage("Other (describe)"),
         "placeholder": MessageLookupByLibrary.simpleMessage("Select..."),
         "previousPage": MessageLookupByLibrary.simpleMessage("PreviousPage"),
         "remove": MessageLookupByLibrary.simpleMessage("Remove"),

diff --git a/lib/generated/intl/messages_zh.dart b/lib/generated/intl/messages_zh.dart
@@ -24,6 +24,8 @@ class MessageLookup extends MessageLookupByLibrary {
   static Map<String, Function> _notInlinedMessages(_) => <String, Function>{
         "add": MessageLookupByLibrary.simpleMessage("添加"),
         "nextPage": MessageLookupByLibrary.simpleMessage("下一页"),
+        "noneItemText": MessageLookupByLibrary.simpleMessage("无"),
+        "otherItemText": MessageLookupByLibrary.simpleMessage("填写其他答案"),
         "placeholder": MessageLookupByLibrary.simpleMessage("请选择..."),
         "previousPage": MessageLookupByLibrary.simpleMessage("上一页"),
         "remove": MessageLookupByLibrary.simpleMessage("删除"),

diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
@@ -4,5 +4,7 @@
   "submitSurvey": "Submit",
   "add": "Add",
   "remove": "Remove",
-  "placeholder": "Select..."
+  "placeholder": "Select...",
+  "otherItemText": "Other (describe)",
+  "noneItemText": "None"
 }
diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb
@@ -4,5 +4,7 @@
   "submitSurvey": "提交",
   "add": "添加",
   "remove": "删除",
-  "placeholder": "请选择..."
+  "placeholder": "请选择...",
+  "otherItemText": "填写其他答案",
+  "noneItemText": "无"
 }
diff --git a/lib/model/matrix.dart b/lib/model/matrix.dart
@@ -88,10 +88,8 @@ abstract class MatrixDropdownBase extends MatrixBase {
   String? detailPanelMode;
   bool? horizontalScroll;
   String? optionsCaption;
-
   @JsonKey(fromJson: ItemValue.fromListJson)
   List<ItemValue>? choices;
-
   String? keyDuplicationError;
   //"dropdown","checkbox","radiogroup","text","comment","boolean","expression",  "rating"
   String? cellType;

diff --git a/lib/model/select_base.dart b/lib/model/select_base.dart
@@ -16,7 +16,7 @@ abstract class SelectBase<T extends ItemValue> extends Question {
   String? choicesEnableIf;
   bool? hasOther;
   bool? hasNone;
-  String? otherPlaceHolder;
+  String? otherPlaceholder;
   String? noneText;
   String? otherText;
   String? otherErrorText;

diff --git a/lib/model/survey.dart b/lib/model/survey.dart
@@ -309,7 +309,12 @@ class Dropdown extends SelectBase {
   num? choicesMax;
   num? choicesStep;
   String? autoComplete;
+
   String? placeholder;
+
+  bool? showOtherItem;
+  bool? showNoneItem;
+
   Dropdown();
   factory Dropdown.fromJson(Map<String, dynamic> json) =>
       _$DropdownFromJson(json);

diff --git a/lib/model/survey.g.dart b/lib/model/survey.g.dart