Browse Source

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

* commit 'd94ccc58619cd0f809399e2b21780e1618bf7a89':
  fix: 改错了
  fix: 改错了
  fix: lodash环境修复
  KERNEL-12829 feat: _gap之类的在fineui中添加类型定义
master
superman 2 years ago
parent
commit
0366199b25
  1. 16
      src/core/logic/logic.layout.js
  2. 6
      typescript/shims-tsx.ts

16
src/core/logic/logic.layout.js

@ -32,7 +32,7 @@ BI.VerticalLayoutLogic = BI.inherit(BI.Logic, {
} else {
layout = "bi.vtape";
}
return _.pickBy({
return BI._.pickBy({
type: layout,
scrollable: o.scrollable,
scrolly: o.scrolly,
@ -50,7 +50,7 @@ BI.VerticalLayoutLogic = BI.inherit(BI.Logic, {
verticalAlign: o.verticalAlign,
columnSize: o.columnSize,
rowSize: o.rowSize
}, _.identity);
}, BI._.identity);
}
});
@ -89,7 +89,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
} else {
layout = "bi.htape";
}
return _.pickBy({
return BI._.pickBy({
type: layout,
scrollable: o.scrollable,
scrolly: o.scrolly,
@ -107,7 +107,7 @@ BI.HorizontalLayoutLogic = BI.inherit(BI.Logic, {
verticalAlign: o.verticalAlign,
columnSize: o.columnSize,
rowSize: o.rowSize
}, _.identity);
}, BI._.identity);
}
});
@ -143,7 +143,7 @@ BI.TableLayoutLogic = BI.inherit(BI.Logic, {
} else {
layout = "bi.window";
}
return _.pickBy({
return BI._.pickBy({
type: layout,
scrollable: o.scrollable,
scrolly: o.scrolly,
@ -157,7 +157,7 @@ BI.TableLayoutLogic = BI.inherit(BI.Logic, {
verticalAlign: o.verticalAlign,
columnSize: o.columnSize,
rowSize: o.rowSize
}, _.identity);
}, BI._.identity);
}
});
@ -198,7 +198,7 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, {
} else {
layout = "bi.htape";
}
return _.pickBy({
return BI._.pickBy({
type: layout,
scrollable: o.scrollable,
scrolly: o.scrolly,
@ -216,6 +216,6 @@ BI.HorizontalFillLayoutLogic = BI.inherit(BI.Logic, {
verticalAlign: o.verticalAlign,
columnSize: columnSize,
rowSize: o.rowSize
}, _.identity);
}, BI._.identity);
}
});

6
typescript/shims-tsx.ts

@ -13,6 +13,12 @@ interface UIProps {
bgap: number;
vgap: number;
hgap: number;
_rgap: number;
_lgap: number;
_tgap: number;
_bgap: number;
_hgap: number;
_vgap: number;
inset: number | string;
}

Loading…
Cancel
Save