ns-base-module 1.0.30 → 1.0.32

package/dist/FilterPopover/Filter.d.ts.map

@@ -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,CAudhC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"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,CAodhC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/FilterPopover/Filter.js

@@ -212,7 +212,7 @@ var Filter = function Filter(props) {
     searchValue.current = value; // 过滤用 前端过滤时
 
     // 枚举 前端搜索label 找出value 给后端搜索
-    if (dictItems && dictItems.length || !(menuCode && formTemplateCode)) {
+    if (dictItems && dictItems.length) {
       // 找枚举的value
       if (value) {
         var _values = [];
@@ -227,6 +227,11 @@ var Filter = function Filter(props) {
         searchEmnuValue.current = [];
       }
     }
+    // 编辑表格2 前端过滤
+    if (!(menuCode && formTemplateCode)) {
+      setSearchval(value); // 搜索用
+      return;
+    }
     getDates();
   };
   var allChecked = useMemo(function () {
@@ -238,18 +243,8 @@ var Filter = function Filter(props) {
     if (props.onFilterSearch) {
       var _props$onFilterSearch, _props$onFilterSearch2;
       // 改成查接口
-      var _criteriaType =
-      // entryType && ['DatePicker', 'Select'].includes(entryType)
-      //   ? 'Equals'
-      //   :
-      // entryType === 'RangeTimePicker' || entryType === 'DateTimePicker'
-      //   ? 'Between'
-      //   :
-      entryType === "MultSelect" && entryAttr !== null && entryAttr !== void 0 && entryAttr.multValue // 多选 + 多字段标识
-      ? "MultIn" : entryType === "MultSelect" || Array.isArray(value) ? "In" :
-      // : entryType === 'InputNumber'
-      // ? 'Equals'
-      "Contains";
+      var _criteriaType = entryType === "MultSelect" && entryAttr !== null && entryAttr !== void 0 && entryAttr.multValue // 多选 + 多字段标识
+      ? "MultIn" : entryType === "MultSelect" || Array.isArray(value) ? "In" : "Contains";
       (_props$onFilterSearch = props.onFilterSearch) === null || _props$onFilterSearch === void 0 || _props$onFilterSearch.call(props, dataIndex, value, _criteriaType);
       (_props$onFilterSearch2 = props.onFilterSearchValue) === null || _props$onFilterSearch2 === void 0 || _props$onFilterSearch2.call(props, value); // 显示筛选图标用
     } else {
@@ -289,7 +284,7 @@ var Filter = function Filter(props) {
     if (props.onFilterSearch) {
       // 改成查接口
       var _value = haDict ? multChecked : lastChecked;
-      if (allChecked && !searchValue.current) {
+      if (allChecked && !searchValue.current && !searchEmnuValue.current) {
         if (menuCode && formTemplateCode) {
           // 查接口清空，编辑表格2是前端查询
           _value = [];