Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~dailer/fineui

dist/font/iconfont.svg

@@ -20,6 +20,9 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="shuzhixiala" unicode="&#59384;" d="M298.666667 682.666667l213.333333-331.861334V597.333333h-64V682.666667h170.666667v-85.333334H554.666667v-512h-42.666667L213.333333 549.930667V170.666667h64v-85.333334h-170.666666v85.333334H170.666667V597.333333H106.666667V682.666667H298.666667z m597.333333-533.333334v-42.666666h-256v42.666666h256z m0 128v-42.666666h-256v42.666666h256z m0 128v-42.666666h-256v42.666666h256z m-21.888 256a21.333333 21.333333 0 0 0 18.090667-32.682666l-84.778667-135.168a21.333333 21.333333 0 0 0-36.181333 0L686.506667 628.650667a21.333333 21.333333 0 0 0 18.090666 32.682666h169.557334z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="bingtu_0" unicode="&#59386;" d="M512 832a448 448 0 1 0 0-896A448 448 0 0 0 512 832z m0-74.688a373.312 373.312 0 1 1 0-746.624A373.312 373.312 0 0 1 512 757.312z"  horiz-adv-x="1024" />
 
     

src/base/layer/layer.popover.js

@@ -10,7 +10,6 @@ BI.Popover = BI.inherit(BI.Widget, {
             NORMAL: "normal",
             BIG: "big"
         },
-        HEADER_HEIGHT: 40
     },
 
     _defaultConfig: function () {
@@ -23,6 +22,7 @@ BI.Popover = BI.inherit(BI.Widget, {
                 dynamic: false
             },
             header: null,
+            headerHeight: 40,
             body: null,
             footer: null,
             closable: true // BI-40839 是否显示右上角的关闭按钮
@@ -61,7 +61,7 @@ BI.Popover = BI.inherit(BI.Widget, {
                         }) : {
                             type: "bi.label",
                             cls: "bi-font-bold",
-                            height: this._constant.HEADER_HEIGHT,
+                            height: o.headerHeight,
                             text: o.header,
                             title: o.header,
                             textAlign: "left"
@@ -75,7 +75,7 @@ BI.Popover = BI.inherit(BI.Widget, {
                     el: o.closable ? {
                         type: "bi.icon_button",
                         cls: "bi-message-close close-font",
-                        height: this._constant.HEADER_HEIGHT,
+                        height: o.headerHeight,
                         handler: function () {
                             self.close();
                         }
@@ -84,9 +84,9 @@ BI.Popover = BI.inherit(BI.Widget, {
                     },
                     width: 56
                 }],
-                height: this._constant.HEADER_HEIGHT
+                height: o.headerHeight
             },
-            height: this._constant.HEADER_HEIGHT
+            height: o.headerHeight
         }, {
             el: o.logic.dynamic ? {
                 type: "bi.vertical",

typescript/base/combination/combo.ts

@@ -15,6 +15,8 @@ export interface _Combo extends _Widget {
 
     getPopupPosition(): any;
 
+    adjustHeight(e?: MouseEvent): void;
+
     toggle(): void;
 }
 

typescript/base/single/button/button.node.ts

@@ -1,11 +1,11 @@
 import { _BasicButton } from "./button.basic";
 
 export interface _NodeButton extends _BasicButton {
-    isOpened: () => void;
+    isOpened(): void;
 
-    setOpened: (b: boolean) => void;
+    setOpened(b: boolean): void;
 
-    triggerCollapse: () => void;
+    triggerCollapse(): void;
 
-    triggerExpand: () => void;
+    triggerExpand(): void;
 }