ns-base-module 1.1.65 → 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);
@@ -943,15 +940,15 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
   var cancel = function cancel() {};
 
   // 设置默认
-  var handleSaveDefault = function handleSaveDefault(isDefault) {
+  var handleSaveDefault = function handleSaveDefault(isDefault, code) {
     var arr = [].concat(_toConsumableArray(templateUser), _toConsumableArray(template));
     arr.forEach(function (item) {
       if (item.value === value) {
         saveTempale({
           menu_code: menuCode,
           form_template_code: formTemplateCode,
-          is_default: isDefault,
-          is_default_public: isDefault,
+          is_default: code !== "public" ? isDefault : "N",
+          is_default_public: code === "public" ? isDefault : "N",
           code: item === null || item === void 0 ? void 0 : item.value,
           name: item === null || item === void 0 ? void 0 : item.label,
           configs: item === null || item === void 0 ? void 0 : item.define,
@@ -1171,7 +1168,26 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
     type: "primary"
   }, initLang({
     id: "button.set.default"
-  }))), /*#__PURE__*/React.createElement(Button, {
+  }))), (curItem === null || curItem === void 0 ? void 0 : curItem.perms_type) == "public" && /*#__PURE__*/React.createElement(React.Fragment, null, (curItem === null || curItem === void 0 ? void 0 : curItem.is_default_public) === "Y" ? /*#__PURE__*/React.createElement(Button, {
+    onClick: function onClick() {
+      return handleSaveDefault("N", "public");
+    },
+    size: "small",
+    type: "primary"
+  }, initLang({
+    id: "button.set.cancelDefault"
+  })) : /*#__PURE__*/React.createElement(Popconfirm, {
+    title: "\u6CA1\u6709\u8BBE\u7F6E\u4E2A\u4EBA\u6A21\u677F\u7684\u7528\u6237\u5C06\u4F1A\u9ED8\u8BA4\u5230\u8BE5\u516C\u5171\u6A21\u677F!",
+    onConfirm: function onConfirm() {
+      handleSaveDefault("Y", "public");
+    }
+    // onCancel={() => {}}
+  }, /*#__PURE__*/React.createElement(Button, {
+    size: "small",
+    type: "primary"
+  }, initLang({
+    id: "button.set.default"
+  })))), /*#__PURE__*/React.createElement(Button, {
     style: {
       marginLeft: 8
     },

package/dist/TableHeaderConfigPopover/utils.js

@@ -105,6 +105,7 @@ 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) {
@@ -126,100 +127,107 @@ export function adapterColumns(customColumns, columns) {
         _loop2(k, j);
       }
     };
+    var item = null;
     for (var n = 0, leng = customColumns.length; n < leng; n++) {
-      var item = customColumns[n];
-      if (item.is_default == "Y") {
-        var JsonPares = JSON.parse(item.define);
+      if (customColumns[n].is_default_public == "Y") {
+        item = customColumns[n];
+      }
+      if (customColumns[n].is_default == "Y") {
+        item = customColumns[n];
+        break;
+      }
+    }
+    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];
-                });
-                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);
-                }
+        // 动态列 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];
               });
-            };
-            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;
+              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);
                 }
-                // else {
-                //   if (_JsonPares[i].children && _JsonPares[i].children.length) {
-                //     loopSetZable(_JsonPares[i].children);
-                //   }
-                // }
+                var d = initColumns([_columns[j]], null)[0];
+                _JsonPares[i] = _objectSpread({}, d);
+                return;
               }
-            };
-            loopSetZable(JsonPares);
-          }
-        };
-        for (var j = 0, k = _columns.length; j < k; j++) {
-          _loop3(j);
+              // else {
+              //   if (_JsonPares[i].children && _JsonPares[i].children.length) {
+              //     loopSetZable(_JsonPares[i].children);
+              //   }
+              // }
+            }
+          };
+          loopSetZable(JsonPares);
         }
+      };
+      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
+      };
     }
   }
   return {