@zgfe/business-lib 1.2.33-hrFix.1 → 1.2.33-hrFix.5

package/es/attrConditions/components/valuesList.js

@@ -92,7 +92,8 @@ var ValuesList = function ValuesList(props) {
     return value === '1' ? 3600 : value === '2' ? 60 : 1;
   };
   var disabledDate = function disabledDate(current) {
-    return current && current > moment().endOf('day');
+    if (!current) return false;
+    return current.isAfter(moment().endOf('day')) || current.isBefore(moment().subtract(2, 'years').startOf('day'));
   };
   if (!attr || !operate || isFirst) {
     return /*#__PURE__*/React.createElement("div", {

package/es/datePicker/datePicker.js

@@ -33,7 +33,7 @@ var BizDate = function BizDate(_ref) {
   function disabledDate(current) {
     var step = includeToday ? 0 : 1;
     var max = moment().subtract(step, 'days');
-    var _timeRangeOpen = timeRangeOpen || 12;
+    var _timeRangeOpen = timeRangeOpen || 24;
     if (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) {
       _timeRangeOpen = typeof (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) === 'boolean' ? (envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen) ? 200 : 12 : envs === null || envs === void 0 ? void 0 : envs.timeRangeOpen;
     }
@@ -106,7 +106,7 @@ var BizDate = function BizDate(_ref) {
     disabledDate: disabledDate,
     onOpenChange: function onOpenChange(open) {
       if (BizDateBeyondRange) {
-        message.error("\u65F6\u95F4\u6BB5\u6700\u5927\u652F\u6301".concat(selectRange ? selectRange : 12).concat(selectRangeUnitText));
+        message.error("\u65F6\u95F4\u6BB5\u6700\u5927\u652F\u6301".concat(selectRange ? selectRange : 24).concat(selectRangeUnitText));
         BizDateBeyondRange = false;
       }
       _onOpenChange && _onOpenChange(open);
@@ -116,7 +116,7 @@ var BizDate = function BizDate(_ref) {
       if (includeToday && value && value.length === 2 && isTodayInRange(value[0], value[1])) {
         subtractDays = 1;
       }
-      if (value && value.length === 2 && moment(_.cloneDeep(value[1]).subtract(subtractDays, 'days').format('YYYY-MM-DD')).diff(moment(value[0].format('YYYY-MM-DD')), selectRangeUnit || 'months') >= (selectRange ? selectRange : 12)) {
+      if (value && value.length === 2 && moment(_.cloneDeep(value[1]).subtract(subtractDays, 'days').format('YYYY-MM-DD')).diff(moment(value[0].format('YYYY-MM-DD')), selectRangeUnit || 'months') >= (selectRange ? selectRange : 24)) {
         BizDateBeyondRange = true;
         return;
       }

package/es/userCondition/conditions/business/paramsCondition.js

@@ -10,6 +10,7 @@ import { classPrefix } from '../..';
 import moment from 'moment';
 import { DatePicker, Input } from 'antd';
 import { PropType } from '../../types';
+import { disabledAbsoluteDate } from '../../util';
 var RangePicker = DatePicker.RangePicker;
 var ParamsCondition = function ParamsCondition(props) {
   var condition = props.condition,
@@ -78,7 +79,8 @@ var ParamsCondition = function ParamsCondition(props) {
     size: "middle",
     defaultValue: [moment(condition.attrs[index].params[0]), moment(condition.attrs[index].params[1])],
     onChange: onDateChange,
-    allowClear: false
+    allowClear: false,
+    disabledDate: disabledAbsoluteDate
   })) : null));
 };
 export default ParamsCondition;

package/es/userCondition/conditions/cdpCondition.js

@@ -19,6 +19,7 @@ import { dateOperate, numberOperate, stringOperate } from '../../attrConditions/
 import { DatePicker, Input } from 'antd';
 import moment from 'moment';
 import { BizUserConditionContext } from '..';
+import { disabledAbsoluteDate } from '../util';
 import request from '../../utils/ajax';
 import Apis from '../../constants/apis';
 import BizGlobalDataContext from '../../context';
@@ -215,7 +216,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
             }(),
             onChange: function onChange() {
               setFieldValue(arguments.length <= 1 ? undefined : arguments[1]);
-            }
+            },
+            disabledDate: disabledAbsoluteDate
           });
           if ((operator === null || operator === void 0 ? void 0 : operator.value) === 'relative') return /*#__PURE__*/React.createElement(Input, {
             key: "relative-date",

package/es/userCondition/conditions/cdpCshCondition.js

@@ -19,6 +19,7 @@ import { dateOperate, numberOperateCsh, numberTypeCsh, stringOperate, numberOper
 import { DatePicker, Input } from 'antd';
 import moment from 'moment';
 import { BizUserConditionContext } from '..';
+import { disabledAbsoluteDate } from '../util';
 import request from '../../utils/ajax';
 import Apis from '../../constants/apis';
 import BizGlobalDataContext from '../../context';
@@ -328,7 +329,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
             }(),
             onChange: function onChange() {
               setFieldValue(arguments.length <= 1 ? undefined : arguments[1]);
-            }
+            },
+            disabledDate: disabledAbsoluteDate
           });
           if ((operator === null || operator === void 0 ? void 0 : operator.value) === 'relative') return /*#__PURE__*/React.createElement(Input, {
             key: "relative-date",

package/es/userCondition/conditions/order/runPeriodCondition.js

@@ -10,6 +10,7 @@ import moment from 'moment';
 import '../styles/periodCondition.less';
 import { classPrefix } from '../..';
 import { operatorMap } from '../constants';
+import { disabledAbsoluteDate } from '../../util';
 import BizSelect from '../../../select';
 import RunTimesCondition from './runTimesCondition';
 var RangePicker = DatePicker.RangePicker;
@@ -102,7 +103,8 @@ var RunPeriodCondition = function RunPeriodCondition(props) {
         size: "middle",
         defaultValue: [moment(values[0]), moment(values[1])],
         onChange: onDateChange,
-        allowClear: false
+        allowClear: false,
+        disabledDate: disabledAbsoluteDate
       });
     }
   }

package/es/userCondition/conditions/periodCondition.js

@@ -11,6 +11,7 @@ import moment from 'moment';
 import './styles/periodCondition.less';
 import { classPrefix } from '..';
 import { operatorMap } from './constants';
+import { disabledAbsoluteDate } from '../util';
 var RangePicker = DatePicker.RangePicker;
 var PeriodCondition = function PeriodCondition(props) {
   var dataId = props.dataId,
@@ -105,7 +106,8 @@ var PeriodCondition = function PeriodCondition(props) {
         size: "middle",
         defaultValue: [moment(values[0]), moment(values[1])],
         onChange: onDateChange,
-        allowClear: false
+        allowClear: false,
+        disabledDate: disabledAbsoluteDate
       });
     }
   }

package/es/userCondition/util.d.ts

@@ -1,5 +1,7 @@
+import moment from 'moment';
 import type { GlobalContextProps } from '../context';
 import type { BizUserConditionT, Unpacked } from './types';
+export declare function disabledAbsoluteDate(current: moment.Moment): boolean;
 export declare function buildCondition(type: BizUserConditionT.ConditionType): BizUserConditionT.BusinessCondition | BizUserConditionT.EventCondition | BizUserConditionT.AddCondition | BizUserConditionT.OrderCondition | BizUserConditionT.ActiveCondition | BizUserConditionT.PropCondition | BizUserConditionT.CdpCondition | BizUserConditionT.CdpCshCondition;
 export declare function transformNumberOperate(key: string, output?: boolean): string;
 export declare function findEvent(eventId: number, eventGroupList: Unpacked<GlobalContextProps, 'eventGroupList'>): import("../attributeSelector/types").AnalysisEvent | null;

package/es/userCondition/util.js

@@ -4,7 +4,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import moment from 'moment';
 import { LabelCreateType } from './types';
+export function disabledAbsoluteDate(current) {
+  if (!current) return false;
+  return current.isAfter(moment().endOf('day')) || current.isBefore(moment().subtract(2, 'years').startOf('day'));
+}
 export function buildCondition(type) {
   switch (type) {
     case 'add':

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.33-hrFix.1",
+    "version": "1.2.33-hrFix.5",
     "module": "es/index.js",
     "typings": "es/index.d.ts",
     "files": [
@@ -55,7 +55,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "f91f93fe67340b40705b3926e192d5eb50ff5f95",
+    "gitHead": "845059a0eba0a2d3aca0262a6dd87175246624a9",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }