feat: Add the text option for QJsonSchemaString to handle multipl…

…e lines of text
zmoth · Sep 18, 2023 · 23f76a7 · 23f76a7
1 parent fa99887
commit 23f76a7
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 146 deletions.
diff --git a/examples/Simple/MainWindow.cpp b/examples/Simple/MainWindow.cpp
@@ -15,7 +15,17 @@ const std::string jsonText = R"(
 {
   "type": "object",
   "title": "Json Example",
-  "ui:order": ["str", "enum", "file", "dir", "num", "range", "arr", "obj"],
+  "ui:order": [
+    "str",
+    "text",
+    "enum",
+    "file",
+    "dir",
+    "num",
+    "range",
+    "arr",
+    "obj"
+  ],
   "properties": {
     "invisible": {
       "ui:visible": false,
@@ -27,6 +37,12 @@ const std::string jsonText = R"(
       "default": "hello world",
       "description": "This is a tooltip"
     },
+    "text": {
+      "type": "string",
+      "ui:widget": "text",
+      "default": "hello world",
+      "description": "This is a tooltip"
+    },
     "enum": {
       "type": "string",
       "default": "hello world",

diff --git a/include/QJsonSchemaForm/QJsonSchemaWidgets.h b/include/QJsonSchemaForm/QJsonSchemaWidgets.h
@@ -8,11 +8,7 @@
 QT_BEGIN_NAMESPACE
 
 class QComboBox;
-class QLineEdit;
-class QPushButton;
-class QCheckBox;
 class QAbstractButton;
-class QDateEdit;
 class QFormLayout;
 class QToolButton;
 class QListWidget;
@@ -129,12 +125,8 @@ class QJsonSchemaString : public QJsonSchemaWidget
     [[nodiscard]] QJsonValue getValue() const override;
     void setValue(const QString &) const;
 
-    QComboBox *combo = nullptr;
-    QLineEdit *widget = nullptr;
-    QPushButton *fileButton = nullptr;
-    QPushButton *dirButton = nullptr;
-    QPushButton *colorButton = nullptr;
-    QDateEdit *dateEdit = nullptr;
+  private:
+    QWidget *_widget{nullptr};
 };
 
 /// @brief 布尔

diff --git a/json/strings.json b/json/strings.json
@@ -24,6 +24,12 @@
       "default": "dragonborn",
       "description": "String choice with default value"
     },
+    "text": {
+      "type": "string",
+      "ui:widget": "text",
+      "default": "{\n文本\n}",
+      "description": "文本编辑器"
+    },
     "string_color": {
       "title": "Color",
       "type": "string",

diff --git a/json/test.json b/json/test.json
@@ -1,7 +1,17 @@
 {
   "type": "object",
   "title": "Json Example",
-  "ui:order": ["str", "enum", "file", "dir", "num", "range", "arr", "obj"],
+  "ui:order": [
+    "str",
+    "text",
+    "enum",
+    "file",
+    "dir",
+    "num",
+    "range",
+    "arr",
+    "obj"
+  ],
   "properties": {
     "invisible": {
       "ui:visible": false,
@@ -13,6 +23,12 @@
       "default": "hello world",
       "description": "This is a tooltip"
     },
+    "text": {
+      "type": "string",
+      "ui:widget": "text",
+      "default": "hello world",
+      "description": "This is a tooltip"
+    },
     "enum": {
       "type": "string",
       "default": "hello world",