@zat-design/sisyphus-react 3.4.6-beta.13 → 3.4.6-beta.14

package/dist/index.esm.css

@@ -2792,6 +2792,11 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
 }
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > span {
+  border-radius: 4px;
+  padding: 5px 8px;
+  background: var(--zaui-contract-bg, #fffaa1);
+}
 .pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-select-selector,
 .pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
 .pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
@@ -4146,6 +4151,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   -webkit-box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
           box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
 }
+.pro-edit-table td[rowspan] {
+  vertical-align: middle !important;
+}
 .pro-edit-table .pro-edit-table-tooltip {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -4212,7 +4220,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: -ms-flexbox;
   display: flex;
 }
-.pro-edit-table .drag-wrapper .drag-icon {
+.pro-edit-table .drag-wrapper .anticon {
   margin-right: var(--zaui-space-size-md, 16px);
   margin-left: var(--zaui-space-size-xs, 4px);
   cursor: pointer;

package/dist/less.esm.css

@@ -2792,6 +2792,11 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
 }
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > span {
+  border-radius: 4px;
+  padding: 5px 8px;
+  background: var(--zaui-contract-bg, #fffaa1);
+}
 .pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-select-selector,
 .pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
 .pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
@@ -4146,6 +4151,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   -webkit-box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
           box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
 }
+.pro-edit-table td[rowspan] {
+  vertical-align: middle !important;
+}
 .pro-edit-table .pro-edit-table-tooltip {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -4212,7 +4220,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   display: -ms-flexbox;
   display: flex;
 }
-.pro-edit-table .drag-wrapper .drag-icon {
+.pro-edit-table .drag-wrapper .anticon {
   margin-right: var(--zaui-space-size-md, 16px);
   margin-left: var(--zaui-space-size-xs, 4px);
   cursor: pointer;

package/es/ProEditTable/style/index.less

@@ -2,6 +2,9 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-edit-table {
+  td[rowspan]{
+    vertical-align: middle !important;
+  }
   .pro-edit-table-tooltip {
     display    : inline-flex;
     align-items: center;
@@ -62,7 +65,7 @@
 
   .drag-wrapper {
     display: flex;
-    .drag-icon {
+    .anticon {
       margin-right: var(--zaui-space-size-md, 16px);
       margin-left: var(--zaui-space-size-xs, 4px);
       cursor: pointer;

package/es/ProForm/components/base/TextArea/index.d.ts

@@ -5,6 +5,7 @@ import './index.less';
 export interface Props extends TextAreaProps {
     otherProps?: ProFormOtherProps;
     isView?: boolean;
+    tooltip?: boolean;
 }
 declare const TextAreaDef: React.FC<Props>;
 export default TextAreaDef;

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

@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
-var _excluded = ["placeholder", "otherProps", "className"];
+var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { omit } from 'lodash';
 import classnames from 'classnames';
@@ -17,6 +17,8 @@ var TextAreaDef = function TextAreaDef(props) {
   var placeholder = props.placeholder,
     otherProps = props.otherProps,
     className = props.className,
+    _props$tooltip = props.tooltip,
+    tooltip = _props$tooltip === void 0 ? true : _props$tooltip,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref = ProForm.useFieldProps() || {},
     label = _ref.label,
@@ -27,7 +29,7 @@ var TextAreaDef = function TextAreaDef(props) {
   if (isView) {
     return _jsx(Container, {
       nowrap: false,
-      tooltip: true,
+      tooltip: tooltip,
       viewEmpty: viewEmpty,
       children: rest.value
     });

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

@@ -17,7 +17,6 @@ import ComRender from './component/ComRender';
  * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
  */
 var GroupCopy = function GroupCopy(props) {
-  console.log('🚀 ~~> props:', props);
   var children = props.children,
     className = props.className,
     _props$space = props.space,

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

@@ -295,58 +295,64 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleFinish = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _data, flag, res;
+      var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) {
+            if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
               _context2.next = 4;
               break;
             }
             _message.error(locale.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
-            _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
+            nextSelectedRows = selectedRows;
+            if (!((_nextSelectedRows = nextSelectedRows) === null || _nextSelectedRows === void 0 ? void 0 : _nextSelectedRows[0])) {
+              nextSelectedRows = data.filter(function (item) {
+                return selectedRowKeys.includes(item[valueKey]);
+              });
+            }
+            record = isMultiple ? nextSelectedRows : (_nextSelectedRows2 = nextSelectedRows) === null || _nextSelectedRows2 === void 0 ? void 0 : _nextSelectedRows2[0];
             if (!isMultiple) {
               // @ts-ignore
-              _data.value = _data[valueKey];
+              record.value = record[valueKey];
               // @ts-ignore
-              _data.label = _data[labelKey];
+              record.label = record[labelKey];
             }
             flag = true;
             if (!onOk) {
-              _context2.next = 12;
+              _context2.next = 14;
               break;
             }
-            _context2.next = 10;
-            return onOk(_data);
-          case 10:
+            _context2.next = 12;
+            return onOk(record);
+          case 12:
             res = _context2.sent;
             if (res !== null && res !== undefined) {
               // @ts-ignore
               flag = res;
             }
-          case 12:
+          case 14:
             if (flag) {
-              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
+              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
               // 更新内部展示值
               setState({
-                _value: _data,
-                options: isArray(_data) ? _data : [_data]
+                _value: record,
+                options: isArray(record) ? record : [record]
               });
               handleClose();
             }
             return _context2.abrupt("return", flag);
-          case 16:
-            _context2.prev = 16;
+          case 18:
+            _context2.prev = 18;
             _context2.t0 = _context2["catch"](0);
             console.warn('error', _context2.t0);
-          case 19:
+          case 21:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 16]]);
+      }, _callee2, null, [[0, 18]]);
     }));
     return function handleFinish() {
       return _ref7.apply(this, arguments);
@@ -427,7 +433,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data2, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -458,15 +464,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
-              if (_data2) {
+              _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
+              if (_data) {
                 nextSelectRowKeys = isMultiple ? value : [value];
                 if (labelInValue) {
-                  onChange(_data2);
+                  onChange(_data);
                 }
                 // 更新内部展示值
                 setState({
-                  _value: _data2,
+                  _value: _data,
                   isInit: false,
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
@@ -493,7 +499,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data3, _data3, nextSelectRowKeys;
+      var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -517,18 +523,18 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
+              _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
               if (labelInValue) {
-                onChange(_data3);
+                onChange(_data2);
               } else {
-                onChange(isMultiple ? _data3.map(function (item) {
+                onChange(isMultiple ? _data2.map(function (item) {
                   return item[valueKey];
-                }) : _data3[valueKey]);
+                }) : _data2[valueKey]);
               }
               // 更新内部展示值
               setState({
-                _value: _data3,
+                _value: _data2,
                 isInit: false,
                 selectedRows: list,
                 selectedRowKeys: nextSelectRowKeys
@@ -597,8 +603,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
+        console.log('value', value);
         nextState.selectedRowKeys = [value];
-        nextState.selectedRows = [_defineProperty({}, valueKey, value[valueKey])];
       }
       setState(nextState);
     }

package/es/ProForm/style/index.less

@@ -140,6 +140,13 @@
 
       // 地址组件
       .@{ant-prefix}-form-item-control-input-content {
+        // 查看模式
+        & > span {
+          border-radius: 4px;
+          padding: 5px 8px;
+          background: @zaui-contract-bg;
+        }
+
         & > .pro-address {
           .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-affix-wrapper,

package/es/ProForm/utils/diffOriginal.js

@@ -40,7 +40,8 @@ export var diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !isEqual(value, originalValue);
+    var res = !isEqual(value, originalValue);
+    return res;
   }
   return false;
 };

package/es/ProForm/utils/useListChanged.js

@@ -1,6 +1,6 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import { get } from 'lodash';
+import { get, isString } from 'lodash';
 import { diffOriginal } from './diffOriginal';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
@@ -87,7 +87,7 @@ export var useListChanged = function useListChanged(params) {
     originalValue: originalValue,
     form: form,
     equalWith: equalWith,
-    name: namesStr || name
+    name: isString(namesStr) ? namesStr : originalName || name
   });
   return [changed, originalValue];
 };

package/es/ProStep/index.js

@@ -103,19 +103,17 @@ var ProStep = function ProStep(_ref) {
           case 10:
             values[id] = _context.sent;
           case 11:
-            _context.next = 17;
+            _context.next = 18;
             break;
           case 13:
             _context.prev = 13;
             _context.t0 = _context["catch"](1);
             num = _context.t0 === null || _context.t0 === void 0 ? void 0 : (_errors$errorFields = _context.t0.errorFields) === null || _errors$errorFields === void 0 ? void 0 : _errors$errorFields.length;
-            if (num) {
-              setLocalData(false);
-              console.error(_context.t0);
-            }
-          case 17:
-            setErrorCollection(_defineProperty({}, id, num));
+            setLocalData(false);
+            console.error(_context.t0);
           case 18:
+            setErrorCollection(_defineProperty({}, id, num));
+          case 19:
           case "end":
             return _context.stop();
         }

package/es/global.less

@@ -9,30 +9,48 @@ pre {
   scrollbar-face-color: #d2d3d7;
   scrollbar-highlight-color: #979797;
   scrollbar-3dlight-color: #979797;
-}
 
-::-webkit-scrollbar  {
-  width: 16px;
-}
+  ::-webkit-scrollbar  {
+    width: 16px;
+    background: transparent;
+  }
 
-// // 滑块
-::-webkit-scrollbar-thumb {
-  background-color: #d2d3d7;
-  background-clip: padding-box;
-  border-color: transparent;
-  border-style: dashed;
-  border-width: 4px;
-  border-radius: 10px;
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
-}
+  // 轨道
+  ::-webkit-scrollbar-track {
+    background-color: #fff;
+    border-radius: 10px;
+  }
 
-// 轨道
-::-webkit-scrollbar-track {
-  background-color: transparent;
-  border-radius: 10px;
-}
+  // 悬浮轨道
+  ::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+  }
+
+  :hover::-webkit-scrollbar-track {
+    background: transparent;
+  }
+
+  :hover::-webkit-scrollbar-thumb {
+    background-color: #d2d3d7;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+  }
+
+  :hover::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+  }
 
-// 悬浮轨道
-::-webkit-scrollbar-thumb:hover {
-  background-color: #979797;
+  :hover::-webkit-scrollbar-track {
+    background-color: #fff;
+  }
 }

package/es/locale/zh_CN.js

@@ -89,7 +89,7 @@ export default {
     edit: '编辑',
     copy: '复制',
     delete: '删除',
-    mulDelete: '删除',
+    mulDelete: '批量删除',
     save: '保存',
     custom: '自定义',
     operation: '操作',

package/lib/ProEditTable/style/index.less

@@ -2,6 +2,9 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-edit-table {
+  td[rowspan]{
+    vertical-align: middle !important;
+  }
   .pro-edit-table-tooltip {
     display    : inline-flex;
     align-items: center;
@@ -62,7 +65,7 @@
 
   .drag-wrapper {
     display: flex;
-    .drag-icon {
+    .anticon {
       margin-right: var(--zaui-space-size-md, 16px);
       margin-left: var(--zaui-space-size-xs, 4px);
       cursor: pointer;

package/lib/ProForm/components/base/TextArea/index.d.ts

@@ -5,6 +5,7 @@ import './index.less';
 export interface Props extends TextAreaProps {
     otherProps?: ProFormOtherProps;
     isView?: boolean;
+    tooltip?: boolean;
 }
 declare const TextAreaDef: React.FC<Props>;
 export default TextAreaDef;

package/lib/ProForm/components/base/TextArea/index.js

@@ -17,12 +17,14 @@ var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
 require("./index.less");
-var _excluded = ["placeholder", "otherProps", "className"];
+var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
 var TextArea = _antd.Input.TextArea;
 var TextAreaDef = function TextAreaDef(props) {
   var placeholder = props.placeholder,
     otherProps = props.otherProps,
     className = props.className,
+    _props$tooltip = props.tooltip,
+    tooltip = _props$tooltip === void 0 ? true : _props$tooltip,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = _ProForm.default.useFieldProps() || {},
     label = _ref.label,
@@ -33,7 +35,7 @@ var TextAreaDef = function TextAreaDef(props) {
   if (isView) {
     return (0, _jsxRuntime.jsx)(_Container.default, {
       nowrap: false,
-      tooltip: true,
+      tooltip: tooltip,
       viewEmpty: viewEmpty,
       children: rest.value
     });

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

@@ -24,7 +24,6 @@ var _ComRender = _interopRequireDefault(require("./component/ComRender"));
  * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
  */
 var GroupCopy = function GroupCopy(props) {
-  console.log('🚀 ~~> props:', props);
   var children = props.children,
     className = props.className,
     _props$space = props.space,

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

@@ -292,58 +292,64 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleFinish = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
-      var _data, flag, res;
+      var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) {
+            if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
               _context2.next = 4;
               break;
             }
             _antd.message.error(_locale.default.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
-            _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
+            nextSelectedRows = selectedRows;
+            if (!((_nextSelectedRows = nextSelectedRows) === null || _nextSelectedRows === void 0 ? void 0 : _nextSelectedRows[0])) {
+              nextSelectedRows = data.filter(function (item) {
+                return selectedRowKeys.includes(item[valueKey]);
+              });
+            }
+            record = isMultiple ? nextSelectedRows : (_nextSelectedRows2 = nextSelectedRows) === null || _nextSelectedRows2 === void 0 ? void 0 : _nextSelectedRows2[0];
             if (!isMultiple) {
               // @ts-ignore
-              _data.value = _data[valueKey];
+              record.value = record[valueKey];
               // @ts-ignore
-              _data.label = _data[labelKey];
+              record.label = record[labelKey];
             }
             flag = true;
             if (!onOk) {
-              _context2.next = 12;
+              _context2.next = 14;
               break;
             }
-            _context2.next = 10;
-            return onOk(_data);
-          case 10:
+            _context2.next = 12;
+            return onOk(record);
+          case 12:
             res = _context2.sent;
             if (res !== null && res !== undefined) {
               // @ts-ignore
               flag = res;
             }
-          case 12:
+          case 14:
             if (flag) {
-              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
+              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
               // 更新内部展示值
               setState({
-                _value: _data,
-                options: (0, _lodash.isArray)(_data) ? _data : [_data]
+                _value: record,
+                options: (0, _lodash.isArray)(record) ? record : [record]
               });
               handleClose();
             }
             return _context2.abrupt("return", flag);
-          case 16:
-            _context2.prev = 16;
+          case 18:
+            _context2.prev = 18;
             _context2.t0 = _context2["catch"](0);
             console.warn('error', _context2.t0);
-          case 19:
+          case 21:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 16]]);
+      }, _callee2, null, [[0, 18]]);
     }));
     return function handleFinish() {
       return _ref7.apply(this, arguments);
@@ -424,7 +430,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data2, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -455,15 +461,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
-              if (_data2) {
+              _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
+              if (_data) {
                 nextSelectRowKeys = isMultiple ? value : [value];
                 if (labelInValue) {
-                  onChange(_data2);
+                  onChange(_data);
                 }
                 // 更新内部展示值
                 setState({
-                  _value: _data2,
+                  _value: _data,
                   isInit: false,
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
@@ -490,7 +496,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data3, _data3, nextSelectRowKeys;
+      var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -514,18 +520,18 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
+              _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
               if (labelInValue) {
-                onChange(_data3);
+                onChange(_data2);
               } else {
-                onChange(isMultiple ? _data3.map(function (item) {
+                onChange(isMultiple ? _data2.map(function (item) {
                   return item[valueKey];
-                }) : _data3[valueKey]);
+                }) : _data2[valueKey]);
               }
               // 更新内部展示值
               setState({
-                _value: _data3,
+                _value: _data2,
                 isInit: false,
                 selectedRows: list,
                 selectedRowKeys: nextSelectRowKeys
@@ -594,8 +600,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
+        console.log('value', value);
         nextState.selectedRowKeys = [value];
-        nextState.selectedRows = [(0, _defineProperty2.default)({}, valueKey, value[valueKey])];
       }
       setState(nextState);
     }

package/lib/ProForm/style/index.less

@@ -140,6 +140,13 @@
 
       // 地址组件
       .@{ant-prefix}-form-item-control-input-content {
+        // 查看模式
+        & > span {
+          border-radius: 4px;
+          padding: 5px 8px;
+          background: @zaui-contract-bg;
+        }
+
         & > .pro-address {
           .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-affix-wrapper,

package/lib/ProForm/utils/diffOriginal.js

@@ -47,7 +47,8 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !(0, _lodash.isEqual)(value, originalValue);
+    var res = !(0, _lodash.isEqual)(value, originalValue);
+    return res;
   }
   return false;
 };

package/lib/ProForm/utils/useListChanged.js

@@ -92,7 +92,7 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
     originalValue: originalValue,
     form: form,
     equalWith: equalWith,
-    name: namesStr || name
+    name: (0, _lodash.isString)(namesStr) ? namesStr : originalName || name
   });
   return [changed, originalValue];
 };

package/lib/ProStep/index.js

@@ -110,19 +110,17 @@ var ProStep = function ProStep(_ref) {
           case 10:
             values[id] = _context.sent;
           case 11:
-            _context.next = 17;
+            _context.next = 18;
             break;
           case 13:
             _context.prev = 13;
             _context.t0 = _context["catch"](1);
             num = _context.t0 === null || _context.t0 === void 0 ? void 0 : (_errors$errorFields = _context.t0.errorFields) === null || _errors$errorFields === void 0 ? void 0 : _errors$errorFields.length;
-            if (num) {
-              setLocalData(false);
-              console.error(_context.t0);
-            }
-          case 17:
-            setErrorCollection((0, _defineProperty2.default)({}, id, num));
+            setLocalData(false);
+            console.error(_context.t0);
           case 18:
+            setErrorCollection((0, _defineProperty2.default)({}, id, num));
+          case 19:
           case "end":
             return _context.stop();
         }

package/lib/global.less

@@ -9,30 +9,48 @@ pre {
   scrollbar-face-color: #d2d3d7;
   scrollbar-highlight-color: #979797;
   scrollbar-3dlight-color: #979797;
-}
 
-::-webkit-scrollbar  {
-  width: 16px;
-}
+  ::-webkit-scrollbar  {
+    width: 16px;
+    background: transparent;
+  }
 
-// // 滑块
-::-webkit-scrollbar-thumb {
-  background-color: #d2d3d7;
-  background-clip: padding-box;
-  border-color: transparent;
-  border-style: dashed;
-  border-width: 4px;
-  border-radius: 10px;
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
-}
+  // 轨道
+  ::-webkit-scrollbar-track {
+    background-color: #fff;
+    border-radius: 10px;
+  }
 
-// 轨道
-::-webkit-scrollbar-track {
-  background-color: transparent;
-  border-radius: 10px;
-}
+  // 悬浮轨道
+  ::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+  }
+
+  :hover::-webkit-scrollbar-track {
+    background: transparent;
+  }
+
+  :hover::-webkit-scrollbar-thumb {
+    background-color: #d2d3d7;
+    background-clip: padding-box;
+    border-color: transparent;
+    border-style: dashed;
+    border-width: 4px;
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+  }
+
+  :hover::-webkit-scrollbar-thumb:hover {
+    background-color: #979797;
+  }
 
-// 悬浮轨道
-::-webkit-scrollbar-thumb:hover {
-  background-color: #979797;
+  :hover::-webkit-scrollbar-track {
+    background-color: #fff;
+  }
 }

package/lib/locale/zh_CN.js

@@ -95,7 +95,7 @@ var _default = exports.default = {
     edit: '编辑',
     copy: '复制',
     delete: '删除',
-    mulDelete: '删除',
+    mulDelete: '批量删除',
     save: '保存',
     custom: '自定义',
     operation: '操作',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.6-beta.13",
+  "version": "3.4.6-beta.14",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",