Merge remote-tracking branch 'origin/master'

changelog.md

@@ -1,5 +1,6 @@
 # 更新日志
 2.0(2020-11)
+- 修复了Popover小屏幕上看不完整的问题
 - 颜色选择器支持输入16进制颜色编号
 - bi.textarea_editor支持气泡提示报错
 

dist/2.0/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-11-11 21:20:27 */
+/*! time: 2020-11-12 10:50:23 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -26861,8 +26861,8 @@ BI.Popover = BI.inherit(BI.Widget, {
                     self.body = this;
                 },
                 css: {
-                    "max-height": c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP,
-                    "min-height": size.height,
+                    "max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP),
+                    "min-height": this._getSuitableBodyHeight(size.height),
                 },
                 items: [{
                     el: o.body,
@@ -26908,7 +26908,7 @@ BI.Popover = BI.inherit(BI.Widget, {
             scrolly: false,
         } : {
             type: "bi.vtape",
-            height: size.height,
+            height: BI.clamp(size.height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight),
         });
     },
 
@@ -26922,6 +26922,12 @@ BI.Popover = BI.inherit(BI.Widget, {
         });
     },
 
+    _getSuitableBodyHeight: function (height) {
+        var o = this.options;
+        var c = this._constant;
+        return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP);
+    },
+
     _calculateSize: function () {
         var o = this.options;
         var size = {};

dist/demo.js

@@ -1,4 +1,4 @@
-/*! time: 2020-11-11 21:20:27 */
+/*! time: 2020-11-12 10:50:23 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -26861,8 +26861,8 @@ BI.Popover = BI.inherit(BI.Widget, {
                     self.body = this;
                 },
                 css: {
-                    "max-height": c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP,
-                    "min-height": size.height,
+                    "max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP),
+                    "min-height": this._getSuitableBodyHeight(size.height),
                 },
                 items: [{
                     el: o.body,
@@ -26908,7 +26908,7 @@ BI.Popover = BI.inherit(BI.Widget, {
             scrolly: false,
         } : {
             type: "bi.vtape",
-            height: size.height,
+            height: BI.clamp(size.height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight),
         });
     },
 
@@ -26922,6 +26922,12 @@ BI.Popover = BI.inherit(BI.Widget, {
         });
     },
 
+    _getSuitableBodyHeight: function (height) {
+        var o = this.options;
+        var c = this._constant;
+        return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP);
+    },
+
     _calculateSize: function () {
         var o = this.options;
         var size = {};

dist/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-11-11 21:20:27 */
+/*! time: 2020-11-12 10:50:23 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -26861,8 +26861,8 @@ BI.Popover = BI.inherit(BI.Widget, {
                     self.body = this;
                 },
                 css: {
-                    "max-height": c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP,
-                    "min-height": size.height,
+                    "max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP),
+                    "min-height": this._getSuitableBodyHeight(size.height),
                 },
                 items: [{
                     el: o.body,
@@ -26908,7 +26908,7 @@ BI.Popover = BI.inherit(BI.Widget, {
             scrolly: false,
         } : {
             type: "bi.vtape",
-            height: size.height,
+            height: BI.clamp(size.height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight),
         });
     },
 
@@ -26922,6 +26922,12 @@ BI.Popover = BI.inherit(BI.Widget, {
         });
     },
 
+    _getSuitableBodyHeight: function (height) {
+        var o = this.options;
+        var c = this._constant;
+        return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP);
+    },
+
     _calculateSize: function () {
         var o = this.options;
         var size = {};

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2020-11-11 21:20:27 */
+/*! time: 2020-11-12 10:50:23 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -22888,8 +22888,8 @@ BI.Popover = BI.inherit(BI.Widget, {
                     self.body = this;
                 },
                 css: {
-                    "max-height": c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP,
-                    "min-height": size.height,
+                    "max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP),
+                    "min-height": this._getSuitableBodyHeight(size.height),
                 },
                 items: [{
                     el: o.body,
@@ -22935,7 +22935,7 @@ BI.Popover = BI.inherit(BI.Widget, {
             scrolly: false,
         } : {
             type: "bi.vtape",
-            height: size.height,
+            height: BI.clamp(size.height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight),
         });
     },
 
@@ -22949,6 +22949,12 @@ BI.Popover = BI.inherit(BI.Widget, {
         });
     },
 
+    _getSuitableBodyHeight: function (height) {
+        var o = this.options;
+        var c = this._constant;
+        return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP);
+    },
+
     _calculateSize: function () {
         var o = this.options;
         var size = {};

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2020-11-11 21:20:27 */
+/*! time: 2020-11-12 10:50:23 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

package.json

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

src/base/layer/layer.popover.js

@@ -99,8 +99,8 @@ BI.Popover = BI.inherit(BI.Widget, {
                     self.body = this;
                 },
                 css: {
-                    "max-height": c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP,
-                    "min-height": size.height,
+                    "max-height": this._getSuitableBodyHeight(c.MAX_HEIGHT - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP),
+                    "min-height": this._getSuitableBodyHeight(size.height),
                 },
                 items: [{
                     el: o.body,
@@ -146,7 +146,7 @@ BI.Popover = BI.inherit(BI.Widget, {
             scrolly: false,
         } : {
             type: "bi.vtape",
-            height: size.height,
+            height: BI.clamp(size.height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight),
         });
     },
 
@@ -160,6 +160,12 @@ BI.Popover = BI.inherit(BI.Widget, {
         });
     },
 
+    _getSuitableBodyHeight: function (height) {
+        var o = this.options;
+        var c = this._constant;
+        return BI.clamp(height, 0, BI.Widget._renderEngine.createElement("body")[0].clientHeight - o.headerHeight - (o.footer ? o.footerHeight : 0) - c.BODY_TGAP);
+    },
+
     _calculateSize: function () {
         var o = this.options;
         var size = {};