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

package/es/ProEditTable/utils/tools.js

@@ -1,7 +1,6 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
 import React from 'react';
@@ -11,7 +10,7 @@ import { cloneDeep, cloneDeepWith, isString, isObject, isEqual, transform, isFun
  * 生成随机字符串
  * @returns 随机字符串
  */
-export var getRandom = function getRandom() {
+export var getRandom = () => {
   return Math.random().toString(36).slice(-6);
 };
 
@@ -21,9 +20,9 @@ export var getRandom = function getRandom() {
  * @param base 基准对象
  * @returns 差异对象
  */
-export var difference = function difference(object, base) {
-  var changes = function changes(object, base) {
-    return transform(object, function (result, value, key) {
+export var difference = (object, base) => {
+  var changes = (object, base) => {
+    return transform(object, (result, value, key) => {
       if (!isEqual(value, base === null || base === void 0 ? void 0 : base[key])) {
         result[key] = isObject(value) && isObject(base === null || base === void 0 ? void 0 : base[key]) ? changes(value, base === null || base === void 0 ? void 0 : base[key]) : value;
       }
@@ -39,10 +38,10 @@ export var difference = function difference(object, base) {
  * @param rowName 行名称路径
  * @returns 校验结果Promise
  */
-export var customValidate = function customValidate(validateKeys, form, rowName) {
+export var customValidate = (validateKeys, form, rowName) => {
   var array = [];
-  validateKeys.forEach(function (key) {
-    array.push([].concat(_toConsumableArray(Array.isArray(rowName) ? rowName : [rowName]), [key]));
+  validateKeys.forEach(key => {
+    array.push([...(Array.isArray(rowName) ? rowName : [rowName]), key]);
   });
   return form.validateFields(array);
 };
@@ -52,16 +51,16 @@ export var customValidate = function customValidate(validateKeys, form, rowName)
  * @param names 名称数组
  * @returns 拆解后的字符串
  */
-export var splitNames = function splitNames(names) {
+export var splitNames = names => {
   var result;
   var resultArray = [];
   if (isString(names[0])) {
     result = names.join('-');
     return result;
   }
-  names.forEach(function (item) {
+  names.forEach(item => {
     if (isString(item[0])) {
-      resultArray.push("".concat(item[0], "_").concat(item[1]));
+      resultArray.push(`${item[0]}_${item[1]}`);
     }
   });
   result = resultArray.join('-');
@@ -74,11 +73,11 @@ export var splitNames = function splitNames(names) {
  * @param virtualKey 虚拟键
  * @returns 完整名称路径数组
  */
-export var getNamePath = function getNamePath(name, virtualKey) {
+export var getNamePath = (name, virtualKey) => {
   var nextName = cloneDeep(Array.isArray(name) ? name : [name]);
   var lastIndex = nextName.length - 1;
   // 确保最后一个元素是字符串类型
-  nextName[lastIndex] = "".concat(nextName[lastIndex]).concat(virtualKey ? "-".concat(virtualKey) : '');
+  nextName[lastIndex] = `${nextName[lastIndex]}${virtualKey ? `-${virtualKey}` : ''}`;
   return nextName;
 };
 
@@ -86,16 +85,14 @@ export var getNamePath = function getNamePath(name, virtualKey) {
  * 删除操作
  * @param params 删除参数
  */
-export var onDelete = function onDelete(_ref) {
+export var onDelete = _ref => {
   var name = _ref.name,
     form = _ref.form,
     virtualKey = _ref.virtualKey,
     selectedRowKeys = _ref.selectedRowKeys;
   // 正常的form数据流处理
   var dataSource = form.getFieldValue(name);
-  dataSource = dataSource.filter(function (row) {
-    return !selectedRowKeys.includes(row.rowKey);
-  });
+  dataSource = dataSource.filter(row => !selectedRowKeys.includes(row.rowKey));
   form.setFieldValue(name, dataSource);
   // 单行模式数据流处理 重置中间正在编辑状态单行数据
   if (virtualKey) {
@@ -103,9 +100,7 @@ export var onDelete = function onDelete(_ref) {
     var namePath = getNamePath(name, virtualKey);
     var virtualList = form.getFieldValue(namePath);
     if ((_virtualList = virtualList) !== null && _virtualList !== void 0 && _virtualList.length) {
-      virtualList = virtualList.filter(function (row) {
-        return !selectedRowKeys.includes(row.rowKey);
-      });
+      virtualList = virtualList.filter(row => !selectedRowKeys.includes(row.rowKey));
       form.setFieldValue(namePath, virtualList);
     }
   }
@@ -118,7 +113,7 @@ export var onDelete = function onDelete(_ref) {
  * @param params 禁用参数
  * @returns 是否禁用
  */
-export var getDisabled = function getDisabled(_ref2) {
+export var getDisabled = _ref2 => {
   var _ref3, _column$disabled;
   var globalControl = _ref2.globalControl,
     formDisabled = _ref2.formDisabled,
@@ -127,7 +122,7 @@ export var getDisabled = function getDisabled(_ref2) {
     columnFieldProps = _ref2.columnFieldProps,
     params = _ref2.params,
     rowDisabled = _ref2.rowDisabled;
-  var convertToBoolean = function convertToBoolean(value) {
+  var convertToBoolean = value => {
     if (Array.isArray(value)) {
       return Boolean(value.length);
     }
@@ -141,13 +136,13 @@ export var getDisabled = function getDisabled(_ref2) {
   };
 
   // 判断是否有column的disabled属性
-  var noColumnDisabled = function noColumnDisabled() {
+  var noColumnDisabled = () => {
     if (isFunction(column === null || column === void 0 ? void 0 : column.disabled) || isFunction(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || isBoolean(column === null || column === void 0 ? void 0 : column.disabled) || isBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
       return false;
     }
     // 判断FieldProps是否有disabled属性
     if (isFunction(columnFieldProps)) {
-      var _columnFieldProps = columnFieldProps.apply(void 0, _toConsumableArray(params)),
+      var _columnFieldProps = columnFieldProps(...params),
         disabled = _columnFieldProps.disabled;
       if (isFunction(disabled) || isBoolean(disabled)) {
         return false;
@@ -171,7 +166,7 @@ export var getDisabled = function getDisabled(_ref2) {
       return column.disabled;
     }
     if (isFunction(column === null || column === void 0 ? void 0 : column.disabled)) {
-      return column === null || column === void 0 ? void 0 : column.disabled.apply(column, _toConsumableArray(params));
+      return column === null || column === void 0 ? void 0 : column.disabled(...params);
     }
   }
 
@@ -180,22 +175,22 @@ export var getDisabled = function getDisabled(_ref2) {
     return rowDisabled(params[1]);
   }
   if (isFunction(column === null || column === void 0 ? void 0 : column.disabled)) {
-    return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled.apply(column, _toConsumableArray(params)));
+    return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled(...params));
   }
 
   // 表单FieldProps为函数时
   if (isFunction(columnFieldProps)) {
-    var _columnFieldProps2 = columnFieldProps.apply(void 0, _toConsumableArray(params)),
+    var _columnFieldProps2 = columnFieldProps(...params),
       disabled = _columnFieldProps2.disabled;
     if (isFunction(disabled)) {
-      return convertToBoolean(disabled.apply(void 0, _toConsumableArray(params)));
+      return convertToBoolean(disabled(...params));
     }
     if (isBoolean(disabled)) {
       return convertToBoolean(disabled);
     }
   }
   if (isFunction(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
-    return convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled.apply(columnFieldProps, _toConsumableArray(params)));
+    return convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled(...params));
   }
   return convertToBoolean((_ref3 = (_column$disabled = column === null || column === void 0 ? void 0 : column.disabled) !== null && _column$disabled !== void 0 ? _column$disabled : columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : tabledDisabled);
 };
@@ -203,8 +198,8 @@ export var getDisabled = function getDisabled(_ref2) {
 /**
  * 表格自动滚动到报错位置
  */
-export var handleScrollToError = function handleScrollToError() {
-  setTimeout(function () {
+export var handleScrollToError = () => {
+  setTimeout(() => {
     var errorDom = document.querySelector('[class*="form-item-has-error"]');
     if (errorDom) {
       var tableBody = errorDom.closest('[class*="table-content"]') || errorDom.closest('[class*="table-body"]');
@@ -256,7 +251,7 @@ export var handleScrollToError = function handleScrollToError() {
  * @returns 深拷贝后的对象，其中的React节点会被保留
  */
 export function cloneDeepFilterNode(value) {
-  return cloneDeepWith(value, function (val) {
+  return cloneDeepWith(value, val => {
     if ( /*#__PURE__*/React.isValidElement(val)) {
       return val;
     }
@@ -268,11 +263,9 @@ export function cloneDeepFilterNode(value) {
  * @param value 需要判断的值
  * @returns 是否为空
  */
-var isNull = function isNull(value) {
+var isNull = value => {
   if (Array.isArray(value) && value.length) {
-    return value.some(function (item) {
-      return isNull(item);
-    });
+    return value.some(item => isNull(item));
   }
   return value === '' || value === undefined || value === null || Array.isArray(value) && value.length === 0;
 };
@@ -288,7 +281,7 @@ var handleCheckCellValue = /*#__PURE__*/function () {
             value = get(record, column.name);
           }
           if ((_column$names = column.names) !== null && _column$names !== void 0 && _column$names.length) {
-            value = column.names.map(function (key) {
+            value = column.names.map(key => {
               return get(record, key);
             });
           }
@@ -403,9 +396,7 @@ export var onPageCheck = /*#__PURE__*/function () {
           pageNum = page.pageNum, pageSize = page.pageSize;
           pageArr = Array.from({
             length: Math.ceil(tools.calc(value.length, '/', pageSize))
-          }, function (_, i) {
-            return i + 1;
-          });
+          }, (_, i) => i + 1);
           flag = false;
           errorNum = 0;
           errorPageNum = 0;
@@ -508,7 +499,7 @@ export var onPageCheck = /*#__PURE__*/function () {
           if (pageNum !== errorPageNum) {
             nextState.page = {
               pageNum: errorPageNum,
-              pageSize: pageSize
+              pageSize
             };
           }
           setState(nextState);

package/es/ProEditTable/utils/transform.js

@@ -1,15 +1,11 @@
 import { transforms } from '@zat-design/utils';
 var transformDate = transforms.transformDate;
 export default {
-  RangePicker: function RangePicker() {
-    return transformDate({
-      type: 'RangePicker',
-      keys: ['form', 'to']
-    });
-  },
-  DatePicker: function DatePicker() {
-    return transformDate({
-      type: 'DatePicker'
-    });
-  }
+  RangePicker: () => transformDate({
+    type: 'RangePicker',
+    keys: ['form', 'to']
+  }),
+  DatePicker: () => transformDate({
+    type: 'DatePicker'
+  })
 };

package/es/ProEditTable/utils/useEditTableError.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useState, useEffect } from 'react';
 import { debounce } from 'lodash';
-var useEditTableError = function useEditTableError(_ref) {
+var useEditTableError = _ref => {
   var containerNode = _ref.containerNode,
     className = _ref.className,
     isEnabled = _ref.isEnabled;
@@ -9,7 +9,7 @@ var useEditTableError = function useEditTableError(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     errorLength = _useState2[0],
     setErrorLength = _useState2[1];
-  useEffect(function () {
+  useEffect(() => {
     var _containerNode$childr3;
     // 如果 isEnabled 为 false 或容器节点不存在，直接跳过监听
     if (!isEnabled || !containerNode || !(containerNode !== null && containerNode !== void 0 && containerNode.querySelector)) {
@@ -17,12 +17,12 @@ var useEditTableError = function useEditTableError(_ref) {
     }
 
     // 防抖处理：将 setErrorLength 函数进行防抖
-    var debouncedSetErrorLength = debounce(function (errorCount) {
+    var debouncedSetErrorLength = debounce(errorCount => {
       setErrorLength(errorCount); // 更新错误数量
     }, 300); // 300ms 后更新状态
 
-    var observer = new MutationObserver(function (mutations) {
-      mutations.forEach(function (mutation) {
+    var observer = new MutationObserver(mutations => {
+      mutations.forEach(mutation => {
         // 只处理节点的 class 属性变化
         if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
           var target = mutation.target;
@@ -31,12 +31,10 @@ var useEditTableError = function useEditTableError(_ref) {
           if (target.classList.contains(className)) {
             var _containerNode$childr;
             // 查找所有包含 className 的节点
-            var errorNodes = containerNode === null || containerNode === void 0 || (_containerNode$childr = containerNode.children[0]) === null || _containerNode$childr === void 0 ? void 0 : _containerNode$childr.querySelectorAll(".".concat(className));
+            var errorNodes = containerNode === null || containerNode === void 0 || (_containerNode$childr = containerNode.children[0]) === null || _containerNode$childr === void 0 ? void 0 : _containerNode$childr.querySelectorAll(`.${className}`);
 
             // 过滤这些节点，只保留那些类名完全为 `ant-form-item-explain-error` 的节点
-            var validErrorNodes = Array.from(errorNodes).filter(function (node) {
-              return node.classList.length === 1 && node.classList.contains('ant-form-item-explain-error');
-            });
+            var validErrorNodes = Array.from(errorNodes).filter(node => node.classList.length === 1 && node.classList.contains('ant-form-item-explain-error'));
             if (errorLength === 0) {
               debouncedSetErrorLength(0);
             }
@@ -51,11 +49,11 @@ var useEditTableError = function useEditTableError(_ref) {
         // 监听子节点的添加或删除
         if (mutation.type === 'childList') {
           // 检查删除的节点是否包含指定的类名
-          mutation.removedNodes.forEach(function (removedNode) {
+          mutation.removedNodes.forEach(removedNode => {
             if (removedNode instanceof HTMLElement && removedNode.classList.contains('ant-table-row')) {
               var _containerNode$childr2;
               // 更新错误数量
-              var _errorNodes = containerNode === null || containerNode === void 0 || (_containerNode$childr2 = containerNode.children[0]) === null || _containerNode$childr2 === void 0 ? void 0 : _containerNode$childr2.querySelectorAll(".".concat(className));
+              var _errorNodes = containerNode === null || containerNode === void 0 || (_containerNode$childr2 = containerNode.children[0]) === null || _containerNode$childr2 === void 0 ? void 0 : _containerNode$childr2.querySelectorAll(`.${className}`);
               if (errorLength === 0) {
                 debouncedSetErrorLength(0);
               }
@@ -88,7 +86,7 @@ var useEditTableError = function useEditTableError(_ref) {
     }
 
     // 清理 MutationObserver 和防抖定时器
-    return function () {
+    return () => {
       observer.disconnect();
       debouncedSetErrorLength.cancel(); // 取消防抖定时器
     };

package/es/ProEnum/components/Group.js

@@ -2,7 +2,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import classNames from 'classnames';
 import { useEffect, useRef, useState } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
-var Group = function Group(props) {
+var Group = props => {
   var value = props.value,
     onChange = props.onChange,
     dataSource = props.dataSource,
@@ -17,14 +17,12 @@ var Group = function Group(props) {
     refresh = _useState2[0],
     setRefresh = _useState2[1];
   var idx = useRef(-1);
-  useEffect(function () {
-    var index = dataSource.findIndex(function (item) {
-      return item[fieldValue] === value;
-    });
+  useEffect(() => {
+    var index = dataSource.findIndex(item => item[fieldValue] === value);
     idx.current = index;
     setRefresh(!refresh);
   }, [value]);
-  var handleClick = function handleClick(val, index) {
+  var handleClick = (val, index) => {
     if (value === val) {
       if (!allowClear) {
         return false;
@@ -47,22 +45,20 @@ var Group = function Group(props) {
       'pro-enum-group-root': true,
       'pro-enum-group-root-disabled': disabled
     }),
-    children: dataSource.map(function (item, index) {
-      return /*#__PURE__*/_jsx("div", {
-        onClick: function onClick() {
-          if (!item.disabled && !disabled) {
-            handleClick(item[fieldValue], index);
-          }
-        },
-        className: classNames({
-          'pro-enum-group-item': true,
-          'pro-enum-group-item-selected': value === item[fieldValue],
-          'pro-enum-group-item-disabled-after': index === idx.current || index + 1 === idx.current,
-          'pro-enum-group-item-disabled': item.disabled
-        }),
-        children: item[fieldLabel]
-      }, item[fieldValue]);
-    })
+    children: dataSource.map((item, index) => /*#__PURE__*/_jsx("div", {
+      onClick: () => {
+        if (!item.disabled && !disabled) {
+          handleClick(item[fieldValue], index);
+        }
+      },
+      className: classNames({
+        'pro-enum-group-item': true,
+        'pro-enum-group-item-selected': value === item[fieldValue],
+        'pro-enum-group-item-disabled-after': index === idx.current || index + 1 === idx.current,
+        'pro-enum-group-item-disabled': item.disabled
+      }),
+      children: item[fieldLabel]
+    }, item[fieldValue]))
   });
 };
 export default Group;

package/es/ProEnum/components/Tag.js

@@ -2,7 +2,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import classNames from 'classnames';
 import { useEffect, useState } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
-var ProEnumTag = function ProEnumTag(props) {
+var ProEnumTag = props => {
   var value = props.value,
     onChange = props.onChange,
     dataSource = props.dataSource,
@@ -13,10 +13,10 @@ var ProEnumTag = function ProEnumTag(props) {
     _useState2 = _slicedToArray(_useState, 2),
     checked = _useState2[0],
     setValue = _useState2[1];
-  useEffect(function () {
+  useEffect(() => {
     setValue(value);
   }, [value]);
-  var handleClick = function handleClick(val) {
+  var handleClick = val => {
     setValue(val);
     onChange === null || onChange === void 0 || onChange(val);
   };
@@ -28,17 +28,13 @@ var ProEnumTag = function ProEnumTag(props) {
   return /*#__PURE__*/_jsx("div", {
     id: id,
     className: "pro-enum-tag-root",
-    children: dataSource.map(function (item) {
-      return /*#__PURE__*/_jsx("div", {
-        onClick: function onClick() {
-          return handleClick(item[fieldValue]);
-        },
-        className: classNames('pro-enum-tag-item', checked === item[fieldValue] ? 'pro-enum-tag-item-selected' : ''
-        // item.disabled ? 'pro-enum-tag-item-disabled' : '',
-        ),
-        children: item[fieldLabel]
-      }, item[fieldValue]);
-    })
+    children: dataSource.map(item => /*#__PURE__*/_jsx("div", {
+      onClick: () => handleClick(item[fieldValue]),
+      className: classNames('pro-enum-tag-item', checked === item[fieldValue] ? 'pro-enum-tag-item-selected' : ''
+      // item.disabled ? 'pro-enum-tag-item-disabled' : '',
+      ),
+      children: item[fieldLabel]
+    }, item[fieldValue]))
   });
 };
 export default ProEnumTag;

package/es/ProEnum/hooks/useEnum.js

@@ -42,6 +42,11 @@ function useEnum(codes, value, compose) {
     fieldNames = _ref3$fieldNames === void 0 ? {} : _ref3$fieldNames,
     _ref3$clear = _ref3.clear,
     clear = _ref3$clear === void 0 ? true : _ref3$clear;
+
+  // 存在子应用自管理枚举时，需要根据其指定的cacheKey进行缓存
+  if (cacheKey !== 'zat-design-pro-component-cacheKey') {
+    baseEnumStorage = null;
+  }
   var catchData = getEnumData(storage, cacheKey, baseEnumStorage);
 
   // 默认枚举缓存数据
@@ -62,20 +67,16 @@ function useEnum(codes, value, compose) {
   if (typeof codes === 'string') {
     var _catchData$data;
     var options = (catchData === null || catchData === void 0 || (_catchData$data = catchData.data) === null || _catchData$data === void 0 ? void 0 : _catchData$data[codes]) || [];
-    var getEnumLabel = function getEnumLabel(v, composezTow) {
-      var option = options.find(function (item) {
-        return item[fieldValue] === v;
-      });
+    var getEnumLabel = (v, composezTow) => {
+      var option = options.find(item => item[fieldValue] === v);
       if (option) {
-        return composezTow ? "".concat(v, "-").concat(option[fieldLabel]) : option[fieldLabel];
+        return composezTow ? `${v}-${option[fieldLabel]}` : option[fieldLabel];
       }
     };
     if (value && Array.isArray(options)) {
-      var option = options.find(function (item) {
-        return item[fieldValue] === value;
-      });
+      var option = options.find(item => item[fieldValue] === value);
       if (option) {
-        return [compose ? "".concat(value, "-").concat(option[fieldLabel]) : option[fieldLabel], option];
+        return [compose ? `${value}-${option[fieldLabel]}` : option[fieldLabel], option];
       }
       return [options];
     }
@@ -83,7 +84,7 @@ function useEnum(codes, value, compose) {
   }
   if (Array.isArray(codes)) {
     var _options = {};
-    codes.forEach(function (code) {
+    codes.forEach(code => {
       var _catchData$data2;
       var values = catchData === null || catchData === void 0 || (_catchData$data2 = catchData.data) === null || _catchData$data2 === void 0 ? void 0 : _catchData$data2[code];
       if (Array.isArray(values) && values.length) {