ns-base-module 1.1.62 → 1.1.64

package/dist/Entry/data.d.ts

@@ -1,133 +1,133 @@
-// export type EntryType =
-//   | 'Input'
-//   | 'InputNumber'
-//   | 'TableInput'
-//   | 'Select'
-//   | 'MultSelect'
-//   | 'DatePicker'
-//   | 'DateTimePicker'
-//   | 'RangePicker'
-//   | 'RangeTimePicker'
-//   | 'Switch'
-//   | 'Textarea'
-//   | 'TableTextarea'
-//   | 'Image'
-//   | 'Checkbox'
-//   | 'CheckboxGroup'
-//   | 'Radio'
-//   | 'ImageUpload'
-//   | 'FileUpload'
-//   | 'TreeSelect';
-import { initLang } from '@/utils/language';
-import { TagConditionEnum } from '@/utils/enum';
-
-export enum EntryType {
-  Input = 'Input',
-  InputNumber = 'InputNumber',
-  InputNumberRange = 'InputNumberRange',
-  Password = 'Password',
-  Search = 'Search',
-  AllSearch = 'AllSearch',
-  TableInput = 'TableInput',
-  TableInputNumber = 'TableInputNumber',
-  Select = 'Select',
-  ObjectSelect = 'ObjectSelect',
-  MultSelect = 'MultSelect',
-  DatePicker = 'DatePicker',
-  DateTimePicker = 'DateTimePicker',
-  RangePicker = 'RangePicker',
-  RangeTimePicker = 'RangeTimePicker',
-  TimePicker = 'TimePicker',
-  SwitchRead = 'SwitchRead',
-  Switch = 'Switch',
-  Textarea = 'Textarea',
-  TableTextarea = 'TableTextarea',
-  Image = 'Image',
-  Checkbox = 'Checkbox',
-  CheckboxGroup = 'CheckboxGroup',
-  Radio = 'Radio',
-  RadioGroup = 'RadioGroup',
-  ImageUpload = 'ImageUpload',
-  FileUpload = 'FileUpload',
-  TreeSelect = 'TreeSelect',
-  Cron = 'Cron', // cron 表达式
-  Editor = 'Editor', // 富文本编辑器
-  EditorPreview = 'EditorPreview', // 富文本编辑器的预览
-  EditorModal = 'EditorModal', // 富文本编辑器弹框
-  JsonRead = 'JsonRead', // json预览
-  Link = 'Link', // 超链接
-  OpenBrowser = 'OpenBrowser', // 打开新浏览器
-  Tag = 'Tag', // 标签
-  Tags = 'Tags', // 标签组
-  FormTable = 'FormTable', // 可操作表格
-  Condition = 'Condition', // 条件组件
-  ColorPicker = 'ColorPicker', // 颜色选择器
-  TagSelect = 'TagSelect', // 可输入的下拉框
-  Styles = 'styles', // 配置样式
-  TimelineModal = 'TimelineModal', // 时间轴弹窗
-  ChooseModal = 'ChooseModal', // 选择弹窗
-  ObjectSelect = 'ObjectSelect', // 下拉选择带出整个对象
-  TableEditableModal = 'TableEditableModal', //可编辑的表格弹窗
-  AceEditor = 'AceEditor', // 代码编辑器
-  AceTable = 'AceTable', // 代码表格
-  Tree = 'Tree', // 树组件
-  Express = 'Express', // 表达式
-  Steps = 'Steps', // 步骤条
-  QRCode = 'QRCode',
-  Barcode = 'Barcode',
-  GroupInput = 'GroupInput',
-  EditorPreview = 'EditorPreview',
-  TagsDatePicker = 'TagsDatePicker',
-  ColorPicker = 'ColorPicker',
-  ChooseModalTable = 'ChooseModalTable', // 选择弹框，选择结果为表格
-  Progress = 'Progress', // 进度条
-  ImageText = 'ImageText', //图文组件
-  Etable2Modal = 'Etable2Modal', // 单据页的弹框选择,ModalWithConfig封装成的弹框选择
-}
-
-export enum TableReadEntryType {
-  Image = 'Image',
-  SwtichRead = 'SwtichRead',
-}
-
-export const tableReadEntryEnum = {
-  [TableReadEntryType.Image]: '图片',
-  [TableReadEntryType.SwtichRead]: '开关',
-};
-
-export enum TableActionEntryType {
-  Image = 'Image',
-  Swtich = 'Swtich',
-  SwtichRead = 'SwtichRead',
-}
-
-export const tableActionEntryEnum = {
-  [TableActionEntryType.Image]: '图片',
-  [TableActionEntryType.Swtich]: '开关',
-  [TableActionEntryType.SwtichRead]: '只读开关',
-};
-
-export const tagStringEnum = {
-  [TagConditionEnum.Equals]: initLang({ id: 'condition.equals' }),
-  [TagConditionEnum.NotEqual]: initLang({ id: 'condition.NotEqual' }),
-  // [TagConditionEnum.In]: '在……范围内',
-  [TagConditionEnum.Contains]: initLang({ id: 'condition.contains' }),
-};
-
-export const tagNumberEnum = {
-  [TagConditionEnum.Equals]: initLang({ id: 'condition.equals' }),
-  [TagConditionEnum.NotEqual]: initLang({ id: 'condition.NotEqual' }),
-  [TagConditionEnum.LessThan]: initLang({ id: 'condition.lessThan' }),
-  [TagConditionEnum.LessOrEqual]: initLang({ id: 'condition.lessOrEqual' }),
-  [TagConditionEnum.GreaterThan]: initLang({ id: 'condition.greaterThan' }),
-  [TagConditionEnum.GreaterOrEqual]: initLang({ id: 'condition.greaterOrEqual' }),
-  // [TagConditionEnum.In]: '在……范围内',
-  // [TagConditionEnum.Between]: '在……之间',
-};
-
-export interface ValueEnumType {
-  label: string;
-  value: any;
-  disabled?: boolean;
-  // style?: { bgColor?: string; color?: string; fontWeight?: boolean };
-}
+// export type EntryType =
+//   | 'Input'
+//   | 'InputNumber'
+//   | 'TableInput'
+//   | 'Select'
+//   | 'MultSelect'
+//   | 'DatePicker'
+//   | 'DateTimePicker'
+//   | 'RangePicker'
+//   | 'RangeTimePicker'
+//   | 'Switch'
+//   | 'Textarea'
+//   | 'TableTextarea'
+//   | 'Image'
+//   | 'Checkbox'
+//   | 'CheckboxGroup'
+//   | 'Radio'
+//   | 'ImageUpload'
+//   | 'FileUpload'
+//   | 'TreeSelect';
+import { initLang } from '@/utils/language';
+import { TagConditionEnum } from '@/utils/enum';
+
+export enum EntryType {
+  Input = 'Input',
+  InputNumber = 'InputNumber',
+  InputNumberRange = 'InputNumberRange',
+  Password = 'Password',
+  Search = 'Search',
+  AllSearch = 'AllSearch',
+  TableInput = 'TableInput',
+  TableInputNumber = 'TableInputNumber',
+  Select = 'Select',
+  ObjectSelect = 'ObjectSelect',
+  MultSelect = 'MultSelect',
+  DatePicker = 'DatePicker',
+  DateTimePicker = 'DateTimePicker',
+  RangePicker = 'RangePicker',
+  RangeTimePicker = 'RangeTimePicker',
+  TimePicker = 'TimePicker',
+  SwitchRead = 'SwitchRead',
+  Switch = 'Switch',
+  Textarea = 'Textarea',
+  TableTextarea = 'TableTextarea',
+  Image = 'Image',
+  Checkbox = 'Checkbox',
+  CheckboxGroup = 'CheckboxGroup',
+  Radio = 'Radio',
+  RadioGroup = 'RadioGroup',
+  ImageUpload = 'ImageUpload',
+  FileUpload = 'FileUpload',
+  TreeSelect = 'TreeSelect',
+  Cron = 'Cron', // cron 表达式
+  Editor = 'Editor', // 富文本编辑器
+  EditorPreview = 'EditorPreview', // 富文本编辑器的预览
+  EditorModal = 'EditorModal', // 富文本编辑器弹框
+  JsonRead = 'JsonRead', // json预览
+  Link = 'Link', // 超链接
+  OpenBrowser = 'OpenBrowser', // 打开新浏览器
+  Tag = 'Tag', // 标签
+  Tags = 'Tags', // 标签组
+  FormTable = 'FormTable', // 可操作表格
+  Condition = 'Condition', // 条件组件
+  ColorPicker = 'ColorPicker', // 颜色选择器
+  TagSelect = 'TagSelect', // 可输入的下拉框
+  Styles = 'styles', // 配置样式
+  TimelineModal = 'TimelineModal', // 时间轴弹窗
+  ChooseModal = 'ChooseModal', // 选择弹窗
+  ObjectSelect = 'ObjectSelect', // 下拉选择带出整个对象
+  TableEditableModal = 'TableEditableModal', //可编辑的表格弹窗
+  AceEditor = 'AceEditor', // 代码编辑器
+  AceTable = 'AceTable', // 代码表格
+  Tree = 'Tree', // 树组件
+  Express = 'Express', // 表达式
+  Steps = 'Steps', // 步骤条
+  QRCode = 'QRCode',
+  Barcode = 'Barcode',
+  GroupInput = 'GroupInput',
+  EditorPreview = 'EditorPreview',
+  TagsDatePicker = 'TagsDatePicker',
+  ColorPicker = 'ColorPicker',
+  ChooseModalTable = 'ChooseModalTable', // 选择弹框，选择结果为表格
+  Progress = 'Progress', // 进度条
+  ImageText = 'ImageText', //图文组件
+  Etable2Modal = 'Etable2Modal', // 单据页的弹框选择,ModalWithConfig封装成的弹框选择
+}
+
+export enum TableReadEntryType {
+  Image = 'Image',
+  SwtichRead = 'SwtichRead',
+}
+
+export const tableReadEntryEnum = {
+  [TableReadEntryType.Image]: '图片',
+  [TableReadEntryType.SwtichRead]: '开关',
+};
+
+export enum TableActionEntryType {
+  Image = 'Image',
+  Swtich = 'Swtich',
+  SwtichRead = 'SwtichRead',
+}
+
+export const tableActionEntryEnum = {
+  [TableActionEntryType.Image]: '图片',
+  [TableActionEntryType.Swtich]: '开关',
+  [TableActionEntryType.SwtichRead]: '只读开关',
+};
+
+export const tagStringEnum = {
+  [TagConditionEnum.Equals]: initLang({ id: 'condition.equals' }),
+  [TagConditionEnum.NotEqual]: initLang({ id: 'condition.NotEqual' }),
+  // [TagConditionEnum.In]: '在……范围内',
+  [TagConditionEnum.Contains]: initLang({ id: 'condition.contains' }),
+};
+
+export const tagNumberEnum = {
+  [TagConditionEnum.Equals]: initLang({ id: 'condition.equals' }),
+  [TagConditionEnum.NotEqual]: initLang({ id: 'condition.NotEqual' }),
+  [TagConditionEnum.LessThan]: initLang({ id: 'condition.lessThan' }),
+  [TagConditionEnum.LessOrEqual]: initLang({ id: 'condition.lessOrEqual' }),
+  [TagConditionEnum.GreaterThan]: initLang({ id: 'condition.greaterThan' }),
+  [TagConditionEnum.GreaterOrEqual]: initLang({ id: 'condition.greaterOrEqual' }),
+  // [TagConditionEnum.In]: '在……范围内',
+  // [TagConditionEnum.Between]: '在……之间',
+};
+
+export interface ValueEnumType {
+  label: string;
+  value: any;
+  disabled?: boolean;
+  // style?: { bgColor?: string; color?: string; fontWeight?: boolean };
+}

package/dist/Entry/index.js

@@ -3,12 +3,12 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-/*
- * @Date: 2023-04-28 13:59:54
- * @description:
- * @author chenchangfu
- * Copyright (c) 2019, AUTHOR. All rights reserved.
- * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+/*
+ * @Date: 2023-04-28 13:59:54
+ * @description:
+ * @author chenchangfu
+ * Copyright (c) 2019, AUTHOR. All rights reserved.
+ * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
  */
 import React from 'react';
 import EntryItem from "./EntryItem";

package/dist/FilterPopover/FilterClearIcon.js

@@ -4,12 +4,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-/*
- * @Date: 2023-05-08 13:49:30
- * @description:
- * @author chenchangfu
- * Copyright (c) 2019, AUTHOR. All rights reserved.
- * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+/*
+ * @Date: 2023-05-08 13:49:30
+ * @description:
+ * @author chenchangfu
+ * Copyright (c) 2019, AUTHOR. All rights reserved.
+ * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
  */
 import { Tooltip } from "antd";
 import React from "react";

package/dist/FilterPopover/index.js

@@ -15,12 +15,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-/*
- * @Date: 2023-05-08 13:49:30
- * @description:
- * @author chenchangfu
- * Copyright (c) 2019, AUTHOR. All rights reserved.
- * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+/*
+ * @Date: 2023-05-08 13:49:30
+ * @description:
+ * @author chenchangfu
+ * Copyright (c) 2019, AUTHOR. All rights reserved.
+ * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
  */
 import { Popover } from "antd";
 import React, { useMemo, useState } from "react";

package/dist/Icon/index.js

@@ -1,8 +1,8 @@
-/*
- * @description:
- * @author chenchangfu
- * Copyright (c) 2019, AUTHOR. All rights reserved.
- * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+/*
+ * @description:
+ * @author chenchangfu
+ * Copyright (c) 2019, AUTHOR. All rights reserved.
+ * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
  */
 
 import { createFromIconfontCN } from "@ant-design/icons";

package/dist/IconTools/utils.js

@@ -47,11 +47,11 @@ var flatColumns = function flatColumns(_columns) {
   return initArr;
 };
 
-/**
- * customColumns 模板数据
- * columns 新接口数据
- *
- * 匹配旧数据 是否有字段增删，返回新表头
+/**
+ * customColumns 模板数据
+ * columns 新接口数据
+ *
+ * 匹配旧数据 是否有字段增删，返回新表头
  * */
 export function adapterColumns(customColumns, columns) {
   if (customColumns && customColumns.length && columns && columns.length) {

package/dist/SubtotalsModal/index.js

@@ -4,14 +4,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-/*
- * @description:
- * @author chenchangfu
- * Copyright (c) 2019, AUTHOR. All rights reserved.
- * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+/*
+ * @description:
+ * @author chenchangfu
+ * Copyright (c) 2019, AUTHOR. All rights reserved.
+ * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
  */
-/**
- * 小计弹窗
+/**
+ * 小计弹窗
  */
 
 import { PlusOutlined } from "@ant-design/icons";

package/dist/TableHeaderConfigPopover/Dustbin.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["onChange", "showArrows"];
+var _excluded = ["onChange", "showArrows", "isRoot"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -14,7 +14,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { HolderOutlined, VerticalAlignBottomOutlined, VerticalAlignMiddleOutlined, VerticalAlignTopOutlined } from "@ant-design/icons";
-import { Slider, Tooltip } from "antd";
+import { Slider, Switch, Tooltip } from "antd";
 import React from "react";
 import { useDrag, useDrop } from "react-dnd";
 import "../../style/components/TableHeaderConfigPopover.scss";
@@ -40,6 +40,7 @@ var Box = function Box(_ref) {
 var Dustbin = function Dustbin(_ref2) {
   var _onChange = _ref2.onChange,
     showArrows = _ref2.showArrows,
+    isRoot = _ref2.isRoot,
     props = _objectWithoutProperties(_ref2, _excluded);
   var item = props.item;
   var _useDrop = useDrop({
@@ -83,7 +84,7 @@ var Dustbin = function Dustbin(_ref2) {
       flex: 1
     },
     onChange: function onChange(e) {
-      return _onChange(e, item);
+      return _onChange(e, item, "width");
     },
     value: typeof item.width === "number" ? item.width : 0
   }), /*#__PURE__*/React.createElement("span", {
@@ -103,6 +104,14 @@ var Dustbin = function Dustbin(_ref2) {
     onClick: function onClick(e) {
       return props.onFixed(item.dataIndex, "right", e);
     }
-  })));
+  })), !!isRoot && /*#__PURE__*/React.createElement(Switch, {
+    checkedChildren: "\u6298\u53E0",
+    unCheckedChildren: "\u5C55\u5F00",
+    size: "small",
+    checked: item.frontEndFold === true || item.frontEndFold === undefined && ["FIRST", "LAST", "NONEDATA"].includes(item.hierarchyState),
+    onChange: function onChange(e) {
+      return _onChange === null || _onChange === void 0 ? void 0 : _onChange(e, item, "frontEndFold");
+    }
+  }));
 };
 export default Dustbin;

package/dist/TableHeaderConfigPopover/index.js

@@ -21,12 +21,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-/*
- * @Date: 2023-05-08 13:49:30
- * @description:
- * @author chenchangfu
- * Copyright (c) 2019, AUTHOR. All rights reserved.
- * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+/*
+ * @Date: 2023-05-08 13:49:30
+ * @description:
+ * @author chenchangfu
+ * Copyright (c) 2019, AUTHOR. All rights reserved.
+ * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
  */
 // import { crossContext } from "@/my-context";
 // import { initLang } from "@/utils/language";
@@ -67,14 +67,6 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
     var _props$editItem, _props$editItem2;
     setTemplateName((_props$editItem = props.editItem) === null || _props$editItem === void 0 ? void 0 : _props$editItem.label);
     setPermsType(((_props$editItem2 = props.editItem) === null || _props$editItem2 === void 0 ? void 0 : _props$editItem2.perms_type) || "private");
-    // if (
-    //   props.editItem?.owner === "Y" &&
-    //   props.editItem?.perms_type === "public"
-    // ) {
-    //   setCheckShare(true);
-    // } else {
-    //   setCheckShare(false);
-    // }
   }, [props.editItem]);
   var saveTempale = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
@@ -311,12 +303,11 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
   };
 
   // 宽度调整
-  var changeTableHeaderWidth = function changeTableHeaderWidth(val, item) {
-    var _columnsTree = _toConsumableArray(columnsTree);
+  var changeTableHeader = function changeTableHeader(val, item, _key) {
     function loopItmes(arr) {
       for (var i = 0, l = arr.length; i < l; i++) {
         if (arr[i].dataIndex === item.dataIndex) {
-          arr[i].width = val;
+          arr[i][_key] = val;
           return;
         }
         if (arr[i].children) {
@@ -324,9 +315,12 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
         }
       }
     }
-    loopItmes(_columnsTree);
-    setColumnsTree(_columnsTree);
-    updateColumns(_columnsTree);
+    if (_key) {
+      var _columnsTree = _toConsumableArray(columnsTree);
+      loopItmes(_columnsTree);
+      setColumnsTree(_columnsTree);
+      updateColumns(_columnsTree);
+    }
   };
 
   // const [leftFixed, unFixed, rightFixed]: any = columnsTree.reduce(
@@ -490,7 +484,7 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
         disabled: d.customizable === false,
         title: d.customizable === false ? d.title : /*#__PURE__*/React.createElement(Dustbin, {
           item: d,
-          onChange: changeTableHeaderWidth,
+          onChange: changeTableHeader,
           onFixed: onFixed,
           showArrows: showArrows,
           onDrop: d.customizable === false ? null : onDrop // 子动态列 不能拖拽
@@ -589,7 +583,8 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
           onDrop: onDrop,
           onFixed: onFixed,
           showArrows: ["center", "down"],
-          onChange: changeTableHeaderWidth
+          onChange: changeTableHeader,
+          isRoot: c.children && c.children.length
         }),
         children: titleChildren(c.children, ["center", "down"])
       };
@@ -621,7 +616,8 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
           onDrop: onDrop,
           onFixed: onFixed,
           showArrows: ["up", "down"],
-          onChange: changeTableHeaderWidth
+          onChange: changeTableHeader,
+          isRoot: c.children && c.children.length
         }),
         children: titleChildren(c.children, ["up", "down"])
       };
@@ -651,7 +647,8 @@ var ColumnsToolbarRender = /*#__PURE__*/memo(function (props) {
           onDrop: onDrop,
           onFixed: onFixed,
           showArrows: ["up", "center"],
-          onChange: changeTableHeaderWidth
+          onChange: changeTableHeader,
+          isRoot: c.children && c.children.length
         }),
         children: titleChildren(c.children, ["up", "center"])
       };
@@ -954,6 +951,7 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
           menu_code: menuCode,
           form_template_code: formTemplateCode,
           is_default: isDefault,
+          is_default_public: isDefault,
           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,
@@ -966,7 +964,7 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
               id: "message.success.set"
             }));
             // 刷新列表
-            setCurItem({});
+            // setCurItem({});
             getColumnsFilter();
           }
         });
@@ -974,6 +972,29 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
       }
     });
   };
+
+  // 取消选择 恢复默认
+  var cancelSelect = function cancelSelect() {
+    setValue("");
+    setCurItem({});
+    restColumns("cancel");
+  };
+  var restColumns = function restColumns(code) {
+    if (curItem !== null && curItem !== void 0 && curItem.define && !code) {
+      props.updateColumns(JSON.parse(curItem.define));
+      return;
+    }
+    var loopColumns = function loopColumns(arr, firstLoop) {
+      return arr.map(function (field) {
+        return _objectSpread(_objectSpread({}, field), {}, {
+          checked: typeof field.checked === "boolean" ? field.checked : field.defaultDisplay == false ? false : true,
+          children: field.children ? loopColumns(field.children) : null
+        });
+      });
+    };
+    var _columns = loopColumns(cloneDeep(props.columns), true);
+    props.updateColumns(_columns);
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "popover-body",
     style: {
@@ -1002,6 +1023,7 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
     columns: columnsCofnig,
     updateColumns: props.updateColumns,
     handleBack: function handleBack() {
+      restColumns();
       setShowConfig(false);
     },
     handleSaveCallback: handleSaveCallback,
@@ -1084,7 +1106,7 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
       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"
@@ -1127,17 +1149,18 @@ 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",
       right: 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) == "private" && /*#__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, {
@@ -1148,6 +1171,14 @@ var ColumnsToolbar = function ColumnsToolbar(_ref4) {
     type: "primary"
   }, initLang({
     id: "button.set.default"
+  }))), /*#__PURE__*/React.createElement(Button, {
+    style: {
+      marginLeft: 8
+    },
+    onClick: cancelSelect,
+    size: "small"
+  }, initLang({
+    id: "button.set.cancelSelect"
   })))));
 };
 var Index = function Index(_ref9) {

package/dist/TableHeaderConfigPopover/updateColumns.js

@@ -2,11 +2,11 @@ var _excluded = ["menuCode", "formTemplateCode", "columns", "updateColumns"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-/*
- * @description:
- * @author chenchangfu
- * Copyright (c) 2019, AUTHOR. All rights reserved.
- * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+/*
+ * @description:
+ * @author chenchangfu
+ * Copyright (c) 2019, AUTHOR. All rights reserved.
+ * AUTHOR PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
  */
 import React from "react";
 import TableHeaderConfigPopover from "../TableHeaderConfigPopover";