@zat-design/sisyphus-react 3.9.4 → 3.9.5-beta.1

package/lib/ProForm/style/index.less

@@ -341,6 +341,10 @@
       background: @zaui-contract-bg !important;
     }
 
+    .ant-picker-clear {
+      background: @zaui-contract-bg;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
@@ -419,6 +423,10 @@
       background: @zaui-contract-bg-add !important;
     }
 
+    .ant-picker-clear {
+      background: @zaui-contract-bg-add;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,

package/lib/ProForm/utils/diffOriginal.js

@@ -42,14 +42,17 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     return 'add';
   }
   if (Array.isArray(_originalValue)) {
-    var isSame = _originalValue.every(function (valueItem, index) {
-      // 如果两个值有一个不是空值, 则进行深比较
-      if (!(0, _utils.isEmpty)(value === null || value === void 0 ? void 0 : value[index]) || !(0, _utils.isEmpty)(valueItem)) {
-        return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
-      }
-      return true;
-    });
-    return isSame ? 'same' : 'changed';
+    if ((_originalValue === null || _originalValue === void 0 ? void 0 : _originalValue.length) === (_value === null || _value === void 0 ? void 0 : _value.length)) {
+      var isSame = _originalValue.every(function (valueItem, index) {
+        // 如果两个值有一个不是空值, 则进行深比较
+        if (!(0, _utils.isEmpty)(value === null || value === void 0 ? void 0 : value[index]) || !(0, _utils.isEmpty)(valueItem)) {
+          return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
+        }
+        return true;
+      });
+      return isSame ? 'same' : 'changed';
+    }
+    return 'changed';
   }
   if (!(0, _utils.isEmpty)(_originalValue) || !(0, _utils.isEmpty)(_value)) {
     return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';

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

@@ -145,7 +145,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           index: index
         });
         // viewRender 返回值为 false 时，不显示对比
-        if ((0, _lodash.isBoolean)(diffResult)) {
+        if ((0, _lodash.isBoolean)(diffResult) && !diffResult) {
           otherProps.isChanged = false;
         }
         originalValue = diffResult;

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

@@ -113,7 +113,7 @@ var DndWrapper = function DndWrapper(_ref2) {
   }();
   var onDragEnd = /*#__PURE__*/function () {
     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;
+      var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -121,7 +121,7 @@ var DndWrapper = function DndWrapper(_ref2) {
             // 为数据源划分层级及parentId
             transformedValue = (0, _index.addLevelAndParentId)(value, rowKey); // 同一level层级的且parentId相同的，可以互相之间拖拽替换
             if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
-              _context2.next = 15;
+              _context2.next = 20;
               break;
             }
             activeObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
@@ -131,47 +131,51 @@ var DndWrapper = function DndWrapper(_ref2) {
               return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
             });
             if (!(activeObject && overObject)) {
-              _context2.next = 15;
+              _context2.next = 20;
               break;
             }
             activeLevel = activeObject.level, activeParentId = activeObject.parentId;
-            overLevel = overObject.level, overParentId = overObject.parentId; // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
+            overLevel = overObject.level, overParentId = overObject.parentId;
+            nextDataSource = value;
+            if (!(activeLevel === overLevel && activeParentId === overParentId)) {
+              _context2.next = 20;
+              break;
+            }
+            // 将树平铺
+            _flatTree = (0, _index.transformTreeToArray)(transformedValue).map(function (item) {
+              return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+                children: undefined
+              });
+            });
+            activeIndex = _flatTree.findIndex(function (i) {
+              return i.rowKey === active.id;
+            });
+            overIndex = _flatTree.findIndex(function (i) {
+              return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+            });
+            nextValue = (0, _sortable.arrayMove)(_flatTree, activeIndex, overIndex);
+            nextDataSource = (0, _index.createTreeFromArray)(nextValue, {
+              itemKey: 'rowKey',
+              parentKey: 'parentId',
+              childrenKey: 'children'
+            });
+            // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
             if (!(onDragEndGuard && (0, _lodash.isFunction)(onDragEndGuard))) {
-              _context2.next = 14;
+              _context2.next = 19;
               break;
             }
-            _context2.next = 11;
+            _context2.next = 18;
             return onDragEndGuard({
               activeObject: activeObject,
               overObject: overObject,
-              currentDataSource: value
+              originDataSource: value,
+              currentDataSource: nextDataSource
             });
-          case 11:
+          case 18:
             nextDataSource = _context2.sent;
-            onChange(nextDataSource !== null && nextDataSource !== void 0 ? nextDataSource : []);
-            return _context2.abrupt("return");
-          case 14:
-            if (activeLevel === overLevel && activeParentId === overParentId) {
-              // 将树平铺
-              _flatTree = (0, _index.transformTreeToArray)(transformedValue).map(function (item) {
-                return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-                  children: undefined
-                });
-              });
-              activeIndex = _flatTree.findIndex(function (i) {
-                return i.rowKey === active.id;
-              });
-              overIndex = _flatTree.findIndex(function (i) {
-                return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
-              });
-              nextValue = (0, _sortable.arrayMove)(_flatTree, activeIndex, overIndex);
-              onChange((0, _index.createTreeFromArray)(nextValue, {
-                itemKey: 'rowKey',
-                parentKey: 'parentId',
-                childrenKey: 'children'
-              }));
-            }
-          case 15:
+          case 19:
+            onChange((_nextDataSource = nextDataSource) !== null && _nextDataSource !== void 0 ? _nextDataSource : []);
+          case 20:
           case "end":
             return _context2.stop();
         }

package/lib/ProTable/index.js

@@ -194,6 +194,26 @@ var ProTable = function ProTable(props) {
       return 'new-cell';
     }
   };
+  var _formatColumns = function formatColumns(nextColumns) {
+    nextColumns === null || nextColumns === void 0 ? void 0 : nextColumns.forEach(function (item, index) {
+      (0, _FormatColumn.formatColumn)({
+        column: item,
+        originalObj: originalObj,
+        rowKey: props.rowKey,
+        diffConfig: diffConfig,
+        wrapToolTipProps: wrapToolTipProps,
+        scroll: _scroll,
+        onUpdateMinWidth: function onUpdateMinWidth(w) {
+          curColumns[index].minWidth = w;
+        },
+        isInNewRow: _rowClassName
+      });
+      if (item.children && Array.isArray(item.children)) {
+        _formatColumns(item.children);
+      }
+    });
+    return nextColumns;
+  };
   var columns = (0, _react.useMemo)(function () {
     var newColumns = curColumns.map(function (item, index) {
       var _propsColumnObj$getCo2;
@@ -215,21 +235,8 @@ var ProTable = function ProTable(props) {
     }).filter(function (item) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
-    newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item, index) {
-      (0, _FormatColumn.formatColumn)({
-        column: item,
-        originalObj: originalObj,
-        rowKey: props.rowKey,
-        diffConfig: diffConfig,
-        wrapToolTipProps: wrapToolTipProps,
-        scroll: _scroll,
-        onUpdateMinWidth: function onUpdateMinWidth(w) {
-          curColumns[index].minWidth = w;
-        },
-        isInNewRow: _rowClassName
-      });
-    });
-    return newColumns;
+    var nextColumns = _formatColumns(newColumns);
+    return nextColumns;
   }, [curColumns, handleResize, _scroll, originalDataSource, originalObj, _rowClassName]);
   var _columns = (0, _react.useMemo)(function () {
     return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {

package/lib/ProTable/propsType.d.ts

@@ -19,7 +19,7 @@ export interface ProTableSummaryProps {
     fixed?: boolean;
 }
 export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
-    dataIndex: string | string[];
+    dataIndex?: string | string[];
     width?: number | string;
     minWidth?: number;
     valueType?: ProTableValueType;
@@ -43,8 +43,9 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     /** 自定义比对函数, 触发条件必须写render */
     onDiff?: ({ value, record, index, originalValue, originalRecord }: any) => any;
     /** 自定义提示render, 触发条件必须写render */
-    viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => 'same' | 'changed' | 'add' | undefined;
+    viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
     isChanged?: boolean | null;
+    children?: ProTableColumn[];
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/lib/style/theme/antd.less

@@ -753,6 +753,9 @@
 }
 
 .@{ant-prefix}-picker.@{ant-prefix}-picker-disabled  {
-  background: var(--zaui-disabled-bg);
+  background: var(--zaui-disabled-bg) !important;
 }
 
+.@{ant-prefix}-input-affix-wrapper-disabled {
+  background: var(--zaui-disabled-bg) !important;
+}

package/package.json

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