aldehyde 0.1.40 → 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.js +1 -1
- package/lib/controls/entity-select/entity-select.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/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 +1 -1
- package/src/aldehyde/controls/input-number/index.tsx +6 -6
- package/src/aldehyde/tmpl/interface.tsx +1 -1
|
@@ -110,7 +110,7 @@ export default class EntitySelect extends React.PureComponent {
|
|
|
110
110
|
pageSize: 4,
|
|
111
111
|
virtualEndPageNo: undefined,
|
|
112
112
|
};
|
|
113
|
-
titleId = selectConfig_.
|
|
113
|
+
titleId = selectConfig_.primaryColumn.id;
|
|
114
114
|
//得到第一个过滤条件
|
|
115
115
|
let firstCriteria = selectConfig_.primaryCriteria;
|
|
116
116
|
let formItemName = 'undefinedCriteria';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-select.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/entity-select.tsx"],"names":[],"mappings":"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
|
|
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;AAMpD,CAAC;AASD,CAAC;AAgBF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,KAAK,CAAC,aAA6D;IAA7G;;QAMI,UAAK,GAAG;YACJ,OAAO,EAAE,SAAS;YAClB,cAAc,EAAE,SAAS;YACzB,MAAM,EAAC,CAAC;YACR,OAAO,EAAE,KAAK;YACd,YAAY,EAAE,EAAE;YAChB,YAAY,EAAC,SAAS;SACzB,CAAA;QAaD,iCAAiC;QACjC,wCAAwC;QACxC,iBAAiB;QACjB,QAAQ;QACR,IAAI;QAGJ,aAAQ,GAAG,CAAC,IAAY,EAAE,KAAa,EAAE,aAAa,EAAE,EAAE;YACtD,IAAI,MAAM,GAAG;gBACT,KAAK,EAAE,IAAI,GAAG,KAAK,GAAG,KAAK;gBAC3B,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,oBAAC,MAAM,IAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAC,OAAO,EAAE,KAAK,EAAC,EAAE,IAAI,EAAC,MAAM,EAAC,KAAK,EAAC,EAAE,EAC5D,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;wBACX,CAAC,CAAC,eAAe,EAAE,CAAC;wBACpB,aAAa,CAAC,IAAI,CAAC,CAAC;oBACxB,CAAC,IAAG,KAAK,CACnC,CAAC,CAAC,CAAC,KAAK;gBACjB,KAAK,EAAE,KAAK;aACf,CAAC;YACF,OAAO,MAAM,CAAC;QAClB,CAAC,CAAA;QAED,iBAAY,GAAC,CAAC,KAAK,EAAC,EAAE;YAClB,IAAI,UAAU,GAAW,EAAE,CAAC;YAC5B,IAAI,KAAK,YAAY,KAAK,EAAE;gBACxB,UAAU,GAAG,KAAK,CAAC;aACtB;iBAAM;gBACH,IAAI,KAAK,EAAE;oBACP,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACjC;qBAAM;oBACH,UAAU,GAAG,EAAE,CAAC;iBACnB;aACJ;YACD,OAAO,UAAU,CAAC;QACtB,CAAC,CAAA;QAED,cAAS,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;YACjC,IAAI,OAAO,GAAa,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YAEpC,IAAI,UAAU,GAAW,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAGlD,KAAK,IAAI,CAAC,IAAI,UAAU,EAAE;gBAClB,IAAI,CAAC,EAAE;oBACH,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBACxB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC;iBAC5D;aACR;YACD,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAChC,OAAO,OAAO,CAAC;QACnB,CAAC,CAAA;QAED,kBAAa,GAAG,GAAS,EAAE;YACvB,MAAM,EAAC,cAAc,EAAE,OAAO,EAAC,YAAY,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC1D,IAAI,WAAW,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;YAC/C,IAAI,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;YACpC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;gBACvB,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;gBACtC,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,oBAAM,QAAQ,GAAG,OAAO,CAAC,CAAC;gBACvF,IAAI,UAAU,EAAE;oBACZ,WAAW,CAAC,OAAO,GAAG,CAAC,GAAG,WAAW,CAAC,OAAO,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;oBACtE,WAAW,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;iBAC9C;gBACD,IAAI,CAAC,QAAQ,CAAC;oBACV,MAAM,EAAC,QAAQ,CAAC,MAAM;iBACzB,CAAC,CAAA;aACL;QACL,CAAC,CAAA,CAAA;QAED,iBAAY,GAAG,CAAO,UAAU,EAAE,EAAE;YAChC,MAAM,EAAE,WAAW,EAAC,QAAQ,EAAC,gBAAgB,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC5D,MAAM,EAAC,YAAY,EAAC,YAAY,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;YAC7C,IAAI,cAAc,GAAC,cAAc,CAAC;YAClC,QAAQ;YACR,IAAI,UAAU,EAAE;gBACZ,cAAc,GAAG,UAAU,CAAC;aAC/B;YACD,IAAI,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;YACjC,IAAI,WAAW,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC;YAC/C,IAAI,CAAC,WAAW,EAAE;gBACd,IAAI,CAAC,QAAQ,CAAC;oBACV,OAAO,EAAE,IAAI;iBAChB,CAAC,CAAA;gBACF,IAAI,aAAa,GAAC,YAAY,CAAC;gBAC/B,IAAI,CAAC,aAAa,EAAE;oBAChB,aAAa,GAAG,MAAM,YAAY,CAAC,mBAAmB,CAAE,WAAW,CAAC,EAAE,CAAC,CAAC;iBAC3E;gBACD,IAAI,QAAQ,GAAG;oBACX,MAAM,EAAE,CAAC;oBACT,QAAQ,EAAE,CAAC;oBACX,gBAAgB,EAAE,SAAS;iBAC9B,CAAC;gBACF,OAAO,GAAG,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC;gBACzC,WAAW;gBACX,IAAI,aAAa,GAAG,aAAa,CAAC,eAAe,CAAC;gBAClD,IAAI,YAAY,GAAG,mBAAmB,CAAC;gBACvC,IAAI,aAAa,EAAE;oBACf,YAAY,GAAG,IAAI,GAAG,aAAa,CAAC,EAAE,CAAC;iBAC1C;gBACD,MAAM,EAAC,eAAe,EAAC,GAAG,aAAa,CAAC;gBACxC,IAAI,eAAe,EAAE;oBACjB,QAAQ,CAAC,QAAQ,GAAG,eAAe,CAAC;iBACvC;gBAED,qBAAqB;gBACjB,QAAQ;gBACZ,IAAI,YAAY,GAAG,EAAE,CAAC;gBACtB,IAAG,gBAAgB,EAAC;oBAChB,YAAY,qBAAK,gBAAgB,CAAC,CAAA;iBACrC;gBACD,YAAY,CAAC,YAAY,CAAC,GAAG,UAAU,CAAC;gBACxC,IAAI,QAAQ,GAAa,MAAM,WAAW,CAAC,oBAAoB,CAAE,WAAW,CAAC,EAAE,gDAAM,YAAY,GAAK,QAAQ,KAAC,QAAQ,IAAE,CAAC;gBAC1H,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;gBAEtE,WAAW,GAAG;oBACV,OAAO,EAAE,UAAU,CAAC,OAAO;oBAC3B,QAAQ;oBACR,QAAQ;oBACR,WAAW,EAAE,UAAU;oBACvB,QAAQ,EAAE,UAAU,CAAC,QAAQ;iBAChC,CAAC;gBACF,YAAY,CAAC,cAAc,CAAC,GAAC,WAAW,CAAC;gBACzC,IAAI,CAAC,QAAQ,CAAC;oBACV,cAAc;oBACd,OAAO;oBACP,YAAY,oBAAK,YAAY,CAAC;oBAC9B,YAAY,EAAC,aAAa;oBAC1B,OAAO,EAAE,KAAK;iBACjB,CAAC,CAAA;aACL;iBAAM;gBACH,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,cAAc,IAAI,cAAc,IAAI,cAAc,EAAE;oBACjF,IAAI,CAAC,QAAQ,CAAC;wBACV,OAAO,EAAE,KAAK;wBACd,cAAc;qBACjB,CAAC,CAAA;iBACL;qBAAM;oBACH,QAAQ,CAAC,GAAG,EAAE;wBACV,IAAI,CAAC,QAAQ,CAAC;4BACV,OAAO,EAAE,KAAK;4BACd,cAAc;yBACjB,CAAC,CAAA;oBACN,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;iBACb;aAEJ;QAEL,CAAC,CAAA,CAAA;QAED,aAAQ,GAAG,CAAC,MAAa,EAAE,EAAE;YACzB,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;gBAClD,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;gBACvC,IAAI,SAAS,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;gBAC5B,SAAS,CAAC,KAAK,EAAE,CAAC;gBAClB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;aAC5B;iBAAM;gBACH,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aAC/B;QACL,CAAC,CAAA;QAGD,aAAQ,GAAG,CAAO,QAAgB,EAAE,QAAkB,EAAE,OAAe,EAA2B,EAAE;YAChG,MAAM,EAAC,aAAa,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAEnC,IAAI,SAAS,GAAc,MAAM,WAAW,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAClF,IAAI,OAAO,GAAa,EAAE,CAAC;YAC3B,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;YAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBACvC,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;gBACnC,IAAG,KAAK,EAAC;oBACL,IAAI,EAAE,GAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC1B,IAAI,CAAC,GAAC,EAAE,IAAI,EAAE,CAAC,MAAM,GAAC,CAAC,CAAA,CAAC,CAAA,EAAE,CAAC,EAAE,CAAC,MAAM,GAAC,CAAC,CAAC,CAAA,CAAC,CAAA,KAAK,CAAC;oBAC9C,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAC,CAAC,EAAG,aAAa,CAAC,CAAC;oBACxD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBACxB;YACL,CAAC,CAAC,CAAA;YACF,OAAO,EAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAC,CAAC;QACnD,CAAC,CAAA,CAAA;QAED,oBAAe,GAAG,GAAG,EAAE;YACnB,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,EAAE;gBACxB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAC3B,CAAC,CAAC;YACF,OAAO,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QACtC,CAAC,CAAC;QAEF,0BAAqB,GAAG,GAAG,EAAE;YACzB,kBAAkB;YAClB,qBAAqB;YACrB,KAAK;YACL,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,EAAE,CAAC;YACpC,kBAAkB;YAClB,sBAAsB;YACtB,KAAK;QACT,CAAC,CAAA;IAmDL,CAAC;IA/PG,kBAAkB,CAAC,SAAS;QACxB,MAAM,EAAC,gBAAgB,EAAC,QAAQ,EAAC,WAAW,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC3D,IAAI,EAAC,gBAAgB,EAAC,mBAAmB,EAAC,QAAQ,EAAC,WAAW,EAAC,WAAW,EAAC,cAAc,EAAC,GAAC,SAAS,CAAC;QACrG,IAAG,CAAC,gBAAgB,IAAI,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAE,IAAE,CAAC,QAAQ,IAAI,QAAQ,IAAI,WAAW,CAAC;eACtI,CAAC,WAAW,IAAI,cAAc,IAAI,WAAW,CAAC,EAAE,IAAI,cAAc,CAAC,EAAE,CAAC,EAAC;YACrE,IAAI,CAAC,QAAQ,CAAC;gBACV,YAAY,EAAC,EAAE;aAClB,CAAC,CAAA;SACL;IACL,CAAC;IAsMD,MAAM;QACF,MAAM,EAAC,EAAE,EAAC,KAAK,EAAG,WAAW,EAAE,QAAQ,EAAC,QAAQ,EAAE,KAAK,EAAG,WAAW,EAAE,aAAa,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACnG,MAAM,EAAC,cAAc,EAAE,OAAO,EAAC,YAAY,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1D,IAAI,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACvD,IAAI,MAAM,CAAC;QACX,IAAI,aAAa,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC;QACrC,IAAI,cAAc,IAAI,YAAY,CAAC,cAAc,CAAC,EAAE;YAChD,KAAK,IAAI,MAAM,IAAI,YAAY,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE;gBACrD,MAAM,GAAG,KAAK,CAAC;gBACf,KAAK,IAAI,IAAI,IAAI,WAAW,EAAE;oBAC1B,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,EAAE;wBAClC,MAAM,GAAG,IAAI,CAAC;qBACjB;iBACJ;gBACD,IAAI,CAAC,MAAM,EAAE;oBACT,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBAC9B;aACJ;SACJ;QAED,OAAO,oBAAC,MAAM,IACV,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,EAAE,EACN,KAAK,oBAAM,KAAK,GAChB,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAC/B,IAAI,EAAC,UAAU,EACf,WAAW,EAAE,MAAM,WAAW,CAAC,KAAK,EAAE,EACtC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC,oBAAC,IAAI,IAAC,IAAI,EAAE,OAAO,GAAS,CAAC,CAAC,CAAC,KAAK,EAC/D,UAAU,EAAE,IAAI,EAChB,SAAS,EAAE,IAAI,EACf,UAAU,EAAE,oBAAC,cAAc,OAAE,EAC7B,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,EAChC,OAAO,EAAE,GAAG,EAAE;gBACV,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,CAAA;YAC/C,CAAC,EACD,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,EACrC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE;gBACjB,MAAM,EAAC,MAAM,EAAC,GAAG,CAAC,CAAC;gBACnB,8GAA8G;gBAC9G,gEAAgE;gBAChE,4EAA4E;gBAC5E,IAAI,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,cAAc,CAAC,EAAE;oBAC5E,IAAI,CAAC,qBAAqB,EAAE,CAAC;iBAChC;YACL,CAAC,GACI,CAAA;IACb,CAAC;;AA3QM,yBAAY,GAAG;IAClB,WAAW,EAAE,GAAG;CACnB,CAAA"}
|
|
@@ -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":"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;IAChC,OAAO,CAAC,GAAG,CAAC,YAAY,EAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,EAAE;QAC1B,OAAO,CAAC,GAAG,CAAC,aAAa,EAAC,KAAK,CAAC,CAAC;QACjC,IAAI,QAAQ,EAAE;YACV,QAAQ,CAAC,KAAK,CAAC,CAAC;SACnB;IACL,CAAC,CAAA;IAED,IAAI,MAAM,GAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACnC,IAAI,UAAU,GAAC,MAAM,CAAC,YAAY,CAAC,EAAE,QAAQ,GAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACjE,IAAI,WAAW,GAAC,KAAK,IAAI,KAAK,IAAE,CAAC,CAAC,CAAC,CAAA,KAAK,CAAA,CAAC,CAAA,IAAI,CAAC;IAE9C,MAAM,gBAAgB,GAAG,CAAC,KAAK,EAAE,EAAE;QAC/B,IAAI,QAAQ,EAAE;YACV,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,EAAC,QAAQ,CAAC,CAAC,CAAC;SAC/C;IACL,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,EAAE;QAC7B,IAAI,QAAQ,EAAE;YACV,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAC,KAAK,CAAC,CAAC,CAAC;SACjD;IACL,CAAC,CAAA;IAED,MAAM,SAAS,GAAG,CAAC,CAAC,EAAE,EAAE;QAChB,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,IAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YACjE,iCAAiC;SACpC;aAAM;YACH,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,CAAA;SACxB;IACL,CAAC,CACJ;IACD,IAAI,WAAW,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IAC7E,IAAI,QAAQ,GAAY,WAAW,CAAC,QAAQ,CAAC;IAE7C,IAAI,gBAAgB,GAAG;QACpB,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAC,KAAK;KACjC,CAAA;IAED,QAAQ,QAAQ,EAAE;QACd,KAAK,KAAK;YACN,YAAY,GAAG,oBAAC,eAAe,kBAAG,KAAK,oBAAM,KAAK,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,UAAU,UAC/C,gBAAgB,IAAE,KAAK,EAAE,WAAW,EACvC,QAAQ,EAAE,WAAW,IACpD,CAAA;YACF,MAAM;QACV,KAAK,SAAS,CAAC;QACf,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ;YACT,YAAY,GAAG,oBAAC,eAAe,kBAAC,KAAK,oBAAM,KAAK,KACxC,gBAAgB,IAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;gBAC5D,kBAAkB;gBAClB,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,WAAW,IAClC,CAAA;YACF,MAAM;QACV,KAAK,UAAU;YACX,YAAY;gBACR,oBAAC,KAAK;oBACN,oBAAC,eAAe,IAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EACpC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB,GAC5E;;oBACF,oBAAC,eAAe,IAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAClB,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAClC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,GAC3D,CACc,CAAC;YACjB,MAAM;QACV,KAAK,cAAc;YACf,YAAY;gBACR,oBAAC,KAAK;oBACF,oBAAC,eAAe,IAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAClB,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,UAAU,EACnC,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,EACtC,QAAQ,EAAE,QAAQ,GACjC;;oBACF,oBAAC,eAAe,IAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAClB,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAC5C,QAAQ,EAAE,cAAc,EAAG,QAAQ,EAAE,QAAQ,GAC7D,CACE,CAAC;YACb,MAAM;KACb;IACD,OAAO,YAAY,CAAC;AACxB,CAAC,CAAA;AAED,eAAe,WAAW,CAAC"}
|
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
|
@@ -154,7 +154,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
154
154
|
pageSize: 4,
|
|
155
155
|
virtualEndPageNo: undefined,
|
|
156
156
|
};
|
|
157
|
-
titleId = selectConfig_.
|
|
157
|
+
titleId = selectConfig_.primaryColumn.id;
|
|
158
158
|
//得到第一个过滤条件
|
|
159
159
|
let firstCriteria = selectConfig_.primaryCriteria;
|
|
160
160
|
let formItemName = 'undefinedCriteria';
|
|
@@ -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':
|
|
@@ -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
|
|