tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

optimize js code

Browse Source
This commit is contained in:
pengfei.zhou 2021-08-31 12:49:47 +08:00 committed by osborn
parent 612e5a4a07
commit 1b10106eb3
31 changed files with 109 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
doric-js/bundle/doric-lib.es5.js
View File

@ -940,9 +940,7 @@ function stack(views, config) {
finally { if (e_1) { throw e_1.error; } } finally { if (e_1) { throw e_1.error; } }
} }
if (config) { if (config) {
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -964,9 +962,7 @@ function hlayout(views, config) {
finally { if (e_2) { throw e_2.error; } } finally { if (e_2) { throw e_2.error; } }
} }
if (config) { if (config) {
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -988,9 +984,7 @@ function vlayout(views, config) {
finally { if (e_3) { throw e_3.error; } } finally { if (e_3) { throw e_3.error; } }
} }
if (config) { if (config) {
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -1019,9 +1013,7 @@ function flexlayout(views, config) {
finally { if (e_4) { throw e_4.error; } } finally { if (e_4) { throw e_4.error; } }
} }
if (config) { if (config) {
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -1914,9 +1906,7 @@ var Text = /** @class */ (function (_super) {
function text(config) { function text(config) {
var ret = new Text; var ret = new Text;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -2105,9 +2095,7 @@ var Image = /** @class */ (function (_super) {
function image(config) { function image(config) {
var ret = new Image; var ret = new Image;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -2278,9 +2266,7 @@ var List = /** @class */ (function (_super) {
}(Superview)); }(Superview));
function list(config) { function list(config) {
var ret = new List; var ret = new List;
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function listItem(item, config) { function listItem(item, config) {
@ -2295,9 +2281,7 @@ function listItem(item, config) {
}); });
} }
if (config) { if (config) {
for (var key in config) { it.apply(config);
Reflect.set(it, key, Reflect.get(config, key, config), it);
}
} }
}); });
} }
@ -2401,9 +2385,7 @@ var Slider = /** @class */ (function (_super) {
}(Superview)); }(Superview));
function slider(config) { function slider(config) {
var ret = new Slider; var ret = new Slider;
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function slideItem(item, config) { function slideItem(item, config) {
@ -2453,9 +2435,7 @@ function scroller(content, config) {
return (new Scroller).also(function (v) { return (new Scroller).also(function (v) {
v.layoutConfig = layoutConfig().fit(); v.layoutConfig = layoutConfig().fit();
if (config) { if (config) {
for (var key in config) { v.apply(config);
Reflect.set(v, key, Reflect.get(config, key, config), v);
}
} }
v.content = content; v.content = content;
}); });
@ -2563,9 +2543,7 @@ var Refreshable = /** @class */ (function (_super) {
function refreshable(config) { function refreshable(config) {
var ret = new Refreshable; var ret = new Refreshable;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function pullable(v, config) { function pullable(v, config) {
@ -2832,9 +2810,7 @@ function flowItem(item, config) {
}); });
} }
if (config) { if (config) {
for (var key in config) { it.apply(config);
Reflect.set(it, key, Reflect.get(config, key, config), it);
}
} }
}); });
} }
@ -2989,9 +2965,7 @@ exports.InputType = void 0;
function input(config) { function input(config) {
var ret = new Input; var ret = new Input;
ret.layoutConfig = layoutConfig().just(); ret.layoutConfig = layoutConfig().just();
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -3096,9 +3070,7 @@ function draggable(views, config) {
}); });
} }
if (config) { if (config) {
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -3159,9 +3131,7 @@ function switchView(config) {
ret.layoutConfig = layoutConfig().just(); ret.layoutConfig = layoutConfig().just();
ret.width = 50; ret.width = 50;
ret.height = 30; ret.height = 30;
for (var key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }

63
doric-js/bundle/doric-lib.js
View File

@ -318,6 +318,9 @@ class View {
getLocationOnScreen(context) { getLocationOnScreen(context) {
return this.nativeChannel(context, "getLocationOnScreen")(); return this.nativeChannel(context, "getLocationOnScreen")();
} }
set props(props) {
this.apply(props);
}
doAnimation(context, animation) { doAnimation(context, animation) {
return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => { return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => {
for (let key in args) { for (let key in args) {
@ -753,9 +756,7 @@ function stack(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -766,9 +767,7 @@ function hlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -779,9 +778,7 @@ function vlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -794,9 +791,7 @@ function flexlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -1444,9 +1439,7 @@ __decorate$a([
function text(config) { function text(config) {
const ret = new Text; const ret = new Text;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -1613,9 +1606,7 @@ __decorate$9([
function image(config) { function image(config) {
const ret = new Image; const ret = new Image;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -1741,9 +1732,7 @@ __decorate$8([
], List.prototype, "bounces", void 0); ], List.prototype, "bounces", void 0);
function list(config) { function list(config) {
const ret = new List; const ret = new List;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function listItem(item, config) { function listItem(item, config) {
@ -1758,9 +1747,7 @@ function listItem(item, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { it.apply(config);
Reflect.set(it, key, Reflect.get(config, key, config), it);
}
} }
}); });
} }
@ -1839,9 +1826,7 @@ __decorate$7([
], Slider.prototype, "bounces", void 0); ], Slider.prototype, "bounces", void 0);
function slider(config) { function slider(config) {
const ret = new Slider; const ret = new Slider;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function slideItem(item, config) { function slideItem(item, config) {
@ -1876,9 +1861,7 @@ function scroller(content, config) {
return (new Scroller).also(v => { return (new Scroller).also(v => {
v.layoutConfig = layoutConfig().fit(); v.layoutConfig = layoutConfig().fit();
if (config) { if (config) {
for (let key in config) { v.apply(config);
Reflect.set(v, key, Reflect.get(config, key, config), v);
}
} }
v.content = content; v.content = content;
}); });
@ -1961,9 +1944,7 @@ __decorate$5([
function refreshable(config) { function refreshable(config) {
const ret = new Refreshable; const ret = new Refreshable;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function pullable(v, config) { function pullable(v, config) {
@ -2184,9 +2165,7 @@ function flowItem(item, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { it.apply(config);
Reflect.set(it, key, Reflect.get(config, key, config), it);
}
} }
}); });
} }
@ -2320,9 +2299,7 @@ exports.InputType = void 0;
function input(config) { function input(config) {
const ret = new Input; const ret = new Input;
ret.layoutConfig = layoutConfig().just(); ret.layoutConfig = layoutConfig().just();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -2386,9 +2363,7 @@ function draggable(views, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -2429,9 +2404,7 @@ function switchView(config) {
ret.layoutConfig = layoutConfig().just(); ret.layoutConfig = layoutConfig().just();
ret.width = 50; ret.width = 50;
ret.height = 30; ret.height = 30;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }

63
doric-js/bundle/doric-vm.js
View File

@ -1842,6 +1842,9 @@ class View {
getLocationOnScreen(context) { getLocationOnScreen(context) {
return this.nativeChannel(context, "getLocationOnScreen")(); return this.nativeChannel(context, "getLocationOnScreen")();
} }
set props(props) {
this.apply(props);
}
doAnimation(context, animation) { doAnimation(context, animation) {
return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => { return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => {
for (let key in args) { for (let key in args) {
@ -2277,9 +2280,7 @@ function stack(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -2290,9 +2291,7 @@ function hlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -2303,9 +2302,7 @@ function vlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -2318,9 +2315,7 @@ function flexlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -2968,9 +2963,7 @@ __decorate$a([
function text(config) { function text(config) {
const ret = new Text; const ret = new Text;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -3137,9 +3130,7 @@ __decorate$9([
function image(config) { function image(config) {
const ret = new Image; const ret = new Image;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -3265,9 +3256,7 @@ __decorate$8([
], List.prototype, "bounces", void 0); ], List.prototype, "bounces", void 0);
function list(config) { function list(config) {
const ret = new List; const ret = new List;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function listItem(item, config) { function listItem(item, config) {
@ -3282,9 +3271,7 @@ function listItem(item, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { it.apply(config);
Reflect.set(it, key, Reflect.get(config, key, config), it);
}
} }
}); });
} }
@ -3363,9 +3350,7 @@ __decorate$7([
], Slider.prototype, "bounces", void 0); ], Slider.prototype, "bounces", void 0);
function slider(config) { function slider(config) {
const ret = new Slider; const ret = new Slider;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function slideItem(item, config) { function slideItem(item, config) {
@ -3400,9 +3385,7 @@ function scroller(content, config) {
return (new Scroller).also(v => { return (new Scroller).also(v => {
v.layoutConfig = layoutConfig().fit(); v.layoutConfig = layoutConfig().fit();
if (config) { if (config) {
for (let key in config) { v.apply(config);
Reflect.set(v, key, Reflect.get(config, key, config), v);
}
} }
v.content = content; v.content = content;
}); });
@ -3485,9 +3468,7 @@ __decorate$5([
function refreshable(config) { function refreshable(config) {
const ret = new Refreshable; const ret = new Refreshable;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function pullable(v, config) { function pullable(v, config) {
@ -3708,9 +3689,7 @@ function flowItem(item, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { it.apply(config);
Reflect.set(it, key, Reflect.get(config, key, config), it);
}
} }
}); });
} }
@ -3844,9 +3823,7 @@ exports.InputType = void 0;
function input(config) { function input(config) {
const ret = new Input; const ret = new Input;
ret.layoutConfig = layoutConfig().just(); ret.layoutConfig = layoutConfig().just();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -3910,9 +3887,7 @@ function draggable(views, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -3953,9 +3928,7 @@ function switchView(config) {
ret.layoutConfig = layoutConfig().just(); ret.layoutConfig = layoutConfig().just();
ret.width = 50; ret.width = 50;
ret.height = 30; ret.height = 30;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }

1
doric-js/index.d.ts vendored
View File

@ -302,6 +302,7 @@ declare module 'doric/lib/src/ui/view' {
* Only affected when its superview or itself is FlexLayout. * Only affected when its superview or itself is FlexLayout.
*/ */
flexConfig?: FlexConfig; flexConfig?: FlexConfig;
set props(props: Partial<this>);
doAnimation(context: BridgeContext, animation: IAnimation): Promise<void>; doAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
clearAnimation(context: BridgeContext, animation: IAnimation): Promise<void>; clearAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
cancelAnimation(context: BridgeContext, animation: IAnimation): Promise<void>; cancelAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;

1
doric-js/lib/src/ui/view.d.ts vendored
View File

@ -131,6 +131,7 @@ export declare abstract class View implements Modeling {
* Only affected when its superview or itself is FlexLayout. * Only affected when its superview or itself is FlexLayout.
*/ */
flexConfig?: FlexConfig; flexConfig?: FlexConfig;
set props(props: Partial<this>);
doAnimation(context: BridgeContext, animation: IAnimation): Promise<void>; doAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
clearAnimation(context: BridgeContext, animation: IAnimation): Promise<void>; clearAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;
cancelAnimation(context: BridgeContext, animation: IAnimation): Promise<void>; cancelAnimation(context: BridgeContext, animation: IAnimation): Promise<void>;

3
doric-js/lib/src/ui/view.js
View File

@ -200,6 +200,9 @@ export class View {
getLocationOnScreen(context) { getLocationOnScreen(context) {
return this.nativeChannel(context, "getLocationOnScreen")(); return this.nativeChannel(context, "getLocationOnScreen")();
} }
set props(props) {
this.apply(props);
}
doAnimation(context, animation) { doAnimation(context, animation) {
return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => { return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => {
for (let key in args) { for (let key in args) {

4
doric-js/lib/src/widget/draggable.js
View File

@ -43,9 +43,7 @@ export function draggable(views, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }

4
doric-js/lib/src/widget/flowlayout.js
View File

@ -141,9 +141,7 @@ export function flowItem(item, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { it.apply(config);
Reflect.set(it, key, Reflect.get(config, key, config), it);
}
} }
}); });
} }

4
doric-js/lib/src/widget/image.js
View File

@ -105,8 +105,6 @@ __decorate([
export function image(config) { export function image(config) {
const ret = new Image; const ret = new Image;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }

4
doric-js/lib/src/widget/input.js
View File

@ -146,8 +146,6 @@ export var InputType;
export function input(config) { export function input(config) {
const ret = new Input; const ret = new Input;
ret.layoutConfig = layoutConfig().just(); ret.layoutConfig = layoutConfig().just();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }

16
doric-js/lib/src/widget/layouts.js
View File

@ -50,9 +50,7 @@ export function stack(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -63,9 +61,7 @@ export function hlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -76,9 +72,7 @@ export function vlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -91,9 +85,7 @@ export function flexlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }

8
doric-js/lib/src/widget/list.js
View File

@ -123,9 +123,7 @@ __decorate([
], List.prototype, "bounces", void 0); ], List.prototype, "bounces", void 0);
export function list(config) { export function list(config) {
const ret = new List; const ret = new List;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
export function listItem(item, config) { export function listItem(item, config) {
@ -140,9 +138,7 @@ export function listItem(item, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { it.apply(config);
Reflect.set(it, key, Reflect.get(config, key, config), it);
}
} }
}); });
} }

4
doric-js/lib/src/widget/refreshable.js
View File

@ -42,9 +42,7 @@ __decorate([
export function refreshable(config) { export function refreshable(config) {
const ret = new Refreshable; const ret = new Refreshable;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
export function pullable(v, config) { export function pullable(v, config) {

4
doric-js/lib/src/widget/scroller.js
View File

@ -28,9 +28,7 @@ export function scroller(content, config) {
return (new Scroller).also(v => { return (new Scroller).also(v => {
v.layoutConfig = layoutConfig().fit(); v.layoutConfig = layoutConfig().fit();
if (config) { if (config) {
for (let key in config) { v.apply(config);
Reflect.set(v, key, Reflect.get(config, key, config), v);
}
} }
v.content = content; v.content = content;
}); });

4
doric-js/lib/src/widget/slider.js
View File

@ -90,9 +90,7 @@ __decorate([
], Slider.prototype, "bounces", void 0); ], Slider.prototype, "bounces", void 0);
export function slider(config) { export function slider(config) {
const ret = new Slider; const ret = new Slider;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
export function slideItem(item, config) { export function slideItem(item, config) {

4
doric-js/lib/src/widget/switch.js
View File

@ -52,8 +52,6 @@ export function switchView(config) {
ret.layoutConfig = layoutConfig().just(); ret.layoutConfig = layoutConfig().just();
ret.width = 50; ret.width = 50;
ret.height = 30; ret.height = 30;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }

4
doric-js/lib/src/widget/text.js
View File

@ -93,8 +93,6 @@ __decorate([
export function text(config) { export function text(config) {
const ret = new Text; const ret = new Text;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }

4
doric-js/src/ui/view.ts
View File

@ -354,6 +354,10 @@ export abstract class View implements Modeling {
@Property @Property
flexConfig?: FlexConfig flexConfig?: FlexConfig
set props(props: Partial<this>) {
this.apply(props)
}
doAnimation(context: BridgeContext, animation: IAnimation) { doAnimation(context: BridgeContext, animation: IAnimation) {
return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => { return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => {
for (let key in args) { for (let key in args) {

4
doric-js/src/widget/draggable.ts
View File

@ -33,9 +33,7 @@ export function draggable(views: View | View[], config?: Partial<Draggable>) {
}) })
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
} }
return ret return ret
} }

4
doric-js/src/widget/flowlayout.ts
View File

@ -121,9 +121,7 @@ export function flowItem(item: View | View[], config?: Partial<FlowLayoutItem>)
}) })
} }
if (config) { if (config) {
for (let key in config) { it.apply(config)
Reflect.set(it, key, Reflect.get(config, key, config), it)
}
} }
}) })
} }

4
doric-js/src/widget/image.ts
View File

@ -112,8 +112,6 @@ export class Image extends View {
export function image(config: Partial<Image>) { export function image(config: Partial<Image>) {
const ret = new Image const ret = new Image
ret.layoutConfig = layoutConfig().fit() ret.layoutConfig = layoutConfig().fit()
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
return ret return ret
} }

4
doric-js/src/widget/input.ts
View File

@ -147,8 +147,6 @@ export enum InputType {
export function input(config: Partial<Input>) { export function input(config: Partial<Input>) {
const ret = new Input const ret = new Input
ret.layoutConfig = layoutConfig().just() ret.layoutConfig = layoutConfig().just()
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
return ret return ret
} }

16
doric-js/src/widget/layouts.ts
View File

@ -44,9 +44,7 @@ export function stack(views: View[], config?: Partial<Stack>) {
ret.addChild(v) ret.addChild(v)
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
} }
return ret return ret
} }
@ -58,9 +56,7 @@ export function hlayout(views: View[], config?: Partial<HLayout>) {
ret.addChild(v) ret.addChild(v)
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
} }
return ret return ret
} }
@ -72,9 +68,7 @@ export function vlayout(views: View[], config?: Partial<VLayout>) {
ret.addChild(v) ret.addChild(v)
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
} }
return ret return ret
} }
@ -91,9 +85,7 @@ export function flexlayout(views: View[], config?: Partial<FlexLayout>) {
ret.addChild(v) ret.addChild(v)
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
} }
return ret return ret
} }

8
doric-js/src/widget/list.ts
View File

@ -114,9 +114,7 @@ export class List extends Superview {
export function list(config: Partial<List>) { export function list(config: Partial<List>) {
const ret = new List const ret = new List
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
return ret return ret
} }
@ -131,9 +129,7 @@ export function listItem(item: View | View[], config?: Partial<ListItem>) {
}) })
} }
if (config) { if (config) {
for (let key in config) { it.apply(config)
Reflect.set(it, key, Reflect.get(config, key, config), it)
}
} }
}) })
} }

4
doric-js/src/widget/refreshable.ts
View File

@ -47,9 +47,7 @@ export class Refreshable extends Superview {
export function refreshable(config: Partial<Refreshable>) { export function refreshable(config: Partial<Refreshable>) {
const ret = new Refreshable const ret = new Refreshable
ret.layoutConfig = layoutConfig().fit() ret.layoutConfig = layoutConfig().fit()
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
return ret return ret
} }

4
doric-js/src/widget/scroller.ts
View File

@ -21,9 +21,7 @@ export function scroller(content: View, config?: Partial<Scroller>) {
return (new Scroller).also(v => { return (new Scroller).also(v => {
v.layoutConfig = layoutConfig().fit() v.layoutConfig = layoutConfig().fit()
if (config) { if (config) {
for (let key in config) { v.apply(config)
Reflect.set(v, key, Reflect.get(config, key, config), v)
}
} }
v.content = content v.content = content
}) })

4
doric-js/src/widget/slider.ts
View File

@ -83,9 +83,7 @@ export class Slider extends Superview {
export function slider(config: Partial<Slider>) { export function slider(config: Partial<Slider>) {
const ret = new Slider const ret = new Slider
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
return ret return ret
} }

4
doric-js/src/widget/switch.ts
View File

@ -44,8 +44,6 @@ export function switchView(config: Partial<Switch>) {
ret.layoutConfig = layoutConfig().just() ret.layoutConfig = layoutConfig().just()
ret.width = 50 ret.width = 50
ret.height = 30 ret.height = 30
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
return ret return ret
} }

4
doric-js/src/widget/text.ts
View File

@ -72,8 +72,6 @@ export class Text extends View {
export function text(config: Partial<Text>) { export function text(config: Partial<Text>) {
const ret = new Text const ret = new Text
ret.layoutConfig = layoutConfig().fit() ret.layoutConfig = layoutConfig().fit()
for (let key in config) { ret.apply(config)
Reflect.set(ret, key, Reflect.get(config, key, config), ret)
}
return ret return ret
} }

63
doric-web/dist/index.js vendored
View File

@ -1896,6 +1896,9 @@ class View {
getLocationOnScreen(context) { getLocationOnScreen(context) {
return this.nativeChannel(context, "getLocationOnScreen")(); return this.nativeChannel(context, "getLocationOnScreen")();
} }
set props(props) {
this.apply(props);
}
doAnimation(context, animation) { doAnimation(context, animation) {
return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => { return this.nativeChannel(context, "doAnimation")(animation.toModel()).then((args) => {
for (let key in args) { for (let key in args) {
@ -2331,9 +2334,7 @@ function stack(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -2344,9 +2345,7 @@ function hlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -2357,9 +2356,7 @@ function vlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -2372,9 +2369,7 @@ function flexlayout(views, config) {
ret.addChild(v); ret.addChild(v);
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -3022,9 +3017,7 @@ __decorate$a([
function text(config) { function text(config) {
const ret = new Text; const ret = new Text;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -3191,9 +3184,7 @@ __decorate$9([
function image(config) { function image(config) {
const ret = new Image; const ret = new Image;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -3319,9 +3310,7 @@ __decorate$8([
], List.prototype, "bounces", void 0); ], List.prototype, "bounces", void 0);
function list(config) { function list(config) {
const ret = new List; const ret = new List;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function listItem(item, config) { function listItem(item, config) {
@ -3336,9 +3325,7 @@ function listItem(item, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { it.apply(config);
Reflect.set(it, key, Reflect.get(config, key, config), it);
}
} }
}); });
} }
@ -3417,9 +3404,7 @@ __decorate$7([
], Slider.prototype, "bounces", void 0); ], Slider.prototype, "bounces", void 0);
function slider(config) { function slider(config) {
const ret = new Slider; const ret = new Slider;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function slideItem(item, config) { function slideItem(item, config) {
@ -3454,9 +3439,7 @@ function scroller(content, config) {
return (new Scroller).also(v => { return (new Scroller).also(v => {
v.layoutConfig = layoutConfig().fit(); v.layoutConfig = layoutConfig().fit();
if (config) { if (config) {
for (let key in config) { v.apply(config);
Reflect.set(v, key, Reflect.get(config, key, config), v);
}
} }
v.content = content; v.content = content;
}); });
@ -3539,9 +3522,7 @@ __decorate$5([
function refreshable(config) { function refreshable(config) {
const ret = new Refreshable; const ret = new Refreshable;
ret.layoutConfig = layoutConfig().fit(); ret.layoutConfig = layoutConfig().fit();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
function pullable(v, config) { function pullable(v, config) {
@ -3762,9 +3743,7 @@ function flowItem(item, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { it.apply(config);
Reflect.set(it, key, Reflect.get(config, key, config), it);
}
} }
}); });
} }
@ -3898,9 +3877,7 @@ exports.InputType = void 0;
function input(config) { function input(config) {
const ret = new Input; const ret = new Input;
ret.layoutConfig = layoutConfig().just(); ret.layoutConfig = layoutConfig().just();
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }
@ -3964,9 +3941,7 @@ function draggable(views, config) {
}); });
} }
if (config) { if (config) {
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
} }
return ret; return ret;
} }
@ -4007,9 +3982,7 @@ function switchView(config) {
ret.layoutConfig = layoutConfig().just(); ret.layoutConfig = layoutConfig().just();
ret.width = 50; ret.width = 50;
ret.height = 30; ret.height = 30;
for (let key in config) { ret.apply(config);
Reflect.set(ret, key, Reflect.get(config, key, config), ret);
}
return ret; return ret;
} }

2
doric-web/dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long