refactor(conflict):

This commit is contained in:
sanfan.hx
2019-02-01 12:54:05 +08:00
189 changed files with 2675 additions and 964 deletions

View File

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_go/components/widget_demo.dart';
import 'demo.dart';
import 'package:flutter_go/widgets/elements/Form/Text/RichText/demo.dart';
const String intro = """
### **简介**

View File

@ -38,7 +38,7 @@ class _Demo extends State<Demo> {
return WidgetDemo(
title: "Text",
docUrl: 'flutter/widgets/Text-class.html',
codeUrl: 'elements/Form/Text/Text/index.dart',
codeUrl: 'elements/Form/Text/Text/demo.dart',
contentList: [
intro,
TextDemo(),

View File

@ -1,16 +1,16 @@
import '../../../../model/widget.dart';
import "package:flutter/material.dart";
import 'RichText/index.dart' as RichText;
// import 'RichText/index.dart' as RichText;
import 'Text/index.dart' as Text;
List<WidgetPoint> widgetPoints = [
WidgetPoint(
name: 'RichText',
routerName: RichText.Demo.routeName,
buildRouter: (BuildContext context) => RichText.Demo(),
),
// WidgetPoint(
// name: 'RichText',
// routerName: RichText.Demo.routeName,
// buildRouter: (BuildContext context) => RichText.Demo(),
// ),
WidgetPoint(
name: 'Text',
routerName: Text.Demo.routeName,