@zat-design/sisyphus-react 3.9.0-beta.9 → 3.9.1-beta.1

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

@@ -10,6 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _ahooks = require("ahooks");
+var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _icons = require("@ant-design/icons");
 var _reactSvg = require("react-svg");
@@ -27,7 +28,6 @@ var RenderColumn = function RenderColumn(props) {
     ellipsis = props.ellipsis,
     width = props.width,
     originalValue = props.originalValue,
-    originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
     minWidth = props.minWidth,
@@ -39,11 +39,12 @@ var RenderColumn = function RenderColumn(props) {
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
   var cellDiffCls = (0, _classnames.default)({
-    'varied-cell': originalDiffTip
+    'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged
   });
-  if (!(0, _utils.isEmpty)(originalValue) && !isInNewRowFlag) {
+  // 比对场景走的逻辑
+  if (!isInNewRowFlag && (0, _lodash.isBoolean)(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
-    if (ellipsis || originalDiffTip) {
+    if (ellipsis || (props === null || props === void 0 ? void 0 : props.isChanged)) {
       renderNode = (0, _jsxRuntime.jsx)(Text, {
         style: {
           width: currentValue === '-' ? 32.5 : width,
@@ -54,29 +55,35 @@ var RenderColumn = function RenderColumn(props) {
         },
         children: ellipsis ? currentValue : renderNode
       });
-      if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+      if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
         return renderNode;
       }
       if (Array.isArray(originalValue)) {
         console.error('Error: When enabled, dataIndex corresponds to an array, which needs to be converted using viewRender');
       }
+      var originalValueCalc = function originalValueCalc() {
+        if (Array.isArray(originalValue)) {
+          return null;
+        }
+        return !(0, _utils.isEmpty)(originalValue) ? originalValue : '-';
+      };
       return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: cellDiffCls,
         style: {
           width: width,
           minWidth: minWidth
         },
-        overlayClassName: "original-value-tootip",
+        overlayClassName: "original-value-tooltip",
         placement: "topLeft",
         autoAdjustOverflow: false,
         title: (0, _jsxRuntime.jsx)(_antd.Space, {
           direction: "vertical",
           className: "changed-tooltip",
-          children: originalDiffTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: (props === null || props === void 0 ? void 0 : props.isChanged) ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
             children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
               align: "start",
               className: "original-value-container",
-              children: ["\u521D\u59CB\u503C\uFF1A", !Array.isArray(originalValue) ? originalValue : null]
+              children: ["\u521D\u59CB\u503C\uFF1A", originalValueCalc()]
             }), (0, _jsxRuntime.jsx)(_antd.Space, {
               className: "current-value-container",
               children: ellipsis ? (0, _jsxRuntime.jsxs)(_antd.Space, {
@@ -92,7 +99,7 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
-    if ((props === null || props === void 0 ? void 0 : props.diffChange) === false) {
+    if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
       return renderNode;
     }
     return (0, _jsxRuntime.jsx)("span", {
@@ -145,15 +152,12 @@ var RenderColumn = function RenderColumn(props) {
       range.setStart(box, 0);
       range.setEnd(box, box.childNodes.length);
       var rangeWidth = range.getBoundingClientRect().width;
-      var rangeHeight = range.getBoundingClientRect().height;
-      var contentWidth = rangeWidth - Math.floor(rangeWidth);
       var _getPadding = getPadding(box),
         pLeft = _getPadding.pLeft,
         pRight = _getPadding.pRight,
         pTop = _getPadding.pTop,
         pBottom = _getPadding.pBottom;
       var horizontalPadding = pLeft + pRight;
-      var verticalPadding = pTop + pBottom;
       if (rangeWidth + horizontalPadding > box.clientWidth) {
         return true;
       }

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

@@ -12,7 +12,6 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _reactResizable = require("react-resizable");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _index = require("../../index");
 var _FormatColumn = require("../FormatColumn");
 var _excluded = ["onDrag", "width", "minwidth"];
 var ResizableTitle = function ResizableTitle(props) {
@@ -22,9 +21,6 @@ var ResizableTitle = function ResizableTitle(props) {
     _props$minwidth = props.minwidth,
     minwidth = _props$minwidth === void 0 ? 50 : _props$minwidth,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _useContext = (0, _react.useContext)(_index.TableContext),
-    tableConfig = _useContext.tableConfig,
-    Storage = _useContext.Storage;
   // 添加偏移量
   var _useState = (0, _react.useState)(0),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),

package/lib/ProTable/index.js

@@ -221,7 +221,6 @@ var ProTable = function ProTable(props) {
         originalObj: originalObj,
         rowKey: props.rowKey,
         diffConfig: diffConfig,
-        diffToolTip: toolTip,
         wrapToolTipProps: wrapToolTipProps,
         scroll: _scroll,
         onUpdateMinWidth: function onUpdateMinWidth(w) {

package/lib/ProTable/propsType.d.ts

@@ -31,7 +31,6 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         value: string | number;
     }[];
     copyable?: boolean;
-    originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     tooltip?: ReactNode | {
@@ -46,7 +45,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         originValue: any;
     }) => boolean;
     viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
-    diffChange?: boolean;
+    isChanged?: boolean | null;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/lib/ProTable/utils/index.d.ts

@@ -11,9 +11,12 @@ export declare const getDecimalDigits: (num?: number) => number;
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
-export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => any;
+export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => {
+    originalValue: any;
+    isChanged: boolean;
+};
 export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 判断数据是否为Response<List<any>>结构

package/lib/ProTable/utils/index.js

@@ -22,18 +22,27 @@ var getDecimalDigits = exports.getDecimalDigits = function getDecimalDigits() {
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
 var getOriginalValue = exports.getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
   if (!originalObj) {
-    return null;
+    return {
+      originalValue: null,
+      isChanged: null
+    };
   }
   var originalRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
   var originalValue = (0, _lodash.get)(originalRecord, dataIndex);
   if (!(0, _lodash.isEqual)(originalValue, value)) {
-    return originalValue;
+    return {
+      originalValue: originalValue,
+      isChanged: true
+    };
   }
-  return null;
+  return {
+    originalValue: null,
+    isChanged: false
+  };
 };
 var getColumnDataIndex = exports.getColumnDataIndex = function getColumnDataIndex(dataIndex) {
   return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');

package/lib/style/theme/antd.less

@@ -280,8 +280,10 @@
     table {
       .@{ant-prefix}-table-tbody {
         .@{ant-prefix}-table-row:nth-child(even) {
-          &:hover td {
-            background-color: @zaui-table-hover-bg;
+          &:hover td,
+          &:hover td.@{ant-prefix}-table-cell-fix-right,
+          &:hover td.@{ant-prefix}-table-cell-fix-left {
+            background-color: @zaui-table-hover-bg !important;
           }
 
           & td,

package/lib/utils/index.d.ts

@@ -1,3 +1,3 @@
 /** 判断一个值是否是空值 */
-export declare const isEmpty: (value: any) => boolean;
+export declare const isEmpty: (value: any, emptyValue?: string) => boolean;
 export declare const useFocus: (element: Element) => boolean;

package/lib/utils/index.js

@@ -9,7 +9,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var EMPTY_VALUE = [undefined, null, ''];
 /** 判断一个值是否是空值 */
-var isEmpty = exports.isEmpty = function isEmpty(value) {
+var isEmpty = exports.isEmpty = function isEmpty(value, emptyValue) {
+  if (emptyValue) {
+    EMPTY_VALUE.push(emptyValue);
+  }
   if (EMPTY_VALUE.includes(value)) {
     return true;
   }

package/package.json

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

package/.vscode/extensions.json

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