ztxkui 4.2.23-558 → 4.2.23-559

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 (5) hide show
  1. package/dist/components/ProForm/record-common-list.js +2 -2
  2. package/dist/components/Table/hooks/useSelectSubtotal.js +6 -1
  3. package/dist/components/Table/table-dynamic.js +1 -1
  4. package/dist/components/business/SearchContainer/record-common-list.js +2 -2
  5. package/package.json +2 -2
package/dist/components/ProForm/record-common-list.js CHANGED
@@ -60,7 +60,7 @@ var RecordCommonList = function (props) {
60
60
  var onMoveEnd = useMemoizedFn(function () {
61
61
  updateServerData === null || updateServerData === void 0 ? void 0 : updateServerData();
62
62
  });
63
- return (React.createElement("div", { className: "record-common-list--container" },
63
+ return recordCommonList.length > 0 ? (React.createElement("div", { className: "record-common-list--container" },
64
64
  React.createElement("div", { className: "record-common-list--title" }, i18next.t('常用搜索')),
65
65
  React.createElement("div", { className: "record-common-list--item--container" },
66
66
  React.createElement(DndProvider, { backend: HTML5Backend, context: window }, recordCommonList.map(function (item, index) { return (React.createElement(RecordCommonItem, { type: "record-common-item", key: item.key, onMoveItem: onMoveItem, onMoveEnd: onMoveEnd, index: index, className: classNames('record-common-list--item', {
@@ -78,6 +78,6 @@ var RecordCommonList = function (props) {
78
78
  setCurrentRecordCommonSearchKey === null || setCurrentRecordCommonSearchKey === void 0 ? void 0 : setCurrentRecordCommonSearchKey('');
79
79
  }
80
80
  }, onCancel: function (e) { var _a; return (_a = e === null || e === void 0 ? void 0 : e.stopPropagation) === null || _a === void 0 ? void 0 : _a.call(e); } },
81
- React.createElement(DeleteOutlined, { onClick: function (e) { var _a; return (_a = e === null || e === void 0 ? void 0 : e.stopPropagation) === null || _a === void 0 ? void 0 : _a.call(e); }, className: "record-common-list--delete" })))); })))));
81
+ React.createElement(DeleteOutlined, { onClick: function (e) { var _a; return (_a = e === null || e === void 0 ? void 0 : e.stopPropagation) === null || _a === void 0 ? void 0 : _a.call(e); }, className: "record-common-list--delete" })))); }))))) : null;
82
82
  };
83
83
  export default RecordCommonList;
package/dist/components/Table/hooks/useSelectSubtotal.js CHANGED
@@ -119,7 +119,12 @@ export default function useSelectSubtotal(tableRef, props) {
119
119
  clearSelections(); // 清除之前的选择
120
120
  return;
121
121
  }
122
- setSelectDisabled(true);
122
+ // 摁住ctrl键时，去掉body的默认行为。
123
+ if (getCtrlKeyPressed(e)) {
124
+ setSelectDisabled(true);
125
+ }
126
+ // 这里回导致复制内容失败
127
+ // setSelectDisabled(true);
123
128
  // 这里要判断如果最上层是TD也行
124
129
  var target = ((_a = e.target) === null || _a === void 0 ? void 0 : _a.tagName) === 'TD' ? e.target : domParentsUntil(e.target, 'td');
125
130
  if ((target === null || target === void 0 ? void 0 : target.tagName) === 'TD') {
package/dist/components/Table/table-dynamic.js CHANGED
@@ -385,7 +385,7 @@ function TableDynamic(props) {
385
385
  React.createElement(Checkbox.Group, { style: { width: '100%' }, value: checkedValues, onChange: onDynamicChangeHandle },
386
386
  React.createElement(Container, { dynamicColumns: dynamicColumns, filterDynamicColumns: filterDynamicColumns, onFindItemHandle: onFindItemHandle, onMoveItemHandle: onMoveItemHandle, onConfigItemHandle: onConfigItemHandle })))),
387
387
  renderTemplateModal(),
388
- React.createElement(Modal, { title: i18next.t('模板保存确认'), width: 600, visible: modalVisible, loading: false, footer: React.createElement(React.Fragment, null,
388
+ React.createElement(Modal, { title: i18next.t('模板保存确认'), width: 600, visible: modalVisible, loading: false, onCancel: function () { return setModalVisible(false); }, footer: React.createElement(React.Fragment, null,
389
389
  React.createElement(Button, { type: "primary", onClick: function () {
390
390
  setModalVisible(false);
391
391
  openTemplateModal();
package/dist/components/business/SearchContainer/record-common-list.js CHANGED
@@ -71,7 +71,7 @@ var RecordCommonList = function () {
71
71
  var onMoveEnd = useMemoizedFn(function () {
72
72
  updateServerData === null || updateServerData === void 0 ? void 0 : updateServerData();
73
73
  });
74
- return (React.createElement("div", { className: "record-common-list--container" },
74
+ return recordCommonList.length > 0 ? (React.createElement("div", { className: "record-common-list--container" },
75
75
  React.createElement("div", { className: "record-common-list--title" }, i18next.t('常用搜索')),
76
76
  React.createElement("div", { className: "record-common-list--item--container" },
77
77
  React.createElement(DndProvider, { backend: HTML5Backend, context: window }, recordCommonList.map(function (item, index) { return (React.createElement(RecordCommonItem, { type: "record-common-item", key: item.key, onMoveItem: onMoveItem, onMoveEnd: onMoveEnd, index: index, className: classNames('record-common-list--item', {
@@ -89,6 +89,6 @@ var RecordCommonList = function () {
89
89
  setCurrentRecordCommonSearchKey === null || setCurrentRecordCommonSearchKey === void 0 ? void 0 : setCurrentRecordCommonSearchKey('');
90
90
  }
91
91
  }, onCancel: function (e) { var _a; return (_a = e === null || e === void 0 ? void 0 : e.stopPropagation) === null || _a === void 0 ? void 0 : _a.call(e); } },
92
- React.createElement(DeleteOutlined, { onClick: function (e) { var _a; return (_a = e === null || e === void 0 ? void 0 : e.stopPropagation) === null || _a === void 0 ? void 0 : _a.call(e); }, className: "record-common-list--delete" })))); })))));
92
+ React.createElement(DeleteOutlined, { onClick: function (e) { var _a; return (_a = e === null || e === void 0 ? void 0 : e.stopPropagation) === null || _a === void 0 ? void 0 : _a.call(e); }, className: "record-common-list--delete" })))); }))))) : null;
93
93
  };
94
94
  export default RecordCommonList;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ztxkui",
3
- "version": "4.2.23-558",
3
+ "version": "4.2.23-559",
4
4
  "private": false,
5
5
  "description": "React components library",
6
6
  "author": "zt-front-end",
@@ -111,4 +111,4 @@
111
111
  "react-dom": ">=16.9.0",
112
112
  "ztxkutils": ">=2.1.1"
113
113
  }
114
- }
114
+ }