@singularsystems/neo-react 0.10.29 → 0.10.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/React/ReactModelCreator.js +0 -1
- package/dist/React/ReactModelCreator.js.map +1 -1
- package/dist/ReactComponents/Card.d.ts +8 -0
- package/dist/ReactComponents/Card.js +33 -8
- package/dist/ReactComponents/Card.js.map +1 -1
- package/dist/ReactComponents/DropDown/DropDownBase.js +6 -0
- package/dist/ReactComponents/DropDown/DropDownBase.js.map +1 -1
- package/dist/ReactComponents/Grid/Row.d.ts +11 -2
- package/dist/ReactComponents/Grid/Row.js +11 -5
- package/dist/ReactComponents/Grid/Row.js.map +1 -1
- package/dist/ReactComponents/Modal/ModalPortal.d.ts +1 -1
- package/dist/ReactComponents/NumberInput.d.ts +3 -1
- package/dist/ReactComponents/NumberInput.js +75 -40
- package/dist/ReactComponents/NumberInput.js.map +1 -1
- package/dist/ReactComponents/PropTypes.js +3 -2
- package/dist/ReactComponents/PropTypes.js.map +1 -1
- package/dist/ReactComponents/RadioList.js +6 -0
- package/dist/ReactComponents/RadioList.js.map +1 -1
- package/dist/Views/ViewBase.d.ts +1 -0
- package/dist/Views/ViewBase.js.map +1 -1
- package/dist/Views/ViewModelBase.d.ts +1 -0
- package/dist/Views/ViewModelBase.js.map +1 -1
- package/package.json +3 -2
- package/styles/Card.scss +24 -0
- package/styles/Neo.scss +1 -0
- package/styles/Validation.scss +0 -2
|
@@ -89,7 +89,6 @@ var ReactModelCreator = /** @class */ (function (_super) {
|
|
|
89
89
|
if (typeof onChange.newValue === "string") {
|
|
90
90
|
throw "Error: tried to assign a string to a date property.";
|
|
91
91
|
}
|
|
92
|
-
propertyInstance.sortValue = onChange.newValue ? onChange.newValue.getTime() : 0;
|
|
93
92
|
}
|
|
94
93
|
}
|
|
95
94
|
observable.previousValue = observable.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReactModelCreator.js","sourceRoot":"","sources":["../../src/React/ReactModelCreator.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAe,MAAM,MAAM,CAAA;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAS,UAAU,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uDAAuD,CAAC;AACzF,OAAO,gBAAgB,MAAM,uDAAuD,CAAC;AASrF,IAAM,kBAAkB,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAC;AAEvD;IAAuC,qCAAgB;IAAvD;;
|
|
1
|
+
{"version":3,"file":"ReactModelCreator.js","sourceRoot":"","sources":["../../src/React/ReactModelCreator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
+
import { Model } from '@singularsystems/neo-core';
|
|
2
3
|
interface ICardProps {
|
|
3
4
|
/** Icon to show next to title in header. */
|
|
4
5
|
icon?: string;
|
|
@@ -8,8 +9,15 @@ interface ICardProps {
|
|
|
8
9
|
headerElements?: JSX.Element;
|
|
9
10
|
/** Use a custom scrollbar instead of the browser scrollbar. */
|
|
10
11
|
useCustomScrollbar?: boolean;
|
|
12
|
+
/** Causes the card to be collapsible. Adds a collapse icon to the header. */
|
|
13
|
+
collapsible?: boolean;
|
|
14
|
+
/** Causes the card to be collapsed on first render. Sets the collapsible prop to true. */
|
|
15
|
+
initiallyCollapsed?: boolean;
|
|
16
|
+
/** Allows the collapse state to be set externally. Sets the collapsible prop to true. */
|
|
17
|
+
isExpanded?: Model.IObservableValue<boolean>;
|
|
11
18
|
}
|
|
12
19
|
export default class Card extends React.Component<ICardProps & React.HTMLProps<HTMLDivElement>> {
|
|
20
|
+
private expandState;
|
|
13
21
|
render(): JSX.Element;
|
|
14
22
|
}
|
|
15
23
|
export {};
|
|
@@ -1,25 +1,50 @@
|
|
|
1
1
|
import { __assign, __decorate, __extends, __rest } from "tslib";
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import { Utils } from '@singularsystems/neo-core';
|
|
3
|
+
import { Model, Utils } from '@singularsystems/neo-core';
|
|
4
4
|
import { observer } from 'mobx-react';
|
|
5
5
|
import Scrollbar from 'react-custom-scrollbars';
|
|
6
|
+
import Collapsable from './Collapsable';
|
|
6
7
|
var Card = /** @class */ (function (_super) {
|
|
7
8
|
__extends(Card, _super);
|
|
8
9
|
function Card() {
|
|
9
|
-
|
|
10
|
+
var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
11
|
+
_this.expandState = new Model.ObservableValue(_this.props.initiallyCollapsed === undefined ? true : !_this.props.initiallyCollapsed);
|
|
12
|
+
return _this;
|
|
10
13
|
}
|
|
11
14
|
Card.prototype.render = function () {
|
|
12
|
-
var _a = this.props, icon = _a.icon, title = _a.title, children = _a.children, headerElements = _a.headerElements, useCustomScrollbar = _a.useCustomScrollbar, domProps = __rest(_a, ["icon", "title", "children", "headerElements", "useCustomScrollbar"]);
|
|
15
|
+
var _a = this.props, icon = _a.icon, title = _a.title, children = _a.children, headerElements = _a.headerElements, useCustomScrollbar = _a.useCustomScrollbar, collapsible = _a.collapsible, initiallyCollapsed = _a.initiallyCollapsed, isExpanded = _a.isExpanded, domProps = __rest(_a, ["icon", "title", "children", "headerElements", "useCustomScrollbar", "collapsible", "initiallyCollapsed", "isExpanded"]);
|
|
13
16
|
var className = Utils.joinWithSpaces("neo-card card", domProps.className);
|
|
17
|
+
var isCollapsible = collapsible || isExpanded !== undefined || initiallyCollapsed !== undefined;
|
|
18
|
+
var expandState = (isExpanded !== null && isExpanded !== void 0 ? isExpanded : this.expandState);
|
|
19
|
+
if (isCollapsible) {
|
|
20
|
+
var expandIndicator = React.createElement("i", { onClick: function () { return expandState.value = !expandState.value; }, className: "card-expand-indicator fa fa-fw fa-angle-" + (expandState.value ? "up" : "down") });
|
|
21
|
+
if (headerElements) {
|
|
22
|
+
headerElements = React.createElement(React.Fragment, null,
|
|
23
|
+
headerElements,
|
|
24
|
+
expandIndicator);
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
headerElements = expandIndicator;
|
|
28
|
+
}
|
|
29
|
+
if (!expandState.value) {
|
|
30
|
+
className += " collapsed";
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
var body = React.createElement("div", { className: "card-body" },
|
|
34
|
+
useCustomScrollbar && React.createElement(Scrollbar, null, children),
|
|
35
|
+
!useCustomScrollbar && children);
|
|
36
|
+
if (isCollapsible) {
|
|
37
|
+
body =
|
|
38
|
+
React.createElement(Collapsable, { show: expandState.value }, body);
|
|
39
|
+
}
|
|
14
40
|
return (React.createElement("div", __assign({}, domProps, { className: className }),
|
|
15
41
|
(icon || title) &&
|
|
16
42
|
React.createElement("div", { className: "card-header" },
|
|
17
|
-
|
|
18
|
-
|
|
43
|
+
React.createElement("div", { className: "card-header-title" },
|
|
44
|
+
icon && React.createElement("i", { className: Utils.getFontAwesomeClass(icon) }),
|
|
45
|
+
React.createElement("span", null, title)),
|
|
19
46
|
headerElements && React.createElement("div", { className: "card-header-right-section" }, headerElements)),
|
|
20
|
-
|
|
21
|
-
useCustomScrollbar && React.createElement(Scrollbar, null, children),
|
|
22
|
-
!useCustomScrollbar && children)));
|
|
47
|
+
body));
|
|
23
48
|
};
|
|
24
49
|
Card = __decorate([
|
|
25
50
|
observer
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Card.js","sourceRoot":"","sources":["../../src/ReactComponents/Card.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"Card.js","sourceRoot":"","sources":["../../src/ReactComponents/Card.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,WAAW,MAAM,eAAe,CAAC;AA0BxC;IAAkC,wBAA6D;IAA/F;QAAA,qEAsDC;QApDW,iBAAW,GAAG,IAAI,KAAK,CAAC,eAAe,CAAC,KAAI,CAAC,KAAK,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;;IAoDzI,CAAC;IAlDG,qBAAM,GAAN;QACI,IAAI,eAAoI,EAAlI,cAAI,EAAE,gBAAK,EAAE,sBAAQ,EAAE,kCAAc,EAAE,0CAAkB,EAAE,4BAAW,EAAE,0CAAkB,EAAE,0BAAU,EAAE,+IAA0B,CAAC;QAEzI,IAAI,SAAS,GAAG,KAAK,CAAC,cAAc,CAAC,eAAe,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE1E,IAAM,aAAa,GAAG,WAAW,IAAI,UAAU,KAAK,SAAS,IAAI,kBAAkB,KAAK,SAAS,CAAC;QAClG,IAAM,WAAW,IAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,CAAC,WAAW,CAAA,CAAC;QAEnD,IAAI,aAAa,EAAE;YACf,IAAM,eAAe,GAAG,2BAAG,OAAO,EAAE,cAAM,OAAA,WAAW,CAAC,KAAK,GAAG,CAAC,WAAW,CAAC,KAAK,EAAtC,CAAsC,EAAE,SAAS,EAAE,8CAA2C,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAE,GAAI,CAAA;YAC/K,IAAI,cAAc,EAAE;gBAChB,cAAc,GAAG;oBAAG,cAAc;oBAAE,eAAe,CAAI,CAAA;aAC1D;iBAAM;gBACH,cAAc,GAAG,eAAe,CAAC;aACpC;YACD,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE;gBACpB,SAAS,IAAI,YAAY,CAAA;aAC5B;SACJ;QAED,IAAI,IAAI,GACJ,6BAAK,SAAS,EAAC,WAAW;YACrB,kBAAkB,IAAI,oBAAC,SAAS,QAAE,QAAQ,CAAa;YACvD,CAAC,kBAAkB,IAAI,QAAQ,CAC9B,CAAA;QAEV,IAAI,aAAa,EAAE;YACf,IAAI;gBACJ,oBAAC,WAAW,IAAC,IAAI,EAAE,WAAW,CAAC,KAAK,IAC/B,IAAI,CACK,CAAA;SACjB;QAED,OAAO,CACH,wCAAS,QAAQ,IAAE,SAAS,EAAE,SAAS;YAElC,CAAC,IAAI,IAAI,KAAK,CAAC;gBAChB,6BAAK,SAAS,EAAC,aAAa;oBACxB,6BAAK,SAAS,EAAC,mBAAmB;wBAC7B,IAAI,IAAI,2BAAG,SAAS,EAAE,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,GAAI;wBAC1D,kCAAO,KAAK,CAAQ,CAClB;oBAEL,cAAc,IAAI,6BAAK,SAAS,EAAC,2BAA2B,IAAE,cAAc,CAAO,CAClF;YAEL,IAAI,CACH,CACT,CAAA;IACL,CAAC;IArDgB,IAAI;QADxB,QAAQ;OACY,IAAI,CAsDxB;IAAD,WAAC;CAAA,AAtDD,CAAkC,KAAK,CAAC,SAAS,GAsDhD;eAtDoB,IAAI"}
|
|
@@ -13,6 +13,12 @@ var DropDownBase = /** @class */ (function (_super) {
|
|
|
13
13
|
}
|
|
14
14
|
DropDownBase.prototype.findMembers = function (item) {
|
|
15
15
|
if (!this.valueMember || !this.displayMember) {
|
|
16
|
+
if (!this.displayMember) {
|
|
17
|
+
var neoTypeInfo = item.constructor.neo;
|
|
18
|
+
if (neoTypeInfo && neoTypeInfo.displayMember) {
|
|
19
|
+
this.displayMember = neoTypeInfo.displayMember.propertyName;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
16
22
|
for (var propName in item) {
|
|
17
23
|
if (this.valueMember && this.displayMember)
|
|
18
24
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DropDownBase.js","sourceRoot":"","sources":["../../../src/ReactComponents/DropDown/DropDownBase.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAI7C;IAAsD,gCAAqB;IAA3E;QAAA,
|
|
1
|
+
{"version":3,"file":"DropDownBase.js","sourceRoot":"","sources":["../../../src/ReactComponents/DropDown/DropDownBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,11 +34,20 @@ export default class Row<TData> extends ComponentBase<IRowProps> {
|
|
|
34
34
|
onExpandClick(): void;
|
|
35
35
|
render(): false | JSX.Element;
|
|
36
36
|
}
|
|
37
|
-
interface INeoChildRowProps extends
|
|
37
|
+
interface INeoChildRowProps extends React.HTMLProps<HTMLTableRowElement> {
|
|
38
38
|
/**
|
|
39
39
|
* Overrides the value of the isExpanded property, or allows you to control the expansion of the child row manually.
|
|
40
40
|
*/
|
|
41
41
|
isExpanded?: boolean;
|
|
42
|
+
/**
|
|
43
|
+
* By default, the expand column will cause the child row to be indented.
|
|
44
|
+
* Setting this to true will make the child row take the full width of the table.
|
|
45
|
+
*/
|
|
46
|
+
isFullWidth?: boolean;
|
|
47
|
+
/**
|
|
48
|
+
* Props to apply to the inner child cell.
|
|
49
|
+
*/
|
|
50
|
+
childCellProps?: React.HTMLProps<HTMLTableCellElement>;
|
|
42
51
|
}
|
|
43
52
|
export declare class ChildRow extends ComponentBase<INeoChildRowProps> {
|
|
44
53
|
static contextType: React.Context<import("./Grid").GridContextParams<unknown>>;
|
|
@@ -54,7 +63,7 @@ export declare class ChildRow extends ComponentBase<INeoChildRowProps> {
|
|
|
54
63
|
protected afterRender(isInitial: boolean): void;
|
|
55
64
|
private afterTransition;
|
|
56
65
|
private setHeight;
|
|
57
|
-
render(): JSX.Element;
|
|
66
|
+
render(): false | JSX.Element | undefined;
|
|
58
67
|
}
|
|
59
68
|
interface INeoRowGroupProps {
|
|
60
69
|
/**
|
|
@@ -2,7 +2,7 @@ import { __assign, __decorate, __extends, __metadata, __rest } from "tslib";
|
|
|
2
2
|
import * as React from 'react';
|
|
3
3
|
import { observer } from 'mobx-react';
|
|
4
4
|
import { GridContext } from './Grid';
|
|
5
|
-
import { Misc, Components } from '@singularsystems/neo-core';
|
|
5
|
+
import { Misc, Components, Utils } from '@singularsystems/neo-core';
|
|
6
6
|
import Column from './Column';
|
|
7
7
|
import NeoButton from '../Button';
|
|
8
8
|
import { StateObserver } from '../StateObserver';
|
|
@@ -155,7 +155,8 @@ var ChildRow = /** @class */ (function (_super) {
|
|
|
155
155
|
ChildRow.prototype.render = function () {
|
|
156
156
|
var _a;
|
|
157
157
|
this.onRender();
|
|
158
|
-
var
|
|
158
|
+
var _b = this.props, isExpanded = _b.isExpanded, isFullWidth = _b.isFullWidth, childCellProps = _b.childCellProps, domProps = __rest(_b, ["isExpanded", "isFullWidth", "childCellProps"]);
|
|
159
|
+
isExpanded = this.inBody && (_a = this.context.expandAll, (_a !== null && _a !== void 0 ? _a : this.isExpanded));
|
|
159
160
|
if (this.context.expandAll !== undefined) {
|
|
160
161
|
// Prevent animation on whole table expand change.
|
|
161
162
|
this.wasExpanded = false;
|
|
@@ -163,12 +164,17 @@ var ChildRow = /** @class */ (function (_super) {
|
|
|
163
164
|
else if (isExpanded) {
|
|
164
165
|
this.wasExpanded = true;
|
|
165
166
|
}
|
|
166
|
-
|
|
167
|
+
domProps.className = Utils.joinWithSpaces(domProps.className, "neo-child-row");
|
|
168
|
+
if (childCellProps === undefined) {
|
|
169
|
+
childCellProps = {};
|
|
170
|
+
}
|
|
171
|
+
childCellProps.className = Utils.joinWithSpaces(childCellProps.className, "neo-child-row-cell");
|
|
172
|
+
var showExpandButtonColumn = this.context.expandProperty && this.context.expandAll === undefined && !this.props.isFullWidth;
|
|
167
173
|
var colSpan = this.context.columnCount + (showExpandButtonColumn ? 0 : 1);
|
|
168
174
|
return (this.inBody && (isExpanded || this.wasExpanded) &&
|
|
169
|
-
React.createElement("tr", {
|
|
175
|
+
React.createElement("tr", __assign({}, domProps),
|
|
170
176
|
showExpandButtonColumn && React.createElement("td", null),
|
|
171
|
-
React.createElement("td", { colSpan: colSpan
|
|
177
|
+
React.createElement("td", __assign({}, childCellProps, { colSpan: colSpan }),
|
|
172
178
|
React.createElement("div", { ref: this.containerDiv, className: "neo-child-row-container" }, this.props.children))));
|
|
173
179
|
};
|
|
174
180
|
ChildRow.contextType = GridContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Row.js","sourceRoot":"","sources":["../../../src/ReactComponents/Grid/Row.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,WAAW,EAAe,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAS,IAAI,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"Row.js","sourceRoot":"","sources":["../../../src/ReactComponents/Grid/Row.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { IModalOptionsBase } from '
|
|
2
|
+
import { IModalOptionsBase } from '@singularsystems/neo-core/dist/Components/Modal/ModalOptions';
|
|
3
3
|
export interface IModalPortalProps {
|
|
4
4
|
show: boolean;
|
|
5
5
|
onDismiss: (e: any) => void;
|
|
@@ -2,6 +2,7 @@ import * as React from 'react';
|
|
|
2
2
|
import { IBindableEditorProps } from './PropTypes';
|
|
3
3
|
import { FormContext } from './FormContext';
|
|
4
4
|
import { Misc } from '@singularsystems/neo-core';
|
|
5
|
+
import Decimal from 'decimal.js-light';
|
|
5
6
|
import ComponentBase from './ComponentBase';
|
|
6
7
|
export interface INumberInputSpecificProps {
|
|
7
8
|
/** Format string of number */
|
|
@@ -25,7 +26,7 @@ export declare class FormatState {
|
|
|
25
26
|
zeroText?: string | undefined;
|
|
26
27
|
constructor(isPercent: boolean, hasExternalPercentSymbol: boolean, formatString: string, zeroText?: string | undefined);
|
|
27
28
|
static create(numericType: Misc.DataType, numProps?: INumberInputSpecificProps, appendText?: string): FormatState;
|
|
28
|
-
getFormattedValue(value?: number): string;
|
|
29
|
+
getFormattedValue(value?: number | Decimal | null): string;
|
|
29
30
|
}
|
|
30
31
|
export default class NumberInput extends ComponentBase<INumberInputProps> {
|
|
31
32
|
static contextType: React.Context<import("./FormContext").FormContextParams>;
|
|
@@ -39,6 +40,7 @@ export default class NumberInput extends ComponentBase<INumberInputProps> {
|
|
|
39
40
|
constructor(props: INumberInputProps);
|
|
40
41
|
private onChanged;
|
|
41
42
|
private onFocus;
|
|
43
|
+
private getBindValueAsNumber;
|
|
42
44
|
private setFocusedText;
|
|
43
45
|
private onBlur;
|
|
44
46
|
private onKeyDown;
|
|
@@ -3,6 +3,7 @@ import * as React from 'react';
|
|
|
3
3
|
import { BindPropsHelper } from './PropTypes';
|
|
4
4
|
import { FormContext } from './FormContext';
|
|
5
5
|
import { Misc, NumberUtils, Utils } from '@singularsystems/neo-core';
|
|
6
|
+
import Decimal from 'decimal.js-light';
|
|
6
7
|
import { InputHelpers } from './InputHelpers';
|
|
7
8
|
import { observer } from 'mobx-react';
|
|
8
9
|
import memoize from 'memoize-one';
|
|
@@ -24,9 +25,10 @@ var FormatState = /** @class */ (function () {
|
|
|
24
25
|
formatString = NumberUtils.getFormatString(numProps.format, numProps.currencySymbol);
|
|
25
26
|
}
|
|
26
27
|
else {
|
|
28
|
+
var hasDecimals = numericType === Misc.DataType.Float || numericType === Misc.DataType.Decimal;
|
|
27
29
|
var format = ((_a = numProps) === null || _a === void 0 ? void 0 : _a.currencySymbol) ?
|
|
28
|
-
(
|
|
29
|
-
(
|
|
30
|
+
(hasDecimals ? Misc.NumberFormat.CurrencyDecimals : Misc.NumberFormat.CurrencyNoDecimals) :
|
|
31
|
+
(hasDecimals ? Misc.NumberFormat.Decimals : Misc.NumberFormat.NoDecimals);
|
|
30
32
|
formatString = NumberUtils.getFormatString(format, (_b = numProps) === null || _b === void 0 ? void 0 : _b.currencySymbol);
|
|
31
33
|
}
|
|
32
34
|
}
|
|
@@ -43,6 +45,9 @@ var FormatState = /** @class */ (function () {
|
|
|
43
45
|
return this.zeroText;
|
|
44
46
|
}
|
|
45
47
|
if (value !== undefined && value !== null) {
|
|
48
|
+
if (value instanceof Decimal) {
|
|
49
|
+
value = value.toNumber();
|
|
50
|
+
}
|
|
46
51
|
if (typeof value === "number") {
|
|
47
52
|
if (this.hasExternalPercentSymbol) {
|
|
48
53
|
value *= 100;
|
|
@@ -77,23 +82,35 @@ var NumberInput = /** @class */ (function (_super) {
|
|
|
77
82
|
}
|
|
78
83
|
NumberInput.prototype.onChanged = function (e) {
|
|
79
84
|
var newValue;
|
|
85
|
+
if (e.target.value !== "" && isNaN(parseFloat(e.target.value))) {
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
80
88
|
if (e.target.value == "") {
|
|
81
|
-
newValue = this.props.bind.propertyInfo.allowNulls ? null : 0;
|
|
89
|
+
newValue = this.props.bind.propertyInfo.allowNulls ? null : new Decimal(0);
|
|
82
90
|
}
|
|
83
91
|
else if (this.formatState.isPercent && NumberUtils.transformPercent) {
|
|
84
|
-
newValue =
|
|
92
|
+
newValue = new Decimal(e.target.value).dividedBy(100);
|
|
85
93
|
}
|
|
86
|
-
else if (this.numericType
|
|
87
|
-
newValue =
|
|
94
|
+
else if (this.numericType === Misc.DataType.Float || this.numericType === Misc.DataType.Decimal) {
|
|
95
|
+
newValue = new Decimal(e.target.value);
|
|
88
96
|
}
|
|
89
97
|
else {
|
|
90
|
-
|
|
98
|
+
// Rounds to zero.
|
|
99
|
+
newValue = new Decimal(e.target.value).toDecimalPlaces(0, Decimal.ROUND_DOWN);
|
|
100
|
+
}
|
|
101
|
+
if (newValue === null) {
|
|
102
|
+
this.props.bind.value = newValue;
|
|
91
103
|
}
|
|
92
|
-
|
|
93
|
-
if (
|
|
104
|
+
else {
|
|
105
|
+
if (!this.props.numProps || this.props.numProps.autoRound !== false) {
|
|
94
106
|
newValue = NumberUtils.roundUsingFormat(newValue, this.formatState.formatString, this.formatState.hasExternalPercentSymbol);
|
|
95
107
|
}
|
|
96
|
-
this.
|
|
108
|
+
if (this.numericType === Misc.DataType.Decimal) {
|
|
109
|
+
this.props.bind.value = newValue;
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
this.props.bind.value = newValue.toNumber();
|
|
113
|
+
}
|
|
97
114
|
}
|
|
98
115
|
};
|
|
99
116
|
NumberInput.prototype.onFocus = function () {
|
|
@@ -103,12 +120,21 @@ var NumberInput = /** @class */ (function (_super) {
|
|
|
103
120
|
element.select();
|
|
104
121
|
}
|
|
105
122
|
};
|
|
123
|
+
NumberInput.prototype.getBindValueAsNumber = function () {
|
|
124
|
+
var propertyValue = this.props.bind.value;
|
|
125
|
+
if (propertyValue instanceof Decimal) {
|
|
126
|
+
return propertyValue.toNumber();
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
return propertyValue;
|
|
130
|
+
}
|
|
131
|
+
};
|
|
106
132
|
NumberInput.prototype.setFocusedText = function (element) {
|
|
107
133
|
this.hasFocus = true;
|
|
108
|
-
var
|
|
134
|
+
var numberValue = this.getBindValueAsNumber();
|
|
109
135
|
var stringValue;
|
|
110
|
-
if (!
|
|
111
|
-
if ((this.props.bind.propertyInfo.allowNulls || element.readOnly) &&
|
|
136
|
+
if (!numberValue) {
|
|
137
|
+
if ((this.props.bind.propertyInfo.allowNulls || element.readOnly) && numberValue === 0) {
|
|
112
138
|
stringValue = "0";
|
|
113
139
|
}
|
|
114
140
|
else {
|
|
@@ -117,13 +143,13 @@ var NumberInput = /** @class */ (function (_super) {
|
|
|
117
143
|
}
|
|
118
144
|
else {
|
|
119
145
|
if (element.readOnly || !this.props.numProps || this.props.numProps.autoRound !== false) {
|
|
120
|
-
stringValue = NumberUtils.formatRaw(
|
|
146
|
+
stringValue = NumberUtils.formatRaw(numberValue, this.formatState.formatString, this.formatState.hasExternalPercentSymbol);
|
|
121
147
|
}
|
|
122
148
|
else {
|
|
123
149
|
if (this.formatState.isPercent && NumberUtils.transformPercent) {
|
|
124
|
-
|
|
150
|
+
numberValue *= 100;
|
|
125
151
|
}
|
|
126
|
-
stringValue =
|
|
152
|
+
stringValue = numberValue.toString();
|
|
127
153
|
}
|
|
128
154
|
}
|
|
129
155
|
element.value = stringValue;
|
|
@@ -137,31 +163,40 @@ var NumberInput = /** @class */ (function (_super) {
|
|
|
137
163
|
NumberInput.prototype.onKeyDown = function (e) {
|
|
138
164
|
var element = this.inputElement.current;
|
|
139
165
|
if (!this.isReadOnly && element && (e.keyCode === 38 || e.keyCode === 40)) {
|
|
140
|
-
var
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
decimalIndex = element.value.indexOf("
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
166
|
+
var value = this.getBindValueAsNumber();
|
|
167
|
+
if (value !== null) {
|
|
168
|
+
var selectionIndex = element.selectionEnd;
|
|
169
|
+
var deltaValue = 1;
|
|
170
|
+
var decimalIndex = element.value.indexOf(".");
|
|
171
|
+
if (decimalIndex < 0) {
|
|
172
|
+
decimalIndex = element.value.indexOf(",");
|
|
173
|
+
}
|
|
174
|
+
if (decimalIndex > 0 && selectionIndex && selectionIndex > decimalIndex) {
|
|
175
|
+
deltaValue = 0.01;
|
|
176
|
+
}
|
|
177
|
+
if (this.formatState.isPercent && NumberUtils.transformPercent) {
|
|
178
|
+
deltaValue /= 100;
|
|
179
|
+
}
|
|
180
|
+
if (e.keyCode === 38) {
|
|
181
|
+
// Up
|
|
182
|
+
value += deltaValue;
|
|
183
|
+
}
|
|
184
|
+
else if (e.keyCode === 40) {
|
|
185
|
+
// Down
|
|
186
|
+
value -= deltaValue;
|
|
187
|
+
}
|
|
188
|
+
if (this.numericType === Misc.DataType.Decimal) {
|
|
189
|
+
this.props.bind.value = new Decimal(value);
|
|
190
|
+
}
|
|
191
|
+
else {
|
|
192
|
+
this.props.bind.value = value;
|
|
193
|
+
}
|
|
194
|
+
this.setFocusedText(element);
|
|
195
|
+
if (selectionIndex !== null) {
|
|
196
|
+
element.selectionStart = element.selectionEnd = selectionIndex;
|
|
197
|
+
}
|
|
198
|
+
e.preventDefault();
|
|
163
199
|
}
|
|
164
|
-
e.preventDefault();
|
|
165
200
|
}
|
|
166
201
|
};
|
|
167
202
|
NumberInput.prototype.componentDidMount = function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NumberInput.js","sourceRoot":"","sources":["../../src/ReactComponents/NumberInput.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAwB,eAAe,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAuB5C;IAEI,qBAAmB,SAAkB,EAAS,wBAAiC,EAAS,YAAoB,EAAS,QAAiB;QAAnH,cAAS,GAAT,SAAS,CAAS;QAAS,6BAAwB,GAAxB,wBAAwB,CAAS;QAAS,iBAAY,GAAZ,YAAY,CAAQ;QAAS,aAAQ,GAAR,QAAQ,CAAS;IAEtI,CAAC;IAEa,kBAAM,GAApB,UAAsB,WAA0B,EAAE,QAAoC,EAAE,UAAmB;;QACvG,IAAI,SAAS,GAAG,KAAK,CAAC;QACtB,IAAI,wBAAwB,GAAG,KAAK,CAAC;QACrC,IAAI,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;QAEzD,IAAI,CAAC,YAAY,EAAE;YACf,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,EAAE;gBAC7B,YAAY,GAAG,WAAW,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAC;aACxF;iBAAM;gBACH,IAAM,
|
|
1
|
+
{"version":3,"file":"NumberInput.js","sourceRoot":"","sources":["../../src/ReactComponents/NumberInput.tsx"],"names":[],"mappings":"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"}
|
|
@@ -57,13 +57,14 @@ var BindPropsHelper = /** @class */ (function () {
|
|
|
57
57
|
}
|
|
58
58
|
};
|
|
59
59
|
BindPropsHelper.getControlType = function (props) {
|
|
60
|
-
|
|
60
|
+
var propertyInfo = props.bind.propertyInfo;
|
|
61
|
+
if (props.dateProps || propertyInfo.propertyType === DataType.Date) {
|
|
61
62
|
return ControlType.Date;
|
|
62
63
|
}
|
|
63
64
|
else if (props.select) {
|
|
64
65
|
return ControlType.DropDown;
|
|
65
66
|
}
|
|
66
|
-
else if (props.numProps ||
|
|
67
|
+
else if (props.numProps || propertyInfo.propertyType === Misc.DataType.Float || propertyInfo.propertyType === Misc.DataType.Int || propertyInfo.propertyType === Misc.DataType.Decimal) {
|
|
67
68
|
return ControlType.Number;
|
|
68
69
|
}
|
|
69
70
|
else if (props.fileProps) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PropTypes.js","sourceRoot":"","sources":["../../src/ReactComponents/PropTypes.ts"],"names":[],"mappings":";AAAA,OAAO,EAAS,IAAI,EAAc,WAAW,EAAa,MAAM,2BAA2B,CAAC;AAE5F,OAAO,QAAoC,MAAM,qBAAqB,CAAC;AACvE,OAAO,WAA0C,MAAM,eAAe,CAAC;AACvE,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,SAAsC,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAIrE,OAAO,SAA+B,MAAM,yBAAyB,CAAC;AAKtE,MAAM,CAAN,IAAY,WAOX;AAPD,WAAY,WAAW;IACnB,6CAAI,CAAA;IACJ,iDAAM,CAAA;IACN,qDAAQ,CAAA;IACR,6CAAI,CAAA;IACJ,6CAAI,CAAA;IACJ,uDAAS,CAAA;AACb,CAAC,EAPW,WAAW,KAAX,WAAW,QAOtB;AAED,MAAM,CAAN,IAAY,YAIX;AAJD,WAAY,YAAY;IACpB,+CAAQ,CAAA;IACR,uDAAY,CAAA;IACZ,mDAAU,CAAA;AACd,CAAC,EAJW,YAAY,KAAZ,YAAY,QAIvB;AAmID;IAAA;
|
|
1
|
+
{"version":3,"file":"PropTypes.js","sourceRoot":"","sources":["../../src/ReactComponents/PropTypes.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,12 @@ var RadioList = /** @class */ (function (_super) {
|
|
|
27
27
|
if (list.length) {
|
|
28
28
|
var valueMember_1 = (_a = this.props.radioList.valueMember, (_a !== null && _a !== void 0 ? _a : ""));
|
|
29
29
|
var displayMember_1 = (_b = this.props.radioList.displayMember, (_b !== null && _b !== void 0 ? _b : ""));
|
|
30
|
+
if (!displayMember_1) {
|
|
31
|
+
var neoTypeInfo = list[0].constructor.neo;
|
|
32
|
+
if (neoTypeInfo && neoTypeInfo.displayMember) {
|
|
33
|
+
displayMember_1 = neoTypeInfo.displayMember.propertyName;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
30
36
|
for (var propName in list[0]) {
|
|
31
37
|
if (valueMember_1 && displayMember_1)
|
|
32
38
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RadioList.js","sourceRoot":"","sources":["../../src/ReactComponents/RadioList.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"RadioList.js","sourceRoot":"","sources":["../../src/ReactComponents/RadioList.tsx"],"names":[],"mappings":"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"}
|
package/dist/Views/ViewBase.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ import { BreadCrumbItem } from '../Routing/BreadCrumbItem';
|
|
|
8
8
|
import { IViewModel } from './IViewModel';
|
|
9
9
|
import EmptyViewModel from './EmptyViewModel';
|
|
10
10
|
import { IRouteChangedProps } from '../Routing/IRouteChangedProps';
|
|
11
|
+
import { valueOrLazy } from './ViewModelBase';
|
|
11
12
|
export interface IViewBase extends Views.IViewBase {
|
|
12
13
|
viewParams: IViewParameterList;
|
|
13
14
|
updateViewParams(match: match): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewBase.js","sourceRoot":"","sources":["../../src/Views/ViewBase.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,IAAI,EAA+B,MAAM,2BAA2B,CAAC;AAE9E,OAAO,EAAuB,iBAAiB,EAAyE,MAAM,8BAA8B,CAAC;AAE7J,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAG3D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,
|
|
1
|
+
{"version":3,"file":"ViewBase.js","sourceRoot":"","sources":["../../src/Views/ViewBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { IReactionDisposer } from 'mobx';
|
|
|
4
4
|
import { BindableBase } from '@singularsystems/neo-core/dist/Model/BindableBase';
|
|
5
5
|
import { AxiosPromise } from 'axios';
|
|
6
6
|
import { WaitForTaskRunnerOptions } from '@singularsystems/neo-core/dist/Components/TaskRunner/TaskRunner';
|
|
7
|
+
export declare type valueOrLazy<T> = T | (() => T) | (new () => T);
|
|
7
8
|
export default abstract class ViewModelBase extends ModelBase implements IViewModel {
|
|
8
9
|
taskRunner: ITaskRunner;
|
|
9
10
|
private disposeHelper;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ViewModelBase.js","sourceRoot":"","sources":["../../src/Views/ViewModelBase.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAsB,MAAM,2BAA2B,CAAC;AAGhF,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"ViewModelBase.js","sourceRoot":"","sources":["../../src/Views/ViewModelBase.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@singularsystems/neo-react",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.33",
|
|
4
4
|
"description": "React application logic and components for the Neo client library",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -32,8 +32,9 @@
|
|
|
32
32
|
"@types/rc-slider": "^8.6.5",
|
|
33
33
|
"@types/react-color": "^3.0.1",
|
|
34
34
|
"@types/react-select": "3.1.0",
|
|
35
|
-
"@singularsystems/neo-core": "^0.10.
|
|
35
|
+
"@singularsystems/neo-core": "^0.10.42",
|
|
36
36
|
"axios": "^0.21.1",
|
|
37
|
+
"decimal.js-light": "2.5.1",
|
|
37
38
|
"history": "4.10.1",
|
|
38
39
|
"inversify": "5.0.1",
|
|
39
40
|
"memoize-one": "5.0.4",
|
package/styles/Card.scss
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
.neo-card.card {
|
|
2
|
+
.card-header {
|
|
3
|
+
display: flex;
|
|
4
|
+
justify-content: space-between;
|
|
5
|
+
align-items: center;
|
|
6
|
+
|
|
7
|
+
.card-header-title i {
|
|
8
|
+
margin-right: 10px;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
.card-header-right-section {
|
|
12
|
+
display: inline-flex;
|
|
13
|
+
align-items: center;
|
|
14
|
+
margin: -10px 0;
|
|
15
|
+
|
|
16
|
+
.card-expand-indicator {
|
|
17
|
+
cursor: pointer;
|
|
18
|
+
margin-left: 0.5rem;
|
|
19
|
+
padding-top: 0.5rem;
|
|
20
|
+
padding-bottom: 0.5rem;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
}
|
package/styles/Neo.scss
CHANGED