@yibozhang/pro-table 16.0.5 → 16.0.7

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.
@@ -69,6 +69,7 @@ export declare class ProTableComponent implements OnInit, AfterContentInit {
69
69
  ngOnInit(): Promise<void>;
70
70
  ngAfterContentInit(): void;
71
71
  private preCheckServerColumns;
72
+ private mergeServerColumnsWithInit;
72
73
  private queryDynamicColumns;
73
74
  private formateInnerColumns;
74
75
  private autoRegisterTemplates;
@@ -1 +1 @@
1
- {"version":3,"file":"pro-table.component.d.ts","sourceRoot":"","sources":["../../../pro-table/src/lib/pro-table.component.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pro-table.component.d.ts","sourceRoot":"","sources":["../../../pro-table/src/lib/pro-table.component.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yibozhang/pro-table",
3
- "version": "16.0.5",
3
+ "version": "16.0.7",
4
4
  "description": "基于 Angular11 和 ng-zorro-antd 的高级表格组件库",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -29,7 +29,7 @@
29
29
  &.ant-select-allow-clear .ant-select-selector {
30
30
  padding-right: 0 !important;
31
31
  }
32
- .ant-select-selection-item{
32
+ .ant-select-selection-item {
33
33
  margin-right: 2px !important;
34
34
  padding-left: 4px !important;
35
35
  }
@@ -44,29 +44,20 @@
44
44
  .ant-table-row {
45
45
  height: 36px !important;
46
46
  }
47
- .ant-table-tbody > .ant-table-custom-row-even {
47
+ .ant-table-tbody > tr.ant-table-custom-row-even > td {
48
48
  background-color: @custom-table-row-even-bg;
49
49
  }
50
- .ant-table-tbody > .ant-table-custom-row-odd {
50
+ .ant-table-tbody > tr.ant-table-custom-row-odd > td {
51
51
  background-color: @custom-table-row-odd-bg;
52
52
  }
53
- .ant-table-tbody > .ant-table-custom-row-selected {
53
+ .ant-table-tbody > tr.ant-table-custom-row-selected > td {
54
54
  background-color: @table-row-hover-bg;
55
55
  }
56
56
 
57
- .ant-table-tbody > .ant-table-row:nth-child(even) {
58
- .ant-table-cell-fix-left,
59
- .ant-table-cell-fix-right {
60
- background-color: @custom-table-row-odd-bg;
61
- }
62
- }
63
- // 偶数行 hover 时同步覆盖固定列背景色,保持与行 hover 一致
64
- .ant-table-tbody > .ant-table-row:nth-child(even):hover {
65
- .ant-table-cell-fix-left,
66
- .ant-table-cell-fix-right {
67
- background-color: @table-row-hover-bg;
68
- }
57
+ .ant-table-tbody > tr:hover > td {
58
+ background-color: @table-row-hover-bg;
69
59
  }
60
+
70
61
  .ant-table-tbody > tr > td:not([class*="nz-disable-td"]) {
71
62
  padding: @custom-table-padding-vertical @custom-table-padding-horizontal !important;
72
63
  }
@@ -194,7 +185,7 @@
194
185
  height: 23px;
195
186
  line-height: 23px;
196
187
  }
197
- .ant-form-item{
188
+ .ant-form-item {
198
189
  margin-bottom: 8px !important;
199
190
  }
200
191
  }