Merge branch 'develop' of https://github.com/Tencent/tdesign-flutter …

…into feature/td_upload � Conflicts: � tdesign-component/example/pubspec.lock � tdesign-component/pubspec.lock
Tencent · Dec 10, 2024 · 24be632 · 24be632
2 parents 0c17ab1 + 8ed4d65
commit 24be632
Show file tree

Hide file tree

Showing 40 changed files with 809 additions and 228 deletions.
diff --git a/tdesign-component/CHANGELOG.md b/tdesign-component/CHANGELOG.md
@@ -1,3 +1,52 @@
+## 🌈 0.1.7 `2024-10-16`
+### 🚀 Features
+- `TDNoticeBar`: Added noticeBar component @ccXxx1aoBai ([#162](https://github.com/Tencent/tdesign-flutter/pull/162))
+- `Result`: Added Result component @shinyina ([#220](https://github.com/Tencent/tdesign-flutter/pull/220))
+- `TimeCounter`: Timer component supports time display beyond conversion units, original TDCountDown component renamed to TimeCounter @hkaikai ([#272](https://github.com/Tencent/tdesign-flutter/pull/272))
+- `Calendar`: Added Calendar component @hkaikai ([#271](https://github.com/Tencent/tdesign-flutter/pull/271))
+- `Indexes`: Added Indexes component @hkaikai ([#321](https://github.com/Tencent/tdesign-flutter/pull/321))
+- `Table`: Added table component @ccXxx1aoBai ([#244](https://github.com/Tencent/tdesign-flutter/pull/244))
+- `Rate`: Added Rate component @hkaikai ([#338](https://github.com/Tencent/tdesign-flutter/pull/338))
+- `Dialog`: Supports custom content padding and buttons @ccXxx1aoBai ([#289](https://github.com/Tencent/tdesign-flutter/pull/289))
+- `Drawer`: Supports controlling the visibility of the divider, custom drawer background color, and controlling the display of the last divider @ccXxx1aoBai ([#278](https://github.com/Tencent/tdesign-flutter/pull/278))
+- `DropdownMenu`: Added control parameters for icon/width/height/icon and text alignment @hkaikai ([#297](https://github.com/Tencent/tdesign-flutter/pull/297))
+- `Search`: Added action and onActionClick properties @Ezer015 ([#263](https://github.com/Tencent/tdesign-flutter/pull/263))
+- `Avatar`: Added onTap event @ccXxx1aoBai ([#344](https://github.com/Tencent/tdesign-flutter/pull/344))
+- `TDDropdownMenu`: Added tabBarFlex parameter to TDDropdownItem to control width ratio @hkaikai ([#338](https://github.com/Tencent/tdesign-flutter/pull/338))
+- `SearchBar`: Feature/td searchbarfix added cursor height property @shizhe2018 ([#337](https://github.com/Tencent/tdesign-flutter/pull/337))
+- `TimeCounter`: Added forward timing function @epoll-j ([#246](https://github.com/Tencent/tdesign-flutter/pull/246))
+- `NavBar`: [NavBar] supports setting bottom shadow @ccXxx1aoBai ([#284](https://github.com/Tencent/tdesign-flutter/pull/284))
+- `Cell`: Added custom padding parameter @epoll-j ([#276](https://github.com/Tencent/tdesign-flutter/pull/276))
+- `Input`: Added onTapOutside callback @epoll-j ([#280](https://github.com/Tencent/tdesign-flutter/pull/280))
+- `Picker`: Added custom leftText, rightText @epoll-j ([#301](https://github.com/Tencent/tdesign-flutter/pull/301))
+- `Slider`: Feature/tdslider added text wrapping function @shizhe2018 ([#329](https://github.com/Tencent/tdesign-flutter/pull/329))
+- `Radio`: Feature/tdRadioGroup added built-in line wrapping, set number of rows and columns @shizhe2018 ([#331](https://github.com/Tencent/tdesign-flutter/pull/331))
+- `Dialog`: Added custom input box @shizhe2018 ([#333](https://github.com/Tencent/tdesign-flutter/pull/333))
+- `TDNavBar`: Added flexibleSpace parameter @Luozf12345 ([#341](https://github.com/Tencent/tdesign-flutter/pull/341))
+- `TDSearch`: Added search box focus acquisition and clear events @Luozf12345 ([#342](https://github.com/Tencent/tdesign-flutter/pull/342))
+
+### 🐞 Bug Fixes
+- `ImageViewer`: Fixed defaultIndex invalid issue @ccXxx1aoBai ([#292](https://github.com/Tencent/tdesign-flutter/pull/292))
+- `TimeCounter`: Fixed issue where it could not be reset repeatedly @hkaikai ([#272](https://github.com/Tencent/tdesign-flutter/pull/272))
+- `DropdownMenu`: Adjusted popup layer logic, fixed issue where back button could not be listened to @hkaikai ([#297](https://github.com/Tencent/tdesign-flutter/pull/297))
+- `DatePicker`: Removed monitoring on year, month, and day when destroyed to avoid memory leaks; added onSelectedItemChanged event @hkaikai ([#300](https://github.com/Tencent/tdesign-flutter/pull/300))
+- `SideBar`: Fixed issue where custom selected style text was not centered @ccXxx1aoBai ([#313](https://github.com/Tencent/tdesign-flutter/pull/313))
+- `Popup`: Fixed issue where multiple returns occurred when quickly clicking the mask @ccXxx1aoBai ([#318](https://github.com/Tencent/tdesign-flutter/pull/318))
+- `ImageViewer`: Fixed issue where deleting the first image caused display anomalies @ccXxx1aoBai ([#322](https://github.com/Tencent/tdesign-flutter/pull/322))
+- `SideBar`: Fixed issue where delayed loading components caused anchor point function anomalies @ccXxx1aoBai ([#343](https://github.com/Tencent/tdesign-flutter/pull/343))
+- `TDDropdownMenu`: Optimized menu display text to show ellipsis when exceeding display limit @hkaikai ([#338](https://github.com/Tencent/tdesign-flutter/pull/338))
+- `NoticeBar`: Fixed issue where it could not follow the theme color @ccXxx1aoBai ([#350](https://github.com/Tencent/tdesign-flutter/pull/350))
+- `Button`: Fixed overflow issue when setting shape to square or circle @epoll-j ([#257](https://github.com/Tencent/tdesign-flutter/pull/257))
+- `Slider`: Bugfix: Fixed issue where tb_slider setState did not update @arvinwli ([#298](https://github.com/Tencent/tdesign-flutter/pull/298))
+- `Cascader`: Fixed list sorting issue @shizhe2018 ([#303](https://github.com/Tencent/tdesign-flutter/pull/303))
+- `Popup`: Fixed issue where the keyboard would cover the input box in the Popup @epoll-j ([#264](https://github.com/Tencent/tdesign-flutter/pull/264))
+- `Cascader`: Fixed linkage time limit range logic @shizhe2018 ([#242](https://github.com/Tencent/tdesign-flutter/pull/242))
+- `Loading`: Fixed issue where dismissing Loading immediately after showing did not take effect @Luozf12345 ([#340](https://github.com/Tencent/tdesign-flutter/pull/340))
+
+### 🚧 Others
+- fix: remove useless output. @Ives7 ([#311](https://github.com/Tencent/tdesign-flutter/pull/311))
+
+
 
 ## 🌈 0.1.6 `2024-07-24`
 

diff --git a/tdesign-component/README.md b/tdesign-component/README.md
@@ -51,7 +51,7 @@ flutter: ">=3.7.0"
 
 # Feedback
 
- <img src="feedback.png" width = "200" height = "200" alt="feedback" align=center />
+ <img src="https://raw.githubusercontent.com/Tencent/tdesign/main/packages/components/src/images/groups/flutter-group.png" width = "200" height = "200" alt="feedback" align=center />
 
 # Open source agreement:
 

diff --git a/tdesign-component/example/android/app/build.gradle b/tdesign-component/example/android/app/build.gradle
@@ -29,7 +29,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
 
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'

diff --git a/tdesign-component/example/android/build.gradle b/tdesign-component/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.7.10'
 
     ext {
 
@@ -35,7 +35,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/tdesign-component/example/assets/theme.json b/tdesign-component/example/assets/theme.json
@@ -1 +1,178 @@
-{"green":{"ref":{"brandLightColor":"brandColor1","brandFocusColor":"brandColor2","brandDisabledColor":"brandColor3","brandHoverColor":"brandColor3","brandNormalColor":"brandColor4","brandActiveColor":"brandColor5","warningNormalColor":"warningColor5","warningHoverColor":"warningColor4","warningFocusColor":"warningColor2","warningActiveColor":"warningColor6","warningDisabledColor":"warningColor3","warningLightColor":"warningColor1","errorNormalColor":"errorColor6","errorHoverColor":"errorColor5","errorFocusColor":"errorColor2","errorActiveColor":"errorColor7","errorDisabledColor":"errorColor3","errorLightColor":"errorColor1","successNormalColor":"successColor5","successHoverColor":"successColor4","successFocusColor":"successColor2","successActiveColor":"successColor6","successDisabledColor":"successColor3","successLightColor":"successColor1","brandColorLightHover":"brandColor2","warningColorLightHover":"warningColor2","errorColorLightHover":"errorColor2","successColorLightHover":"successColor2"},"color":{"brandColor1":"#e4f9e9","brandColor2":"#c8f2d7","brandColor3":"#94dab2","brandColor4":"#45c58b","brandColor5":"#33a371","brandColor6":"#008857","brandColor7":"#006c44","brandColor8":"#005333","brandColor9":"#003b23","brandColor10":"#002515","warningColor1":"#fef3e6","warningColor2":"#f9e0c7","warningColor3":"#f7c797","warningColor4":"#f2995f","warningColor5":"#ed7b2f","warningColor6":"#d35a21","warningColor7":"#ba431b","warningColor8":"#9e3610","warningColor9":"#842b0b","warningColor10":"#5a1907","errorColor1":"#fdecee","errorColor2":"#f9d7d9","errorColor3":"#f8b9be","errorColor4":"#f78d94","errorColor5":"#f36d78","errorColor6":"#e34d59","errorColor7":"#c9353f","errorColor8":"#b11f26","errorColor9":"#951114","errorColor10":"#680506","successColor1":"#e8f8f2","successColor2":"#bcebdc","successColor3":"#85dbbe","successColor4":"#48c79c","successColor5":"#00a870","successColor6":"#078d5c","successColor7":"#067945","successColor8":"#056334","successColor9":"#044f2a","successColor10":"#033017","grayColor1":"#f3f3f3","grayColor2":"#eee","grayColor3":"#e7e7e7","grayColor4":"#dcdcdc","grayColor5":"#c5c5c5","grayColor6":"#a6a6a6","grayColor7":"#8b8b8b","grayColor8":"#777","grayColor9":"#5e5e5e","grayColor10":"#4b4b4b","grayColor11":"#383838","grayColor12":"#2c2c2c","grayColor13":"#242424","grayColor14":"#181818"}},"red":{"ref":{"brandLightColor":"brandColor1","brandFocusColor":"brandColor2","brandDisabledColor":"brandColor3","brandHoverColor":"brandColor4","brandNormalColor":"brandColor5","brandActiveColor":"brandColor6","warningNormalColor":"warningColor5","warningHoverColor":"warningColor4","warningFocusColor":"warningColor2","warningActiveColor":"warningColor6","warningDisabledColor":"warningColor3","warningLightColor":"warningColor1","errorNormalColor":"errorColor6","errorHoverColor":"errorColor5","errorFocusColor":"errorColor2","errorActiveColor":"errorColor7","errorDisabledColor":"errorColor3","errorLightColor":"errorColor1","successNormalColor":"successColor5","successHoverColor":"successColor4","successFocusColor":"successColor2","successActiveColor":"successColor6","successDisabledColor":"successColor3","successLightColor":"successColor1","brandColorLightHover":"brandColor2","warningColorLightHover":"warningColor2","errorColorLightHover":"errorColor2","successColorLightHover":"successColor2"},"color":{"brandColor1":"#fff0f1","brandColor2":"#ffd8dd","brandColor3":"#ffb7c1","brandColor4":"#ff8fa2","brandColor5":"#ff5479","brandColor6":"#db3d62","brandColor7":"#b2294b","brandColor8":"#8d1135","brandColor9":"#690021","brandColor10":"#480014","warningColor1":"#fef3e6","warningColor2":"#f9e0c7","warningColor3":"#f7c797","warningColor4":"#f2995f","warningColor5":"#ed7b2f","warningColor6":"#d35a21","warningColor7":"#ba431b","warningColor8":"#9e3610","warningColor9":"#842b0b","warningColor10":"#5a1907","errorColor1":"#fdecee","errorColor2":"#f9d7d9","errorColor3":"#f8b9be","errorColor4":"#f78d94","errorColor5":"#f36d78","errorColor6":"#e34d59","errorColor7":"#c9353f","errorColor8":"#b11f26","errorColor9":"#951114","errorColor10":"#680506","successColor1":"#e8f8f2","successColor2":"#bcebdc","successColor3":"#85dbbe","successColor4":"#48c79c","successColor5":"#00a870","successColor6":"#078d5c","successColor7":"#067945","successColor8":"#056334","successColor9":"#044f2a","successColor10":"#033017","grayColor1":"#f3f3f3","grayColor2":"#eee","grayColor3":"#e7e7e7","grayColor4":"#dcdcdc","grayColor5":"#c5c5c5","grayColor6":"#a6a6a6","grayColor7":"#8b8b8b","grayColor8":"#777","grayColor9":"#5e5e5e","grayColor10":"#4b4b4b","grayColor11":"#383838","grayColor12":"#2c2c2c","grayColor13":"#242424","grayColor14":"#181818"}}}
+{
+  "green": {
+    "ref": {
+      "brandLightColor": "brandColor1",
+      "brandFocusColor": "brandColor2",
+      "brandDisabledColor": "brandColor3",
+      "brandHoverColor": "brandColor3",
+      "brandNormalColor": "brandColor4",
+      "brandActiveColor": "brandColor5",
+      "warningNormalColor": "warningColor5",
+      "warningHoverColor": "warningColor4",
+      "warningFocusColor": "warningColor2",
+      "warningActiveColor": "warningColor6",
+      "warningDisabledColor": "warningColor3",
+      "warningLightColor": "warningColor1",
+      "errorNormalColor": "errorColor6",
+      "errorHoverColor": "errorColor5",
+      "errorFocusColor": "errorColor2",
+      "errorActiveColor": "errorColor7",
+      "errorDisabledColor": "errorColor3",
+      "errorLightColor": "errorColor1",
+      "successNormalColor": "successColor5",
+      "successHoverColor": "successColor4",
+      "successFocusColor": "successColor2",
+      "successActiveColor": "successColor6",
+      "successDisabledColor": "successColor3",
+      "successLightColor": "successColor1",
+      "brandColorLightHover": "brandColor2",
+      "warningColorLightHover": "warningColor2",
+      "errorColorLightHover": "errorColor2",
+      "successColorLightHover": "successColor2"
+    },
+    "color": {
+      "brandColor1": "#e4f9e9",
+      "brandColor2": "#c8f2d7",
+      "brandColor3": "#94dab2",
+      "brandColor4": "#45c58b",
+      "brandColor5": "#33a371",
+      "brandColor6": "#008857",
+      "brandColor7": "#006c44",
+      "brandColor8": "#005333",
+      "brandColor9": "#003b23",
+      "brandColor10": "#002515",
+      "warningColor1": "#fef3e6",
+      "warningColor2": "#f9e0c7",
+      "warningColor3": "#f7c797",
+      "warningColor4": "#f2995f",
+      "warningColor5": "#ed7b2f",
+      "warningColor6": "#d35a21",
+      "warningColor7": "#ba431b",
+      "warningColor8": "#9e3610",
+      "warningColor9": "#842b0b",
+      "warningColor10": "#5a1907",
+      "errorColor1": "#fdecee",
+      "errorColor2": "#f9d7d9",
+      "errorColor3": "#f8b9be",
+      "errorColor4": "#f78d94",
+      "errorColor5": "#f36d78",
+      "errorColor6": "#e34d59",
+      "errorColor7": "#c9353f",
+      "errorColor8": "#b11f26",
+      "errorColor9": "#951114",
+      "errorColor10": "#680506",
+      "successColor1": "#e8f8f2",
+      "successColor2": "#bcebdc",
+      "successColor3": "#85dbbe",
+      "successColor4": "#48c79c",
+      "successColor5": "#00a870",
+      "successColor6": "#078d5c",
+      "successColor7": "#067945",
+      "successColor8": "#056334",
+      "successColor9": "#044f2a",
+      "successColor10": "#033017",
+      "grayColor1": "#f3f3f3",
+      "grayColor2": "#eeeeee",
+      "grayColor3": "#e7e7e7",
+      "grayColor4": "#dcdcdc",
+      "grayColor5": "#c5c5c5",
+      "grayColor6": "#a6a6a6",
+      "grayColor7": "#8b8b8b",
+      "grayColor8": "#777777",
+      "grayColor9": "#5e5e5e",
+      "grayColor10": "#4b4b4b",
+      "grayColor11": "#383838",
+      "grayColor12": "#2c2c2c",
+      "grayColor13": "#242424",
+      "grayColor14": "#181818"
+    }
+  },
+  "red": {
+    "ref": {
+      "brandLightColor": "brandColor1",
+      "brandFocusColor": "brandColor2",
+      "brandDisabledColor": "brandColor3",
+      "brandHoverColor": "brandColor4",
+      "brandNormalColor": "brandColor5",
+      "brandActiveColor": "brandColor6",
+      "warningNormalColor": "warningColor5",
+      "warningHoverColor": "warningColor4",
+      "warningFocusColor": "warningColor2",
+      "warningActiveColor": "warningColor6",
+      "warningDisabledColor": "warningColor3",
+      "warningLightColor": "warningColor1",
+      "errorNormalColor": "errorColor6",
+      "errorHoverColor": "errorColor5",
+      "errorFocusColor": "errorColor2",
+      "errorActiveColor": "errorColor7",
+      "errorDisabledColor": "errorColor3",
+      "errorLightColor": "errorColor1",
+      "successNormalColor": "successColor5",
+      "successHoverColor": "successColor4",
+      "successFocusColor": "successColor2",
+      "successActiveColor": "successColor6",
+      "successDisabledColor": "successColor3",
+      "successLightColor": "successColor1",
+      "brandColorLightHover": "brandColor2",
+      "warningColorLightHover": "warningColor2",
+      "errorColorLightHover": "errorColor2",
+      "successColorLightHover": "successColor2"
+    },
+    "color": {
+      "brandColor1": "#fff0f1",
+      "brandColor2": "#ffd8dd",
+      "brandColor3": "#ffb7c1",
+      "brandColor4": "#ff8fa2",
+      "brandColor5": "#ff5479",
+      "brandColor6": "#db3d62",
+      "brandColor7": "#b2294b",
+      "brandColor8": "#8d1135",
+      "brandColor9": "#690021",
+      "brandColor10": "#480014",
+      "warningColor1": "#fef3e6",
+      "warningColor2": "#f9e0c7",
+      "warningColor3": "#f7c797",
+      "warningColor4": "#f2995f",
+      "warningColor5": "#ed7b2f",
+      "warningColor6": "#d35a21",
+      "warningColor7": "#ba431b",
+      "warningColor8": "#9e3610",
+      "warningColor9": "#842b0b",
+      "warningColor10": "#5a1907",
+      "errorColor1": "#fdecee",
+      "errorColor2": "#f9d7d9",
+      "errorColor3": "#f8b9be",
+      "errorColor4": "#f78d94",
+      "errorColor5": "#f36d78",
+      "errorColor6": "#e34d59",
+      "errorColor7": "#c9353f",
+      "errorColor8": "#b11f26",
+      "errorColor9": "#951114",
+      "errorColor10": "#680506",
+      "successColor1": "#e8f8f2",
+      "successColor2": "#bcebdc",
+      "successColor3": "#85dbbe",
+      "successColor4": "#48c79c",
+      "successColor5": "#00a870",
+      "successColor6": "#078d5c",
+      "successColor7": "#067945",
+      "successColor8": "#056334",
+      "successColor9": "#044f2a",
+      "successColor10": "#033017",
+      "grayColor1": "#f3f3f3",
+      "grayColor2": "#eeeeee",
+      "grayColor3": "#e7e7e7",
+      "grayColor4": "#dcdcdc",
+      "grayColor5": "#c5c5c5",
+      "grayColor6": "#a6a6a6",
+      "grayColor7": "#8b8b8b",
+      "grayColor8": "#777777",
+      "grayColor9": "#5e5e5e",
+      "grayColor10": "#4b4b4b",
+      "grayColor11": "#383838",
+      "grayColor12": "#2c2c2c",
+      "grayColor13": "#242424",
+      "grayColor14": "#181818"
+    }
+  }
+}
diff --git a/tdesign-component/example/lib/base/intl_resource_delegate.dart b/tdesign-component/example/lib/base/intl_resource_delegate.dart
@@ -65,6 +65,17 @@ class IntlResourceDelegate extends TDResourceDelegate {
   String get seconds => AppLocalizations.of(context)!.seconds;
 
   @override
+  String get yearLabel => AppLocalizations.of(context)!.yearLabel;
+
+  @override
+  String get monthLabel => AppLocalizations.of(context)!.monthLabel;
+
+  @override
+  String get dateLabel => AppLocalizations.of(context)!.dateLabel;
+
+  @override
+  String get weeksLabel => AppLocalizations.of(context)!.dateLabel;
+}
   String get friday => AppLocalizations.of(context)!.friday;
 
   @override
@@ -135,4 +146,7 @@ class IntlResourceDelegate extends TDResourceDelegate {
 
   @override
   String get notRated => AppLocalizations.of(context)!.notRated;
+
+  @override
+  String get cascadeLabel =>  AppLocalizations.of(context)!.cascadeLabel;
 }
diff --git a/tdesign-component/example/lib/l10n/app_en.arb b/tdesign-component/example/lib/l10n/app_en.arb
@@ -20,6 +20,10 @@
   "minutes": "minutes",
   "seconds": "seconds",
   "milliseconds": "milliseconds",
+  "yearLabel": "year",
+  "monthLabel": "month",
+  "dateLabel": "date",
+  "weeks":"weeks"
   "sunday": "SUN",
   "monday": "MON",
   "tuesday": "TUE",
@@ -43,5 +47,6 @@
   "time": "Time",
   "start": "Start",
   "end": "End",
-  "notRated": "Not rated"
+  "notRated": "Not rated",
+  "cascadeLabel": "Select Item"
 }
diff --git a/tdesign-component/example/lib/l10n/app_zh.arb b/tdesign-component/example/lib/l10n/app_zh.arb
@@ -20,6 +20,10 @@
   "minutes": "分",
   "seconds": "秒",
   "milliseconds": "毫秒",
+  "yearLabel":"年",
+  "monthLabel": "月",
+  "dateLabel": "日",
+  "weeks":"周"
   "sunday": "日",
   "monday": "一",
   "tuesday": "二",
@@ -43,5 +47,6 @@
   "time": "时间",
   "start": "开始",
   "end": "结束",
-  "notRated": "未评分"
+  "notRated": "未评分",
+  "cascadeLabel": "选择选项"
 }