Merge branch 'v2.x'

mylxsw · Dec 21, 2024 · a0b95d6 · a0b95d6
2 parents ab5c3a7 + 098963c
commit a0b95d6
Show file tree

Hide file tree

Showing 8 changed files with 476 additions and 381 deletions.
diff --git a/lib/page/admin/models_add.dart b/lib/page/admin/models_add.dart
diff --git a/lib/page/admin/models_edit.dart b/lib/page/admin/models_edit.dart
diff --git a/lib/page/component/enhanced_input.dart b/lib/page/component/enhanced_input.dart
@@ -89,13 +89,8 @@ class EnhancedInput extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.end,
                     mainAxisSize: MainAxisSize.min,
                     children: [
-                      ConstrainedBox(
-                        constraints: BoxConstraints(
-                          maxWidth: MediaQuery.of(context).size.width - 160,
-                        ),
-                        child: value ?? Container(),
-                      ),
-                      const SizedBox(width: 10),
+                      Flexible(child: value ?? Container()),
+                      const SizedBox(width: 5),
                       icon ??
                           const Icon(
                             CupertinoIcons.chevron_forward,

diff --git a/lib/page/component/enhanced_textfield.dart b/lib/page/component/enhanced_textfield.dart
@@ -144,7 +144,8 @@ class _EnhancedTextFieldState extends State<EnhancedTextField> {
 
   @override
   Widget build(BuildContext context) {
-    if ((widget.labelText != null || widget.labelWidget != null) && widget.labelPosition != LabelPosition.inner) {
+    if ((widget.labelText != null || widget.labelWidget != null) &&
+        widget.labelPosition != LabelPosition.inner) {
       // 上下结构
       if (widget.labelPosition == LabelPosition.top) {
         return Column(
@@ -167,7 +168,8 @@ class _EnhancedTextFieldState extends State<EnhancedTextField> {
                             ),
                           ),
                           const SizedBox(width: 5),
-                          if (widget.labelHelpWidget != null) widget.labelHelpWidget!,
+                          if (widget.labelHelpWidget != null)
+                            widget.labelHelpWidget!,
                         ],
                       ),
                 if (widget.inputSelector != null) widget.inputSelector!,
@@ -253,8 +255,10 @@ class _EnhancedTextFieldState extends State<EnhancedTextField> {
                       fillColor: widget.customColors.textfieldBackgroundColor,
                       hintText: widget.hintText,
                       hintStyle: TextStyle(
-                        fontSize: widget.hintTextSize ?? CustomSize.defaultHintTextSize,
-                        color: widget.hintColor ?? widget.customColors.textfieldHintColor,
+                        fontSize: widget.hintTextSize ??
+                            CustomSize.defaultHintTextSize,
+                        color: widget.hintColor ??
+                            widget.customColors.textfieldHintColor,
                       ),
                       hintTextDirection: widget.textDirection,
                       counterText: "",
@@ -266,16 +270,22 @@ class _EnhancedTextFieldState extends State<EnhancedTextField> {
                         top: widget.labelPosition == LabelPosition.top ? 0 : 10,
                         left: widget.enableBackground ? 15 : 0,
                         right: widget.enableBackground ? 15 : 0,
-                        bottom: (widget.showCounter || widget.bottomButton != null) && widget.middleWidget == null
+                        bottom: (widget.showCounter ||
+                                    widget.bottomButton != null) &&
+                                widget.middleWidget == null
                             ? 30
                             : 10,
                       ),
-                      labelText: widget.labelPosition == LabelPosition.inner ? widget.labelText : null,
+                      labelText: widget.labelPosition == LabelPosition.inner
+                          ? widget.labelText
+                          : null,
                       labelStyle: TextStyle(
                         color: widget.customColors.textfieldLabelColor,
                       ),
                       suffixIcon: widget.suffixIcon ??
-                          (widget.labelPosition == LabelPosition.left ? widget.inputSelector : null),
+                          (widget.labelPosition == LabelPosition.left
+                              ? widget.inputSelector
+                              : null),
                     ),
                     cursorRadius: CustomSize.radius,
                     keyboardType: widget.keyboardType,
@@ -327,7 +337,8 @@ class _EnhancedTextFieldState extends State<EnhancedTextField> {
                   highlightColor: Colors.transparent,
                   padding: const EdgeInsets.all(0),
                   minWidth: 60,
-                  shape: RoundedRectangleBorder(borderRadius: CustomSize.borderRadius),
+                  shape: RoundedRectangleBorder(
+                      borderRadius: CustomSize.borderRadius),
                   onPressed: widget.bottomButtonOnPressed,
                   child: widget.bottomButton!,
                 ),
@@ -340,7 +351,9 @@ class _EnhancedTextFieldState extends State<EnhancedTextField> {
 
   InputBorder resolveInputBorder() {
     if (widget.enableBackground) {
-      return const OutlineInputBorder(borderRadius: CustomSize.borderRadiusAll, borderSide: BorderSide.none);
+      return const OutlineInputBorder(
+          borderRadius: CustomSize.borderRadiusAll,
+          borderSide: BorderSide.none);
     }
 
     return InputBorder.none;

diff --git a/lib/page/component/model_item.dart b/lib/page/component/model_item.dart
@@ -77,9 +77,7 @@ class _ModelItemState extends State<ModelItem> {
           child: buildTag(
             customColors,
             tag,
-            tagBgColor: selectedTag == tag
-                ? colorToString(customColors.linkColor ?? Colors.green)
-                : colorToString(customColors.tagsBackground ?? Colors.grey),
+            tagBgColor: selectedTag == tag ? 'FF4CAF50' : '2A9E9E9E',
             tagTextColor: selectedTag == tag ? 'FFFFFFFF' : null,
             tagFontSize: 12,
           ),

diff --git a/lib/page/drawer.dart b/lib/page/drawer.dart
@@ -44,11 +44,11 @@ class _LeftDrawerState extends State<LeftDrawer> {
                 child: Column(
                   children: [
                     SizedBox(
-                      height: 150,
+                      height: 180,
                       child: DrawerHeader(
                         padding: PlatformTool.isMacOS()
                             ? const EdgeInsets.only(top: kToolbarHeight)
-                            : const EdgeInsets.all(0),
+                            : const EdgeInsets.only(top: 20),
                         margin: const EdgeInsets.all(0),
                         // decoration: BoxDecoration(
                         //   color: Colors.white,

diff --git a/pubspec.lock b/pubspec.lock
@@ -25,6 +25,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
+  animated_list_plus:
+    dependency: "direct main"
+    description:
+      name: animated_list_plus
+      sha256: fb3d7f1fbaf5af84907f3c739236bacda8bf32cbe1f118dd51510752883ff50c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.2"
   animated_text_kit:
     dependency: "direct main"
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -134,6 +134,7 @@ dependencies:
   camerawesome: ^2.1.0
   flutter_markdown_latex: ^0.3.4
   auto_size_text: ^3.0.0
+  animated_list_plus: ^0.5.2
 
 dev_dependencies:
   flutter_test: