@zat-design/sisyphus-react 3.9.7 → 3.9.8

package/dist/index.esm.css

@@ -917,7 +917,7 @@
 }
 .pro-header .pro-header-describe .ant-space .pro-header-describe-value .pro-header-describe-items.pro-header-describe-items-more .pro-header-tag {
   padding: 0;
-  background: transparent;
+  background: transparent !important;
   color: #333;
 }
 .pro-header .pro-header-copy {
@@ -1854,6 +1854,12 @@
 .pro-table .ant-table-content > table td .pro-form-view-container_nowrap {
   white-space: normal;
 }
+.pro-table .ant-table-content > table td.ant-table-row-expand-icon-cell > button.ant-table-row-expand-icon {
+  left: 50%;
+  top: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+}
 .pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not( .ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-right .pro-edit-table-title::before {
   position: static;
   top: 0;

package/dist/less.esm.css

@@ -917,7 +917,7 @@
 }
 .pro-header .pro-header-describe .ant-space .pro-header-describe-value .pro-header-describe-items.pro-header-describe-items-more .pro-header-tag {
   padding: 0;
-  background: transparent;
+  background: transparent !important;
   color: #333;
 }
 .pro-header .pro-header-copy {
@@ -1854,6 +1854,12 @@
 .pro-table .ant-table-content > table td .pro-form-view-container_nowrap {
   white-space: normal;
 }
+.pro-table .ant-table-content > table td.ant-table-row-expand-icon-cell > button.ant-table-row-expand-icon {
+  left: 50%;
+  top: 50%;
+  -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+}
 .pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not( .ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-right .pro-edit-table-title::before {
   position: static;
   top: 0;

package/es/ProEditTable/utils/config.js

@@ -236,15 +236,14 @@ export var actions = {
       virtualKey: virtualKey,
       selectedRowKeys: selectedRowKeys
     });
+    var nextData = {
+      selectedRowKeys: [],
+      selectedRows: []
+    };
     // 删除的选择数据包含单行编辑行时，清空可编辑key
     if (virtualKey && selectedRowKeys.includes(editingKeys === null || editingKeys === void 0 ? void 0 : editingKeys[0])) {
-      setState({
-        editingKeys: []
-      });
+      nextData.editingKeys = [];
     }
-    setState({
-      selectedRowKeys: [],
-      selectedRows: []
-    });
+    setState(nextData);
   }
 };

package/es/ProLayout/components/ProHeader/style/index.less

@@ -81,7 +81,7 @@
           &.pro-header-describe-items-more{
             .pro-header-tag{
               padding: 0;
-              background: transparent;
+              background: transparent !important;
               color: #333 ;
             }
 

package/es/ProStep/index.js

@@ -1,12 +1,12 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { createContext, useContext, useMemo, useRef, useState } from 'react';
+import { createContext, useCallback, useContext, useMemo, useRef, useState } from 'react';
+import { debounce } from 'lodash';
 import { useSetState, useLocalStorageState, useDeepCompareEffect } from 'ahooks';
 import { handleScroll } from './utils';
 import Step from './components/Step';
@@ -20,10 +20,9 @@ export var useStep = function useStep() {
 var ProStep = function ProStep(_ref) {
   var children = _ref.children,
     resetProps = _objectWithoutProperties(_ref, _excluded);
-  var _useState = useState([]),
+  var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
-    ids = _useState2[0],
-    setIds = _useState2[1];
+    reRender = _useState2[1];
   var _useSetState = useSetState({}),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     errorCollection = _useSetState2[0],
@@ -33,6 +32,7 @@ var ProStep = function ProStep(_ref) {
   var _useLocalStorageState = useLocalStorageState('cache-pro-step'),
     _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 2),
     setLocalData = _useLocalStorageState2[1];
+  var ids = Object.keys(registerMap.current);
   var targetOffset = resetProps.targetOffset,
     _resetProps$collapse = resetProps.collapse,
     collapse = _resetProps$collapse === void 0 ? false : _resetProps$collapse,
@@ -61,6 +61,9 @@ var ProStep = function ProStep(_ref) {
       return pre.order - next.order;
     });
   }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, ids]);
+  var debounceReRender = useCallback(debounce(function () {
+    return reRender({});
+  }, 500), []);
   // 用来注册form匹配到对应的模块id
   var register = function register(_ref4) {
     var id = _ref4.id,
@@ -72,10 +75,8 @@ var ProStep = function ProStep(_ref) {
     var record = {};
     record.title = title;
     record.order = order;
-    if (!ids.includes(id)) {
-      setIds(function (preState) {
-        return [].concat(_toConsumableArray(preState), [id]);
-      });
+    if (!registerMap.current[id]) {
+      debounceReRender();
     }
     if (disabled) {
       registerMap.current[id] = record;

package/es/ProTable/components/FormatColumn/index.js

@@ -139,8 +139,29 @@ export var formatColumn = function formatColumn(_ref2) {
           index: index
         });
         // viewRender 返回值为 false 时，不显示对比
-        if (isBoolean(diffResult) && !diffResult) {
-          otherProps.isChanged = false;
+        if (isBoolean(diffResult)) {
+          if (!diffResult) {
+            otherProps.isChanged = false;
+            _isAddCell = false;
+          } else {
+            otherProps.isChanged = true;
+            _isAddCell = false;
+          }
+        }
+        // 指定返回相同了
+        if (typeof diffResult === 'string') {
+          if (diffResult === 'changed') {
+            _isAddCell = false;
+            otherProps.isChanged = true;
+          }
+          if (diffResult === 'same') {
+            _isAddCell = false;
+            otherProps.isChanged = false;
+          }
+          if (diffResult === 'add') {
+            _isAddCell = true;
+            otherProps.isChanged = false;
+          }
         }
         originalValue = diffResult;
       }
@@ -155,9 +176,11 @@ export var formatColumn = function formatColumn(_ref2) {
           index: index
         });
         if (_diffResult === 'changed') {
+          _isAddCell = false;
           otherProps.isChanged = true;
         }
         if (_diffResult === 'same') {
+          _isAddCell = false;
           otherProps.isChanged = false;
         }
         if (_diffResult === 'add') {
@@ -317,6 +340,11 @@ export var formatColumn = function formatColumn(_ref2) {
       if (!originalValue) {
         originalRenderValue = '-';
       }
+      if (renderValue !== originalRenderValue) {
+        otherProps.isChanged = true;
+      } else {
+        otherProps.isChanged = false;
+      }
       var node = _jsxs(_Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]

package/es/ProTable/index.js

@@ -250,6 +250,9 @@ var ProTable = function ProTable(props) {
   if (isExistPercentWidth) {
     _scroll = props === null || props === void 0 ? void 0 : props.scroll;
   }
+  if (props.expandable) {
+    _scroll = {};
+  }
   var handleColumnConfig = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;

package/es/ProTable/style/index.less

@@ -40,6 +40,13 @@
         .pro-form-view-container_nowrap {
           white-space: normal;
         }
+        &.@{ant-prefix}-table-row-expand-icon-cell {
+          >button.@{ant-prefix}-table-row-expand-icon{
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%, -50%);
+          }
+        }
       }
 
       .@{ant-prefix}-table-thead

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

@@ -569,8 +569,8 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     children: _jsx(_TreeSelect, _objectSpread(_objectSpread({
       maxTagPlaceholder: function maxTagPlaceholder(rest) {
         var _rest = rest.map(function (tag) {
-          var _tag$label, _tag$label$props, _tag$label$props$dang;
-          return (tag === null || tag === void 0 ? void 0 : (_tag$label = tag.label) === null || _tag$label === void 0 ? void 0 : (_tag$label$props = _tag$label.props) === null || _tag$label$props === void 0 ? void 0 : (_tag$label$props$dang = _tag$label$props.dangerouslySetInnerHTML) === null || _tag$label$props$dang === void 0 ? void 0 : _tag$label$props$dang.__html) || tag.label;
+          var _tag$label, _tag$label$props, _tag$label2, _tag$label2$props, _tag$label2$props$chi, _tag$label2$props$chi2, _tag$label2$props$chi3, _tag$label3, _tag$label3$props, _tag$label3$props$dan;
+          return ((tag === null || tag === void 0 ? void 0 : (_tag$label = tag.label) === null || _tag$label === void 0 ? void 0 : (_tag$label$props = _tag$label.props) === null || _tag$label$props === void 0 ? void 0 : _tag$label$props.children) ? tag === null || tag === void 0 ? void 0 : (_tag$label2 = tag.label) === null || _tag$label2 === void 0 ? void 0 : (_tag$label2$props = _tag$label2.props) === null || _tag$label2$props === void 0 ? void 0 : (_tag$label2$props$chi = _tag$label2$props.children) === null || _tag$label2$props$chi === void 0 ? void 0 : (_tag$label2$props$chi2 = _tag$label2$props$chi.props) === null || _tag$label2$props$chi2 === void 0 ? void 0 : (_tag$label2$props$chi3 = _tag$label2$props$chi2.dangerouslySetInnerHTML) === null || _tag$label2$props$chi3 === void 0 ? void 0 : _tag$label2$props$chi3.__html : tag === null || tag === void 0 ? void 0 : (_tag$label3 = tag.label) === null || _tag$label3 === void 0 ? void 0 : (_tag$label3$props = _tag$label3.props) === null || _tag$label3$props === void 0 ? void 0 : (_tag$label3$props$dan = _tag$label3$props.dangerouslySetInnerHTML) === null || _tag$label3$props$dan === void 0 ? void 0 : _tag$label3$props$dan.__html) || tag.label;
         });
         var _str = _rest.join('、');
         return _jsx(_Tooltip, {

package/lib/ProEditTable/utils/config.js

@@ -242,15 +242,14 @@ var actions = exports.actions = {
       virtualKey: virtualKey,
       selectedRowKeys: selectedRowKeys
     });
+    var nextData = {
+      selectedRowKeys: [],
+      selectedRows: []
+    };
     // 删除的选择数据包含单行编辑行时，清空可编辑key
     if (virtualKey && selectedRowKeys.includes(editingKeys === null || editingKeys === void 0 ? void 0 : editingKeys[0])) {
-      setState({
-        editingKeys: []
-      });
+      nextData.editingKeys = [];
     }
-    setState({
-      selectedRowKeys: [],
-      selectedRows: []
-    });
+    setState(nextData);
   }
 };

package/lib/ProLayout/components/ProHeader/style/index.less

@@ -81,7 +81,7 @@
           &.pro-header-describe-items-more{
             .pro-header-tag{
               padding: 0;
-              background: transparent;
+              background: transparent !important;
               color: #333 ;
             }
 

package/lib/ProStep/index.js

@@ -8,11 +8,11 @@ exports.useStep = exports.default = exports.ProStepContext = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _lodash = require("lodash");
 var _ahooks = require("ahooks");
 var _utils = require("./utils");
 var _Step = _interopRequireDefault(require("./components/Step"));
@@ -27,10 +27,9 @@ var useStep = exports.useStep = function useStep() {
 var ProStep = function ProStep(_ref) {
   var children = _ref.children,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    ids = _useState2[0],
-    setIds = _useState2[1];
+    reRender = _useState2[1];
   var _useSetState = (0, _ahooks.useSetState)({}),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     errorCollection = _useSetState2[0],
@@ -40,6 +39,7 @@ var ProStep = function ProStep(_ref) {
   var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('cache-pro-step'),
     _useLocalStorageState2 = (0, _slicedToArray2.default)(_useLocalStorageState, 2),
     setLocalData = _useLocalStorageState2[1];
+  var ids = Object.keys(registerMap.current);
   var targetOffset = resetProps.targetOffset,
     _resetProps$collapse = resetProps.collapse,
     collapse = _resetProps$collapse === void 0 ? false : _resetProps$collapse,
@@ -68,6 +68,9 @@ var ProStep = function ProStep(_ref) {
       return pre.order - next.order;
     });
   }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, ids]);
+  var debounceReRender = (0, _react.useCallback)((0, _lodash.debounce)(function () {
+    return reRender({});
+  }, 500), []);
   // 用来注册form匹配到对应的模块id
   var register = function register(_ref4) {
     var id = _ref4.id,
@@ -79,10 +82,8 @@ var ProStep = function ProStep(_ref) {
     var record = {};
     record.title = title;
     record.order = order;
-    if (!ids.includes(id)) {
-      setIds(function (preState) {
-        return [].concat((0, _toConsumableArray2.default)(preState), [id]);
-      });
+    if (!registerMap.current[id]) {
+      debounceReRender();
     }
     if (disabled) {
       registerMap.current[id] = record;

package/lib/ProTable/components/FormatColumn/index.js

@@ -145,8 +145,29 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           index: index
         });
         // viewRender 返回值为 false 时，不显示对比
-        if ((0, _lodash.isBoolean)(diffResult) && !diffResult) {
-          otherProps.isChanged = false;
+        if ((0, _lodash.isBoolean)(diffResult)) {
+          if (!diffResult) {
+            otherProps.isChanged = false;
+            _isAddCell = false;
+          } else {
+            otherProps.isChanged = true;
+            _isAddCell = false;
+          }
+        }
+        // 指定返回相同了
+        if (typeof diffResult === 'string') {
+          if (diffResult === 'changed') {
+            _isAddCell = false;
+            otherProps.isChanged = true;
+          }
+          if (diffResult === 'same') {
+            _isAddCell = false;
+            otherProps.isChanged = false;
+          }
+          if (diffResult === 'add') {
+            _isAddCell = true;
+            otherProps.isChanged = false;
+          }
         }
         originalValue = diffResult;
       }
@@ -161,9 +182,11 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           index: index
         });
         if (_diffResult === 'changed') {
+          _isAddCell = false;
           otherProps.isChanged = true;
         }
         if (_diffResult === 'same') {
+          _isAddCell = false;
           otherProps.isChanged = false;
         }
         if (_diffResult === 'add') {
@@ -323,6 +346,11 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       if (!originalValue) {
         originalRenderValue = '-';
       }
+      if (renderValue !== originalRenderValue) {
+        otherProps.isChanged = true;
+      } else {
+        otherProps.isChanged = false;
+      }
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]

package/lib/ProTable/index.js

@@ -257,6 +257,9 @@ var ProTable = function ProTable(props) {
   if (isExistPercentWidth) {
     _scroll = props === null || props === void 0 ? void 0 : props.scroll;
   }
+  if (props.expandable) {
+    _scroll = {};
+  }
   var handleColumnConfig = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;

package/lib/ProTable/style/index.less

@@ -40,6 +40,13 @@
         .pro-form-view-container_nowrap {
           white-space: normal;
         }
+        &.@{ant-prefix}-table-row-expand-icon-cell {
+          >button.@{ant-prefix}-table-row-expand-icon{
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%, -50%);
+          }
+        }
       }
 
       .@{ant-prefix}-table-thead

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

@@ -569,8 +569,8 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     children: (0, _jsxRuntime.jsx)(_antd.TreeSelect, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       maxTagPlaceholder: function maxTagPlaceholder(rest) {
         var _rest = rest.map(function (tag) {
-          var _tag$label, _tag$label$props, _tag$label$props$dang;
-          return (tag === null || tag === void 0 ? void 0 : (_tag$label = tag.label) === null || _tag$label === void 0 ? void 0 : (_tag$label$props = _tag$label.props) === null || _tag$label$props === void 0 ? void 0 : (_tag$label$props$dang = _tag$label$props.dangerouslySetInnerHTML) === null || _tag$label$props$dang === void 0 ? void 0 : _tag$label$props$dang.__html) || tag.label;
+          var _tag$label, _tag$label$props, _tag$label2, _tag$label2$props, _tag$label2$props$chi, _tag$label2$props$chi2, _tag$label2$props$chi3, _tag$label3, _tag$label3$props, _tag$label3$props$dan;
+          return ((tag === null || tag === void 0 ? void 0 : (_tag$label = tag.label) === null || _tag$label === void 0 ? void 0 : (_tag$label$props = _tag$label.props) === null || _tag$label$props === void 0 ? void 0 : _tag$label$props.children) ? tag === null || tag === void 0 ? void 0 : (_tag$label2 = tag.label) === null || _tag$label2 === void 0 ? void 0 : (_tag$label2$props = _tag$label2.props) === null || _tag$label2$props === void 0 ? void 0 : (_tag$label2$props$chi = _tag$label2$props.children) === null || _tag$label2$props$chi === void 0 ? void 0 : (_tag$label2$props$chi2 = _tag$label2$props$chi.props) === null || _tag$label2$props$chi2 === void 0 ? void 0 : (_tag$label2$props$chi3 = _tag$label2$props$chi2.dangerouslySetInnerHTML) === null || _tag$label2$props$chi3 === void 0 ? void 0 : _tag$label2$props$chi3.__html : tag === null || tag === void 0 ? void 0 : (_tag$label3 = tag.label) === null || _tag$label3 === void 0 ? void 0 : (_tag$label3$props = _tag$label3.props) === null || _tag$label3$props === void 0 ? void 0 : (_tag$label3$props$dan = _tag$label3$props.dangerouslySetInnerHTML) === null || _tag$label3$props$dan === void 0 ? void 0 : _tag$label3$props$dan.__html) || tag.label;
         });
         var _str = _rest.join('、');
         return (0, _jsxRuntime.jsx)(_antd.Tooltip, {

package/package.json

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

package/.vscode/extensions.json

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