@zat-design/sisyphus-react 3.13.18 → 3.13.19-beta.10

package/lib/ProForm/utils/index.js

@@ -15,18 +15,13 @@ exports.splitNameStr = exports.parseNamePath = exports.isUpperCase = exports.isT
 exports.toArray = toArray;
 exports.weedOutProps = exports.view = exports.useControlled = void 0;
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _isNaN2 = _interopRequireDefault(require("lodash/isNaN"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _set2 = _interopRequireDefault(require("lodash/set"));
-var _get2 = _interopRequireDefault(require("lodash/get"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
-var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _react = _interopRequireWildcard(require("react"));
 var _moment = _interopRequireDefault(require("moment"));
-var getLayout = exports.getLayout = function getLayout(params) {
+var _lodash = _interopRequireWildcard(require("lodash"));
+/* eslint-disable no-restricted-syntax */
+
+var getLayout = params => {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
     form = params.form;
@@ -39,16 +34,18 @@ var getLayout = exports.getLayout = function getLayout(params) {
     colProps: {
       span: span || 8
     },
-    onCancel: function onCancel() {
+    onCancel: () => {
       form.resetFields();
     },
-    onOk: function onOk() {
+    onOk: () => {
       form.submit();
     }
   };
 };
+
 // 受控状态
-var useControlled = exports.useControlled = function useControlled(props) {
+exports.getLayout = getLayout;
+var useControlled = props => {
   var value = props.value,
     onChange = props.onChange;
   var _useState = (0, _react.useState)(value || false),
@@ -60,65 +57,70 @@ var useControlled = exports.useControlled = function useControlled(props) {
   }
   return [state, setState];
 };
-var isSelect = exports.isSelect = function isSelect(props) {
+exports.useControlled = useControlled;
+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 {}
  */
-var isTrim = exports.isTrim = function isTrim(type, trim, configData) {
+exports.isSelect = isSelect;
+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 {}
  */
-var isUpperCase = exports.isUpperCase = function isUpperCase(type, upperCase) {
+exports.isTrim = isTrim;
+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 组成对象返回
-var weedOutProps = exports.weedOutProps = function weedOutProps(data, keys) {
+exports.isUpperCase = isUpperCase;
+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];
@@ -128,87 +130,93 @@ var weedOutProps = exports.weedOutProps = function weedOutProps(data, keys) {
   });
   return [obj, weedOut];
 };
+
 // 对比字段变化
-var diffField = exports.diffField = function diffField(prevValues, curValues, names) {
-  return names.some(function (name) {
-    return (0, _get2.default)(prevValues, name) !== (0, _get2.default)(curValues, name);
+exports.weedOutProps = weedOutProps;
+var diffField = (prevValues, curValues, names) => {
+  return names.some(name => {
+    return _lodash.default.get(prevValues, name) !== _lodash.default.get(curValues, name);
   });
 };
+
 // 表单name展开
-var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
-  return name.split('-').map(function (keyStr) {
-    return keyStr.split('_');
-  });
+exports.diffField = diffField;
+var splitNameStr = name => {
+  return name.split('-').map(keyStr => keyStr.split('_'));
 };
+
 // 过滤掉字段名中包含 '-' 的字段
-var _filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
+exports.splitNameStr = splitNameStr;
+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.default.isMoment(values)) {
+  if (values !== null && values !== void 0 && values._immutable || _moment.default.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 ((0, _isObject2.default)(nextValues)) {
+  if ((0, _lodash.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;
 };
-var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
+exports.filterInternalFields = filterInternalFields;
+var getAllNamePath = exports.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 ((0, _isObject2.default)(value)) {
-      resultKeys.concat(_getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
+    if ((0, _lodash.isObject)(value)) {
+      resultKeys.concat(getAllNamePath(value, [...currentPath, key]));
     }
-    resultKeys.push([].concat((0, _toConsumableArray2.default)(currentPath), [key]));
+    resultKeys.push([...currentPath, key]);
   });
   return resultKeys;
 };
+
 // 判断一个字段值是否算空
 var nullList = [undefined, 'null', '""', '[]'];
-var isNullValue = exports.isNullValue = function isNullValue(value) {
+var isNullValue = value => {
   return nullList.includes(JSON.stringify(value));
 };
+
 /**
  * 判断数组中是否包含空值 一个为空则为true
  * @param arr 值
  * @returns boole
  */
-var isNotFullArray = exports.isNotFullArray = function isNotFullArray(arr, length, required) {
+exports.isNullValue = isNullValue;
+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;
     }
@@ -221,14 +229,16 @@ var isNotFullArray = exports.isNotFullArray = function isNotFullArray(arr, lengt
     return false;
   });
 };
+
 /**
  * 判断数组中值是否都为空 全部为空则为true
  * @param arr 值
  * @returns boole
  */
-var isNullArray = exports.isNullArray = function isNullArray(arr) {
+exports.isNotFullArray = isNotFullArray;
+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;
     }
@@ -241,14 +251,16 @@ var isNullArray = exports.isNullArray = function isNullArray(arr) {
     return false;
   });
 };
+
 /**
  * 判断数组中值是否全部为空  如果值不是数组返回false
  * @param arr 值
  * @returns boole
  */
-var isEmptyArray = exports.isEmptyArray = function isEmptyArray(arr) {
+exports.isNullArray = isNullArray;
+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;
     }
@@ -261,12 +273,14 @@ var isEmptyArray = exports.isEmptyArray = function isEmptyArray(arr) {
     return false;
   });
 };
+exports.isEmptyArray = isEmptyArray;
 function toArray(value) {
   if (value === undefined || value === null) {
     return [];
   }
   return Array.isArray(value) ? value : [value];
 }
+
 /**
  * 初始化值names值合并
  * @param obj AnyObject
@@ -279,50 +293,51 @@ 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) {
-          (0, _set2.default)(values, name, item.initialValue[index]);
+          (0, _lodash.set)(values, name, item.initialValue[index]);
         }
-        return (0, _get2.default)(values, name);
+        return (0, _lodash.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]
  */
 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;
 }
+
 // 自定义深比对 如果两边都是函数类型则认为相等
-var customEqualForFun = exports.customEqualForFun = function customEqualForFun(value, other) {
-  if ((0, _isFunction2.default)(value) && (0, _isFunction2.default)(other) || /*#__PURE__*/_react.default.isValidElement(value) && /*#__PURE__*/_react.default.isValidElement(other)) {
+var customEqualForFun = (value, other) => {
+  if ((0, _lodash.isFunction)(value) && (0, _lodash.isFunction)(other) || /*#__PURE__*/_react.default.isValidElement(value) && /*#__PURE__*/_react.default.isValidElement(other)) {
     return true;
   }
 };
+
 /**
  * 查询数据中是否包含rowKey
  */
-var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
-  if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
+exports.customEqualForFun = customEqualForFun;
+var hasRowKey = obj => {
+  if (typeof obj !== 'object' || obj === null) {
     return false;
   }
   var keys = Object.keys(obj);
@@ -330,15 +345,15 @@ var _hasRowKey = exports.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
  */
-var view = exports.view = function view(obj) {
-  if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
+exports.hasRowKey = hasRowKey;
+var view = obj => {
+  if (typeof obj !== 'object' || obj === null) {
     return false;
   }
   var keys = Object.keys(obj);
@@ -346,28 +361,29 @@ var view = exports.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 位数
  */
-var getDecimalDigits = exports.getDecimalDigits = function getDecimalDigits(num) {
+exports.view = view;
+var getDecimalDigits = num => {
   var match = num.toString().match(/\.(\d+)/);
   return match ? match[1].length : 0;
 };
-var deleteForPath = exports.deleteForPath = function deleteForPath(values, namePath) {
+exports.getDecimalDigits = getDecimalDigits;
+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 ((0, _typeof2.default)(current[nameItem]) !== 'object') {
+      if (typeof current[nameItem] !== 'object') {
         return false;
       }
       current = current[nameItem];
@@ -377,74 +393,79 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
   }
   delete values[namePath];
 };
+
 /**
  * 获取树状结构option
  * @param treeData 树数据源
  * @param value 选中值
  * @returns {}
  */
-var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
-  if ((0, _isObject2.default)(value)) {
+exports.deleteForPath = deleteForPath;
+var findOptionByValue = (treeData, value, fieldNames) => {
+  if ((0, _lodash.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 (0, _omit2.default)(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
+      return (0, _lodash.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 (0, _omit2.default)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
+        return (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
     }
   }
 };
+
 /**
  * 对比依赖列表中的 值是否变更
  */
-var equalDependencies = exports.equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
-  if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
-    return dependencies.some(function (namePath) {
-      var prevValue = (0, _get2.default)(prevValues, namePath);
-      var currentValue = (0, _get2.default)(currentValues, namePath);
+exports.findOptionByValue = findOptionByValue;
+var equalDependencies = (dependencies, prevValues, currentValues) => {
+  if (dependencies !== null && dependencies !== void 0 && dependencies.length) {
+    return dependencies.some(namePath => {
+      var prevValue = (0, _lodash.get)(prevValues, namePath);
+      var currentValue = (0, _lodash.get)(currentValues, namePath);
       return prevValue !== currentValue;
     });
   }
   return false;
 };
+
 /** 解析namePath */
-var parseNamePath = exports.parseNamePath = function parseNamePath(input) {
+exports.equalDependencies = equalDependencies;
+var parseNamePath = input => {
   var parts = input.split('_');
-  if (parts.every(function (item) {
-    return (0, _isNaN2.default)(Number(item));
-  })) {
+  if (parts.every(item => (0, _lodash.isNaN)(Number(item)))) {
     return [input];
   }
-  var result = parts.map(function (item) {
-    return (0, _isNaN2.default)(Number(item)) ? item : Number(item);
+  var result = parts.map(item => {
+    return (0, _lodash.isNaN)(Number(item)) ? item : Number(item);
   });
   return [result];
 };
+
 /**
  * 获取表单所有字段路径的简化函数
  * @param form 表单实例
  * @returns 所有字段路径数组
  */
-var getFormFieldPaths = exports.getFormFieldPaths = function getFormFieldPaths(form) {
+exports.parseNamePath = parseNamePath;
+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 [];
   }
 };
+exports.getFormFieldPaths = getFormFieldPaths;
 function findNamesKeyInArray(arr, key) {
   var _iterator = (0, _createForOfIteratorHelper2.default)(arr),
     _step;

package/lib/ProForm/utils/processDependencies.js

@@ -1,12 +1,18 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 exports.processDependencies = processDependencies;
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+/**
+ * 定义支持多字段依赖的类型
+ */
+
+/**
+ * dependencies支持的类型
+ */
+
 /**
  * 处理表单依赖项
  *
@@ -27,17 +33,18 @@ function processDependencies(dependencies) {
    * 1、没有 dependencies，直接返回
    */
   if (!dependencies) return undefined;
+
   /**
    * 2、如果是数组，处理可能包含多种类型的元素
    */
   if (Array.isArray(dependencies)) {
-    return dependencies.map(function (item) {
+    return dependencies.map(item => {
       // 处理数组中的namesPaths类型元素
-      if ((0, _typeof2.default)(item) === 'object' && item !== null && 'type' in item && item.type === 'namesPaths') {
+      if (typeof item === 'object' && item !== null && 'type' in item && item.type === 'namesPaths') {
         // 安全类型转换
         var itemWithPaths = item;
         var paths = itemWithPaths.paths;
-        return paths.map(function (path) {
+        return paths.map(path => {
           return Array.isArray(path) ? path.join('_') : String(path);
         }).join('-');
       }
@@ -45,16 +52,18 @@ function processDependencies(dependencies) {
       return item;
     });
   }
+
   /**
    * 3、如果是单个namesPaths对象，转换为特定的字符串形式
    * 例如：[['a','b','c'], ['a','b','d']] => 'a_b_c-a_b_d'
    */
   if ('type' in dependencies && dependencies.type === 'namesPaths') {
     var paths = dependencies.paths;
-    return [paths.map(function (path) {
+    return [paths.map(path => {
       return Array.isArray(path) ? path.join('_') : String(path);
     }).join('-')];
   }
+
   /**
    * 4、如果是普通的 dependencies，直接返回
    */