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

package/lib/ProTable/style/index.less

@@ -257,15 +257,23 @@
     }
   }
 
-  tbody.@{ant-prefix}-table-tbody {
-    tr.@{ant-prefix}-table-row.new-cell {
-      background: var(--zaui-contract-bg-add; #d2fff4) !important;
-      background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
 
-      td.@{ant-prefix}-table-cell {
-        background: var(--zaui-contract-bg-add; #d2fff4) !important;
+  .@{ant-prefix}-table table tbody.@{ant-prefix}-table-tbody,
+  .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal table tbody.@{ant-prefix}-table-tbody {
+    tr.@{ant-prefix}-table-row.new-cell,
+    tr.@{ant-prefix}-table-row.new-cell:hover {
+      background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
+      td.@{ant-prefix}-table-cell{
         background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
         border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+        &.@{ant-prefix}-table-cell-fix-right {
+          background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
+          border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+        }
+        &.@{ant-prefix}-table-cell-fix-left {
+          background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
+          border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+        }
       }
     }
 
@@ -574,3 +582,9 @@
     }
   }
 }
+
+.@{ant-prefix}-table{
+  .original-value-tooltip{
+    position: fixed;
+  }
+}

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 undefined;
+    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 undefined;
+  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/ProTree/components/ProTreeSelect/index.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.ProTreeSelect = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -398,18 +400,35 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     sourceList = _filterData(sourceList);
     return sourceList;
   }
-  var searchTreeEvent = function searchTreeEvent(searchVal) {
-    if (!searchVal) {
-      setState({
-        selectList: (0, _lodash.cloneDeep)(origDataSource || [])
-      });
-      return null;
-    }
-    var result = filterTree((0, _lodash.cloneDeep)(origDataSource || []), searchVal);
-    setState({
-      selectList: result || []
-    });
-  };
+  var searchTreeEvent = (0, _lodash.debounce)(/*#__PURE__*/function () {
+    var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(searchVal) {
+      var result;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (searchVal) {
+              _context.next = 3;
+              break;
+            }
+            setState({
+              selectList: (0, _lodash.cloneDeep)(origDataSource || [])
+            });
+            return _context.abrupt("return", null);
+          case 3:
+            result = filterTree((0, _lodash.cloneDeep)(origDataSource || []), searchVal);
+            setState({
+              selectList: result || []
+            });
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref5.apply(this, arguments);
+    };
+  }(), 500);
   function findTreeNode(treeList, nodeValue) {
     var result = {};
     var _filterData2 = function filterData(data) {

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",
+  "version": "3.9.1-beta.10",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -59,7 +59,7 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "1.1.35",
+    "@zat-design/utils": "1.1.36",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",