@zat-design/sisyphus-react 3.13.19-beta.6 → 3.13.19-beta.7

package/es/ProForm/utils/diffOriginal.js

@@ -1,44 +1,51 @@
-import _isObject from "lodash/isObject";
-import _isFunction from "lodash/isFunction";
-import _isEqual from "lodash/isEqual";
-import { isEmpty } from '../../utils';
+import { isEqual, isFunction, isObject } from 'lodash';
+import { isEmpty } from "../../utils";
+
+// 比较策略接口
+
 // 数字类型标准化函数
-var normalizeNumberValue = function normalizeNumberValue(value) {
+var normalizeNumberValue = value => {
   if (value === null || value === undefined || value === '') return null;
   var num = Number(value);
   return Number.isNaN(num) ? null : num;
 };
+
 // InputNumber 比较策略
 var inputNumberStrategy = {
-  compare: function compare(val1, val2) {
+  compare: (val1, val2) => {
     var num1 = normalizeNumberValue(val1);
     var num2 = normalizeNumberValue(val2);
     return num1 === num2;
   }
 };
+
 // ProNumberRange 比较策略
 var proNumberRangeStrategy = {
-  compare: function compare(val1, val2) {
+  compare: (val1, val2) => {
     if (!Array.isArray(val1) || !Array.isArray(val2)) return false;
     if (val1.length !== val2.length) return false;
-    return val1.every(function (item, index) {
+    return val1.every((item, index) => {
       var num1 = normalizeNumberValue(item);
       var num2 = normalizeNumberValue(val2[index]);
       return num1 === num2;
     });
   }
 };
+
 // 数字类型处理函数
-var handleNumberTypeDiff = function handleNumberTypeDiff(params) {
+var handleNumberTypeDiff = params => {
   var originalValue = params.originalValue,
     value = params.value,
     type = params.type;
   var isEmptyVal = isEmpty(value);
   var isEmptyOrg = isEmpty(originalValue);
+
   // 都为空视为相等
   if (isEmptyOrg && isEmptyVal) return 'same';
+
   // 如果原始值为空 且当前有值的话 视为新增
   if (isEmptyOrg && !isEmptyVal) return 'add';
+
   // 根据类型选择对应的比较策略
   var compareStrategy;
   if (type === 'InputNumber') {
@@ -50,15 +57,17 @@ var handleNumberTypeDiff = function handleNumberTypeDiff(params) {
   }
   return compareStrategy.compare(value, originalValue) ? 'same' : 'changed';
 };
+
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
-var filterObject = function filterObject(data) {
-  if (!_isObject(data) || data === null) return data;
+var filterObject = data => {
+  if (!isObject(data) || data === null) return data;
+
   // ['1', undefined] ['1', ''] 视为相等
   if (Array.isArray(data)) {
     // 数组中全是empty值的话 视为null
     var isFillNull = true;
-    var arr = data.map(function (item) {
+    var arr = data.map(item => {
       if (isEmpty(item)) {
         return null;
       }
@@ -68,22 +77,24 @@ var filterObject = function filterObject(data) {
     return isFillNull ? null : arr;
   }
   var resData = {};
-  Object.keys(data).forEach(function (key) {
+  Object.keys(data).forEach(key => {
     if (!isEmpty(data[key])) {
       resData[key] = data[key];
     }
   });
+
   // 空对象视为null 比较时 null undefined {} [] '' 视为相等
   if (!Object.keys(resData).length) return null;
   return resData;
 };
-export var diffOriginal = function diffOriginal(params) {
+export var diffOriginal = params => {
   var originalValue = params.originalValue,
     value = params.value,
     onDiff = params.onDiff,
     type = params.type;
+
   // 支持传入自定义比较事件
-  if (_isFunction(onDiff)) {
+  if (isFunction(onDiff)) {
     var diffRes = onDiff(originalValue, value);
     // 如果返回undefined走内置比较逻辑
     if (diffRes !== undefined) {
@@ -96,14 +107,17 @@ export var diffOriginal = function diffOriginal(params) {
   if (['InputNumber', 'ProNumberRange'].includes(type)) {
     return handleNumberTypeDiff(params);
   }
+
   // 其他类型使用原有逻辑
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
   var isEmptyVal = isEmpty(_value);
   var isEmptyOrg = isEmpty(_originalValue);
+
   // 都为空视为相等
   if (isEmptyOrg && isEmptyVal) return 'same';
+
   // 如果原始值为空 且当前有值的话 视为新增
   if (isEmptyOrg && !isEmptyVal) return 'add';
-  return _isEqual(_value, _originalValue) ? 'same' : 'changed';
+  return isEqual(_value, _originalValue) ? 'same' : 'changed';
 };

package/es/ProForm/utils/getDefaultProps.js

@@ -1,31 +1,31 @@
-import _isEqual from "lodash/isEqual";
-import _get from "lodash/get";
+import { get, isEqual } from 'lodash';
 var defaultPropsMap = {
-  ProSelect: function ProSelect(props) {
+  ProSelect: props => {
     var fieldProps = props.fieldProps,
       name = props.name,
       namePath = props.namePath;
     var _ref = fieldProps || {},
       filterInList = _ref.filterInList;
     var defaultProps = {};
+
     // formList场景传入列表过滤时
     if (filterInList && namePath && name) {
       var _listName = namePath.slice(0, -1);
       var _namePath = name.slice(1);
-      defaultProps.shouldUpdate = function (preValues, curValues) {
-        var preListValue = _get(preValues, _listName).map(function (item) {
-          return _get(item, _namePath);
+      defaultProps.shouldUpdate = (preValues, curValues) => {
+        var preListValue = get(preValues, _listName).map(item => {
+          return get(item, _namePath);
         });
-        var curListValue = _get(curValues, _listName).map(function (item) {
-          return _get(item, _namePath);
+        var curListValue = get(curValues, _listName).map(item => {
+          return get(item, _namePath);
         });
-        return !_isEqual(preListValue, curListValue);
+        return !isEqual(preListValue, curListValue);
       };
     }
     return defaultProps;
   }
 };
-export var getDefaultProps = function getDefaultProps(props) {
+export var getDefaultProps = props => {
   var _defaultPropsMap$type;
   var type = props.type;
   return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);

package/es/ProForm/utils/index.js

@@ -1,16 +1,11 @@
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _isNaN from "lodash/isNaN";
-import _omit from "lodash/omit";
-import _set from "lodash/set";
-import _get from "lodash/get";
-import _isFunction from "lodash/isFunction";
-import _isObject from "lodash/isObject";
+/* eslint-disable no-restricted-syntax */
+
 import React, { useState } from 'react';
 import moment from 'moment';
-export var getLayout = function getLayout(params) {
+import _, { isObject, isFunction, get, set, omit, isNaN } from 'lodash';
+export var getLayout = params => {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
     form = params.form;
@@ -23,16 +18,17 @@ export var getLayout = function getLayout(params) {
     colProps: {
       span: span || 8
     },
-    onCancel: function onCancel() {
+    onCancel: () => {
       form.resetFields();
     },
-    onOk: function onOk() {
+    onOk: () => {
       form.submit();
     }
   };
 };
+
 // 受控状态
-export var useControlled = function useControlled(props) {
+export var useControlled = props => {
   var value = props.value,
     onChange = props.onChange;
   var _useState = useState(value || false),
@@ -44,65 +40,66 @@ export var useControlled = function useControlled(props) {
   }
   return [state, setState];
 };
-export var isSelect = function isSelect(props) {
+export var isSelect = props => {
   var dataSource = props.dataSource,
     type = props.type;
   return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProCascader', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload', 'TimePicker'].includes(type);
 };
+
 /**
  * Input TextArea 移除前后空格
  * @param type 组件类型
  * @param trim 是否移除前后空格
  * @returns {}
  */
-export var isTrim = function isTrim(type, trim, configData) {
+export var isTrim = (type, trim, configData) => {
   var _state$type;
   var result = {};
   var _ref = configData || {},
     _ref$state = _ref.state,
     state = _ref$state === void 0 ? {} : _ref$state;
-  var _trim = trim || (state === null || state === void 0 ? void 0 : (_state$type = state[type]) === null || _state$type === void 0 ? void 0 : _state$type.trim);
+  var _trim = trim || (state === null || state === void 0 || (_state$type = state[type]) === null || _state$type === void 0 ? void 0 : _state$type.trim);
   if (['Input', 'ProCombination'].includes(type) && _trim) {
-    result.getValueFromEvent = function (event) {
+    result.getValueFromEvent = event => {
       var _event$target$value;
       if (Array.isArray(event)) {
-        return event.map(function (value) {
-          return (value === null || value === void 0 ? void 0 : value.trim()) || '';
-        });
+        return event.map(value => (value === null || value === void 0 ? void 0 : value.trim()) || '');
       }
       return ((_event$target$value = event.target.value) === null || _event$target$value === void 0 ? void 0 : _event$target$value.trim()) || '';
     };
   }
   return result;
 };
+
 /**
  * Input TextArea 小写自动转大写
  * @param type 组件类型
  * @param upperCase 是否小写转大写
  * @returns {}
  */
-export var isUpperCase = function isUpperCase(type, upperCase) {
+export var isUpperCase = (type, upperCase) => {
   var result = {};
   if (['Input', 'ProCombination'].includes(type) && upperCase) {
-    result.getValueFromEvent = function (event) {
-      var _event$target, _event$target$value2;
+    result.getValueFromEvent = event => {
+      var _event$target;
       if (Array.isArray(event)) {
-        return event.map(function (value) {
+        return event.map(value => {
           var newValue = value === null || value === void 0 ? void 0 : value.replace(/[^a-zA-Z]/g, '');
           return (newValue === null || newValue === void 0 ? void 0 : newValue.toUpperCase()) || '';
         });
       }
-      var newValue = (_event$target = event.target) === null || _event$target === void 0 ? void 0 : (_event$target$value2 = _event$target.value) === null || _event$target$value2 === void 0 ? void 0 : _event$target$value2.replace(/[^a-zA-Z]/g, '');
+      var newValue = (_event$target = event.target) === null || _event$target === void 0 || (_event$target = _event$target.value) === null || _event$target === void 0 ? void 0 : _event$target.replace(/[^a-zA-Z]/g, '');
       return newValue.toUpperCase() || '';
     };
   }
   return result;
 };
+
 // 剔除otherProps 组成对象返回
-export var weedOutProps = function weedOutProps(data, keys) {
+export var weedOutProps = (data, keys) => {
   var obj = {};
   var weedOut = {};
-  Object.keys(data).forEach(function (key) {
+  Object.keys(data).forEach(key => {
     var included = keys.includes(key);
     if (included) {
       weedOut[key] = data[key];
@@ -112,89 +109,88 @@ export var weedOutProps = function weedOutProps(data, keys) {
   });
   return [obj, weedOut];
 };
+
 // 对比字段变化
-export var diffField = function diffField(prevValues, curValues, names) {
-  return names.some(function (name) {
-    return _get(prevValues, name) !== _get(curValues, name);
+export var diffField = (prevValues, curValues, names) => {
+  return names.some(name => {
+    return _.get(prevValues, name) !== _.get(curValues, name);
   });
 };
+
 // 表单name展开
-export var splitNameStr = function splitNameStr(name) {
-  return name.split('-').map(function (keyStr) {
-    return keyStr.split('_');
-  });
+export var splitNameStr = name => {
+  return name.split('-').map(keyStr => keyStr.split('_'));
 };
+
 // 过滤掉字段名中包含 '-' 的字段
-var _filterInternalFields = function filterInternalFields(values, optimize) {
+export var filterInternalFields = (values, optimize) => {
   if (optimize) {
     return values;
   }
   var nextValues = values;
   // fix: braft-editor对象不可遍历 Moment不过滤
-  if ((values === null || values === void 0 ? void 0 : values._immutable) || moment.isMoment(values)) {
+  if (values !== null && values !== void 0 && values._immutable || moment.isMoment(values)) {
     return nextValues;
   }
   if (values instanceof File) {
     return nextValues;
   }
   if (Array.isArray(nextValues)) {
-    return nextValues.map(function (item) {
-      return _filterInternalFields(item);
+    return nextValues.map(item => {
+      return filterInternalFields(item);
     });
   }
-  if (_isObject(nextValues)) {
+  if (isObject(nextValues)) {
     var result = {};
-    Object.keys(nextValues).forEach(function (key) {
+    Object.keys(nextValues).forEach(key => {
       if (key.includes('-') || key.startsWith('__')) return;
-      result[key] = _filterInternalFields(nextValues[key]);
+      result[key] = filterInternalFields(nextValues[key]);
     });
     return result;
   }
   return nextValues;
 };
-export { _filterInternalFields as filterInternalFields };
-var _getAllNamePath = function getAllNamePath(object) {
+export var getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
-  keys.forEach(function (key) {
+  keys.forEach(key => {
     var value = object[key];
+
     // 拆开组合key (组合key只可能存在于最外层)
     if (key.includes('-')) {
-      resultKeys.concat(key.split('-').map(function (keyStr) {
-        return keyStr.split('_');
-      }));
+      resultKeys.concat(key.split('-').map(keyStr => keyStr.split('_')));
     }
+
     // 深度获取对象key
-    if (_isObject(value)) {
-      resultKeys.concat(_getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
+    if (isObject(value)) {
+      resultKeys.concat(getAllNamePath(value, [...currentPath, key]));
     }
-    resultKeys.push([].concat(_toConsumableArray(currentPath), [key]));
+    resultKeys.push([...currentPath, key]);
   });
   return resultKeys;
 };
+
 // 判断一个字段值是否算空
-export { _getAllNamePath as getAllNamePath };
 var nullList = [undefined, 'null', '""', '[]'];
-export var isNullValue = function isNullValue(value) {
+export var isNullValue = value => {
   return nullList.includes(JSON.stringify(value));
 };
+
 /**
  * 判断数组中是否包含空值 一个为空则为true
  * @param arr 值
  * @returns boole
  */
-export var isNotFullArray = function isNotFullArray(arr, length, required) {
+export var isNotFullArray = (arr, length, required) => {
   if (!Array.isArray(arr)) {
     return false;
   }
-  if (Array.isArray(required) && required.some(function (item) {
-    return item === false;
-  })) {
+  if (Array.isArray(required) && required.some(item => item === false)) {
     return false;
   }
   if (arr.length < length) return true;
-  return arr.some(function (item) {
+  return arr.some(item => {
     if (item === undefined || item === null) {
       return true;
     }
@@ -207,14 +203,15 @@ export var isNotFullArray = function isNotFullArray(arr, length, required) {
     return false;
   });
 };
+
 /**
  * 判断数组中值是否都为空 全部为空则为true
  * @param arr 值
  * @returns boole
  */
-export var isNullArray = function isNullArray(arr) {
+export var isNullArray = arr => {
   if (!Array.isArray(arr)) return !arr;
-  return arr.every(function (item) {
+  return arr.every(item => {
     if (item === undefined || item === null) {
       return true;
     }
@@ -227,14 +224,15 @@ export var isNullArray = function isNullArray(arr) {
     return false;
   });
 };
+
 /**
  * 判断数组中值是否全部为空  如果值不是数组返回false
  * @param arr 值
  * @returns boole
  */
-export var isEmptyArray = function isEmptyArray(arr) {
+export var isEmptyArray = arr => {
   if (!Array.isArray(arr)) return false;
-  return arr.every(function (item) {
+  return arr.every(item => {
     if (item === undefined || item === null) {
       return true;
     }
@@ -253,6 +251,7 @@ export function toArray(value) {
   }
   return Array.isArray(value) ? value : [value];
 }
+
 /**
  * 初始化值names值合并
  * @param obj AnyObject
@@ -265,50 +264,50 @@ export function initialValuesToNames() {
   if (!Array.isArray(columns)) {
     return result;
   }
-  columns.forEach(function (item) {
+  columns.forEach(item => {
     if (Array.isArray(item === null || item === void 0 ? void 0 : item.names)) {
       var _item$names;
-      var key = (_item$names = item.names) === null || _item$names === void 0 ? void 0 : _item$names.map(function (name) {
+      var _key = (_item$names = item.names) === null || _item$names === void 0 ? void 0 : _item$names.map(name => {
         return Array.isArray(name) ? name.join('_') : name;
       }).join('-');
-      var formInitialValue = item.names.map(function (name, index) {
+      var formInitialValue = item.names.map((name, index) => {
         if (item.initialValue) {
-          _set(values, name, item.initialValue[index]);
+          set(values, name, item.initialValue[index]);
         }
-        return _get(values, name);
+        return get(values, name);
       });
+
       // 过滤掉不存在的初始值  防止names字段值为空数组
-      var namesInitialValue = formInitialValue.filter(function (item) {
-        return item !== undefined;
-      });
+      var namesInitialValue = formInitialValue.filter(item => item !== undefined);
       if (namesInitialValue.length) {
-        values[key] = formInitialValue;
+        values[_key] = formInitialValue;
       }
     }
   });
   return values;
 }
+
 /**
  * 获取数组含数字的新数组
  * @returns ['group-7x19no', 0, 'abc'] =>['group-7x19no', 0]
  */
 export function getArrayBeforeNumber(arr) {
-  var index = arr.findIndex(function (item) {
-    return typeof item === 'number';
-  });
+  var index = arr.findIndex(item => typeof item === 'number');
   return index !== -1 ? arr.slice(0, index + 1) : arr;
 }
+
 // 自定义深比对 如果两边都是函数类型则认为相等
-export var customEqualForFun = function customEqualForFun(value, other) {
-  if (_isFunction(value) && _isFunction(other) || /*#__PURE__*/React.isValidElement(value) && /*#__PURE__*/React.isValidElement(other)) {
+export var customEqualForFun = (value, other) => {
+  if (isFunction(value) && isFunction(other) || /*#__PURE__*/React.isValidElement(value) && /*#__PURE__*/React.isValidElement(other)) {
     return true;
   }
 };
+
 /**
  * 查询数据中是否包含rowKey
  */
-var _hasRowKey = function hasRowKey(obj) {
-  if (_typeof(obj) !== 'object' || obj === null) {
+export var hasRowKey = obj => {
+  if (typeof obj !== 'object' || obj === null) {
     return false;
   }
   var keys = Object.keys(obj);
@@ -316,16 +315,14 @@ var _hasRowKey = function hasRowKey(obj) {
   if (rowKeyExists) {
     return true;
   }
-  return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
-  });
+  return keys.some(key => hasRowKey(obj[key]));
 };
+
 /**
  * 查询数据中是否包含rowKey
  */
-export { _hasRowKey as hasRowKey };
-export var view = function view(obj) {
-  if (_typeof(obj) !== 'object' || obj === null) {
+export var view = obj => {
+  if (typeof obj !== 'object' || obj === null) {
     return false;
   }
   var keys = Object.keys(obj);
@@ -333,28 +330,27 @@ export var view = function view(obj) {
   if (rowKeyExists) {
     return true;
   }
-  return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
-  });
+  return keys.some(key => hasRowKey(obj[key]));
 };
+
 /**
  * 获取小数点后的位数
  * @param num 数字
  * @returns 位数
  */
-export var getDecimalDigits = function getDecimalDigits(num) {
+export var getDecimalDigits = num => {
   var match = num.toString().match(/\.(\d+)/);
   return match ? match[1].length : 0;
 };
-export var deleteForPath = function deleteForPath(values, namePath) {
+export var deleteForPath = (values, namePath) => {
   if (Array.isArray(namePath)) {
     var current = values;
-    namePath.every(function (nameItem, index) {
+    namePath.every((nameItem, index) => {
       if (index === namePath.length - 1) {
         delete current[nameItem];
         return false;
       }
-      if (_typeof(current[nameItem]) !== 'object') {
+      if (typeof current[nameItem] !== 'object') {
         return false;
       }
       current = current[nameItem];
@@ -364,70 +360,69 @@ export var deleteForPath = function deleteForPath(values, namePath) {
   }
   delete values[namePath];
 };
+
 /**
  * 获取树状结构option
  * @param treeData 树数据源
  * @param value 选中值
  * @returns {}
  */
-var _findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
-  if (_isObject(value)) {
+export var findOptionByValue = (treeData, value, fieldNames) => {
+  if (isObject(value)) {
     return value;
   }
   for (var i = 0; i < (treeData === null || treeData === void 0 ? void 0 : treeData.length); i++) {
     var node = treeData[i];
     if (node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'] === value) {
-      return _omit(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
+      return omit(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
+      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
-        return _omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
+        return omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
     }
   }
 };
+
 /**
  * 对比依赖列表中的 值是否变更
  */
-export { _findOptionByValue as findOptionByValue };
-export var equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
-  if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
-    return dependencies.some(function (namePath) {
-      var prevValue = _get(prevValues, namePath);
-      var currentValue = _get(currentValues, namePath);
+export var equalDependencies = (dependencies, prevValues, currentValues) => {
+  if (dependencies !== null && dependencies !== void 0 && dependencies.length) {
+    return dependencies.some(namePath => {
+      var prevValue = get(prevValues, namePath);
+      var currentValue = get(currentValues, namePath);
       return prevValue !== currentValue;
     });
   }
   return false;
 };
+
 /** 解析namePath */
-export var parseNamePath = function parseNamePath(input) {
+export var parseNamePath = input => {
   var parts = input.split('_');
-  if (parts.every(function (item) {
-    return _isNaN(Number(item));
-  })) {
+  if (parts.every(item => isNaN(Number(item)))) {
     return [input];
   }
-  var result = parts.map(function (item) {
-    return _isNaN(Number(item)) ? item : Number(item);
+  var result = parts.map(item => {
+    return isNaN(Number(item)) ? item : Number(item);
   });
   return [result];
 };
+
 /**
  * 获取表单所有字段路径的简化函数
  * @param form 表单实例
  * @returns 所有字段路径数组
  */
-export var getFormFieldPaths = function getFormFieldPaths(form) {
+export var getFormFieldPaths = form => {
   try {
     // @ts-ignore
     var _form$getInternalHook = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS'),
       getFields = _form$getInternalHook.getFields;
     var allFields = getFields();
-    return allFields.map(function (field) {
-      return field.name;
-    });
+    return allFields.map(field => field.name);
   } catch (error) {
     console.error('获取表单字段失败:', error);
     return [];