diff --git a/packages/fineui/dist/font/iconfont.eot b/packages/fineui/dist/font/iconfont.eot
index 30d5644ca..ee4462ec3 100644
Binary files a/packages/fineui/dist/font/iconfont.eot and b/packages/fineui/dist/font/iconfont.eot differ
diff --git a/packages/fineui/dist/font/iconfont.svg b/packages/fineui/dist/font/iconfont.svg
index 0aa415779..7e2b17d8c 100644
--- a/packages/fineui/dist/font/iconfont.svg
+++ b/packages/fineui/dist/font/iconfont.svg
@@ -14,6 +14,34 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1546,13 +1574,13 @@
-
+
-
+
diff --git a/packages/fineui/dist/font/iconfont.ttf b/packages/fineui/dist/font/iconfont.ttf
index 243165efe..2392fc12c 100644
Binary files a/packages/fineui/dist/font/iconfont.ttf and b/packages/fineui/dist/font/iconfont.ttf differ
diff --git a/packages/fineui/dist/font/iconfont.woff b/packages/fineui/dist/font/iconfont.woff
index e8fb8e441..08821e186 100644
Binary files a/packages/fineui/dist/font/iconfont.woff and b/packages/fineui/dist/font/iconfont.woff differ
diff --git a/packages/fineui/dist/font/iconfont.woff2 b/packages/fineui/dist/font/iconfont.woff2
index 2229cff55..7339acab5 100644
Binary files a/packages/fineui/dist/font/iconfont.woff2 and b/packages/fineui/dist/font/iconfont.woff2 differ
diff --git a/packages/fineui/src/base/layer/layer.popover.js b/packages/fineui/src/base/layer/layer.popover.js
index d7649c389..0f08ac097 100644
--- a/packages/fineui/src/base/layer/layer.popover.js
+++ b/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 H = Widget._renderEngine.createElement(bodyDom).height();
+ const el = Widget._renderEngine.createElement(getOuterBody())[0];
+ 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() {
diff --git a/packages/fineui/src/core/controller/controller.popover.js b/packages/fineui/src/core/controller/controller.popover.js
index c4b8337b8..d8a800780 100644
--- a/packages/fineui/src/core/controller/controller.popover.js
+++ b/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(),
- H = Widget._renderEngine.createElement(render).height();
+ const el = Widget._renderEngine.createElement(render)[0];
+ 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;
}
diff --git a/packages/fineui/webpack/webpack.dev.js b/packages/fineui/webpack/webpack.dev.js
index 3b795e02d..1f80646d2 100644
--- a/packages/fineui/webpack/webpack.dev.js
+++ b/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: {
- errors: true,
- warnings: false,
- },
+ overlay: false,
},
}
});