ns-base-module 1.0.30 → 1.0.31
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":"Filter.d.ts","sourceRoot":"","sources":["Filter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAOrC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,2CAA2C,CAAC;AAOnD,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAE1B,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,QAAQ,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAC;IACtD,cAAc,CAAC,EAAE,CACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,MAAM,KACjB,IAAI,CAAC;IACV,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAE1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAWD,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"Filter.d.ts","sourceRoot":"","sources":["Filter.tsx"],"names":[],"mappings":"AAEA,OAAO,KAMN,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAOrC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,2CAA2C,CAAC;AAOnD,MAAM,WAAW,UAAU;IACzB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,iBAAiB,EAAE,CAAC;IAE1B,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,QAAQ,EAAE,CAAC,YAAY,EAAE,iBAAiB,EAAE,KAAK,IAAI,CAAC;IACtD,cAAc,CAAC,EAAE,CACf,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,YAAY,EAAE,MAAM,KACjB,IAAI,CAAC;IACV,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;IAE1D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAE/B,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAWD,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CA+chC,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
|
@@ -238,18 +238,8 @@ var Filter = function Filter(props) {
|
|
|
238
238
|
if (props.onFilterSearch) {
|
|
239
239
|
var _props$onFilterSearch, _props$onFilterSearch2;
|
|
240
240
|
// 改成查接口
|
|
241
|
-
var _criteriaType =
|
|
242
|
-
|
|
243
|
-
// ? 'Equals'
|
|
244
|
-
// :
|
|
245
|
-
// entryType === 'RangeTimePicker' || entryType === 'DateTimePicker'
|
|
246
|
-
// ? 'Between'
|
|
247
|
-
// :
|
|
248
|
-
entryType === "MultSelect" && entryAttr !== null && entryAttr !== void 0 && entryAttr.multValue // 多选 + 多字段标识
|
|
249
|
-
? "MultIn" : entryType === "MultSelect" || Array.isArray(value) ? "In" :
|
|
250
|
-
// : entryType === 'InputNumber'
|
|
251
|
-
// ? 'Equals'
|
|
252
|
-
"Contains";
|
|
241
|
+
var _criteriaType = entryType === "MultSelect" && entryAttr !== null && entryAttr !== void 0 && entryAttr.multValue // 多选 + 多字段标识
|
|
242
|
+
? "MultIn" : entryType === "MultSelect" || Array.isArray(value) ? "In" : "Contains";
|
|
253
243
|
(_props$onFilterSearch = props.onFilterSearch) === null || _props$onFilterSearch === void 0 || _props$onFilterSearch.call(props, dataIndex, value, _criteriaType);
|
|
254
244
|
(_props$onFilterSearch2 = props.onFilterSearchValue) === null || _props$onFilterSearch2 === void 0 || _props$onFilterSearch2.call(props, value); // 显示筛选图标用
|
|
255
245
|
} else {
|
|
@@ -289,7 +279,7 @@ var Filter = function Filter(props) {
|
|
|
289
279
|
if (props.onFilterSearch) {
|
|
290
280
|
// 改成查接口
|
|
291
281
|
var _value = haDict ? multChecked : lastChecked;
|
|
292
|
-
if (allChecked && !searchValue.current) {
|
|
282
|
+
if (allChecked && !searchValue.current && !searchEmnuValue.current) {
|
|
293
283
|
if (menuCode && formTemplateCode) {
|
|
294
284
|
// 查接口清空，编辑表格2是前端查询
|
|
295
285
|
_value = [];
|