aldehyde 0.1.38 → 0.1.39
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 +1 -0
- package/lib/controls/entity-select/entity-select.d.ts.map +1 -1
- package/lib/controls/entity-select/entity-select.js +4 -1
- package/lib/controls/entity-select/entity-select.js.map +1 -1
- package/lib/controls/entry-control.js +4 -6
- package/lib/controls/entry-control.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/controls/entity-select/entity-select.tsx +6 -2
- package/src/aldehyde/controls/entry-control.tsx +4 -4
|
@@ -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,EAAa,QAAQ,EAAE,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;
|
|
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,EAAa,QAAQ,EAAE,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;CACpB;AAED,aAAK,WAAW,GAAG;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;CACvB,CAAA;AAED,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;;;;;MAKJ;IAGD,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IACnD,YAAY,EAAE,YAAY,CAAa;IAEvC,QAAQ,SAAU,MAAM,SAAS,MAAM;;;;MAYtC;IAED,YAAY,2BAYX;IAED,SAAS,+CAeR;IAED,aAAa,sBAgBZ;IAED,YAAY,qCA2EX;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"}
|
|
@@ -84,7 +84,7 @@ export default class EntitySelect extends React.PureComponent {
|
|
|
84
84
|
}
|
|
85
85
|
});
|
|
86
86
|
this.fetchOptions = (searchText) => __awaiter(this, void 0, void 0, function* () {
|
|
87
|
-
const { fieldConfig, mainCode } = this.props;
|
|
87
|
+
const { fieldConfig, mainCode, baseCriteriaData } = this.props;
|
|
88
88
|
this.setState({
|
|
89
89
|
loading: true,
|
|
90
90
|
});
|
|
@@ -119,6 +119,9 @@ export default class EntitySelect extends React.PureComponent {
|
|
|
119
119
|
/** 构建 dataSource **/
|
|
120
120
|
//构建过滤条件
|
|
121
121
|
let criteriaData = {};
|
|
122
|
+
if (baseCriteriaData) {
|
|
123
|
+
criteriaData = Object.assign({}, baseCriteriaData);
|
|
124
|
+
}
|
|
122
125
|
criteriaData[formItemName] = searchText;
|
|
123
126
|
let queryKey = yield HcserviceV3.requestLtmplQueryKey(fieldConfig.id, Object.assign(Object.assign(Object.assign({}, criteriaData), pageInfo), { mainCode }));
|
|
124
127
|
let sourceData = yield this.loadData(queryKey.key, pageInfo, titleId);
|
|
@@ -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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"}
|
|
@@ -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;AAUzB,SAAS,UAAU,CAAC,QAAQ;IACxB,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE9C,IAAI,KAAK,EAAE;QACP,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAC,CAAC,CAAA;QAC/F,CAAC,CAAC,CAAA;KACL;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAGD,SAAS,aAAa,CAAC,EAAM,EAAC,QAAe,EAAC,WAAwB,EAAE,UAAe,EAAE,QAAa,EAAE,KAAU;
|
|
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;AAUzB,SAAS,UAAU,CAAC,QAAQ;IACxB,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE9C,IAAI,KAAK,EAAE;QACP,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACf,OAAO,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAC,CAAC,CAAA;QAC/F,CAAC,CAAC,CAAA;KACL;IACD,OAAO,OAAO,CAAC;AACnB,CAAC;AAGD,SAAS,aAAa,CAAC,EAAM,EAAC,QAAe,EAAC,WAAwB,EAAE,UAAe,EAAE,QAAa,EAAE,KAAU,EAAC,KAAK;IAEpH,IAAI,QAAQ,GAAG,oBAAoB,CAAC,cAAc,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAE5E,IAAI,YAAY,GAAG,SAAS,CAAC;IAE7B,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,UAAU,GAAe,MAAM,CAAC;IACpC,IAAI,YAAY,GAAQ,WAAW,CAAC,GAAG,CAAC;IACxC,IAAI,GAAG,GAAC,CAAC,YAAY,IAAI,YAAY,IAAE,GAAG,CAAE,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAChG,YAAY,GAAC,WAAW,CAAC,GAAG,CAAC;IAC7B,IAAI,GAAG,GAAC,CAAC,YAAY,IAAI,YAAY,IAAE,GAAG,CAAE,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAAA,CAAC;IAEjG,IAAI,YAAY,mCAAO,KAAK,KACzB,EAAE,EAAE,QAAQ,EAAC,WAAW,EAAC,GAAG,EAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,EAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAC,GACtI,CAAA;IAED,IAAI,gBAAgB,GAAG;QACnB,EAAE,EAAE,QAAQ,EAAC,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAC;KACzG,CAAA;IAED,MAAM,gBAAgB,GAAG,oBAAC,KAAK,IAC3B,IAAI,EAAC,MAAM,EACX,WAAW,EAAE,QAAQ,QAAQ,EAAE,EAC/B,QAAQ,EAAE,IAAI,GAChB,CAAC;IAEH,SAAS;IACT,IAAG,aAAa,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAC;QAC5C,OAAO,KAAK,CAAC,aAAa,CAAC,aAAa,CAAC,oBAAoB,CAAC,QAAQ,CAAC,EAAC,YAAY,CAAC,CAAC;KACzF;IAED,QAAQ,QAAQ,EAAE;QACd,KAAK,KAAK,CAAC;QACX,KAAK,SAAS,CAAC;QACf,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd,KAAK,UAAU,CAAC;QAChB,KAAK,cAAc;YACf,YAAY,GAAG,oBAAC,WAAW,oBACnB,YAAY,EAClB,CAAA;YACF,MAAM;QACV,KAAK,MAAM;YACP,YAAY,GAAG,oBAAC,KAAK,kBAAC,UAAU,EAAE,IAAI,EAClC,IAAI,EAAC,MAAM,IACP,gBAAgB,EACtB,CAAC;YACH,MAAM;QACV,KAAK,OAAO;YACR,YAAY,GAAG,oBAAC,UAAU;YACtB,iCAAiC;gCAC7B,YAAY,EAClB,CAAC;YACH,MAAM;QACV,KAAK,QAAQ;YACT,YAAY,GAAG,oBAAC,MAAM,oBACd,gBAAgB,IACpB,eAAe,EAAC,0BAAM,EACtB,UAAU,EAAE,IAAI,EAChB,UAAU,QACV,eAAe,EAAE,OAAO,EACxB,gBAAgB,EAAE,OAAO,EACzB,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,IAEpC,CAAA;YACT,MAAM;QACV,KAAK,aAAa,CAAC;QACnB,KAAK,UAAU;YACX,YAAY,GAAG,oBAAC,MAAM,kBAClB,IAAI,EAAC,UAAU,IACX,gBAAgB,IACpB,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,EAC3E,eAAe,EAAC,0BAAM,EACtB,UAAU,EAAE,IAAI,EAChB,UAAU,QACV,eAAe,EAAE,OAAO,EACxB,gBAAgB,EAAE,OAAO;gBACzB,qCAAqC;gBACrC,qCAAqC;gBACrC,0EAA0E;gBAC1E,IAAI;gBACJ,IAAI;gBACJ,SAAS,EAAE,IAAI,EACf,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,IAEpC,CAAA;YACT,MAAM;QACV,KAAK,UAAU;YACX,YAAY,GAAG,oBAAC,aAAa,oBAAK,gBAAgB,IAAE,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,IAAK,CAAA;YAC/K,MAAM;QACV,KAAK,OAAO;YACR,YAAY,GAAG,oBAAC,UAAU,oBAAK,gBAAgB,IAAE,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,UAAU,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,IAAK,CAAA;YAC/K,MAAM;QACV,KAAK,eAAe;YAChB,MAAM,EAAC,KAAK,EAAC,QAAQ,EAAC,KAAK,KAAW,gBAAgB,EAAvB,KAAK,UAAE,gBAAgB,EAAhD,8BAA+B,CAAiB,CAAA;YACtD,YAAY,GAAE,oBAAC,MAAM,kBAAC,KAAK,EAAE,EAAC,KAAK,EAAC,MAAM,EAAC,EAAE,eAAe,EAAC,QAAG,EAAC,iBAAiB,EAAC,QAAG,EAAC,OAAO,EAAE,KAAK,IAAE,GAAG,CAAA,CAAC,CAAA,IAAI,CAAA,CAAC,CAAA,KAAK,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAC,EAAE;oBACxI,QAAQ,CAAC,OAAO,CAAA,CAAC,CAAA,GAAG,CAAA,CAAC,CAAA,GAAG,CAAC,CAAC;gBAC9B,CAAC,IACK,KAAK,EAAI,CAAA;YACf,MAAM;QACV,KAAK,SAAS,CAAC;QACf,KAAK,cAAc,CAAC;QACpB,KAAK,SAAS,CAAC;QACf,KAAK,cAAc,CAAC;QACpB,KAAK,MAAM,CAAC;QACZ,KAAK,WAAW,CAAC;QACjB,KAAK,aAAa,CAAC;QACnB,KAAK,kBAAkB,CAAC;QACxB,KAAK,aAAa,CAAC;QACnB,KAAK,kBAAkB,CAAC;QACxB,KAAK,UAAU,CAAC;QAChB,KAAK,eAAe;YAChB,YAAY,GAAG,oBAAC,UAAU,oBAAM,YAAY,EAAG,CAAC;YAChD,MAAM;QACV,KAAK,SAAS,CAAC;QACf,KAAK,cAAc,CAAC;QACpB,KAAK,SAAS,CAAC;QACf,KAAK,cAAc,CAAC;QACpB,KAAK,MAAM,CAAC;QACZ,KAAK,WAAW;YACZ,YAAY,GAAG,oBAAC,UAAU,oBAAM,YAAY,EAAG,CAAC;YAChD,MAAM;QACV,KAAK,UAAU;YACX,YAAY;gBACR,oBAAC,QAAQ,kBAAC,IAAI,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,IACrB,gBAAgB,EAC5B,CAAA;YACN,MAAM;QACV,KAAK,MAAM;YACP,YAAY,GAAG,oBAAC,UAAU,kBAAC,UAAU,EAAE,MAAM,IAAO,YAAY,EAAe,CAAC;YAChF,MAAM;QACV,KAAK,OAAO;YACR,YAAY,GAAG,oBAAC,KAAK,oBAAK,YAAY,EAAG,CAAA;YACzC,MAAM;QACV,KAAK,UAAU;YACX,YAAY,GAAG,gBAAgB,CAAC;YAChC,MAAM;QACV,KAAK,WAAW;YACZ,YAAY,GAAG,oBAAC,YAAY,oBAAK,YAAY,EAAI,CAAA;YACjD,MAAM;QACV,KAAK,UAAU;YACX,YAAY,GAAE,oBAAC,QAAQ,oBAAK,YAAY,EAAa,CAAC;YACtD,MAAM;QACV,KAAK,UAAU;YACX,YAAY,GAAG,gBAAgB,CAAC;YAChC,MAAM;QACV,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO,CAAC;QACb,KAAK,SAAS;YACV,YAAY,GAAG,oBAAC,MAAM,oBAAK,YAAY,EAAI,CAAA;YAC3C,MAAM;QACV,KAAK,WAAW;YACZ,YAAY,GAAG,oBAAC,SAAS,kBAAC,UAAU,EAAE,MAAM,IAAM,YAAY,EAAc,CAAA;YAC5E,gCAAgC;YAChC,MAAM;QACV,KAAK,WAAW,CAAC;QACjB,KAAK,WAAW,CAAC;QACjB,KAAK,eAAe;YAChB,YAAY,GAAC,oBAAC,YAAY,kBAAC,WAAW,EAAE,GAAG,CAAA,CAAC,CAAA,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAC,CAAA,SAAS,IAAM,YAAY,EAAK,CAAA;YAC1F,4FAA4F;YAC5F,MAAM;QACV,KAAK,qBAAqB;YACtB,YAAY,GAAC,oBAAC,mBAAmB,kBAAC,WAAW,EAAE,GAAG,CAAA,CAAC,CAAA,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAC,CAAA,SAAS,IAAM,YAAY,EAAK,CAAA;YACjG,4FAA4F;YAC5F,MAAM;QACV,KAAK,iBAAiB;YAClB,YAAY,GAAC,oBAAC,aAAa,kBAAC,WAAW,EAAE,GAAG,CAAA,CAAC,CAAA,QAAQ,CAAC,GAAG,CAAC,CAAA,CAAC,CAAA,SAAS,IAAM,YAAY,EAAK,CAAA;YAC3F,4FAA4F;YAC5F,MAAM;QACV,KAAK,UAAU;YACX,YAAY,GAAG,oBAAC,QAAQ,oBAAK,YAAY,EAAa,CAAA;YACtD,MAAM;QACV,KAAK,WAAW;YACZ,YAAY,GAAG,oBAAC,SAAS,oBAAK,YAAY,EAAc,CAAA;YACxD,MAAM;QACV,KAAK,OAAO;YACR,YAAY,GAAG,oBAAC,WAAW,oBAAK,YAAY,EAAgB,CAAA;YAC5D,MAAM;QACV,KAAK,QAAQ,EAAC,EAAE;YACZ,YAAY,GAAG,oBAAC,KAAK,IACjB,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,IAAI,GAChB,CAAC;YACH,MAAM;QACV;YACI,YAAY,GAAG,gBAAgB,CAAA;YAC/B,MAAM;KACb;IAED,OAAO,YAAY,CAAC;AAExB,CAAC;AAED,MAAM,YAAY,GAAgC,CAAC,KAAK,EAAE,EAAE;IACxD,MAAM,EAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAC,EAAE,EAAC,QAAQ,KAAa,KAAK,EAAd,KAAK,UAAI,KAAK,EAA3D,sDAAmD,CAAQ,CAAC;IAClE,OAAO,aAAa,CAAC,EAAE,EAAC,QAAQ,EAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAC,KAAK,CAAC,CAAC;AAC/E,CAAC,CAAA;AAED,eAAe,YAAY,CAAC"}
|
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 {
|
|
@@ -69,7 +70,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
69
70
|
if (value instanceof Array) {
|
|
70
71
|
valueArray = value;
|
|
71
72
|
} else {
|
|
72
|
-
if (value) {
|
|
73
|
+
if (value) {
|
|
73
74
|
valueArray = value.split(',');
|
|
74
75
|
} else {
|
|
75
76
|
valueArray = [];
|
|
@@ -114,7 +115,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
114
115
|
}
|
|
115
116
|
|
|
116
117
|
fetchOptions = async (searchText) => {
|
|
117
|
-
const { fieldConfig,mainCode} = this.props;
|
|
118
|
+
const { fieldConfig,mainCode,baseCriteriaData} = this.props;
|
|
118
119
|
|
|
119
120
|
this.setState({
|
|
120
121
|
loading: true,
|
|
@@ -151,6 +152,9 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
151
152
|
/** 构建 dataSource **/
|
|
152
153
|
//构建过滤条件
|
|
153
154
|
let criteriaData = {};
|
|
155
|
+
if(baseCriteriaData){
|
|
156
|
+
criteriaData={...baseCriteriaData}
|
|
157
|
+
}
|
|
154
158
|
criteriaData[formItemName] = searchText;
|
|
155
159
|
let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey( fieldConfig.id, {...criteriaData, ...pageInfo,mainCode});
|
|
156
160
|
let sourceData = await this.loadData(queryKey.key, pageInfo, titleId);
|
|
@@ -60,7 +60,7 @@ function getOptions(mstrucId) {
|
|
|
60
60
|
}
|
|
61
61
|
|
|
62
62
|
|
|
63
|
-
function renderControl(id:any,mainCode:string,fieldConfig: FieldConfig, fieldValue: any, onChange: any, width: any) {
|
|
63
|
+
function renderControl(id:any,mainCode:string,fieldConfig: FieldConfig, fieldValue: any, onChange: any, width: any,other) {
|
|
64
64
|
|
|
65
65
|
let itemType = ControlTypeSupportor.getControlType(fieldConfig, fieldValue);
|
|
66
66
|
|
|
@@ -75,7 +75,7 @@ function renderControl(id:any,mainCode:string,fieldConfig: FieldConfig, fieldVal
|
|
|
75
75
|
fieldConfigM=fieldConfig.max;
|
|
76
76
|
let max=(fieldConfigM || fieldConfigM=='0' ) ? Units.configParamTrans(fieldConfigM) : undefined;;
|
|
77
77
|
|
|
78
|
-
let controlProps = {
|
|
78
|
+
let controlProps = {...other,
|
|
79
79
|
id, mainCode,fieldConfig,min,max, itemType, viewOrEdit, onChange, disabled, value: fieldValue, style: {minWidth: 220, width: '100%'}
|
|
80
80
|
}
|
|
81
81
|
|
|
@@ -258,8 +258,8 @@ function renderControl(id:any,mainCode:string,fieldConfig: FieldConfig, fieldVal
|
|
|
258
258
|
}
|
|
259
259
|
|
|
260
260
|
const EntryControl: React.FC<EntryControlProps> = (props) => {
|
|
261
|
-
const {fieldConfig, value, onChange,id,mainCode} = props;
|
|
262
|
-
return renderControl(id,mainCode,fieldConfig, value, onChange, null);
|
|
261
|
+
const {fieldConfig, value, onChange,id,mainCode,...other} = props;
|
|
262
|
+
return renderControl(id,mainCode,fieldConfig, value, onChange, null,other);
|
|
263
263
|
}
|
|
264
264
|
|
|
265
265
|
export default EntryControl;
|