Pull request #1747: 无JIRA任务 处理工作日输入框的标红

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '3df025f57121d5a53056b55937b47179698b3d1c':
  BI-72363 补充声明
  无JIRA任务 处理工作日输入框的标红

src/widget/dynamicdate/dynamicdate.card.js

@@ -298,6 +298,9 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
             case BI.DynamicDateCard.TYPE.DAY:
                 valueMap.day = (value.offset === 0 ? -value.value : value.value);
                 break;
+            case BI.DynamicDateCard.TYPE.WORK_DAY:
+                valueMap.workDay = (value.offset === 0 ? -value.value : value.value);
+                break;
             default:
                 break;
         }

src/widget/yearmonth/combo.yearmonth.js

@@ -188,7 +188,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
         return this.trigger.getKey();
     },
 
-    isValid: function () {
+    isStateValid: function () {
         return this.trigger.isValid();
     }
 

src/widget/yearmonth/trigger.yearmonth.js

@@ -259,7 +259,7 @@ BI.DynamicYearMonthTrigger = BI.inherit(BI.Trigger, {
         return this.yearEditor.getValue() + "-" + this.monthEditor.getValue();
     },
 
-    isValid: function () {
+    isStateValid: function () {
         return this.yearEditor.isValid() && this.monthEditor.isValid();
     }
 });

src/widget/yearmonthinterval/yearmonthinterval.js

@@ -100,7 +100,7 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
         combo.on(BI.DynamicYearMonthCombo.EVENT_CONFIRM, function () {
             BI.Bubbles.hide("error");
             var smallDate = self.left.getKey(), bigDate = self.right.getKey();
-            if (self.left.isValid() && self.right.isValid() && self._check(smallDate, bigDate) && self._compare(smallDate, bigDate)) {
+            if (self.left.isStateValid() && self.right.isStateValid() && self._check(smallDate, bigDate) && self._compare(smallDate, bigDate)) {
                 self._setTitle(BI.i18nText("BI-Time_Interval_Error_Text"));
                 self.element.addClass(self.constants.timeErrorCls);
                 self.fireEvent(BI.YearMonthInterval.EVENT_ERROR);

typescript/base/single/button/node/textnode.ts

@@ -0,0 +1,15 @@
+import { NodeButton } from "../button.node";
+
+export declare class TextNode extends NodeButton {
+    setText(b: string): void;
+
+    getText(): string;
+
+    setValue(): void;
+
+    getValue(): string;
+
+    doRedMark(...args: any[]): void;
+
+    unRedMark(...args: any[]): void;
+}

typescript/index.ts

@@ -149,6 +149,7 @@ import { Controller } from "./core/controller/controller";
 import { LayerController } from "./core/controller/controller.layer";
 import { DateCalendarPopup } from "./widget/date/calendar/popup.calendar.date";
 import { Tree, Node } from "./core/utils/tree";
+import { TextNode } from "./base/single/button/node/textnode";
 
 
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@@ -303,6 +304,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     Msg: _msg;
     DynamicYearMonthPopup: typeof DynamicYearMonthPopup;
     DateCalendarPopup: typeof DateCalendarPopup;
+    TextNode: typeof TextNode;
 }
 
 export default {
@@ -459,4 +461,5 @@ export {
     DateCalendarPopup,
     Tree,
     Node,
+    TextNode,
 };