diff --git a/package.json b/package.json
index b3355d4f6..f24311602 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20220505161347",
+  "version": "2.0.20220507150550",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",
diff --git a/src/case/checkbox/check.first.treenode.js b/src/case/checkbox/check.first.treenode.js
index aa808488f..40568e700 100644
--- a/src/case/checkbox/check.first.treenode.js
+++ b/src/case/checkbox/check.first.treenode.js
@@ -7,8 +7,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
             extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type2" : "tree-collapse-icon-type2",
-            iconWidth: 24,
-            iconHeight: 24
+            iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
+            iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
         });
     },
 
diff --git a/src/case/checkbox/check.last.treenode.js b/src/case/checkbox/check.last.treenode.js
index cb536f8cc..653dd785d 100644
--- a/src/case/checkbox/check.last.treenode.js
+++ b/src/case/checkbox/check.last.treenode.js
@@ -7,8 +7,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
             extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type4" : "tree-collapse-icon-type4",
-            iconWidth: 24,
-            iconHeight: 24
+            iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
+            iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
         });
     },
 
diff --git a/src/case/checkbox/check.mid.treenode.js b/src/case/checkbox/check.mid.treenode.js
index 7ec4e5230..716cb0142 100644
--- a/src/case/checkbox/check.mid.treenode.js
+++ b/src/case/checkbox/check.mid.treenode.js
@@ -7,8 +7,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
             extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type3" : "tree-collapse-icon-type3",
-            iconWidth: 24,
-            iconHeight: 24
+            iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
+            iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
         });
     },
 
diff --git a/src/case/checkbox/check.treenode.js b/src/case/checkbox/check.treenode.js
index 128bb73c6..ab186f4fb 100644
--- a/src/case/checkbox/check.treenode.js
+++ b/src/case/checkbox/check.treenode.js
@@ -7,8 +7,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
             extraCls: BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-solid-collapse-icon-type1" : "tree-collapse-icon-type1",
-            iconWidth: 24,
-            iconHeight: 24
+            iconWidth: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
+            iconHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT
         });
     },
 
diff --git a/src/case/list/list.select.js b/src/case/list/list.select.js
index 12037b9a9..bab4a15af 100644
--- a/src/case/list/list.select.js
+++ b/src/case/list/list.select.js
@@ -94,7 +94,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
         var hasNext = this.list.hasNext();
         var isAlreadyAllSelected = this.toolbar.isSelected();
         var isHalf = selectLength > 0 && notSelectLength > 0;
-        var allSelected = isAlreadyAllSelected;
+        var allSelected = selectLength > 0 && notSelectLength <= 0 && (!hasNext || isAlreadyAllSelected);
 
         if (this.isAllSelected() === false) {
             hasNext && (isHalf = selectLength > 0);
diff --git a/src/less/core/wrapper/flex.horizontal.less b/src/less/core/wrapper/flex.horizontal.less
index a6a38704d..24d8862f6 100644
--- a/src/less/core/wrapper/flex.horizontal.less
+++ b/src/less/core/wrapper/flex.horizontal.less
@@ -169,7 +169,9 @@
   }
 
   > .f-f {
-    min-width: 0;
+    &:not(.f-s-n) {
+      min-width: 0;
+    }
     -webkit-flex-grow: 1;
     -moz-flex-grow: 1;
     -ms-flex-grow: 1;
diff --git a/src/less/core/wrapper/flex.vertical.less b/src/less/core/wrapper/flex.vertical.less
index 5b97ea999..007396436 100644
--- a/src/less/core/wrapper/flex.vertical.less
+++ b/src/less/core/wrapper/flex.vertical.less
@@ -168,7 +168,9 @@
   }
 
   > .f-f {
-    min-height: 0;
+    &:not(.f-s-n) {
+      min-height: 0;
+    }
     -webkit-flex-grow: 1;
     -moz-flex-grow: 1;
     -ms-flex-grow: 1;
diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less
index 1b38fa0be..09926f54b 100644
--- a/src/less/core/wrapper/flex.wrapper.horizontal.less
+++ b/src/less/core/wrapper/flex.wrapper.horizontal.less
@@ -265,7 +265,9 @@
     }
 
     > .f-f {
-      min-width: 0;
+      &:not(.f-s-n) {
+        min-width: 0;
+      }
       -webkit-flex-grow: 1;
       -moz-flex-grow: 1;
       -ms-flex-grow: 1;
diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less
index 09693c348..118759152 100644
--- a/src/less/core/wrapper/flex.wrapper.vertical.less
+++ b/src/less/core/wrapper/flex.wrapper.vertical.less
@@ -259,7 +259,9 @@
     }
 
     > .f-f {
-      min-height: 0;
+      &:not(.f-s-n) {
+        min-height: 0;
+      }
       -webkit-flex-grow: 1;
       -moz-flex-grow: 1;
       -ms-flex-grow: 1;
diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js
index 62a498d54..1774ca384 100644
--- a/src/widget/year/combo.year.js
+++ b/src/widget/year/combo.year.js
@@ -24,7 +24,8 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
             min: o.minDate,
             max: o.maxDate,
             height: o.height - border,
-            value: o.value || ""
+            value: o.value || "",
+            watermark: o.watermark
         });
         this.trigger.on(BI.DynamicYearTrigger.EVENT_KEY_DOWN, function () {
             if (self.combo.isViewVisible()) {
@@ -211,8 +212,11 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
 
     isStateValid: function () {
         return this.trigger.isValid();
-    }
+    },
 
+    setWaterMark: function (v) {
+        this.trigger.setWaterMark(v);
+    }
 });
 BI.DynamicYearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.DynamicYearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
diff --git a/src/widget/year/trigger.year.js b/src/widget/year/trigger.year.js
index 91b80a431..fe8976b2f 100644
--- a/src/widget/year/trigger.year.js
+++ b/src/widget/year/trigger.year.js
@@ -10,7 +10,8 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
             extraCls: "bi-year-trigger",
             min: "1900-01-01", // 最小日期
             max: "2099-12-31", // 最大日期
-            height: 24
+            height: 24,
+            watermark: BI.i18nText("BI-Basic_Unrestricted")
         });
     },
 
@@ -35,7 +36,7 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
             },
             hgap: c.hgap,
             vgap: c.vgap,
-            watermark: BI.i18nText("BI-Basic_Unrestricted"),
+            watermark: o.watermark,
             allowBlank: true,
             errorText: function (v) {
                 if (BI.isPositiveInteger(v)) {
@@ -188,6 +189,10 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
 
     getKey: function () {
         return this.editor.getValue() | 0;
+    },
+
+    setWaterMark: function (v) {
+        this.editor.setWaterMark(v);
     }
 });
 BI.DynamicYearTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";