@pisell/materials 2.2.3 → 2.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. package/build/lowcode/assets-daily.json +11 -11
  2. package/build/lowcode/assets-dev.json +2 -2
  3. package/build/lowcode/assets-prod.json +11 -11
  4. package/build/lowcode/index.js +1 -1
  5. package/build/lowcode/meta.js +2 -2
  6. package/build/lowcode/preview.js +4 -4
  7. package/build/lowcode/render/default/view.css +1 -1
  8. package/build/lowcode/render/default/view.js +8 -8
  9. package/build/lowcode/view.css +1 -1
  10. package/build/lowcode/view.js +6 -6
  11. package/es/components/MultipleContainersSortList/index.d.ts +5 -5
  12. package/es/components/MultipleContainersSortList/index.js +10 -10
  13. package/es/components/filter/components/FilterItem/index.js +5 -2
  14. package/es/components/filter/components/QuickFilter/index.js +2 -1
  15. package/es/components/filter/types.d.ts +1 -0
  16. package/es/components/sort/index.js +3 -1
  17. package/es/components/sort/index.less +3 -0
  18. package/es/components/sort/types.d.ts +1 -0
  19. package/es/components/table/Actions/component/ExportImport/index.js +9 -5
  20. package/es/components/table/Actions/component/Group/PopoverContent.d.ts +2 -2
  21. package/es/components/table/Actions/component/Group/PopoverContent.js +11 -7
  22. package/es/components/table/index.d.ts +2 -2
  23. package/es/components/table/index.js +27 -25
  24. package/es/components/table/types.d.ts +6 -1
  25. package/es/components/virtual-keyboard/Time/index.js +1 -1
  26. package/lib/components/MultipleContainersSortList/index.d.ts +5 -5
  27. package/lib/components/MultipleContainersSortList/index.js +16 -11
  28. package/lib/components/filter/components/FilterItem/index.js +11 -2
  29. package/lib/components/filter/components/QuickFilter/index.js +2 -1
  30. package/lib/components/filter/types.d.ts +1 -0
  31. package/lib/components/sort/index.js +4 -9
  32. package/lib/components/sort/index.less +3 -0
  33. package/lib/components/sort/types.d.ts +1 -0
  34. package/lib/components/table/Actions/component/ExportImport/index.js +9 -6
  35. package/lib/components/table/Actions/component/Group/PopoverContent.d.ts +2 -2
  36. package/lib/components/table/Actions/component/Group/PopoverContent.js +2 -1
  37. package/lib/components/table/index.d.ts +2 -2
  38. package/lib/components/table/index.js +4 -2
  39. package/lib/components/table/types.d.ts +6 -1
  40. package/lib/components/virtual-keyboard/Time/index.js +1 -1
  41. package/lowcode/table/meta.ts +42 -0
  42. package/lowcode/table/snippets.ts +6 -0
  43. package/package.json +1 -1
@@ -1,15 +1,15 @@
1
- import React from "react";
2
- import { SortableItemProps } from "../DragSortList";
3
- import "./index.less";
1
+ import React from 'react';
2
+ import { SortableItemProps } from '../DragSortList';
3
+ import './index.less';
4
4
  declare type IdType = string | number;
5
5
  export interface MultipleContainersSortListProps<T> {
6
6
  list: Record<string, T[]>;
7
7
  vertical?: boolean;
8
8
  wrapStyle?: React.CSSProperties;
9
9
  onChange: (val: Record<string, T[]>) => void;
10
- renderContainer?: DefaultRenderContainerProps["renderContainer"];
10
+ renderContainer?: DefaultRenderContainerProps['renderContainer'];
11
11
  rowKey: IdType | ((val: T) => IdType);
12
- children: SortableItemProps<T>["children"];
12
+ children: SortableItemProps<T>['children'];
13
13
  quickFilterMaxLength: number;
14
14
  }
15
15
  export declare const TRASH_ID = "void";
@@ -14,14 +14,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
14
14
  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; }
15
15
  function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
16
16
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
17
- import { DndContext } from "@dnd-kit/core";
18
- import { SortableContext, arrayMove, verticalListSortingStrategy, useSortable } from "@dnd-kit/sortable";
19
- import { isFunction } from "@pisell/utils";
20
- import React, { useCallback, useEffect, useState } from "react";
17
+ import { DndContext } from '@dnd-kit/core';
18
+ import { SortableContext, arrayMove, verticalListSortingStrategy, useSortable } from '@dnd-kit/sortable';
19
+ import { isFunction } from '@pisell/utils';
20
+ import React, { useCallback, useEffect, useState } from 'react';
21
21
  import { SortableItem } from "../DragSortList";
22
22
  import "./index.less";
23
23
  import { getText } from "../../locales";
24
- export var TRASH_ID = "void";
24
+ export var TRASH_ID = 'void';
25
25
  var DefaultRenderContainer = function DefaultRenderContainer(props) {
26
26
  var id = props.id,
27
27
  children = props.children,
@@ -48,7 +48,7 @@ var MultipleContainersSortList = function MultipleContainersSortList(props) {
48
48
  onChange = props.onChange,
49
49
  renderContainer = props.renderContainer,
50
50
  _props$rowKey = props.rowKey,
51
- rowKey = _props$rowKey === void 0 ? "id" : _props$rowKey,
51
+ rowKey = _props$rowKey === void 0 ? 'id' : _props$rowKey,
52
52
  quickFilterMaxLength = props.quickFilterMaxLength;
53
53
  var _useState = useState([]),
54
54
  _useState2 = _slicedToArray(_useState, 2),
@@ -106,7 +106,7 @@ var MultipleContainersSortList = function MultipleContainersSortList(props) {
106
106
  var newList = _objectSpread(_objectSpread({}, list), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, activeContainer, list[activeContainer].filter(function (item) {
107
107
  return getRowKey(item) !== active.id;
108
108
  })), _defineProperty(_objectSpread2, overContainer, [].concat(_toConsumableArray(list[overContainer].slice(0, newIndex)), [list[activeContainer][activeIndex]], _toConsumableArray(list[overContainer].slice(newIndex, list[overContainer].length)))), _objectSpread2));
109
- if (overContainer === "quickFilter" && newList[overContainer].length > quickFilterMaxLength) {
109
+ if (overContainer === 'quickFilter' && newList[overContainer].length > quickFilterMaxLength) {
110
110
  var _objectSpread3;
111
111
  newList = _objectSpread(_objectSpread({}, newList), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, overContainer, newList[overContainer].slice(0, quickFilterMaxLength)), _defineProperty(_objectSpread3, activeContainer, [].concat(_toConsumableArray(newList[overContainer].slice(quickFilterMaxLength)), _toConsumableArray(newList[activeContainer]))), _objectSpread3));
112
112
  }
@@ -152,15 +152,15 @@ var MultipleContainersSortList = function MultipleContainersSortList(props) {
152
152
  }),
153
153
  strategy: verticalListSortingStrategy
154
154
  }, list[container].length ? list[container].map(function (item, index) {
155
- return /*#__PURE__*/React.createElement(SortableItem, {
155
+ return !(item !== null && item !== void 0 && item.isHidden) ? /*#__PURE__*/React.createElement(SortableItem, {
156
156
  key: getRowKey(item),
157
157
  id: getRowKey(item),
158
158
  item: item,
159
159
  index: index
160
- }, children);
160
+ }, children) : null;
161
161
  }) : /*#__PURE__*/React.createElement("span", {
162
162
  className: "materials-sort-list-empty"
163
- }, getText("table-action-filter-no-filter"))));
163
+ }, getText('table-action-filter-no-filter'))));
164
164
  })));
165
165
  };
166
166
  export default MultipleContainersSortList;
@@ -7,7 +7,8 @@ var FilterItem = function FilterItem(props) {
7
7
  var label = props.label,
8
8
  type = props.type,
9
9
  name = props.name,
10
- other = props.other;
10
+ other = props.other,
11
+ isHidden = props.isHidden;
11
12
  var Com = useMemo(function () {
12
13
  var _fieldMaps;
13
14
  return (_fieldMaps = fieldMaps[type]) === null || _fieldMaps === void 0 ? void 0 : _fieldMaps.edit;
@@ -15,6 +16,8 @@ var FilterItem = function FilterItem(props) {
15
16
  return /*#__PURE__*/React.createElement(Form.Item, _extends({
16
17
  label: label,
17
18
  name: name
18
- }, (other === null || other === void 0 ? void 0 : other.formItemProps) || {}), /*#__PURE__*/React.createElement(Com, other));
19
+ }, (other === null || other === void 0 ? void 0 : other.formItemProps) || {}, {
20
+ hidden: isHidden
21
+ }), /*#__PURE__*/React.createElement(Com, other));
19
22
  };
20
23
  export default FilterItem;
@@ -28,7 +28,8 @@ var QuickFilter = function QuickFilter(props) {
28
28
  ,
29
29
  type: item.type,
30
30
  other: item.other,
31
- props: item.props
31
+ props: item.props,
32
+ isHidden: item.isHidden
32
33
  });
33
34
  }));
34
35
  };
@@ -28,6 +28,7 @@ export declare type FilterItemProps = {
28
28
  other: Record<string, any>;
29
29
  isCustom?: boolean;
30
30
  columnKey?: string;
31
+ isHidden?: boolean;
31
32
  };
32
33
  /**
33
34
  * 筛选组件属性
@@ -87,7 +87,9 @@ var Sort = function Sort(_ref2) {
87
87
  key: d.name,
88
88
  label: d.label,
89
89
  children: sortChildrenMap[d.type](d.name, !!(d !== null && d !== void 0 && d.localFilter)),
90
- popupClassName: "".concat(prefix, "sort-sub-menu-popup-wrap")
90
+ popupClassName: "".concat(prefix, "sort-sub-menu-popup-wrap"),
91
+ // 增加显示隐藏配置
92
+ className: "".concat(d.isHidden ? "".concat(prefix, "sort-menu-wrap-hide") : "")
91
93
  };
92
94
  });
93
95
  }, [list, localPagination]);
@@ -31,4 +31,7 @@
31
31
  }
32
32
  }
33
33
  }
34
+ &-sort-menu-wrap-hide{
35
+ display: none!important;
36
+ }
34
37
  }
@@ -7,6 +7,7 @@ export declare type SortItemProps = {
7
7
  isCustom: boolean;
8
8
  columnKey?: string;
9
9
  localFilter?: boolean;
10
+ isHidden?: boolean;
10
11
  };
11
12
  export declare type SortListProps = {
12
13
  list: SortItemProps[];
@@ -24,6 +24,7 @@ import { batchExport } from "./components/ExportTable/function";
24
24
  import ImportLog from "./components/ImportLog";
25
25
  import ImportTable from "./components/ImportTable";
26
26
  import { useSharedState } from "../../../../../hooks";
27
+ import { getCurrentLocale } from "../../../../../utils/locale";
27
28
  import { Context } from "../../../model";
28
29
  import "./index.less";
29
30
  var Com = {
@@ -33,6 +34,7 @@ var Com = {
33
34
  import_log: ImportLog
34
35
  };
35
36
  var ExportImport = function ExportImport(_ref) {
37
+ var _context$appHelper, _context$appHelper$ut;
36
38
  var exportImport = _ref.exportImport;
37
39
  var _useState = useState(false),
38
40
  _useState2 = _slicedToArray(_useState, 2),
@@ -59,7 +61,7 @@ var ExportImport = function ExportImport(_ref) {
59
61
  var originResultDataSource = state.originResultDataSource,
60
62
  currentDataSource = state.currentDataSource;
61
63
  var context = useEngineContext();
62
- request.setRequest(context.appHelper.utils.request);
64
+ request.setRequest((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : (_context$appHelper$ut = _context$appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : _context$appHelper$ut.request);
63
65
  var _items = useMemo(function () {
64
66
  // 将对象转成数组
65
67
  var result = Object.entries(exportImportOptions).map(function (_ref2) {
@@ -74,9 +76,9 @@ var ExportImport = function ExportImport(_ref) {
74
76
  return result;
75
77
  }, []);
76
78
  var Content = useMemo(function () {
77
- if (!value) return null;
78
- return Com[value];
79
- }, [value]);
79
+ var _value = value || defaultOptions.importValue;
80
+ return Com[_value];
81
+ }, [value, defaultOptions.importValue]);
80
82
  var _footer = useMemo(function () {
81
83
  var types = defaultOptions.footerHintTypes;
82
84
  if (types.includes(value)) {
@@ -90,10 +92,12 @@ var ExportImport = function ExportImport(_ref) {
90
92
  var _title = useMemo(function () {
91
93
  if (!value) return null;
92
94
  var types = defaultOptions.okShowButtonTypes;
95
+ var lang = getCurrentLocale();
96
+ var isEn = lang === "en-US" || lang === "en";
93
97
 
94
98
  // 导出导入标题
95
99
  if (types.includes(value) && exportImport !== null && exportImport !== void 0 && exportImport.title) {
96
- return "".concat(exportImportOptions[value]).concat(exportImport.title);
100
+ return "".concat(exportImportOptions[value]).concat(isEn ? " " : "").concat(exportImport.title);
97
101
  }
98
102
  return exportImportOptions[value];
99
103
  }, [value, exportImport === null || exportImport === void 0 ? void 0 : exportImport.title]);
@@ -1,5 +1,5 @@
1
- import React from "react";
2
- import "./PopoverContent.less";
1
+ import React from 'react';
2
+ import './PopoverContent.less';
3
3
  declare type FieldType = string | number;
4
4
  export declare type GroupValue = {
5
5
  field: FieldType;
@@ -1,9 +1,9 @@
1
- import React, { useMemo } from "react";
2
- import { Select, Tooltip } from "antd";
3
- import HelpCircle from "@pisell/icon/es/HelpCircle";
1
+ import React, { useMemo } from 'react';
2
+ import { Select, Tooltip } from 'antd';
3
+ import HelpCircle from '@pisell/icon/es/HelpCircle';
4
4
  import { getText } from "../../../../../locales";
5
5
  import "./PopoverContent.less";
6
- var prefix = "pisell-lowcode-";
6
+ var prefix = 'pisell-lowcode-';
7
7
  var PopoverContent = function PopoverContent(props) {
8
8
  var columns = props.columns,
9
9
  _props$value = props.value,
@@ -20,7 +20,11 @@ var PopoverContent = function PopoverContent(props) {
20
20
  }]);
21
21
  };
22
22
  var options = useMemo(function () {
23
- return (columns || []).map(function (item) {
23
+ // 是否开启了隐藏
24
+ var _lists = (columns || []).filter(function (item) {
25
+ return !(item !== null && item !== void 0 && item.isHidden);
26
+ });
27
+ return _lists.map(function (item) {
24
28
  return {
25
29
  label: item.label,
26
30
  value: "".concat(item.name)
@@ -33,8 +37,8 @@ var PopoverContent = function PopoverContent(props) {
33
37
  className: "".concat(prefix, "table-action-group-header")
34
38
  }, /*#__PURE__*/React.createElement("span", {
35
39
  className: "".concat(prefix, "table-action-group-header-title")
36
- }, getText("table-action-group-by-title")), /*#__PURE__*/React.createElement(Tooltip, {
37
- title: getText("table-action-group-by-title-tip")
40
+ }, getText('table-action-group-by-title')), /*#__PURE__*/React.createElement(Tooltip, {
41
+ title: getText('table-action-group-by-title-tip')
38
42
  }, /*#__PURE__*/React.createElement(HelpCircle, null))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
39
43
  options: options,
40
44
  value: firstValue.field,
@@ -1,4 +1,4 @@
1
- import React from "react";
2
- import "./index.less";
1
+ import React from 'react';
2
+ import './index.less';
3
3
  declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
4
4
  export default _default;
@@ -1,5 +1,5 @@
1
1
  function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
2
- var _excluded = ["dataSource", "columns", "dispatch", "style", "filter", "sort", "buttons", "actionButtons", "title", "summary", "onValuesChange", "columnSetting", "dataSourceGroup", "view", "gallery", "currentSettingKey", "exportImport"];
2
+ var _excluded = ["dataSource", "columns", "dispatch", "style", "filter", "sort", "buttons", "actionButtons", "title", "summary", "onValuesChange", "columnSetting", "dataSourceGroup", "view", "gallery", "currentSettingKey", "exportImport", "currentComponentId"];
3
3
  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); }
4
4
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
5
5
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -14,9 +14,9 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
14
14
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
15
15
  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; }
16
16
  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; }
17
- import { useSize } from "ahooks";
18
- import { Form } from "antd";
19
- import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from "react";
17
+ import { useSize } from 'ahooks';
18
+ import { Form } from 'antd';
19
+ import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
20
20
  import { useSharedState } from "../../hooks";
21
21
  import useEngineContext from "../../hooks/useEngineContext";
22
22
  import Actions from "./Actions";
@@ -32,7 +32,7 @@ import useTriggerValuesChange from "./hooks/useTriggerValuesChange";
32
32
  import { Context, Provider, formatColumn } from "./model";
33
33
  import "./index.less";
34
34
  var defaultView = {
35
- defaultViewMode: "grid",
35
+ defaultViewMode: 'grid',
36
36
  multiple: false,
37
37
  modeList: []
38
38
  };
@@ -56,6 +56,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
56
56
  gallery = props.gallery,
57
57
  currentSettingKey = props.currentSettingKey,
58
58
  exportImport = props.exportImport,
59
+ currentComponentId = props.currentComponentId,
59
60
  other = _objectWithoutProperties(props, _excluded);
60
61
  var modal = useSharedState(Context);
61
62
  var _Form$useForm = Form.useForm(),
@@ -63,7 +64,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
63
64
  form = _Form$useForm2[0];
64
65
  var defaultViewMode = view.defaultViewMode,
65
66
  multiple = view.multiple;
66
- var viewMode = Form.useWatch("view_mode", {
67
+ var viewMode = Form.useWatch('view_mode', {
67
68
  form: form,
68
69
  preserve: true
69
70
  });
@@ -76,11 +77,12 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
76
77
  width = _ref.width;
77
78
  var utils = context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils;
78
79
  var tableId = useMemo(function () {
79
- if (props.__designMode === "design") {
80
- return "designMode-mock-table-id";
80
+ console.log(props, 'wh');
81
+ if (props.__designMode === 'design') {
82
+ return 'designMode-mock-table-id';
81
83
  }
82
- return props.__id;
83
- }, [props.__id, props.__designMode]);
84
+ return (props === null || props === void 0 ? void 0 : props.currentComponentId) || props.__id;
85
+ }, [props.__id, props.__designMode, props === null || props === void 0 ? void 0 : props.currentComponentId]);
84
86
  var columns = useMemo(function () {
85
87
  return propsColumns.filter(function (item) {
86
88
  return !item.hidden;
@@ -120,7 +122,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
120
122
  return _columns;
121
123
  }, [columns]);
122
124
  var currentSettingHash = useMemo(function () {
123
- return currentSettingKey || getHash(removeTitleColumns) || "";
125
+ return currentSettingKey || getHash(removeTitleColumns) || '';
124
126
  }, [currentSettingKey, JSON.stringify(removeTitleColumns)]);
125
127
  useEffect(function () {
126
128
  var setting = getTableSettingFromLocalStorage(tableId);
@@ -131,7 +133,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
131
133
  useEffect(function () {
132
134
  if (width) {
133
135
  modal.dispatch({
134
- type: "setTableWidth",
136
+ type: 'setTableWidth',
135
137
  payload: width || {}
136
138
  });
137
139
  }
@@ -161,13 +163,13 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
161
163
  });
162
164
  useEffect(function () {
163
165
  modal.dispatch({
164
- type: "setUtils",
166
+ type: 'setUtils',
165
167
  payload: utils || {}
166
168
  });
167
169
  }, [utils]);
168
170
  useEffect(function () {
169
171
  modal.dispatch({
170
- type: "setDefaultColumns",
172
+ type: 'setDefaultColumns',
171
173
  payload: mergeColumnSetting({
172
174
  columns: columns,
173
175
  tableId: tableId,
@@ -175,36 +177,36 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
175
177
  })
176
178
  });
177
179
  modal.dispatch({
178
- type: "setOriginColumns",
180
+ type: 'setOriginColumns',
179
181
  payload: columns
180
182
  });
181
183
  }, [columns, tableId, currentViewMode]);
182
184
  useEffect(function () {
183
185
  modal.dispatch({
184
- type: "setDataSource",
186
+ type: 'setDataSource',
185
187
  payload: dataSource
186
188
  });
187
189
  modal.dispatch({
188
- type: "setOriginDataSource",
190
+ type: 'setOriginDataSource',
189
191
  payload: dataSource
190
192
  });
191
193
  }, [dataSource]);
192
194
  useEffect(function () {
193
195
  modal.dispatch({
194
- type: "setTableId",
196
+ type: 'setTableId',
195
197
  payload: tableId
196
198
  });
197
199
  }, [tableId]);
198
200
  useEffect(function () {
199
201
  var _other$pagination;
200
202
  modal.dispatch({
201
- type: "setLocalPagination",
203
+ type: 'setLocalPagination',
202
204
  payload: other === null || other === void 0 ? void 0 : (_other$pagination = other.pagination) === null || _other$pagination === void 0 ? void 0 : _other$pagination.localPagination
203
205
  });
204
206
  }, [other === null || other === void 0 ? void 0 : (_other$pagination2 = other.pagination) === null || _other$pagination2 === void 0 ? void 0 : _other$pagination2.localPagination]);
205
207
  useEffect(function () {
206
208
  setTimeout(function () {
207
- document.body.id = "body";
209
+ document.body.id = 'body';
208
210
  }, 200);
209
211
  }, []);
210
212
  var filterDefaultValues = useMemo(function () {
@@ -238,8 +240,8 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
238
240
  useEffect(function () {
239
241
  // 虚拟表columns由接口获取 columns变更时只重新设置tableSetting
240
242
  // 直接设置column_setting对象时useWatch监听数据有误,先设置{}后再设置useWatch可以监听到变更数据
241
- form.setFieldValue("column_setting", {});
242
- form.setFieldValue("column_setting", tableSettingRef.current.column_setting);
243
+ form.setFieldValue('column_setting', {});
244
+ form.setFieldValue('column_setting', tableSettingRef.current.column_setting);
243
245
  // JSON.stringify会丢失 render函数变更的监听 使用自定义stringify处理
244
246
  }, [stringify(removeTitleColumns)]);
245
247
  useEffect(function () {
@@ -254,7 +256,7 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
254
256
  var _values = _objectSpread(_objectSpread({}, form.getFieldsValue(true)), values.filters || {});
255
257
  var _cur = _objectSpread(_objectSpread({}, cur), cur.filters || {});
256
258
  var currentKey = Object.keys(cur)[0];
257
- if (currentKey !== "pagination") {
259
+ if (currentKey !== 'pagination') {
258
260
  _values.pagination = _objectSpread(_objectSpread({}, _values.pagination), {}, {
259
261
  page: 1
260
262
  });
@@ -277,11 +279,11 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
277
279
  if (!getIsTriggerValuesChange(cur, values)) {
278
280
  return;
279
281
  }
280
- _onValuesChange === null || _onValuesChange === void 0 ? void 0 : _onValuesChange(omit(_cur, ["filters"]), _values);
282
+ _onValuesChange === null || _onValuesChange === void 0 ? void 0 : _onValuesChange(omit(_cur, ['filters']), _values);
281
283
  },
282
284
  className: "materials-grid-form-wrap"
283
285
  }, /*#__PURE__*/React.createElement("div", {
284
- className: "materials-grid",
286
+ className: 'materials-grid',
285
287
  style: style,
286
288
  ref: wrapRef
287
289
  }, /*#__PURE__*/React.createElement(Header, {
@@ -26,6 +26,7 @@ declare type DataSourceListItemType = {
26
26
  columnKey?: string;
27
27
  label?: string;
28
28
  name?: string | string[];
29
+ isHidden?: boolean;
29
30
  };
30
31
  /**
31
32
  * 数据源分组总配置
@@ -211,7 +212,11 @@ export declare type GridViewProps = {
211
212
  /**
212
213
  * 当前本地配置的key 用此hash是否改变用来判断是否清空本地配置 不填默认使用columns数据生成hash
213
214
  */
214
- currentSettingKey?: "";
215
+ currentSettingKey?: string;
216
+ /**
217
+ * 当前本地配置的唯一值, 不填默认使用currentSettingKey
218
+ */
219
+ currentComponentId?: string;
215
220
  /**
216
221
  * 当前表格中数据发生变化事件 包含本地筛选和外部传入数据变化
217
222
  * @param currentDataSource
@@ -1,7 +1,7 @@
1
1
  import React, { useMemo, useEffect } from "react";
2
2
  import VirtualKeyboard from "../index";
3
3
  import "./index.less";
4
- import { formatStringToTime } from "./utils.tsx";
4
+ import { formatStringToTime } from "./utils";
5
5
  import { getText } from "../../../locales";
6
6
  import dayjs from "dayjs";
7
7
  var items = [{
@@ -1,15 +1,15 @@
1
- import React from "react";
2
- import { SortableItemProps } from "../DragSortList";
3
- import "./index.less";
1
+ import React from 'react';
2
+ import { SortableItemProps } from '../DragSortList';
3
+ import './index.less';
4
4
  declare type IdType = string | number;
5
5
  export interface MultipleContainersSortListProps<T> {
6
6
  list: Record<string, T[]>;
7
7
  vertical?: boolean;
8
8
  wrapStyle?: React.CSSProperties;
9
9
  onChange: (val: Record<string, T[]>) => void;
10
- renderContainer?: DefaultRenderContainerProps["renderContainer"];
10
+ renderContainer?: DefaultRenderContainerProps['renderContainer'];
11
11
  rowKey: IdType | ((val: T) => IdType);
12
- children: SortableItemProps<T>["children"];
12
+ children: SortableItemProps<T>['children'];
13
13
  quickFilterMaxLength: number;
14
14
  }
15
15
  export declare const TRASH_ID = "void";
@@ -123,7 +123,10 @@ var MultipleContainersSortList = (props) => {
123
123
  if (overContainer === "quickFilter" && newList[overContainer].length > quickFilterMaxLength) {
124
124
  newList = {
125
125
  ...newList,
126
- [overContainer]: newList[overContainer].slice(0, quickFilterMaxLength),
126
+ [overContainer]: newList[overContainer].slice(
127
+ 0,
128
+ quickFilterMaxLength
129
+ ),
127
130
  [activeContainer]: [
128
131
  ...newList[overContainer].slice(quickFilterMaxLength),
129
132
  ...newList[activeContainer]
@@ -174,16 +177,18 @@ var MultipleContainersSortList = (props) => {
174
177
  items: list[container].map((item) => getRowKey(item)),
175
178
  strategy: import_sortable.verticalListSortingStrategy
176
179
  },
177
- list[container].length ? list[container].map((item, index) => /* @__PURE__ */ import_react.default.createElement(
178
- import_DragSortList.SortableItem,
179
- {
180
- key: getRowKey(item),
181
- id: getRowKey(item),
182
- item,
183
- index
184
- },
185
- children
186
- )) : /* @__PURE__ */ import_react.default.createElement("span", { className: "materials-sort-list-empty" }, (0, import_locales.getText)("table-action-filter-no-filter"))
180
+ list[container].length ? list[container].map(
181
+ (item, index) => !(item == null ? void 0 : item.isHidden) ? /* @__PURE__ */ import_react.default.createElement(
182
+ import_DragSortList.SortableItem,
183
+ {
184
+ key: getRowKey(item),
185
+ id: getRowKey(item),
186
+ item,
187
+ index
188
+ },
189
+ children
190
+ ) : null
191
+ ) : /* @__PURE__ */ import_react.default.createElement("span", { className: "materials-sort-list-empty" }, (0, import_locales.getText)("table-action-filter-no-filter"))
187
192
  )
188
193
  ))));
189
194
  };
@@ -37,11 +37,20 @@ var import_antd = require("antd");
37
37
  var import_fields = require("../../../table/Table/fields");
38
38
  var import_index = require("./index.less");
39
39
  var FilterItem = (props) => {
40
- const { label, type, name, other } = props;
40
+ const { label, type, name, other, isHidden } = props;
41
41
  const Com = (0, import_react.useMemo)(() => {
42
42
  var _a;
43
43
  return (_a = import_fields.fieldMaps[type]) == null ? void 0 : _a.edit;
44
44
  }, [type]);
45
- return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { label, name, ...(other == null ? void 0 : other.formItemProps) || {} }, /* @__PURE__ */ import_react.default.createElement(Com, { ...other }));
45
+ return /* @__PURE__ */ import_react.default.createElement(
46
+ import_antd.Form.Item,
47
+ {
48
+ label,
49
+ name,
50
+ ...(other == null ? void 0 : other.formItemProps) || {},
51
+ hidden: isHidden
52
+ },
53
+ /* @__PURE__ */ import_react.default.createElement(Com, { ...other })
54
+ );
46
55
  };
47
56
  var FilterItem_default = FilterItem;
@@ -51,7 +51,8 @@ var QuickFilter = (props) => {
51
51
  name,
52
52
  type: item.type,
53
53
  other: item.other,
54
- props: item.props
54
+ props: item.props,
55
+ isHidden: item.isHidden
55
56
  }
56
57
  );
57
58
  }));
@@ -28,6 +28,7 @@ export declare type FilterItemProps = {
28
28
  other: Record<string, any>;
29
29
  isCustom?: boolean;
30
30
  columnKey?: string;
31
+ isHidden?: boolean;
31
32
  };
32
33
  /**
33
34
  * 筛选组件属性
@@ -102,7 +102,9 @@ var Sort = ({
102
102
  key: d.name,
103
103
  label: d.label,
104
104
  children: sortChildrenMap[d.type](d.name, !!(d == null ? void 0 : d.localFilter)),
105
- popupClassName: `${prefix}sort-sub-menu-popup-wrap`
105
+ popupClassName: `${prefix}sort-sub-menu-popup-wrap`,
106
+ // 增加显示隐藏配置
107
+ className: `${d.isHidden ? `${prefix}sort-menu-wrap-hide` : ""}`
106
108
  };
107
109
  });
108
110
  }, [list, localPagination]);
@@ -130,14 +132,7 @@ var Sort = ({
130
132
  );
131
133
  }, [button, style, value, isMobileBool]);
132
134
  const content = (0, import_react.useMemo)(() => {
133
- return /* @__PURE__ */ import_react.default.createElement(
134
- import_InlineMenu.default,
135
- {
136
- items: sortItems,
137
- value: value || "",
138
- onChange
139
- }
140
- );
135
+ return /* @__PURE__ */ import_react.default.createElement(import_InlineMenu.default, { items: sortItems, value: value || "", onChange });
141
136
  }, [value, sortItems, onChange]);
142
137
  if ((0, import_platform.isMobile)()) {
143
138
  return /* @__PURE__ */ import_react.default.createElement(
@@ -31,4 +31,7 @@
31
31
  }
32
32
  }
33
33
  }
34
+ &-sort-menu-wrap-hide{
35
+ display: none!important;
36
+ }
34
37
  }
@@ -7,6 +7,7 @@ export declare type SortItemProps = {
7
7
  isCustom: boolean;
8
8
  columnKey?: string;
9
9
  localFilter?: boolean;
10
+ isHidden?: boolean;
10
11
  };
11
12
  export declare type SortListProps = {
12
13
  list: SortItemProps[];