@nokecy/qc-ui-business 2.0.0-beta.2 → 2.0.0-beta.4

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 (7) hide show
  1. package/dist/cjs/standardList/groupedHeaders.d.ts +1 -0
  2. package/dist/cjs/standardList/groupedHeaders.js +13 -5
  3. package/dist/cjs/standardList/groupedHeaders.less +18 -3
  4. package/dist/esm/standardList/groupedHeaders.d.ts +1 -0
  5. package/dist/esm/standardList/groupedHeaders.js +13 -5
  6. package/dist/esm/standardList/groupedHeaders.less +18 -3
  7. package/package.json +2 -2
package/dist/cjs/standardList/groupedHeaders.d.ts CHANGED
@@ -14,6 +14,7 @@ export declare const compositeClasses: {
14
14
  readonly cell: "app-grid-composite-cell";
15
15
  readonly start: "app-grid-composite-start";
16
16
  readonly end: "app-grid-composite-end";
17
+ readonly sharedStart: "app-grid-composite-shared-start";
17
18
  };
18
19
  /** 使用显示分组而非原始列顺序，覆盖隐藏列、拆分分组、固定列及多层嵌套。@author nokecy */
19
20
  export declare const getCompositeColumnEdges: (column?: DisplayedColumn | null) => {
package/dist/cjs/standardList/groupedHeaders.js CHANGED
@@ -23,7 +23,8 @@ var compositeClasses = exports.compositeClasses = {
23
23
  header: 'app-grid-composite-header',
24
24
  cell: 'app-grid-composite-cell',
25
25
  start: 'app-grid-composite-start',
26
- end: 'app-grid-composite-end'
26
+ end: 'app-grid-composite-end',
27
+ sharedStart: 'app-grid-composite-shared-start'
27
28
  };
28
29
 
29
30
  /** 使用显示分组而非原始列顺序，覆盖隐藏列、拆分分组、固定列及多层嵌套。@author nokecy */
@@ -44,6 +45,11 @@ var getCompositeColumnEdges = exports.getCompositeColumnEdges = function getComp
44
45
  end: end
45
46
  };
46
47
  };
48
+
49
+ /** 共享边界由前一组右框绘制，防止相邻4.5px分组框叠加；相邻普通列时保留左框。@author jwy */
50
+ var sharesCompositeStart = function sharesCompositeStart(column, api) {
51
+ return !!column && getCompositeColumnEdges(column).start && !!(api !== null && api !== void 0 && api.getDisplayedColBefore) && getCompositeColumnEdges(api.getDisplayedColBefore(column)).end;
52
+ };
47
53
  var classesOf = function classesOf(value) {
48
54
  return (Array.isArray(value) ? value : [value]).flatMap(function (item) {
49
55
  var _item$split$filter;
@@ -59,8 +65,8 @@ var withCompositeGroupHeader = exports.withCompositeGroupHeader = function withC
59
65
  var originalHeaderClass = column.headerClass;
60
66
  return _objectSpread(_objectSpread({}, column), {}, {
61
67
  headerClass: function headerClass(params) {
62
- var _params$columnGroup;
63
- return mergeClasses(originalHeaderClass, params, (_params$columnGroup = params.columnGroup) !== null && _params$columnGroup !== void 0 && _params$columnGroup.isPadding() ? [] : [compositeClasses.group]);
68
+ var _params$columnGroup, _params$columnGroup2;
69
+ return mergeClasses(originalHeaderClass, params, (_params$columnGroup = params.columnGroup) !== null && _params$columnGroup !== void 0 && _params$columnGroup.isPadding() ? [] : [compositeClasses.group].concat(_toConsumableArray(sharesCompositeStart((_params$columnGroup2 = params.columnGroup) === null || _params$columnGroup2 === void 0 ? void 0 : _params$columnGroup2.getDisplayedLeafColumns()[0], params.api) ? [compositeClasses.sharedStart] : [])));
64
70
  }
65
71
  });
66
72
  };
@@ -71,14 +77,16 @@ var withCompositeLeafHeader = exports.withCompositeLeafHeader = function withCom
71
77
  return _objectSpread(_objectSpread({}, column), {}, {
72
78
  headerClass: function headerClass(params) {
73
79
  var edges = getCompositeColumnEdges(params.column);
74
- return mergeClasses(originalHeaderClass, params, [].concat(_toConsumableArray(edges.grouped ? [compositeClasses.header] : []), _toConsumableArray(edges.start ? [compositeClasses.start] : []), _toConsumableArray(edges.end ? [compositeClasses.end] : [])));
80
+ return mergeClasses(originalHeaderClass, params, [].concat(_toConsumableArray(edges.grouped ? [compositeClasses.header] : []), _toConsumableArray(edges.start ? [compositeClasses.start] : []), _toConsumableArray(edges.end ? [compositeClasses.end] : []), _toConsumableArray(sharesCompositeStart(params.column, params.api) ? [compositeClasses.sharedStart] : [])));
75
81
  },
76
- cellClassRules: _objectSpread(_objectSpread({}, column.cellClassRules), {}, _defineProperty(_defineProperty(_defineProperty({}, compositeClasses.cell, function (params) {
82
+ cellClassRules: _objectSpread(_objectSpread({}, column.cellClassRules), {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, compositeClasses.cell, function (params) {
77
83
  return getCompositeColumnEdges(params.column).grouped;
78
84
  }), compositeClasses.start, function (params) {
79
85
  return getCompositeColumnEdges(params.column).start;
80
86
  }), compositeClasses.end, function (params) {
81
87
  return getCompositeColumnEdges(params.column).end;
88
+ }), compositeClasses.sharedStart, function (params) {
89
+ return sharesCompositeStart(params.column, params.api);
82
90
  }))
83
91
  });
84
92
  };
package/dist/cjs/standardList/groupedHeaders.less CHANGED
@@ -2,11 +2,21 @@
2
2
  .ag-root-wrapper {
3
3
  .app-grid-composite-group {
4
4
  border-top: 1px solid var(--ag-border-color) !important;
5
- border-inline: 2px solid var(--ag-border-color) !important;
5
+ border-inline: 4.5px solid var(--ag-border-color) !important;
6
6
 
7
7
  .ag-header-group-cell-label {
8
8
  justify-content: center !important;
9
9
  width: 100%;
10
+ min-width: 0;
11
+ font-size: calc(var(--ag-font-size, 12px) + 3px);
12
+ line-height: 1.25;
13
+ }
14
+
15
+ .ag-header-group-text {
16
+ min-width: 0;
17
+ overflow: hidden;
18
+ text-overflow: ellipsis;
19
+ white-space: nowrap;
10
20
  }
11
21
  }
12
22
 
@@ -20,10 +30,15 @@
20
30
  }
21
31
 
22
32
  .app-grid-composite-start {
23
- border-inline-start: 2px solid var(--ag-border-color) !important;
33
+ border-inline-start: 4.5px solid var(--ag-border-color) !important;
24
34
  }
25
35
 
26
36
  .app-grid-composite-end {
27
- border-inline-end: 2px solid var(--ag-border-color) !important;
37
+ border-inline-end: 4.5px solid var(--ag-border-color) !important;
38
+ }
39
+
40
+ // 相邻分组仅绘制一条4.5px分界；独立分组左右框均保留。@author jwy
41
+ .app-grid-composite-shared-start {
42
+ border-inline-start: 0 !important;
28
43
  }
29
44
  }
package/dist/esm/standardList/groupedHeaders.d.ts CHANGED
@@ -14,6 +14,7 @@ export declare const compositeClasses: {
14
14
  readonly cell: "app-grid-composite-cell";
15
15
  readonly start: "app-grid-composite-start";
16
16
  readonly end: "app-grid-composite-end";
17
+ readonly sharedStart: "app-grid-composite-shared-start";
17
18
  };
18
19
  /** 使用显示分组而非原始列顺序，覆盖隐藏列、拆分分组、固定列及多层嵌套。@author nokecy */
19
20
  export declare const getCompositeColumnEdges: (column?: DisplayedColumn | null) => {
package/dist/esm/standardList/groupedHeaders.js CHANGED
@@ -17,7 +17,8 @@ export var compositeClasses = {
17
17
  header: 'app-grid-composite-header',
18
18
  cell: 'app-grid-composite-cell',
19
19
  start: 'app-grid-composite-start',
20
- end: 'app-grid-composite-end'
20
+ end: 'app-grid-composite-end',
21
+ sharedStart: 'app-grid-composite-shared-start'
21
22
  };
22
23
 
23
24
  /** 使用显示分组而非原始列顺序，覆盖隐藏列、拆分分组、固定列及多层嵌套。@author nokecy */
@@ -38,6 +39,11 @@ export var getCompositeColumnEdges = function getCompositeColumnEdges(column) {
38
39
  end: end
39
40
  };
40
41
  };
42
+
43
+ /** 共享边界由前一组右框绘制，防止相邻4.5px分组框叠加；相邻普通列时保留左框。@author jwy */
44
+ var sharesCompositeStart = function sharesCompositeStart(column, api) {
45
+ return !!column && getCompositeColumnEdges(column).start && !!(api !== null && api !== void 0 && api.getDisplayedColBefore) && getCompositeColumnEdges(api.getDisplayedColBefore(column)).end;
46
+ };
41
47
  var classesOf = function classesOf(value) {
42
48
  return (Array.isArray(value) ? value : [value]).flatMap(function (item) {
43
49
  var _item$split$filter;
@@ -53,8 +59,8 @@ export var withCompositeGroupHeader = function withCompositeGroupHeader(column)
53
59
  var originalHeaderClass = column.headerClass;
54
60
  return _objectSpread(_objectSpread({}, column), {}, {
55
61
  headerClass: function headerClass(params) {
56
- var _params$columnGroup;
57
- return mergeClasses(originalHeaderClass, params, (_params$columnGroup = params.columnGroup) !== null && _params$columnGroup !== void 0 && _params$columnGroup.isPadding() ? [] : [compositeClasses.group]);
62
+ var _params$columnGroup, _params$columnGroup2;
63
+ return mergeClasses(originalHeaderClass, params, (_params$columnGroup = params.columnGroup) !== null && _params$columnGroup !== void 0 && _params$columnGroup.isPadding() ? [] : [compositeClasses.group].concat(_toConsumableArray(sharesCompositeStart((_params$columnGroup2 = params.columnGroup) === null || _params$columnGroup2 === void 0 ? void 0 : _params$columnGroup2.getDisplayedLeafColumns()[0], params.api) ? [compositeClasses.sharedStart] : [])));
58
64
  }
59
65
  });
60
66
  };
@@ -65,14 +71,16 @@ export var withCompositeLeafHeader = function withCompositeLeafHeader(column) {
65
71
  return _objectSpread(_objectSpread({}, column), {}, {
66
72
  headerClass: function headerClass(params) {
67
73
  var edges = getCompositeColumnEdges(params.column);
68
- return mergeClasses(originalHeaderClass, params, [].concat(_toConsumableArray(edges.grouped ? [compositeClasses.header] : []), _toConsumableArray(edges.start ? [compositeClasses.start] : []), _toConsumableArray(edges.end ? [compositeClasses.end] : [])));
74
+ return mergeClasses(originalHeaderClass, params, [].concat(_toConsumableArray(edges.grouped ? [compositeClasses.header] : []), _toConsumableArray(edges.start ? [compositeClasses.start] : []), _toConsumableArray(edges.end ? [compositeClasses.end] : []), _toConsumableArray(sharesCompositeStart(params.column, params.api) ? [compositeClasses.sharedStart] : [])));
69
75
  },
70
- cellClassRules: _objectSpread(_objectSpread({}, column.cellClassRules), {}, _defineProperty(_defineProperty(_defineProperty({}, compositeClasses.cell, function (params) {
76
+ cellClassRules: _objectSpread(_objectSpread({}, column.cellClassRules), {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, compositeClasses.cell, function (params) {
71
77
  return getCompositeColumnEdges(params.column).grouped;
72
78
  }), compositeClasses.start, function (params) {
73
79
  return getCompositeColumnEdges(params.column).start;
74
80
  }), compositeClasses.end, function (params) {
75
81
  return getCompositeColumnEdges(params.column).end;
82
+ }), compositeClasses.sharedStart, function (params) {
83
+ return sharesCompositeStart(params.column, params.api);
76
84
  }))
77
85
  });
78
86
  };
package/dist/esm/standardList/groupedHeaders.less CHANGED
@@ -2,11 +2,21 @@
2
2
  .ag-root-wrapper {
3
3
  .app-grid-composite-group {
4
4
  border-top: 1px solid var(--ag-border-color) !important;
5
- border-inline: 2px solid var(--ag-border-color) !important;
5
+ border-inline: 4.5px solid var(--ag-border-color) !important;
6
6
 
7
7
  .ag-header-group-cell-label {
8
8
  justify-content: center !important;
9
9
  width: 100%;
10
+ min-width: 0;
11
+ font-size: calc(var(--ag-font-size, 12px) + 3px);
12
+ line-height: 1.25;
13
+ }
14
+
15
+ .ag-header-group-text {
16
+ min-width: 0;
17
+ overflow: hidden;
18
+ text-overflow: ellipsis;
19
+ white-space: nowrap;
10
20
  }
11
21
  }
12
22
 
@@ -20,10 +30,15 @@
20
30
  }
21
31
 
22
32
  .app-grid-composite-start {
23
- border-inline-start: 2px solid var(--ag-border-color) !important;
33
+ border-inline-start: 4.5px solid var(--ag-border-color) !important;
24
34
  }
25
35
 
26
36
  .app-grid-composite-end {
27
- border-inline-end: 2px solid var(--ag-border-color) !important;
37
+ border-inline-end: 4.5px solid var(--ag-border-color) !important;
38
+ }
39
+
40
+ // 相邻分组仅绘制一条4.5px分界；独立分组左右框均保留。@author jwy
41
+ .app-grid-composite-shared-start {
42
+ border-inline-start: 0 !important;
28
43
  }
29
44
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nokecy/qc-ui-business",
3
- "version": "2.0.0-beta.2",
3
+ "version": "2.0.0-beta.4",
4
4
  "description": "QC_UI business components and ABP adapters",
5
5
  "license": "MIT",
6
6
  "private": false,
@@ -48,7 +48,7 @@
48
48
  "@nokecy/formily-antd": "1.2.5",
49
49
  "@nokecy/formily-core": "2.3.7",
50
50
  "@nokecy/formily-react": "2.3.7",
51
- "@nokecy/qc-ui-components": "2.0.0-beta.2",
51
+ "@nokecy/qc-ui-components": "2.0.0-beta.4",
52
52
  "ahooks": "3.10.0"
53
53
  },
54
54
  "peerDependencies": {