aldehyde 0.2.216 → 0.2.217
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/report-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAChD,OAAO,aAAa,CAAA;AACpB,OAAO,EAAc,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAgBhE,QAAA,MAAM,WAAW,GAAE,OAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"report-table.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/table/report-table.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAChD,OAAO,aAAa,CAAA;AACpB,OAAO,EAAc,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AAgBhE,QAAA,MAAM,WAAW,GAAE,OAAM,gBAAgB,sBAgGxC,CAAA;AAED,eAAe,WAAW,CAAC"}
|
|
@@ -60,7 +60,7 @@ const ReportTable = (props) => {
|
|
|
60
60
|
if (rowGrids) {
|
|
61
61
|
c.onCell = (record, index) => {
|
|
62
62
|
let rowGrid = rowGrids[record.code];
|
|
63
|
-
if (rowGrid) {
|
|
63
|
+
if (rowGrid && rowGrid.cellMap) {
|
|
64
64
|
return Object.assign({}, rowGrid.cellMap[c.dataIndex]);
|
|
65
65
|
}
|
|
66
66
|
};
|
|
@@ -73,12 +73,12 @@ const ReportTable = (props) => {
|
|
|
73
73
|
table_x = table_x + (c.width ? c.width : 140);
|
|
74
74
|
});
|
|
75
75
|
addColumnOnCell(current_cols);
|
|
76
|
-
return React.createElement(Table, { size: tableProps.size ? tableProps.size : undefined, loading: loading,
|
|
76
|
+
return React.createElement(Table, { size: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.size) ? tableProps.size : undefined, loading: loading,
|
|
77
77
|
//rowSelection={this.getRowSelection()}
|
|
78
|
-
columns: current_cols, dataSource: dataSource, scroll: tableProps.scrollY == -1 || tableProps.scrollY == 0
|
|
78
|
+
columns: current_cols, dataSource: dataSource, scroll: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.scrollY) == -1 || (tableProps === null || tableProps === void 0 ? void 0 : tableProps.scrollY) == 0
|
|
79
79
|
? null
|
|
80
80
|
: {
|
|
81
|
-
y: tableProps.scrollY,
|
|
81
|
+
y: tableProps === null || tableProps === void 0 ? void 0 : tableProps.scrollY,
|
|
82
82
|
x: table_x,
|
|
83
83
|
}, bordered: true, pagination: false, style: { display: columns ? "block" : "none" } });
|
|
84
84
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report-table.js","sourceRoot":"","sources":["../../../../src/aldehyde/table/report-table.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAA;AAChD,OAAO,aAAa,CAAA;AAGpB,OAAO,EAAC,KAAK,EAAC,MAAM,MAAM,CAAC;AAC3B,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,aAAa,MAAM,yBAAyB,CAAC;AAIpD,+BAA+B;AAC/B,4BAA4B;AAC5B,qCAAqC;AACrC,yBAAyB;AACzB,KAAK;AAGL,MAAM,WAAW,GAAC,CAAC,KAAsB,EAAC,EAAE;IAExC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAU,KAAK,CAAC,CAAC;IACvD,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAW,SAAS,CAAC,CAAC;IAClE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAa,SAAS,CAAC,CAAC;IAEpE,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAC,GAAG,SAAS,EAAE,CAAC;IACpD,MAAM,EAAC,UAAU,EAAC,OAAO,EAAC,QAAQ,EAAC,SAAS,EAAC,aAAa,EAAC,GAAC,KAAK,CAAA;IAEjE,SAAS,CAAE,GAAG,EAAE;QACZ,MAAM,SAAS,GAAG,GAAS,EAAE;YACzB,IAAI,QAAQ,EAAE,CAAC;gBACX,MAAM,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAC,SAAS,CAAC,CAAC;YAC3C,CAAC;QACL,CAAC,CAAA,CAAC;QACF,SAAS,EAAE,CAAA;IACf,CAAC,EAAE,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,CAAC,CAAC,CAAC;IAIpB,MAAM,QAAQ,GAAG,CACb,QAAgB,EAAC,SAAgB,EACnC,EAAE;QACA,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,IAAI,UAAU,GAAe,MAAM,WAAW,CAAC,sBAAsB,CAC7D,SAAS,EACT,QAAQ,EAAC,iBAAiB,EAAE,CAC/B,CAAC;QACF,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,KAAI,QAAQ,EAAE,CAAC;YAC9B,OAAO;QACX,CAAC;aAAM,CAAC;YACJ,IAAI,UAAU,GAAa,EAAE,CAAC;YAC9B,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;gBACtB,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;oBACxC,IAAI,GAAG,iCACH,GAAG,EAAE,IAAI,CAAC,IAAI,EACd,IAAI,EAAE,IAAI,CAAC,IAAI,IACZ,IAAI,CAAC,QAAQ,KAChB,KAAK,GACR,CAAC;oBACF,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;YACP,CAAC;YAED,aAAa,CAAC,UAAU,CAAC,CAAC;YAC1B,aAAa,CAAC,UAAU,CAAC,CAAC;YAC1B,UAAU,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACT,CAAC,CAAA,CAAA;IACD,MAAM,eAAe,GAAC,CAAC,YAAY,EAAC,EAAE;QAElC,IAAG,CAAC,UAAU,EAAC,CAAC;YACZ,OAAO;QACX,CAAC;QACD,MAAM,EAAC,QAAQ,EAAC,GAAC,UAAU,CAAA;QAC3B,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACvB,IAAG,QAAQ,EAAC,CAAC;gBACT,CAAC,CAAC,MAAM,GAAC,CAAC,MAAM,EAAC,KAAK,EAAC,EAAE;oBAEvB,IAAI,OAAO,GAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"report-table.js","sourceRoot":"","sources":["../../../../src/aldehyde/table/report-table.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -75,8 +75,9 @@ const ReportTable=(props:ReportTableProps)=> {
|
|
|
75
75
|
if(rowGrids){
|
|
76
76
|
c.onCell=(record,index)=>{
|
|
77
77
|
|
|
78
|
-
let rowGrid= rowGrids[record.code]
|
|
79
|
-
|
|
78
|
+
let rowGrid= rowGrids[record.code];
|
|
79
|
+
|
|
80
|
+
if(rowGrid && rowGrid.cellMap){
|
|
80
81
|
return {
|
|
81
82
|
...rowGrid.cellMap[c.dataIndex]
|
|
82
83
|
}
|
|
@@ -95,16 +96,16 @@ const ReportTable=(props:ReportTableProps)=> {
|
|
|
95
96
|
addColumnOnCell(current_cols);
|
|
96
97
|
|
|
97
98
|
return <Table
|
|
98
|
-
size={tableProps
|
|
99
|
+
size={tableProps?.size ? tableProps.size : undefined}
|
|
99
100
|
loading={loading}
|
|
100
101
|
//rowSelection={this.getRowSelection()}
|
|
101
102
|
columns={current_cols}
|
|
102
103
|
dataSource={dataSource}
|
|
103
104
|
scroll={
|
|
104
|
-
tableProps
|
|
105
|
+
tableProps?.scrollY == -1 || tableProps?.scrollY == 0
|
|
105
106
|
? null
|
|
106
107
|
: {
|
|
107
|
-
y: tableProps
|
|
108
|
+
y: tableProps?.scrollY,
|
|
108
109
|
x: table_x,
|
|
109
110
|
}
|
|
110
111
|
}
|