Merge pull request #5147 from abpframework/liangshiwei/abp.luxon.js

Add abp.luxon.js

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/Luxon/LuxonScriptContributor.cs

@@ -8,6 +8,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.Luxon
         public override void ConfigureBundle(BundleConfigurationContext context)
         {
             context.Files.AddIfNotContains("/libs/luxon/luxon.min.js");
+            context.Files.AddIfNotContains("/libs/abp/luxon/abp.luxon.js");
         }
     }
 }

modules/blogging/app/Volo.BloggingTestApp/wwwroot/libs/abp/luxon/abp.luxon.js

@@ -0,0 +1,48 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    /* NOTIFICATION *********************************************/
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);

modules/docs/app/VoloDocs.Web/wwwroot/libs/abp/luxon/abp.luxon.js

@@ -0,0 +1,48 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    /* NOTIFICATION *********************************************/
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);

modules/virtual-file-explorer/app/Volo.Abp.VirtualFileExplorer.DemoApp/wwwroot/libs/abp/luxon/abp.luxon.js

@@ -0,0 +1,48 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    /* NOTIFICATION *********************************************/
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);

npm/packs/luxon/abp.resourcemapping.js

@@ -1,5 +1,6 @@
 module.exports = {
     mappings: {
         "@node_modules/luxon/build/global/*.*": "@libs/luxon/"
+        "@node_modules/@abp/luxon/src/*.*": "@libs/abp/luxon/"
     }
 }

npm/packs/luxon/package.json

@@ -5,6 +5,7 @@
     "access": "public"
   },
   "dependencies": {
+    "@abp/core": "~3.0.5",
     "luxon": "^1.24.1"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"

npm/packs/luxon/src/abp.luxon.js

@@ -0,0 +1,48 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    /* NOTIFICATION *********************************************/
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/wwwroot/libs/abp/luxon/abp.luxon.js

@@ -0,0 +1,48 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    /* NOTIFICATION *********************************************/
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/wwwroot/libs/abp/luxon/abp.luxon.js

@@ -0,0 +1,48 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    /* NOTIFICATION *********************************************/
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/wwwroot/libs/abp/luxon/abp.luxon.js

@@ -0,0 +1,48 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    /* NOTIFICATION *********************************************/
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/wwwroot/libs/abp/luxon/abp.luxon.js

@@ -0,0 +1,48 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    /* NOTIFICATION *********************************************/
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/wwwroot/libs/abp/luxon/abp.luxon.js

@@ -0,0 +1,48 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    /* NOTIFICATION *********************************************/
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Host/wwwroot/libs/abp/luxon/abp.luxon.js

@@ -0,0 +1,48 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    /* NOTIFICATION *********************************************/
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Web.Unified/wwwroot/libs/abp/luxon/abp.luxon.js

@@ -0,0 +1,48 @@
+var abp = abp || {};
+(function () {
+
+    if (!luxon) {
+        throw "abp/luxon library requires the luxon library included to the page!";
+    }
+
+    /* TIMING *************************************************/
+
+    abp.timing = abp.timing || {};
+
+    /* NOTIFICATION *********************************************/
+
+    var setObjectValue = function (obj, property, value) {
+        if (typeof property === "string") {
+            property = property.split('.');
+        }
+
+        if (property.length > 1) {
+            var p = property.shift();
+            setObjectValue(obj[p], property, value);
+        } else {
+            obj[property[0]] = value;
+        }
+    }
+
+    var getObjectValue = function (obj, property) {
+        return property.split('.').reduce((a, v) => a[v], obj)
+    }
+
+    abp.timing.convertFieldsToIsoDate = function (form, fields) {
+        for (var field of fields) {
+            var dateTime = luxon.DateTime
+                .fromFormat(
+                    getObjectValue(form, field),
+                    abp.localization.currentCulture.dateTimeFormat.shortDatePattern,
+                    {locale: abp.localization.currentCulture.cultureName}
+                );
+
+            if (!dateTime.invalid) {
+                setObjectValue(form, field, dateTime.toFormat("yyyy-MM-dd HH:mm:ss"))
+            }
+        }
+
+        return form;
+    }
+
+})(jQuery);