@zat-design/sisyphus-react 4.1.2-beta.1 → 4.1.2-beta.10

package/lib/ProForm/components/combination/Group/component/FlexibleGroup.js

@@ -127,16 +127,16 @@ var FlexibleGroupRender = props => {
     var childDisabled = typeof child.disabled === 'function' ? false : child.disabled;
     var finalDisabled = groupDisabled || childDisabled;
 
-    // 构建 formItemProps
+    // 构建 formItemProps - 在非编辑态时移除校验规则
     var formItemProps = {
       name: fullName,
       label: child.label,
-      rules: child.rules,
+      rules: isView ? undefined : child.rules,
       dependencies: processedDependencies,
       extra: child.extra,
       before: child.before,
       after: child.after,
-      required: child.required,
+      required: isView ? undefined : child.required,
       disabled: finalDisabled,
       validateFirst: child.validateFirst
     };
@@ -157,13 +157,40 @@ var FlexibleGroupRender = props => {
       formItemProps.tooltip = child.tooltip;
     }
 
+    // 在ProEditTable场景下，如果同组其他字段有值，则当前字段空值不显示 -
+    var childViewEmpty = otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty;
+    if (isView && (otherProps === null || otherProps === void 0 ? void 0 : otherProps.source) === 'ProEditTable' && form && children.length > 1) {
+      // 检查同组其他字段是否有值
+      var hasOtherValues = children.some(otherChild => {
+        if (otherChild === child) return false; // 跳过当前字段
+
+        var otherChildNamePath = otherChild.namePath || contextProps.namePath;
+        var otherFullName = (() => {
+          if (otherChildNamePath && Array.isArray(otherChild.name) && otherChild.name.length > 1) {
+            return [...otherChildNamePath, ...otherChild.name];
+          }
+          if (otherChildNamePath) {
+            return [...otherChildNamePath, otherChild.name];
+          }
+          return otherChild.name;
+        })();
+        var value = form.getFieldValue(otherFullName);
+        return value !== undefined && value !== null && value !== '';
+      });
+
+      // 如果有其他字段有值，当前字段空值显示为空字符串
+      if (hasOtherValues) {
+        childViewEmpty = '';
+      }
+    }
+
     // 构建 otherProps
     var renderOtherProps = {
       label: child.label,
       name: fullName,
       disabled: finalDisabled,
       isView,
-      viewEmpty: otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty,
+      viewEmpty: childViewEmpty,
       valueType: child.valueType,
       form,
       type,
@@ -277,12 +304,16 @@ var FlexibleGroupRender = props => {
       elements.push(formElement);
 
       // 添加分隔符
-      if (index < visibleChildren.length - 1 && space !== null && space !== void 0 && space.separator) {
+      // 查看模式下，如果没有配置separator，使用默认的 finalSeparator
+      var separatorToUse = isView ? (space === null || space === void 0 ? void 0 : space.separator) || finalSeparator : space === null || space === void 0 ? void 0 : space.separator;
+      if (index < visibleChildren.length - 1 && separatorToUse) {
         var shouldAddSeparator = space.separatorIndex ? Array.isArray(space.separatorIndex) ? space.separatorIndex.includes(originalIndex) : space.separatorIndex === originalIndex : true;
         if (shouldAddSeparator) {
+          // 查看模式下使用不同的className，避免显示边框
+          var separatorClassName = isView ? 'pro-group-separator-compact pro-group-separator-view' : 'pro-group-separator-compact';
           elements.push( /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-            className: "pro-group-separator-compact",
-            children: space.separator
+            className: separatorClassName,
+            children: separatorToUse
           }, child.name ? `separator-${child.name}` : `separator-${originalIndex}`));
         }
       }
@@ -312,6 +343,29 @@ var FlexibleGroupRender = props => {
     return (otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty) || '-';
   }
 
+  // 查看模式下，检查所有children的值是否都为空
+  if (isView && form && children.length > 0) {
+    var allValuesEmpty = children.every(child => {
+      var childNamePath = child.namePath || contextProps.namePath;
+      var fullName = (() => {
+        if (childNamePath && Array.isArray(child.name) && child.name.length > 1) {
+          return [...childNamePath, ...child.name];
+        }
+        if (childNamePath) {
+          return [...childNamePath, child.name];
+        }
+        return child.name;
+      })();
+      var value = form.getFieldValue(fullName);
+      return value === undefined || value === null || value === '';
+    });
+
+    // 如果所有值都为空，显示一个 -
+    if (allValuesEmpty) {
+      return (otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewEmpty) || '-';
+    }
+  }
+
   // 渲染内容
   var renderContent = () => {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/ProForm/components/combination/Group/style/index.less

@@ -4,6 +4,15 @@
   display: flex;
   width: unset !important;
 
+  &.pro-group-view {
+    .pro-group-form-item {
+      flex: 0 0 auto !important;
+   
+    }
+    .@{ant-prefix}-space-compact .pro-group-separator-compact{
+      color: #333 !important;
+    }
+  }
 
 
   &.pro-group-view {
@@ -385,6 +394,13 @@
       // margin: 0 !important;
     }
 
+    // 查看模式下，Form.Item不平分空间，而是根据内容自适应
+    &.pro-group-view {
+      .pro-group-form-item {
+        flex: 0 0 auto;
+      }
+    }
+
     // 当有自定义宽度时，只有设置了宽度的 Form.Item 不使用 flex:1
     &.pro-group-diy-width {
       // 覆盖 Space.Compact 内设置了宽度的 Form.Item
@@ -430,7 +446,7 @@
         }
 
         .@{ant-prefix}-input-number-input {
-          border-left: 1px solid #ff4d4f !important;
+          border-left: 0 !important;
         }
       }
 
@@ -467,6 +483,15 @@
     margin-left: -1px;
   }
 
+  // 查看模式下的分隔符样式 - 移除边框，使用简洁样式
+  .pro-group-separator-view {
+    border: none !important;
+    background: transparent !important;
+    padding: 0 2px !important;
+    margin-inline-start: 0 !important;
+    color: #999 !important;
+  }
+
 
   /* 1. 处理第一个子元素：左上、左下圆角 */
   > .pro-group-form-item:first-child{

package/lib/ProForm/components/combination/ProCascader/propsType.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { DefaultOptionType } from 'rc-select/lib/Select';
+import { DefaultOptionType } from '@rc-component/select/es/Select';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 export interface FieldNamesType {
     label: string;

package/lib/ProForm/propsType.d.ts

@@ -1,9 +1,9 @@
+import React, { ReactNode } from 'react';
 import { ButtonProps, ColProps, RowProps } from 'antd';
 import { FormProps, FormInstance } from 'antd/es/form/Form';
 import { NamePath } from 'antd/es/form/interface';
-import { StoreValue, Store } from 'rc-field-form/es/interface.d';
-import { ShouldUpdate } from 'rc-field-form/es/Field.d';
-import React, { ReactNode } from 'react';
+import type { StoreValue, Store } from '@rc-component/form/es/interface';
+import type { ShouldUpdate } from '@rc-component/form/es/Field';
 import type { ProFormColumnType, ViewType } from './components/render/propsType';
 import type { ProFormComponentType } from './components';
 export interface ButtonType extends ButtonProps {

package/lib/ProForm/utils/transformValue.d.ts

@@ -1,6 +1,6 @@
 import { FormInstance, FormItemProps } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
-import { StoreValue, Store } from 'rc-field-form/es/interface.d';
+import type { StoreValue, Store } from '@rc-component/form/es/interface';
 import type { TransformType } from '../propsType';
 export declare const transformValue: (names: NamePath[], form: FormInstance, fieldName: NamePath, normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue, getValueProps?: FormItemProps['getValueProps']) => TransformType;
 export default transformValue;

package/lib/ProForm/utils/useForm.d.ts

@@ -1,6 +1,6 @@
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
-import { ValuedNotifyInfo } from 'rc-field-form/es/interface';
+import type { ValuedNotifyInfo } from '@rc-component/form/es/interface';
 export type ModifiedFormInstanceType<T> = FormInstance<T> & {
     isModified?: boolean;
     /** 默认清空设置值的报错状态 */

package/lib/ProForm/utils/useWatch.d.ts

@@ -1,4 +1,5 @@
-import { FormInstance, NamePath } from 'rc-field-form/es/interface';
+import { FormInstance } from 'antd/es/form/Form';
+import { NamePath } from 'antd/es/form/interface';
 export declare function toArray<T>(value?: T | T[] | null): T[];
 /**
  * ProForm的useWatch hook，用于监听表单字段变化

package/lib/ProForm/utils/useWatch.js

@@ -120,7 +120,9 @@ function useWatch(dependencies, form, wait) {
       }
     }
     return paths;
-  }, [/* dependencies 故意忽略，与原实现一致 */]);
+  }, [
+    /* dependencies 故意忽略，与原实现一致 */
+  ]);
 
   // 保存防抖函数引用，避免重复创建
   var debouncedFn = (0, _react.useMemo)(() => {

package/lib/ProSelect/index.js

@@ -16,6 +16,7 @@ var _locale = _interopRequireDefault(require("../locale"));
 var _utils = require("./utils");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["dataSource", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "transformResponse", "getValueProps", "getChangeValue", "viewportReady", "isView"];
+/** 将 selectList（扁平或分组）转为扁平选项列表，用于查找、回显、defaultOne */
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -32,10 +33,6 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-var Option = _antd.Select.Option,
-  OptGroup = _antd.Select.OptGroup;
-
-/** 将 selectList（扁平或分组）转为扁平选项列表，用于查找、回显、defaultOne */
 function flattenOptions(list) {
   if (!Array.isArray(list) || !list.length) return [];
   var out = [];
@@ -49,7 +46,7 @@ function flattenOptions(list) {
   return out;
 }
 var ProSelect = (props, ref) => {
-  var _selectProps$showCode, _useRequest$options3, _locale$ProSelect;
+  var _selectProps$showCode, _ProForm$useFieldProp, _useRequest$options3, _locale$ProSelect;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
@@ -84,7 +81,7 @@ var ProSelect = (props, ref) => {
     selectProps = _objectWithoutProperties(props, _excluded);
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = getValueProps && props.value ? getValueProps(props.value) : props.value;
-  var _ref2 = _.ProForm.useFieldProps() || {},
+  var _ref2 = (_.ProForm === null || _.ProForm === void 0 || (_ProForm$useFieldProp = _.ProForm.useFieldProps) === null || _ProForm$useFieldProp === void 0 ? void 0 : _ProForm$useFieldProp.call(_.ProForm)) || {},
     isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
@@ -146,6 +143,10 @@ var ProSelect = (props, ref) => {
       useRequest === null || useRequest === void 0 || (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 || (_useRequest$options$o = _useRequest$options.onSuccess) === null || _useRequest$options$o === void 0 || _useRequest$options$o.call(_useRequest$options, data, useRequest === null || useRequest === void 0 || (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams);
     }
   }));
+  var fetchFunctionRef = (0, _react.useRef)(fetchFunction);
+  (0, _react.useEffect)(() => {
+    fetchFunctionRef.current = fetchFunction;
+  }, [fetchFunction]);
   var cacheList = useRequest !== null && useRequest !== void 0 && (_useRequest$options3 = useRequest.options) !== null && _useRequest$options3 !== void 0 && _useRequest$options3.cacheKey ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
   var flatOptions = flattenOptions(selectList);
   var getValueObject = input => {
@@ -323,16 +324,99 @@ var ProSelect = (props, ref) => {
     return props.children;
   };
   var isReactElement = element => /*#__PURE__*/(0, _react.isValidElement)(element);
+  var getInnerRecord = option => {
+    var _option$data;
+    if (!option) return undefined;
+    if (option.record) return option.record;
+    if ((_option$data = option.data) !== null && _option$data !== void 0 && _option$data.record) return option.data.record;
+    return undefined;
+  };
+  var getOptionText = item => {
+    if (OptionRender) {
+      var _item$label;
+      var rendered = OptionRender(item);
+      return (0, _lodash.isString)(rendered) ? rendered : String((_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : '');
+    }
+    var text = selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label];
+    return (0, _lodash.isString)(text) ? text : String(text !== null && text !== void 0 ? text : '');
+  };
+  var buildOptionItem = (item, index) => {
+    var text = getOptionText(item);
+    return {
+      key: item[code] != null ? `${item[code]}-${index}` : `option-${index}`,
+      label: text,
+      value: item[code] != null ? item[code] : undefined,
+      disabled: !!item.disabled,
+      title: text,
+      searchText: text,
+      record: item
+    };
+  };
+  var selectOptionRender = option => {
+    var _option$data2, _ref5, _ref6, _option$data$searchTe, _option$data3, _option$data4;
+    var currentRecord = (option === null || option === void 0 || (_option$data2 = option.data) === null || _option$data2 === void 0 ? void 0 : _option$data2.record) || (option === null || option === void 0 ? void 0 : option.record);
+    var text = (_ref5 = (_ref6 = (_option$data$searchTe = option === null || option === void 0 || (_option$data3 = option.data) === null || _option$data3 === void 0 ? void 0 : _option$data3.searchText) !== null && _option$data$searchTe !== void 0 ? _option$data$searchTe : option === null || option === void 0 || (_option$data4 = option.data) === null || _option$data4 === void 0 ? void 0 : _option$data4.title) !== null && _ref6 !== void 0 ? _ref6 : option === null || option === void 0 ? void 0 : option.label) !== null && _ref5 !== void 0 ? _ref5 : '';
+    if (!currentRecord) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(TooltipOption, {
+        title: String(text),
+        children: String(text)
+      });
+    }
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(TooltipOption, {
+      title: String(text),
+      children: OptionRender ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: OptionRender(currentRecord)
+      }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: String(text)
+      })
+    });
+  };
+  var defaultFilterOption = (0, _react.useCallback)((input, option) => {
+    var _ref7, _option$searchText;
+    if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
+    var optionLabel = (_ref7 = (_option$searchText = option === null || option === void 0 ? void 0 : option.searchText) !== null && _option$searchText !== void 0 ? _option$searchText : option === null || option === void 0 ? void 0 : option.title) !== null && _ref7 !== void 0 ? _ref7 : option === null || option === void 0 ? void 0 : option.label;
+    return String(optionLabel !== null && optionLabel !== void 0 ? optionLabel : '').toLowerCase().includes(input.toLowerCase());
+  }, []);
+  var mergedShowSearch = (0, _react.useMemo)(() => {
+    var defaultConfig = {
+      enabled: true,
+      filterOption: (0, _lodash.isFunction)(_onSearch) ? false : defaultFilterOption,
+      onSearch: searchValue => {
+        _onSearch === null || _onSearch === void 0 || _onSearch(searchValue, _objectSpread({}, fetchFunctionRef.current));
+      }
+    };
+    var customShowSearch = selectProps.showSearch;
+    if (customShowSearch === false) {
+      return _objectSpread(_objectSpread({}, defaultConfig), {}, {
+        enabled: false
+      });
+    }
+    if (customShowSearch === true || customShowSearch == null) {
+      return defaultConfig;
+    }
+    if ((0, _lodash.isObject)(customShowSearch)) {
+      var _customShowSearch$fil, _customShowSearch$onS;
+      return _objectSpread(_objectSpread(_objectSpread({}, defaultConfig), customShowSearch), {}, {
+        enabled: true,
+        filterOption: (_customShowSearch$fil = customShowSearch.filterOption) !== null && _customShowSearch$fil !== void 0 ? _customShowSearch$fil : defaultConfig.filterOption,
+        onSearch: (_customShowSearch$onS = customShowSearch.onSearch) !== null && _customShowSearch$onS !== void 0 ? _customShowSearch$onS : defaultConfig.onSearch
+      });
+    }
+    return defaultConfig;
+  }, [_onSearch, defaultFilterOption, selectProps.showSearch]);
   var handleChange = (value, _option) => {
     // option/其第一层子节点是react节点且是labelInValue就拿record
     var option = _option;
     if (labelInValue && (isReactElement(_option) || isReactElement(_option === null || _option === void 0 ? void 0 : _option.children))) {
-      option = _option === null || _option === void 0 ? void 0 : _option.record;
+      option = getInnerRecord(_option);
     }
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
         option.forEach(item => {
-          Object.assign(item, item.record);
+          var currentRecord = getInnerRecord(item);
+          if (currentRecord) {
+            Object.assign(item, currentRecord);
+          }
           delete item.record;
           delete item.children;
         });
@@ -345,7 +429,7 @@ var ProSelect = (props, ref) => {
     } else if (!selectProps.mode && labelInValue) {
       onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 || onChange(getChangeValue ? getChangeValue(value) : value, _option === null || _option === void 0 ? void 0 : _option.record);
+      onChange === null || onChange === void 0 || onChange(getChangeValue ? getChangeValue(value) : value, getInnerRecord(_option));
     }
   };
 
@@ -396,71 +480,41 @@ var ProSelect = (props, ref) => {
       mode: selectProps.mode
     });
   }
+  var selectOptions = Array.isArray(newSelectList) ? newSelectList.map((item, index) => {
+    var groupOptions = item.options;
+    if (Array.isArray(groupOptions)) {
+      var _item$label2;
+      return {
+        key: (_item$label2 = item[label]) !== null && _item$label2 !== void 0 ? _item$label2 : `group-${index}`,
+        label: item[label],
+        options: groupOptions.map((opt, optIndex) => buildOptionItem(opt, optIndex))
+      };
+    }
+    return buildOptionItem(item, index);
+  }) : [];
+  var selectSearchProps = {
+    filterOption: mergedShowSearch.filterOption,
+    onSearch: mergedShowSearch.onSearch
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     style: props.style,
     className: "pro-select",
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Select, _objectSpread(_objectSpread({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Select, _objectSpread(_objectSpread(_objectSpread({
       placeholder: _locale.default === null || _locale.default === void 0 || (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
       allowClear: true,
       loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       onChange: handleChange,
-      showSearch: true,
-      filterOption: (0, _lodash.isFunction)(_onSearch) ? false : (input, option) => {
-        var _option$children;
-        if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
-        var value = (0, _lodash.isString)(option === null || option === void 0 ? void 0 : option.children) ? option === null || option === void 0 ? void 0 : option.children : option === null || option === void 0 || (_option$children = option.children) === null || _option$children === void 0 || (_option$children = _option$children.props) === null || _option$children === void 0 ? void 0 : _option$children.title;
-        return value.toLowerCase().includes(input.toLowerCase());
-      },
-      onSearch: value => {
-        _onSearch && _onSearch(value, _objectSpread({}, fetchFunction));
-      },
+      showSearch: mergedShowSearch.enabled
+    }, selectSearchProps), {}, {
       getPopupContainer: trigger => {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, (0, _lodash.omit)(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange', 'getChangeValue', 'viewportReady'])), {}, {
+    }, (0, _lodash.omit)(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange', 'getChangeValue', 'viewportReady', 'showSearch'])), {}, {
       // 如果是多选模式且用户没有自定义maxTagPlaceholder，使用我们的hover版本
       maxTagPlaceholder: selectProps.mode === 'multiple' && !selectProps.maxTagPlaceholder ? maxTagPlaceholder : selectProps.maxTagPlaceholder,
+      optionRender: selectOptionRender,
       value: transformValue(),
-      children: Array.isArray(newSelectList) && newSelectList.map((item, index) => {
-        var itemValue = item[code];
-        var itemKey = itemValue != null ? `${itemValue}-${index}` : `option-${index}`;
-        var optionValue = itemValue != null ? itemValue : undefined;
-        var groupOpts = item.options;
-        if (Array.isArray(groupOpts)) {
-          var _item$label;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(OptGroup, {
-            label: item[label],
-            children: groupOpts.map(opt => /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
-              label: selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label],
-              value: opt[code],
-              record: opt,
-              disabled: !!opt.disabled,
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(TooltipOption, {
-                title: OptionRender ? OptionRender(opt) : selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label],
-                children: OptionRender ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-                  children: OptionRender(opt)
-                }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-                  children: selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label]
-                })
-              })
-            }, opt[code]))
-          }, (_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : `group-${index}`);
-        }
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
-          label: selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label],
-          value: optionValue,
-          record: item,
-          disabled: !!item.disabled,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(TooltipOption, {
-            title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label],
-            children: OptionRender ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-              children: OptionRender(item)
-            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-              children: selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label]
-            })
-          })
-        }, itemKey);
-      })
+      options: selectOptions
     }))
   });
 };

package/lib/ProUpload/propsType.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { UploadFile } from 'antd/es/upload/interface';
-import { UploadRequestOption } from 'rc-upload/lib/interface';
+import type { UploadRequestOption } from '@rc-component/upload/es/interface';
 export type UploadType = 'drag' | 'button' | 'image';
 export interface UploadFileResType {
     /**

package/lib/ProUpload/style/index.less

@@ -84,7 +84,7 @@
             }
 
             .file-name {
-              display: box;
+              display: flex;
               overflow: hidden;
               word-break: break-all;
               line-clamp: 1;
@@ -362,7 +362,7 @@
         position: absolute;
       }
       .file-name {
-        display: box;
+        display: flex;
         padding-left: var(--zaui-space-size-lg, 32px);
         overflow: hidden;
         line-clamp: 1;
@@ -429,7 +429,7 @@
         position: absolute;
       }
       .file-name {
-        display: box;
+        display: flex;
         padding-left: var(--zaui-space-size-sm, 8px);
         overflow: hidden;
         line-clamp: 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.1.2-beta.1",
+  "version": "4.1.2-beta.10",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -44,6 +44,8 @@
     "lint": "npm run lint:js && npm run lint:style && npm run lint:prettier",
     "lint-staged": "lint-staged",
     "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx --ignore-pattern '**/__tests__/**' --ignore-pattern '**/*.test.*' --ignore-pattern '**/*.spec.*'",
+    "code-standards:check": "node ./scripts/code-standards-check.mjs",
+    "git:pull:dev_4": "git pull --tags --no-rebase origin dev_4",
     "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
     "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
     "lint:prettier": "prettier --check \"**/*\" --end-of-line auto",
@@ -62,7 +64,7 @@
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-commit": "npm run lint-staged"
+      "pre-commit": "npm run lint-staged && npm run code-standards:check"
     }
   },
   "lint-staged": {