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

fix: layout() cannot effect configMaxWidth or configMinWidth

Browse Source
This commit is contained in:
pengfei.zhou
2022-03-22 17:04:59 +08:00
committed by osborn
parent a19c327743
commit 809bc5ef0e
10 changed files with 1715 additions and 3105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ var Mutable = /** @class */ (function () {
*/
var __uniqueId__ = 0;
function uniqueId(prefix) {
return "__".concat(prefix, "_").concat(__uniqueId__++, "__");
return "__" + prefix + "_" + __uniqueId__++ + "__";
}
function toString(message) {
@@ -177,11 +177,11 @@ var __values$5 = (undefined && undefined.__values) || function(o) {
function Property(target, propKey) {
Object.defineProperty(target, propKey, {
get: function () {
return Reflect.get(this, "__prop__".concat(propKey), this);
return Reflect.get(this, "__prop__" + propKey, this);
},
set: function (v) {
var oldV = Reflect.get(this, "__prop__".concat(propKey), this);
Reflect.set(this, "__prop__".concat(propKey), v, this);
var oldV = Reflect.get(this, "__prop__" + propKey, this);
Reflect.set(this, "__prop__" + propKey, v, this);
if (oldV !== v) {
Reflect.apply(this.onPropertyChanged, this, [propKey, oldV, v]);
}
@@ -191,11 +191,11 @@ function Property(target, propKey) {
function InconsistProperty(target, propKey) {
Object.defineProperty(target, propKey, {
get: function () {
return Reflect.get(this, "__prop__".concat(propKey), this);
return Reflect.get(this, "__prop__" + propKey, this);
},
set: function (v) {
var oldV = Reflect.get(this, "__prop__".concat(propKey), this);
Reflect.set(this, "__prop__".concat(propKey), v, this);
var oldV = Reflect.get(this, "__prop__" + propKey, this);
Reflect.set(this, "__prop__" + propKey, v, this);
Reflect.apply(this.onPropertyChanged, this, [propKey, oldV, v]);
},
});
@@ -373,7 +373,7 @@ var View = /** @class */ (function () {
return Reflect.apply(f, this, argumentsList);
}
else {
loge("Cannot find callback:".concat(id, " for ").concat(JSON.stringify(this.toModel())));
loge("Cannot find callback:" + id + " for " + JSON.stringify(this.toModel()));
}
};
View.prototype.toModel = function () {
@@ -714,7 +714,7 @@ var Group = /** @class */ (function (_super) {
this.addChild(e);
}
else {
loge("Not allowed to add ".concat(typeof e));
loge("Not allowed to add " + typeof e);
}
};
Object.defineProperty(Group.prototype, "innerElement", {
@@ -902,6 +902,10 @@ var LayoutConfigImpl = /** @class */ (function () {
margin: this.margin,
alignment: this.alignment ? this.alignment.toModel() : undefined,
weight: this.weight,
minWidth: this.minWidth,
maxWidth: this.maxWidth,
minHeight: this.minHeight,
maxHeight: this.maxHeight
};
};
return LayoutConfigImpl;
@@ -1225,7 +1229,7 @@ var Panel = /** @class */ (function () {
var v = this.retrospectView(viewIds);
if (v === undefined) {
loge("Cannot find view for ".concat(viewIds));
loge("Cannot find view for " + viewIds);
}
else {
var argumentsList = [callbackId];
@@ -1427,7 +1431,7 @@ var Color = /** @class */ (function () {
}
Color.parse = function (str) {
if (!str.startsWith("#")) {
throw new Error("Parse color error with ".concat(str));
throw new Error("Parse color error with " + str);
}
var val = parseInt(str.substr(1), 16);
if (str.length === 7) {
@@ -1437,7 +1441,7 @@ var Color = /** @class */ (function () {
return new Color(val);
}
else {
throw new Error("Parse color error with ".concat(str));
throw new Error("Parse color error with " + str);
}
};
Color.safeParse = function (str, defVal) {
@@ -2240,7 +2244,7 @@ var MainBundleResource = /** @class */ (function (_super) {
var BundleResource = /** @class */ (function (_super) {
__extends$f(BundleResource, _super);
function BundleResource(bundleName, fileName) {
return _super.call(this, "bundle", "".concat(bundleName, "://").concat(fileName)) || this;
return _super.call(this, "bundle", bundleName + "://" + fileName) || this;
}
return BundleResource;
}(iOSResource));
@@ -2523,7 +2527,7 @@ var List = /** @class */ (function (_super) {
List.prototype.getItem = function (itemIdx) {
var view = this.renderItem(itemIdx);
view.superview = this;
this.cachedViews.set("".concat(itemIdx), view);
this.cachedViews.set("" + itemIdx, view);
return view;
};
List.prototype.renderBunchedItems = function (start, length) {
@@ -2657,7 +2661,7 @@ var Slider = /** @class */ (function (_super) {
Slider.prototype.getItem = function (itemIdx) {
var view = this.renderPage(itemIdx);
view.superview = this;
this.cachedViews.set("".concat(itemIdx), view);
this.cachedViews.set("" + itemIdx, view);
return view;
};
Slider.prototype.renderBunchedItems = function (start, length) {
@@ -3021,7 +3025,7 @@ exports.jsx = void 0;
Reflect.set(e, "innerElement", children, e);
}
else {
throw new Error("Do not support ".concat(constructor.name, " for ").concat(children));
throw new Error("Do not support " + constructor.name + " for " + children);
}
}
return e;
@@ -3139,7 +3143,7 @@ var FlowLayout = /** @class */ (function (_super) {
FlowLayout.prototype.getItem = function (itemIdx) {
var view = this.renderItem(itemIdx);
view.superview = this;
this.cachedViews.set("".concat(itemIdx), view);
this.cachedViews.set("" + itemIdx, view);
return view;
};
FlowLayout.prototype.renderBunchedItems = function (start, length) {
@@ -3820,7 +3824,7 @@ function navbar(context) {
}
function internalScheme(context, panelClass) {
return "_internal_://export?class=".concat(encodeURIComponent(panelClass.name), "&context=").concat(context.id);
return "_internal_://export?class=" + encodeURIComponent(panelClass.name) + "&context=" + context.id;
}
function navigator(context) {
var moduleName = "navigator";
@@ -3860,9 +3864,9 @@ function transformRequest(request) {
if (request.params !== undefined) {
var queryStrings = [];
for (var key in request.params) {
queryStrings.push("".concat(key, "=").concat(encodeURIComponent(request.params[key])));
queryStrings.push(key + "=" + encodeURIComponent(request.params[key]));
}
request.url = "".concat(request.url).concat(url.indexOf('?') >= 0 ? '&' : '?').concat(queryStrings.join('&'));
request.url = "" + request.url + (url.indexOf('?') >= 0 ? '&' : '?') + queryStrings.join('&');
}
if (typeof request.data === 'object') {
request.data = JSON.stringify(request.data);
@@ -4138,7 +4142,7 @@ function animate(context) {
}
else {
return function (args) {
return Promise.reject("Cannot find panel in Context:".concat(context.id));
return Promise.reject("Cannot find panel in Context:" + context.id);
};
}
}

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

@@ -754,6 +754,10 @@ class LayoutConfigImpl {
margin: this.margin,
alignment: this.alignment ? this.alignment.toModel() : undefined,
weight: this.weight,
minWidth: this.minWidth,
maxWidth: this.maxWidth,
minHeight: this.minHeight,
maxHeight: this.maxHeight
};
}
}

4744
doric-js/bundle/doric-sandbox.es5.js
View File

File diff suppressed because it is too large Load Diff

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

@@ -2282,6 +2282,10 @@ class LayoutConfigImpl {
margin: this.margin,
alignment: this.alignment ? this.alignment.toModel() : undefined,
weight: this.weight,
minWidth: this.minWidth,
maxWidth: this.maxWidth,
minHeight: this.minHeight,
maxHeight: this.maxHeight
};
}
}

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

@@ -1553,6 +1553,10 @@ declare module 'doric/lib/src/util/layoutconfig' {
} | undefined;
alignment: number | undefined;
weight: number | undefined;
minWidth: number | undefined;
maxWidth: number | undefined;
minHeight: number | undefined;
maxHeight: number | undefined;
};
}
export function layoutConfig(): LayoutConfigImpl;

4
doric-js/lib/src/util/layoutconfig.d.ts vendored
View File

@@ -79,6 +79,10 @@ export declare class LayoutConfigImpl implements LayoutConfig, Modeling {
} | undefined;
alignment: number | undefined;
weight: number | undefined;
minWidth: number | undefined;
maxWidth: number | undefined;
minHeight: number | undefined;
maxHeight: number | undefined;
};
}
export declare function layoutConfig(): LayoutConfigImpl;

4
doric-js/lib/src/util/layoutconfig.js
View File

@@ -96,6 +96,10 @@ export class LayoutConfigImpl {
margin: this.margin,
alignment: this.alignment ? this.alignment.toModel() : undefined,
weight: this.weight,
minWidth: this.minWidth,
maxWidth: this.maxWidth,
minHeight: this.minHeight,
maxHeight: this.maxHeight
};
}
}

4
doric-js/src/util/layoutconfig.ts
View File

@@ -175,6 +175,10 @@ export class LayoutConfigImpl implements LayoutConfig, Modeling {
margin: this.margin,
alignment: this.alignment ? this.alignment.toModel() : undefined,
weight: this.weight,
minWidth: this.minWidth,
maxWidth: this.maxWidth,
minHeight: this.minHeight,
maxHeight: this.maxHeight
}
}
}

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

@@ -2356,6 +2356,10 @@ class LayoutConfigImpl {
margin: this.margin,
alignment: this.alignment ? this.alignment.toModel() : undefined,
weight: this.weight,
minWidth: this.minWidth,
maxWidth: this.maxWidth,
minHeight: this.minHeight,
maxHeight: this.maxHeight
};
}
}

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

File diff suppressed because one or more lines are too long