ns-base-module 1.1.66 → 1.1.67

package/dist/TableHeaderConfigPopover/index.js

@@ -32,7 +32,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 // import { initLang } from "@/utils/language";
 import { CopyOutlined, DeleteOutlined, PlusOutlined, SettingOutlined, ShareAltOutlined, UserOutlined } from "@ant-design/icons";
 import { Button, Checkbox, Input, message, Popconfirm, Popover, Radio, Tooltip, Tree } from "antd";
-import { cloneDeep, find, isArray, isEmpty } from "lodash";
+import { cloneDeep, isArray, isEmpty } from "lodash";
 import React, { memo, useEffect, useMemo, useState } from "react";
 import { DndProvider } from "react-dnd";
 import { HTML5Backend } from "react-dnd-html5-backend";
@@ -40,7 +40,7 @@ import Dustbin from "./Dustbin";
 import "../../style/components/TableHeaderConfigPopover.scss";
 import { initLang } from "../utils/language";
 import { queryColumnsConfig, setFormTemplates } from "../utils/services/global";
-import { initColumns, sortColums } from "./utils";
+import { adapterColumns, sortColums } from "./utils";
 // 设置界面
 var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
   var columns = props.columns,
@@ -814,39 +814,36 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
   var handleSet = function handleSet(item) {
     try {
       // 匹配是否有字段修改
-      var JsonPares = JSON.parse(item.define);
-      // 删掉新数组没有的字段
-      var _loop2 = function _loop2(_k, j) {
-        var _code = JsonPares[j].code ? "code" : "dataIndex";
-        if (!find(props.columns, function (o) {
-          return o[_code] === JsonPares[j][_code];
-        })) {
-          JsonPares.splice(j, 1);
-          _k -= 1;
-        }
-        k = _k;
-      };
-      for (var j = 0, k = JsonPares.length; j < k; j++) {
-        _loop2(k, j);
-      }
-      // 新增新数组字段 || 更新名称
-      var _loop3 = function _loop3(_j) {
-        var _code = props.columns[_j].code ? "code" : "dataIndex";
-        var _findItem = find(JsonPares, function (o) {
-          return o[_code] === props.columns[_j][_code];
-        });
-        if (!_findItem) {
-          JsonPares.push(initColumns([props.columns[_j]], null)[0]);
-        } else {
-          // 更新名称
-          if (_findItem.title !== props.columns[_j].title) {
-            _findItem.title = props.columns[_j].title;
-          }
-        }
-      };
-      for (var _j = 0, _k2 = props.columns.length; _j < _k2; _j++) {
-        _loop3(_j);
-      }
+      // const JsonPares = JSON.parse(item.define) as any;
+      // // 删掉新数组没有的字段
+      // for (let j = 0, k = JsonPares.length; j < k; j++) {
+      //   const _code = JsonPares[j].code ? "code" : "dataIndex";
+      //   if (!find(props.columns, (o) => o[_code] === JsonPares[j][_code])) {
+      //     JsonPares.splice(j, 1);
+      //     k -= 1;
+      //   }
+      // }
+      // // 新增新数组字段 || 更新名称
+      // for (let j = 0, k = props.columns.length; j < k; j++) {
+      //   const _code = props.columns[j].code ? "code" : "dataIndex";
+      //   const _findItem = find(
+      //     JsonPares,
+      //     (o) => o[_code] === props.columns[j][_code]
+      //   );
+      //   if (!_findItem) {
+      //     JsonPares.push(initColumns([props.columns[j]], null)[0]);
+      //   } else {
+      //     // 更新名称
+      //     if (_findItem.title !== props.columns[j].title) {
+      //       _findItem.title = props.columns[j].title;
+      //     }
+      //   }
+      // }
+
+      var _adapterColumns = adapterColumns([_objectSpread(_objectSpread({}, item), {}, {
+          is_default: "Y"
+        })], props.columns),
+        JsonPares = _adapterColumns.JsonPares;
       setColumnsCofnig(JsonPares);
       setShowConfig(true);
       setEditItem(item);