BI-133648 feat：日期过滤控件加预览模式

12 months ago · 69cbd37288
14 changed files with 81 additions and 56 deletions
--- a/packages/fineui/src/widget/datepane/datepane.js
+++ b/packages/fineui/src/widget/datepane/datepane.js
@ -30,7 +30,7 @@ export class DynamicDatePane extends Widget {
        minDate: "1900-01-01",
        maxDate: "2099-12-31",
        supportDynamic: true,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    render() {
@ -196,7 +196,7 @@ export class DynamicDatePane extends Widget {
    }

    created() {
-        this.setValue(this.options.value, true);
+        this._initValue(this.options.value);
    }

    _checkValueValid(value) {
@ -213,6 +213,45 @@ export class DynamicDatePane extends Widget {
        }
    }

+    _initValue(v) {
+        v = v || {};
+        const type = v.type || DynamicDateCombo.Static;
+        const value = v.value || v;
+
+        const { isPreview } = this.options;
+        let date;
+
+        // 如果是初始化且是预览状态 直接打开静态页面
+        this.switcher.setValue(isPreview ? DynamicDateCombo.Static : type);
+        this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
+        switch (type) {
+            case DynamicDateCombo.Dynamic:
+                if (isPreview) {
+                    date = DynamicDateHelper.getCalculation(value);
+                    this.ymd.setValue({
+                        year: date.getFullYear(),
+                        month: date.getMonth() + 1,
+                        day: date.getDate(),
+                    });
+                } else {
+                    this.dynamicPane.setValue(value);
+                }
+                break;
+            case DynamicDateCombo.Static:
+            default:
+                if (this._checkValueValid(value)) {
+                    const date = getDate();
+                    this.ymd.setValue({
+                        year: date.getFullYear(),
+                        month: date.getMonth() + 1,
+                    });
+                } else {
+                    this.ymd.setValue(value);
+                }
+                break;
+        }
+    }
+
    setMinDate(minDate) {
        if (this.options.minDate !== minDate) {
            this.options.minDate = minDate;
@ -227,29 +266,15 @@ export class DynamicDatePane extends Widget {
        }
    }

-    setValue(v, isCreated = false) {
+    setValue(v) {
        v = v || {};
        const type = v.type || DynamicDateCombo.Static;
        const value = v.value || v;
-
-        const { isShow } = this.options;
-        let date;
-
-        // 如果是初始化且是预览状态 直接打开静态页面
-        this.switcher.setValue(isShow && isCreated ? DynamicDateCombo.Static : type);
-        this.dateTab.setSelect(isShow && isCreated ? DynamicDateCombo.Static : type);
+        this.switcher.setValue(type);
+        this.dateTab.setSelect(type);
        switch (type) {
            case DynamicDateCombo.Dynamic:
-                if (isShow && isCreated) {
-                    date = DynamicDateHelper.getCalculation(value);
-                    this.ymd.setValue({
-                        year: date.getFullYear(),
-                        month: date.getMonth() + 1,
-                        day: date.getDate(),
-                    });
-                } else {
-                    this.dynamicPane.setValue(value);
-                }
+                this.dynamicPane.setValue(value);
                break;
            case DynamicDateCombo.Static:
            default:
--- a/packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js
+++ b/packages/fineui/src/widget/dynamicdate/dynamicdate.combo.js
@ -53,7 +53,7 @@ export class DynamicDateCombo extends Single {
        },
        isNeedAdjustHeight: false,
        isNeedAdjustWidth: false,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    _init() {
@ -201,7 +201,7 @@ export class DynamicDateCombo extends Single {
                        popup: {
                            el: {
                                type: DynamicDatePopup.xtype,
-                                isShow: opts.isShow,
+                                isPreview: opts.isPreview,
                                width: opts.isNeedAdjustWidth ? opts.width : undefined,
                                supportDynamic: opts.supportDynamic,
                                behaviors: opts.behaviors,
--- a/packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js
+++ b/packages/fineui/src/widget/dynamicdate/dynamicdate.popup.js
@ -34,7 +34,7 @@ export class DynamicDatePopup extends Widget {
        baseCls: "bi-dynamic-date-popup",
        width: 272,
        supportDynamic: true,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    static EVENT_CHANGE = "EVENT_CHANGE";
@ -283,14 +283,14 @@ export class DynamicDatePopup extends Widget {
        v = v || {};
        const type = v.type || DynamicDateCombo.Static;
        const value = v.value || v;
-        const { isShow } = this.options;
+        const { isPreview } = this.options;
        let date;

        // 如果是预览状态 直接打开静态页面
-        this.dateTab.setSelect(isShow ? DynamicDateCombo.Static : type);
+        this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
        switch (type) {
        case DynamicDateCombo.Dynamic:
-            if (isShow) {
+            if (isPreview) {
                date = DynamicDateHelper.getCalculation(value);
                this.ymd.setValue({
                    year: date.getFullYear(),
--- a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js
+++ b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.combo.js
@ -44,7 +44,7 @@ export class DynamicDateTimeCombo extends Single {
        },
        isNeedAdjustHeight: false,
        isNeedAdjustWidth: false,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    static EVENT_KEY_DOWN = "EVENT_KEY_DOWN";
@ -208,7 +208,7 @@ export class DynamicDateTimeCombo extends Single {
                        popup: {
                            el: {
                                type: DynamicDateTimePopup.xtype,
-                                isShow: opts.isShow,
+                                isPreview: opts.isPreview,
                                timeSelectTypes: opts.timeSelectTypes,
                                width: opts.isNeedAdjustWidth ? opts.width : undefined,
                                supportDynamic: opts.supportDynamic,
--- a/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.popup.js
+++ b/packages/fineui/src/widget/dynamicdatetime/dynamicdatetime.popup.js
@ -36,7 +36,7 @@ export class DynamicDateTimePopup extends Widget {
        baseCls: "bi-dynamic-date-time-popup",
        width: 272,
        supportDynamic: true,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    static EVENT_CHANGE = "EVENT_CHANGE";
@ -293,14 +293,14 @@ export class DynamicDateTimePopup extends Widget {
        v = v || {};
        const type = v.type || DynamicDateCombo.Static;
        const value = v.value || v;
-        const { isShow } = this.options;
+        const { isPreview } = this.options;
        let date;

        // 如果是预览状态 直接打开静态页面
-        this.dateTab.setSelect(isShow ? DynamicDateCombo.Static : type);
+        this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
        switch (type) {
            case DynamicDateCombo.Dynamic:
-                if (isShow) {
+                if (isPreview) {
                    date = DynamicDateHelper.getCalculation(value);
                    this.ymd.setValue({
                        year: date.getFullYear(),
--- a/packages/fineui/src/widget/timeinterval/dateinterval.js
+++ b/packages/fineui/src/widget/timeinterval/dateinterval.js
@ -23,7 +23,7 @@ export class DateInterval extends Single {
        lgap: 15,
        offset: 0,
        timeErrorCls: "time-error",
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    static EVENT_VALID = "EVENT_VALID";
@ -79,7 +79,7 @@ export class DateInterval extends Single {
        const o = this.options;
        const combo = createWidget({
            type: DynamicDateCombo.xtype,
-            isShow: o.isShow,
+            isPreview: o.isPreview,
            supportDynamic: o.supportDynamic,
            minDate: o.minDate,
            maxDate: o.maxDate,
--- a/packages/fineui/src/widget/timeinterval/timeinterval.js
+++ b/packages/fineui/src/widget/timeinterval/timeinterval.js
@ -23,7 +23,7 @@ export class TimeInterval extends Single {
        lgap: 15,
        offset: 0,
        timeErrorCls: "time-error",
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    static EVENT_VALID = "EVENT_VALID";
@ -77,7 +77,7 @@ export class TimeInterval extends Single {
        const o = this.options;
        const combo = createWidget({
            type: DynamicDateTimeCombo.xtype,
-            isShow: o.isShow,
+            isPreview: o.isPreview,
            timeSelectTypes: o.timeSelectTypes,
            simple: o.simple,
            supportDynamic: o.supportDynamic,
--- a/packages/fineui/src/widget/year/combo.year.js
+++ b/packages/fineui/src/widget/year/combo.year.js
@ -27,7 +27,7 @@ export class DynamicYearCombo extends Widget {
        maxDate: "2099-12-31", // 最大日期
        height: 24,
        supportDynamic: true,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    _init() {
@ -96,7 +96,7 @@ export class DynamicYearCombo extends Widget {
                el: {
                    type: DynamicYearPopup.xtype,
                    supportDynamic: o.supportDynamic,
-                    isShow: o.isShow,
+                    isPreview: o.isPreview,
                    ref: _ref => {
                        this.popup = _ref;
                    },
--- a/packages/fineui/src/widget/year/popup.year.js
+++ b/packages/fineui/src/widget/year/popup.year.js
@ -30,7 +30,7 @@ export class DynamicYearPopup extends Widget {
        max: "2099-12-31",
        width: 180,
        supportDynamic: true,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };
    constants = {
        tabHeight: 40,
@ -267,13 +267,13 @@ export class DynamicYearPopup extends Widget {
        v = v || {};
        const type = v.type || DynamicDateCombo.Static;
        const value = v.value || v;
-        const { isShow } = this.options;
+        const { isPreview } = this.options;

        // 如果是预览状态 直接打开静态页面
-        this.dateTab.setSelect(isShow ? DynamicDateCombo.Static : type);
+        this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
        switch (type) {
            case DynamicDateCombo.Dynamic:
-                isShow
+                isPreview
                    ? this.year.setValue({ year: DynamicDateHelper.getCalculation(value).getFullYear() })
                    : this.dynamicPane.setValue(value);
                this._setInnerValue();
--- a/packages/fineui/src/widget/yearmonth/combo.yearmonth.js
+++ b/packages/fineui/src/widget/yearmonth/combo.yearmonth.js
@ -38,7 +38,7 @@ export class DynamicYearMonthCombo extends Single {
        supportDynamic: true,
        isNeedAdjustHeight: false,
        isNeedAdjustWidth: false,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    _init() {
@ -107,7 +107,7 @@ export class DynamicYearMonthCombo extends Single {
                    type: DynamicYearMonthPopup.xtype,
                    width: o.isNeedAdjustWidth ? o.width : undefined,
                    supportDynamic: o.supportDynamic,
-                    isShow: o.isShow,
+                    isPreview: o.isPreview,
                    ref: _ref => {
                        this.popup = _ref;
                    },
--- a/packages/fineui/src/widget/yearmonth/popup.yearmonth.js
+++ b/packages/fineui/src/widget/yearmonth/popup.yearmonth.js
@ -31,7 +31,7 @@ export class DynamicYearMonthPopup extends Widget {
        max: "2099-12-31",
        width: 180,
        supportDynamic: true,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    static BUTTON_CLEAR_EVENT_CHANGE = "BUTTON_CLEAR_EVENT_CHANGE";
@ -263,14 +263,14 @@ export class DynamicYearMonthPopup extends Widget {
        v = v || {};
        const type = v.type || DynamicDateCombo.Static;
        const value = v.value || v;
-        const { isShow } = this.options;
+        const { isPreview } = this.options;
        let date;

        // 如果是预览状态 直接打开静态页面
-        this.dateTab.setSelect(isShow ? DynamicDateCombo.Static : type);
+        this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
        switch (type) {
            case DynamicDateCombo.Dynamic:
-                if (isShow) {
+                if (isPreview) {
                    date = DynamicDateHelper.getCalculation(value);
                    this.year.setValue({
                        year: date.getFullYear(),
--- a/packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js
+++ b/packages/fineui/src/widget/yearmonthinterval/yearmonthinterval.js
@ -34,7 +34,7 @@ export class YearMonthInterval extends Single {
        supportDynamic: true,
        height: 24,
        simple: false,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    render() {
@ -72,7 +72,7 @@ export class YearMonthInterval extends Single {
        const o = this.options;
        const combo = createWidget({
            type: DynamicYearMonthCombo.xtype,
-            isShow: o.isShow,
+            isPreview: o.isPreview,
            simple: o.simple,
            supportDynamic: o.supportDynamic,
            height: o.height,
--- a/packages/fineui/src/widget/yearquarter/combo.yearquarter.js
+++ b/packages/fineui/src/widget/yearquarter/combo.yearquarter.js
@ -33,7 +33,7 @@ export class DynamicYearQuarterCombo extends Widget {
        supportDynamic: true,
        isNeedAdjustHeight: false,
        isNeedAdjustWidth: false,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    static EVENT_CONFIRM = "EVENT_CONFIRM";
@ -110,7 +110,7 @@ export class DynamicYearQuarterCombo extends Widget {
                    type: DynamicYearQuarterPopup.xtype,
                    width: o.isNeedAdjustWidth ? o.width : undefined,
                    supportDynamic: o.supportDynamic,
-                    isShow: o.isShow,
+                    isPreview: o.isPreview,
                    ref: _ref => {
                        this.popup = _ref;
                    },
--- a/packages/fineui/src/widget/yearquarter/popup.yearquarter.js
+++ b/packages/fineui/src/widget/yearquarter/popup.yearquarter.js
@ -32,7 +32,7 @@ export class DynamicYearQuarterPopup extends Widget {
        max: "2099-12-31",
        width: 180,
        supportDynamic: true,
-        isShow: false, // 是否是预览状态
+        isPreview: false, // 是否是预览状态
    };

    static BUTTON_CLEAR_EVENT_CHANGE = "BUTTON_CLEAR_EVENT_CHANGE";
@ -305,14 +305,14 @@ export class DynamicYearQuarterPopup extends Widget {
        v = v || {};
        const type = v.type || DynamicDateCombo.Static;
        const value = v.value || v;
-        const { isShow } = this.options;
+        const { isPreview } = this.options;
        let date;

        // 如果是预览状态 直接打开静态页面
-        this.dateTab.setSelect(isShow ? DynamicDateCombo.Static : type);
+        this.dateTab.setSelect(isPreview ? DynamicDateCombo.Static : type);
        switch (type) {
            case DynamicDateCombo.Dynamic:
-                if (isShow) {
+                if (isPreview) {
                    date = DynamicDateHelper.getCalculation(value);
                    this.year.setValue({
                        year: date.getFullYear(),