@yesilyazilim/web.spa 1.1.22 → 1.1.23
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.
- package/index.js +4 -1
- package/index.js.map +1 -1
- package/package.json +2 -2
- package/types.d.ts +5 -2
- package/types.d.ts.map +1 -1
package/index.js
CHANGED
|
@@ -8533,6 +8533,7 @@ let $1b4e3c1abfa7ee85$export$df30df7ec97b32b5 = class DataTable extends (0, $ea0
|
|
|
8533
8533
|
const colInfos = this.options.columns;
|
|
8534
8534
|
if (colInfos.startColumns && colInfos.startColumns.length > 0) cols.push(...colInfos.startColumns);
|
|
8535
8535
|
if (colInfos.idField) ttOpt.index = colInfos.idField;
|
|
8536
|
+
let mcols = [];
|
|
8536
8537
|
for(const key in colInfos.modelColumns){
|
|
8537
8538
|
if (!key) continue;
|
|
8538
8539
|
if (Object.prototype.hasOwnProperty.call(colInfos.modelColumns, key)) {
|
|
@@ -8540,9 +8541,11 @@ let $1b4e3c1abfa7ee85$export$df30df7ec97b32b5 = class DataTable extends (0, $ea0
|
|
|
8540
8541
|
if (!ci) continue;
|
|
8541
8542
|
if (!ci.field) ci.field = key;
|
|
8542
8543
|
this._createColumnCustomFilter(ci.field, ci);
|
|
8543
|
-
|
|
8544
|
+
mcols.push(ci);
|
|
8544
8545
|
}
|
|
8545
8546
|
}
|
|
8547
|
+
mcols = mcols.sort((a, b)=>(a.order || 999) - (b.order || 999));
|
|
8548
|
+
cols.push(...mcols);
|
|
8546
8549
|
if (colInfos.endColumns && colInfos.endColumns.length > 0) cols.push(...colInfos.endColumns);
|
|
8547
8550
|
if (this.options.detail && this.options.detail.flatDataProps) this._createDetailColumns(cols, ttOpt, this.options.detail);
|
|
8548
8551
|
ttOpt.columns = cols;
|