From e3d864c92f6d1971df962548c60e5e2af86351cf Mon Sep 17 00:00:00 2001
From: Caijinglong <cjl_spy@163.com>
Date: Tue, 20 Aug 2019 09:13:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=20class=20name=20?=
 =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD,=20=E5=90=8E?=
 =?UTF-8?q?=E7=BB=AD=E4=BF=AE=E6=94=B9=E6=9B=B4=E5=8F=8B=E5=96=84=E7=9A=84?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/generator.dart      | 22 +++++++++++++++-------
 lib/json_generator.dart | 24 +++++++++++++++++++-----
 web/index.html          | 12 ++++++------
 web/index_ch.html       |  2 +-
 web/styles.css          | 13 +++++++++++--
 5 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/lib/generator.dart b/lib/generator.dart
index 041a4e1..36be902 100644
--- a/lib/generator.dart
+++ b/lib/generator.dart
@@ -37,7 +37,7 @@ class Generator {
 
   String makeDartCode() {
     StringBuffer resultSb = StringBuffer();
-    handleTemplate(templateList);
+    handleInputClassName();
 
     resultSb.writeln(header);
     templateList.forEach((template) {
@@ -46,7 +46,20 @@ class Generator {
     return resultSb.toString();
   }
 
-  void handleTemplate(List<DefaultTemplate> templateList) {}
+  void handleInputClassName() {
+    final text = eClassName.value;
+    final lines = text.split("\n");
+
+    for (var i = 0; i < templateList.length; i++) {
+      final template = templateList[i];
+      final line = lines[i].trim();
+      final inputKeyValue = line.split(":");
+      final inputName = inputKeyValue[1];
+
+      template.className = inputName;
+      print("设置 template class name 为 $inputName");
+    }
+  }
 
   void refreshTemplate(DefaultTemplate template) {
     var fieldList = template.fieldList;
@@ -94,11 +107,6 @@ class Generator {
     }
     return sb.toString();
   }
-
-  void changeClassName(String text) {
-    final texts = text.split("\n");
-    print(texts);
-  }
 }
 
 String camelCase2UnderScoreCase(String name) {
diff --git a/lib/json_generator.dart b/lib/json_generator.dart
index 2504df9..b8ce9f0 100644
--- a/lib/json_generator.dart
+++ b/lib/json_generator.dart
@@ -29,7 +29,7 @@ enum Version { v0, v1 }
 Version v = Version.v0;
 
 TextAreaElement eResult;
-Element eClassName;
+TextAreaElement eClassName;
 Element editButton;
 void main() async {
   isChinese = await _isChinese();
@@ -244,10 +244,14 @@ void makeCode(Generator generator) {
   } else {
     filePrefix = "your dart file name is:";
   }
-  // print(filePrefix);
-  querySelector("#file_name").text = "$filePrefix $dartFileName";
+  final resultName = "$filePrefix $dartFileName";
+  writeToResult(resultName, dartCode);
+}
 
-  eResult.value = dartCode;
+void writeToResult(String resultName, String resultText) {
+  // print(filePrefix);
+  querySelector("#file_name").text = resultName;
+  eResult.value = resultText;
 }
 
 String formatJson(String jsonString) {
@@ -266,5 +270,15 @@ void showOrClassName() {
 }
 
 void refreshClassNameChange(String text) {
-  generator.changeClassName(text);
+  final value = generator.makeDartCode();
+  String filePrefix;
+  if (isChinese) {
+    filePrefix = "应该使用的文件名为:";
+  } else {
+    filePrefix = "your dart file name is:";
+  }
+  var dartFileName = ("${generator.fileName}.dart");
+  downloadFileName = dartFileName;
+  final resultName = "$filePrefix $dartFileName";
+  writeToResult(resultName, value);
 }
diff --git a/web/index.html b/web/index.html
index 229b012..4c078aa 100644
--- a/web/index.html
+++ b/web/index.html
@@ -66,12 +66,6 @@
         <div class="content">
           <span class="half_span">
             <textarea id="json" title="json" class="content_area"></textarea>
-            <textarea
-              id="class_name"
-              title="json"
-              class="content_area"
-              hidden
-            ></textarea>
           </span>
           <span class="half_span">
             <textarea
@@ -79,6 +73,12 @@
               title="result"
               class="content_area"
             ></textarea>
+            <textarea
+              id="class_name"
+              title="class name"
+              class="content_area"
+              hidden
+            ></textarea>
           </span>
         </div>
         <div class="func">
diff --git a/web/index_ch.html b/web/index_ch.html
index 6da9eea..ec36e37 100644
--- a/web/index_ch.html
+++ b/web/index_ch.html
@@ -75,7 +75,7 @@
           <textarea id="result" title="结果" class="content_area"></textarea>
           <textarea
             id="class_name"
-            title="json"
+            title="class name"
             class="content_area"
             hidden
           ></textarea>
diff --git a/web/styles.css b/web/styles.css
index 20d61e7..4110906 100644
--- a/web/styles.css
+++ b/web/styles.css
@@ -21,7 +21,6 @@ h1 {
 
 textarea {
   width: 86%;
-  height: 70vh;
 }
 
 .content {
@@ -34,7 +33,7 @@ textarea {
 }
 
 button {
-  width: 6rem;
+  width: 9rem;
   height: 2rem;
   font-size: 1rem;
 }
@@ -63,3 +62,13 @@ a:hover {
   font-size: 10px;
   text-align: center;
 }
+
+.content_area {
+  height: 60vh;
+}
+
+#class_name {
+  width: 86%;
+  background-color: rgba(255, 255, 0, 0.164);
+  height: 60vh;
+}