@zat-design/sisyphus-react 3.8.0-beat.1 → 3.8.0-beat.11

package/lib/ProForm/components/combination/ProNumberRange/index.js

@@ -90,8 +90,7 @@ var ProNumberRange = function ProNumberRange(props) {
   };
   var cls = (0, _classnames.default)({
     'pro-number-range': true,
-    'pro-number-range-after': addonAfter,
-    'pro-number-range-before': addonBefore,
+    'pro-number-range-disabled': disabled,
     className: className
   });
   // 查看模式
@@ -180,50 +179,51 @@ var ProNumberRange = function ProNumberRange(props) {
     }
     return result;
   };
-  return (0, _jsxRuntime.jsxs)(_antd.Input.Group, {
-    compact: true,
+  return (0, _jsxRuntime.jsx)(_antd.Space, {
     className: cls,
-    children: [(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      id: id,
-      className: "range-left",
-      value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
-      placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
-      precision: precision,
-      disabled: getDisabled(disabled, 0),
-      onChange: function onChange(e) {
-        firstHandleChange(e);
-      },
-      addonBefore: addonBefore
-    }, valueProps), {}, {
-      style: addonAfter ? {
-        width: "calc(50% - ".concat(16 + addonAfterDomWidth / 2, "px)")
-      } : null,
-      min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
-      max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
-    }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), (0, _jsxRuntime.jsx)(_antd.Input, {
-      className: (0, _classnames.default)({
-        'range-split': true,
-        'range-split-disabled': !!disabled
-      }),
-      placeholder: "~",
-      disabled: true
-    }), (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      className: "range-right",
-      value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
-      placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
-      precision: precision,
-      disabled: getDisabled(disabled, 1),
-      onChange: function onChange(e) {
-        lastHandleChange(e);
-      },
-      addonAfter: addonAfter
-    }, valueProps), {}, {
-      style: addonAfter ? {
-        width: "calc(50% - ".concat(16 - addonAfterDomWidth / 2, "px)")
-      } : null,
-      min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
-      max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
-    }, childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
+    children: (0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
+      children: [(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        id: id,
+        className: "range-left",
+        value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
+        placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
+        precision: precision,
+        disabled: getDisabled(disabled, 0),
+        onChange: function onChange(e) {
+          firstHandleChange(e);
+        }
+      }, valueProps), {}, {
+        min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
+        max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? (0, _jsxRuntime.jsx)(_antd.Button, {
+        disabled: true,
+        className: "range-addon-before",
+        children: addonBefore
+      }) : null, (0, _jsxRuntime.jsx)(_antd.Input, {
+        className: (0, _classnames.default)({
+          'range-split': true,
+          'range-split-disabled': !!disabled
+        }),
+        placeholder: "~",
+        disabled: true
+      }), (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        className: "range-right",
+        value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
+        placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
+        precision: precision,
+        disabled: getDisabled(disabled, 1),
+        onChange: function onChange(e) {
+          lastHandleChange(e);
+        }
+      }, valueProps), {}, {
+        min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
+        max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? (0, _jsxRuntime.jsx)(_antd.Button, {
+        disabled: true,
+        className: "range-addon-after",
+        children: addonAfter
+      }) : null]
+    })
   });
 };
 var _default = exports.default = ProNumberRange;

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

@@ -6,87 +6,82 @@
     width: 32px !important;
     text-align: center !important;
 
-    border-right: 0px;
-    border-left: 0px;
     pointer-events: none;
     &.@{ant-prefix}-input[disabled] {
       background: #fff !important;
     }
   }
+  // 数字输入框error状态
   .@{ant-prefix}-input-number-status-error:not(.@{ant-prefix}-input-number-disabled):not(
       .@{ant-prefix}-input-number-borderless
     ).@{ant-prefix}-input-number {
     border-color: @zaui-danger !important;
   }
-  .@{ant-prefix}-input-status-error {
-    &.range-split {
-      color: @zaui-danger !important;
+
+  // 分隔符输入框error状态
+  &:has(.@{ant-prefix}-input-status-error):not(.pro-number-range-disabled) {
+    .range-split,
+    .range-addon-before,
+    .range-addon-after {
+      // color: @zaui-danger !important;
       border-color: @zaui-danger;
     }
   }
 
-  & .@{ant-prefix}-input-rtl.range-right {
-    border-right-width: 0;
-  }
-
-  & .@{ant-prefix}-input-rtl.range-right:hover,
-  & .@{ant-prefix}-input-rtl.range-right:focus {
-    border-right-width: 1px;
-  }
-
   .@{ant-prefix}-form-item {
     margin-bottom: 0;
   }
 
-  .range-left,
-  .range-right {
-    width: calc(50% - 16px);
-    text-align: center;
-    transition: none;
-    .range-left {
-      width: calc(100% + 2px) !important;
-    }
-  }
+  // .range-left,
+  // .range-right {
+  //   text-align: center;
+  // }
 
-  .range-left {
-    .@{ant-prefix}-input-number {
-      border-right: none;
-    }
-  }
+  // .range-left {
+  //   .@{ant-prefix}-input-number {
+  //     border-right: none;
+  //   }
+  // }
 
-  .range-right {
-    .@{ant-prefix}-input-number {
-      border-left: none;
-    }
+  // .range-right {
+  //   .@{ant-prefix}-input-number {
+  //     border-left: none;
+  //   }
 
-    .range-right {
-      width: 100%;
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
-  }
+  //   .range-right {
+  //     width: 100%;
+  //     border-top-left-radius: 0;
+  //     border-bottom-left-radius: 0;
+  //   }
+  // }
 
-  &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
-    margin-right: 0;
+  .range-addon-before,
+  .range-addon-after {
+    color: var(--zaui-disabled-text);
+    pointer-events: none;
   }
 
-  > *:first-child {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
+  // &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
+  //   margin-right: 0;
+  // }
 
-    > .@{ant-prefix}-select-selector {
-      border-top-right-radius: 0 !important;
-      border-bottom-right-radius: 0 !important;
-    }
-  }
+  // > *:first-child {
+  //   border-top-right-radius: 0 !important;
+  //   border-bottom-right-radius: 0 !important;
 
-  > *:last-child {
-    border-top-left-radius: 0 !important;
-    border-bottom-left-radius: 0 !important;
+  //   > .@{ant-prefix}-select-selector {
+  //     border-top-right-radius: 0 !important;
+  //     border-bottom-right-radius: 0 !important;
+  //   }
+  // }
 
-    > .@{ant-prefix}-select-selector {
-      border-top-left-radius: 0 !important;
-      border-bottom-left-radius: 0 !important;
-    }
-  }
+  // > *:last-child {
+  //   border-top-left-radius: 0 !important;
+  //   border-bottom-left-radius: 0 !important;
+
+  //   > .@{ant-prefix}-select-selector {
+  //     border-top-left-radius: 0 !important;
+  //     border-bottom-left-radius: 0 !important;
+  //   }
+  // }
 }

package/lib/ProForm/components/old/ProAddress/index.js

@@ -93,7 +93,7 @@ function ProAddress(_ref3) {
     secondCitys = _useState6[0],
     setSecondCitys = _useState6[1];
   var queryCity = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(code, type) {
+    var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(code, type) {
       var cityList, _cityList, newList, _secondCitys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

package/lib/ProForm/components/render/ChangedWrapper.js

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize"];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
@@ -30,6 +30,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     diffConfig = props.diffConfig,
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
+    normalize = props.normalize,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -44,9 +45,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
+    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
     return (0, _diffOriginal.diffOriginal)({
       originalValue: originalValue,
-      value: props[valuePropName],
+      value: _value,
       form: form,
       equalWith: equalWith
       // name: namesStr || name,

package/lib/ProForm/components/render/ConfirmWrapper.js

@@ -28,7 +28,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var _ProForm$useFieldProp = _index.default.useFieldProps(),
     form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value) {
+    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value) {
       var _len,
         other,
         _key,

package/lib/ProForm/components/render/Render.js

@@ -240,7 +240,7 @@ var Render = function Render(props) {
       _args = functionArgs([].concat(args));
     }
     var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
-    if ( /*#__PURE__*/_react.default.isValidElement(AutoComponent)) {
+    if (/*#__PURE__*/_react.default.isValidElement(AutoComponent)) {
       var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args))));
       return false;
@@ -290,7 +290,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _len3,
         args,
         _key3,
@@ -373,7 +373,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? ( /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
+    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? (/*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
       otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,
@@ -437,6 +437,7 @@ var Render = function Render(props) {
         type: type,
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
+        normalize: _otherFormItemProps.normalize,
         children: child
       });
     }

package/lib/ProForm/index.js

@@ -201,7 +201,7 @@ var ProForm = function ProForm(props, ref) {
     if (isView || disabled) {
       // 查看或禁用模式
       footerEle = null;
-    } else if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
+    } else if (/*#__PURE__*/_react.default.isValidElement(footer)) {
       // 传入组件渲染组件
       footerEle = footer;
     } else if (footer === undefined || footer || (0, _lodash.isObject)(footer)) {

package/lib/ProForm/utils/useForm.js

@@ -44,7 +44,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
+    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
       var _rest$,
         _len,
         rest,

package/lib/ProStep/components/Listener/index.js

@@ -21,7 +21,7 @@ var _default = exports.default = function _default(_ref) {
   var _useStep = (0, _index.useStep)(),
     notify = _useStep.notify;
   return /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-    onClick: (0, _lodash.throttle)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    onClick: (0, _lodash.throttle)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

package/lib/ProStep/index.js

@@ -89,7 +89,7 @@ var ProStep = function ProStep(_ref) {
       return null;
     }
     var subEvent = /*#__PURE__*/function () {
-      var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+      var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
         var value, _form$validateFields, _error$errorFields;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -135,7 +135,7 @@ var ProStep = function ProStep(_ref) {
     registerMap.current[id] = record;
   };
   var notify = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
+    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
       var _ref7, excludes, triggerIds, events, res, nextErrorCollection;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -174,7 +174,7 @@ var ProStep = function ProStep(_ref) {
     };
   }();
   var triggerTo = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(keys) {
+    var _ref9 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(keys) {
       var events, result, nextErrorCollection;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {

package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -81,7 +81,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     onDragStartGuard = _ref2.onDragStartGuard,
     onDragEndGuard = _ref2.onDragEndGuard;
   var onDragStart = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref3) {
+    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref3) {
       var active, _transformedValue, activeObject;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -112,7 +112,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     };
   }();
   var onDragEnd = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
+    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
       var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {

package/lib/ProTable/hooks/useAntdTable.js

@@ -283,7 +283,7 @@ function useAntdTable(service, options, useRequestOptions) {
     }
   };
   var handleRefresh = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -395,7 +395,7 @@ function useAntdTable(service, options, useRequestOptions) {
         total: total
       }),
       onSelect: function () {
-        var _onSelect = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(changeableRowKeys) {
+        var _onSelect = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(changeableRowKeys) {
           return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -419,7 +419,7 @@ function useAntdTable(service, options, useRequestOptions) {
       key: 'uncheckAll',
       text: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable4 = _locale.default.ProTable) === null || _locale$ProTable4 === void 0 ? void 0 : _locale$ProTable4.deselect,
       onSelect: function () {
-        var _onSelect2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+        var _onSelect2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
           return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:

package/lib/ProTable/index.js

@@ -223,7 +223,7 @@ function ProTable(props) {
     });
   }, [columns]);
   var handleColumnConfig = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(checkList) {
+    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -332,7 +332,7 @@ function ProTable(props) {
     return _rowSelection;
   };
   var onDataSourceChange = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(nextDataSource) {
+    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(nextDataSource) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:

package/lib/ProTree/components/ProTree.js

@@ -359,7 +359,7 @@ var ProTree = function ProTree(props) {
   };
   /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
   var onSelectTreeNode = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(props, info) {
+    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(props, info) {
       var _options$;
       var values, options, option;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -79,7 +79,9 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     showEllipse = _props$showEllipse === void 0 ? true : _props$showEllipse;
   var _ref2 = otherProps !== null && otherProps !== void 0 ? otherProps : {},
     isDiffChange = _ref2.isDiffChange;
+  console.log('tag1', showEllipse, otherProps, isDiffChange);
   var _showEllipse = showEllipse && !isDiffChange;
+  console.log('tag2', _showEllipse);
   var _ref3 = otherProps || {},
     isView = _ref3.isView,
     viewEmpty = _ref3.viewEmpty;
@@ -297,6 +299,16 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     var labelText = node[label];
     var value = node[code];
     var key = node[uuidKey];
+    // 三无走默认
+    if (['undefined-undefined', 'undefined'].includes(labelText) && !value && !key) {
+      if (showCodeName) {
+        labelText = "".concat(node === null || node === void 0 ? void 0 : node.value, "-").concat(node === null || node === void 0 ? void 0 : node.label);
+      } else {
+        labelText = node === null || node === void 0 ? void 0 : node.label;
+      }
+      value = node === null || node === void 0 ? void 0 : node.value;
+      key = node === null || node === void 0 ? void 0 : node.value;
+    }
     var titleHtml = (0, _jsxRuntime.jsx)("span", {
       dangerouslySetInnerHTML: {
         __html: labelText
@@ -319,6 +331,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       }) : null]
     });
     if (_showEllipse) {
+      console.log('tag3', '走自身气泡了');
       title = (0, _jsxRuntime.jsx)(_AdaptiveTooltip.default, {
         children: treeCheckable ? titleHtml : (0, _jsxRuntime.jsxs)("span", {
           className: "check-option-text",

package/lib/ProTree/components/Tree.js

@@ -115,7 +115,7 @@ function List(props) {
     }
   }, [selectedKey]);
   var onSelect = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value, item) {
+    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value, item) {
       var _props$onSelect;
       var val;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {

package/lib/ProUpload/components/ImageRender.js

@@ -166,7 +166,7 @@ var ImageRender = function ImageRender(props) {
                   disabled: isView || disabled,
                   className: "action-item",
                   onClick: function () {
-                    var _onClick = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+                    var _onClick = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
                       var res;
                       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
                         while (1) switch (_context.prev = _context.next) {

package/lib/ProViewer/index.js

@@ -112,8 +112,8 @@ var ProViewer = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   (0, _react.useEffect)(function () {
     if (previewFile) {
       try {
-        previewFile().then( /*#__PURE__*/function () {
-          var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(response) {
+        previewFile().then(/*#__PURE__*/function () {
+          var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(response) {
             var res, blob, blobUrl;
             return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {

package/lib/old/ProEditableTable/index.js

@@ -166,7 +166,7 @@ var ProEditableTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
    * @returns {Promise<{nextList: IRowDataPropsType[], list: IRowDataPropsType[], rowData: IRowDataPropsType, rowIndex: number}>}
    */
   var onMultipleDelete = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var res, values, nextList, resetFieldsIndex;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -272,7 +272,7 @@ var ProEditableTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
    * @returns {Promise<{nextList: IRowDataPropsType[], list: IRowDataPropsType[], rowData: IRowDataPropsType, rowIndex: number}>}
    */
   var onSave = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(rowIndex, callback) {
+    var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(rowIndex, callback) {
       var _form$getFieldsValue$, _form$getFieldsValue, nextValues, res, values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -398,12 +398,12 @@ var ProEditableTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
           }, antButtonProps), {}, {
             children: buttonText
           }))]
-        }) : ( /*#__PURE__*/(0, _react.cloneElement)(buttonText, antButtonProps))
+        }) : (/*#__PURE__*/(0, _react.cloneElement)(buttonText, antButtonProps))
       }) : null
     });
   };
   var validateFields = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
       var values, nextValues, nextList, isEditing;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.8.0-beat.1",
+  "version": "3.8.0-beat.11",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -84,7 +84,6 @@
     "@types/classnames": "^2.3.1",
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.171",
-    "@types/mockjs": "^1.0.6",
     "@types/react": "^17.0.53",
     "@types/react-dom": "^17.0.0",
     "@types/react-resizable": "^1.7.4",
@@ -96,7 +95,7 @@
     "@zat-design/login-react": "1.0.25",
     "babel-eslint": "10.0.3",
     "babel-plugin-import": "^1.13.3",
-    "commander": "<=9.2.0",
+    "commander": "9.2.0",
     "cross-env": "^7.0.3",
     "dumi": "^1.0.9",
     "eslint": "7.10.0",
@@ -113,7 +112,7 @@
     "husky": "^4.0.7",
     "jest-canvas-mock": "^2.5.2",
     "lint-staged": "^10.0.0",
-    "mockjs": "^1.1.0",
+    "mockjs": "^1.0.0",
     "prettier": "^2.5.0",
     "pretty-quick": "^3.1.3",
     "react-json-view": "^1.21.3",

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "kisstkondoros.vscode-codemetrics"
-    ]
-}