Pull request #211827: 无JIRA任务同步final

Merge in DEC/fineui from ~WINDY/fineui:final/11.0 to final/11.0 * commit '582b614704babbb91ab3a201c131c9e03771cc50': (57 commits) Revert "BI-118262 fix: 树过滤组件搜索过滤不生效" KERNEL-11877 fix: firefox 下bounds计算错误问题 BI-118262 fix: 树过滤组件搜索过滤不生效无 jira 任务 refactor: 类型补充 KERNEL-11877 feat: 修复bug REPORT-84736 feat: 多门户首页切换-平台前端开发 auto upgrade version to 2.0.20221210193709 KERNEL-11877 feat: direction:bottom和direction:top空间不够时的调整逻辑 KERNEL-11877 feat: container支持函数, 修复错误 auto upgrade version to 2.0.20221209162625 BI-118670 fix: 修复传参 auto upgrade version to 2.0.20221209142506 auto upgrade version to 2.0.20221209120344 BI-118434 fix: 临时解决一下belowMouse BI-118474 style: 图标更新 auto upgrade version to 2.0.20221208185443 auto upgrade version to 2.0.20221208183344 auto upgrade version to 2.0.20221208181750 KERNEL-11877 feat: container支持函数, 修复错误 demo ...
2 years ago · 698c8f224f
40 changed files with 493 additions and 652 deletions
--- a/demo/js/base/button/demo.button.js
+++ b/demo/js/base/button/demo.button.js
@ -385,6 +385,11 @@ Demo.Button = BI.inherit(BI.Widget, {
            type: "bi.button",
            text: "小于最小宽度的按钮",
            width: 50,
+        }, {
+            type: "bi.button",
+            text: "一个文字超级超级长的 button, 他比按钮宽度还长。",
+            textWidth: 500,
+            width: 100,
        }];

        return {
--- a/demo/js/case/combo/demo.text_value_combo.js
+++ b/demo/js/case/combo/demo.text_value_combo.js
@ -8,19 +8,21 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
    render: function () {
        var combo1, combo2;

-        var items = [{
-            text: "MVC-1",
-            iconCls: "date-font",
-            value: 1
-        }, {
-            text: "MVC-2",
-            iconCls: "search-font",
-            value: 2
-        }, {
-            text: "MVC-3",
-            iconCls: "pull-right-font",
-            value: 3
-        }];
+        var items = [
+            {
+                text: "MVC-1",
+                iconCls: "date-font",
+                value: 1
+            }, {
+                text: "MVC-2",
+                iconCls: "search-font",
+                value: 2
+            }, {
+                text: "MVC-3",
+                iconCls: "pull-right-font",
+                value: 3
+            }
+        ];

        // 创建下拉框各种场景用例
        return {
@ -195,6 +197,31 @@ Demo.TextValueCombo = BI.inherit(BI.Widget, {
                            allowClear: true,
                            defaultText: "请选择",
                            chooseType: BI.Selection.Multi,
+                            value: [1],
+                            // allowSelectAll: false,
+                            listeners: [
+                                {
+                                    eventName: BI.TextValueCombo.EVENT_CHANGE,
+                                    action: function () {
+                                        console.log(this.getValue());
+                                    }
+                                }
+                            ]
+                        }
+                    ]
+                }),
+                this.createCombo("支持复选,不要全选功能", {
+                    type: "bi.vertical",
+                    items: [
+                        {
+                            type: "bi.text_value_combo",
+                            width: 300,
+                            items: items,
+                            allowClear: true,
+                            defaultText: "请选择",
+                            chooseType: BI.Selection.Multi,
+                            value: [1],
+                            allowSelectAll: false,
                            listeners: [
                                {
                                    eventName: BI.TextValueCombo.EVENT_CHANGE,
--- a/demo/js/west.js
+++ b/demo/js/west.js
@ -9,6 +9,10 @@ Demo.West = BI.inherit(BI.Widget, {

    render: function () {
        var self = this;
+
+
+        var selectedId = BI.Router.$router.currentRoute.params?.componentId;
+
        return {
            type: "bi.vtape",
            items: [{
@ -60,7 +64,7 @@ Demo.West = BI.inherit(BI.Widget, {
                        self.fireEvent(Demo.West.EVENT_VALUE_CHANGE, v);
                    }
                }],
-                value: Demo.showIndex,
+                value: selectedId || Demo.showIndex,
                items: Demo.CONFIG,
                ref: function (ref) {
                    self.tree = ref;
--- a/dist/font/iconfont.eot
+++ b/dist/font/iconfont.eot
--- a/dist/font/iconfont.svg
+++ b/dist/font/iconfont.svg
@ -14,6 +14,30 @@
    />
      <missing-glyph />
      
+      <glyph glyph-name="qitaziduanleixing" unicode="&#59860;" d="M168 704a8 8 0 0 1-8-8v-64a8 8 0 0 1 8-8h688a8 8 0 0 1 8 8V696a8 8 0 0 1-8 8H168z m-8-288a8 8 0 0 0 8 8h688a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8H168a8 8 0 0 0-8 8v64z m0-280a8 8 0 0 0 8 8h688a8 8 0 0 0 8-8v-64a8 8 0 0 0-8-8H168a8 8 0 0 0-8 8v64z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="ziyuankongzhi" unicode="&#59859;" d="M450.328 754.728A16.008 16.008 0 0 1 438.46 760H128a16 16 0 0 1-16-16v-720a16 16 0 0 1 16-16h766.952a16 16 0 0 1 16 16V615.88a16 16 0 0 1-16 16H800.48l-71.752 75.168A16 16 0 0 1 717.152 712h-228.196l-38.628 42.728z m-273.76-67.136h244.58l116.408-123.936h308.828V318h-105.62a8.008 8.008 0 0 0-6.544 3.396l-121.548 172.728a8 8 0 0 1-13.056 0.04l-159.992-224.36a8 8 0 0 0-13.172 0.208l-93.216 139.824a8 8 0 0 1-12.676 0.828l-78.688-89.932a8 8 0 0 0-6.024-2.732h-59.28V687.592z m0-433.592h88.32a8 8 0 0 1 6.024 2.732l42.768 48.88a8 8 0 0 0 12.676-0.832l98.324-147.484a8 8 0 0 1 13.168-0.208l161.42 226.36a8 8 0 0 0 13.056-0.04l88.676-126.012a8 8 0 0 1 6.544-3.396h138.84v-173.592H176.564V254z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="yiping" unicode="&#59858;" d="M506.036 553.656a8.008 8.008 0 0 0 9.724 1.24c1.404-0.332 2.74-1.04 3.836-2.14l175.696-175.692a8 8 0 0 0 0-11.312l-33.944-33.944a8 8 0 0 0-11.312 0l-137.668 137.668-136.772-136.768a8 8 0 0 0-11.312 0l-33.94 33.94a8 8 0 0 0 0 11.316l175.692 175.692zM912 768a16 16 0 0 1-16 16H128a16 16 0 0 1-16-16v-624a16 16 0 0 1 16-16h352v-80H324a8 8 0 0 1-8-8v-48a8 8 0 0 1 8-8h372a8 8 0 0 1 8 8v48a8 8 0 0 1-8 8h-152v80h352a16 16 0 0 1 16 16V768z m-72-56v-512H184V712h656z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="hangzhuanlie" unicode="&#59851;" d="M152 648h188V744H152v-96z m260 0h200V744h-200v-96z m460 0V744h-188v-96h188zM80 800a16 16 0 0 0 16 16h832a16 16 0 0 0 16-16v-208a16 16 0 0 0-16-16H96a16 16 0 0 0-16 16V800z m0-312a16 16 0 0 0 16 16h316a16 16 0 0 0 16-16v-520a16 16 0 0 0-16-16H96a16 16 0 0 0-16 16V488z m438-400.952H656c68.484 0 124 55.516 124 124v147.28l-49.088-49.092a8 8 0 0 0-11.316 0l-33.94 33.944a8 8 0 0 0 0 11.312l120.82 120.82a16 16 0 0 0 22.628 0l120.82-120.82a8 8 0 0 0 0-11.312l-33.944-33.944a8 8 0 0 0-11.312 0L852 361.904v-150.856c0-108.248-87.752-196-196-196h-138a8 8 0 0 0-8 8v56a8 8 0 0 0 8 8z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="liezhuanhang" unicode="&#59857;" d="M80 800a16 16 0 0 0 16 16h832a16 16 0 0 0 16-16v-208a16 16 0 0 0-16-16H96a16 16 0 0 0-16 16V800z m72-368h200v-92H152v92z m0-244v80h200v-80H152z m0-72h200v-92H152v92zM96 504a16 16 0 0 1-16-16v-520a16 16 0 0 1 16-16h312a16 16 0 0 1 16 16V488a16 16 0 0 1-16 16H96z m419.312-429.088l23.632-23.632c0.748-1.392 1.892-2.536 3.28-3.28l93.908-93.908a8 8 0 0 1 11.312 0l33.944 33.944a8 8 0 0 1 0 11.312l-47.708 47.708H684c108.248 0 196 87.752 196 196v244.952a8 8 0 0 1-8 8h-56a8 8 0 0 1-8-8v-244.952c0-68.484-55.516-124-124-124h-56.664l54.052 54.048a8 8 0 0 1 0 11.312l-33.944 33.944a8 8 0 0 1-11.312 0l-120.82-120.82a16 16 0 0 1 0-22.628z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="a-jiantoumian" unicode="&#59853;" d="M711.111111 636.131556a28.444444 28.444444 0 0 0 18.204445-6.542223l268.515555-223.744a28.444444 28.444444 0 0 0 0-43.690666l-268.515555-223.744a28.444444 28.444444 0 0 0-46.648889 21.902222L682.609778 344.177778H96.711111a39.822222 39.822222 0 0 0 0 79.644444H682.666667V607.687111a28.444444 28.444444 0 0 0 28.444444 28.444445z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="tingzhi" unicode="&#59854;" d="M320 832a64 64 0 0 0 64-64v-768a64 64 0 0 0-64-64H192a64 64 0 0 0-64 64V768a64 64 0 0 0 64 64h128z m512 0a64 64 0 0 0 64-64v-768a64 64 0 0 0-64-64h-128a64 64 0 0 0-64 64V768a64 64 0 0 0 64 64h128zM307.2 755.2H204.8v-742.4h102.4V755.2z m512 0h-102.4v-742.4h102.4V755.2z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="zhongqi" unicode="&#59855;" d="M512 807.168c111.744 0 213.248-44.096 288-115.84v51.84a32 32 0 1 0 64 0v-160a31.872 31.872 0 0 0-32-32h-159.872a32 32 0 1 0 0 64h111.36a352 352 0 1 1 52.608-361.536h0.128a32 32 0 1 0 57.92-27.008A416.128 416.128 0 0 0 96 391.168a416 416 0 0 0 416 416zM447.04 531.648a12.8 12.8 0 0 0 7.552-2.496l184.96-134.784a12.8 12.8 0 0 0 0-20.736l-184.96-134.784a12.8 12.8 0 0 0-20.352 10.304V518.848c0 7.04 5.76 12.8 12.8 12.8z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="qidong" unicode="&#59856;" d="M892.48 432.704l-552.192 386.56a70.4 70.4 0 0 1-110.784-57.664v-773.12a70.4 70.4 0 0 1 110.72-57.6l552.256 386.56a70.4 70.4 0 0 1 0 115.264z m-51.456-57.6l-534.72-374.272V749.312L840.96 375.04z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="yunweizujian" unicode="&#61899;" d="M768 832a64 64 0 0 0 64-64v-192a64 64 0 0 0-64-64H544v-96.384l288 0.064a96 96 0 0 0 95.552-86.72l0.448-9.216V256h32a64 64 0 0 0 64-64v-192a64 64 0 0 0-64-64h-128a64 64 0 0 0-64 64v192a64 64 0 0 0 64 64h32v63.68a32 32 0 0 1-26.24 31.488L832 351.67999999999995l-288-0.064V256h64a64 64 0 0 0 64-64v-192a64 64 0 0 0-64-64h-192a64 64 0 0 0-64 64v192a64 64 0 0 0 64 64h64V351.616L192 351.48800000000006a32.064 32.064 0 0 1-31.488-26.24l-0.512-5.76V256H192a64 64 0 0 0 64-64v-192a64 64 0 0 0-64-64H64a64 64 0 0 0-64 64v192a64 64 0 0 0 64 64h32v63.488c0 49.856 38.08 90.88 86.72 95.552L192 415.488l288 0.128V512H256a64 64 0 0 0-64 64V768a64 64 0 0 0 64 64h512zM192 192h-32v-0.32h-64V192H64v-192h128v192z m416 0h-192v-192h192v192z m352 0h-128v-192h128v192z m-192 576H256v-192h512V768zM352 704a32 32 0 1 0 0-64 32 32 0 0 0 0 64z m320 0a32 32 0 1 0 0-64h-192a32 32 0 0 0 0 64h192z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="jiankangzhenduan" unicode="&#59852;" d="M800-1.472a32 32 0 1 0 0-64h-576a32 32 0 0 0 0 64h576z m96 768a64 64 0 0 0 64-64v-576a64 64 0 0 0-64-64H128a64 64 0 0 0-64 64v576a64 64 0 0 0 64 64h768z m0-64H128v-576h768v576zM431.744 621.12a32 32 0 0 0 57.28-5.76l105.024-284.608 28.096 67.392 2.56 4.864a32 32 0 0 0 26.944 14.848h116.8l5.76-0.512a32 32 0 0 0 26.24-31.488l-0.512-5.76a32 32 0 0 0-31.488-26.24h-95.424l-51.2-122.88-2.752-5.312a32 32 0 0 0-56.768 6.528l-103.68 280.512-53.568-142.336-2.432-5.12a32 32 0 0 0-27.52-15.616H256.384l-5.76 0.512a32 32 0 0 0-26.24 31.488l0.512 5.76a32 32 0 0 0 31.488 26.24h96.512l76.16 201.984z"  horiz-adv-x="1024" />
+      
+      <glyph glyph-name="Greenplumtouxiang" unicode="&#59850;" d="M511.36 564.608c-99.392 0-179.968-78.944-179.968-176.32 0-66.24 24.16-116.352 76.16-144.576 13.216-7.2 29.28-1.92 37.92 10.432l59.264 84.608a331.36 331.36 0 0 0 53.632 59.616l79.68 69.44c11.584 10.112 15.04 27.2 5.664 39.36-32.672 42.56-81.664 57.44-132.352 57.44zM512-128c282.784 0 512 229.216 512 512S794.784 896 512 896 0 666.784 0 384s229.216-512 512-512z m0 874.88c111.392 0 216.96-52.8 285.056-138.56 27.744-34.944 17.408-84.192-15.744-114.016L611.84 342.08c-16.8-15.104-32-31.872-45.44-50.048l-137.696-187.072c-26.4-35.84-74.336-50.944-111.84-26.944A362.592 362.592 0 0 0 149.12 384C149.12 584.416 311.584 746.88 512 746.88z"  horiz-adv-x="1024" />
+      
      <glyph glyph-name="a-leixingshujubiaozhilianoffyifabuon" unicode="&#59848;" d="M56 864a16 16 0 0 1-16-16v-808a16 16 0 0 1 16-16h455.232a282.52 282.52 0 0 0-12.972 56H96V808h496v-148a16 16 0 0 1 16-16h160v-244.248a285.964 285.964 0 0 0 56-3.14V653.28a16 16 0 0 1-4.796 11.424l-198.536 194.72A16.004 16.004 0 0 1 609.464 864H56zM493.596 355.344L613.432 500l49.284-40.828-134.672-162.568-3.988-5.168a32 32 0 0 0-44.88-5.796l-112.196 86.536-117.696-140.556L200 272.448l131.816 157.6 4.672 6.06a32 32 0 0 0 44.88 5.796l112.228-86.56zM1020 116c0-132.548-107.452-240-240-240s-240 107.452-240 240 107.452 240 240 240 240-107.452 240-240z m-104.296 116.508c1.464 4.444-2.752 8.66-7.196 7.196l-284.596-93.912a5.696 5.696 0 0 1-2.24-9.436l72.14-72.14 91.08 44.436-44.436-91.08 71.9-71.9c3-3 8.108-1.788 9.436 2.244l93.912 284.592z"  horiz-adv-x="1024" />
      
      <glyph glyph-name="a-leixingshujubiaozhilianonyifabuon" unicode="&#59849;" d="M40 848a16 16 0 0 0 16 16h553.464c4.188 0 8.212-1.64 11.204-4.576l198.536-194.72A16 16 0 0 0 824 653.28v-256.668a285.964 285.964 0 0 1-56 3.14V644h-160a16 16 0 0 0-16 16V808H96v-728h402.26a282.52 282.52 0 0 1 12.972-56H56a16 16 0 0 0-16 16V848zM176 216h338.104a282.16 282.16 0 0 1-15.844-64H176a8 8 0 0 0-8 8v48a8 8 0 0 0 8 8zM613.432 580l-119.836-144.656-112.224 86.56a32 32 0 0 1-44.884-5.796l-4.672-6.06L200 352.448l49.284-40.828 117.696 140.556 112.196-86.536a32 32 0 0 1 44.88 5.796l3.988 5.168 134.672 162.568L613.432 580zM1020 116c0-132.548-107.452-240-240-240s-240 107.452-240 240 107.452 240 240 240 240-107.452 240-240z m-104.296 116.508c1.464 4.444-2.752 8.66-7.196 7.196l-284.596-93.912a5.696 5.696 0 0 1-2.24-9.436l72.14-72.14 91.08 44.436-44.436-91.08 71.9-71.9c3-3 8.108-1.788 9.436 2.244l93.912 284.592z"  horiz-adv-x="1024" />
--- a/dist/font/iconfont.ttf
+++ b/dist/font/iconfont.ttf
--- a/dist/font/iconfont.woff
+++ b/dist/font/iconfont.woff
--- a/dist/font/iconfont.woff2
+++ b/dist/font/iconfont.woff2
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fineui",
-  "version": "2.0.20221121190600",
+  "version": "2.0.20221210193709",
  "description": "fineui",
  "main": "dist/fineui_without_conflict.min.js",
  "types": "dist/lib/index.d.ts",
--- a/src/base/combination/bubble.js
+++ b/src/base/combination/bubble.js
@ -106,7 +106,8 @@
        _initPullDownAction: function () {
            var self = this, o = this.options;
            var evs = (this.options.trigger || "").split(",");
-            function st (e) {
+
+            function st(e) {
                if (o.stopEvent) {
                    e.stopEvent();
                }
@ -268,7 +269,7 @@
                BI.createWidget({
                    type: "bi.vertical",
                    scrolly: false,
-                    element: this.options.container || this,
+                    element: BI.isFunction(this.options.container) ? this.options.container() : (this.options.container || this),
                    items: [
                        { el: this.popupView }
                    ],
@ -344,14 +345,16 @@
            if (this.popper) {
                this.popper.destroy();
            }
-            var modifiers = [{
-                name: "offset",
-                options: {
-                    offset: function () {
-                        return [o.adjustXOffset, (o.showArrow ? 12 : 0) + (o.adjustYOffset + o.adjustLength)];
+            var modifiers = [
+                {
+                    name: "offset",
+                    options: {
+                        offset: function () {
+                            return [o.adjustXOffset, (o.showArrow ? 12 : 0) + (o.adjustYOffset + o.adjustLength)];
+                        },
                    },
-                },
-            }];
+                }
+            ];
            if (this.options.showArrow) {
                modifiers.push({
                    name: "arrow",
--- a/src/base/combination/combo.js
+++ b/src/base/combination/combo.js
@ -38,6 +38,7 @@
                adjustLength: 0, // 调整的距离
                adjustXOffset: 0,
                adjustYOffset: 0,
+                supportCSSTransform: false,
                hideChecker: BI.emptyFn,
                offsetStyle: "left", // left,right,center
                el: {},
@ -161,7 +162,7 @@
            this._assertPopupViewRender();
            this.fireEvent(BI.Combo.EVENT_BEFORE_POPUPVIEW);
            // popupVisible是为了获取其宽高, 放到可视范围之外以防止在IE下闪一下
-            this.popupView.css({ left: -999999999, top: -99999999 });
+            this.popupView.css({ left: -99999, top: -99999 });
            this.popupView.visible();
            BI.each(needHideWhenAnotherComboOpen, function (i, combo) {
                if (i !== self.getName()) {
@ -195,6 +196,7 @@
            this.popupView.visible();
            var combo = (o.belowMouse && BI.isNotNull(e)) ? {
                element: {
+                    0: e.target,
                    offset: function () {
                        return {
                            left: e.pageX,
@ -218,46 +220,47 @@
                    },
                },
            } : this.combo;
+            var positionRelativeElement = BI.DOM.getPositionRelativeContainingBlock(BI.isNull(o.container) ? this.element[0] : BI.Widget._renderEngine.createElement(BI.isFunction(o.container) ? o.container() : o.container)[0]);
            switch (o.direction) {
                case "bottom":
                case "bottom,right":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset, (o.adjustYOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset, (o.adjustYOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.isNeedAdjustHeight, ["bottom", "top", "right", "left"], o.offsetStyle, positionRelativeElement);
                    break;
                case "top":
                case "top,right":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset, (o.adjustYOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset, (o.adjustYOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.isNeedAdjustHeight, ["top", "bottom", "right", "left"], o.offsetStyle, positionRelativeElement);
                    break;
                case "left":
                case "left,bottom":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "bottom", "top"], o.offsetStyle, positionRelativeElement);
                    break;
                case "right":
                case "right,bottom":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "bottom", "top"], o.offsetStyle, positionRelativeElement);
                    break;
                case "top,left":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset, (o.adjustYOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset, (o.adjustYOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.isNeedAdjustHeight, ["top", "bottom", "left", "right"], o.offsetStyle, positionRelativeElement);
                    break;
                case "bottom,left":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset, (o.adjustYOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset, (o.adjustYOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.isNeedAdjustHeight, ["bottom", "top", "left", "right"], o.offsetStyle, positionRelativeElement);
                    break;
                case "left,top":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["left", "right", "top", "bottom"], o.offsetStyle, positionRelativeElement);
                    break;
                case "right,top":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "top", "bottom"], o.offsetStyle, positionRelativeElement);
                    break;
                case "right,innerRight":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerRight", "innerLeft", "bottom", "top"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerRight", "innerLeft", "bottom", "top"], o.offsetStyle, positionRelativeElement);
                    break;
                case "right,innerLeft":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerLeft", "innerRight", "bottom", "top"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerLeft", "innerRight", "bottom", "top"], o.offsetStyle, positionRelativeElement);
                    break;
                case "innerRight":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["innerRight", "innerLeft", "right", "left", "bottom", "top"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["innerRight", "innerLeft", "right", "left", "bottom", "top"], o.offsetStyle, positionRelativeElement);
                    break;
                case "innerLeft":
-                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["innerLeft", "innerRight", "left", "right", "bottom", "top"], o.offsetStyle);
+                    p = BI.DOM.getComboPosition(combo, this.popupView, (o.adjustXOffset + o.adjustLength) + (o.showArrow ? this._const.TRIANGLE_LENGTH : 0), o.adjustYOffset, o.isNeedAdjustHeight, ["innerLeft", "innerRight", "left", "right", "bottom", "top"], o.offsetStyle, positionRelativeElement);
                    break;
                case "top,custom":
                case "custom,top":
@ -287,9 +290,6 @@
                    break;
            }

-            if ("adaptHeight" in p) {
-                this.resetListHeight(p.adaptHeight);
-            }
            var width = this.combo.element.outerWidth();
            var height = this.combo.element.outerHeight();
            this.popupView.setDirection && this.popupView.setDirection(p.dir, {
@ -300,6 +300,24 @@
                adjustYOffset: o.adjustYOffset,
                offset: this.combo.element.offset(),
            });
+
+            if (o.supportCSSTransform) {
+
+                var positonedRect = positionRelativeElement.getBoundingClientRect();
+
+                var scaleX = positonedRect.width / positionRelativeElement.offsetWidth;
+                var scaleY = positonedRect.height / positionRelativeElement.offsetHeight;
+
+                p.top && (p.top = p.top / scaleY);
+                p.left && (p.left = p.left / scaleX);
+
+                p.adaptHeight && (p.adaptHeight = p.adaptHeight / scaleY);
+            }
+
+            if ("adaptHeight" in p) {
+                this.resetListHeight(p.adaptHeight);
+            }
+
            if ("left" in p) {
                this.popupView.element.css({
                    left: p.left,
--- a/src/base/single/button/buttons/button.js
+++ b/src/base/single/button/buttons/button.js
@ -81,7 +81,7 @@
                },
                hgap: o.hgap,
                vgap: o.vgap,
-                items: self.generateItems()
+                items: self.generateItems(),
            });

            // 如果 options 对应的属性为 true 则给元素添加 class
@ -102,7 +102,7 @@

            // 由于button默认情况下有个边框，所以要主动算行高
            var lineHeight, textHeight = o.textHeight;
-            var hasBorder = false
+            var hasBorder = false;
            if (BI.isNumber(o.height)) {
                if (!isVertical(o.iconPosition)) {
                    if (!(o.clear && o.block && o.light)) {
@ -121,12 +121,12 @@

            var iconInvisible = !(o.loading || o.iconCls || o.icon || defaultRenderIcon);

-            var textWidth = o.textWidth;
-            if (BI.isNull(o.textWidth)) {
-                textWidth = (o.minWidth > 0 && o.width < o.minWidth) ? o.minWidth : o.width;
-                textWidth -= (o.hgap * 2 + o.iconGap)
-                textWidth -= iconInvisible || isVertical(o.iconPosition) ? 0 : this._const.iconWidth
-            }
+            var maxTextWidth = Math.max(o.minWidth, o.width);
+            maxTextWidth -= (o.hgap * 2 + o.iconGap);
+            // 减去图标水平占位宽度
+            maxTextWidth -= iconInvisible || isVertical(o.iconPosition) ? 0 : this._const.iconWidth;
+            var textWidth = BI.isNull(o.textWidth) ? maxTextWidth : Math.min(o.textWidth, maxTextWidth);
+
            this.text = BI.createWidget({
                type: "bi.label",
                text: o.text,
@ -140,7 +140,7 @@
            });

            if (iconInvisible) {
-                return [this.text]
+                return [this.text];
            }

            this._iconRendered = true;
--- a/src/base/single/editor/editor.js
+++ b/src/base/single/editor/editor.js
@ -23,6 +23,7 @@ BI.Editor = BI.inherit(BI.Single, {
            allowBlank: false,
            watermark: "",
            errorText: "",
+            autoTrim: true,
        });
    },

@ -49,25 +50,29 @@ BI.Editor = BI.inherit(BI.Single, {
            margin: "0",
        });

-        var items = [{
-            el: {
-                type: "bi.absolute",
-                ref: function (_ref) {
-                    self.contentWrapper = _ref;
+        var items = [
+            {
+                el: {
+                    type: "bi.absolute",
+                    ref: function (_ref) {
+                        self.contentWrapper = _ref;
+                    },
+                    items: [
+                        {
+                            el: this.editor,
+                            left: 0,
+                            right: 0,
+                            top: 0,
+                            bottom: 0,
+                        }
+                    ],
                },
-                items: [{
-                    el: this.editor,
-                    left: 0,
-                    right: 0,
-                    top: 0,
-                    bottom: 0,
-                }],
-            },
-            left: o.hgap + o.lgap,
-            right: o.hgap + o.rgap,
-            top: o.vgap + o.tgap,
-            bottom: o.vgap + o.bgap,
-        }];
+                left: o.hgap + o.lgap,
+                right: o.hgap + o.rgap,
+                top: o.vgap + o.tgap,
+                bottom: o.vgap + o.bgap,
+            }
+        ];

        BI.createWidget({
            type: "bi.absolute",
@ -248,13 +253,15 @@ BI.Editor = BI.inherit(BI.Single, {
            BI.createWidget({
                type: "bi.absolute",
                element: this.contentWrapper,
-                items: [{
-                    el: this.watermark,
-                    left: 0,
-                    right: 0,
-                    top: 0,
-                    bottom: 0,
-                }],
+                items: [
+                    {
+                        el: this.watermark,
+                        left: 0,
+                        right: 0,
+                        top: 0,
+                        bottom: 0,
+                    }
+                ],
            });
        }
        this.watermark.setText(v);
@ -265,7 +272,7 @@ BI.Editor = BI.inherit(BI.Single, {
        var o = this.options;
        var errorText = o.errorText;
        if (BI.isFunction(errorText)) {
-            errorText = errorText(BI.trim(this.editor.getValue()));
+            errorText = errorText(o.autoTrim ? BI.trim(this.editor.getValue()) : this.editor.getValue());
        }
        if (!this.disabledError && BI.isKey(errorText)) {
            BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
@ -330,10 +337,10 @@ BI.Editor = BI.inherit(BI.Single, {

    getValue: function () {
        if (!this.isValid()) {
-            return BI.trim(this.editor.getLastValidValue());
+            return this.options.autoTrim ? BI.trim(this.editor.getLastValidValue()) : this.editor.getLastValidValue();
        }

-        return BI.trim(this.editor.getValue());
+        return this.options.autoTrim ? BI.trim(this.editor.getValue()) : this.editor.getValue();
    },

    isEditing: function () {
--- a/src/case/combo/bubblecombo/combo.bubble.js
+++ b/src/case/combo/bubblecombo/combo.bubble.js
@ -53,6 +53,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
            offsetStyle: o.offsetStyle,
            showArrow: true,
            comboClass: o.comboClass,
+            supportCSSTransform: o.supportCSSTransform,
            el: o.el,
            popup: () => BI.extend({
                type: "bi.bubble_popup_view",
--- a/src/case/combo/textvaluecombo/combo.textvalue.js
+++ b/src/case/combo/textvaluecombo/combo.textvalue.js
@ -16,7 +16,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
            el: {},
            allowClear: false,
            status: "success", //  success | warning | error,
-            title: null
+            title: null,
+            allowSelectAll: true,
        });
    },

@ -78,6 +79,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
            ref: ref => this.popup = ref,
            chooseType: o.chooseType,
            items: o.items,
+            allowSelectAll: o.allowSelectAll,
            listeners: [
                {
                    eventName: BI.TextValueComboPopup.EVENT_CHANGE,
--- a/src/case/combo/textvaluecombo/popup.textvalue.js
+++ b/src/case/combo/textvaluecombo/popup.textvalue.js
@ -2,92 +2,132 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
    _defaultConfig: function () {
        return BI.extend(BI.TextValueComboPopup.superclass._defaultConfig.apply(this, arguments), {
            baseCls: "bi-text-icon-popup",
-            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE
+            chooseType: BI.ButtonGroup.CHOOSE_TYPE_SINGLE,
+            allowSelectAll: true,
        });
    },

-    render () {
+    render() {
        var o = this.options, self = this;
        if (o.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
            return {
                type: "bi.vertical",
                vgap: 5,
-                items: [{
-                    type: "bi.button_group",
-                    ref: (_ref) => {
-                        this.popup = _ref;
-                    },
-                    items: this._formatItems(o.items),
-                    chooseType: o.chooseType,
-                    layouts: [{
-                        type: "bi.vertical"
-                    }],
-                    value: o.value,
-                    listeners: [{
-                        eventName: BI.Controller.EVENT_CHANGE,
-                        action: function (type, val, obj) {
-                            self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
-                            if (type === BI.Events.CLICK) {
-                                self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj);
+                items: [
+                    {
+                        type: "bi.button_group",
+                        ref: (_ref) => {
+                            this.popup = _ref;
+                        },
+                        items: this._formatItems(o.items),
+                        chooseType: o.chooseType,
+                        layouts: [
+                            {
+                                type: "bi.vertical"
                            }
-                        }
-                    }]
-                }]
+                        ],
+                        value: o.value,
+                        listeners: [
+                            {
+                                eventName: BI.Controller.EVENT_CHANGE,
+                                action: function (type, val, obj) {
+                                    self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
+                                    if (type === BI.Events.CLICK) {
+                                        self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val, obj);
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                ]
            };
        }
        return {
            type: "bi.vertical",
            verticalAlign: BI.VerticalAlign.Stretch,
-            rowSize: ["fill", ""],
-            items: [{
-                type: "bi.select_list",
-                logic: {
-                    dynamic: true,
-                    innerVgap: 5,
-                    rowSize: ["", "fill"],
-                    verticalAlign: BI.VerticalAlign.Stretch
-                },
-                ref: (_ref) => {
-                    this.popup = _ref;
-                },
-                el: {
+            items: o.allowSelectAll ? [
+                {
+                    type: "bi.select_list",
+                    logic: {
+                        dynamic: true,
+                        innerVgap: 5,
+                        rowSize: ["", "fill"],
+                        verticalAlign: BI.VerticalAlign.Stretch
+                    },
+                    ref: (_ref) => {
+                        this.popup = _ref;
+                    },
                    el: {
-                        chooseType: o.chooseType
-                    }
-                },
-                items: this._formatItems(o.items),
-                value: {
-                    type: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
-                    value: o.value
-                },
-                listeners: [{
-                    eventName: BI.SelectList.EVENT_CHANGE,
-                    action: function (val) {
-                        self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val);
-                    }
-                }]
-            }, {
-                type: "bi.center",
-                cls: "list-view-toolbar bi-high-light bi-split-top",
-                height: 24,
-                items: BI.createItems([{
-                    type: "bi.text_button",
-                    text: BI.i18nText("BI-Basic_Clears"),
-                    handler: function () {
-                        self.fireEvent(BI.TextValueComboPopup.EVENT_CLEAR);
-                    }
+                        el: {
+                            chooseType: o.chooseType,
+                        }
+                    },
+                    items: this._formatItems(o.items),
+                    value: {
+                        type: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
+                        value: o.value
+                    },
+                    height: "fill",
+                    listeners: [
+                        {
+                            eventName: BI.SelectList.EVENT_CHANGE,
+                            action: function (val) {
+                                self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val);
+                            }
+                        }
+                    ]
                }, {
-                    type: "bi.text_button",
-                    text: BI.i18nText("BI-Basic_OK"),
-                    handler: function () {
-                        self.fireEvent(BI.TextValueComboPopup.EVENT_CONFIRM);
-                    }
-                }], {
-                    once: false,
-                    shadow: true,
-                    isShadowShowingOnSelected: true
-                })
-            }]
+                    type: "bi.center",
+                    cls: "list-view-toolbar bi-high-light bi-split-top",
+                    height: 24,
+                    items: BI.createItems([
+                        {
+                            type: "bi.text_button",
+                            text: BI.i18nText("BI-Basic_Clears"),
+                            handler: function () {
+                                self.fireEvent(BI.TextValueComboPopup.EVENT_CLEAR);
+                            }
+                        }, {
+                            type: "bi.text_button",
+                            text: BI.i18nText("BI-Basic_OK"),
+                            handler: function () {
+                                self.fireEvent(BI.TextValueComboPopup.EVENT_CONFIRM);
+                            }
+                        }
+                    ], {
+                        once: false,
+                        shadow: true,
+                        isShadowShowingOnSelected: true
+                    })
+                }
+            ] : [
+                {
+                    type: "bi.list_pane",
+                    logic: {
+                        dynamic: true,
+                        innerVgap: 5,
+                        rowSize: ["", "fill"],
+                        verticalAlign: BI.VerticalAlign.Stretch
+                    },
+                    ref: (_ref) => {
+                        this.popup = _ref;
+                    },
+                    el: {
+                        chooseType: o.chooseType,
+                    },
+                    items: this._formatItems(o.items),
+                    value: o.value,
+                    height: "fill",
+                    listeners: [
+                        {
+                            eventName: BI.ListPane.EVENT_CHANGE,
+                            action: function (val) {
+                                self.fireEvent(BI.TextValueComboPopup.EVENT_CHANGE, val);
+                            }
+                        }
+                    ]
+                }
+            ],
        };
    },

@ -117,6 +157,9 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
            return this.popup.getValue();
        }
        var val = this.popup.getValue();
+        if (!this.options.allowSelectAll) {
+            return val;
+        }
        if (val.type === BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
            return val.value;
        } else {
@ -128,6 +171,10 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
        if (this.options.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
            return this.popup.setValue(v);
        }
+        if (!this.options.allowSelectAll) {
+            this.popup.setValue(v);
+            return;
+        }
        this.popup.setValue({
            type: BI.ButtonGroup.CHOOSE_TYPE_MULTI,
            value: v
--- a/src/case/editor/editor.clear.js
+++ b/src/case/editor/editor.clear.js
@ -31,7 +31,8 @@ BI.ClearEditor = BI.inherit(BI.Widget, {
            errorText: o.errorText,
            validationChecker: o.validationChecker,
            quitChecker: o.quitChecker,
-            value: o.value
+            value: o.value,
+            autoTrim: o.autoTrim,
        });
        this.clear = BI.createWidget({
            type: "bi.icon_button",
@ -54,7 +55,8 @@ BI.ClearEditor = BI.inherit(BI.Widget, {
                {
                    el: this.clear,
                    width: 24
-                }]
+                }
+            ]
        });
        this.editor.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
--- a/src/case/editor/editor.defaulttext.js
+++ b/src/case/editor/editor.defaulttext.js
@ -45,6 +45,7 @@ BI.DefaultTextEditor = BI.inherit(BI.Widget, {
            watermark: o.watermark,
            errorText: o.errorText,
            invisible: true,
+            autoTrim: o.autoTrim,
        });

        var showText = BI.isFunction(o.text) ? o.text() : o.text;
--- a/src/case/editor/editor.shelter.js
+++ b/src/case/editor/editor.shelter.js
@ -46,7 +46,8 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
            quitChecker: o.quitChecker,
            allowBlank: o.allowBlank,
            watermark: o.watermark,
-            errorText: o.errorText
+            errorText: o.errorText,
+            autoTrim: o.autoTrim,
        });
        this.text = BI.createWidget({
            type: "bi.text_button",
--- a/src/case/editor/editor.sign.js
+++ b/src/case/editor/editor.sign.js
@ -46,7 +46,8 @@ BI.SignEditor = BI.inherit(BI.Widget, {
            quitChecker: o.quitChecker,
            allowBlank: o.allowBlank,
            watermark: o.watermark,
-            errorText: o.errorText
+            errorText: o.errorText,
+            autoTrim: o.autoTrim,
        });
        this.text = BI.createWidget({
            type: "bi.text_button",
--- a/src/case/editor/editor.state.js
+++ b/src/case/editor/editor.state.js
@ -45,7 +45,8 @@ BI.StateEditor = BI.inherit(BI.Widget, {
            quitChecker: o.quitChecker,
            allowBlank: o.allowBlank,
            watermark: o.watermark,
-            errorText: o.errorText
+            errorText: o.errorText,
+            autoTrim: o.autoTrim,
        });
        this.text = BI.createWidget({
            type: "bi.text_button",
--- a/src/case/editor/editor.state.simple.js
+++ b/src/case/editor/editor.state.simple.js
@ -45,7 +45,8 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
            quitChecker: o.quitChecker,
            allowBlank: o.allowBlank,
            watermark: o.watermark,
-            errorText: o.errorText
+            errorText: o.errorText,
+            autoTrim: o.autoTrim,
        });
        this.text = BI.createWidget({
            type: "bi.text_button",
@ -68,13 +69,15 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
        BI.createWidget({
            type: "bi.absolute",
            element: this,
-            items: [{
-                el: this.text,
-                left: 0,
-                right: 0,
-                top: 0,
-                bottom: 0
-            }]
+            items: [
+                {
+                    el: this.text,
+                    left: 0,
+                    right: 0,
+                    top: 0,
+                    bottom: 0
+                }
+            ]
        });
        this.editor.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
--- a/src/case/linearsegment/linear.segment.js
+++ b/src/case/linearsegment/linear.segment.js
@ -47,6 +47,14 @@ BI.LinearSegment = BI.inherit(BI.Widget, {

    getValue: function () {
        return this.buttonGroup.getValue();
-    }
+    },
+
+    populate: function (buttons) {
+        var o = this.options;
+        this.buttonGroup.populate([BI.createItems(buttons, {
+            type: "bi.linear_segment_button",
+            height: o.height
+        })])
+    },
 });
 BI.shortcut("bi.linear_segment", BI.LinearSegment);
--- a/src/case/segment/segment.js
+++ b/src/case/segment/segment.js
@ -58,6 +58,15 @@ BI.Segment = BI.inherit(BI.Widget, {
    getValue: function () {
        return this.buttonGroup.getValue();
    },
+
+    populate: function (buttons) {
+        var o = this.options;
+        this.buttonGroup.populate([BI.createItems(buttons, {
+            type: "bi.segment_button",
+            height: BI.toPix(o.height, 2),
+            whiteSpace: o.whiteSpace,
+        })]);
+    },
 });
 BI.Segment.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.segment", BI.Segment);
--- a/src/core/platform/web/dom.js
+++ b/src/core/platform/web/dom.js
@ -56,7 +56,7 @@
        preloadImages: function (srcArray, onload) {
            var count = 0, images = [];

-            function complete () {
+            function complete() {
                count++;
                if (count >= srcArray.length) {
                    onload();
@ -151,9 +151,15 @@

    BI.extend(BI.DOM, {

-        getLeftPosition: function (combo, popup, extraWidth) {
+        getLeftPosition: function (combo, popup, extraWidth, container) {
+            var el = combo.element;
+            var popupEl = popup.element;
+            var elRect = el[0].getBoundingClientRect();
+            var popupElRect = popupEl[0].getBoundingClientRect();
+            var containerRect = container ? container.getBoundingClientRect() : { left: 0 };
+
            return {
-                left: combo.element.offset().left - popup.element.outerWidth() - (extraWidth || 0)
+                left: elRect.left - containerRect.left - popupElRect.width - (extraWidth || 0)
            };
        },

@ -163,10 +169,13 @@
            };
        },

-        getRightPosition: function (combo, popup, extraWidth) {
+        getRightPosition: function (combo, popup, extraWidth, container) {
            var el = combo.element;
+            var elRect = el[0].getBoundingClientRect();
+            var containerRect = container ? container.getBoundingClientRect() : { left: 0 };
+
            return {
-                left: el.offset().left + el.outerWidth() + (extraWidth || 0)
+                left: elRect.left + elRect.width - containerRect.left + (extraWidth || 0)
            };
        },

@ -177,16 +186,25 @@
            };
        },

-        getTopPosition: function (combo, popup, extraHeight) {
+        getTopPosition: function (combo, popup, extraHeight, container) {
+            var el = combo.element;
+            var popupEl = popup.element;
+            var elRect = el[0].getBoundingClientRect();
+            var popupElRect = popupEl[0].getBoundingClientRect();
+            var containerRect = container ? container.getBoundingClientRect() : { top: 0 };
+
            return {
-                top: combo.element.offset().top - popup.element.outerHeight() - (extraHeight || 0)
+                top: elRect.top - containerRect.top - popupElRect.height - (extraHeight || 0)
            };
        },

-        getBottomPosition: function (combo, popup, extraHeight) {
+        getBottomPosition: function (combo, popup, extraHeight, container) {
            var el = combo.element;
+            var elRect = el[0].getBoundingClientRect();
+            var containerRect = container ? container.getBoundingClientRect() : { top: 0 };
+
            return {
-                top: el.offset().top + el.outerHeight() + (extraHeight || 0)
+                top: elRect.top - containerRect.top + elRect.height + (extraHeight || 0)
            };
        },

@ -201,9 +219,9 @@
        },

        isRightSpaceEnough: function (combo, popup, extraWidth) {
-            var viewBounds = popup.element.bounds(),
-                windowBounds = BI.Widget._renderEngine.createElement("body").bounds();
-            return BI.DOM.getRightPosition(combo, popup, extraWidth).left + viewBounds.width <= windowBounds.width;
+            var viewBounds = popup.element[0].getBoundingClientRect(),
+                viewportBounds = document.documentElement.getBoundingClientRect();
+            return BI.DOM.getRightPosition(combo, popup, extraWidth).left + viewBounds.width <= viewportBounds.width;
        },

        isInnerRightSpaceEnough: function (combo, popup, extraWidth) {
@ -215,9 +233,9 @@
        },

        isBottomSpaceEnough: function (combo, popup, extraHeight) {
-            var viewBounds = popup.element.bounds(),
-                windowBounds = BI.Widget._renderEngine.createElement("body").bounds();
-            return BI.DOM.getBottomPosition(combo, popup, extraHeight).top + viewBounds.height <= windowBounds.height;
+            var viewBounds = popup.element[0].getBoundingClientRect(),
+                viewportBounds = document.documentElement.getBoundingClientRect();
+            return BI.DOM.getBottomPosition(combo, popup, extraHeight).top + viewBounds.height <= viewportBounds.height;
        },

        isRightSpaceLarger: function (combo) {
@ -230,18 +248,19 @@
            return windowBounds.height - combo.element.offset().top - combo.element.bounds().height >= combo.element.offset().top;
        },

-        _getLeftAlignPosition: function (combo, popup, extraWidth) {
+        _getLeftAlignPosition: function (combo, popup, extraWidth, container) {
            var viewBounds = popup.element.bounds(),
                windowBounds = BI.Widget._renderEngine.createElement("body").bounds();
-            var left = combo.element.offset().left + extraWidth;
+            var left = combo.element.offset().left - (container ? container.getBoundingClientRect().left : 0) + extraWidth;
+
            if (left + viewBounds.width > windowBounds.width) {
                left = windowBounds.width - viewBounds.width;
            }
            return left;
        },

-        getLeftAlignPosition: function (combo, popup, extraWidth) {
-            var left = this._getLeftAlignPosition(combo, popup, extraWidth);
+        getLeftAlignPosition: function (combo, popup, extraWidth, container) {
+            var left = this._getLeftAlignPosition(combo, popup, extraWidth, container);
            var dir = "";
            // 如果放不下，优先使用RightAlign, 如果RightAlign也放不下, 再使用left=0
            if (left < 0) {
@ -297,24 +316,26 @@
            };
        },

-        getTopAlignPosition: function (combo, popup, extraHeight, needAdaptHeight) {
+        getTopAlignPosition: function (combo, popup, extraHeight, needAdaptHeight, container) {
            var comboOffset = combo.element.offset();
-            var comboBounds = combo.element.bounds(), popupBounds = popup.element.bounds(),
-                windowBounds = BI.Widget._renderEngine.createElement("body").bounds();
+            var comboBounds = combo.element[0].getBoundingClientRect(),
+                popupBounds = popup.element[0].getBoundingClientRect(),
+                viewportBounds = document.documentElement.getBoundingClientRect(),
+                containerBounds = container ? container.getBoundingClientRect() : { top: 0 };
            var top, adaptHeight, dir;
            if (BI.DOM.isBottomSpaceEnough(combo, popup, -1 * comboBounds.height + extraHeight)) {
-                top = comboOffset.top + extraHeight;
+                top = comboOffset.top - containerBounds.top + extraHeight;
            } else if (needAdaptHeight) {
-                top = comboOffset.top + extraHeight;
-                adaptHeight = windowBounds.height - top;
+                top = comboBounds.top - containerBounds.top + extraHeight;
+                adaptHeight = viewportBounds.height - comboBounds.top;
            } else if (BI.DOM.isTopSpaceEnough(combo, popup, -1 * comboBounds.height + extraHeight)) {
                // 下方空间不足且不允许调整高度的情况下，优先使用上对齐
-                top = comboOffset.top + comboBounds.height - popupBounds.height - extraHeight;
+                top = comboBounds.top + comboBounds.height - popupBounds.height - containerBounds.top - extraHeight;
                dir = "top";
            } else {
-                top = windowBounds.height - popupBounds.height;
+                top = viewportBounds.height - popupBounds.height;
                if (top < extraHeight) {
-                    adaptHeight = windowBounds.height - extraHeight;
+                    adaptHeight = viewportBounds.height - extraHeight;
                }
            }
            if (top < extraHeight) {
@ -353,19 +374,21 @@
            };
        },

-        getBottomAlignPosition: function (combo, popup, extraHeight, needAdaptHeight) {
+        getBottomAlignPosition: function (combo, popup, extraHeight, needAdaptHeight, container) {
            var comboOffset = combo.element.offset();
-            var comboBounds = combo.element.bounds(), popupBounds = popup.element.bounds(),
-                windowBounds = BI.Widget._renderEngine.createElement("body").bounds();
+            var comboBounds = combo.element[0].getBoundingClientRect(),
+                popupBounds = popup.element[0].getBoundingClientRect(),
+                windowBounds = BI.Widget._renderEngine.createElement("body").bounds(),
+                containerBounds = container ? container.getBoundingClientRect() : { top: 0 };
            var top, adaptHeight, dir;
            if (BI.DOM.isTopSpaceEnough(combo, popup, -1 * comboBounds.height + extraHeight)) {
-                top = comboOffset.top + comboBounds.height - popupBounds.height - extraHeight;
+                top = comboOffset.top + comboBounds.height - containerBounds.top - popupBounds.height;
            } else if (needAdaptHeight) {
-                top = 0;
-                adaptHeight = comboOffset.top + comboBounds.height - extraHeight;
+                top = 0 - containerBounds.top;
+                adaptHeight = comboBounds.top + comboBounds.height - extraHeight;
            } else if (BI.DOM.isBottomSpaceEnough(combo, popup, -1 * comboBounds.height + extraHeight)) {
                // 上方空间不足且不允许调整高度的情况下，优先使用下对齐
-                top = comboOffset.top + extraHeight;
+                top = comboOffset.top - containerBounds.top + extraHeight;
                dir = "bottom";
            } else {
                top = 0;
@ -373,7 +396,7 @@
                    adaptHeight = windowBounds.height - extraHeight;
                }
            }
-            if (top < 0) {
+            if (top + containerBounds.top < 0) {
                top = 0;
            }
            return adaptHeight ? {
@ -446,7 +469,7 @@
            };
        },

-        getComboPositionByDirections: function (combo, popup, extraWidth, extraHeight, needAdaptHeight, directions) {
+        getComboPositionByDirections: function (combo, popup, extraWidth, extraHeight, needAdaptHeight, directions, container) {
            extraWidth || (extraWidth = 0);
            extraHeight || (extraHeight = 0);
            var i, direct;
@ -483,11 +506,11 @@
                        if (!isNeedAdaptHeight) {
                            var tW = tbFirst ? extraHeight : extraWidth, tH = tbFirst ? 0 : extraHeight;
                            if (BI.DOM.isLeftSpaceEnough(combo, popup, tW)) {
-                                left = BI.DOM.getLeftPosition(combo, popup, tW).left;
+                                left = BI.DOM.getLeftPosition(combo, popup, tW, container).left;
                                if (topBottom[0] === "bottom") {
-                                    pos = BI.DOM.getTopAlignPosition(combo, popup, tH, needAdaptHeight);
+                                    pos = BI.DOM.getTopAlignPosition(combo, popup, tH, needAdaptHeight, container);
                                } else {
-                                    pos = BI.DOM.getBottomAlignPosition(combo, popup, tH, needAdaptHeight);
+                                    pos = BI.DOM.getBottomAlignPosition(combo, popup, tH, needAdaptHeight, container);
                                }
                                pos.dir = "left," + pos.dir;
                                if (tbFirst) {
@ -503,11 +526,11 @@
                        if (!isNeedAdaptHeight) {
                            var tW = tbFirst ? extraHeight : extraWidth, tH = tbFirst ? extraWidth : extraHeight;
                            if (BI.DOM.isRightSpaceEnough(combo, popup, tW)) {
-                                left = BI.DOM.getRightPosition(combo, popup, tW).left;
+                                left = BI.DOM.getRightPosition(combo, popup, tW, container).left;
                                if (topBottom[0] === "bottom") {
-                                    pos = BI.DOM.getTopAlignPosition(combo, popup, tH, needAdaptHeight);
+                                    pos = BI.DOM.getTopAlignPosition(combo, popup, tH, needAdaptHeight, container);
                                } else {
-                                    pos = BI.DOM.getBottomAlignPosition(combo, popup, tH, needAdaptHeight);
+                                    pos = BI.DOM.getBottomAlignPosition(combo, popup, tH, needAdaptHeight, container);
                                }
                                pos.dir = "right," + pos.dir;
                                if (tbFirst) {
@ -522,11 +545,11 @@
                    case "top":
                        var tW = lrFirst ? extraHeight : extraWidth, tH = lrFirst ? extraWidth : extraHeight;
                        if (BI.DOM.isTopSpaceEnough(combo, popup, tH)) {
-                            top = BI.DOM.getTopPosition(combo, popup, tH).top;
+                            top = BI.DOM.getTopPosition(combo, popup, tH, container).top;
                            if (leftRight[0] === "right") {
-                                pos = BI.DOM.getLeftAlignPosition(combo, popup, tW, needAdaptHeight);
+                                pos = BI.DOM.getLeftAlignPosition(combo, popup, tW, container);
                            } else {
-                                pos = BI.DOM.getRightAlignPosition(combo, popup, tW);
+                                pos = BI.DOM.getRightAlignPosition(combo, popup, tW, container);
                            }
                            pos.dir = "top," + pos.dir;
                            if (lrFirst) {
@ -543,11 +566,11 @@
                    case "bottom":
                        var tW = lrFirst ? extraHeight : extraWidth, tH = lrFirst ? extraWidth : extraHeight;
                        if (BI.DOM.isBottomSpaceEnough(combo, popup, tH)) {
-                            top = BI.DOM.getBottomPosition(combo, popup, tH).top;
+                            top = BI.DOM.getBottomPosition(combo, popup, tH, container).top;
                            if (leftRight[0] === "right") {
-                                pos = BI.DOM.getLeftAlignPosition(combo, popup, tW, needAdaptHeight);
+                                pos = BI.DOM.getLeftAlignPosition(combo, popup, tW, container);
                            } else {
-                                pos = BI.DOM.getRightAlignPosition(combo, popup, tW);
+                                pos = BI.DOM.getRightAlignPosition(combo, popup, tW, container);
                            }
                            pos.dir = "bottom," + pos.dir;
                            if (lrFirst) {
@ -635,7 +658,7 @@
                        firstDir = "top";
                    }
                    if (leftRight[0] === "right") {
-                        pos = BI.DOM.getLeftAlignPosition(combo, popup, extraWidth, needAdaptHeight);
+                        pos = BI.DOM.getLeftAlignPosition(combo, popup, extraWidth);
                        pos.top = top;
                        pos.dir = firstDir + "," + pos.dir;
                        return pos;
@ -648,13 +671,13 @@
        },


-        getComboPosition: function (combo, popup, extraWidth, extraHeight, needAdaptHeight, directions, offsetStyle) {
+        getComboPosition: function (combo, popup, extraWidth, extraHeight, needAdaptHeight, directions, offsetStyle, positionRelativeElement) {
            extraWidth || (extraWidth = 0);
            extraHeight || (extraHeight = 0);
            var bodyHeight = BI.Widget._renderEngine.createElement("body").bounds().height - extraHeight;
            var maxHeight = Math.min(popup.attr("maxHeight") || bodyHeight, bodyHeight);
            popup.resetHeight && popup.resetHeight(maxHeight);
-            var position = BI.DOM.getComboPositionByDirections(combo, popup, extraWidth, extraHeight, needAdaptHeight, directions || ["bottom", "top", "right", "left"]);
+            var position = BI.DOM.getComboPositionByDirections(combo, popup, extraWidth, extraHeight, needAdaptHeight, directions || ["bottom", "top", "right", "left"], positionRelativeElement);
            switch (offsetStyle) {
                case "center":
                    if (position.change) {
@ -676,9 +699,35 @@
                    break;
            }
            if (needAdaptHeight === true) {
-                popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top, maxHeight));
+                popup.resetHeight && popup.resetHeight(Math.min(bodyHeight - position.top + (positionRelativeElement ? positionRelativeElement.getBoundingClientRect().top : 0), maxHeight));
            }
            return position;
-        }
+        },
+
+        /**
+         * 获取position:fixed相对定位的元素
+         */
+        getPositionRelativeContainingBlock: function (element) {
+            if (['html', 'body', '#document'].indexOf((element.nodeName || '').toLowerCase()) >= 0) {
+                // $FlowFixMe[incompatible-return]: assume body is always available
+                return element.ownerDocument.body;
+            }
+
+            function isExcept(node) {
+                var _computedStyle = getComputedStyle(node);
+                var transform = _computedStyle.transform;
+                var perspective = _computedStyle.perspective;
+                var filter = _computedStyle.filter;
+                var willChange = _computedStyle["will-change"];
+
+                return [transform, perspective, filter].some(value => value !== 'none') || (willChange === "transform");
+            }
+
+            if (isExcept(element)) {
+                return element;
+            }
+
+            return BI.DOM.getPositionRelativeContainingBlock(element.parentNode);
+        },
    });
 })();
--- a/src/core/platform/web/function.js
+++ b/src/core/platform/web/function.js
@ -137,5 +137,14 @@ BI._.extend(BI, {
            return version[1] * 1;
        }
        return 0;
+    },
+
+    getMinimumFontSize: function () {
+        const el = document.createElement('div');
+        el.style.fontSize = "0px";
+        document.body.appendChild(el);
+        const size = getComputedStyle(el).fontSize;
+        el.remove();
+        return parseInt(size);
    }
 });
--- a/src/less/core/utils/motion/zoom.less
+++ b/src/less/core/utils/motion/zoom.less
@ -4,7 +4,7 @@
  .make-motion(@className, @keyframeName, @duration);
  .@{className}-enter,
  .@{className}-appear {
-    transform: scale(0); // need this by yiminghe
+    //transform: scale(0); // need this by yiminghe, but dailer did not need this
    opacity: 0;
    animation-timing-function: @ease-out-circ;

--- a/src/less/widget/multiselect/trigger/button.checkselected.less
+++ b/src/less/widget/multiselect/trigger/button.checkselected.less
@ -2,7 +2,7 @@

 .bi-multi-select-check-selected-button {
  z-index: 1;
-  .border-radius(50%);
+  .border-radius(99999px);

  &:active {
    color: @color-bi-text-highlight;
--- a/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less
+++ b/src/less/widget/multitree/trigger/multi.tree.button.checkselected.less
@ -6,9 +6,9 @@
    z-index: 1;
  }
  .trigger-check-text {
-    .border-radius(8px);
-    .border-radius(calc(var(--css-scale, 1) * 8px));
+    .border-radius(99999px);
    z-index: 1;
+
    &:active {
      background-color: @color-bi-background-multi-select-trigger-check-selected;
    }
--- a/src/widget/downlist/combo.downlist.js
+++ b/src/widget/downlist/combo.downlist.js
@ -44,7 +44,8 @@
                popup: {},
                minWidth: 140,
                maxHeight: 1000,
-                destroyWhenHide: false
+                destroyWhenHide: false,
+                isDefaultInit: true,
            });
        },

@ -57,7 +58,7 @@
                type: "bi.combo",
                trigger: o.trigger,
                isNeedAdjustWidth: false,
-                isDefaultInit: true,
+                isDefaultInit: o.isDefaultInit,
                container: o.container,
                adjustLength: o.adjustLength,
                direction: o.direction,
--- a/src/widget/editor/editor.search.js
+++ b/src/widget/editor/editor.search.js
@ -27,7 +27,8 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
            errorText: o.errorText,
            validationChecker: o.validationChecker,
            quitChecker: o.quitChecker,
-            value: o.value
+            value: o.value,
+            autoTrim: o.autoTrim,
        });
        this.clear = BI.createWidget({
            type: "bi.icon_button",
--- a/src/widget/editor/editor.text.js
+++ b/src/widget/editor/editor.text.js
@ -47,7 +47,8 @@ BI.TextEditor = BI.inherit(BI.Widget, {
            watermark: o.watermark,
            errorText: o.errorText,
            inputType: o.inputType,
-            autocomplete: o.autocomplete
+            autocomplete: o.autocomplete,
+            autoTrim: o.autoTrim,
        });
        this.editor.on(BI.Controller.EVENT_CHANGE, function () {
            self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
--- a/typescript/base/single/button/button.basic.ts
+++ b/typescript/base/single/button/button.basic.ts
@ -38,7 +38,7 @@ export declare class BasicButton extends Single {
        trigger?: string | null;
        handler?: Function;
        bubble?: Function | null | string;
-        text?: string;
+        text?: string | ((context: any) => string);
        el?: Obj;
    } & Single["props"];

--- a/typescript/case/combo/combo.textvalue.ts
+++ b/typescript/case/combo/combo.textvalue.ts
@ -5,5 +5,10 @@ export declare class TextValueCombo extends Widget {

    static EVENT_CHANGE: string;
    
-    populate(items: any): void; 
+    clear(): void;
+    setText(text: string): void;
+    setValue(value: any): void;
+    setStatus(status: "success" | "warning" | "error"): void;
+    getValue(): any[];
+    populate(items: any[]): void;
 }
--- a/typescript/case/combo/popup.textvalue.ts
+++ b/typescript/case/combo/popup.textvalue.ts
@ -0,0 +1,13 @@
+import { Pane } from "../../base/pane";
+
+export declare class TextValueComboPopup extends Pane {
+    static xtype: string;
+    
+    static EVENT_CHANGE: string;
+    static EVENT_CLEAR: string;
+    static EVENT_CONFIRM: string;
+
+    populate(items: any[]): void;
+    getValue(): any;
+    setValue(value: any): void;
+}
--- a/typescript/component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo.ts
+++ b/typescript/component/allvaluemultitextvaluecombo/allvalue.multitextvalue.combo.ts
@ -1,14 +1,4 @@
-import { Widget, _Widget } from "../../core/widget";
-
-export interface _AllValueMultiTextValueCombo extends _Widget {
-    getValue<T>(): T[];
-
-    populate(items: any): void;
-}
-
-export interface _AllValueMultiTextValueComboStatic {
-    EVENT_CONFIRM: string;
-}
+import { Widget } from "../../core/widget";

 export declare class AllValueMultiTextValueCombo extends Widget {
    static xtype: string;
--- a/typescript/core/base.ts
+++ b/typescript/core/base.ts
@ -1,4 +1,4 @@
-import { _Widget } from "./widget";
+import { Widget } from "./widget";

 export interface _base {
    assert: (v: any, is: Function) => Boolean;
@ -7,7 +7,7 @@ export interface _base {

    UUID: () => string;

-    isWidget: (widget: any) => widget is _Widget;
+    isWidget: (widget: any) => widget is Widget;

    createWidgets: (items: any, options: any, context: any) => any;

@ -38,7 +38,9 @@ export interface _base {

    size: (collection: any) => number;

-    each: <T>(collection: T[] | object | string, callback?: ((index: number, value: T) => void) | object | string, thisArg?: any) => any;
+    each<T>(collection: ArrayLike<T>, iteratee?: (index: number, value: T) => void, thisArg?: any): ArrayLike<T>;
+    each<T extends object, K extends keyof T>(collection: T, iteratee?: (index: K, value: T[K]) => void, thisArg?: any): T;
+    each<T>(collection: T, iteratee?: any, thisArg?: any): T;

    map: <T, U>(collection: T[] | object | string | null | undefined, callback?: ((index: number, value: T) => U) | object | string, thisArg?: any) => U[];

--- a/typescript/core/plugin.ts
+++ b/typescript/core/plugin.ts
@ -1,7 +1,7 @@
-import { _Widget } from "./widget";
+import { Widget } from "./widget";

 type configWidgetFn = (type: string, options: Obj) => void
-type configObjectFn = (type: string, widget: _Widget) => void
+type configObjectFn = (type: string, widget: Widget) => void

 export type _config = (widgetFunction: configWidgetFn | configWidgetFn[], objectFunction: configObjectFn | configObjectFn[]) => void

--- a/typescript/core/widget.ts
+++ b/typescript/core/widget.ts
@ -1,401 +1,5 @@
 import { OB, _OB } from "./ob";

-export interface _WidgetStatic {
-
-    /**
-     * 注册渲染引擎
-     * @param engine 引擎
-     */
-    registerRenderEngine(engine: RenderEngine): void;
-}
-
-export interface _Widget extends _OB {
-
-    /**
-     * 出现loading的锁
-     */
-    __asking: boolean;
-
-    /**
-     * 同步锁
-     */
-    __async: boolean;
-
-    /**
-     * widget类标识符
-     */
-    widgetName: string | null;
-
-    /**
-     * 是否为根节点
-     */
-    _isRoot: boolean;
-
-    /**
-     * 父节点
-     */
-    _parent: _Widget | null;
-    // TODO: 完成jquery文件夹后把这块改了
-    /**
-     * 真实dom的类jQuery对象
-     */
-    element: {
-        width(): number;
-        height(): number;
-        width(width: number | string): _Widget["element"];
-        height(height: number | string): _Widget["element"];
-        [key: string]: any;
-    };
-
-    /**
-     * 子元素
-     */
-    _children: {
-        [key: string]: _Widget;
-    };
-
-    /**
-     * 是否已挂载
-     */
-    _isMounted: boolean;
-
-    /**
-     * 手动设置enable
-     */
-    _manualSetEnable: boolean;
-
-    /**
-     * 手动设置valid
-     */
-    _manualSetValid: boolean;
-
-    /**
-     * 渲染引擎
-     */
-    _renderEngine: RenderEngine;
-
-    _store(): void;
-
-    // 生命周期函数
-    /**
-     * 初始化前
-     */
-    beforeInit?(cb: Function): void;
-
-    /**
-     * 创建前
-     */
-    beforeCreate?(): void;
-
-    /**
-     * 创建
-     */
-    created?(): void;
-
-    /**
-     * 渲染
-     */
-    render?(): any;
-
-    /**
-     * 挂载前
-     */
-    beforeMount?(): void;
-
-    /**
-     * 挂载
-     */
-    mounted?(): void;
-
-    /**
-     * 更新前
-     */
-    shouldUpdate?(...args: any[]): void;
-
-    /**
-     * 更新
-     */
-    update?(...args: any[]): void;
-
-    /**
-     * 销毁前
-     */
-    beforeDestroy?(): void;
-
-    /**
-     * 销毁
-     */
-    destroyed?(): void;
-
-    /**
-     * 初始化render函数
-     */
-    _initRender: () => void;
-
-    /**
-     * 内部主render函数
-     */
-    _render: () => void;
-
-    /**
-     * 初始化根节点
-     */
-    _initRoot: () => void;
-
-    /**
-     * 初始化元素宽度
-     */
-    _initElementWidth: () => void;
-
-    /**
-     * 初始化元素高度
-     */
-    _initElementHeight: () => void;
-
-    /**
-     * 初始化元素可见
-     */
-    _initVisual: () => void;
-
-    /**
-     * 初始化元素可用不可用
-     */
-    _initEffects: () => void;
-
-    /**
-     * 设置mounted锁
-     */
-    _initState: () => void;
-
-    /**
-     * 生成真实dom
-     */
-    _initElement: () => void;
-
-    /**
-     * 设置父节点
-     */
-    _setParent: () => void;
-
-    /**
-     * @param force 是否强制挂载子节点
-     * @param deep 子节点是否也是按照当前force处理
-     * @param lifeHook 生命周期钩子触不触发，默认触发
-     * @param predicate 递归每个widget的回调
-     */
-    _mount(force?: boolean, deep?: boolean, lifeHook?: boolean, predicate?: Function): boolean;
-
-    /**
-     * 挂载子节点
-     */
-    _mountChildren?(): void;
-
-    /**
-     * 是否已挂载
-     */
-    isMounted(): boolean;
-
-    /**
-     * 设置宽度
-     */
-    setWidth(w: number): void;
-
-    /**
-     * 设置高度
-     */
-    setHeight(h: number): void;
-
-    /**
-     * 设置可用
-     */
-    _setEnable(enable: boolean): void;
-
-    /**
-     * 设置合法
-     */
-    _setValid(valid: boolean): void;
-
-    /**
-     * 设置可见
-     */
-    _setVisible(visible: boolean): void;
-
-    /**
-     * 设置是否可用
-     */
-    setEnable(enable: boolean): void;
-
-    /**
-     * 设置是否可见
-     */
-    setVisible(visible: boolean): void;
-
-    /**
-     * 设置是否合法
-     */
-    setValid(valid: boolean): void;
-
-    /**
-     * 设置反馈效果
-     * @param args arguments参数
-     */
-    doBehavior(...args: any[]): void;
-
-    /**
-     * 获取宽度
-     */
-    getWidth(): number;
-
-    /**
-     * 获取高度
-     */
-    getHeight(): number;
-
-    /**
-     * 是否合法
-     */
-    isValid(): boolean;
-
-    /**
-     * 新增子元素
-     */
-    addWidget(_name: any, _widget: _Widget): _Widget;
-
-    /**
-     * 根据wigetname获取子元素实例
-     */
-    getWidgetByName(_name: string): _Widget | undefined;
-
-    /**
-     * 移除子元素
-     * @param nameOrWidget widgetName或widget实例
-     */
-    removeWidget(nameOrWidget: string | _Widget): void;
-
-    /**
-     * 是否有某个子元素
-     */
-    hasWidget(name: string): boolean;
-
-    /**
-     * 获取widgetName
-     */
-    getName(): string;
-
-    /**
-     * 设置tag
-     * @param tag html tag
-     */
-    setTag(tag: string): void;
-
-    /**
-     * 获取tag
-     */
-    getTag(): string;
-
-    /**
-     * 设置属性
-     * @param key 键
-     * @param value 值
-     */
-    attr(key: string | { [key: string]: any }, value?: any): any;
-
-    /**
-     * 获取text
-     */
-    getText(): string;
-
-    /**
-     * 设置text
-     */
-    setText(text: string): void;
-
-    /**
-     * 获取值
-     */
-    getValue(): any;
-
-    /**
-     * 设置值
-     */
-    setValue(...args: any[]): void;
-
-    /**
-     * 获取是否enable
-     */
-    isEnabled(): boolean;
-
-    /**
-     * 是否可见
-     */
-    isVisible(): boolean;
-
-    /**
-     * disable元素
-     */
-    disable(): void;
-
-    /**
-     * enable元素
-     */
-    enable(): void;
-
-    /**
-     * 是widget合法
-     */
-    valid(): void;
-
-    /**
-     * 使元素不合法
-     */
-    invalid(): void;
-
-    /**
-     * 使不可见
-     */
-    invisible(..._args: any[]): void;
-
-    /**
-     * 可见
-     */
-    visible(..._args: any[]): void;
-
-    /**
-     * 清除子元素
-     */
-    __d(): void;
-
-    /**
-     * 取消挂载
-     */
-    _unMount(): void;
-
-    /**
-     * hang元素
-     */
-    isolate(): void;
-
-    /**
-     * 请除元素
-     */
-    empty(): void;
-
-    /**
-     * 刷新控件
-     */
-    reset(): void;
-
-    /**
-     * 内部destory方法
-     */
-    _destroy(): void;
-
-    /**
-     * destory元素
-     */
-    destroy(): void;
-}
-
 interface RenderEngine {
    // TODO: 完成jquery文件夹后把这块改了
    /**
@ -411,13 +15,17 @@ interface RenderEngine {
 }

 export declare class Widget extends OB {
-    //
    /**
     * 注册渲染引擎
     * @param engine 引擎
     */
    static registerRenderEngine(engine: RenderEngine): void;

+    /**
+     * 渲染引擎
+     */
+    static _renderEngine: RenderEngine;
+
    /**
     * 出现loading的锁
     */
@ -441,7 +49,7 @@ export declare class Widget extends OB {
    /**
     * 父节点
     */
-    _parent: _Widget | null;
+    _parent: Widget | null;
    // TODO: 完成jquery文件夹后把这块改了
    /**
     * 真实dom的类jQuery对象
@ -458,7 +66,7 @@ export declare class Widget extends OB {
     * 子元素
     */
    _children: {
-        [key: string]: _Widget;
+        [key: string]: Widget;
    };

    /**
@ -476,11 +84,6 @@ export declare class Widget extends OB {
     */
    _manualSetValid: boolean;

-    /**
-     * 渲染引擎
-     */
-    _renderEngine: RenderEngine;
-
    _store(): void;

    // 生命周期函数
@ -671,19 +274,19 @@ export declare class Widget extends OB {
    /**
     * 新增子元素
     */
-    addWidget(widget: _Widget): _Widget;
-    addWidget(_name: any, _widget: _Widget): _Widget;
+    addWidget(widget: Widget): Widget;
+    addWidget(_name: any, _widget: Widget): Widget;

    /**
     * 根据wigetname获取子元素实例
     */
-    getWidgetByName(_name: string): _Widget | undefined;
+    getWidgetByName(_name: string): Widget | undefined;

    /**
     * 移除子元素
     * @param nameOrWidget widgetName或widget实例
     */
-    removeWidget(nameOrWidget: string | _Widget): void;
+    removeWidget(nameOrWidget: string | Widget): void;

    /**
     * 是否有某个子元素
--- a/typescript/index.ts
+++ b/typescript/index.ts
@ -20,6 +20,7 @@ import { IconChangeButton } from "./case/button/icon/icon.change";
 import { MultiSelectItem } from "./case/button/item.multiselect";
 import { BubbleCombo } from "./case/combo/bubblecombo/combo.bubble";
 import { TextValueCombo } from "./case/combo/combo.textvalue";
+import { TextValueComboPopup } from "./case/combo/popup.textvalue";
 import { SmallTextValueCombo } from "./case/combo/combo.textvaluesmall";
 import { SearchTextValueCombo } from "./case/combo/searchtextvaluecombo/combo.searchtextvalue";
 import { SignEditor } from "./case/editor/editor.sign";
@ -226,6 +227,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
    ButtonGroup: typeof ButtonGroup;
    Combo: typeof Combo;
    TextValueCombo: typeof TextValueCombo;
+    TextValueComboPopup: typeof TextValueComboPopup;
    SmallTextValueCombo: typeof SmallTextValueCombo;
    BubbleCombo: typeof BubbleCombo;
    AllValueMultiTextValueCombo: typeof AllValueMultiTextValueCombo;
@ -464,6 +466,7 @@ export {
    MultiSelectBar,
    SelectList,
    TextValueCombo,
+    TextValueComboPopup,
    SmallTextValueCombo,
    Editor,
    IconLabel,