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

package/lib/ProForm/components/combination/ProTimeLimit/index.js

@@ -13,7 +13,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
-var _dayjs = _interopRequireWildcard(require("dayjs"));
+var _moment = _interopRequireWildcard(require("moment"));
 var _react = require("react");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -40,7 +40,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _useMemo = (0, _react.useMemo)(function () {
-      var foreverMoment = foreverTime ? (0, _dayjs.default)(foreverTime, format) : (0, _dayjs.default)('9999-01-01', 'YYYY-MM-DD');
+      var foreverMoment = foreverTime ? (0, _moment.default)(foreverTime, format) : (0, _moment.default)('9999-01-01', 'YYYY-MM-DD');
       var foreverString = foreverTime || foreverMoment.format(format);
       return [foreverString, foreverMoment];
     }, [format, foreverTime]),
@@ -56,7 +56,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var initialConfig = (0, _ProConfigProvider.useProConfig)('ProTimeLimit');
   var isForever = (0, _react.useMemo)(function () {
-    if ((0, _dayjs.isDayjs)(value)) {
+    if ((0, _moment.isMoment)(value)) {
       return foreverMoment.format(format) === value.format(format);
     }
     return false;
@@ -64,7 +64,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
   var foreverChange = function foreverChange(e) {
     var checkedForever = e.target.checked;
     if (checkedForever) {
-      onChange((0, _dayjs.default)(foreverString, format));
+      onChange((0, _moment.default)(foreverString, format));
     } else {
       onChange(null);
     }

package/lib/ProForm/components/combination/ProTimeLimit/style/index.less

@@ -3,11 +3,15 @@
 
 .@{ant-prefix}-form-item-has-error {
   .@{ant-prefix}-picker-status-error
-    ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(.@{ant-prefix}-input-borderless).@{ant-prefix}-input {
+    ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(
+      .@{ant-prefix}-input-borderless
+    ).@{ant-prefix}-input {
     background: @zaui-base-bg;
     border-color: var(--ant-error-color);
   }
-  .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(.@{ant-prefix}-input-borderless).@{ant-prefix}-input:focus {
+  .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(
+      .@{ant-prefix}-input-borderless
+    ).@{ant-prefix}-input:focus {
     border-color: var(--ant-error-color-hover);
     border-right-width: 1px;
     outline: 0;
@@ -24,6 +28,9 @@ span.@{ant-prefix}-input-group-compact {
       flex: 1;
     }
 
+    .@{ant-prefix}-picker-focused {
+      z-index: 1;
+    }
     .forever-checkbox {
       flex: 0;
       min-width: unset;

package/lib/ProForm/components/old/InputRange/index.js

@@ -13,6 +13,7 @@ var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable no-param-reassign */
+
 var positiveInteger = {
   formatter: function formatter(value) {
     return value.replace(/[^0-9]/g, '');

package/lib/ProForm/components/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 = _value2.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 = _value3.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, (_value4 = value) === null || _value4 === void 0 ? void 0 : _value4.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) {
       _value = '长期';
     } else {
-      _value = rangeTime.range ? (0, _dayjs.default)(rangeTime.range).format(defaultFormatDate) : null;
+      _value = rangeTime.range ? (0, _moment.default)(rangeTime.range).format(defaultFormatDate) : null;
     }
     return (0, _jsxRuntime.jsx)(_antd.Input, {
       value: _value,

package/lib/ProForm/components/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/ProForm/components/render/Render.js

@@ -28,7 +28,6 @@ var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
-/* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
   var _classNames, _otherProps$names2;
@@ -365,7 +364,9 @@ var Render = function Render(props) {
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
-      child = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _otherFormItemProps), {}, {
+      child = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        name: _otherFormItemProps.name
+      }, (0, _lodash.omit)(_otherFormItemProps, ['rules'])), {}, {
         children: function children(fields, operation, meta) {
           return (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
             otherProps: otherProps,

package/lib/ProForm/components/render/RenderFields.js

@@ -137,7 +137,11 @@ var RenderFields = function RenderFields(props) {
       dataSource: dataSource,
       type: _type
     });
-    var _placeholder = placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(label || formLabel || '');
+    var placeholderHandle = function placeholderHandle() {
+      var _label = (0, _lodash.isString)(label) ? label : '';
+      var _formLabel = (0, _lodash.isString)(formLabel) ? formLabel : '';
+      return placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_label || _formLabel || '');
+    };
     // 表单组件Props 兼容2.0版本
     var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemChildProps), fieldProps);
     if ((0, _lodash.isBoolean)(formDisabled)) {
@@ -145,7 +149,7 @@ var RenderFields = function RenderFields(props) {
     }
     var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
       disabledStrictly: true,
-      placeholder: _placeholder
+      placeholder: placeholderHandle()
     }, _fieldProps), {}, {
       disabled: _disabled
     });

package/lib/ProForm/utils/useForm.js

@@ -53,23 +53,31 @@ var useForm = exports.useForm = function useForm(originForm) {
     };
     var _validateFields = /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
-        var values, _values;
+        var _len,
+          rest,
+          _key,
+          values,
+          _values,
+          _args = arguments;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _context.next = 2;
-              return validateFields(nameList);
-            case 2:
+              for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+                rest[_key - 1] = _args[_key];
+              }
+              _context.next = 3;
+              return validateFields.apply(void 0, [nameList].concat(rest));
+            case 3:
               values = _context.sent;
               if (!nameList) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
               return _context.abrupt("return", values);
-            case 5:
+            case 6:
               _values = _getFieldsValue();
               return _context.abrupt("return", _values);
-            case 7:
+            case 8:
             case "end":
               return _context.stop();
           }

package/lib/ProForm/utils/useRules.js

@@ -19,6 +19,7 @@ var useRules = function useRules(props) {
     names = props.names,
     labelRequired = props.labelRequired,
     type = props.type;
+  var _label = (0, _lodash.isString)(label) ? label : '';
   // 根据 required 添加 rules, names 字段会添加数组的必填校验
   var internalRule = (0, _react.useMemo)(function () {
     var result = {
@@ -29,7 +30,7 @@ var useRules = function useRules(props) {
         return 'required' in rule;
       }));
       if (!requiredRule) {
-        var message = isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder).concat(label || '') : "".concat(_locale.default.ProForm.inputPlaceholder).concat(label || '');
+        var message = isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder).concat(_label) : "".concat(_locale.default.ProForm.inputPlaceholder).concat(_label);
         var rule = {
           required: required,
           message: message
@@ -38,7 +39,7 @@ var useRules = function useRules(props) {
         if (names === null || names === void 0 ? void 0 : names.length) {
           rule.validator = function (_, value) {
             if (!value || (0, _index.isNullArray)(value)) {
-              return Promise.reject(new Error("".concat(_locale.default.ProForm.inputPlaceholder).concat(label)));
+              return Promise.reject(new Error("".concat(_locale.default.ProForm.inputPlaceholder).concat(_label)));
             }
             return Promise.resolve();
           };
@@ -49,7 +50,7 @@ var useRules = function useRules(props) {
     return result;
   }, [rules, required]);
   // type转换为内置rules
-  internalRule.rules = internalRule.rules && (0, _rulesCreator.rulesCreator)(internalRule.rules, label, isSelect);
+  internalRule.rules = internalRule.rules && (0, _rulesCreator.rulesCreator)(internalRule.rules, _label, isSelect);
   (0, _react.useEffect)(function () {
     // 添加完整性校验
     if (names && !(0, _lodash.isBoolean)(labelRequired) || type === 'Group' && Array.isArray(names) && required) {
@@ -57,7 +58,7 @@ var useRules = function useRules(props) {
         validator: function validator(rules, value) {
           // 完整性校验, 空数组不校验, 数组有值且值不完整则校验不通过
           if (Array.isArray(value) && !(0, _index.isNullArray)(value) && (0, _index.isNotFullArray)(value, names.length)) {
-            return Promise.reject(new Error("".concat(_locale.default.ProForm.completeText).concat(label || '')));
+            return Promise.reject(new Error("".concat(_locale.default.ProForm.completeText).concat(_label)));
           }
           return Promise.resolve();
         }

package/lib/ProLayout/components/ProHeader/index.js

@@ -13,7 +13,7 @@ var _antd = require("antd");
 var _react = require("react");
 var _utils = require("@zat-design/utils");
 var _classnames2 = _interopRequireDefault(require("classnames"));
-var _dayjs3 = _interopRequireDefault(require("dayjs"));
+var _moment3 = _interopRequireDefault(require("moment"));
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
 var _reactSvg = require("react-svg");
@@ -155,7 +155,7 @@ var ProHeader = function ProHeader(props) {
    * 次级描述数据渲染
    */
   var subDescribeRender = function subDescribeRender(describeData) {
-    var _dayjs, _dayjs2;
+    var _moment, _moment2;
     var value = describeData.value,
       type = describeData.type,
       valueType = describeData.valueType,
@@ -186,11 +186,11 @@ var ProHeader = function ProHeader(props) {
         break;
       case 'date':
         // 年月日
-        result = value ? (_dayjs = (0, _dayjs3.default)(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format('YYYY-MM-DD') : '-';
+        result = value ? (_moment = (0, _moment3.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format('YYYY-MM-DD') : '-';
         break;
       case 'dateTime':
         // 年月日 时分秒
-        result = value ? (_dayjs2 = (0, _dayjs3.default)(value)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format('YYYY-MM-DD HH:mm:ss') : '-';
+        result = value ? (_moment2 = (0, _moment3.default)(value)) === null || _moment2 === void 0 ? void 0 : _moment2.format('YYYY-MM-DD HH:mm:ss') : '-';
         break;
       default:
         result = String(value).includes('undefined') || !value ? '-' : value;

package/lib/ProTable/components/TableResizable/index.js

@@ -15,14 +15,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _index = require("../../index");
 var _utils = require("../../utils");
 var _excluded = ["onDrag", "width", "minwidth"];
-/*
- * @Author: chongyang wanchongyang@zhongan.io
- * @Date: 2023-02-23 17:47:46
- * @LastEditors: chongyang wanchongyang@zhongan.io
- * @LastEditTime: 2023-03-07 20:18:22
- * @FilePath: /za-material-warehouse/src/ProTable/TableResizable.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 var ResizableTitle = function ResizableTitle(props) {
   var _restProps$className;
   var onDrag = props.onDrag,

package/lib/ProTable/utils.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.isListResult = exports.getParentElement = exports.getColumnDataIndex = exports.formatColumn = void 0;
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
-var _dayjs15 = _interopRequireDefault(require("dayjs"));
+var _moment15 = _interopRequireDefault(require("moment"));
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
@@ -163,30 +163,30 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
     column.render = function (value, record, index) {
-      var _dayjs, _dayjs2, _dayjs3, _dayjs4, _dayjs5, _dayjs6, _dayjs7, _dayjs8, _dayjs9, _dayjs10, _dayjs11, _dayjs12, _dayjs13, _dayjs14;
-      var renderValue = (_dayjs = (0, _dayjs15.default)(value)) === null || _dayjs === void 0 ? void 0 : _dayjs.format(format);
+      var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
+      var renderValue = (_moment = (0, _moment15.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
       var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
-      var originalRenderValue = (_dayjs2 = (0, _dayjs15.default)(originalValue)) === null || _dayjs2 === void 0 ? void 0 : _dayjs2.format(format);
+      var originalRenderValue = (_moment2 = (0, _moment15.default)(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
         case 'date':
-          renderValue = (_dayjs3 = (0, _dayjs15.default)(value)) === null || _dayjs3 === void 0 ? void 0 : _dayjs3.format('YYYY-MM-DD');
-          originalRenderValue = (_dayjs4 = (0, _dayjs15.default)(originalValue)) === null || _dayjs4 === void 0 ? void 0 : _dayjs4.format('YYYY-MM-DD');
+          renderValue = (_moment3 = (0, _moment15.default)(value)) === null || _moment3 === void 0 ? void 0 : _moment3.format('YYYY-MM-DD');
+          originalRenderValue = (_moment4 = (0, _moment15.default)(originalValue)) === null || _moment4 === void 0 ? void 0 : _moment4.format('YYYY-MM-DD');
           break;
         case 'dateTime':
-          renderValue = (_dayjs5 = (0, _dayjs15.default)(value)) === null || _dayjs5 === void 0 ? void 0 : _dayjs5.format('YYYY-MM-DD HH:mm:ss');
-          originalRenderValue = (_dayjs6 = (0, _dayjs15.default)(originalValue)) === null || _dayjs6 === void 0 ? void 0 : _dayjs6.format('YYYY-MM-DD HH:mm:ss');
+          renderValue = (_moment5 = (0, _moment15.default)(value)) === null || _moment5 === void 0 ? void 0 : _moment5.format('YYYY-MM-DD HH:mm:ss');
+          originalRenderValue = (_moment6 = (0, _moment15.default)(originalValue)) === null || _moment6 === void 0 ? void 0 : _moment6.format('YYYY-MM-DD HH:mm:ss');
           break;
         case 'dateStartTime':
-          renderValue = "".concat((_dayjs7 = (0, _dayjs15.default)(value)) === null || _dayjs7 === void 0 ? void 0 : _dayjs7.format('YYYY-MM-DD'), " 00:00:00");
-          originalRenderValue = "".concat((_dayjs8 = (0, _dayjs15.default)(originalValue)) === null || _dayjs8 === void 0 ? void 0 : _dayjs8.format('YYYY-MM-DD'), " 00:00:00");
+          renderValue = "".concat((_moment7 = (0, _moment15.default)(value)) === null || _moment7 === void 0 ? void 0 : _moment7.format('YYYY-MM-DD'), " 00:00:00");
+          originalRenderValue = "".concat((_moment8 = (0, _moment15.default)(originalValue)) === null || _moment8 === void 0 ? void 0 : _moment8.format('YYYY-MM-DD'), " 00:00:00");
           break;
         case 'dateEndTime':
-          renderValue = "".concat((_dayjs9 = (0, _dayjs15.default)(value)) === null || _dayjs9 === void 0 ? void 0 : _dayjs9.format('YYYY-MM-DD'), " 23:59:59");
-          originalRenderValue = "".concat((_dayjs10 = (0, _dayjs15.default)(originalValue)) === null || _dayjs10 === void 0 ? void 0 : _dayjs10.format('YYYY-MM-DD'), " 23:59:59");
+          renderValue = "".concat((_moment9 = (0, _moment15.default)(value)) === null || _moment9 === void 0 ? void 0 : _moment9.format('YYYY-MM-DD'), " 23:59:59");
+          originalRenderValue = "".concat((_moment10 = (0, _moment15.default)(originalValue)) === null || _moment10 === void 0 ? void 0 : _moment10.format('YYYY-MM-DD'), " 23:59:59");
           break;
         case 'dateStartEndTime':
-          renderValue = "".concat((_dayjs11 = (0, _dayjs15.default)(value === null || value === void 0 ? void 0 : value[0])) === null || _dayjs11 === void 0 ? void 0 : _dayjs11.format('YYYY-MM-DD'), " 00:00:00~").concat((_dayjs12 = (0, _dayjs15.default)(value === null || value === void 0 ? void 0 : value[1])) === null || _dayjs12 === void 0 ? void 0 : _dayjs12.format('YYYY-MM-DD'), " 23:59:59");
-          originalRenderValue = "".concat((_dayjs13 = (0, _dayjs15.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _dayjs13 === void 0 ? void 0 : _dayjs13.format('YYYY-MM-DD'), " 00:00:00~").concat((_dayjs14 = (0, _dayjs15.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _dayjs14 === void 0 ? void 0 : _dayjs14.format('YYYY-MM-DD'), " 23:59:59");
+          renderValue = "".concat((_moment11 = (0, _moment15.default)(value === null || value === void 0 ? void 0 : value[0])) === null || _moment11 === void 0 ? void 0 : _moment11.format('YYYY-MM-DD'), " 00:00:00~").concat((_moment12 = (0, _moment15.default)(value === null || value === void 0 ? void 0 : value[1])) === null || _moment12 === void 0 ? void 0 : _moment12.format('YYYY-MM-DD'), " 23:59:59");
+          originalRenderValue = "".concat((_moment13 = (0, _moment15.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[0])) === null || _moment13 === void 0 ? void 0 : _moment13.format('YYYY-MM-DD'), " 00:00:00~").concat((_moment14 = (0, _moment15.default)(originalValue === null || originalValue === void 0 ? void 0 : originalValue[1])) === null || _moment14 === void 0 ? void 0 : _moment14.format('YYYY-MM-DD'), " 23:59:59");
           break;
       }
       if (!value) {

package/lib/ProTabs/index.js

@@ -17,7 +17,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
 var _components = require("./components");
 var _excluded = ["style", "className", "dataSource", "onChange", "transformResponse", "useRequest", "tabSearch", "mode"];
-/* eslint-disable @typescript-eslint/consistent-type-assertions */
 var ProTabs = function ProTabs(props, ref) {
   var style = props.style,
     className = props.className,

package/lib/ProThemeTools/index.js

@@ -18,7 +18,6 @@ var _index = require("./utils/index");
 var _component = require("./component");
 var _locale = _interopRequireDefault(require("../locale"));
 var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme"];
-/* eslint-disable prefer-const */
 var defaultCacheTime = 1; // 配置保存时间为一天
 var defaultThemeConfig = {
   zauiBrand: '#006AFF',

package/lib/ProTree/components/Tree.js

@@ -18,13 +18,6 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _utils = require("../utils");
 var _locale = _interopRequireDefault(require("../../locale"));
 var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "optionRender", "treeData", "showLine", "switcherIcon", "checkable", "menu", "innerExpandKeys", "selectedKey", "disabledMode"];
-/*
- *@Date: 2023-07-25 13:49:35
- *@LastEditTime: 2023-07-25 13:49:35
- *@Author: liudongliang
- *@Description: 树每行节点渲染组件，复选时阻止点击事件冒泡，只有点击树节点文本会向上触发onSelect事件
-*/
-/* eslint-disable no-plusplus */
 var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
 var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
 function List(props) {

package/lib/ProTree/index.js

@@ -16,6 +16,7 @@ var _ProTreeSelect = _interopRequireDefault(require("../ProTreeSelect"));
  *@Author: liudongliang
  *@Description: ProTree组件，集成了tree和treeSelect
 */
+
 var ProTreeHandle = function ProTreeHandle(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'tree' : _props$mode;

package/lib/ProTreeModal/components/Tree.js

@@ -16,7 +16,6 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _CloseIcon = _interopRequireDefault(require("./CloseIcon"));
 var _utils = require("../utils");
 var _excluded = ["checkedValues", "disabled", "treeData", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "handleFilterClose", "optionRender"];
-/* eslint-disable no-plusplus */
 var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
 var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
 function List(props, ref) {

package/lib/ProTreeModal/components/Trigger.js

@@ -82,6 +82,8 @@ function Trigger(props) {
       return (0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
         block: true,
         children: [(0, _jsxRuntime.jsxs)(_antd.Select, {
+          disabled: disabled,
+          className: (0, _classnames.default)(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
           defaultValue: "appoint",
           value: state.mode,
           onChange: onAppointChange,

package/lib/ProTreeModal/index.js

@@ -66,9 +66,9 @@ var ProTreeModal = function ProTreeModal(props) {
       children: 'children'
     } : _props$fieldNames,
     _props$disabled = props.disabled,
-    disabled = _props$disabled === void 0 ? props.disabled || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.isView) || false : _props$disabled,
+    disabled = _props$disabled === void 0 ? props.disabled || props.isView || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.isView) || false : _props$disabled,
     _props$isView = props.isView,
-    isView = _props$isView === void 0 ? (props === null || props === void 0 ? void 0 : (_props$otherProps2 = props.otherProps) === null || _props$otherProps2 === void 0 ? void 0 : _props$otherProps2.isView) || false : _props$isView,
+    isView = _props$isView === void 0 ? props.isView || (props === null || props === void 0 ? void 0 : (_props$otherProps2 = props.otherProps) === null || _props$otherProps2 === void 0 ? void 0 : _props$otherProps2.isView) || false : _props$isView,
     transformResponse = props.transformResponse,
     optionRender = props.optionRender,
     openChange = props.openChange,
@@ -170,7 +170,7 @@ var ProTreeModal = function ProTreeModal(props) {
         allKeys = state.allKeys,
         originalTreeData = state.originalTreeData;
       var treeViewData = [];
-      if (allValue && typeof value === 'string') {
+      if (allValue && typeof value === 'string' && allValue === value) {
         if (modeType === LIST) {
           checkedValues = treeData.map(function (item) {
             return item[fieldNameValue];

package/lib/ProUpload/components/DragRender.js

@@ -58,7 +58,8 @@ var DragRender = function DragRender(props) {
    */
   var handleReSelect = function handleReSelect(file) {
     if (disabled) return;
-    handleDelFile(file);
+    // handleDelFile(file);
+    setFileList([]);
     setTimeout(function () {
       refReSelect.current.click();
     }, 1);

package/lib/ProUpload/index.js

@@ -22,13 +22,6 @@ var _ImageRender = _interopRequireDefault(require("./components/ImageRender"));
 var _uitls = require("./uitls");
 var _locale = _interopRequireDefault(require("../locale"));
 var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "disabled", "uploadType", "buttonProps", "accept", "extraTipText", "beforeUpload", "onChange", "onDownload", "onPreview", "onRemove", "method", "className", "dataParams", "name", "showExampleContent", "showUploadList", "otherProps", "transformResponse", "exampleTitle", "exampleContent", "exampleModalProps", "buttonText", "afterRender", "fieldNames"];
-/*
- * @Author: wangshengqiang
- * @Date: 2023-02-03 14:18:59
- * @LastEditTime: 2023-11-14 18:32:13
- * @LastEditors: wangshengqiang
- * @Description: 上传控件
- */
 var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _locale$ProUpload;
   var _useState = (0, _react.useState)([]),

package/lib/ProViewer/index.js

@@ -16,7 +16,6 @@ var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _locale = _interopRequireDefault(require("../locale"));
 var _locale$ProViewer;
-/* eslint-disable jsx-a11y/iframe-has-title */
 // 用于解析word | excel
 var officeApp = 'https://view.officeapps.live.com/op/view.aspx?src=';
 // 文件MIME类型

package/lib/locale/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 exports.formatMessage = formatMessage;
 exports.setLanguage = void 0;
-var _dayjs = _interopRequireDefault(require("dayjs"));
+var _moment = _interopRequireDefault(require("moment"));
 var _zh_CN = _interopRequireDefault(require("./zh_CN"));
 var _en_US = _interopRequireDefault(require("./en_US"));
 var activeLang = localStorage.getItem('locale') || 'zh-CN';
@@ -22,7 +22,7 @@ var langMap = {
 var setLanguage = exports.setLanguage = function setLanguage(lang, isReload) {
   activeLang = lang;
   localStorage.setItem('locale', lang);
-  _dayjs.default.locale(lang.toLowerCase());
+  _moment.default.locale(lang.toLowerCase());
   if (isReload) {
     window.location.reload();
   }