ns-base-module 1.1.66 → 1.1.68

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,
@@ -738,7 +738,7 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
   var getColumnsFilter = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var _res;
-      var res, _res2, _templateUser, _template;
+      var res, _res2, _templateUser, _template, hasDefault;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -771,6 +771,7 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
             if ((_res = res) !== null && _res !== void 0 && (_res = _res.data) !== null && _res !== void 0 && _res.data) {
               _templateUser = [];
               _template = [];
+              hasDefault = false;
               (_res2 = res) === null || _res2 === void 0 || (_res2 = _res2.data) === null || _res2 === void 0 || _res2.data.forEach(function (item) {
                 if (item.perms_type === "private") {
                   _templateUser.push(item);
@@ -778,6 +779,11 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
                   _template.push(item);
                 }
                 if (item.is_default === "Y") {
+                  hasDefault = true;
+                  setValue(item.value);
+                  setCurItem(item);
+                }
+                if (item.is_default_public === "Y" && !hasDefault) {
                   setValue(item.value);
                   setCurItem(item);
                 }
@@ -814,39 +820,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);
@@ -964,7 +967,10 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
               id: "message.success.set"
             }));
             // 刷新列表
-            // setCurItem({});
+            setCurItem(_objectSpread(_objectSpread({}, item), {}, {
+              is_default: code !== "public" ? isDefault : "N",
+              is_default_public: code === "public" ? isDefault : "N"
+            }));
             getColumnsFilter();
           }
         });
@@ -1102,7 +1108,7 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
     }, /*#__PURE__*/React.createElement(Radio, {
       value: item.value,
       className: "list-radio-label"
-    }, item.label), item.is_default === "Y" && /*#__PURE__*/React.createElement("span", {
+    }, item.label), item.is_default_public === "Y" && /*#__PURE__*/React.createElement("span", {
       className: "set-text-default"
     }, initLang({
       id: "prompt.text.default"

package/dist/TableHeaderConfigPopover/utils.js

@@ -46,7 +46,8 @@ export var initColumns = function initColumns(arr, parent) {
 var flatColumns = function flatColumns(_columns) {
   var initArr = [];
   var flatArr = function flatArr(arr) {
-    arr.forEach(function (item) {
+    var _arr$forEach;
+    arr === null || arr === void 0 || (_arr$forEach = arr.forEach) === null || _arr$forEach === void 0 || _arr$forEach.call(arr, function (item) {
       initArr.push(item);
       if (Array.isArray(item.children) && item.children.length) {
         // 子级是动态列 父级也必须是
@@ -105,7 +106,6 @@ var updateTemplateFilds = function updateTemplateFilds(JsonPares, _columns) {
  * */
 export function adapterColumns(customColumns, columns) {
   if (customColumns && customColumns.length && columns && columns.length) {
-    var _item2;
     // 展平 columns, 1,子是动态列 父级必须是，父级的表头宽度取决于子级设置.2,子级是浮动 父级同步 解决首行选择框的浮动
     var _columns = flatColumns(columns);
     var itemLoop = function itemLoop(arr, commad) {
@@ -137,98 +137,101 @@ export function adapterColumns(customColumns, columns) {
         break;
       }
     }
-    if ((_item2 = item) !== null && _item2 !== void 0 && _item2.is_default) {
-      var JsonPares = JSON.parse(item.define);
+    try {
+      var _item2;
+      if ((_item2 = item) !== null && _item2 !== void 0 && _item2.is_default) {
+        var JsonPares = JSON.parse(item.define);
 
-      // 删 旧模板多出的字段
-      itemLoop(JsonPares, "del");
+        // 删 旧模板多出的字段
+        itemLoop(JsonPares, "del");
 
-      // 展平 columns
-      var flaJsonPares = flatColumns(JsonPares);
-      // 增 新字段加最后
-      var _loop3 = function _loop3(j) {
-        var _code = _columns[j].code ? "code" : "dataIndex";
-        if (!find(flaJsonPares, function (o) {
-          return o[_code] === _columns[j][_code];
-        })) {
-          var _item = initColumns([_columns[j]], null)[0];
-          if (_item.customizable !== false) {
-            // 不是动态列
-            if (_item.fixed === "left") {
-              JsonPares.unshift(_item);
-            } else {
-              JsonPares.push(_item);
+        // 展平 columns
+        var flaJsonPares = flatColumns(JsonPares);
+        // 增 新字段加最后
+        var _loop3 = function _loop3(j) {
+          var _code = _columns[j].code ? "code" : "dataIndex";
+          if (!find(flaJsonPares, function (o) {
+            return o[_code] === _columns[j][_code];
+          })) {
+            var _item = initColumns([_columns[j]], null)[0];
+            if (_item.customizable !== false) {
+              // 不是动态列
+              if (_item.fixed === "left") {
+                JsonPares.unshift(_item);
+              } else {
+                JsonPares.push(_item);
+              }
             }
           }
-        }
 
-        // 动态列 columns[j].customizable === false 不能用模板，用列表数据
-        if (_columns[j].customizable === false && _code) {
-          var loopSetChildren = function loopSetChildren(arr1, arr2) {
-            arr1.forEach(function (d) {
-              var h = find(arr2, function (o) {
-                return o[_code] === d[_code];
+          // 动态列 columns[j].customizable === false 不能用模板，用列表数据
+          if (_columns[j].customizable === false && _code) {
+            var loopSetChildren = function loopSetChildren(arr1, arr2) {
+              arr1.forEach(function (d) {
+                var h = find(arr2, function (o) {
+                  return o[_code] === d[_code];
+                });
+                if (h) {
+                  d.width = h.width;
+                  d.fixed = h.fixed;
+                  d.checked = h.checked;
+                }
+                if (d.children && d.children.length && h !== null && h !== void 0 && h.children && h !== null && h !== void 0 && h.children.length) {
+                  loopSetChildren(d.children, h.children);
+                }
               });
-              if (h) {
-                d.width = h.width;
-                d.fixed = h.fixed;
-                d.checked = h.checked;
-              }
-              if (d.children && d.children.length && h !== null && h !== void 0 && h.children && h !== null && h !== void 0 && h.children.length) {
-                loopSetChildren(d.children, h.children);
-              }
-            });
-          };
-          var loopSetZable = function loopSetZable(_JsonPares) {
-            for (var i = 0, l = _JsonPares.length; i < l; i++) {
-              if (_columns[j][_code] === _JsonPares[i][_code]) {
-                var obj = {
-                  width: _JsonPares[i].width,
-                  fixed: _JsonPares[i].fixed,
-                  checked: _JsonPares[i].checked
-                };
-                _columns[j] = _objectSpread(_objectSpread({}, _columns[j]), obj);
-                if (_columns[j].children && _columns[j].children.length && _JsonPares[i].children && _JsonPares[i].children.length) {
-                  loopSetChildren(_columns[j].children, _JsonPares[i].children);
+            };
+            var loopSetZable = function loopSetZable(_JsonPares) {
+              for (var i = 0, l = _JsonPares.length; i < l; i++) {
+                if (_columns[j][_code] === _JsonPares[i][_code]) {
+                  var obj = {
+                    width: _JsonPares[i].width,
+                    fixed: _JsonPares[i].fixed,
+                    checked: _JsonPares[i].checked
+                  };
+                  _columns[j] = _objectSpread(_objectSpread({}, _columns[j]), obj);
+                  if (_columns[j].children && _columns[j].children.length && _JsonPares[i].children && _JsonPares[i].children.length) {
+                    loopSetChildren(_columns[j].children, _JsonPares[i].children);
+                  }
+                  var d = initColumns([_columns[j]], null)[0];
+                  _JsonPares[i] = _objectSpread({}, d);
+                  return;
                 }
-                var d = initColumns([_columns[j]], null)[0];
-                _JsonPares[i] = _objectSpread({}, d);
-                return;
+                // else {
+                //   if (_JsonPares[i].children && _JsonPares[i].children.length) {
+                //     loopSetZable(_JsonPares[i].children);
+                //   }
+                // }
               }
-              // else {
-              //   if (_JsonPares[i].children && _JsonPares[i].children.length) {
-              //     loopSetZable(_JsonPares[i].children);
-              //   }
-              // }
-            }
-          };
-          loopSetZable(JsonPares);
+            };
+            loopSetZable(JsonPares);
+          }
+        };
+        for (var j = 0, k = _columns.length; j < k; j++) {
+          _loop3(j);
         }
-      };
-      for (var j = 0, k = _columns.length; j < k; j++) {
-        _loop3(j);
-      }
 
-      // 子级是否全部 浮动
-      JsonPares.forEach(function (dd) {
-        if (dd.fixed && dd.children && dd.children.length) {
-          var isAllChildrenFixed = true;
-          dd.children.forEach(function (hh) {
-            if (hh.checked && hh.fixed !== dd.fixed) {
-              isAllChildrenFixed = false;
-            }
-          });
-          dd.isAllChildrenFixed = isAllChildrenFixed;
-        }
-      });
+        // 子级是否全部 浮动
+        JsonPares.forEach(function (dd) {
+          if (dd.fixed && dd.children && dd.children.length) {
+            var isAllChildrenFixed = true;
+            dd.children.forEach(function (hh) {
+              if (hh.checked && hh.fixed !== dd.fixed) {
+                isAllChildrenFixed = false;
+              }
+            });
+            dd.isAllChildrenFixed = isAllChildrenFixed;
+          }
+        });
 
-      // 替成新配置
-      updateTemplateFilds(JsonPares, _columns);
-      return {
-        JsonPares: JsonPares,
-        item: item
-      };
-    }
+        // 替成新配置
+        updateTemplateFilds(JsonPares, _columns);
+        return {
+          JsonPares: JsonPares,
+          item: item
+        };
+      }
+    } catch (error) {}
   }
   return {
     JsonPares: null,