Browse Source

Update `datatables.net` to `2.0.2`.

Resolve #19323
pull/19340/head
maliming 3 years ago
parent
commit
48fda66c6f
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs
  2. 25
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
  3. 2
      npm/packs/datatables.net-bs5/package.json
  4. 2
      npm/packs/datatables.net/abp.resourcemapping.js
  5. 2
      npm/packs/datatables.net/package.json

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs

@ -10,6 +10,6 @@ public class DatatablesNetScriptContributor : BundleContributor
{
public override void ConfigureBundle(BundleConfigurationContext context)
{
context.Files.AddIfNotContains("/libs/datatables.net/js/jquery.dataTables.js");
context.Files.AddIfNotContains("/libs/datatables.net/js/dataTables.min.js");
}
}

25
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js

@ -11,10 +11,6 @@ var abp = abp || {};
* RECORD-ACTIONS extension for datatables *
*************************************************************************/
(function () {
if (!$.fn.dataTableExt) {
return;
}
var getVisibilityValue = function (visibilityField, record, tableInstance) {
if (visibilityField === undefined) {
return true;
@ -238,10 +234,9 @@ var abp = abp || {};
var renderRowActions = function (tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull) {
var columns;
if (tableInstance.aoColumns) {
columns = tableInstance.aoColumns;
} else {
columns = tableInstance.fnSettings().aoColumns;
var settings = tableInstance.api().settings();
if (settings.length === 1 && settings[0].aoColumns) {
columns = settings[0].aoColumns;
}
if (!columns) {
@ -271,16 +266,6 @@ var abp = abp || {};
}
};
var _existingApiRenderRowActionsFunction = $.fn.dataTableExt.oApi.renderRowActions;
$.fn.dataTableExt.oApi.renderRowActions =
function (tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull) {
if (_existingApiRenderRowActionsFunction) {
_existingApiRenderRowActionsFunction(tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull);
}
renderRowActions(tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull);
};
if (!$.fn.dataTable) {
return;
}
@ -466,6 +451,10 @@ var abp = abp || {};
if (column.rowAction) {
customizeRowActionColumn(column);
}
if (!column.type) {
column.type = "string";
}
}
configuration.language = datatables.defaultConfigurations.language();

2
npm/packs/datatables.net-bs5/package.json

@ -6,7 +6,7 @@
},
"dependencies": {
"@abp/datatables.net": "~8.1.0-rc.2",
"datatables.net-bs5": "^1.11.4"
"datatables.net-bs5": "^2.0.2"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431",
"homepage": "https://abp.io",

2
npm/packs/datatables.net/abp.resourcemapping.js

@ -1,5 +1,5 @@
module.exports = {
mappings: {
"@node_modules/datatables.net/js/jquery.dataTables.js": "@libs/datatables.net/js/"
"@node_modules/datatables.net/js/dataTables.min.js": "@libs/datatables.net/js/"
}
}

2
npm/packs/datatables.net/package.json

@ -11,7 +11,7 @@
},
"dependencies": {
"@abp/jquery": "~8.1.0-rc.2",
"datatables.net": "^1.11.4"
"datatables.net": "^2.0.2"
},
"gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431",
"homepage": "https://abp.io",

Loading…
Cancel
Save