ns-base-module 2.0.6 → 2.0.7

package/dist/TableHeaderConfigPopover/index.js

@@ -33,7 +33,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 // import { initLang } from "@/utils/language";
 import { CopyOutlined, DeleteOutlined, PlusOutlined, SettingOutlined } 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, get, isArray, isEmpty } from "lodash";
 import React, { memo, useEffect, useMemo, useState } from "react";
 import { DndProvider } from "react-dnd";
 import { HTML5Backend } from "react-dnd-html5-backend";
@@ -42,7 +42,7 @@ import "../../style/components/TableHeaderConfigPopover.scss";
 import IconCreate from "../Icon";
 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,
@@ -705,6 +705,18 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
     _useState20 = _slicedToArray(_useState19, 2),
     curItem = _useState20[0],
     setCurItem = _useState20[1];
+  var mode = useMemo(function () {
+    try {
+      var userInfoStr = window.localStorage.getItem("userInfo");
+      if (userInfoStr) {
+        var userInfo = JSON.parse(userInfoStr);
+        return get(userInfo, "userPreferenceConfig.mode", "");
+      }
+      return "";
+    } catch (error) {
+      return "";
+    }
+  }, []);
   var saveTempale = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
@@ -736,7 +748,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:
@@ -769,6 +781,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);
@@ -776,6 +789,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);
                 }
@@ -812,39 +830,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);
@@ -941,15 +956,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,
@@ -962,7 +977,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();
           }
         });
@@ -1099,11 +1117,11 @@ 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"
-    })), item.owner === "N" && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Tooltip, {
+    })), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Tooltip, {
       placement: "top",
       title: initLang({
         id: "prompt.copyTemplate"
@@ -1146,27 +1164,48 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
         return handleSet(item);
       }
     }))));
-  }))), (curItem === null || curItem === void 0 ? void 0 : curItem.perms_type) !== "public" && /*#__PURE__*/React.createElement("div", {
+  }))), /*#__PURE__*/React.createElement("div", {
     style: {
       position: "absolute",
       left: 12,
       bottom: 16
     }
-  }, (curItem === null || curItem === void 0 ? void 0 : curItem.is_default) === "Y" ? /*#__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) === "Y" ? /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return handleSaveDefault("N");
     },
-    size: "small"
+    size: "small",
+    type: "primary"
   }, initLang({
     id: "button.set.cancelDefault"
   })) : /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return handleSaveDefault("Y");
     },
-    size: "small"
+    size: "small",
+    type: "primary"
   }, initLang({
     id: "button.set.default"
-  })), /*#__PURE__*/React.createElement(Button, {
+  }))), (curItem === null || curItem === void 0 ? void 0 : curItem.perms_type) == "public" && mode === "DEV" && /*#__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

@@ -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) {
         // 子级是动态列 父级也必须是
@@ -126,9 +127,19 @@ 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") {
+      if (customColumns[n].is_default_public == "Y") {
+        item = customColumns[n];
+      }
+      if (customColumns[n].is_default == "Y") {
+        item = customColumns[n];
+        break;
+      }
+    }
+    try {
+      var _item2;
+      if ((_item2 = item) !== null && _item2 !== void 0 && _item2.is_default) {
         var JsonPares = JSON.parse(item.define);
 
         // 删 旧模板多出的字段
@@ -220,6 +231,11 @@ export function adapterColumns(customColumns, columns) {
           item: item
         };
       }
+    } catch (error) {
+      return {
+        JsonPares: null,
+        item: null
+      };
     }
   }
   return {