@zgfe/business-lib 1.2.50 → 1.2.51-ljy.1

package/es/datePickerOld/types.d.ts

@@ -0,0 +1,39 @@
+export declare namespace DatePickerTypes {
+    enum Unit {
+        'hour' = "hour",
+        'day' = "day",
+        'week' = "week",
+        'month' = "month",
+        'quarter' = "quarter",
+        'custom' = "custom"
+    }
+    interface Range {
+        begin?: string;
+        end?: string;
+    }
+    interface Value extends Range {
+        unit: Unit;
+        relative?: [number, number];
+    }
+    interface Props {
+        defaultValue?: Value;
+        value?: Value;
+        includeToday?: boolean;
+        selectRange?: number;
+        timeRangeOpen?: number;
+        selectRangeUnit?: 'days' | 'weeks' | 'months' | 'quarter';
+        onChange?: (data: Value) => void;
+        onOpenChange?: (data: boolean) => void;
+        mode?: 'general' | 'simple' | 'superSimple';
+        dateTypeList?: Unit[];
+    }
+    interface Option {
+        label: string;
+        value: Unit;
+        children: ListOption[];
+    }
+    interface ListOption {
+        count: number;
+        value: string;
+    }
+}

package/es/datePickerOld/types.js

@@ -0,0 +1,12 @@
+export var DatePickerTypes;
+(function (DatePickerTypes) {
+  var Unit;
+  (function (Unit) {
+    Unit["hour"] = "hour";
+    Unit["day"] = "day";
+    Unit["week"] = "week";
+    Unit["month"] = "month";
+    Unit["quarter"] = "quarter";
+    Unit["custom"] = "custom";
+  })(Unit = DatePickerTypes.Unit || (DatePickerTypes.Unit = {}));
+})(DatePickerTypes || (DatePickerTypes = {}));

package/es/datePickerOld/utils.d.ts

@@ -0,0 +1,7 @@
+import moment from 'moment';
+import { DatePickerTypes } from './types';
+export declare const getDateRange: (type: DatePickerTypes.Unit, count: number, includeToday: boolean) => {
+    begin: string;
+    end: string;
+};
+export declare const isTodayInRange: (_startDate: moment.Moment, _endDate: moment.Moment) => boolean;

package/es/datePickerOld/utils.js

@@ -0,0 +1,47 @@
+import moment from 'moment';
+import { DatePickerTypes } from './types';
+function getAbsoluteDate(unit, count, maxDate) {
+  var res = {};
+  var dayTime = 24 * 60 * 60 * 1000;
+  switch (unit) {
+    case DatePickerTypes.Unit.hour:
+      res.endDate = res.startDate = moment().subtract(count, 'days').toDate();
+      break;
+    case DatePickerTypes.Unit.day:
+      res.startDate = moment().subtract(count, 'days').toDate();
+      count == 1 ? res.endDate = moment().subtract(count, 'days').toDate() : res.endDate = maxDate;
+      break;
+    case DatePickerTypes.Unit.week:
+      res.endDate = maxDate;
+      var firstOfWeek = new Date(maxDate.getTime() - (maxDate.getDay() - 1) * dayTime);
+      res.startDate = new Date(firstOfWeek.getTime() - count * 7 * dayTime);
+      break;
+    case DatePickerTypes.Unit.month:
+      res.endDate = maxDate;
+      var firstOfMonth = new Date(maxDate.getTime() - (maxDate.getDate() - 1) * dayTime);
+      firstOfMonth.setMonth(firstOfMonth.getMonth() - count);
+      res.startDate = new Date(firstOfMonth);
+      break;
+    case DatePickerTypes.Unit.quarter:
+      res.endDate = maxDate;
+      var firstOfQuarter = new Date(maxDate.getTime() - (maxDate.getDate() - 1) * dayTime);
+      firstOfQuarter.setMonth(firstOfQuarter.getMonth() - firstOfQuarter.getMonth() % 3 - 3 * (count - 1));
+      res.startDate = new Date(firstOfQuarter);
+      break;
+  }
+  return res;
+}
+export var getDateRange = function getDateRange(type, count, includeToday) {
+  var maxDate = moment().subtract(includeToday || count == 0 ? 0 : 1, 'days').toDate();
+  var res = getAbsoluteDate(type, count, maxDate);
+  return {
+    begin: moment(res.startDate).format('YYYY-MM-DD'),
+    end: moment(res.endDate).format('YYYY-MM-DD')
+  };
+};
+export var isTodayInRange = function isTodayInRange(_startDate, _endDate) {
+  var startDate = _startDate.format('x');
+  var endDate = moment(_endDate).add(1, 'days').format('x');
+  var dateToCheck = moment(new Date()).format('x');
+  return dateToCheck >= startDate && dateToCheck <= endDate;
+};

package/es/index.d.ts

@@ -47,7 +47,8 @@ import useBizStore from './hooks/useBizStore';
 import useChanged from './hooks/useChanged';
 import useSubject from './hooks/useSubject';
 import DataSetGroup from './dataSetGroup';
-export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, };
+import BizDatePickerOld from './datePickerOld';
+export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizDatePickerOld, };
 export type { UserGroupTypes } from './userGroup/types';
 export type { BizProductConditionT } from './productCondition/types';
 export type { BizSelectTypes } from './select/types';

package/es/index.js

@@ -46,4 +46,5 @@ import useBizStore from './hooks/useBizStore';
 import useChanged from './hooks/useChanged';
 import useSubject from './hooks/useSubject';
 import DataSetGroup from './dataSetGroup';
-export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup };
+import BizDatePickerOld from './datePickerOld';
+export { BizTargetDimension, BizTargetFromPanel, BizSearchInput, BizSelect, BizDialog, BizChart, BizTable, BizLayout, BizAnalysisLayout, BizDetailLayout, BizUserGroup, BizUserGroupHeader, IconFont, ColorIcon, BizFormulaTarget, BizAUMFormulaTarget, BizTargetSelector, BizEventSelector, BizAttributeSelector, BizGlobalDataContext, BizTargetFromPanelContext, BizTargetCondition, BizDatePicker, BizQuickDatePicker, BizLoading, BizConditionItem, BizConditionGroup, BizAttrCondition, BizAttrConditionGroup, BizUserCondition, BizProductCondition, BizAddToScene, BizAddToPanel, BizCycleTime, BizDnd, BizLoginForm, DemoWrapper, SocketClient, ajax, util, base64, theme, convertAttributeData, BizUserTagsSelect, setGlobalConfig, chartColors, useBizStore, useChanged, useSubject, DataSetGroup, BizDatePickerOld };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.50",
+    "version": "1.2.51-ljy.1",
     "module": "es/index.js",
     "typings": "es/index.d.ts",
     "files": [
@@ -45,7 +45,7 @@
         "@types/lodash": "^4.14.182",
         "@umijs/fabric": "^2.8.1",
         "@umijs/test": "^3.0.5",
-        "antd": "^4.22.8",
+        "antd": "4.24.16",
         "dumi": "^1.1.0",
         "father-build": "^1.17.2",
         "gh-pages": "^3.0.0",
@@ -55,7 +55,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "43bb6c649f157574dd89b35c9d491644708aecad",
+    "gitHead": "9a7a09c57f1d248349441367e54a637f97d8f4f5",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }