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

package/es/ProEditTable/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-edit-table {
   td[rowspan]{
@@ -81,7 +79,7 @@
     }
   }
 
-  .drag-wrapper {
+  .pro-edit-table-drag-wrapper {
     display: flex;
     justify-content: flex-end;
     .anticon {
@@ -90,7 +88,7 @@
       cursor: pointer;
     }
   }
-  .drag-wrapper.no-check {
+  .pro-edit-table-drag-wrapper.no-check {
     .anticon {
       margin-right: 0;
     }

package/es/ProEditTable/utils/diffOriginal.d.ts

@@ -4,6 +4,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
+    type?: string;
     onDiff?: ({ originValue, originRecord, value, record, index, }: {
         originValue: any;
         originRecord: any;

package/es/ProEditTable/utils/diffOriginal.js

@@ -1,6 +1,64 @@
 import { isEqual, isFunction, isObject } from 'lodash';
 import { validate } from '@zat-design/utils';
 var isEmpty = validate.isEmpty;
+
+// 比较策略接口
+
+// 数字类型标准化函数
+var normalizeNumberValue = function 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) {
+    var num1 = normalizeNumberValue(val1);
+    var num2 = normalizeNumberValue(val2);
+    return num1 === num2;
+  }
+};
+
+// ProNumberRange 比较策略
+var proNumberRangeStrategy = {
+  compare: function 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) {
+      var num1 = normalizeNumberValue(item);
+      var num2 = normalizeNumberValue(val2[index]);
+      return num1 === num2;
+    });
+  }
+};
+
+// 数字类型处理函数
+var handleNumberTypeDiff = function 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') {
+    compareStrategy = inputNumberStrategy;
+  } else if (type === 'ProNumberRange') {
+    compareStrategy = proNumberRangeStrategy;
+  } else {
+    return 'changed'; // 未知类型视为已改变
+  }
+  return compareStrategy.compare(value, originalValue) ? 'same' : 'changed';
+};
+
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
 var filterObject = function filterObject(data) {
@@ -36,7 +94,9 @@ export var diffOriginal = function diffOriginal(params) {
     onDiff = params.onDiff,
     originRecord = params.originRecord,
     record = params.record,
-    index = params.index;
+    index = params.index,
+    type = params.type;
+
   // 支持传入自定义比较事件
   if (isFunction(onDiff)) {
     var diffRes = onDiff({
@@ -54,6 +114,13 @@ export var diffOriginal = function diffOriginal(params) {
       return diffRes;
     }
   }
+
+  // 数字类型特殊处理
+  if (['InputNumber', 'ProNumberRange'].includes(type)) {
+    return handleNumberTypeDiff(params);
+  }
+
+  // 其他类型使用原有逻辑
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
   var isEmptyVal = isEmpty(_value);

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);
 
   // 默认枚举缓存数据

package/es/ProEnum/style/index.less

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

package/es/ProForm/components/FormFooter/index.js

@@ -38,7 +38,7 @@ var FormFooter = function FormFooter(props) {
       form.setFieldsValue(searchCache[formId]);
     }
   }, [formId]);
-  var _onOk = function _onOk() {
+  var nextOnOk = function nextOnOk() {
     var _modifiedForm$__INTER;
     if (formId) {
       var values = form.getFieldsValue();
@@ -53,14 +53,14 @@ var FormFooter = function FormFooter(props) {
       // 使用自定义验证逻辑
       form.validateFields().then(function () {
         onOk();
-      }).catch(function () {
-        // 验证失败，不执行 onOk
+      }).catch(function (error) {
+        console.warn('ProForm validateFields error', error);
       });
     } else {
       onOk();
     }
   };
-  var _onCancel = function _onCancel() {
+  var nextOnCancel = function nextOnCancel() {
     if (formId && searchCache[formId]) {
       delete searchCache[formId];
       window.sessionStorage.setItem(PRO_FORM_CACHE, JSON.stringify(searchCache));
@@ -71,13 +71,13 @@ var FormFooter = function FormFooter(props) {
     children: [/*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
       type: "primary",
       htmlType: onOk ? 'button' : 'submit',
-      onClick: _onOk,
+      onClick: nextOnOk,
       disabled: confirmLoading,
       loading: confirmLoading
     }, okButtonProps), {}, {
       children: okChildren || okText || "".concat(locale.ProForm.search)
     })), /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
-      onClick: _onCancel
+      onClick: nextOnCancel
     }, cancelButtonProps), {}, {
       children: cancelChildren || cancelText || "".concat(locale.ProForm.reset)
     })), children]

package/es/ProForm/components/base/DatePicker/index.js

@@ -1,10 +1,9 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["className", "format"];
 import { DatePicker as AntDatePicker } from 'antd';
-import { isFunction, isString, isObject, uniq } from 'lodash';
+import { isFunction, isString, isObject, omit } from 'lodash';
 import classNames from 'classnames';
 import dayjs from 'dayjs';
 import React from 'react';
@@ -23,64 +22,50 @@ var DatePicker = function DatePicker(props) {
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
 
-  var initialConfig = useProConfig('DatePicker');
-  var _className = classNames(_defineProperty({
+  var initialConfig = useProConfig('DatePicker') || {};
+  var nextFormat = format;
+  var nextClassName = classNames(_defineProperty({
     'full-form-item': true
   }, className, !!className));
-  var _viewFormat = Array.isArray(format) ? format[0] : format;
-  var tempFormat = Array.isArray(format) ? format : [format];
-  if (isFunction(format)) {
-    tempFormat = [];
-  }
-  var _format = uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
-    return !!formatKey;
-  });
   if (isView) {
     var value = rest.value;
     var viewChildren = null;
     if (!value) {
       viewChildren = null;
     } else if (typeof format === 'string' && isObject(value)) {
-      var _format2, _ref2;
-      viewChildren = ((_format2 = (_ref2 = value).format) === null || _format2 === void 0 ? void 0 : _format2.call(_ref2, format)) || value;
+      var _format, _ref2;
+      viewChildren = ((_format = (_ref2 = value).format) === null || _format === void 0 ? void 0 : _format.call(_ref2, format)) || value;
     } else if (isFunction(format)) {
       viewChildren = format(value);
     } else if (isString(value)) {
-      viewChildren = dayjs(value).format(_viewFormat);
+      viewChildren = dayjs(value).format(format);
     }
     return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,
       children: viewChildren
     });
   }
-  var _defaultShowTime = {
-    format: 'HH:mm:ss'
-  };
 
   // dateTime模式下默认开启time选择
-  var _rest = _objectSpread({}, rest);
+  var restProps = _objectSpread({}, rest);
 
   // showTime默认值受valueType属性影响
-  if (rest.showTime === undefined) {
-    if (valueType === 'dateTime') {
-      _rest.showTime = true;
-    }
+
+  if (restProps.showTime === false) {
+    restProps.showTime = false;
+  } else if (valueType === 'dateTime') {
+    restProps.showTime = true;
+    nextFormat = 'YYYY-MM-DD HH:mm:ss';
   }
 
   // 字符串时间格式兼容
-  if (isString(_rest.value)) {
-    _rest.value = dayjs(_rest.value);
-  }
-  if (_rest.showTime === true) {
-    _rest.showTime = _objectSpread({}, _defaultShowTime);
-  }
-  if (isObject(_rest.showTime)) {
-    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
+  if (isString(restProps.value)) {
+    restProps.value = dayjs(restProps.value);
   }
   return /*#__PURE__*/_jsx(AntDatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
-    format: _format
-  }, _rest), {}, {
-    className: _className
+    format: nextFormat
+  }, omit(restProps, ['otherProps'])), {}, {
+    className: nextClassName
   }));
 };
 export default DatePicker;

package/es/ProForm/components/base/SwitchCheckbox/style/index.less

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

package/es/ProForm/components/base/TextArea/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 div.pro-textarea-view {
   .@{ant-prefix}-input-disabled {

package/es/ProForm/components/base/TimePicker/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 /* 适配antd 5.x，不再导入antd样式 */
 

package/es/ProForm/components/combination/Container/style/index.less

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

package/es/ProForm/components/combination/FormList/style/index.less

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-form-list-block-title {
   height: 14px;

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -3,6 +3,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
 import React from 'react';
+import { omit } from 'lodash';
 import ConfirmWrapper from "../../../../components/render/ConfirmWrapper";
 import { FieldProvider } from "../../../../utils/useFieldProps";
 import * as componentMap from "../../../../../index";
@@ -20,16 +21,16 @@ var wrapperMap = {
 // 增加middleware根据配置增加多层包裹
 var getComRender = function getComRender(component, props, componentProps) {
   var wrappers = Object.keys(wrapperMap);
-  var Com = component;
+  var renderComponent = component;
   wrappers.forEach(function (item) {
     if (item in props) {
       var Wrapper = wrapperMap[item];
-      Com = /*#__PURE__*/_jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
-        children: Com
+      renderComponent = /*#__PURE__*/_jsx(Wrapper, _objectSpread(_objectSpread(_objectSpread({}, componentProps), _defineProperty({}, item, props[item])), {}, {
+        children: renderComponent
       }));
     }
   });
-  return Com;
+  return renderComponent;
 };
 
 /** 渲染组件 */
@@ -53,8 +54,8 @@ var ComRender = function ComRender(props) {
   var mergedGetValueProps = getValueProps || function (val) {
     return _defineProperty({}, valuePropName, val);
   };
-  var _props = mergedGetValueProps(fieldProps.value);
-  var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
+  var nextProps = mergedGetValueProps(fieldProps.value);
+  var componentProps = omit(_objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), nextProps), ['onFieldChange']);
   var isSeparator = (props === null || props === void 0 || (_props$component = props.component) === null || _props$component === void 0 || (_props$component = _props$component.props) === null || _props$component === void 0 ? void 0 : _props$component.className) === 'group-separator';
   if (isSeparator && isView) {
     var _props$component2;
@@ -73,14 +74,14 @@ var ComRender = function ComRender(props) {
     });
   }
   var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : /*#__PURE__*/_jsx(TypeComponent, _objectSpread({}, componentProps));
-  var Com = getComRender(Component, props, componentProps);
+  var renderComponent = getComRender(Component, props, componentProps);
   return /*#__PURE__*/_jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
       valueType: valueType,
       type: type,
       isView: isView
     }),
-    children: Com
+    children: renderComponent
   });
 };
 export default ComRender;

package/es/ProForm/components/combination/Group/hooks/index.js

@@ -36,9 +36,7 @@ export var useTransformColumns = function useTransformColumns(params) {
     var _ref = fieldProps || {},
       mode = _ref.mode,
       onChange = _ref.onChange,
-      onFieldChange = _ref.onFieldChange,
-      comDisabled = _ref.disabled,
-      onBlur = _ref.onBlur;
+      comDisabled = _ref.disabled;
     var _disabled = disabled || comDisabled;
     var columnName = names ? names[index] : [].concat(name, index);
 
@@ -79,6 +77,11 @@ export var useTransformColumns = function useTransformColumns(params) {
         desensitization: desensitization
       });
     }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
+
+    // 从处理后的fieldProps中获取事件处理器
+    var _ref2 = reactiveProps.fieldProps || {},
+      onFieldChange = _ref2.onFieldChange,
+      onBlur = _ref2.onBlur;
     if (reactiveProps.show === false) {
       return [];
     }
@@ -103,7 +106,17 @@ export var useTransformColumns = function useTransformColumns(params) {
         // @ts-ignore
         newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
       }
-      internalChange === null || internalChange === void 0 || internalChange(newValue, args[1], index);
+
+      // 根据模式选择值管理方式
+      if (names) {
+        // 独立字段模式：设置单个字段值 + 触发整体校验
+        form.setFieldValue(columnName, newValue);
+        // 确保触发Group整体的校验
+        internalChange === null || internalChange === void 0 || internalChange(newValue, args[1], index);
+      } else {
+        // 数组值模式
+        internalChange === null || internalChange === void 0 || internalChange(newValue, args[1], index);
+      }
       var values = form.getFieldValue(namePath);
       var originRow = namePath !== null && namePath !== void 0 && namePath.length ? cloneDeep(values) : undefined;
       onChange === null || onChange === void 0 || onChange.apply(void 0, args);

package/es/ProForm/components/combination/Group/index.d.ts

@@ -1,4 +1,10 @@
 import React from 'react';
 import type { GroupType } from './propsType';
-declare const _default: React.NamedExoticComponent<GroupType>;
-export default _default;
+/**
+ * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
+ * 2.
+ *
+ * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
+ */
+declare const Group: React.FC<GroupType>;
+export default Group;

package/es/ProForm/components/combination/Group/index.js

@@ -2,8 +2,8 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { Space } from 'antd';
-import React, { memo } from 'react';
-import { isEqual, omit } from 'lodash';
+import React from 'react';
+import { omit } from 'lodash';
 import classnames from 'classnames';
 import { insertSeparator } from "./utils";
 import { useTransformColumns } from "./hooks";
@@ -39,14 +39,14 @@ var Group = function Group(props) {
     namePath = contextProps.namePath,
     index = contextProps.index,
     isView = contextProps.isView;
-  var _option = React.useRef([]);
+  var nextOption = React.useRef([]);
 
   // 组合onChange
   var handleChange = function handleChange(value, option, index) {
-    var _value = props.value ? _toConsumableArray(props.value) : [];
-    _value[index] = value;
-    _option.current[index] = option;
-    onChange(_value, _option.current);
+    var nextValue = props.value ? _toConsumableArray(props.value) : [];
+    nextValue[index] = value;
+    nextOption.current[index] = option;
+    onChange(nextValue, nextOption.current);
   };
   var columnsProps = useTransformColumns({
     columns: children,
@@ -62,7 +62,7 @@ var Group = function Group(props) {
     desensitizationKey: desensitizationKey
   });
   var columns = insertSeparator(columnsProps, space);
-  var _className = classnames(_defineProperty({
+  var nextClassName = classnames(_defineProperty({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {
       var _item$fieldProps;
@@ -73,7 +73,7 @@ var Group = function Group(props) {
     })
   }, "".concat(className), className));
   return /*#__PURE__*/_jsx("div", {
-    className: _className,
+    className: nextClassName,
     id: id,
     children: space.compact || space !== null && space !== void 0 && space.separator ? /*#__PURE__*/_jsx(Space.Compact, {
       children: columns.map(function (column, index) {
@@ -105,10 +105,4 @@ var Group = function Group(props) {
     }))
   });
 };
-export default /*#__PURE__*/memo(Group, function (prevProps, nextProps) {
-  // 基本props比较 只比较关键的
-  if (!isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.value, nextProps === null || nextProps === void 0 ? void 0 : nextProps.value) || (prevProps === null || prevProps === void 0 ? void 0 : prevProps.disabled) !== (nextProps === null || nextProps === void 0 ? void 0 : nextProps.disabled) || !isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.children, nextProps === null || nextProps === void 0 ? void 0 : nextProps.children)) {
-    return false;
-  }
-  return true;
-});
+export default Group;