aldehyde 0.1.38 → 0.1.41
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/lib/controls/entity-select/entity-select.d.ts +7 -10
- package/lib/controls/entity-select/entity-select.d.ts.map +1 -1
- package/lib/controls/entity-select/entity-select.js +40 -20
- package/lib/controls/entity-select/entity-select.js.map +1 -1
- package/lib/controls/entry-control.d.ts +1 -0
- package/lib/controls/entry-control.d.ts.map +1 -1
- package/lib/controls/entry-control.js +4 -6
- package/lib/controls/entry-control.js.map +1 -1
- package/lib/controls/input-number/index.js +4 -2
- package/lib/controls/input-number/index.js.map +1 -1
- package/lib/custom-page/custom-page-router.d.ts +3 -0
- package/lib/custom-page/custom-page-router.d.ts.map +1 -1
- package/lib/custom-page/custom-page-router.js +32 -1
- package/lib/custom-page/custom-page-router.js.map +1 -1
- package/lib/layout/menu/menu-2layers.d.ts.map +1 -1
- package/lib/layout/menu/menu-2layers.js +1 -21
- package/lib/layout/menu/menu-2layers.js.map +1 -1
- package/lib/routable/ltmpl-route.d.ts.map +1 -1
- package/lib/routable/ltmpl-route.js.map +1 -1
- package/lib/tmpl/interface.d.ts +1 -1
- package/lib/tmpl/interface.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/controls/entity-select/entity-select.tsx +47 -24
- package/src/aldehyde/controls/entry-control.tsx +5 -4
- package/src/aldehyde/controls/input-number/index.tsx +6 -6
- package/src/aldehyde/custom-page/custom-page-router.tsx +32 -1
- package/src/aldehyde/layout/menu/menu-2layers.tsx +2 -23
- package/src/aldehyde/routable/ltmpl-route.tsx +1 -0
- package/src/aldehyde/tmpl/interface.tsx +1 -1
|
@@ -1,24 +1,20 @@
|
|
|
1
1
|
/// <reference types="lodash" />
|
|
2
2
|
import * as React from 'react';
|
|
3
|
-
import { EControlProps, PageInfo,
|
|
3
|
+
import { EControlProps, PageInfo, SelectConfig } from "../../tmpl/interface";
|
|
4
4
|
import './index.css';
|
|
5
5
|
interface InnerEntitySelectProps extends EControlProps {
|
|
6
6
|
maxSelected?: number;
|
|
7
7
|
onEntityClick?: (code: string) => void;
|
|
8
|
+
baseCriteriaData: object;
|
|
8
9
|
}
|
|
9
10
|
interface InnerEntitySelectState {
|
|
10
11
|
titleId: string;
|
|
11
12
|
optionCacheKey: string;
|
|
12
13
|
pageNo: number;
|
|
13
14
|
loading: boolean;
|
|
15
|
+
optionsCache: object;
|
|
16
|
+
selectConfig: SelectConfig;
|
|
14
17
|
}
|
|
15
|
-
declare type OptionCache = {
|
|
16
|
-
queryKey: QueryKey;
|
|
17
|
-
pageInfo: PageInfo;
|
|
18
|
-
touchEnd: boolean;
|
|
19
|
-
options: any;
|
|
20
|
-
searchValue: string;
|
|
21
|
-
};
|
|
22
18
|
declare type LoadDataSource = {
|
|
23
19
|
options: any[];
|
|
24
20
|
touchEnd: boolean;
|
|
@@ -32,9 +28,10 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
32
28
|
optionCacheKey: any;
|
|
33
29
|
pageNo: number;
|
|
34
30
|
loading: boolean;
|
|
31
|
+
optionsCache: {};
|
|
32
|
+
selectConfig: any;
|
|
35
33
|
};
|
|
36
|
-
|
|
37
|
-
selectConfig: SelectConfig;
|
|
34
|
+
componentDidUpdate(prevProps: any): void;
|
|
38
35
|
toOption: (code: string, title: string, onEntityClick: any) => {
|
|
39
36
|
value: string;
|
|
40
37
|
showlabel: string | JSX.Element;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-select.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/entity-select.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAC,aAAa,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"entity-select.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/entity-select.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAuB,YAAY,EAAa,MAAM,sBAAsB,CAAC;AAG5G,OAAO,aAAa,CAAC;AAIrB,UAAU,sBAAuB,SAAQ,aAAa;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,gBAAgB,EAAC,MAAM,CAAC;CAC3B;AAED,UAAU,sBAAsB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAC,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,CAAE;IACtB,YAAY,EAAE,YAAY,CAAA;CAC7B;AAUD,aAAK,cAAc,GAAG;IAClB,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;CAErB,CAAA;AAED,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,KAAK,CAAC,aAAa,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;IAEzG,MAAM,CAAC,YAAY;;MAElB;IAED,KAAK;;;;;;;MAOJ;IAED,kBAAkB,CAAC,SAAS,KAAA;IAkB5B,QAAQ,SAAU,MAAM,SAAS,MAAM;;;;MAYtC;IAED,YAAY,2BAYX;IAED,SAAS,+CAeR;IAED,aAAa,sBAeZ;IAED,YAAY,qCA6EX;IAED,QAAQ,WAAY,GAAG,EAAE,UASxB;IAGD,QAAQ,aAAoB,MAAM,YAAY,QAAQ,WAAW,MAAM,KAAG,QAAQ,cAAc,CAAC,CAgBhG;IAED,eAAe,2DAKb;IAEF,qBAAqB,aAQpB;IAGD,MAAM;CAgDT"}
|
|
@@ -24,10 +24,14 @@ export default class EntitySelect extends React.PureComponent {
|
|
|
24
24
|
optionCacheKey: undefined,
|
|
25
25
|
pageNo: 1,
|
|
26
26
|
loading: false,
|
|
27
|
+
optionsCache: {},
|
|
28
|
+
selectConfig: undefined,
|
|
27
29
|
};
|
|
28
|
-
|
|
29
|
-
this.
|
|
30
|
-
|
|
30
|
+
// componentWillUnmount(): void {
|
|
31
|
+
// this.setState=(state,callback)=>{
|
|
32
|
+
// return
|
|
33
|
+
// }
|
|
34
|
+
// }
|
|
31
35
|
this.toOption = (code, title, onEntityClick) => {
|
|
32
36
|
let option = {
|
|
33
37
|
value: code + '@R@' + title,
|
|
@@ -68,8 +72,8 @@ export default class EntitySelect extends React.PureComponent {
|
|
|
68
72
|
return options;
|
|
69
73
|
};
|
|
70
74
|
this.fetchNextPage = () => __awaiter(this, void 0, void 0, function* () {
|
|
71
|
-
const { optionCacheKey, titleId } = this.state;
|
|
72
|
-
let optionCache =
|
|
75
|
+
const { optionCacheKey, titleId, optionsCache } = this.state;
|
|
76
|
+
let optionCache = optionsCache[optionCacheKey];
|
|
73
77
|
let pageInfo = optionCache.pageInfo;
|
|
74
78
|
if (!optionCache.touchEnd) {
|
|
75
79
|
pageInfo.pageNo = pageInfo.pageNo + 1;
|
|
@@ -84,41 +88,45 @@ export default class EntitySelect extends React.PureComponent {
|
|
|
84
88
|
}
|
|
85
89
|
});
|
|
86
90
|
this.fetchOptions = (searchText) => __awaiter(this, void 0, void 0, function* () {
|
|
87
|
-
const { fieldConfig, mainCode } = this.props;
|
|
88
|
-
this.
|
|
89
|
-
loading: true,
|
|
90
|
-
});
|
|
91
|
+
const { fieldConfig, mainCode, baseCriteriaData } = this.props;
|
|
92
|
+
const { optionsCache, selectConfig } = this.state;
|
|
91
93
|
let optionCacheKey = "withoutValue";
|
|
92
94
|
//先从缓存里拿
|
|
93
95
|
if (searchText) {
|
|
94
96
|
optionCacheKey = searchText;
|
|
95
97
|
}
|
|
96
98
|
let titleId = this.state.titleId;
|
|
97
|
-
let optionCache =
|
|
99
|
+
let optionCache = optionsCache[optionCacheKey];
|
|
98
100
|
if (!optionCache) {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
+
this.setState({
|
|
102
|
+
loading: true,
|
|
103
|
+
});
|
|
104
|
+
let selectConfig_ = selectConfig;
|
|
105
|
+
if (!selectConfig_) {
|
|
106
|
+
selectConfig_ = yield HCDataSource.requestSelectConfig(fieldConfig.id);
|
|
101
107
|
}
|
|
102
108
|
let pageInfo = {
|
|
103
109
|
pageNo: 1,
|
|
104
110
|
pageSize: 4,
|
|
105
111
|
virtualEndPageNo: undefined,
|
|
106
112
|
};
|
|
107
|
-
|
|
108
|
-
titleId = selectConfig.characteristicColumn.id;
|
|
113
|
+
titleId = selectConfig_.primaryColumn.id;
|
|
109
114
|
//得到第一个过滤条件
|
|
110
|
-
let firstCriteria =
|
|
115
|
+
let firstCriteria = selectConfig_.primaryCriteria;
|
|
111
116
|
let formItemName = 'undefinedCriteria';
|
|
112
117
|
if (firstCriteria) {
|
|
113
118
|
formItemName = 'c_' + firstCriteria.id;
|
|
114
119
|
}
|
|
115
|
-
const { defaultPageSize } =
|
|
120
|
+
const { defaultPageSize } = selectConfig_;
|
|
116
121
|
if (defaultPageSize) {
|
|
117
122
|
pageInfo.pageSize = defaultPageSize;
|
|
118
123
|
}
|
|
119
124
|
/** 构建 dataSource **/
|
|
120
125
|
//构建过滤条件
|
|
121
126
|
let criteriaData = {};
|
|
127
|
+
if (baseCriteriaData) {
|
|
128
|
+
criteriaData = Object.assign({}, baseCriteriaData);
|
|
129
|
+
}
|
|
122
130
|
criteriaData[formItemName] = searchText;
|
|
123
131
|
let queryKey = yield HcserviceV3.requestLtmplQueryKey(fieldConfig.id, Object.assign(Object.assign(Object.assign({}, criteriaData), pageInfo), { mainCode }));
|
|
124
132
|
let sourceData = yield this.loadData(queryKey.key, pageInfo, titleId);
|
|
@@ -129,10 +137,12 @@ export default class EntitySelect extends React.PureComponent {
|
|
|
129
137
|
searchValue: searchText,
|
|
130
138
|
touchEnd: sourceData.touchEnd
|
|
131
139
|
};
|
|
132
|
-
|
|
140
|
+
optionsCache[optionCacheKey] = optionCache;
|
|
133
141
|
this.setState({
|
|
134
142
|
optionCacheKey,
|
|
135
143
|
titleId,
|
|
144
|
+
optionsCache: Object.assign({}, optionsCache),
|
|
145
|
+
selectConfig: selectConfig_,
|
|
136
146
|
loading: false,
|
|
137
147
|
});
|
|
138
148
|
}
|
|
@@ -196,14 +206,24 @@ export default class EntitySelect extends React.PureComponent {
|
|
|
196
206
|
// })
|
|
197
207
|
};
|
|
198
208
|
}
|
|
209
|
+
componentDidUpdate(prevProps) {
|
|
210
|
+
const { baseCriteriaData, mainCode, fieldConfig } = this.props;
|
|
211
|
+
let { baseCriteriaData: preBaseCriteriaData, mainCode: preMainCode, fieldConfig: preFieldConfig } = prevProps;
|
|
212
|
+
if ((baseCriteriaData && JSON.stringify(baseCriteriaData) != JSON.stringify(preBaseCriteriaData)) || (mainCode && mainCode != preMainCode)
|
|
213
|
+
|| (fieldConfig && preFieldConfig && fieldConfig.id != preFieldConfig.id)) {
|
|
214
|
+
this.setState({
|
|
215
|
+
optionsCache: {}
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
}
|
|
199
219
|
render() {
|
|
200
220
|
const { id, value, fieldConfig, onChange, disabled, style, maxSelected, onEntityClick } = this.props;
|
|
201
|
-
const { optionCacheKey, loading } = this.state;
|
|
221
|
+
const { optionCacheKey, loading, optionsCache } = this.state;
|
|
202
222
|
let initOptions = this.toOptions(value, onEntityClick);
|
|
203
223
|
let exists;
|
|
204
224
|
let properOptions = [...initOptions];
|
|
205
|
-
if (optionCacheKey) {
|
|
206
|
-
for (let option of
|
|
225
|
+
if (optionCacheKey && optionsCache[optionCacheKey]) {
|
|
226
|
+
for (let option of optionsCache[optionCacheKey].options) {
|
|
207
227
|
exists = false;
|
|
208
228
|
for (let init of initOptions) {
|
|
209
229
|
if (init['value'] == option['value']) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-select.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/entity-select.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAC,MAAM,MAAM,CAAA;AAEzC,OAAO,EAAC,cAAc,EAAC,MAAM,mBAAmB,CAAC;AACjD,OAAO,QAAQ,MAAM,iBAAiB,CAAC;AACvC,OAAO,aAAa,CAAC;AACrB,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,YAAY,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"entity-select.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/entity-select.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry-control.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/controls/entry-control.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,WAAW,EAAa,MAAM,mBAAmB,CAAC;AAwC1D,UAAU,iBAAiB;IACvB,QAAQ,CAAC,EAAC,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,EAAE,CAAC,EAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"entry-control.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/controls/entry-control.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,WAAW,EAAa,MAAM,mBAAmB,CAAC;AAwC1D,UAAU,iBAAiB;IACvB,QAAQ,CAAC,EAAC,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,EAAE,CAAC,EAAC,GAAG,CAAC;IACR,gBAAgB,CAAC,EAAC,MAAM,CAAC;CAC5B;AAoND,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAG7C,CAAA;AAED,eAAe,YAAY,CAAC"}
|
|
@@ -48,7 +48,7 @@ function getOptions(mstrucId) {
|
|
|
48
48
|
}
|
|
49
49
|
return options;
|
|
50
50
|
}
|
|
51
|
-
function renderControl(id, mainCode, fieldConfig, fieldValue, onChange, width) {
|
|
51
|
+
function renderControl(id, mainCode, fieldConfig, fieldValue, onChange, width, other) {
|
|
52
52
|
let itemType = ControlTypeSupportor.getControlType(fieldConfig, fieldValue);
|
|
53
53
|
let entryControl = undefined;
|
|
54
54
|
let placeholder = !fieldConfig.disabled ? `请输入${fieldConfig.title}` : "无需输入";
|
|
@@ -59,9 +59,7 @@ function renderControl(id, mainCode, fieldConfig, fieldValue, onChange, width) {
|
|
|
59
59
|
fieldConfigM = fieldConfig.max;
|
|
60
60
|
let max = (fieldConfigM || fieldConfigM == '0') ? Units.configParamTrans(fieldConfigM) : undefined;
|
|
61
61
|
;
|
|
62
|
-
let controlProps = {
|
|
63
|
-
id, mainCode, fieldConfig, min, max, itemType, viewOrEdit, onChange, disabled, value: fieldValue, style: { minWidth: 220, width: '100%' }
|
|
64
|
-
};
|
|
62
|
+
let controlProps = Object.assign(Object.assign({}, other), { id, mainCode, fieldConfig, min, max, itemType, viewOrEdit, onChange, disabled, value: fieldValue, style: { minWidth: 220, width: '100%' } });
|
|
65
63
|
let antdControlProps = {
|
|
66
64
|
id, mainCode, placeholder, disabled, value: fieldValue, onChange, style: { minWidth: 220, width: '100%' }
|
|
67
65
|
};
|
|
@@ -198,8 +196,8 @@ function renderControl(id, mainCode, fieldConfig, fieldValue, onChange, width) {
|
|
|
198
196
|
return entryControl;
|
|
199
197
|
}
|
|
200
198
|
const EntryControl = (props) => {
|
|
201
|
-
const { fieldConfig, value, onChange, id, mainCode } = props;
|
|
202
|
-
return renderControl(id, mainCode, fieldConfig, value, onChange, null);
|
|
199
|
+
const { fieldConfig, value, onChange, id, mainCode } = props, other = __rest(props, ["fieldConfig", "value", "onChange", "id", "mainCode"]);
|
|
200
|
+
return renderControl(id, mainCode, fieldConfig, value, onChange, null, other);
|
|
203
201
|
};
|
|
204
202
|
export default EntryControl;
|
|
205
203
|
//# sourceMappingURL=entry-control.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry-control.js","sourceRoot":"","sources":["../../../../src/aldehyde/controls/entry-control.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAC,KAAK,EAAC,MAAM,EAAC,MAAM,MAAM,CAAC;AAEvE,OAAO,oBAAoB,MAAM,gCAAgC,CAAC;AAClE,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAClD,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,YAAY,MAAM,+BAA+B,CAAC;AACzD,OAAO,mBAAmB,MAAM,uCAAuC,CAAA;AACvE,OAAO,WAAW,MAAM,gBAAgB,CAAA;AACxC,OAAO,aAAa,MAAM,iCAAiC,CAAA;AAC3D,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,kEAAkE;AAClE,6CAA6C;AAC7C,MAAO,aAAa,GAAC,QAAQ,CAAC,KAAK,CAAC;AACpC,MAAM,UAAU,GAAC,KAAK,CAAC,KAAK,CAAC;AAC7B,MAAM,OAAO,GAAG,oBAAC,IAAI,IAAC,GAAG,EAAC,YAAY;IAClC,oBAAC,KAAK,IACF,OAAO,EAAC,wDAAW,EACnB,WAAW,EAAC,gLAA+B,EAC3C,IAAI,EAAC,MAAM,GACb,CACC,CAAC;AACR,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,CAC5B,MAAM,CAAC,aAAa,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAC;AAChD,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,EAAE,CAC5B,MAAM,CAAC,mBAAmB,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAC;AACtD,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,EAAE,CAC7B,MAAM,CAAC,qBAAqB,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAC;AAExD,MAAM,EAAC,QAAQ,EAAC,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"entry-control.js","sourceRoot":"","sources":["../../../../src/aldehyde/controls/entry-control.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,9 @@ import Units from "../../units";
|
|
|
4
4
|
const InputNumber = (props) => {
|
|
5
5
|
const { id, value, itemType, fieldConfig, onChange, style, min, max } = props;
|
|
6
6
|
let entryControl = undefined;
|
|
7
|
+
console.log('form value', value);
|
|
7
8
|
const changeValue = (value) => {
|
|
9
|
+
console.log('input value', value);
|
|
8
10
|
if (onChange) {
|
|
9
11
|
onChange(value);
|
|
10
12
|
}
|
|
@@ -24,7 +26,7 @@ const InputNumber = (props) => {
|
|
|
24
26
|
};
|
|
25
27
|
const changeInt = (e) => {
|
|
26
28
|
if ((e.target.value || e.target.value == 0) && !isNaN(e.target.value)) {
|
|
27
|
-
e.target.value =
|
|
29
|
+
//e.target.value = e.target.value
|
|
28
30
|
}
|
|
29
31
|
else {
|
|
30
32
|
e.target.value = null;
|
|
@@ -37,7 +39,7 @@ const InputNumber = (props) => {
|
|
|
37
39
|
};
|
|
38
40
|
switch (itemType) {
|
|
39
41
|
case 'int':
|
|
40
|
-
entryControl = React.createElement(AntdInputNumber, Object.assign({ style: Object.assign({}, style), min: min, max: max }, antdControlProps, { value: valueSingle,
|
|
42
|
+
entryControl = React.createElement(AntdInputNumber, Object.assign({ style: Object.assign({}, style), min: min, max: max, stringMode: true }, antdControlProps, { value: valueSingle, onChange: changeValue }));
|
|
41
43
|
break;
|
|
42
44
|
case 'decimal':
|
|
43
45
|
case 'float':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/input-number/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,WAAW,IAAI,eAAe,EAAC,KAAK,EAAC,MAAM,MAAM,CAAC;AAE1D,OAAO,KAAK,MAAM,aAAa,CAAC;AAMhC,MAAM,WAAW,GAA+B,CAAC,KAAK,EAAE,EAAE;IAEtD,MAAM,EAAC,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAC,KAAK,EAAC,GAAG,EAAC,GAAG,EAAC,GAAG,KAAK,CAAC;IAExE,IAAI,YAAY,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/input-number/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,9 @@ export interface CustomPageRouterStat {
|
|
|
14
14
|
* 自定义页面的路径映射
|
|
15
15
|
*/
|
|
16
16
|
declare class CustomPageRouter extends React.PureComponent<CustomPageRouterProps, CustomPageRouterStat> {
|
|
17
|
+
goBackToLtmpl: () => void;
|
|
18
|
+
getMainCode: () => any;
|
|
19
|
+
getMenuId: () => string;
|
|
17
20
|
render(): React.CElement<any, React.Component<any, any, any>>;
|
|
18
21
|
}
|
|
19
22
|
export default CustomPageRouter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-page-router.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,aAAa,EAAe,MAAM,UAAU,CAAC;AAGrD,MAAM,WAAW,qBAAsB,SAAQ,aAAa,CAAC,eAAe;CAE3E;AAED,MAAM,WAAW,oBAAoB;CAEpC;AAED;;;;;GAKG;AAQH;;GAEG;AACF,cAAM,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;IAE5F,MAAM;CAST;AAED,eAAe,gBAAgB,CAAC"}
|
|
1
|
+
{"version":3,"file":"custom-page-router.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,aAAa,EAAe,MAAM,UAAU,CAAC;AAGrD,MAAM,WAAW,qBAAsB,SAAQ,aAAa,CAAC,eAAe;CAE3E;AAED,MAAM,WAAW,oBAAoB;CAEpC;AAED;;;;;GAKG;AAQH;;GAEG;AACF,cAAM,gBAAiB,SAAQ,KAAK,CAAC,aAAa,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;IAE5F,aAAa,aASZ;IAED,WAAW,YAUV;IAED,SAAS,eAMR;IAED,MAAM;CAST;AAED,eAAe,gBAAgB,CAAC"}
|
|
@@ -20,6 +20,37 @@ import Units from "../units";
|
|
|
20
20
|
* 自定义页面的路径映射
|
|
21
21
|
*/
|
|
22
22
|
class CustomPageRouter extends React.PureComponent {
|
|
23
|
+
constructor() {
|
|
24
|
+
super(...arguments);
|
|
25
|
+
this.goBackToLtmpl = () => {
|
|
26
|
+
const { sourceId, } = this.props.match.params;
|
|
27
|
+
const { basePath } = this.props;
|
|
28
|
+
let url = `${basePath ? basePath + '/' : ""}/${sourceId}/act-table?menuId=${this.getMenuId()}`;
|
|
29
|
+
let mainCode = this.getMainCode();
|
|
30
|
+
if (mainCode) {
|
|
31
|
+
url = url + `&mainCode=${mainCode}`;
|
|
32
|
+
}
|
|
33
|
+
this.props.history.push(url);
|
|
34
|
+
};
|
|
35
|
+
this.getMainCode = () => {
|
|
36
|
+
const { location } = this.props;
|
|
37
|
+
let search = location.search;
|
|
38
|
+
let mainCode = undefined;
|
|
39
|
+
let criteriaData = Units.transQueryStrToParams(search);
|
|
40
|
+
if (search.indexOf('mainCode') > 0) {
|
|
41
|
+
criteriaData = Units.transQueryStrToParams(search);
|
|
42
|
+
mainCode = criteriaData['mainCode'];
|
|
43
|
+
}
|
|
44
|
+
return mainCode;
|
|
45
|
+
};
|
|
46
|
+
this.getMenuId = () => {
|
|
47
|
+
const { location } = this.props;
|
|
48
|
+
console.log("this.props.match.params", this.props);
|
|
49
|
+
var searchParams = new URLSearchParams(location.search);
|
|
50
|
+
let menuId = searchParams.get('menuId');
|
|
51
|
+
return menuId;
|
|
52
|
+
};
|
|
53
|
+
}
|
|
23
54
|
render() {
|
|
24
55
|
// console.log("CustomPageRouter",this.props);
|
|
25
56
|
let pageName = this.props.match.params.pageName;
|
|
@@ -27,7 +58,7 @@ class CustomPageRouter extends React.PureComponent {
|
|
|
27
58
|
let criteriaData = Units.transQueryStrToParams(search);
|
|
28
59
|
let Page = ProgramConfig.getCustomPage("/" + pageName) || DefCustomPage;
|
|
29
60
|
console.log("CustomPageRouter", Object.assign(Object.assign({}, this.props.match.params), criteriaData));
|
|
30
|
-
return React.createElement(Page, Object.assign(Object.assign({}, this.props.match.params), criteriaData));
|
|
61
|
+
return React.createElement(Page, Object.assign(Object.assign(Object.assign({}, this.props.match.params), { goBack: this.goBackToLtmpl }), criteriaData));
|
|
31
62
|
}
|
|
32
63
|
}
|
|
33
64
|
export default CustomPageRouter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom-page-router.js","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAe,aAAa,EAAC,MAAM,UAAU,CAAC;AACrD,OAAO,KAAK,MAAM,UAAU,CAAC;AAI5B,CAAC;AAID,CAAC;AAEF;;;;;GAKG;AACH,mCAAmC;AACnC,+BAA+B;AAC/B,oCAAoC;AACpC,kCAAkC;AAClC,+BAA+B;AAC/B,IAAI;AAEJ;;GAEG;AACF,MAAM,gBAAiB,SAAQ,KAAK,CAAC,aAA0D;
|
|
1
|
+
{"version":3,"file":"custom-page-router.js","sourceRoot":"","sources":["../../../../src/aldehyde/custom-page/custom-page-router.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";AAgFA,wBAAuC"}
|
|
@@ -54,32 +54,12 @@ class Menu2layers extends React.PureComponent {
|
|
|
54
54
|
else {
|
|
55
55
|
let openKey = blockMenu ? MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId) : undefined;
|
|
56
56
|
let preOpenKey = blockMenu ? MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId) : undefined;
|
|
57
|
-
if (openKey && openKey != preOpenKey) {
|
|
57
|
+
if ((!preOpenKey && openKey) || (openKey && openKey != preOpenKey)) {
|
|
58
58
|
this.setState({
|
|
59
59
|
openKeys: [openKey],
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
|
-
// let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
|
|
64
|
-
// if(openKey && openKeys.length<1){
|
|
65
|
-
// this.setState({
|
|
66
|
-
// openKeys:[openKey.toString()]
|
|
67
|
-
// })
|
|
68
|
-
// }else if(preMenuId!=currentL2MenuId){
|
|
69
|
-
// console.log('currentL2MenuId:',currentL2MenuId);
|
|
70
|
-
// if (openKey) {
|
|
71
|
-
// if(openKeys.length==1){
|
|
72
|
-
// openKeys.push(openKey.toString())
|
|
73
|
-
// if (openKeys && openKeys.length > 1) {
|
|
74
|
-
// openKeys.splice(0, 1);
|
|
75
|
-
// }
|
|
76
|
-
// }
|
|
77
|
-
// this.setState({
|
|
78
|
-
// openKeys,
|
|
79
|
-
// })
|
|
80
|
-
// }
|
|
81
|
-
// }
|
|
82
|
-
//}
|
|
83
63
|
}
|
|
84
64
|
render() {
|
|
85
65
|
const _a = this.props, { blockMenu, collapsed, currentL2MenuId, basePath } = _a, other = __rest(_a, ["blockMenu", "collapsed", "currentL2MenuId", "basePath"]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAE1B,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAM5C,MAAM,WAAY,SAAQ,KAAK,CAAC,aAAiD;IAG7E,YAAY,KAAK;QACb,KAAK,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAM/E,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAEvD;AAED,MAAM,WAAW,eAAe;IAE5B,cAAc,EAAE,cAAc,CAAC;CAClC;AAED,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1E,MAAM,CAAE,YAAY;;MAEnB;IAED,KAAK;;MAEJ;IAEK,iBAAiB;IAIvB,OAAO,sBAEN;IAED,SAAS,eAMR;IAED,QAAQ,sBASP;IAEK,kBAAkB,CAAC,SAAS,KAAA;IAelC,QAAQ,SAAU,MAAM,iBAAc,OAAO,UAS5C;IAED,MAAM,SAAU,MAAM,QAAM,WAAW,iBAAc,OAAO,
|
|
1
|
+
{"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,WAAW,EAAE,cAAc,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAM/E,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAEvD;AAED,MAAM,WAAW,eAAe;IAE5B,cAAc,EAAE,cAAc,CAAC;CAClC;AAED,cAAM,UAAW,SAAQ,KAAK,CAAC,aAAa,CAAC,eAAe,EAAE,eAAe,CAAC;IAC1E,MAAM,CAAE,YAAY;;MAEnB;IAED,KAAK;;MAEJ;IAEK,iBAAiB;IAIvB,OAAO,sBAEN;IAED,SAAS,eAMR;IAED,QAAQ,sBASP;IAEK,kBAAkB,CAAC,SAAS,KAAA;IAelC,QAAQ,SAAU,MAAM,iBAAc,OAAO,UAS5C;IAED,MAAM,SAAU,MAAM,QAAM,WAAW,iBAAc,OAAO,UAc3D;IAED,WAAW,YAUV;IAED,QAAQ,kBAAiB,OAAO,UAa/B;IAED,SAAS,cAAc,MAAM,YAAU,MAAM,UAI5C;IAED,QAAQ,yBAsBP;IAGD,MAAM;CA8BT;AAED,eAAe,UAAU,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,QAAQ,MAAM,oBAAoB,CAAA;AACzC,qDAAqD;AACrD,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAIjD,CAAC;AAKD,CAAC;AAEF,MAAM,UAAW,SAAQ,KAAK,CAAC,aAA+C;IAA9E;;QAKI,UAAK,GAAG;YACJ,cAAc,EAAE,SAAS;SAC5B,CAAA;QAMD,YAAO,GAAG,CAAC,IAAI,EAAE,EAAE;YACf,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,CAAA;QAED,cAAS,GAAC,GAAE,EAAE;YACV,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,yBAAyB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClD,IAAI,YAAY,GAAG,IAAI,eAAe,CAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YACzD,IAAI,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YACxC,OAAO,MAAM,CAAC;QAClB,CAAC,CAAA;QAED,aAAQ,GAAG,GAAS,EAAE;YAClB,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9B,MAAM,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;YAC5C,IAAI,YAAY,GAAG,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC3E,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACrE,IAAI,cAAc,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YACrE,IAAI,CAAC,QAAQ,CAAC;gBACV,cAAc;aACjB,CAAC,CAAA;QACN,CAAC,CAAA,CAAA;QAiBD,aAAQ,GAAG,CAAC,IAAY,EAAC,eAAqB,KAAK,EAAE,EAAE;YACnD,MAAM,EAAC,QAAQ,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;YAC5C,MAAM,EAAC,cAAc,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACpC,IAAI,IAAI,GAAG,GAAG,QAAQ,IAAI,QAAQ,qBAAqB,IAAI,WAAW,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACzF,IAAG,YAAY,IAAI,cAAc,CAAC,WAAW,CAAC,kBAAkB,EAAC;gBAC7D,IAAI,GAAC,GAAG,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,kBAAkB,WAAW,IAAI,CAAC,SAAS,EAAE,aAAa,QAAQ,EAAE,CAAC;aACtH;YACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAA;QAED,WAAM,GAAG,CAAC,IAAY,EAAC,IAAgB,EAAC,eAAqB,KAAK,EAAE,EAAE;YAClE,MAAM,EAAC,QAAQ,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;YAC5B,MAAM,EAAE,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;YAC5C,MAAM,EAAC,cAAc,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACpC,IAAI,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"ltmpl-route.js","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"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"}
|
package/lib/tmpl/interface.d.ts
CHANGED
|
@@ -106,7 +106,7 @@ export interface SelectConfig extends TmplBase {
|
|
|
106
106
|
columns: ColumnConfig[];
|
|
107
107
|
criterias: CriteriaConfig[];
|
|
108
108
|
defaultCriteriaValue?: object;
|
|
109
|
-
|
|
109
|
+
primaryColumn: ColumnConfig;
|
|
110
110
|
primaryCriteria: CriteriaConfig;
|
|
111
111
|
}
|
|
112
112
|
export interface RActionConfig extends OrderableTmplBase {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/interface.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/interface.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -10,6 +10,7 @@ import HCDataSource from "../../tmpl/hc-data-source";
|
|
|
10
10
|
interface InnerEntitySelectProps extends EControlProps {
|
|
11
11
|
maxSelected?: number,
|
|
12
12
|
onEntityClick?: (code: string) => void,
|
|
13
|
+
baseCriteriaData:object,
|
|
13
14
|
};
|
|
14
15
|
|
|
15
16
|
interface InnerEntitySelectState {
|
|
@@ -17,6 +18,8 @@ interface InnerEntitySelectState {
|
|
|
17
18
|
optionCacheKey: string,
|
|
18
19
|
pageNo:number,
|
|
19
20
|
loading: boolean,
|
|
21
|
+
optionsCache: object ;
|
|
22
|
+
selectConfig: SelectConfig
|
|
20
23
|
};
|
|
21
24
|
|
|
22
25
|
type OptionCache = {
|
|
@@ -44,11 +47,27 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
44
47
|
optionCacheKey: undefined,
|
|
45
48
|
pageNo:1,
|
|
46
49
|
loading: false,
|
|
50
|
+
optionsCache: {},
|
|
51
|
+
selectConfig:undefined,
|
|
47
52
|
}
|
|
48
53
|
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
54
|
+
componentDidUpdate(prevProps) {
|
|
55
|
+
const {baseCriteriaData,mainCode,fieldConfig} = this.props;
|
|
56
|
+
let {baseCriteriaData:preBaseCriteriaData,mainCode:preMainCode,fieldConfig:preFieldConfig}=prevProps;
|
|
57
|
+
if((baseCriteriaData && JSON.stringify(baseCriteriaData) != JSON.stringify(preBaseCriteriaData) )||(mainCode && mainCode != preMainCode)
|
|
58
|
+
||(fieldConfig && preFieldConfig && fieldConfig.id != preFieldConfig.id)){
|
|
59
|
+
this.setState({
|
|
60
|
+
optionsCache:{}
|
|
61
|
+
})
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
// componentWillUnmount(): void {
|
|
66
|
+
// this.setState=(state,callback)=>{
|
|
67
|
+
// return
|
|
68
|
+
// }
|
|
69
|
+
// }
|
|
70
|
+
|
|
52
71
|
|
|
53
72
|
toOption = (code: string, title: string, onEntityClick) => {
|
|
54
73
|
let option = {
|
|
@@ -69,7 +88,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
69
88
|
if (value instanceof Array) {
|
|
70
89
|
valueArray = value;
|
|
71
90
|
} else {
|
|
72
|
-
if (value) {
|
|
91
|
+
if (value) {
|
|
73
92
|
valueArray = value.split(',');
|
|
74
93
|
} else {
|
|
75
94
|
valueArray = [];
|
|
@@ -96,9 +115,8 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
96
115
|
}
|
|
97
116
|
|
|
98
117
|
fetchNextPage = async () => {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
let optionCache = this.optionsCache.get(optionCacheKey);
|
|
118
|
+
const {optionCacheKey, titleId,optionsCache} = this.state;
|
|
119
|
+
let optionCache = optionsCache[optionCacheKey];
|
|
102
120
|
let pageInfo = optionCache.pageInfo;
|
|
103
121
|
if (!optionCache.touchEnd) {
|
|
104
122
|
pageInfo.pageNo = pageInfo.pageNo + 1;
|
|
@@ -114,36 +132,36 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
114
132
|
}
|
|
115
133
|
|
|
116
134
|
fetchOptions = async (searchText) => {
|
|
117
|
-
const { fieldConfig,mainCode} = this.props;
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
loading: true,
|
|
121
|
-
})
|
|
122
|
-
let optionCacheKey = "withoutValue";
|
|
135
|
+
const { fieldConfig,mainCode,baseCriteriaData} = this.props;
|
|
136
|
+
const {optionsCache,selectConfig}=this.state;
|
|
137
|
+
let optionCacheKey="withoutValue";
|
|
123
138
|
//先从缓存里拿
|
|
124
139
|
if (searchText) {
|
|
125
140
|
optionCacheKey = searchText;
|
|
126
141
|
}
|
|
127
142
|
let titleId = this.state.titleId;
|
|
128
|
-
let optionCache =
|
|
143
|
+
let optionCache = optionsCache[optionCacheKey];
|
|
129
144
|
if (!optionCache) {
|
|
130
|
-
|
|
131
|
-
|
|
145
|
+
this.setState({
|
|
146
|
+
loading: true,
|
|
147
|
+
})
|
|
148
|
+
let selectConfig_=selectConfig;
|
|
149
|
+
if (!selectConfig_) {
|
|
150
|
+
selectConfig_ = await HCDataSource.requestSelectConfig( fieldConfig.id);
|
|
132
151
|
}
|
|
133
152
|
let pageInfo = {
|
|
134
153
|
pageNo: 1,
|
|
135
154
|
pageSize: 4,
|
|
136
155
|
virtualEndPageNo: undefined,
|
|
137
156
|
};
|
|
138
|
-
|
|
139
|
-
titleId = selectConfig.characteristicColumn.id;
|
|
157
|
+
titleId = selectConfig_.primaryColumn.id;
|
|
140
158
|
//得到第一个过滤条件
|
|
141
|
-
let firstCriteria =
|
|
159
|
+
let firstCriteria = selectConfig_.primaryCriteria;
|
|
142
160
|
let formItemName = 'undefinedCriteria';
|
|
143
161
|
if (firstCriteria) {
|
|
144
162
|
formItemName = 'c_' + firstCriteria.id;
|
|
145
163
|
}
|
|
146
|
-
const {defaultPageSize} =
|
|
164
|
+
const {defaultPageSize} = selectConfig_;
|
|
147
165
|
if (defaultPageSize) {
|
|
148
166
|
pageInfo.pageSize = defaultPageSize;
|
|
149
167
|
}
|
|
@@ -151,6 +169,9 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
151
169
|
/** 构建 dataSource **/
|
|
152
170
|
//构建过滤条件
|
|
153
171
|
let criteriaData = {};
|
|
172
|
+
if(baseCriteriaData){
|
|
173
|
+
criteriaData={...baseCriteriaData}
|
|
174
|
+
}
|
|
154
175
|
criteriaData[formItemName] = searchText;
|
|
155
176
|
let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey( fieldConfig.id, {...criteriaData, ...pageInfo,mainCode});
|
|
156
177
|
let sourceData = await this.loadData(queryKey.key, pageInfo, titleId);
|
|
@@ -162,10 +183,12 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
162
183
|
searchValue: searchText,
|
|
163
184
|
touchEnd: sourceData.touchEnd
|
|
164
185
|
};
|
|
165
|
-
|
|
186
|
+
optionsCache[optionCacheKey]=optionCache;
|
|
166
187
|
this.setState({
|
|
167
188
|
optionCacheKey,
|
|
168
189
|
titleId,
|
|
190
|
+
optionsCache:{...optionsCache},
|
|
191
|
+
selectConfig:selectConfig_,
|
|
169
192
|
loading: false,
|
|
170
193
|
})
|
|
171
194
|
} else {
|
|
@@ -237,12 +260,12 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
237
260
|
|
|
238
261
|
render() {
|
|
239
262
|
const {id,value, fieldConfig, onChange,disabled, style, maxSelected, onEntityClick} = this.props;
|
|
240
|
-
const {optionCacheKey, loading} = this.state;
|
|
263
|
+
const {optionCacheKey, loading,optionsCache} = this.state;
|
|
241
264
|
let initOptions = this.toOptions(value, onEntityClick);
|
|
242
265
|
let exists;
|
|
243
266
|
let properOptions = [...initOptions];
|
|
244
|
-
if (optionCacheKey) {
|
|
245
|
-
for (let option of
|
|
267
|
+
if (optionCacheKey && optionsCache[optionCacheKey]) {
|
|
268
|
+
for (let option of optionsCache[optionCacheKey].options) {
|
|
246
269
|
exists = false;
|
|
247
270
|
for (let init of initOptions) {
|
|
248
271
|
if (init['value'] == option['value']) {
|
|
@@ -45,6 +45,7 @@ interface EntryControlProps {
|
|
|
45
45
|
fieldConfig: FieldConfig;
|
|
46
46
|
onChange?: any;
|
|
47
47
|
id?:any;
|
|
48
|
+
baseCriteriaData?:object,
|
|
48
49
|
}
|
|
49
50
|
|
|
50
51
|
function getOptions(mstrucId) {
|
|
@@ -60,7 +61,7 @@ function getOptions(mstrucId) {
|
|
|
60
61
|
}
|
|
61
62
|
|
|
62
63
|
|
|
63
|
-
function renderControl(id:any,mainCode:string,fieldConfig: FieldConfig, fieldValue: any, onChange: any, width: any) {
|
|
64
|
+
function renderControl(id:any,mainCode:string,fieldConfig: FieldConfig, fieldValue: any, onChange: any, width: any,other) {
|
|
64
65
|
|
|
65
66
|
let itemType = ControlTypeSupportor.getControlType(fieldConfig, fieldValue);
|
|
66
67
|
|
|
@@ -75,7 +76,7 @@ function renderControl(id:any,mainCode:string,fieldConfig: FieldConfig, fieldVal
|
|
|
75
76
|
fieldConfigM=fieldConfig.max;
|
|
76
77
|
let max=(fieldConfigM || fieldConfigM=='0' ) ? Units.configParamTrans(fieldConfigM) : undefined;;
|
|
77
78
|
|
|
78
|
-
let controlProps = {
|
|
79
|
+
let controlProps = {...other,
|
|
79
80
|
id, mainCode,fieldConfig,min,max, itemType, viewOrEdit, onChange, disabled, value: fieldValue, style: {minWidth: 220, width: '100%'}
|
|
80
81
|
}
|
|
81
82
|
|
|
@@ -258,8 +259,8 @@ function renderControl(id:any,mainCode:string,fieldConfig: FieldConfig, fieldVal
|
|
|
258
259
|
}
|
|
259
260
|
|
|
260
261
|
const EntryControl: React.FC<EntryControlProps> = (props) => {
|
|
261
|
-
const {fieldConfig, value, onChange,id,mainCode} = props;
|
|
262
|
-
return renderControl(id,mainCode,fieldConfig, value, onChange, null);
|
|
262
|
+
const {fieldConfig, value, onChange,id,mainCode,...other} = props;
|
|
263
|
+
return renderControl(id,mainCode,fieldConfig, value, onChange, null,other);
|
|
263
264
|
}
|
|
264
265
|
|
|
265
266
|
export default EntryControl;
|
|
@@ -12,8 +12,9 @@ const InputNumber: React.FC<InputNumberProps> = (props) => {
|
|
|
12
12
|
const {id,value, itemType, fieldConfig, onChange,style,min,max} = props;
|
|
13
13
|
|
|
14
14
|
let entryControl = undefined;
|
|
15
|
-
|
|
15
|
+
console.log('form value',value);
|
|
16
16
|
const changeValue = (value) => {
|
|
17
|
+
console.log('input value',value);
|
|
17
18
|
if (onChange) {
|
|
18
19
|
onChange(value);
|
|
19
20
|
}
|
|
@@ -21,7 +22,7 @@ const InputNumber: React.FC<InputNumberProps> = (props) => {
|
|
|
21
22
|
|
|
22
23
|
let valObj=Units.splitValue(value);
|
|
23
24
|
let valueBegin=valObj['valueBegin'], valueEnd=valObj['valueEnd'];
|
|
24
|
-
let valueSingle=value || value==0
|
|
25
|
+
let valueSingle=value || value==0 ?value:null;
|
|
25
26
|
|
|
26
27
|
const changeBeginValue = (value) => {
|
|
27
28
|
if (onChange) {
|
|
@@ -37,13 +38,12 @@ const InputNumber: React.FC<InputNumberProps> = (props) => {
|
|
|
37
38
|
|
|
38
39
|
const changeInt = (e) => { //只允许输入整数
|
|
39
40
|
if ((e.target.value || e.target.value==0) && !isNaN(e.target.value)) {
|
|
40
|
-
e.target.value =
|
|
41
|
+
//e.target.value = e.target.value
|
|
41
42
|
} else {
|
|
42
43
|
e.target.value = null
|
|
43
44
|
}
|
|
44
45
|
}
|
|
45
46
|
;
|
|
46
|
-
|
|
47
47
|
let placeholder = !fieldConfig.disabled ? `请输入${fieldConfig.title}` : "无需输入";
|
|
48
48
|
let disabled: boolean = fieldConfig.disabled;
|
|
49
49
|
|
|
@@ -53,9 +53,9 @@ const InputNumber: React.FC<InputNumberProps> = (props) => {
|
|
|
53
53
|
|
|
54
54
|
switch (itemType) {
|
|
55
55
|
case 'int':
|
|
56
|
-
entryControl = <AntdInputNumber style={{...style}} min={min} max={max}
|
|
56
|
+
entryControl = <AntdInputNumber style={{...style}} min={min} max={max} stringMode
|
|
57
57
|
{...antdControlProps} value={valueSingle}
|
|
58
|
-
|
|
58
|
+
onChange={changeValue}
|
|
59
59
|
/>
|
|
60
60
|
break;
|
|
61
61
|
case 'decimal':
|
|
@@ -29,6 +29,37 @@ export interface CustomPageRouterStat {
|
|
|
29
29
|
*/
|
|
30
30
|
class CustomPageRouter extends React.PureComponent<CustomPageRouterProps, CustomPageRouterStat> {
|
|
31
31
|
|
|
32
|
+
goBackToLtmpl=()=>{
|
|
33
|
+
const { sourceId,} = this.props.match.params;
|
|
34
|
+
const {basePath}=this.props;
|
|
35
|
+
let url=`${basePath?basePath+'/':""}/${sourceId}/act-table?menuId=${this.getMenuId()}`;
|
|
36
|
+
let mainCode=this.getMainCode();
|
|
37
|
+
if(mainCode){
|
|
38
|
+
url=url+`&mainCode=${mainCode}`;
|
|
39
|
+
}
|
|
40
|
+
this.props.history.push(url);
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
getMainCode = () => {
|
|
44
|
+
const {location} = this.props;
|
|
45
|
+
let search = location.search;
|
|
46
|
+
let mainCode = undefined;
|
|
47
|
+
let criteriaData = Units.transQueryStrToParams(search);
|
|
48
|
+
if (search.indexOf('mainCode') > 0) {
|
|
49
|
+
criteriaData = Units.transQueryStrToParams(search);
|
|
50
|
+
mainCode = criteriaData['mainCode'];
|
|
51
|
+
}
|
|
52
|
+
return mainCode;
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
getMenuId=()=>{
|
|
56
|
+
const {location} = this.props;
|
|
57
|
+
console.log("this.props.match.params",this.props);
|
|
58
|
+
var searchParams = new URLSearchParams( location.search);
|
|
59
|
+
let menuId = searchParams.get('menuId');
|
|
60
|
+
return menuId;
|
|
61
|
+
}
|
|
62
|
+
|
|
32
63
|
render() {
|
|
33
64
|
// console.log("CustomPageRouter",this.props);
|
|
34
65
|
let pageName = this.props.match.params.pageName;
|
|
@@ -36,7 +67,7 @@ export interface CustomPageRouterStat {
|
|
|
36
67
|
let criteriaData = Units.transQueryStrToParams(search);
|
|
37
68
|
let Page = ProgramConfig.getCustomPage("/" + pageName) || DefCustomPage;
|
|
38
69
|
console.log("CustomPageRouter",{...this.props.match.params, ...criteriaData});
|
|
39
|
-
return React.createElement(Page, {...this.props.match.params, ...criteriaData});
|
|
70
|
+
return React.createElement(Page, {...this.props.match.params,goBack:this.goBackToLtmpl, ...criteriaData});
|
|
40
71
|
}
|
|
41
72
|
}
|
|
42
73
|
|
|
@@ -33,7 +33,7 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
|
|
|
33
33
|
let {currentL2MenuId:preMenuId,blockMenu:preBlockMenu}=prevProps;
|
|
34
34
|
const {openKeys} = this.state;
|
|
35
35
|
|
|
36
|
-
if(!preBlockMenu || !blockMenu || blockMenu.id!=preBlockMenu.id){
|
|
36
|
+
if(!preBlockMenu || !blockMenu || blockMenu.id!=preBlockMenu.id ){
|
|
37
37
|
//console.log('currentL2MenuId:',currentL2MenuId);
|
|
38
38
|
let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
|
|
39
39
|
if (openKey) {
|
|
@@ -44,33 +44,12 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
|
|
|
44
44
|
}else {
|
|
45
45
|
let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
|
|
46
46
|
let preOpenKey = blockMenu?MenuRender.findOpenId(preBlockMenu.l1Menus, preMenuId):undefined;
|
|
47
|
-
if(openKey && openKey!=preOpenKey){
|
|
47
|
+
if((!preOpenKey && openKey) || (openKey && openKey!=preOpenKey)){
|
|
48
48
|
this.setState({
|
|
49
49
|
openKeys:[openKey],
|
|
50
50
|
})
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
|
-
|
|
54
|
-
// let openKey = blockMenu?MenuRender.findOpenId(blockMenu.l1Menus, currentL2MenuId):undefined;
|
|
55
|
-
// if(openKey && openKeys.length<1){
|
|
56
|
-
// this.setState({
|
|
57
|
-
// openKeys:[openKey.toString()]
|
|
58
|
-
// })
|
|
59
|
-
// }else if(preMenuId!=currentL2MenuId){
|
|
60
|
-
// console.log('currentL2MenuId:',currentL2MenuId);
|
|
61
|
-
// if (openKey) {
|
|
62
|
-
// if(openKeys.length==1){
|
|
63
|
-
// openKeys.push(openKey.toString())
|
|
64
|
-
// if (openKeys && openKeys.length > 1) {
|
|
65
|
-
// openKeys.splice(0, 1);
|
|
66
|
-
// }
|
|
67
|
-
// }
|
|
68
|
-
// this.setState({
|
|
69
|
-
// openKeys,
|
|
70
|
-
// })
|
|
71
|
-
// }
|
|
72
|
-
// }
|
|
73
|
-
//}
|
|
74
53
|
}
|
|
75
54
|
|
|
76
55
|
handleOpen = (openKeys) => {
|
|
@@ -81,6 +81,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
|
|
|
81
81
|
const { sourceId} = this.props.match.params;
|
|
82
82
|
const {ltmplConfigRes} = this.state;
|
|
83
83
|
let mainCode = this.getMainCode();
|
|
84
|
+
|
|
84
85
|
let path = `${basePath}/${sourceId}/detail-edit?code=${code}&menuId=${this.getMenuId()}&mode=${mode}`;
|
|
85
86
|
if(toCustomPage && ltmplConfigRes.ltmplConfig.customEditPagePath){
|
|
86
87
|
path=`${basePath}/page-${sourceId}${ltmplConfigRes.ltmplConfig.customEditPagePath}?code=${code}&menuId=${this.getMenuId()}`;
|
|
@@ -144,7 +144,7 @@ export interface SelectConfig extends TmplBase {
|
|
|
144
144
|
columns: ColumnConfig[];
|
|
145
145
|
criterias: CriteriaConfig[];
|
|
146
146
|
defaultCriteriaValue?:object;
|
|
147
|
-
|
|
147
|
+
primaryColumn:ColumnConfig;
|
|
148
148
|
primaryCriteria:CriteriaConfig;
|
|
149
149
|
}
|
|
150
150
|
|