Browse Source

Merge pull request #275057 in DEC/fineui from master to feature/x

* commit 'bfe7256c57eaecc3e4af78ac36807e48b7085aa5':
  REPORT-119215 fix: 统一使用clientWidth和clientHeight,父页面代理掉子应用的body的clientHeight和clientWidth到父应用的body上
  REPORT-119215 fix: 统一使用clientWidth和clientHeight,父页面代理掉子应用的body的clientHeight和clientWidth到父应用的body上
  REPORT-119215 fix: 统一获取宽高的方法
master
superman 7 months ago
parent
commit
2f199552b9
  1. 8
      packages/fineui/src/base/layer/layer.popover.js
  2. 4
      packages/fineui/src/core/controller/controller.popover.js
  3. 10
      packages/fineui/webpack/webpack.dev.js

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

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

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

@ -58,8 +58,8 @@ export class PopoverController extends Controller {
const popover = this.get(name); const popover = this.get(name);
popover.show && popover.show(); popover.show && popover.show();
const render = this.getRender(); 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(); const w = popover.element.width(), h = popover.element.height();
let left = (W - w) / 2, top = (H - h) / 2; let left = (W - w) / 2, top = (H - h) / 2;
if (left < 0) { if (left < 0) {

10
packages/fineui/webpack/webpack.dev.js

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

Loading…
Cancel
Save