@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.4

package/dist/esm/transforms/transformSwitch/index.js

@@ -0,0 +1,35 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+/**
+ * 转换Switch参数函数
+ * @param keys  第一个值为选中值，第二个为未选中值
+ * @returns object
+ */
+var transformSwitch = function transformSwitch() {
+  var keys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ['Y', 'N'];
+  if (keys.length !== 2) {
+    return new Error('参数必须为2个');
+  }
+  var _keys = _slicedToArray(keys, 2),
+    value1 = _keys[0],
+    value2 = _keys[1];
+  return {
+    // 组件内部值转成外部值 true => Y
+    normalize: function normalize(value) {
+      return value ? value1 : value2;
+    },
+    // 外部值转成组件内部值 Y => true
+    getValueProps: function getValueProps(value) {
+      var checked = value === value1;
+      return {
+        checked: checked,
+        value: value
+      };
+    }
+  };
+};
+export default transformSwitch;

package/dist/esm/transforms/utils.d.ts

@@ -0,0 +1,2 @@
+import { NamePath } from 'antd/es/form/interface';
+export declare const contrast: (prevValues: any, curValues: any, names: NamePath[]) => boolean;

package/dist/esm/transforms/utils.js

@@ -0,0 +1,8 @@
+import get from 'lodash/get';
+
+// 对比字段变化
+export var contrast = function contrast(prevValues, curValues, names) {
+  return names.some(function (name) {
+    return get(prevValues, name) !== get(curValues, name);
+  });
+};

package/dist/esm/validate/index.d.ts

@@ -0,0 +1,107 @@
+/** 链接 */
+export declare const isExternal: (val: string) => boolean;
+/** 邮箱 */
+export declare const isEmail: (val: string) => boolean;
+/** 邮编 */
+export declare const isZipCode: (val: string) => boolean;
+/** 手机号 */
+export declare const isPhone: (val: string) => boolean;
+/** 固定电话 */
+export declare const isTel: (val: string) => boolean;
+/** 户口本 */
+export declare const isHouseHold: (val: string) => boolean;
+/** 护照 */
+export declare const isPassportCard: (val: string) => boolean;
+/** 港澳通行证 */
+export declare const isHMPassCard: (val: string) => boolean;
+/** 军官证 */
+export declare const isOfficerCard: (val: string) => boolean;
+/** 回乡证 m|M|h|H开头10位或者8位数字 */
+export declare const isHomeReturnCard: (val: string) => boolean;
+export declare const isGaToInPassCard: (val: any) => boolean;
+/** 出生证 字母加9位数字 */
+export declare const isBirthCard: (val: string) => boolean;
+/** 港澳居民居住证(香港) */
+export declare const isHKResideCard: (val: string) => boolean;
+/** 港澳居民居住证(澳门) */
+export declare const isMAResideCard: (val: string) => boolean;
+/** 台湾居民居住证(台湾) */
+export declare const isTaiWanResideCard: (val: string) => boolean;
+/** 大陆居民往来港澳通行证 */
+export declare const isHongkongMacaoTravel: (val: string) => boolean;
+/** 大陆居民往来台湾通行证 */
+export declare const isTaiwanTravel: (val: string) => boolean;
+/** 外国人永久居留证 */
+export declare const isForeignPermanent: (val: string) => boolean;
+/** 港澳台居民居住证(三合一) */
+export declare const isGATResideCard: (val: string) => boolean;
+/** 台湾居民来往大陆通行证 */
+export declare const isTaiWanGobackCHNCard: (val: string) => boolean;
+/** 营业执照 */
+export declare const isBusinessLicense: (val: any) => boolean;
+/** 税务号 */
+export declare const isTaxCode: (val: any) => boolean;
+/** 判断是否为中文 */
+export declare const isChinese: (text: any) => boolean;
+/** 判断是否不包含中文中文 */
+export declare const isNotChinese: (text: any) => boolean;
+export declare const isName: (name: any) => boolean;
+export declare const isPWN: (value: any) => boolean;
+/** ipv4地址 */
+export declare const isIPv4: (value: string) => boolean;
+export declare const isFullAddress: (value: any) => any;
+export declare const isFullAddressDetail: (value: any) => any;
+export declare const isIdCard: (value: string) => boolean;
+export declare const isCreditCode: (creditCode: string) => boolean;
+export declare const isOrgCode: (orgCode: string) => boolean;
+/**
+ * @description: 是否IE环境
+ * @return {*}
+ */
+export declare const isIE: () => boolean;
+/** DEMO中用来显示中文名 */
+export declare const validateNameMap: {
+    [K: string]: string;
+};
+/**
+ * 检查属性是否是空值，非0
+ */
+export declare const isEmpty: (value: any) => boolean;
+/** 判断是否是JSON */
+export declare const isJSON: (str: string) => boolean;
+declare const _default: {
+    isZipCode: (val: string) => boolean;
+    isPhone: (val: string) => boolean;
+    isIdCard: (value: string) => boolean;
+    isExternal: (val: string) => boolean;
+    isEmail: (val: string) => boolean;
+    isTel: (val: string) => boolean;
+    isIE: () => boolean;
+    isHouseHold: (val: string) => boolean;
+    isPassportCard: (val: string) => boolean;
+    isHMPassCard: (val: string) => boolean;
+    isOfficerCard: (val: string) => boolean;
+    isHomeReturnCard: (val: string) => boolean;
+    isBirthCard: (val: string) => boolean;
+    isHKResideCard: (val: string) => boolean;
+    isMAResideCard: (val: string) => boolean;
+    isTaiWanResideCard: (val: string) => boolean;
+    isHongkongMacaoTravel: (val: string) => boolean;
+    isTaiwanTravel: (val: string) => boolean;
+    isForeignPermanent: (val: string) => boolean;
+    isGATResideCard: (val: string) => boolean;
+    isTaiWanGobackCHNCard: (val: string) => boolean;
+    isBusinessLicense: (val: any) => boolean;
+    isOrgCode: (orgCode: string) => boolean;
+    isCreditCode: (creditCode: string) => boolean;
+    isTaxCode: (val: any) => boolean;
+    isChinese: (text: any) => boolean;
+    isNotChinese: (text: any) => boolean;
+    isName: (name: any) => boolean;
+    isPWN: (value: any) => boolean;
+    isGaToInPassCard: (val: any) => boolean;
+    isIPv4: (value: string) => boolean;
+    isEmpty: (value: any) => boolean;
+    isJSON: (str: string) => boolean;
+};
+export default _default;

package/dist/esm/validate/index.js

@@ -0,0 +1,284 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import regExp from "../regExp";
+import { getDataByIdCard } from "../tools";
+
+/** 链接 */
+export var isExternal = function isExternal(val) {
+  return /^(https?:|mailto:|tel:)/.test(val);
+}; // 链接
+/** 邮箱 */
+export var isEmail = function isEmail(val) {
+  return /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/.test(val);
+};
+/** 邮编 */
+export var isZipCode = function isZipCode(val) {
+  return /^[0-9]{6,6}$/.test(val);
+};
+/** 手机号 */
+export var isPhone = function isPhone(val) {
+  return /^((\+?86)|(\(\+86\)))?1(3|4|5|6|7|8|9)\d{9}$/.test(val);
+};
+/** 固定电话 */
+export var isTel = function isTel(val) {
+  return /^[0-9-()（）]{7,18}$/.test(val);
+};
+/** 户口本 */
+export var isHouseHold = function isHouseHold(val) {
+  return /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(val);
+};
+/** 护照 */
+export var isPassportCard = function isPassportCard(val) {
+  return /^[0-9A-Z]{8,9}$/.test(val);
+};
+/** 港澳通行证 */
+export var isHMPassCard = function isHMPassCard(val) {
+  return /^[a-zA-Z][a-zA-Z0-9]\d{7}$/.test(val);
+};
+/** 军官证 */
+export var isOfficerCard = function isOfficerCard(val) {
+  return /^[\u4E00-\u9FA5](字第)([0-9a-zA-Z]{4,10})号$/.test(val);
+};
+/** 回乡证 m|M|h|H开头10位或者8位数字 */
+export var isHomeReturnCard = function isHomeReturnCard(val) {
+  return /^[a-zA-Z0-9]{9,12}$/.test(val);
+};
+// 港澳居民来往内地通行证
+export var isGaToInPassCard = function isGaToInPassCard(val) {
+  return /^[a-zA-Z0-9]{9,12}$/.test(val);
+};
+/** 出生证 字母加9位数字 */
+export var isBirthCard = function isBirthCard(val) {
+  return /^[a-zA-Z0-9\u4E00-\u9FA5]{3,18}$/.test(val);
+};
+/** 港澳居民居住证(香港) */
+export var isHKResideCard = function isHKResideCard(val) {
+  return /^810000(?:19|20)\d{2}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01])\d{3}[\dX]$/.test(val);
+};
+/** 港澳居民居住证(澳门) */
+export var isMAResideCard = function isMAResideCard(val) {
+  return /^820000(?:19|20)\d{2}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01])\d{3}[\dX]$/.test(val);
+};
+/** 台湾居民居住证(台湾) */
+export var isTaiWanResideCard = function isTaiWanResideCard(val) {
+  return /^830000(?:19|20)\d{2}(?:0[1-9]|1[0-2])(?:0[1-9]|[12]\d|3[01])\d{3}[\dX]$/.test(val);
+};
+/** 大陆居民往来港澳通行证 */
+export var isHongkongMacaoTravel = function isHongkongMacaoTravel(val) {
+  return /^[C]\d{8}$|^[C][a-hA-Hj-nJ-Np-zP-Z][0-9]{7}$/.test(val);
+};
+/** 大陆居民往来台湾通行证 */
+export var isTaiwanTravel = function isTaiwanTravel(val) {
+  return /^[L]\d{8}$/.test(val);
+};
+/** 外国人永久居留证 */
+export var isForeignPermanent = function isForeignPermanent(val) {
+  return /^[A-Z]{3}[0-9]{12}$/.test(val);
+};
+/** 港澳台居民居住证(三合一) */
+export var isGATResideCard = function isGATResideCard(val) {
+  return /^[0-9a-zA-Z]{18}$/.test(val);
+};
+/** 台湾居民来往大陆通行证 */
+export var isTaiWanGobackCHNCard = function isTaiWanGobackCHNCard(val) {
+  return /^[a-zA-Z0-9]{8}$|^[a-zA-Z0-9]{10}$|^[a-zA-Z0-9]{18}$/.test(val);
+};
+/** 营业执照 */
+export var isBusinessLicense = function isBusinessLicense(val) {
+  return /^.{1,150}$/.test(val);
+};
+/** 税务号 */
+export var isTaxCode = function isTaxCode(val) {
+  return /^[0-9A-Z]{15}$|^[0-9A-Z]{18}$|^[0-9A-Z]{20}$/.test(val);
+};
+/** 判断是否为中文 */
+export var isChinese = function isChinese(text) {
+  return /^[\u4e00-\u9fa5]+$/.test(text);
+};
+/** 判断是否不包含中文中文 */
+export var isNotChinese = function isNotChinese(text) {
+  return /^[^\u4e00-\u9fa5]+$/.test(text);
+};
+// 检查姓名是否正确
+export var isName = function isName(name) {
+  return /^(?:[\u4e00-\u9fa5]+)(?:●[\u4e00-\u9fa5]+)*$|^[a-zA-Z0-9]+\s?[\.·\-()a-zA-Z]*[a-zA-Z]|[.]+$/.test(name);
+};
+// 正整数
+export var isPWN = function isPWN(value) {
+  return /^[1-9]\d*$/.test(value);
+};
+/** ipv4地址 */
+export var isIPv4 = function isIPv4(value) {
+  return regExp.isIPv4.test(value);
+};
+
+// 是否完整的地址  校验数组前三位是否有值
+export var isFullAddress = function isFullAddress(value) {
+  return value && [,,].every(function (_, index) {
+    return value[index];
+  });
+};
+// 是否完整的地址  校验数组前4位是否有值
+export var isFullAddressDetail = function isFullAddressDetail(value) {
+  return value && [,,,].every(function (_, index) {
+    return value[index];
+  });
+};
+export var isIdCard = function isIdCard(value) {
+  var result = getDataByIdCard(value);
+  return !!result;
+};
+
+// 校验统一社会信用代码
+export var isCreditCode = function isCreditCode(creditCode) {
+  // 校验长度
+  if (creditCode.length !== 18) {
+    return false;
+  }
+  // 校验格式
+  var regex = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/;
+  if (!regex.test(creditCode)) {
+    return false;
+  }
+  // 校验校验码
+  var codes = '0123456789ABCDEFGHJKLMNPQRTUWXY';
+  var weights = [1, 3, 9, 27, 19, 26, 16, 17, 20, 29, 25, 13, 8, 24, 10, 30, 28];
+  var sum = 0;
+  for (var i = 0; i < 17; i++) {
+    var code = creditCode.charAt(i);
+    var index = codes.indexOf(code);
+    sum += index * weights[i];
+  }
+  var checkCode = codes.charAt((31 - sum % 31) % 31);
+  if (creditCode.charAt(17) !== checkCode) {
+    return false;
+  }
+  return true;
+};
+
+// 组织机构代码
+export var isOrgCode = function isOrgCode(orgCode) {
+  // 校验长度
+  if (orgCode.length !== 9 && orgCode.length !== 10) {
+    return false;
+  }
+  // 校验格式
+  var regex = /^[0-9A-Z]{8}[0-9X]$/;
+  if (!regex.test(orgCode)) {
+    return false;
+  }
+  // 校验校验码
+  var codes = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+  var weights = [3, 7, 9, 10, 5, 8, 4, 2];
+  var sum = 0;
+  for (var i = 0; i < 8; i++) {
+    var code = orgCode.charAt(i);
+    var index = codes.indexOf(code);
+    sum += index * weights[i];
+  }
+  var mod = sum % 11;
+  var checkCode = mod === 0 ? '0' : mod === 1 ? 'X' : (11 - mod).toString();
+  if (orgCode.charAt(8) !== checkCode) {
+    return false;
+  }
+  return true;
+};
+
+/**
+ * @description: 是否IE环境
+ * @return {*}
+ */
+export var isIE = function isIE() {
+  if (!!window.ActiveXObject || 'ActiveXObject' in window) {
+    return true;
+  }
+  return false;
+};
+
+/** DEMO中用来显示中文名 */
+export var validateNameMap = {
+  isZipCode: '邮编',
+  isPhone: '手机号',
+  isIdCard: '身份证',
+  isExternal: '网址',
+  isEmail: '邮箱',
+  isTel: '固定电话',
+  isIE: 'IE',
+  isHouseHold: '户口本',
+  isPassportCard: '护照',
+  isHMPassCard: '港澳通行证',
+  isOfficerCard: '军官证',
+  isHomeReturnCard: '回乡证',
+  isBirthCard: '出生证',
+  isHKResideCard: '港澳居民居住证(香港)',
+  isMAResideCard: '港澳居民居住证(澳门)',
+  isTaiWanResideCard: '台湾居民居住证(台湾)',
+  isHongkongMacaoTravel: '大陆居民往来港澳通行证',
+  isTaiwanTravel: '大陆居民往来台湾通行证',
+  isForeignPermanent: '外国人永久居留证',
+  isGATResideCard: '港澳台居民居住证(三合一)',
+  isTaiWanGobackCHNCard: '台湾居民来往大陆通行证',
+  isBusinessLicense: '营业执照',
+  isOrgCode: '组织代码',
+  isCreditCode: '信用代码',
+  isTaxCode: '税务号',
+  isChinese: '是否中文',
+  isNotChinese: '是否不包含中文',
+  isName: '姓名',
+  isPWN: '正整数',
+  isGaToInPassCard: '港澳居民来往内地通行证',
+  isIPv4: '是否IPv4'
+};
+
+/**
+ * 检查属性是否是空值，非0
+ */
+export var isEmpty = function isEmpty(value) {
+  return ['', null, undefined].includes(value);
+};
+
+/** 判断是否是JSON */
+export var isJSON = function isJSON(str) {
+  if (typeof str !== 'string') return false;
+  try {
+    var result = JSON.parse(str);
+    // 确保解析后的结果是对象或数组
+    return _typeof(result) === 'object' && result !== null || Array.isArray(result);
+  } catch (e) {
+    return false;
+  }
+};
+export default {
+  isZipCode: isZipCode,
+  isPhone: isPhone,
+  isIdCard: isIdCard,
+  isExternal: isExternal,
+  isEmail: isEmail,
+  isTel: isTel,
+  isIE: isIE,
+  isHouseHold: isHouseHold,
+  isPassportCard: isPassportCard,
+  isHMPassCard: isHMPassCard,
+  isOfficerCard: isOfficerCard,
+  isHomeReturnCard: isHomeReturnCard,
+  isBirthCard: isBirthCard,
+  isHKResideCard: isHKResideCard,
+  isMAResideCard: isMAResideCard,
+  isTaiWanResideCard: isTaiWanResideCard,
+  isHongkongMacaoTravel: isHongkongMacaoTravel,
+  isTaiwanTravel: isTaiwanTravel,
+  isForeignPermanent: isForeignPermanent,
+  isGATResideCard: isGATResideCard,
+  isTaiWanGobackCHNCard: isTaiWanGobackCHNCard,
+  isBusinessLicense: isBusinessLicense,
+  isOrgCode: isOrgCode,
+  isCreditCode: isCreditCode,
+  isTaxCode: isTaxCode,
+  isChinese: isChinese,
+  isNotChinese: isNotChinese,
+  isName: isName,
+  isPWN: isPWN,
+  isGaToInPassCard: isGaToInPassCard,
+  isIPv4: isIPv4,
+  isEmpty: isEmpty,
+  isJSON: isJSON
+};

package/es/ProAction/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-action-error-modal {
   .ant-modal-content {

package/es/ProConfigProvider/index.d.ts

@@ -1,5 +1,6 @@
 import React, { FC } from 'react';
 import { FormInstance } from 'antd';
+import 'dayjs/locale/zh-cn';
 import type { PropSelectType } from '../ProSelect/propsType';
 import type { ProModalSelectType } from '../ProForm/components/combination/ProModalSelect/propsType';
 import type { ProCascaderType } from '../ProForm/components/combination/ProCascader/propsType';

package/es/ProConfigProvider/index.js

@@ -5,6 +5,7 @@ import React, { useContext, useEffect, useReducer } from 'react';
 import { ConfigProvider } from 'antd';
 import zhCN from 'antd/es/locale/zh_CN';
 import enUS from 'antd/es/locale/en_US';
+import 'dayjs/locale/zh-cn';
 import merge from 'lodash/merge';
 import useEnumRequest from "../ProEnum/hooks/useEnumRequest";
 import { setLanguage } from "../locale";
@@ -112,11 +113,9 @@ export var ProConfigProvider = function ProConfigProvider(props) {
   var cacheLang = localStorage.getItem('locale');
   // 如果是用户切换了语言那么优先使用用户切换的，否则从缓存中取用户语言，在取默认值
   var lang = (state === null || state === void 0 ? void 0 : state.locale) || cacheLang || (props === null || props === void 0 ? void 0 : props.locale);
-  // 如果缓存里没有语言，那么将配置的语言设置为当前系统语言
-  if (!(state !== null && state !== void 0 && state.locale) && !cacheLang && props !== null && props !== void 0 && props.locale) {
-    // 设置默认语言
-    setLanguage(props === null || props === void 0 ? void 0 : props.locale);
-  }
+  useEffect(function () {
+    setLanguage(lang);
+  }, [lang]);
   useEffect(function () {
     if (enumRes !== null && enumRes !== void 0 && enumRes.data) {
       (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(enumRes === null || enumRes === void 0 ? void 0 : enumRes.data, enumRes === null || enumRes === void 0 ? void 0 : enumRes.params));

package/es/ProDownload/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-download {
 

package/es/ProDrawerForm/index.js

@@ -1,6 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _locale$ProDrawerForm3;
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["open", "mode", "size", "disabled", "isView", "form", "proFormProps", "onCancel", "onCloseClean", "children", "okText", "isConfirmClose", "maskClosable", "cancelText"];
 import React, { createContext, forwardRef, useContext, useImperativeHandle, useMemo } from 'react';
 import { ProDrawer, ProModal } from "./components";
 import ProForm from "../ProForm";
@@ -12,23 +13,32 @@ export var useProDrawerFormContext = function useProDrawerFormContext() {
   return useContext(ProDrawerFormContext);
 };
 var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _okText, _locale$ProDrawerForm, _locale$ProDrawerForm2;
-  var showType = props.showType,
-    okText = props.okText,
-    isView = props.isView;
+  var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3;
   var open = props.open,
-    mode = props.mode,
-    size = props.size,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 'Drawer' : _props$mode,
+    _props$size = props.size,
+    size = _props$size === void 0 ? 'middle' : _props$size,
     disabled = props.disabled,
+    isView = props.isView,
     originalForm = props.form,
-    proFormProps = props.proFormProps,
+    _props$proFormProps = props.proFormProps,
+    proFormProps = _props$proFormProps === void 0 ? {} : _props$proFormProps,
     onCancel = props.onCancel,
-    onCloseClean = props.onCloseClean,
-    children = props.children;
-  showType = mode || showType;
-  isView = isView || disabled;
-  okText = (_okText = okText) !== null && _okText !== void 0 ? _okText : showType === 'Drawer' ? locale === null || locale === void 0 || (_locale$ProDrawerForm = locale.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.save : locale === null || locale === void 0 || (_locale$ProDrawerForm2 = locale.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.confirm;
-  var width = props.width;
+    _props$onCloseClean = props.onCloseClean,
+    onCloseClean = _props$onCloseClean === void 0 ? true : _props$onCloseClean,
+    children = props.children,
+    okText = props.okText,
+    _props$isConfirmClose = props.isConfirmClose,
+    isConfirmClose = _props$isConfirmClose === void 0 ? true : _props$isConfirmClose,
+    _props$maskClosable = props.maskClosable,
+    maskClosable = _props$maskClosable === void 0 ? false : _props$maskClosable,
+    _props$cancelText = props.cancelText,
+    cancelText = _props$cancelText === void 0 ? locale === null || locale === void 0 || (_locale$ProDrawerForm = locale.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.cancel : _props$cancelText,
+    restProps = _objectWithoutProperties(props, _excluded);
+  var nextIsView = isView || disabled;
+  var nextOkText = okText !== null && okText !== void 0 ? okText : mode === 'Drawer' ? locale === null || locale === void 0 || (_locale$ProDrawerForm2 = locale.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.save : locale === null || locale === void 0 || (_locale$ProDrawerForm3 = locale.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.confirm;
+  var width = restProps.width;
   if (!width && size) {
     width = transformBySize(size);
   }
@@ -53,34 +63,28 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
     return {
       Drawer: ProDrawer,
       Modal: ProModal
-    }[showType];
-  }, [showType]);
+    }[mode];
+  }, [mode]);
   return /*#__PURE__*/_jsx(ProDrawerFormContext.Provider, {
     value: {
       source: 'ProDrawerForm'
     },
-    children: open ? /*#__PURE__*/_jsx(DrawerModal, _objectSpread(_objectSpread({}, props), {}, {
-      isView: isView,
+    children: open ? /*#__PURE__*/_jsx(DrawerModal, _objectSpread(_objectSpread({}, restProps), {}, {
+      isView: nextIsView,
       open: open,
       form: form,
       width: width,
-      okText: okText,
+      okText: nextOkText,
       onCancel: handleCancel,
+      isConfirmClose: isConfirmClose,
+      maskClosable: maskClosable,
+      cancelText: cancelText,
       children: children || /*#__PURE__*/_jsx(ProForm, _objectSpread({
         form: form,
-        disabled: isView,
+        disabled: nextIsView,
         footer: false
       }, proFormProps))
     })) : null
   });
 });
-ProDrawerForm.defaultProps = {
-  showType: 'Drawer',
-  size: 'middle',
-  isConfirmClose: true,
-  onCloseClean: true,
-  maskClosable: false,
-  cancelText: locale === null || locale === void 0 || (_locale$ProDrawerForm3 = locale.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.cancel,
-  proFormProps: {}
-};
 export default ProDrawerForm;

package/es/ProDrawerForm/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-drawer {
   .original-value-tooltip {

package/es/ProEditLabel/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-edit-label {
   display: inline-block;

package/es/ProEditTable/components/RcTable/DraggableTable.js

@@ -48,7 +48,7 @@ var Row = function Row(props) {
         var isDrag = restProps['data-row-draggable'] ? (_restProps$dataRowD = restProps['data-row-draggable']) === null || _restProps$dataRowD === void 0 ? void 0 : _restProps$dataRowD.call(restProps, record) : true;
         return /*#__PURE__*/React.cloneElement(child, {
           children: /*#__PURE__*/_jsxs("span", {
-            className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
+            className: "pro-edit-table-drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
             children: [isDrag ? /*#__PURE__*/_jsx(ProIcon, _objectSpread({
               className: "drag-icon",
               style: {

package/es/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -136,7 +136,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       onDiff: onDiff,
       originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
       record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
-      index: index
+      index: index,
+      type: props.type
     });
   }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
@@ -158,10 +159,19 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       }
       _children = viewRender;
     }
+
+    // 对于ProNumberRange类型，需要将字符串数组转换为数字数组
+    var processedValue = orgValue;
+    if (type === 'ProNumberRange' && Array.isArray(orgValue)) {
+      processedValue = orgValue.map(function (item) {
+        var num = Number(item);
+        return Number.isNaN(num) ? item : num;
+      });
+    }
     return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, _defineProperty(_defineProperty({
       // @ts-ignore
       isView: true
-    }, valuePropName, orgValue), "checked", type === 'Switch' ? originalValue : undefined))) : undefined;
+    }, valuePropName, processedValue), "checked", type === 'Switch' ? originalValue : undefined))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
     return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
@@ -187,6 +197,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
+  // debugger;
+
   return /*#__PURE__*/_jsx(Tooltip, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {

package/es/ProEditTable/propsType.d.ts

@@ -7,7 +7,7 @@ import type { NamePath } from 'antd/es/form/interface';
 import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
 import type { ProFormValueType, FunctionArgs, ProRule } from '../ProForm/components/render/propsType';
-import type { DiffOriginalParams } from '../ProForm/utils/diffOriginal';
+import type { DiffOriginalParams } from './utils/diffOriginal';
 /**
  * 操作类型定义
  */