ps-toolkit-ui 1.20.87 → 1.20.89

package/bundles/ps-toolkit-ui.umd.js

@@ -1473,42 +1473,65 @@
         };
         HelperClass.getDateRemainFull = function (l, dt, c) {
             if (c === void 0) { c = 2; }
+            var now = new Date();
             var d = parseInt(dt.substring(6, dt.length - 2), 10);
-            var now = moment.now();
+            var target = new Date(d);
             var r = '';
-            var dif = (d - now) / 1000;
-            var f = dif <= 0;
-            if (dif <= 0) {
+            var f = now > target;
+            if (f) {
                 r += l('Finished') + ' - ';
-                dif = dif * -1;
-            }
-            var year = Math.floor(dif / 31536000);
-            var month = Math.floor((dif % 31536000) / 2628000);
-            var day = Math.floor(((dif % 31536000) % 2628000) / 86400);
-            var hour = Math.floor((((dif % 31536000) % 2628000) % 86400) / 3600);
-            var minute = Math.floor(((((dif % 31536000) % 2628000) % 86400) % 3600) / 60);
-            if (year > 0) {
-                r += l('YearP', year.toString());
+                var tmp = target;
+                target = now;
+                now = tmp;
+            }
+            var years = target.getFullYear() - now.getFullYear();
+            var months = target.getMonth() - now.getMonth();
+            var days = target.getDate() - now.getDate();
+            var hours = target.getHours() - now.getHours();
+            var minutes = target.getMinutes() - now.getMinutes();
+            var seconds = target.getSeconds() - now.getSeconds();
+            if (seconds < 0) {
+                minutes--;
+            }
+            if (minutes < 0) {
+                minutes += 60;
+                hours--;
+            }
+            if (hours < 0) {
+                hours += 24;
+                days--;
+            }
+            if (days < 0) {
+                var prevMonth = new Date(target.getFullYear(), target.getMonth(), 0);
+                days += prevMonth.getDate();
+                months--;
+            }
+            if (months < 0) {
+                months += 12;
+                years--;
+            }
+            if (years > 0) {
+                r += l('YearP', years.toString());
                 c--;
             }
-            if (month > 0 && c > 0) {
-                r += year > 0 ? l('And') : '';
-                r += l('MonthP', month.toString());
+            if (months > 0 && c > 0) {
+                r += years > 0 ? l('And') : '';
+                r += l('MonthP', months.toString());
                 c--;
             }
-            if (day > 0 && c > 0) {
-                r += year > 0 || month > 0 ? l('And') : '';
-                r += l('DayP', day.toString());
+            if (days > 0 && c > 0) {
+                r += years > 0 || months > 0 ? l('And') : '';
+                r += l('DayP', days.toString());
                 c--;
             }
-            if (hour > 0 && c > 0) {
-                r += year > 0 || month > 0 || day > 0 ? l('And') : '';
-                r += l('HourP', hour.toString());
+            if (hours > 0 && c > 0) {
+                r += years > 0 || months > 0 || days > 0 ? l('And') : '';
+                r += l('HourP', hours.toString());
                 c--;
             }
-            if (minute > 0 && c > 0) {
-                r += year > 0 || month > 0 || day > 0 || hour > 0 ? l('And') : '';
-                r += l('MinuteP', minute.toString());
+            if (minutes > 0 && c > 0) {
+                r += years > 0 || months > 0 || days > 0 || hours > 0 ? l('And') : '';
+                r += l('MinuteP', minutes.toString());
                 c--;
             }
             r += (r !== '' ? '' : l('LessThanMinute')) + ' ' + (f ? l('Ago') : l('Later'));
@@ -6304,7 +6327,7 @@
                 if (this.inp.onChange) {
                     this.inp.onChange(this.inp, false);
                 }
-                if (this.inp.type === exports.InputType.SelectSearch) {
+                if (this.inp.type === exports.InputType.SelectSearch || this.inp.type === exports.InputType.SelectSearchRadio) {
                     this.setOptions();
                 }
                 else if (e.target.value) {