Merge pull request #401 from zmtzawqlp/fixed

zmtzawqlp fixed
wuba · Jun 18, 2024 · 383690c · 383690c
2 parents 6d8c4be + 46eeac6
commit 383690c
Show file tree

Hide file tree

Showing 291 changed files with 10,517 additions and 7,418 deletions.
diff --git a/dart2dsl/lib/fairdsl/fair_ast_gen.dart b/dart2dsl/lib/fairdsl/fair_ast_gen.dart
diff --git a/dart2dsl/lib/fairdsl/fair_check_node_map.dart b/dart2dsl/lib/fairdsl/fair_check_node_map.dart
@@ -1,9 +1,3 @@
-/*
- * Copyright (C) 2005-present, 58.com.  All rights reserved.
- * Use of this source code is governed by a BSD type license that can be
- * found in the LICENSE file.
- */
-
 // **************************************************************************
 // 如果存在新文件需要更新，建议先执行清除命令：
 // flutter packages pub run build_runner clean
@@ -58,5 +52,5 @@ final checkNode = {
   'WithClauseImpl': 'visitWithClause',
   'PropertyAccessImpl': 'visitPropertyAccess',
   'PrefixExpressionImpl': 'visitPrefixExpression',
-  'TypeArgumentListImpl':'visitTypeArgumentList'
+  'TypeArgumentListImpl': 'visitTypeArgumentList'
 };
diff --git a/dart2dsl/lib/fairdsl/fair_dsl_gen.dart b/dart2dsl/lib/fairdsl/fair_dsl_gen.dart
diff --git a/dart2dsl/lib/src/widget.dart b/dart2dsl/lib/src/widget.dart
diff --git a/example/assets/fair/fair_patch.zip b/example/assets/fair/fair_patch.zip
diff --git a/example/assets/fair/lib_best_flutter_ui_component_home_list.fair.bin b/example/assets/fair/lib_best_flutter_ui_component_home_list.fair.bin
diff --git a/example/assets/fair/lib_best_flutter_ui_component_hotel_listview_content.fair.bin b/example/assets/fair/lib_best_flutter_ui_component_hotel_listview_content.fair.bin
diff --git a/example/assets/fair/lib_best_flutter_ui_feedback_screen.fair.bin b/example/assets/fair/lib_best_flutter_ui_feedback_screen.fair.bin
diff --git a/example/assets/fair/lib_best_flutter_ui_help_screen.fair.bin b/example/assets/fair/lib_best_flutter_ui_help_screen.fair.bin
diff --git a/example/assets/fair/lib_best_flutter_ui_invite_friend_screen.fair.bin b/example/assets/fair/lib_best_flutter_ui_invite_friend_screen.fair.bin
diff --git a/example/assets/fair/lib_fair_widget_fairbinding_fair_binding_sample.fair.bin b/example/assets/fair/lib_fair_widget_fairbinding_fair_binding_sample.fair.bin
diff --git a/example/assets/fair/lib_json_file_explain.fair.bin b/example/assets/fair/lib_json_file_explain.fair.bin
diff --git a/example/assets/fair/lib_main.fair.js b/example/assets/fair/lib_main.fair.js
diff --git a/example/assets/fair/lib_page2page_page_one.fair.bin b/example/assets/fair/lib_page2page_page_one.fair.bin
diff --git a/example/assets/fair/lib_page2page_page_one.fair.json b/example/assets/fair/lib_page2page_page_one.fair.json
@@ -38,19 +38,24 @@
       "className": "FloatingActionButton",
       "na": {
         "onPressed": {
-          "className": "Navigator.pushNamed",
-          "pa": [
-            "^(context)",
-            "fair_page_two"
-          ],
-          "na": {
-            "arguments": {
-              "path": "assets/fair/lib_page2page_page_two.fair.json",
-              "data": {
-                "title": "PageTwo"
+          "className": "FairFunction",
+          "body": {
+            "className": "Navigator.pushNamed",
+            "pa": [
+              "^(context)",
+              "fair_page_two"
+            ],
+            "na": {
+              "arguments": {
+                "path": "assets/fair/lib_page2page_page_two.fair.json",
+                "data": {
+                  "title": "PageTwo"
+                }
               }
             }
-          }
+          },
+          "tag": "void Function()",
+          "rt": "void"
         },
         "tooltip": "Increment",
         "child": {

diff --git a/example/assets/fair/lib_template_appbar_appbar_template.fair.bin b/example/assets/fair/lib_template_appbar_appbar_template.fair.bin
diff --git a/example/assets/fair/lib_template_detail_page_fair_detail.fair.bin b/example/assets/fair/lib_template_detail_page_fair_detail.fair.bin
diff --git a/example/assets/fair/lib_template_detail_page_fair_detail.fair.js b/example/assets/fair/lib_template_detail_page_fair_detail.fair.js
diff --git a/example/assets/fair/lib_template_drawer_drawer_template.fair.bin b/example/assets/fair/lib_template_drawer_drawer_template.fair.bin
diff --git a/example/assets/fair/lib_template_fab_fab_template.fair.bin b/example/assets/fair/lib_template_fab_fab_template.fair.bin
diff --git a/example/assets/fair/lib_template_gridview_gridview_template.fair.bin b/example/assets/fair/lib_template_gridview_gridview_template.fair.bin
diff --git a/example/assets/fair/lib_template_gridview_gridview_template.fair.js b/example/assets/fair/lib_template_gridview_gridview_template.fair.js
diff --git a/example/assets/fair/lib_template_gridview_gridview_template.fair.json b/example/assets/fair/lib_template_gridview_gridview_template.fair.json
@@ -31,53 +31,64 @@
       ],
       "na": {
         "trueValue": {
-          "className": "Center",
-          "na": {
-            "child": {
-              "className": "Text",
-              "pa": [
-                "加载中..."
-              ]
+          "className": "FairFunction",
+          "body": {
+            "className": "Center",
+            "na": {
+              "child": {
+                "className": "Text",
+                "pa": [
+                  "加载中..."
+                ]
+              }
             }
-          }
+          },
+          "tag": "Widget Function()",
+          "rt": "Widget"
         },
         "falseValue": {
-          "className": "GridView.count",
-          "na": {
-            "crossAxisCount": 2,
-            "mainAxisSpacing": 10,
-            "crossAxisSpacing": 10,
-            "children": {
-              "className": "Sugar.map",
-              "pa": [
-                "^(_listData)"
-              ],
-              "na": {
-                "builder": {
-                  "className": "AspectRatio",
-                  "na": {
-                    "aspectRatio": 1.5,
-                    "child": {
-                      "className": "ClipRRect",
+          "className": "FairFunction",
+          "body": {
+            "className": "GridView.count",
+            "na": {
+              "crossAxisCount": 2,
+              "mainAxisSpacing": 10,
+              "crossAxisSpacing": 10,
+              "children": {
+                "className": "Sugar.map",
+                "pa": [
+                  "^(_listData)"
+                ],
+                "na": {
+                  "builder": {
+                    "className": "FairFunction",
+                    "body": {
+                      "className": "AspectRatio",
                       "na": {
-                        "borderRadius": {
-                          "className": "BorderRadius.all",
-                          "pa": [
-                            {
-                              "className": "Radius.circular",
+                        "aspectRatio": 1.5,
+                        "child": {
+                          "className": "ClipRRect",
+                          "na": {
+                            "borderRadius": {
+                              "className": "BorderRadius.all",
                               "pa": [
-                                4.0
+                                {
+                                  "className": "Radius.circular",
+                                  "pa": [
+                                    4.0
+                                  ]
+                                }
                               ]
+                            },
+                            "child": {
+                              "className": "Image.network",
+                              "pa": [
+                                "$(item.picUrl)"
+                              ],
+                              "na": {
+                                "fit": "#(BoxFit.cover)"
+                              }
                             }
-                          ]
-                        },
-                        "child": {
-                          "className": "Image.network",
-                          "pa": [
-                            "$(item.picUrl)"
-                          ],
-                          "na": {
-                            "fit": "#(BoxFit.cover)"
                           }
                         }
                       }
@@ -91,7 +102,9 @@
                 }
               }
             }
-          }
+          },
+          "tag": "Widget Function()",
+          "rt": "Widget"
         }
       }
     }

diff --git a/example/assets/fair/lib_template_hotel_listview_hotel_listview_template.fair.bin b/example/assets/fair/lib_template_hotel_listview_hotel_listview_template.fair.bin
diff --git a/example/assets/fair/lib_template_hotel_listview_hotel_listview_template.fair.js b/example/assets/fair/lib_template_hotel_listview_hotel_listview_template.fair.js