@jiaozhiye/qm-design-react 1.9.23 → 1.9.25

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.
@@ -233,9 +233,9 @@ declare const _default: {
233
233
  placeholder: string;
234
234
  supportText: string;
235
235
  };
236
- mergeCell: {
237
- cancel: string;
238
- confirm: string;
236
+ areaSelect: {
237
+ mergeCell: string;
238
+ cancelMerge: string;
239
239
  };
240
240
  print: {
241
241
  text: string;
@@ -1,8 +1,8 @@
1
- /*
2
- * @Author: 焦质晔
3
- * @Date: 2021-06-19 08:46:00
4
- * @Last Modified by: 焦质晔
5
- * @Last Modified time: 2023-09-11 14:48:15
1
+ /*
2
+ * @Author: 焦质晔
3
+ * @Date: 2021-06-19 08:46:00
4
+ * @Last Modified by: 焦质晔
5
+ * @Last Modified time: 2024-07-26 10:21:48
6
6
  */
7
7
  export default {
8
8
  name: 'en',
@@ -239,9 +239,9 @@ export default {
239
239
  placeholder: 'Please paste data here with ctrl+v',
240
240
  supportText: 'Note: only excel data can be pasted'
241
241
  },
242
- mergeCell: {
243
- cancel: 'reset',
244
- confirm: 'merge'
242
+ areaSelect: {
243
+ mergeCell: 'Cell Merge',
244
+ cancelMerge: 'Cancel Merge'
245
245
  },
246
246
  print: {
247
247
  text: 'Print'
@@ -233,9 +233,9 @@ declare const _default: {
233
233
  placeholder: string;
234
234
  supportText: string;
235
235
  };
236
- mergeCell: {
237
- cancel: string;
238
- confirm: string;
236
+ areaSelect: {
237
+ mergeCell: string;
238
+ cancelMerge: string;
239
239
  };
240
240
  print: {
241
241
  text: string;
@@ -1,8 +1,8 @@
1
- /*
2
- * @Author: 焦质晔
3
- * @Date: 2021-06-19 08:45:54
4
- * @Last Modified by: 焦质晔
5
- * @Last Modified time: 2023-09-11 14:47:16
1
+ /*
2
+ * @Author: 焦质晔
3
+ * @Date: 2021-06-19 08:45:54
4
+ * @Last Modified by: 焦质晔
5
+ * @Last Modified time: 2024-07-26 09:00:17
6
6
  */
7
7
  export default {
8
8
  name: 'zh-cn',
@@ -239,9 +239,9 @@ export default {
239
239
  placeholder: '请在此处 ctrl+v 粘贴数据',
240
240
  supportText: '说明:只支持粘贴 Excel 数据'
241
241
  },
242
- mergeCell: {
243
- cancel: '恢复',
244
- confirm: '合并'
242
+ areaSelect: {
243
+ mergeCell: '合并单元格',
244
+ cancelMerge: '取消合并'
245
245
  },
246
246
  print: {
247
247
  text: '打印'
@@ -29785,7 +29785,7 @@ table {
29785
29785
  * @Author: 焦质晔
29786
29786
  * @Date: 2024-07-23 09:27:27
29787
29787
  * @Last Modified by: 焦质晔
29788
- * @Last Modified time: 2024-07-24 13:32:48
29788
+ * @Last Modified time: 2024-07-26 08:39:21
29789
29789
  */
29790
29790
  .qm-table--area-select {
29791
29791
  position: static;
@@ -29794,7 +29794,7 @@ table {
29794
29794
  }
29795
29795
  .qm-table--area-select .checked-area {
29796
29796
  border: 1px solid #40a9ff;
29797
- background-color: rgba(186, 231, 255, 0.35);
29797
+ background-color: rgba(186, 231, 255, 0.25);
29798
29798
  position: absolute;
29799
29799
  z-index: 2;
29800
29800
  pointer-events: none;