Merge branch 'master' of ssh://code.fineres.com:7999/~dailer/fineui

packages/fineui/src/base/layer/layer.popover.js

@@ -198,11 +198,11 @@ export class Popover extends Widget {
     mounted() {
         this.startX = 0;
         this.startY = 0;
-        const bodyDom = getOuterBody();
         this.tracker = new MouseMoveTracker(
             (deltaX, deltaY) => {
-                const W = Widget._renderEngine.createElement(bodyDom).width();
+                const el = Widget._renderEngine.createElement(getOuterBody())[0];
-                const H = Widget._renderEngine.createElement(bodyDom).height();
+                const W = el.clientWidth;
+                const H = el.clientHeight;
                 this.startX += deltaX;
                 this.startY += deltaY;
                 this.element.css({
@@ -246,7 +246,7 @@ export class Popover extends Widget {
     }
 
     _getSuitableWidth(width) {
-        return clamp(width, 0, Widget._renderEngine.createElement(getOuterBody()).width());
+        return clamp(width, 0, Widget._renderEngine.createElement(getOuterBody())[0].clientWidth);
     }
 
     _calculateSize() {

packages/fineui/src/core/controller/controller.popover.js

@@ -38,7 +38,7 @@ export class PopoverController extends Controller {
             type: "bi.popover",
         }, context);
         this.add(name, popover, options, context);
-        
+
         return this;
     }
 
@@ -58,8 +58,8 @@ export class PopoverController extends Controller {
             const popover = this.get(name);
             popover.show && popover.show();
             const render = this.getRender();
-            const W = Widget._renderEngine.createElement(render).width(),
+            const el = Widget._renderEngine.createElement(render)[0];
-                H = Widget._renderEngine.createElement(render).height();
+            const W = el.clientWidth, H = el.clientHeight;
             const w = popover.element.width(), h = popover.element.height();
             let left = (W - w) / 2, top = (H - h) / 2;
             if (left < 0) {
@@ -74,7 +74,7 @@ export class PopoverController extends Controller {
                 top: `${top}px`,
             });
         }
-        
+
         return this;
     }
 
@@ -87,7 +87,7 @@ export class PopoverController extends Controller {
             this.floatContainer[name].invisible();
             this.modal && this.floatContainer[name].element.__releaseZIndexMask__(this.zindexMap[name]);
         }
-        
+
         return this;
     }
 
@@ -135,7 +135,7 @@ export class PopoverController extends Controller {
                 bottom: 0,
             }],
         });
-        
+
         return this;
     }
 
@@ -167,7 +167,7 @@ export class PopoverController extends Controller {
         delete this.zindexMap[name];
         delete this.floatContainer[name];
         delete this.floatOpened[name];
-        
+
         return this;
     }
 
@@ -181,7 +181,7 @@ export class PopoverController extends Controller {
         this.floatContainer = {};
         this.floatOpened = {};
         this.zindexMap = {};
-        
+
         return this;
     }
 

packages/fineui/webpack/webpack.dev.js

@@ -6,7 +6,7 @@ const dirs = require("./dirs");
 module.exports = merge(common, {
     mode: "development",
 
-    devtool: "inline-source-map",
+    devtool: "eval-source-map",
 
     output: {
         path: dirs.DEST,
@@ -14,14 +14,14 @@ module.exports = merge(common, {
     },
 
     devServer: {
+        headers: {
+            "Access-Control-Allow-Origin": "*",
+        },
         port: 9001,
         // liveReload: true,
         client: {
             logging: 'error',
-            overlay: {
+            overlay: false,
-                errors: true,
-                warnings: false,
-            },
         },
     }
 });