Merge branch 'master' of https://code.fineres.com/scm/~guy/fineui

3 years ago · fba057e48b
73 changed files with 3586 additions and 2988 deletions
--- a/dist/2.0/fineui.css
+++ b/dist/2.0/fineui.css
--- a/dist/2.0/fineui.ie.min.js
+++ b/dist/2.0/fineui.ie.min.js
--- a/dist/2.0/fineui.ie.min.js.map
+++ b/dist/2.0/fineui.ie.min.js.map
--- a/dist/2.0/fineui.js
+++ b/dist/2.0/fineui.js
--- a/dist/2.0/fineui.js.map
+++ b/dist/2.0/fineui.js.map
--- a/dist/2.0/fineui.min.css
+++ b/dist/2.0/fineui.min.css
--- a/dist/2.0/fineui.min.js
+++ b/dist/2.0/fineui.min.js
--- a/dist/2.0/fineui.min.js.map
+++ b/dist/2.0/fineui.min.js.map
--- a/dist/2.0/fineui_without_normalize.css
+++ b/dist/2.0/fineui_without_normalize.css
--- a/dist/2.0/fineui_without_normalize.min.css
+++ b/dist/2.0/fineui_without_normalize.min.css
--- a/dist/core.css
+++ b/dist/core.css
--- a/dist/core.js
+++ b/dist/core.js
--- a/dist/core.js.map
+++ b/dist/core.js.map
--- a/dist/demo.css
+++ b/dist/demo.css
--- a/dist/demo.js
+++ b/dist/demo.js
--- a/dist/demo.js.map
+++ b/dist/demo.js.map
--- a/dist/fineui.css
+++ b/dist/fineui.css
--- a/dist/fineui.ie.min.js
+++ b/dist/fineui.ie.min.js
--- a/dist/fineui.ie.min.js.map
+++ b/dist/fineui.ie.min.js.map
--- a/dist/fineui.js
+++ b/dist/fineui.js
--- a/dist/fineui.js.map
+++ b/dist/fineui.js.map
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui.min.js.map
+++ b/dist/fineui.min.js.map
--- a/dist/fineui.proxy.css
+++ b/dist/fineui.proxy.css
--- a/dist/fineui.proxy.js
+++ b/dist/fineui.proxy.js
--- a/dist/fineui.proxy.js.map
+++ b/dist/fineui.proxy.js.map
--- a/dist/fineui.proxy.min.css
+++ b/dist/fineui.proxy.min.css
--- a/dist/fineui.proxy.min.js
+++ b/dist/fineui.proxy.min.js
--- a/dist/fineui.proxy.min.js.map
+++ b/dist/fineui.proxy.min.js.map
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -1,4 +1,4 @@
-/*! time: 2021-7-12 20:10:46 */
+/*! time: 2021-7-21 10:30:28 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1446);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1447);
 /******/ })
 /************************************************************************/
 /******/ ([
@ -6426,10 +6426,8 @@ BI.Req = {
            this._isMounted = true;
            for (var key in this._children) {
                var child = this._children[key];
-                if (layer === 0) {
-                    !self.isEnabled() && child._setEnable(false);
-                    !self.isValid() && child._setValid(false);
-                }
+                !self.isEnabled() && child._setEnable(false);
+                !self.isValid() && child._setValid(false);
                child._mount && child._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1);
            }
            this._mountChildren && this._mountChildren();
@ -8087,7 +8085,7 @@ BI.Plugin = BI.Plugin || {};
    var propsModule = { create: updateProps, update: updateProps };

    // Bindig `requestAnimationFrame` like this fixes a bug in IE/Edge. See #360 and #409.
-    var raf$1 = typeof window !== "undefined" && window.requestAnimationFrame.bind(window) || setTimeout;
+    var raf$1 = typeof window !== "undefined" && (window.requestAnimationFrame && window.requestAnimationFrame.bind(window)) || setTimeout;
    var nextFrame$1 = function nextFrame$1(fn) {
        raf$1(function () {
            raf$1(fn);
@ -15708,6 +15706,7 @@ BI.LeftVerticalAdaptLayout = BI.inherit(BI.Layout, {
        return BI.extend(BI.LeftRightVerticalAdaptLayout.superclass.props.apply(this, arguments), {
            baseCls: "bi-l-v-a",
            items: [],
+            columnSize: [],
            lgap: 0,
            rgap: 0,
            hgap: 0,
@ -15725,6 +15724,7 @@ BI.LeftVerticalAdaptLayout = BI.inherit(BI.Layout, {
                self.layout = _ref;
            },
            items: o.items,
+            columnSize: o.columnSize,
            hgap: o.hgap,
            lgap: o.lgap,
            rgap: o.rgap,
@ -15757,6 +15757,7 @@ BI.RightVerticalAdaptLayout = BI.inherit(BI.Layout, {
        return BI.extend(BI.RightVerticalAdaptLayout.superclass.props.apply(this, arguments), {
            baseCls: "bi-r-v-a",
            items: [],
+            columnSize: [],
            lgap: 0,
            rgap: 0,
            hgap: 0,
@ -15775,6 +15776,7 @@ BI.RightVerticalAdaptLayout = BI.inherit(BI.Layout, {
            },
            horizontalAlign: BI.HorizontalAlign.Right,
            items: o.items,
+            columnSize: o.columnSize,
            hgap: o.hgap,
            lgap: o.lgap,
            rgap: o.rgap,
@ -15870,7 +15872,11 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
        // 2、不能给多个td设置最大宽度，这样只会平分宽度
        // 3、多百分比宽度就算了
        if (columnSize > 0) {
-            td.element.css({"max-width": columnSize < 1 ? width : width / BI.pixRatio + BI.pixUnit});
+            columnSize = columnSize < 1 ? width : width / BI.pixRatio + BI.pixUnit;
+            td.element.css({
+                "max-width": columnSize,
+                "min-width": columnSize
+            });
        }
        if (i === 0) {
            td.element.addClass("first-element");
@ -18956,13 +18962,14 @@ BI.TdLayout = BI.inherit(BI.Layout, {
        }

        var height = o.rowSize[idx] === "" ? "" : (o.rowSize[idx] < 1 ? ((o.rowSize[idx] * 100).toFixed(1) + "%") : o.rowSize[idx]);
-
+        var rowHeight = BI.isNumber(o.rowSize[idx]) ? (o.rowSize[idx] <= 1 ? height : height / BI.pixRatio + BI.pixUnit) : height;
        var tr = BI._lazyCreateWidget({
            type: "bi.default",
            tagName: "tr",
            height: height,
            css: {
-                "max-height": BI.isNumber(o.rowSize[idx]) ? (o.rowSize[idx] <= 1 ? height : height / BI.pixRatio + BI.pixUnit) : height
+                "max-height": rowHeight,
+                "min-height": rowHeight
            }
        });

@ -19012,7 +19019,11 @@ BI.TdLayout = BI.inherit(BI.Layout, {
            // 2、不能给多个td设置最大宽度，这样只会平分宽度
            // 3、多百分比宽度就算了
            if (columnSize > 0) {
-                td.element.css({"max-width": columnSize < 1 ? width : width / BI.pixRatio + BI.pixUnit});
+                columnSize = columnSize < 1 ? width : width / BI.pixRatio + BI.pixUnit;
+                td.element.css({
+                    "max-width": columnSize,
+                    "min-width": columnSize
+                });
            }
            td.element.css({
                position: "relative",
@ -19805,6 +19816,11 @@ BI.Pane = BI.inherit(BI.Widget, {
        }
    },

+    setTipText: function (text) {
+        this._assertTip();
+        this._tipText.setText(text);
+    },
+
    populate: function (items) {
        this.options.items = items || [];
        this.check();
@ -38437,8 +38453,16 @@ BI.ListPane = BI.inherit(BI.Pane, {
            }]);
            return;
        }
-        BI.ListPane.superclass.populate.apply(this, arguments);
-        this.button_group.populate.apply(this.button_group, arguments);
+
+        var context = BI.get(arguments, [2], {});
+        var tipText = context.tipText || '';
+        if (BI.isNotEmptyString(tipText)) {
+            BI.ListPane.superclass.populate.apply(this, []);
+            this.setTipText(tipText);
+        } else {
+            BI.ListPane.superclass.populate.apply(this, arguments);
+            this.button_group.populate.apply(this.button_group, arguments);
+        }
    },

    empty: function () {
@ -38746,11 +38770,13 @@ BI.SelectList = BI.inherit(BI.Widget, {
            items: o.items,
            itemsCreator: function (op, callback) {
                op.times === 1 && self.toolbar.setVisible(false);
-                o.itemsCreator(op, function (items) {
+                o.itemsCreator(op, function (items, keywords, context) {
                    callback.apply(self, arguments);
                    if (op.times === 1) {
-                        self.toolbar.setVisible(items && items.length > 0);
-                        self.toolbar.setEnable(self.isEnabled() && items && items.length > 0);
+                        var tipText = BI.get(context, 'tipText', '');
+                        var visible = BI.isEmptyString(tipText) && items && items.length > 0;
+                        self.toolbar.setVisible(visible);
+                        self.toolbar.setEnable(self.isEnabled() && visible);
                    }
                    self._checkAllSelected();
                });
@ -39545,9 +39571,10 @@ BI.AllCountPager = BI.inherit(BI.Widget, {

        BI.createWidget(o.showRowCount ? {
            type: "bi.vertical_adapt",
-            columnSize: ["fill", ""],
            element: this,
            scrollx: false,
+            columnSize: ["fill", ""],
+            horizontalAlign: BI.HorizontalAlign.Right,
            items: [
                this._getRowCountObject(),
                this.editor, this.allPages, this.pager
@ -51828,12 +51855,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
            valueFormatter: BI.emptyFn,
            itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
            height: 24,
-            allowEdit: true
+            allowEdit: true,
        });
    },

    _init: function () {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        BI.MultiSelectCombo.superclass._init.apply(this, arguments);
        var assertShowValue = function () {
            if (BI.isKey(self._startValue)) {
@ -51868,13 +51895,13 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                    left: 0,
                    top: 0,
                    right: 0,
-                    bottom: 25
-                }
+                    bottom: 25,
+                },
            },
            valueFormatter: o.valueFormatter,
            itemsCreator: BI.bind(this._itemsCreator4Trigger, this),
            itemHeight: o.itemHeight,
-            value: this.storeValue
+            value: this.storeValue,
        });

        this.trigger.on(BI.MultiSelectTrigger.EVENT_FOCUS, function () {
@ -51959,22 +51986,22 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                            assertShowValue();
                        });
                        self.fireEvent(BI.MultiSelectCombo.EVENT_CLICK_ITEM);
-                    }
+                    },
                }, {
                    eventName: BI.MultiSelectPopupView.EVENT_CLICK_CONFIRM,
                    action: function () {
                        self._defaultState();
-                    }
+                    },
                }, {
                    eventName: BI.MultiSelectPopupView.EVENT_CLICK_CLEAR,
                    action: function () {
                        self._dataChange = true;
                        self.setValue();
                        self._defaultState();
-                    }
+                    },
                }],
                itemsCreator: o.itemsCreator,
-                itemsHeight: o.itemsHeight,
+                itemHeight: o.itemHeight,
                valueFormatter: o.valueFormatter,
                onLoaded: function () {
                    BI.nextTick(function () {
@ -51983,12 +52010,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                        self.numberCounter.adjustView();
                        self.trigger.getSearcher().adjustView();
                    });
-                }
+                },
            },
            value: o.value,
            hideChecker: function (e) {
                return triggerBtn.element.find(e.target).length === 0 && self.numberCounter.element.find(e.target).length === 0;
-            }
+            },
        });

        this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
@ -52016,7 +52043,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
            type: "bi.trigger_icon_button",
            width: o.height,
            height: o.height,
-            cls: "multi-select-trigger-icon-button"
+            cls: "multi-select-trigger-icon-button",
        });
        triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
            self.numberCounter.hideView();
@ -52034,12 +52061,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                    left: 0,
                    top: 0,
                    right: 0,
-                    bottom: 25
-                }
+                    bottom: 25,
+                },
            },
            valueFormatter: o.valueFormatter,
            itemsCreator: BI.bind(this._itemsCreator4Trigger, this),
-            value: this.storeValue
+            value: this.storeValue,
        });
        this.numberCounter.on(BI.MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_CHANGE, function () {
            if (!self.combo.isViewVisible()) {
@ -52076,26 +52103,26 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                left: 0,
                right: 0,
                top: 0,
-                bottom: 0
+                bottom: 0,
            }, {
                el: triggerBtn,
                right: 0,
                top: 0,
-                bottom: 0
+                bottom: 0,
            }, {
                el: {
                    type: "bi.vertical_adapt",
-                    items: [this.numberCounter]
+                    items: [this.numberCounter],
                },
                right: o.height,
                top: 0,
-                height: o.height
-            }]
+                height: o.height,
+            }],
        });
    },

    _itemsCreator4Trigger: function (op, callback) {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        o.itemsCreator(op, function (res) {
            if (op.times === 1 && BI.isNotNull(op.keywords)) {
                // 预防trigger内部把当前的storeValue改掉
@ -52126,12 +52153,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
    },

    _joinKeywords: function (keywords, callback) {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        this._assertValue(this.storeValue);
        this.requesting = true;
        o.itemsCreator({
            type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
-            keywords: keywords
+            keywords: keywords,
        }, function (ob) {
            var values = BI.map(ob.items, "value");
            digest(values);
@ -52149,28 +52176,30 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
    },

    _joinAll: function (res, callback) {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        this._assertValue(res);
        this.requesting = true;
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    self.storeValue.assist && self.storeValue.assist.push(map[v]);
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            this._adjust(callback);
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
-            keywords: [this.trigger.getKey()]
+            keywords: [this.trigger.getKey()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        self.storeValue.assist && self.storeValue.assist.push(map[v]);
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                self._adjust(callback);
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
@ -52190,7 +52219,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
    },

    _adjust: function (callback) {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        adjust();
        callback();

@ -52204,7 +52233,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
    },

    _join: function (res, callback) {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        this._assertValue(res);
        this._assertValue(this.storeValue);
        if (this.storeValue.type === res.type) {
@ -52226,7 +52255,8 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
            });
            change && (this.storeValue.value = BI.values(map));
            self._adjust(callback);
-            return;
+            
+return;
        }
        this._joinAll(res, callback);
    },
@ -52262,12 +52292,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
    populate: function () {
        this._populate.apply(this, arguments);
        this.numberCounter.populateSwitcher.apply(this.numberCounter, arguments);
-    }
+    },
 });

 BI.extend(BI.MultiSelectCombo, {
    REQ_GET_DATA_LENGTH: 1,
-    REQ_GET_ALL_DATA: -1
+    REQ_GET_ALL_DATA: -1,
 });

 BI.MultiSelectCombo.EVENT_BLUR = "EVENT_BLUR";
@ -52649,25 +52679,27 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
        var self = this, o = this.options;
        this._assertValue(res);
        this.requesting = true;
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = self._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    self.storeValue.assist && self.storeValue.assist.push(map[v]);
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            this._adjust(callback);
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectNoBarCombo.REQ_GET_ALL_DATA,
-            keywords: [this.trigger.getKey()]
+            keywords: [this.trigger.getKey()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        self.storeValue.assist && self.storeValue.assist.push(map[v]);
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                self._adjust(callback);
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
@ -53135,25 +53167,27 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
        var self = this, o = this.options;
        this._assertValue(res);
        this.requesting = true;
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    self.storeValue.assist && self.storeValue.assist.push(map[v]);
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            this._adjust(callback);
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
-            keywords: [this.trigger.getKey()]
+            keywords: [this.trigger.getKey()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        self.storeValue.assist && self.storeValue.assist.push(map[v]);
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                self._adjust(callback);
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
@ -53618,25 +53652,27 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
        var self = this, o = this.options;
        this._assertValue(res);
        this.requesting = true;
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    self.storeValue.assist && self.storeValue.assist.push(map[v]);
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            this._adjust(callback);
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectInsertNoBarCombo.REQ_GET_ALL_DATA,
-            keywords: [this.trigger.getKey()]
+            keywords: [this.trigger.getKey()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        self.storeValue.assist && self.storeValue.assist.push(map[v]);
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                self._adjust(callback);
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
@ -54815,7 +54851,10 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
                        var json = self._filterValues(self.storeValue);
                        firstItems = self._createItems(json);
                    }
-                    callback(firstItems.concat(self._createItems(ob.items)), keyword);
+                    var context = {
+                        tipText: ob.tipText,
+                    };
+                    callback(firstItems.concat(self._createItems(ob.items)), keyword, context);
                    if (op.times === 1 && self.storeValue) {
                        self.setValue(self.storeValue);
                    }
@ -56194,24 +56233,26 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
    _joinAll: function (res, callback) {
        var self = this, o = this.options;
        this._assertValue(res);
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            callback();
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
-            keywords: [self.trigger.getKeyword()]
+            keywords: [this.trigger.getKeyword()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                callback();
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
@ -56542,24 +56583,26 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
    _joinAll: function (res, callback) {
        var self = this, o = this.options;
        this._assertValue(res);
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            callback();
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA,
-            keywords: [self.trigger.getKeyword()]
+            keywords: [this.trigger.getKeyword()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                callback();
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
@ -56877,24 +56920,26 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
    _joinAll: function (res, callback) {
        var self = this, o = this.options;
        this._assertValue(res);
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            this._adjust(callback);
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectList.REQ_GET_ALL_DATA,
-            keywords: [this.trigger.getKey()]
+            keywords: [this.trigger.getKey()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                self._adjust(callback);
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
@ -61872,7 +61917,10 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
                        var json = self._filterValues(self.storeValue);
                        firstItems = self._createItems(json);
                    }
-                    callback(firstItems.concat(self._createItems(ob.items)), keyword || "");
+                    var context = {
+                        tipText: ob.tipText,
+                    };
+                    callback(firstItems.concat(self._createItems(ob.items)), keyword || "", context);
                    if (op.times === 1 && self.storeValue) {
                        self.setValue(self.storeValue);
                    }
@ -68484,7 +68532,11 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
            height: o.height,
            validationChecker: function (v) {
                if (isYear) {
-                    return v === "" || (BI.isPositiveInteger(v) && !BI.checkDateVoid(v, parseInt(v, 10) === BI.parseDateTime(o.min, "%Y-%X-%d").getFullYear() ? BI.parseDateTime(o.min, "%Y-%X-%d").getMonth() + 1 : 1, 1, o.min, o.max)[0]);
+                    var month = self.monthEditor.getValue();
+                    if(BI.isEmptyString(month)) {
+                        month = parseInt(v, 10) === BI.parseDateTime(o.min, "%Y-%X-%d").getFullYear() ? (BI.parseDateTime(o.min, "%Y-%X-%d").getMonth() + 1) : 1;
+                    }
+                    return v === "" || (BI.isPositiveInteger(v) && !BI.checkDateVoid(v, month, 1, o.min, o.max)[0]);
                }
                var year = self.yearEditor.getValue();

@ -69785,7 +69837,13 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
            height: o.height,
            validationChecker: function (v) {
                if(isYear) {
-                    return v === "" || (BI.isPositiveInteger(v) && !BI.checkDateVoid(v, parseInt(v, 10) === BI.parseDateTime(o.min, "%Y-%X-%d").getFullYear() ? BI.parseDateTime(o.min, "%Y-%X-%d").getMonth() + 1 : 1, 1, o.min, o.max)[0]);
+                    var month = self.quarterEditor.getValue();
+                    if(BI.isEmptyString(month)) {
+                        month = parseInt(v, 10) === BI.parseDateTime(o.min, "%Y-%X-%d").getFullYear() ? BI.parseDateTime(o.min, "%Y-%X-%d").getMonth() + 1 : 1;
+                    } else {
+                        month = (v - 1) * 3 + 1;
+                    }
+                    return v === "" || (BI.isPositiveInteger(v) && !BI.checkDateVoid(v, month, 1, o.min, o.max)[0]);
                }
                var year = self.yearEditor.getValue();

@ -73698,6 +73756,12 @@ Object.defineProperty(exports, "TreeValueChooserPane", {
    return _pane3.TreeValueChooserPane;
  }
 });
+Object.defineProperty(exports, "TdLayout", {
+  enumerable: true,
+  get: function get() {
+    return _layout11.TdLayout;
+  }
+});
 exports["default"] = void 0;

 var _combo = __webpack_require__(710);
@ -74030,6 +74094,8 @@ var _html2 = __webpack_require__(851);

 var _pane3 = __webpack_require__(852);

+var _layout11 = __webpack_require__(853);
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }

 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@ -75527,7 +75593,15 @@ var _abstract = __webpack_require__(47);
 var _abstract = __webpack_require__(30);

 /***/ }),
-/* 853 */,
+/* 853 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _layout = __webpack_require__(3);
+
+/***/ }),
 /* 854 */,
 /* 855 */,
 /* 856 */,
@ -75555,7 +75629,8 @@ var _abstract = __webpack_require__(30);
 /* 878 */,
 /* 879 */,
 /* 880 */,
-/* 881 */
+/* 881 */,
+/* 882 */
 /***/ (function(module, exports) {

 ;(function () {
@ -75718,7 +75793,6 @@ var _abstract = __webpack_require__(30);


 /***/ }),
-/* 882 */,
 /* 883 */,
 /* 884 */,
 /* 885 */,
@ -75752,7 +75826,8 @@ var _abstract = __webpack_require__(30);
 /* 913 */,
 /* 914 */,
 /* 915 */,
-/* 916 */
+/* 916 */,
+/* 917 */
 /***/ (function(module, exports) {

 ;(function () {
@ -76028,7 +76103,6 @@ var _abstract = __webpack_require__(30);


 /***/ }),
-/* 917 */,
 /* 918 */,
 /* 919 */,
 /* 920 */,
@ -76037,14 +76111,15 @@ var _abstract = __webpack_require__(30);
 /* 923 */,
 /* 924 */,
 /* 925 */,
-/* 926 */
+/* 926 */,
+/* 927 */
 /***/ (function(module, exports, __webpack_require__) {

-/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(927);
+/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(928);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(14)))

 /***/ }),
-/* 927 */
+/* 928 */
 /***/ (function(module, exports, __webpack_require__) {

 /* WEBPACK VAR INJECTION */(function(setImmediate) {function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@ -77577,7 +77652,6 @@ var _abstract = __webpack_require__(30);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(61).setImmediate))

 /***/ }),
-/* 928 */,
 /* 929 */,
 /* 930 */,
 /* 931 */,
@ -77777,13 +77851,13 @@ var _abstract = __webpack_require__(30);
 /* 1125 */,
 /* 1126 */,
 /* 1127 */,
-/* 1128 */
+/* 1128 */,
+/* 1129 */
 /***/ (function(module, exports) {



 /***/ }),
-/* 1129 */,
 /* 1130 */,
 /* 1131 */,
 /* 1132 */,
@ -78100,7 +78174,8 @@ var _abstract = __webpack_require__(30);
 /* 1443 */,
 /* 1444 */,
 /* 1445 */,
-/* 1446 */
+/* 1446 */,
+/* 1447 */
 /***/ (function(module, exports, __webpack_require__) {

 __webpack_require__(92);
@ -78211,7 +78286,7 @@ __webpack_require__(371);
 __webpack_require__(110);
 __webpack_require__(111);
 __webpack_require__(112);
-__webpack_require__(926);
+__webpack_require__(927);
 __webpack_require__(372);
 __webpack_require__(373);
 __webpack_require__(374);
@ -78608,9 +78683,9 @@ __webpack_require__(704);
 __webpack_require__(705);
 __webpack_require__(706);
 __webpack_require__(707);
-__webpack_require__(916);
-__webpack_require__(881);
-__webpack_require__(1128);
+__webpack_require__(917);
+__webpack_require__(882);
+__webpack_require__(1129);
 module.exports = __webpack_require__(708);


--- a/dist/fineui_without_jquery_polyfill.js.map
+++ b/dist/fineui_without_jquery_polyfill.js.map
--- a/dist/font.css
+++ b/dist/font.css
--- a/dist/lib/base/a/a.d.ts
+++ b/dist/lib/base/a/a.d.ts
@ -1,4 +1,7 @@
 import { Text } from "../single/text";
 export declare class A extends Text {
    static xtype: string;
+    props: {
+        href: string;
+    } & Text['props'];
 }
--- a/dist/lib/case/button/item.multiselect.d.ts
+++ b/dist/lib/case/button/item.multiselect.d.ts
@ -2,6 +2,16 @@ import { BasicButton } from "../../base/single/button/button.basic";
 export declare class MultiSelectItem extends BasicButton {
    static xtype: string;
    static EVENT_CHANGE: string;
+    props: {
+        login: {
+            dynamic: boolean;
+        };
+        text: string;
+        iconWrapperWidth: number;
+        textLgap: number;
+        textRgap: number;
+        textHgap: number;
+    } & BasicButton['props'];
    doClick(...args: any[]): void;
    doRedMark(...args: any[]): void;
    unRedMark(...args: any[]): void;
--- a/dist/lib/case/combo/textvaluecheckcombo/popup.textvaluecheck.d.ts
+++ b/dist/lib/case/combo/textvaluecheckcombo/popup.textvaluecheck.d.ts
@ -4,5 +4,5 @@ export declare class TextValueCheckComboPopup extends Pane {
    static EVENT_CHANGE: string;
    populate(items: any[]): void;
    getValue(): any;
-    setValue(): void;
+    setValue(v: any): void;
 }
--- a/dist/lib/case/toolbar/toolbar.multiselect.d.ts
+++ b/dist/lib/case/toolbar/toolbar.multiselect.d.ts
@ -2,6 +2,16 @@ import { BasicButton } from "../../base/single/button/button.basic";
 export declare class MultiSelectBar extends BasicButton {
    static xtype: string;
    static EVENT_CHANGE: string;
+    props: {
+        text: string;
+        isAllCheckedBySelectedValue: (values: any[]) => boolean;
+        disableSelected: boolean;
+        isHalfCheckedBySelectedValue: (values: any[]) => boolean;
+        halfSelected: boolean;
+        iconWrapperWidth: number;
+        iconWidth: number;
+        iconHeight: number;
+    } & BasicButton['props'];
    setHalfSelected(v: boolean): void;
    isHalfSelected(): boolean;
    setValue<T>(selectedValues: T[]): void;
--- a/dist/lib/core/wrapper/layout/layout.td.d.ts
+++ b/dist/lib/core/wrapper/layout/layout.td.d.ts
@ -0,0 +1,10 @@
+import { Layout } from '../layout';
+export declare class TdLayout extends Layout {
+    static xtype: string;
+    props: {
+        columnSize: number[];
+        rowSize: number[];
+        verticalAlign: 'middle' | 'top' | 'bottom' | 'stretch';
+        horizontalAlign: 'left' | 'right' | 'center' | 'stretch';
+    };
+}
--- a/dist/lib/index.d.ts
+++ b/dist/lib/index.d.ts
@ -173,6 +173,7 @@ import { SingleSelectInsertList } from './widget/singleselect/singleselectlist.i
 import { MultiSelectTree } from './widget/multiselecttree/multiselecttree';
 import { HtmlLabel } from "./base/single/label/html.label";
 import { TreeValueChooserPane } from './component/treevaluechooser/pane.treevaluechooser';
+import { TdLayout } from './core/wrapper/layout/layout.td';
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
    OB: typeof OB;
    Plugin: _Plugin;
@ -351,9 +352,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
    MultiSelectTree: typeof MultiSelectTree;
    HtmlLabel: typeof HtmlLabel;
    TreeValueChooserPane: typeof TreeValueChooserPane;
+    TdLayout: typeof TdLayout;
 }
 declare const _default: {
    Decorators: typeof decorator;
 };
 export default _default;
-export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, BroadcastController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiPopupView, MultiSelectBar, SelectList, TextValueCombo, SmallTextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, MultiLayerDownListPopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiLayerDownListCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, StateEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, TextTrigger, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, Pager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, Tree, Node, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, DateTimeCombo, FloatHorizontalLayout, AdaptiveLayout, HexColorChooserPopup, BlankIconTextItem, TimeInterval, DynamicDateTimePane, SingleSelectInsertList, MultiSelectTree, HtmlLabel, TreeValueChooserPane, };
+export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, BroadcastController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiPopupView, MultiSelectBar, SelectList, TextValueCombo, SmallTextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, MultiLayerDownListPopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiLayerDownListCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, StateEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, TextTrigger, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, Pager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, Tree, Node, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, DateTimeCombo, FloatHorizontalLayout, AdaptiveLayout, HexColorChooserPopup, BlankIconTextItem, TimeInterval, DynamicDateTimePane, SingleSelectInsertList, MultiSelectTree, HtmlLabel, TreeValueChooserPane, TdLayout, };
--- a/dist/lib/widget/multiselect/multiselect.combo.d.ts
+++ b/dist/lib/widget/multiselect/multiselect.combo.d.ts
@ -9,6 +9,13 @@ export declare class MultiSelectCombo extends Single {
    static EVENT_CONFIRM: string;
    static REQ_GET_DATA_LENGTH: 1;
    static REQ_GET_ALL_DATA: -1;
+    props: {
+        itemsCreator: (options: any, callback: () => any[]) => void;
+        itemHeight: number;
+        text: string;
+        valueFormatter: (v: string) => string;
+        allowEdit: boolean;
+    } & Single['props'];
    _itemsCreator4Trigger(op: any, callback: Function): void;
    _stopEditing(): void;
    _defaultState(): void;
--- a/dist/resource.css
+++ b/dist/resource.css
--- a/dist/utils.js
+++ b/dist/utils.js
@ -1,4 +1,4 @@
-/*! time: 2021-7-12 20:10:46 */
+/*! time: 2021-7-21 10:30:28 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1269);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1270);
 /******/ })
 /************************************************************************/
 /******/ ({
@ -2927,7 +2927,7 @@ BI.Req = {

 /***/ }),

-/***/ 1127:
+/***/ 1128:
 /***/ (function(module, exports) {

 BI.i18n = {
@ -3132,7 +3132,7 @@ BI.i18n = {

 /***/ }),

-/***/ 1269:
+/***/ 1270:
 /***/ (function(module, exports, __webpack_require__) {

 __webpack_require__(91);
@ -3151,8 +3151,8 @@ __webpack_require__(97);
 __webpack_require__(98);
 __webpack_require__(108);
 __webpack_require__(109);
-__webpack_require__(1127);
-__webpack_require__(1270);
+__webpack_require__(1128);
+__webpack_require__(1271);
 __webpack_require__(110);
 __webpack_require__(111);
 module.exports = __webpack_require__(112);
@ -3160,7 +3160,7 @@ module.exports = __webpack_require__(112);

 /***/ }),

-/***/ 1270:
+/***/ 1271:
 /***/ (function(module, exports) {

 /**
--- a/dist/utils.js.map
+++ b/dist/utils.js.map
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/dist/utils.min.js.map
+++ b/dist/utils.min.js.map
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fineui",
-  "version": "2.0.20210712201212",
+  "version": "2.0.20210721103227",
  "description": "fineui",
  "main": "dist/fineui.min.js",
  "types": "dist/lib/index.d.ts",
--- a/src/base/1.pane.js
+++ b/src/base/1.pane.js
@ -138,6 +138,11 @@ BI.Pane = BI.inherit(BI.Widget, {
        }
    },

+    setTipText: function (text) {
+        this._assertTip();
+        this._tipText.setText(text);
+    },
+
    populate: function (items) {
        this.options.items = items || [];
        this.check();
--- a/src/case/layer/pane.list.js
+++ b/src/case/layer/pane.list.js
@ -121,8 +121,16 @@ BI.ListPane = BI.inherit(BI.Pane, {
            }]);
            return;
        }
-        BI.ListPane.superclass.populate.apply(this, arguments);
-        this.button_group.populate.apply(this.button_group, arguments);
+
+        var context = BI.get(arguments, [2], {});
+        var tipText = context.tipText || '';
+        if (BI.isNotEmptyString(tipText)) {
+            BI.ListPane.superclass.populate.apply(this, []);
+            this.setTipText(tipText);
+        } else {
+            BI.ListPane.superclass.populate.apply(this, arguments);
+            this.button_group.populate.apply(this.button_group, arguments);
+        }
    },

    empty: function () {
--- a/src/case/list/list.select.js
+++ b/src/case/list/list.select.js
@ -48,11 +48,13 @@ BI.SelectList = BI.inherit(BI.Widget, {
            items: o.items,
            itemsCreator: function (op, callback) {
                op.times === 1 && self.toolbar.setVisible(false);
-                o.itemsCreator(op, function (items) {
+                o.itemsCreator(op, function (items, keywords, context) {
                    callback.apply(self, arguments);
                    if (op.times === 1) {
-                        self.toolbar.setVisible(items && items.length > 0);
-                        self.toolbar.setEnable(self.isEnabled() && items && items.length > 0);
+                        var tipText = BI.get(context, 'tipText', '');
+                        var visible = BI.isEmptyString(tipText) && items && items.length > 0;
+                        self.toolbar.setVisible(visible);
+                        self.toolbar.setEnable(self.isEnabled() && visible);
                    }
                    self._checkAllSelected();
                });
--- a/src/case/pager/pager.all.count.js
+++ b/src/case/pager/pager.all.count.js
@ -97,9 +97,10 @@ BI.AllCountPager = BI.inherit(BI.Widget, {

        BI.createWidget(o.showRowCount ? {
            type: "bi.vertical_adapt",
-            columnSize: ["fill", ""],
            element: this,
            scrollx: false,
+            columnSize: ["fill", ""],
+            horizontalAlign: BI.HorizontalAlign.Right,
            items: [
                this._getRowCountObject(),
                this.editor, this.allPages, this.pager
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@ -300,10 +300,8 @@
            this._isMounted = true;
            for (var key in this._children) {
                var child = this._children[key];
-                if (layer === 0) {
-                    !self.isEnabled() && child._setEnable(false);
-                    !self.isValid() && child._setValid(false);
-                }
+                !self.isEnabled() && child._setEnable(false);
+                !self.isValid() && child._setValid(false);
                child._mount && child._mount(deep ? force : false, deep, lifeHook, predicate, layer + 1);
            }
            this._mountChildren && this._mountChildren();
--- a/src/core/8.snabdom.js
+++ b/src/core/8.snabdom.js
@ -929,7 +929,7 @@
    var propsModule = { create: updateProps, update: updateProps };

    // Bindig `requestAnimationFrame` like this fixes a bug in IE/Edge. See #360 and #409.
-    var raf$1 = typeof window !== "undefined" && window.requestAnimationFrame.bind(window) || setTimeout;
+    var raf$1 = typeof window !== "undefined" && (window.requestAnimationFrame && window.requestAnimationFrame.bind(window)) || setTimeout;
    var nextFrame$1 = function nextFrame$1(fn) {
        raf$1(function () {
            raf$1(fn);
--- a/src/core/wrapper/layout/adapt/adapt.leftrightvertical.js
+++ b/src/core/wrapper/layout/adapt/adapt.leftrightvertical.js
@ -97,6 +97,7 @@ BI.LeftVerticalAdaptLayout = BI.inherit(BI.Layout, {
        return BI.extend(BI.LeftRightVerticalAdaptLayout.superclass.props.apply(this, arguments), {
            baseCls: "bi-l-v-a",
            items: [],
+            columnSize: [],
            lgap: 0,
            rgap: 0,
            hgap: 0,
@ -114,6 +115,7 @@ BI.LeftVerticalAdaptLayout = BI.inherit(BI.Layout, {
                self.layout = _ref;
            },
            items: o.items,
+            columnSize: o.columnSize,
            hgap: o.hgap,
            lgap: o.lgap,
            rgap: o.rgap,
@ -146,6 +148,7 @@ BI.RightVerticalAdaptLayout = BI.inherit(BI.Layout, {
        return BI.extend(BI.RightVerticalAdaptLayout.superclass.props.apply(this, arguments), {
            baseCls: "bi-r-v-a",
            items: [],
+            columnSize: [],
            lgap: 0,
            rgap: 0,
            hgap: 0,
@ -164,6 +167,7 @@ BI.RightVerticalAdaptLayout = BI.inherit(BI.Layout, {
            },
            horizontalAlign: BI.HorizontalAlign.Right,
            items: o.items,
+            columnSize: o.columnSize,
            hgap: o.hgap,
            lgap: o.lgap,
            rgap: o.rgap,
--- a/src/core/wrapper/layout/adapt/adapt.table.js
+++ b/src/core/wrapper/layout/adapt/adapt.table.js
@ -61,7 +61,11 @@ BI.TableAdaptLayout = BI.inherit(BI.Layout, {
        // 2、不能给多个td设置最大宽度，这样只会平分宽度
        // 3、多百分比宽度就算了
        if (columnSize > 0) {
-            td.element.css({"max-width": columnSize < 1 ? width : width / BI.pixRatio + BI.pixUnit});
+            columnSize = columnSize < 1 ? width : width / BI.pixRatio + BI.pixUnit;
+            td.element.css({
+                "max-width": columnSize,
+                "min-width": columnSize
+            });
        }
        if (i === 0) {
            td.element.addClass("first-element");
--- a/src/core/wrapper/layout/layout.td.js
+++ b/src/core/wrapper/layout/layout.td.js
@ -76,13 +76,14 @@ BI.TdLayout = BI.inherit(BI.Layout, {
        }

        var height = o.rowSize[idx] === "" ? "" : (o.rowSize[idx] < 1 ? ((o.rowSize[idx] * 100).toFixed(1) + "%") : o.rowSize[idx]);
-
+        var rowHeight = BI.isNumber(o.rowSize[idx]) ? (o.rowSize[idx] <= 1 ? height : height / BI.pixRatio + BI.pixUnit) : height;
        var tr = BI._lazyCreateWidget({
            type: "bi.default",
            tagName: "tr",
            height: height,
            css: {
-                "max-height": BI.isNumber(o.rowSize[idx]) ? (o.rowSize[idx] <= 1 ? height : height / BI.pixRatio + BI.pixUnit) : height
+                "max-height": rowHeight,
+                "min-height": rowHeight
            }
        });

@ -132,7 +133,11 @@ BI.TdLayout = BI.inherit(BI.Layout, {
            // 2、不能给多个td设置最大宽度，这样只会平分宽度
            // 3、多百分比宽度就算了
            if (columnSize > 0) {
-                td.element.css({"max-width": columnSize < 1 ? width : width / BI.pixRatio + BI.pixUnit});
+                columnSize = columnSize < 1 ? width : width / BI.pixRatio + BI.pixUnit;
+                td.element.css({
+                    "max-width": columnSize,
+                    "min-width": columnSize
+                });
            }
            td.element.css({
                position: "relative",
--- a/src/widget/multiselect/multiselect.combo.js
+++ b/src/widget/multiselect/multiselect.combo.js
@ -12,12 +12,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
            valueFormatter: BI.emptyFn,
            itemHeight: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
            height: 24,
-            allowEdit: true
+            allowEdit: true,
        });
    },

    _init: function () {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        BI.MultiSelectCombo.superclass._init.apply(this, arguments);
        var assertShowValue = function () {
            if (BI.isKey(self._startValue)) {
@ -52,13 +52,13 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                    left: 0,
                    top: 0,
                    right: 0,
-                    bottom: 25
-                }
+                    bottom: 25,
+                },
            },
            valueFormatter: o.valueFormatter,
            itemsCreator: BI.bind(this._itemsCreator4Trigger, this),
            itemHeight: o.itemHeight,
-            value: this.storeValue
+            value: this.storeValue,
        });

        this.trigger.on(BI.MultiSelectTrigger.EVENT_FOCUS, function () {
@ -143,22 +143,22 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                            assertShowValue();
                        });
                        self.fireEvent(BI.MultiSelectCombo.EVENT_CLICK_ITEM);
-                    }
+                    },
                }, {
                    eventName: BI.MultiSelectPopupView.EVENT_CLICK_CONFIRM,
                    action: function () {
                        self._defaultState();
-                    }
+                    },
                }, {
                    eventName: BI.MultiSelectPopupView.EVENT_CLICK_CLEAR,
                    action: function () {
                        self._dataChange = true;
                        self.setValue();
                        self._defaultState();
-                    }
+                    },
                }],
                itemsCreator: o.itemsCreator,
-                itemsHeight: o.itemsHeight,
+                itemHeight: o.itemHeight,
                valueFormatter: o.valueFormatter,
                onLoaded: function () {
                    BI.nextTick(function () {
@ -167,12 +167,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                        self.numberCounter.adjustView();
                        self.trigger.getSearcher().adjustView();
                    });
-                }
+                },
            },
            value: o.value,
            hideChecker: function (e) {
                return triggerBtn.element.find(e.target).length === 0 && self.numberCounter.element.find(e.target).length === 0;
-            }
+            },
        });

        this.combo.on(BI.Combo.EVENT_BEFORE_POPUPVIEW, function () {
@ -200,7 +200,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
            type: "bi.trigger_icon_button",
            width: o.height,
            height: o.height,
-            cls: "multi-select-trigger-icon-button"
+            cls: "multi-select-trigger-icon-button",
        });
        triggerBtn.on(BI.TriggerIconButton.EVENT_CHANGE, function () {
            self.numberCounter.hideView();
@ -218,12 +218,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                    left: 0,
                    top: 0,
                    right: 0,
-                    bottom: 25
-                }
+                    bottom: 25,
+                },
            },
            valueFormatter: o.valueFormatter,
            itemsCreator: BI.bind(this._itemsCreator4Trigger, this),
-            value: this.storeValue
+            value: this.storeValue,
        });
        this.numberCounter.on(BI.MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_CHANGE, function () {
            if (!self.combo.isViewVisible()) {
@ -260,26 +260,26 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
                left: 0,
                right: 0,
                top: 0,
-                bottom: 0
+                bottom: 0,
            }, {
                el: triggerBtn,
                right: 0,
                top: 0,
-                bottom: 0
+                bottom: 0,
            }, {
                el: {
                    type: "bi.vertical_adapt",
-                    items: [this.numberCounter]
+                    items: [this.numberCounter],
                },
                right: o.height,
                top: 0,
-                height: o.height
-            }]
+                height: o.height,
+            }],
        });
    },

    _itemsCreator4Trigger: function (op, callback) {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        o.itemsCreator(op, function (res) {
            if (op.times === 1 && BI.isNotNull(op.keywords)) {
                // 预防trigger内部把当前的storeValue改掉
@ -310,12 +310,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
    },

    _joinKeywords: function (keywords, callback) {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        this._assertValue(this.storeValue);
        this.requesting = true;
        o.itemsCreator({
            type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
-            keywords: keywords
+            keywords: keywords,
        }, function (ob) {
            var values = BI.map(ob.items, "value");
            digest(values);
@ -333,28 +333,30 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
    },

    _joinAll: function (res, callback) {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        this._assertValue(res);
        this.requesting = true;
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    self.storeValue.assist && self.storeValue.assist.push(map[v]);
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            this._adjust(callback);
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectCombo.REQ_GET_ALL_DATA,
-            keywords: [this.trigger.getKey()]
+            keywords: [this.trigger.getKey()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        self.storeValue.assist && self.storeValue.assist.push(map[v]);
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                self._adjust(callback);
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
@ -374,7 +376,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
    },

    _adjust: function (callback) {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        adjust();
        callback();

@ -388,7 +390,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
    },

    _join: function (res, callback) {
-        var self = this, o = this.options;
+        var self = this; var o = this.options;
        this._assertValue(res);
        this._assertValue(this.storeValue);
        if (this.storeValue.type === res.type) {
@ -410,7 +412,8 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
            });
            change && (this.storeValue.value = BI.values(map));
            self._adjust(callback);
-            return;
+            
+return;
        }
        this._joinAll(res, callback);
    },
@ -446,12 +449,12 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
    populate: function () {
        this._populate.apply(this, arguments);
        this.numberCounter.populateSwitcher.apply(this.numberCounter, arguments);
-    }
+    },
 });

 BI.extend(BI.MultiSelectCombo, {
    REQ_GET_DATA_LENGTH: 1,
-    REQ_GET_ALL_DATA: -1
+    REQ_GET_ALL_DATA: -1,
 });

 BI.MultiSelectCombo.EVENT_BLUR = "EVENT_BLUR";
--- a/src/widget/multiselect/multiselect.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.combo.nobar.js
@ -363,25 +363,27 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
        var self = this, o = this.options;
        this._assertValue(res);
        this.requesting = true;
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = self._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    self.storeValue.assist && self.storeValue.assist.push(map[v]);
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            this._adjust(callback);
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectNoBarCombo.REQ_GET_ALL_DATA,
-            keywords: [this.trigger.getKey()]
+            keywords: [this.trigger.getKey()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        self.storeValue.assist && self.storeValue.assist.push(map[v]);
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                self._adjust(callback);
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
--- a/src/widget/multiselect/multiselect.insert.combo.js
+++ b/src/widget/multiselect/multiselect.insert.combo.js
@ -350,25 +350,27 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
        var self = this, o = this.options;
        this._assertValue(res);
        this.requesting = true;
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    self.storeValue.assist && self.storeValue.assist.push(map[v]);
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            this._adjust(callback);
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectInsertCombo.REQ_GET_ALL_DATA,
-            keywords: [this.trigger.getKey()]
+            keywords: [this.trigger.getKey()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        self.storeValue.assist && self.storeValue.assist.push(map[v]);
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                self._adjust(callback);
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
--- a/src/widget/multiselect/multiselect.insert.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js
@ -348,25 +348,27 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
        var self = this, o = this.options;
        this._assertValue(res);
        this.requesting = true;
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    self.storeValue.assist && self.storeValue.assist.push(map[v]);
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            this._adjust(callback);
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectInsertNoBarCombo.REQ_GET_ALL_DATA,
-            keywords: [this.trigger.getKey()]
+            keywords: [this.trigger.getKey()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        self.storeValue.assist && self.storeValue.assist.push(map[v]);
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                self._adjust(callback);
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
--- a/src/widget/multiselect/search/multiselect.search.loader.js
+++ b/src/widget/multiselect/search/multiselect.search.loader.js
@ -68,7 +68,10 @@ BI.MultiSelectSearchLoader = BI.inherit(BI.Widget, {
                        var json = self._filterValues(self.storeValue);
                        firstItems = self._createItems(json);
                    }
-                    callback(firstItems.concat(self._createItems(ob.items)), keyword);
+                    var context = {
+                        tipText: ob.tipText,
+                    };
+                    callback(firstItems.concat(self._createItems(ob.items)), keyword, context);
                    if (op.times === 1 && self.storeValue) {
                        self.setValue(self.storeValue);
                    }
--- a/src/widget/multiselectlist/multiselectlist.insert.js
+++ b/src/widget/multiselectlist/multiselectlist.insert.js
@ -239,24 +239,26 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
    _joinAll: function (res, callback) {
        var self = this, o = this.options;
        this._assertValue(res);
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            callback();
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectInsertList.REQ_GET_ALL_DATA,
-            keywords: [self.trigger.getKeyword()]
+            keywords: [this.trigger.getKeyword()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                callback();
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
--- a/src/widget/multiselectlist/multiselectlist.insert.nobar.js
+++ b/src/widget/multiselectlist/multiselectlist.insert.nobar.js
@ -243,24 +243,26 @@ BI.MultiSelectInsertNoBarList = BI.inherit(BI.Single, {
    _joinAll: function (res, callback) {
        var self = this, o = this.options;
        this._assertValue(res);
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            callback();
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectInsertNoBarList.REQ_GET_ALL_DATA,
-            keywords: [self.trigger.getKeyword()]
+            keywords: [this.trigger.getKeyword()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                callback();
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
--- a/src/widget/multiselectlist/multiselectlist.js
+++ b/src/widget/multiselectlist/multiselectlist.js
@ -229,24 +229,26 @@ BI.MultiSelectList = BI.inherit(BI.Widget, {
    _joinAll: function (res, callback) {
        var self = this, o = this.options;
        this._assertValue(res);
+        if (this.storeValue.type === res.type) {
+            var result = BI.Func.getSearchResult(this.storeValue.value, this.trigger.getKey());
+            var change = false;
+            var map = this._makeMap(this.storeValue.value);
+            BI.each(BI.concat(result.match, result.find), function (i, v) {
+                if (BI.isNotNull(map[v])) {
+                    change = true;
+                    delete map[v];
+                }
+            });
+            change && (this.storeValue.value = BI.values(map));
+            this._adjust(callback);
+            return;
+        }
        o.itemsCreator({
            type: BI.MultiSelectList.REQ_GET_ALL_DATA,
-            keywords: [this.trigger.getKey()]
+            keywords: [this.trigger.getKey()],
+            selectedValues: this.storeValue.value,
        }, function (ob) {
            var items = BI.map(ob.items, "value");
-            if (self.storeValue.type === res.type) {
-                var change = false;
-                var map = self._makeMap(self.storeValue.value);
-                BI.each(items, function (i, v) {
-                    if (BI.isNotNull(map[v])) {
-                        change = true;
-                        delete map[v];
-                    }
-                });
-                change && (self.storeValue.value = BI.values(map));
-                self._adjust(callback);
-                return;
-            }
            var selectedMap = self._makeMap(self.storeValue.value);
            var notSelectedMap = self._makeMap(res.value);
            var newItems = [];
--- a/src/widget/singleselect/search/singleselect.search.loader.js
+++ b/src/widget/singleselect/search/singleselect.search.loader.js
@ -64,7 +64,10 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
                        var json = self._filterValues(self.storeValue);
                        firstItems = self._createItems(json);
                    }
-                    callback(firstItems.concat(self._createItems(ob.items)), keyword || "");
+                    var context = {
+                        tipText: ob.tipText,
+                    };
+                    callback(firstItems.concat(self._createItems(ob.items)), keyword || "", context);
                    if (op.times === 1 && self.storeValue) {
                        self.setValue(self.storeValue);
                    }
--- a/src/widget/yearmonth/trigger.yearmonth.js
+++ b/src/widget/yearmonth/trigger.yearmonth.js
@ -67,7 +67,11 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
            height: o.height,
            validationChecker: function (v) {
                if (isYear) {
-                    return v === "" || (BI.isPositiveInteger(v) && !BI.checkDateVoid(v, parseInt(v, 10) === BI.parseDateTime(o.min, "%Y-%X-%d").getFullYear() ? BI.parseDateTime(o.min, "%Y-%X-%d").getMonth() + 1 : 1, 1, o.min, o.max)[0]);
+                    var month = self.monthEditor.getValue();
+                    if(BI.isEmptyString(month)) {
+                        month = parseInt(v, 10) === BI.parseDateTime(o.min, "%Y-%X-%d").getFullYear() ? (BI.parseDateTime(o.min, "%Y-%X-%d").getMonth() + 1) : 1;
+                    }
+                    return v === "" || (BI.isPositiveInteger(v) && !BI.checkDateVoid(v, month, 1, o.min, o.max)[0]);
                }
                var year = self.yearEditor.getValue();

--- a/src/widget/yearquarter/trigger.yearquarter.js
+++ b/src/widget/yearquarter/trigger.yearquarter.js
@ -65,7 +65,13 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
            height: o.height,
            validationChecker: function (v) {
                if(isYear) {
-                    return v === "" || (BI.isPositiveInteger(v) && !BI.checkDateVoid(v, parseInt(v, 10) === BI.parseDateTime(o.min, "%Y-%X-%d").getFullYear() ? BI.parseDateTime(o.min, "%Y-%X-%d").getMonth() + 1 : 1, 1, o.min, o.max)[0]);
+                    var month = self.quarterEditor.getValue();
+                    if(BI.isEmptyString(month)) {
+                        month = parseInt(v, 10) === BI.parseDateTime(o.min, "%Y-%X-%d").getFullYear() ? BI.parseDateTime(o.min, "%Y-%X-%d").getMonth() + 1 : 1;
+                    } else {
+                        month = (v - 1) * 3 + 1;
+                    }
+                    return v === "" || (BI.isPositiveInteger(v) && !BI.checkDateVoid(v, month, 1, o.min, o.max)[0]);
                }
                var year = self.yearEditor.getValue();

--- a/typescript/base/a/a.ts
+++ b/typescript/base/a/a.ts
@ -2,4 +2,7 @@ import { Text } from "../single/text";

 export declare class A extends Text {
    static xtype: string;
+    props: {
+        href: string;
+    } & Text['props'];
 }
--- a/typescript/case/button/item.multiselect.ts
+++ b/typescript/case/button/item.multiselect.ts
@ -4,12 +4,23 @@ export declare class MultiSelectItem extends BasicButton {
    static xtype: string;

    static EVENT_CHANGE: string;
-    
+
+    props: {
+        login: {
+            dynamic: boolean;
+        }
+        text: string;
+        iconWrapperWidth: number;
+        textLgap: number;
+        textRgap: number;
+        textHgap: number;
+    } & BasicButton['props'];
+
    doClick(...args: any[]): void;

    doRedMark(...args: any[]): void;

    unRedMark(...args: any[]): void;

-    setSelected(v: boolean): void; 
+    setSelected(v: boolean): void;
 }
--- a/typescript/case/combo/textvaluecheckcombo/popup.textvaluecheck.ts
+++ b/typescript/case/combo/textvaluecheckcombo/popup.textvaluecheck.ts
@ -6,5 +6,5 @@ export declare class TextValueCheckComboPopup extends Pane {

    populate(items: any[]): void;
    getValue(): any;
-    setValue(): void;
+    setValue(v: any): void;
 }
--- a/typescript/case/toolbar/toolbar.multiselect.ts
+++ b/typescript/case/toolbar/toolbar.multiselect.ts
@ -2,8 +2,19 @@ import { BasicButton } from "../../base/single/button/button.basic";

 export declare class MultiSelectBar extends BasicButton {
    static xtype: string;
-    
+
    static EVENT_CHANGE: string;
+    
+    props: {
+        text: string;
+        isAllCheckedBySelectedValue: (values: any[]) => boolean;
+        disableSelected: boolean;
+        isHalfCheckedBySelectedValue: (values: any[]) => boolean;
+        halfSelected: boolean;
+        iconWrapperWidth: number;
+        iconWidth: number;
+        iconHeight: number;
+    } & BasicButton['props'];

    setHalfSelected(v: boolean): void;

--- a/typescript/core/wrapper/layout/layout.td.ts
+++ b/typescript/core/wrapper/layout/layout.td.ts
@ -0,0 +1,12 @@
+import { Layout } from '../layout';
+
+export declare class TdLayout extends Layout {
+    static xtype: string;
+
+    props: {
+        columnSize: number[];
+        rowSize: number[];
+        verticalAlign: 'middle' | 'top' | 'bottom' | 'stretch';
+        horizontalAlign: 'left' | 'right' | 'center' | 'stretch';
+    }
+}
--- a/typescript/index.ts
+++ b/typescript/index.ts
@ -173,6 +173,7 @@ import { SingleSelectInsertList } from './widget/singleselect/singleselectlist.i
 import { MultiSelectTree } from './widget/multiselecttree/multiselecttree';
 import { HtmlLabel } from "./base/single/label/html.label";
 import { TreeValueChooserPane } from './component/treevaluechooser/pane.treevaluechooser';
+import { TdLayout } from './core/wrapper/layout/layout.td';


 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@ -353,6 +354,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
    MultiSelectTree: typeof MultiSelectTree;
    HtmlLabel: typeof HtmlLabel;
    TreeValueChooserPane: typeof TreeValueChooserPane;
+    TdLayout: typeof TdLayout;
 }

 export default {
@ -533,4 +535,5 @@ export {
    MultiSelectTree,
    HtmlLabel,
    TreeValueChooserPane,
+    TdLayout,
 };
--- a/typescript/widget/multiselect/multiselect.combo.ts
+++ b/typescript/widget/multiselect/multiselect.combo.ts
@ -11,6 +11,14 @@ export declare class MultiSelectCombo extends Single {
    static REQ_GET_DATA_LENGTH: 1;
    static REQ_GET_ALL_DATA: -1;

+    props: {
+        itemsCreator: (options: any, callback: () => any[]) => void;
+        itemHeight: number;
+        text: string;
+        valueFormatter: (v: string) => string;
+        allowEdit: boolean;
+    } & Single['props']
+
    _itemsCreator4Trigger(op: any, callback: Function): void;

    _stopEditing(): void;