@zat-design/sisyphus-react 3.3.0-beta.9 → 3.3.1

package/lib/old/ProCertValidity/index.js

@@ -9,9 +9,9 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _dayjs = _interopRequireDefault(require("dayjs"));
+var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
-var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
+var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
 var RangePicker = _antd.DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
 var defaultPopupContainer = function defaultPopupContainer(triggerNode) {
@@ -50,37 +50,37 @@ var ProCertValidity = exports.ProCertValidity = /*#__PURE__*/(0, _react.forwardR
         forever = _value.forever;
       if (forever === 'Y') {
         return {
-          range: [(0, _dayjs.default)('9999-01-01'), (0, _dayjs.default)('9999-01-01')],
+          range: [(0, _moment.default)('9999-01-01'), (0, _moment.default)('9999-01-01')],
           forever: true
         };
       }
       if (startTime && endTime) {
-        var tempStartDate = (0, _dayjs.default)(startTime).format(defaultFormatDate);
-        var tempEndDate = (0, _dayjs.default)(endTime).format(defaultFormatDate);
+        var tempStartDate = (0, _moment.default)(startTime).format(defaultFormatDate);
+        var tempEndDate = (0, _moment.default)(endTime).format(defaultFormatDate);
         if ((!forever || forever === 'N') && !checkIsForever(tempStartDate) && !checkIsForever(tempEndDate)) {
           return {
-            range: [(0, _dayjs.default)(startTime), (0, _dayjs.default)(endTime)],
+            range: [(0, _moment.default)(startTime), (0, _moment.default)(endTime)],
             forever: false
           };
         }
         if (checkIsForever(tempStartDate) && checkIsForever(tempEndDate) && !isChange.current) {
           return {
-            range: [(0, _dayjs.default)('9999-01-01'), (0, _dayjs.default)('9999-01-01')],
+            range: [(0, _moment.default)('9999-01-01'), (0, _moment.default)('9999-01-01')],
             forever: true
           };
         }
       }
     } else {
       if (typeof value === 'string' || value._isAMomentObject) {
-        var tempDate = (0, _dayjs.default)(value).format(defaultFormatDate);
+        var tempDate = (0, _moment.default)(value).format(defaultFormatDate);
         if (tempDate && tempDate === '9999-01-01') {
           return {
-            range: (0, _dayjs.default)('9999-01-01'),
+            range: (0, _moment.default)('9999-01-01'),
             forever: true
           };
         }
         return {
-          range: (0, _dayjs.default)(value),
+          range: (0, _moment.default)(value),
           forever: false
         };
       }
@@ -89,21 +89,21 @@ var ProCertValidity = exports.ProCertValidity = /*#__PURE__*/(0, _react.forwardR
         _forever = _value2.forever;
       if (_forever === 'Y') {
         return {
-          range: (0, _dayjs.default)('9999-01-01'),
+          range: (0, _moment.default)('9999-01-01'),
           forever: true
         };
       }
       if (dateTime) {
-        var _tempDate = (0, _dayjs.default)(dateTime).format(defaultFormatDate);
+        var _tempDate = (0, _moment.default)(dateTime).format(defaultFormatDate);
         if ((!_forever || _forever === 'N') && _tempDate !== '9999-01-01') {
           return {
-            range: (0, _dayjs.default)(dateTime),
+            range: (0, _moment.default)(dateTime),
             forever: false
           };
         }
         if (_tempDate && _tempDate === '9999-01-01' && !isChange.current) {
           return {
-            range: (0, _dayjs.default)('9999-01-01'),
+            range: (0, _moment.default)('9999-01-01'),
             forever: true
           };
         }
@@ -113,8 +113,8 @@ var ProCertValidity = exports.ProCertValidity = /*#__PURE__*/(0, _react.forwardR
   }, [value, (_value3 = value) === null || _value3 === void 0 ? void 0 : _value3.dateTime]);
   var changeRangeTime = function changeRangeTime(values) {
     onChange({
-      startTime: values ? (0, _dayjs.default)(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
-      endTime: values ? (0, _dayjs.default)(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
+      startTime: values ? (0, _moment.default)(values === null || values === void 0 ? void 0 : values[0]).format(defaultFormatDate) : null,
+      endTime: values ? (0, _moment.default)(values === null || values === void 0 ? void 0 : values[1]).format(defaultFormatDate) : null,
       forever: 'N'
     });
   };
@@ -142,7 +142,7 @@ var ProCertValidity = exports.ProCertValidity = /*#__PURE__*/(0, _react.forwardR
     if (rangeTime.forever) {
       _value4 = '长期';
     } else {
-      _value4 = rangeTime.range ? (0, _dayjs.default)(rangeTime.range).format(defaultFormatDate) : null;
+      _value4 = rangeTime.range ? (0, _moment.default)(rangeTime.range).format(defaultFormatDate) : null;
     }
     return (0, _jsxRuntime.jsx)(_antd.Input, {
       value: _value4,

package/lib/old/ProCertValidity/propsType.d.ts

@@ -1,12 +1,12 @@
 import { DatePickerProps, RangePickerProps } from 'antd/es/date-picker';
-import dayjs from 'dayjs';
+import moment from 'moment';
 interface ICertValidityValuePropsType {
-    dateTime?: dayjs.Dayjs | string;
+    dateTime?: moment.Moment | string;
     forever?: string;
 }
 interface ICertValidityRangeValuePropsType {
-    startTime?: dayjs.Dayjs | string;
-    endTime?: dayjs.Dayjs | string;
+    startTime?: moment.Moment | string;
+    endTime?: moment.Moment | string;
     forever?: string;
 }
 interface IProCertValidityExtraPropsType {

package/lib/old/ProEditableTable/utils.d.ts

@@ -1,7 +1,7 @@
-import type { Dayjs } from 'dayjs';
+import type { Moment } from 'moment';
 import { IRowDataPropsType } from './propsType';
 export declare const rangePickerTransform: (formatter?: string) => {
-    normalize: (value: [Dayjs, Dayjs]) => {
+    normalize: (value: [Moment, Moment]) => {
         from?: undefined;
         to?: undefined;
     } | {
@@ -13,15 +13,15 @@ export declare const rangePickerTransform: (formatter?: string) => {
         to: string;
     }) => {
         format: string;
-        value: Dayjs[];
+        value: Moment[];
     };
     getValueFromEvent: (rawDate?: any) => any;
 };
 export declare const datePickerTransform: (formatter?: string) => {
-    normalize: (value: Dayjs) => string;
+    normalize: (value: Moment) => string;
     getValueProps: (value: string) => {
         format: string;
-        value: Dayjs;
+        value: Moment;
     };
 };
 export declare const transformColumns: (columns: any[], form: any, disabled: Boolean) => any[];

package/lib/old/ProEditableTable/utils.js

@@ -10,7 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
-var _dayjs2 = _interopRequireDefault(require("dayjs"));
+var _moment2 = _interopRequireDefault(require("moment"));
 var _components = require("../../ProForm/components");
 var Option = _antd.Select.Option;
 var RangePicker = _antd.DatePicker.RangePicker;
@@ -37,7 +37,7 @@ var rangePickerTransform = exports.rangePickerTransform = function rangePickerTr
         to = _ref.to;
       return {
         format: formatter,
-        value: [from ? (0, _dayjs2.default)(from) : null, to ? (0, _dayjs2.default)(to) : null]
+        value: [from ? (0, _moment2.default)(from) : null, to ? (0, _moment2.default)(to) : null]
       };
     },
     getValueFromEvent: function getValueFromEvent() {
@@ -51,13 +51,13 @@ var datePickerTransform = exports.datePickerTransform = function datePickerTrans
   var formatter = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'YYYY-MM-DD';
   return {
     normalize: function normalize(value) {
-      var _dayjs;
-      return value ? (_dayjs = (0, _dayjs2.default)(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format(formatter) : null;
+      var _moment;
+      return value ? (_moment = (0, _moment2.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format(formatter) : null;
     },
     getValueProps: function getValueProps(value) {
       return {
         format: formatter,
-        value: value ? (0, _dayjs2.default)(value) : null
+        value: value ? (0, _moment2.default)(value) : null
       };
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.3.0-beta.9",
+  "version": "3.3.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -63,8 +63,8 @@
     "antd": "4.24.8",
     "big.js": "^6.2.1",
     "classnames": "^2.3.1",
-    "dayjs": "^1.11.10",
     "lodash": "^4.17.21",
+    "moment": "^2.29.1",
     "react-resizable": "^3.0.4",
     "react-svg": "^15.1.7"
   },
@@ -88,7 +88,6 @@
     "@umijs/preset-react": "^1.8.22",
     "@umijs/test": "^3.0.5",
     "@zat-design/login-react": "1.0.25",
-    "antd-dayjs-webpack-plugin": "^1.0.6",
     "babel-eslint": "10.0.3",
     "babel-plugin-import": "^1.13.3",
     "cross-env": "^7.0.3",