Merge remote-tracking branch 'origin/master'

demo/js/core/popup/demo.popover.js

@@ -189,6 +189,10 @@ Demo.Func = BI.inherit(BI.Widget, {
                                 };
                             }),
                         },
+                        footer: {
+                            type: "bi.label",
+                            text: "这个是footer",
+                        },
                     }).open(id);
                 },
             }],

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2020-9-21 12:00:19 */
+/*! time: 2020-9-21 17:10:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1081);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1080);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -4236,7 +4236,7 @@ if (!_global.BI) {
 
 /***/ }),
 
-/***/ 1081:
+/***/ 1080:
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(101);
@@ -4266,8 +4266,8 @@ __webpack_require__(118);
 __webpack_require__(119);
 __webpack_require__(120);
 __webpack_require__(121);
-__webpack_require__(746);
-__webpack_require__(1082);
+__webpack_require__(745);
+__webpack_require__(1081);
 __webpack_require__(131);
 __webpack_require__(132);
 module.exports = __webpack_require__(133);
@@ -4275,7 +4275,7 @@ module.exports = __webpack_require__(133);
 
 /***/ }),
 
-/***/ 1082:
+/***/ 1081:
 /***/ (function(module, exports) {
 
 /**
@@ -9168,7 +9168,7 @@ process.umask = function () {
 
 /***/ }),
 
-/***/ 746:
+/***/ 745:
 /***/ (function(module, exports) {
 
 BI.i18n = {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20200921120228",
+  "version": "2.0.20200921171204",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",

src/base/layer/layer.popover.js

@@ -10,6 +10,9 @@ BI.Popover = BI.inherit(BI.Widget, {
             NORMAL: "normal",
             BIG: "big",
         },
+        MAX_HEIGHT: 600,
+        BODY_TGAP: 10,
+        BODY_HGAP: 20,
     },
 
     props: {
@@ -17,7 +20,6 @@ BI.Popover = BI.inherit(BI.Widget, {
         size: "normal", // small, normal, big
         logic: {
             dynamic: false,
-            maxHeight: 600,
         },
         header: null,
         headerHeight: 40,
@@ -29,6 +31,7 @@ BI.Popover = BI.inherit(BI.Widget, {
 
     render: function () {
         var self = this; var o = this.options;
+        var c = this._constant;
         this.startX = 0;
         this.startY = 0;
         var size = this._calculateSize();
@@ -87,28 +90,32 @@ BI.Popover = BI.inherit(BI.Widget, {
                 height: o.headerHeight,
             },
             height: o.headerHeight,
-        }, {
-            el: o.logic.dynamic ? {
+        }, o.logic.dynamic ? {
+            el: {
                 type: "bi.vertical",
-                scrolly: false,
+                scrolly: true,
                 cls: "popover-body",
                 ref: function () {
                     self.body = this;
                 },
-                hgap: 20,
-                tgap: 10,
+                css: {
+                    "max-height": c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP - 2,
+                    "min-height": size.height,
+                },
                 items: [{
-                    el: BI.extend({}, o.body, {
-                        extraCls: "dynamic-height-limit-layout-" + size.type,
-                    }),
+                    el: o.body,
                 }],
-            } : {
+            },
+            hgap: c.BODY_HGAP,
+            tgap: c.BODY_TGAP,
+        } : {
+            el: {
                 type: "bi.absolute",
                 items: [{
                     el: o.body,
-                    left: 20,
-                    top: 10,
-                    right: 20,
+                    left: c.BODY_HGAP,
+                    top: c.BODY_TGAP,
+                    right: c.BODY_HGAP,
                     bottom: 0,
                 }],
             },
@@ -139,7 +146,7 @@ BI.Popover = BI.inherit(BI.Widget, {
             scrolly: false,
         } : {
             type: "bi.vtape",
-            height: size.height,
+            height: size.height - 2,
         });
     },
 

src/less/base/layer/layer.popover.less

@@ -1,13 +0,0 @@
-@maxHeight: 600px;
-
-.bi-popover {
-    .dynamic-height-limit-layout-small {
-        min-height: 200px;
-        max-height: @maxHeight;
-    }
-
-    .dynamic-height-limit-layout-big, .dynamic-height-limit-layout-default {
-        min-height: 500px;
-        max-height: @maxHeight;
-    }
-}