@bchr/bchr-front-lib 0.3.101 → 0.3.105

package/lib/base/AppFormulaFunctions.js

@@ -1,26 +1,48 @@
 "use strict";
 
-window.AppFormulaFunctions = {};
-
-window.AppFormulaFunctions.currentMonthStartDay = function (date) {
-  var currentDate = new Date(date),
-      currentYear = currentDate.getFullYear(),
-      currentMouth = currentDate.getMonth() + 1;
-  return currentYear + "-" + currentMouth + "-1";
-};
-
-window.AppFormulaFunctions.nextMonthStartDay = function (date) {
-  var currentDate = new Date(date),
-      currentYear = currentDate.getFullYear(),
-      currentMouth = currentDate.getMonth() + 1;
-  return new Date(currentYear, currentMouth, 1);
-};
-
-window.AppFormulaFunctions.currentDateToDeadline = function (date, during) {
-  debugger;
-  var changeDate = new Date(new Date(date).getTime() + during * 24 * 60 * 60 * 1000);
-  var changeYear = changeDate.getFullYear(),
-      changeMouth = changeDate.getMonth() + 1,
-      changeDay = changeDate.getDay();
-  return changeYear + '-' + changeMouth + '-' + changeDay;
+var _moment = _interopRequireDefault(require("moment"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+window.AppFormulaFunctions = {
+  currentMonthStartDay: function currentMonthStartDay(dateStr) {
+    if (dateStr) {
+      var baseDate = (0, _moment["default"])(dateStr, "YYYY-MM-DD");
+      return baseDate.date(1).format("YYYY-MM-DD");
+    }
+
+    return null;
+  },
+  nextMonthStartDay: function nextMonthStartDay(dateStr) {
+    if (dateStr) {
+      var baseDate = (0, _moment["default"])(dateStr, "YYYY-MM-DD");
+      return baseDate.add(1, 'months').date(1).format("YYYY-MM-DD");
+    }
+
+    return null;
+  },
+  datePlusDays: function datePlusDays(dateStr, during_days) {
+    if (dateStr && during_days) {
+      var baseDate = (0, _moment["default"])(dateStr, "YYYY-MM-DD");
+      return baseDate.add(during_days, 'days').format("YYYY-MM-DD");
+    }
+
+    return null;
+  },
+  datePlusMonths: function datePlusMonths(dateStr, during_months) {
+    if (dateStr && during_months) {
+      var baseDate = (0, _moment["default"])(dateStr, "YYYY-MM-DD");
+      return baseDate.add(during_months, 'months').format("YYYY-MM-DD");
+    }
+
+    return null;
+  },
+  datePlusYears: function datePlusYears(dateStr, during_years) {
+    if (dateStr && during_years) {
+      var baseDate = (0, _moment["default"])(dateStr, "YYYY-MM-DD");
+      return baseDate.add(during_years, 'years').format("YYYY-MM-DD");
+    }
+
+    return null;
+  }
 };

package/lib/base/layout/ui_tpl/form/FormForBrowse.js

@@ -372,7 +372,7 @@ var FormForBrowse = /*#__PURE__*/function (_React$Component) {
             if (typeof initialValue === 'boolean') {
               value = initialValues[display_code] ? "是" : "否";
             } else {
-              value = (initialValue || '').toLowerCase() === 'true' ? "是" : "否";
+              value = (initialValue + '' || '').toLowerCase() === 'true' || (initialValue + '' || '').toLowerCase() === '1' ? "是" : "否";
             }
 
             break;