aldehyde 0.1.46 → 0.1.47
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.
|
@@ -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,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,YAAY,EAAC,MAAM,CAAC;CACvB;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,
|
|
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,YAAY,EAAC,MAAM,CAAC;CACvB;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,qCAiFX;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"}
|
|
@@ -124,11 +124,15 @@ export default class EntitySelect extends React.PureComponent {
|
|
|
124
124
|
/** 构建 dataSource **/
|
|
125
125
|
//构建过滤条件
|
|
126
126
|
let criteriaData = {};
|
|
127
|
+
let mainCode_ = mainCode;
|
|
127
128
|
if (baseCriteria) {
|
|
128
129
|
criteriaData = Object.assign({}, baseCriteria);
|
|
130
|
+
if (!mainCode) {
|
|
131
|
+
mainCode_ = baseCriteria['mainCode']; //当只在条件中设置mainCode时，保证生效不被设置为null
|
|
132
|
+
}
|
|
129
133
|
}
|
|
130
134
|
criteriaData[formItemName] = searchText;
|
|
131
|
-
let queryKey = yield HcserviceV3.requestLtmplQueryKey(fieldConfig.id, Object.assign(Object.assign(Object.assign({}, criteriaData), pageInfo), {
|
|
135
|
+
let queryKey = yield HcserviceV3.requestLtmplQueryKey(fieldConfig.id, Object.assign(Object.assign(Object.assign({}, criteriaData), pageInfo), { mainCode_ }));
|
|
132
136
|
let sourceData = yield this.loadData(queryKey.key, pageInfo, titleId);
|
|
133
137
|
optionCache = {
|
|
134
138
|
options: sourceData.options,
|
|
@@ -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":"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"}
|
package/package.json
CHANGED
|
@@ -169,11 +169,15 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
|
|
|
169
169
|
/** 构建 dataSource **/
|
|
170
170
|
//构建过滤条件
|
|
171
171
|
let criteriaData = {};
|
|
172
|
+
let mainCode_=mainCode;
|
|
172
173
|
if(baseCriteria){
|
|
173
174
|
criteriaData={...baseCriteria}
|
|
175
|
+
if(!mainCode){
|
|
176
|
+
mainCode_=baseCriteria['mainCode']; //当只在条件中设置mainCode时，保证生效不被设置为null
|
|
177
|
+
}
|
|
174
178
|
}
|
|
175
179
|
criteriaData[formItemName] = searchText;
|
|
176
|
-
let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey( fieldConfig.id, {...criteriaData, ...pageInfo,
|
|
180
|
+
let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey( fieldConfig.id, {...criteriaData, ...pageInfo,mainCode_});
|
|
177
181
|
let sourceData = await this.loadData(queryKey.key, pageInfo, titleId);
|
|
178
182
|
|
|
179
183
|
optionCache = {
|