ns-base-module 2.0.12 → 2.0.13

package/dist/FilterPopover/Filter.js

@@ -75,6 +75,8 @@ var Filter = function Filter(props) {
   var searchValue = useRef("");
   var searchEmnuValue = useRef([]); // 枚举搜索
   var srolRef = useRef(null);
+  var orderTypeRef = useRef("");
+  var orderKeyRef = useRef("");
   var page = useRef({
     pageNum: 1,
     pageSize: 40,
@@ -140,8 +142,8 @@ var Filter = function Filter(props) {
               pageSize: page.current.pageSize,
               distinctField: [dataIndex],
               variablePara: variablePara,
-              orderKey: orderKey,
-              orderType: orderType
+              orderKey: orderKeyRef.current || orderKey,
+              orderType: orderTypeRef.current || orderType
             };
             res = {};
             datas = [];
@@ -401,10 +403,16 @@ var Filter = function Filter(props) {
   };
   var handleSort = function handleSort(key) {
     if (checkSort === "asc" && key === "asc" || checkSort === "desc" && key === "desc") {
+      orderTypeRef.current = "";
+      orderKeyRef.current = "";
       onSort === null || onSort === void 0 || onSort("");
+      getDates();
       return;
     }
     onSort === null || onSort === void 0 || onSort(key);
+    orderKeyRef.current = dataIndex;
+    orderTypeRef.current = key;
+    getDates();
   };
   var selectSearch = function selectSearch(e) {
     setSelectValue(e);

package/dist/FilterPopover/index.js

@@ -87,7 +87,6 @@ var Index = function Index(_ref2) {
 
   // 活动的icon显示
   var visibilityStyle = useMemo(function () {
-    console.log("filterValuefilterValue:", filterValue);
     var _value = get(props === null || props === void 0 ? void 0 : props.filterSearch, "".concat(dataIndex, ".value"), "");
     if (!dataIndex) return null;
     if (!_value) {

package/dist/SubtotalsModal/subtotalTemplate.js

@@ -291,17 +291,12 @@ var Index = function Index(props) {
         }),
         onConfirm: confirm,
         onCancel: cancel
-      }, /*#__PURE__*/React.createElement(Tooltip, {
-        placement: "top",
-        title: initLang({
-          id: "prompt.delTemplate"
-        })
       }, /*#__PURE__*/React.createElement(DeleteOutlined, {
         className: "set-icon",
         onClick: function onClick() {
           return handleDel(item);
         }
-      })));
+      }));
       var copyDom = /*#__PURE__*/React.createElement(Tooltip, {
         placement: "top",
         title: initLang({