ns-base-module 2.0.11 → 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({

package/dist/TableHeaderConfigPopover/index.js

@@ -158,6 +158,13 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
       dragNode = _ref2.dragNode;
     var nextColumns = cloneDeep(columnsTree);
 
+    // 禁止跨层级拖拽 模板 和更新的数据匹配渲染问题， 渲染时也只匹配同级增删改
+    // 修复 模板存储 a下的b, 新表头b在c下面 并改名d
+    if (node.parentCode !== dragNode.parentCode) {
+      message.warning("不允许改变层级");
+      return;
+    }
+
     // 找到 旧位置 删除自己
     var delDom = null;
     function _loopFind(tree, dom, command) {

package/dist/TableHeaderConfigPopover/utils.js

@@ -80,6 +80,7 @@ var updateTemplateFilds = function updateTemplateFilds(JsonPares, _columns) {
     if (_findItem) {
       JsonPares[r] = _objectSpread(_objectSpread({}, _findItem), {}, {
         title: _findItem.title || JsonPares[r].title,
+        label: _findItem.label || JsonPares[r].label,
         fixed: JsonPares[r].fixed,
         width: JsonPares[r].width,
         checked: JsonPares[r].checked,
@@ -113,7 +114,7 @@ export function adapterColumns(customColumns, columns) {
         var _code = arr[j].code ? "code" : "dataIndex";
         if (commad === "del") {
           if (!find(_columns, function (o) {
-            return o[_code] === arr[j][_code];
+            return o[_code] === arr[j][_code] && o.parentCode === arr[j].parentCode;
           })) {
             arr.splice(j, 1);
             _k -= 1;
@@ -151,7 +152,7 @@ export function adapterColumns(customColumns, columns) {
         var _loop3 = function _loop3(j) {
           var _code = _columns[j].code ? "code" : "dataIndex";
           if (!find(flaJsonPares, function (o) {
-            return o[_code] === _columns[j][_code];
+            return o[_code] === _columns[j][_code] && o.parentCode === _columns[j].parentCode;
           })) {
             var _item = initColumns([_columns[j]], null)[0];
             if (_item.customizable !== false) {