@zat-design/sisyphus-react 3.6.10 → 3.7.0-beta.1

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

@@ -1,3 +1,5 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["disabled", "children"];
@@ -6,6 +8,7 @@ import React from 'react';
 import { DndContext, closestCorners } from '@dnd-kit/core';
 import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
+import { isFunction } from 'lodash';
 import { addLevelAndParentId, treeNodeFind, transformTreeToArray, createTreeFromArray } from './utils/index';
 import ProIcon from '../../../../../../../ProIcon';
 export var Row = function Row(props) {
@@ -67,55 +70,119 @@ var DndWrapper = function DndWrapper(_ref2) {
     onChange = _ref2.onChange,
     disabled = _ref2.disabled,
     children = _ref2.children,
-    rowKey = _ref2.rowKey;
-  var onDragEnd = function onDragEnd(_ref3) {
-    var active = _ref3.active,
-      over = _ref3.over;
-    // 为数据源划分层级及parentId
-    var transformedValue = addLevelAndParentId(value, rowKey);
-    // 同一level层级的且parentId相同的，可以互相之间拖拽替换
-    if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      var activeObject = treeNodeFind(transformedValue, function (t) {
-        return t.rowKey === active.id;
-      });
-      var overObject = treeNodeFind(transformedValue, function (t) {
-        return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
-      });
-      if (activeObject && overObject) {
-        var activeLevel = activeObject.level,
-          activeParentId = activeObject.parentId;
-        var overLevel = overObject.level,
-          overParentId = overObject.parentId;
-        if (activeLevel === overLevel && activeParentId === overParentId) {
-          // 将树平铺
-          var _flatTree = transformTreeToArray(transformedValue).map(function (item) {
-            return _objectSpread(_objectSpread({}, item), {}, {
-              children: undefined
+    rowKey = _ref2.rowKey,
+    onDragStartGuard = _ref2.onDragStartGuard,
+    onDragEndGuard = _ref2.onDragEndGuard;
+  var onDragStart = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
+      var active, _transformedValue, activeObject;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            active = _ref3.active;
+            if (!(onDragStartGuard && isFunction(onDragStartGuard))) {
+              _context.next = 6;
+              break;
+            }
+            // 为数据源划分层级及parentId
+            _transformedValue = addLevelAndParentId(value, rowKey);
+            activeObject = treeNodeFind(_transformedValue, function (t) {
+              return t.rowKey === active.id;
             });
-          });
-          var activeIndex = _flatTree.findIndex(function (i) {
-            return i.rowKey === active.id;
-          });
-          var overIndex = _flatTree.findIndex(function (i) {
-            return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
-          });
-          var nextValue = arrayMove(_flatTree, activeIndex, overIndex);
-          onChange(createTreeFromArray(nextValue, {
-            itemKey: 'rowKey',
-            parentKey: 'parentId',
-            childrenKey: 'children'
-          }));
+            _context.next = 6;
+            return onDragStartGuard({
+              activeObject: activeObject,
+              currentDataSource: value
+            });
+          case 6:
+          case "end":
+            return _context.stop();
         }
-      }
-    }
-  };
+      }, _callee);
+    }));
+    return function onDragStart(_x) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var onDragEnd = /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
+      var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            active = _ref5.active, over = _ref5.over;
+            // 为数据源划分层级及parentId
+            transformedValue = addLevelAndParentId(value, rowKey); // 同一level层级的且parentId相同的，可以互相之间拖拽替换
+            if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
+              _context2.next = 15;
+              break;
+            }
+            activeObject = treeNodeFind(transformedValue, function (t) {
+              return t.rowKey === active.id;
+            });
+            overObject = treeNodeFind(transformedValue, function (t) {
+              return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+            });
+            if (!(activeObject && overObject)) {
+              _context2.next = 15;
+              break;
+            }
+            activeLevel = activeObject.level, activeParentId = activeObject.parentId;
+            overLevel = overObject.level, overParentId = overObject.parentId; // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
+            if (!(onDragEndGuard && isFunction(onDragEndGuard))) {
+              _context2.next = 14;
+              break;
+            }
+            _context2.next = 11;
+            return onDragEndGuard({
+              activeObject: activeObject,
+              overObject: overObject,
+              currentDataSource: value
+            });
+          case 11:
+            nextDataSource = _context2.sent;
+            onChange(nextDataSource !== null && nextDataSource !== void 0 ? nextDataSource : []);
+            return _context2.abrupt("return");
+          case 14:
+            if (activeLevel === overLevel && activeParentId === overParentId) {
+              // 将树平铺
+              _flatTree = transformTreeToArray(transformedValue).map(function (item) {
+                return _objectSpread(_objectSpread({}, 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 = arrayMove(_flatTree, activeIndex, overIndex);
+              onChange(createTreeFromArray(nextValue, {
+                itemKey: 'rowKey',
+                parentKey: 'parentId',
+                childrenKey: 'children'
+              }));
+            }
+          case 15:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onDragEnd(_x2) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+  var transformedValue = addLevelAndParentId(value, rowKey);
   // 将树平铺
-  var flatTree = transformTreeToArray(value).map(function (item) {
+  var flatTree = transformTreeToArray(transformedValue).map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
       children: undefined
     });
   });
   return draggable && !disabled ? _jsx(DndContext, {
+    onDragStart: onDragStart,
     onDragEnd: onDragEnd,
     collisionDetection: closestCorners,
     children: _jsx(SortableContext, {

package/es/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -4,6 +4,15 @@ import _Table from "antd/es/table";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
 import { jsx as _jsx } from "react/jsx-runtime";
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-08-09 13:48:59
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-08-20 19:31:24
+ * @FilePath: /za-material-warehouse/src/ProTable/components/RcTable/components/DraggableTable/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+
 import { memo } from 'react';
 import DndWrapper, { Row } from './components/DndWrapper';
 import { RenderEmptyText, RenderSummary } from '../../../index';
@@ -21,13 +30,17 @@ var DraggableTable = function DraggableTable(_ref) {
     disabled = tableProps.disabled;
   var onChange = draggableProps.onChange,
     draggable = draggableProps.draggable,
-    rowKey = draggableProps.rowKey;
+    rowKey = draggableProps.rowKey,
+    onDragStartGuard = draggableProps.onDragStartGuard,
+    onDragEndGuard = draggableProps.onDragEndGuard;
   return _jsx(DndWrapper, {
     value: dataSource !== null && dataSource !== void 0 ? dataSource : [],
     onChange: onChange,
     disabled: disabled,
     draggable: draggable,
     rowKey: rowKey,
+    onDragStartGuard: onDragStartGuard,
+    onDragEndGuard: onDragEndGuard,
     children: _jsx(_Table, _objectSpread(_objectSpread({
       className: "pro-edit-table-drag",
       components: {

package/es/ProTable/index.js

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource"],
+var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "originalDataSource", "onDragStart", "onDragEnd"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
@@ -53,6 +53,8 @@ function ProTable(props) {
     _props$emptyText = props.emptyText,
     emptyText = _props$emptyText === void 0 ? locale === null || locale === void 0 ? void 0 : (_locale$ProTable = locale.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.noData : _props$emptyText,
     originalDataSource = props.originalDataSource,
+    onDragStartGuard = props.onDragStart,
+    onDragEndGuard = props.onDragEnd,
     restProps = _objectWithoutProperties(props, _excluded);
   var quickTableConfig = quickConfig ? _objectSpread({
     columnConfig: true,
@@ -352,7 +354,9 @@ function ProTable(props) {
           draggableProps: {
             onChange: onDataSourceChange,
             draggable: draggable,
-            rowKey: rowKey
+            rowKey: rowKey,
+            onDragStartGuard: onDragStartGuard,
+            onDragEndGuard: onDragEndGuard
           },
           tableProps: {
             value: _dataSource,

package/es/ProTable/propsType.d.ts

@@ -41,6 +41,23 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     transform?: (value: any, record?: any) => string[];
 }
+export interface CreateTreeFromArrayOptions {
+    itemKey?: string;
+    parentKey?: string;
+    childrenKey?: string;
+}
+export interface DragCommonGuardProps<T> {
+    event: T;
+}
+export interface DragEndGuardProps {
+    activeObject: any;
+    overObject?: any;
+    currentDataSource: any[];
+}
+export interface DragStartGuardProps {
+    activeObject: any;
+    currentDataSource: any[];
+}
 export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary' | 'columns'> {
     tableId?: string;
     rowKey?: string | GetRowKey<any>;
@@ -67,6 +84,11 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
     stripe?: boolean;
     columns: ProTableColumn[];
     originalDataSource?: any[];
+    /**
+     * 拖拽额外配置
+     */
+    onDragStart?: DragStartGuardProps;
+    onDragEnd?: DragEndGuardProps;
 }
 export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
 export interface Response<T = any> {

package/es/ProTable/style/index.less

@@ -2,17 +2,17 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-table {
-  &.pro-table-draggable-only{
-    .ant-table-tbody{
+  &.pro-table-draggable-only {
+    .ant-table-tbody {
       .anticon {
         margin-right: 0;
       }
     }
   }
   .@{ant-prefix}-table-cell-with-append {
-    white-space: nowrap;
     position: relative;
     z-index: 100;
+    white-space: nowrap;
   }
   .@{ant-prefix}-table-row-expand-icon {
     position: absolute;
@@ -20,16 +20,15 @@
   }
 
   .@{ant-prefix}-table-content {
-    >table {
+    > table {
       .@{ant-prefix}-table-summary {
+        color: var(--zaui-text, #343434);
+        font-weight: 600;
         background-color: var(--zaui-table-header-bg, #f2f3f5);
-        color           : var(--zaui-text, #343434);
-        font-weight     : 600;
 
         .@{ant-prefix}-table-cell-fix-left,
         .@{ant-prefix}-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);
-
         }
       }
 
@@ -43,33 +42,37 @@
         }
       }
 
-      .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
+      .@{ant-prefix}-table-thead
+        > tr
+        > th:not(.@{ant-prefix}-table-selection-column):not(
+          .@{ant-prefix}-table-row-expand-icon-cell
+        ):not([colspan]).is-required {
         &.is-required-right {
           .pro-edit-table-title {
             &::before {
-              position   : static;
-              top        : 0;
-              display    : inline-block;
-              text-indent: -8px;
-              color      : #ff5050;
-              font-size  : var(--zaui-font-size-md, 14px);
+              position: static;
+              top: 0;
+              display: inline-block;
+              color: #ff5050;
+              font-size: var(--zaui-font-size-md, 14px);
               line-height: 1;
-              content    : "*";
+              text-indent: -8px;
+              content: '*';
             }
           }
         }
         &.is-required-left {
           .pro-edit-table-title {
             &::after {
+              position: static;
+              top: 0;
+              display: inline-block;
               width: auto;
-              position   : static;
-              top        : 0;
-              display    : inline-block;
               margin-left: var(--zaui-space-size-xs, 4px);
-              color      : #ff5050;
-              font-size  : 14px;
+              color: #ff5050;
+              font-size: 14px;
               line-height: 1;
-              content    : "*";
+              content: '*';
             }
           }
         }
@@ -80,9 +83,9 @@
     display: flex;
     width: 20px;
     .anticon {
-      cursor: pointer;
       margin-right: 12px;
-      .drag-icon{
+      cursor: pointer;
+      .drag-icon {
         margin-right: 0;
       }
     }
@@ -93,8 +96,6 @@
     }
   }
 
-
-
   &.pro-table-bordered {
     .@{ant-prefix}-table .@{ant-prefix}-table-thead > tr > th {
       border-bottom: 1px solid #f0f0f0;
@@ -557,10 +558,4 @@
       }
     }
   }
-}
-
-.pro-edit-table-drag {
-  table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
-    text-align: right;
-  }
-}
+}

package/es/ProThemeTools/component/{PrdTools → ProTools}/index.d.ts

@@ -1,3 +1,3 @@
 import type { DevToolsPropsType } from '../../propsType';
-declare const PrdTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
-export default PrdTools;
+declare const ProTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
+export default ProTools;

package/es/ProThemeTools/component/{PrdTools → ProTools}/index.js

@@ -21,7 +21,7 @@ var connect = function connect(Component) {
   return ComponentWrapper;
 };
 var NewDrawer = connect(_Drawer);
-var PrdTools = function PrdTools(_ref) {
+var ProTools = function ProTools(_ref) {
   var onReset = _ref.onReset,
     onClose = _ref.onClose,
     setState = _ref.setState,
@@ -266,4 +266,4 @@ var PrdTools = function PrdTools(_ref) {
     })]
   });
 };
-export default PrdTools;
+export default ProTools;

package/es/ProThemeTools/component/index.d.ts

@@ -1,2 +1 @@
-/// <reference types="typings" />
-export { default as PrdTools } from './PrdTools';
+export { default as ProTools } from './ProTools';

package/es/ProThemeTools/component/index.js

@@ -1,2 +1 @@
-/// <reference path="../../../typings.d.ts" />;
-export { default as PrdTools } from './PrdTools';
+export { default as ProTools } from './ProTools';

package/es/ProThemeTools/index.js

@@ -17,7 +17,7 @@ import { isEqual } from 'lodash';
 import classnames from 'classnames';
 import { getKebabCase, setThemes, setTableBorder, getMapKebabCase, getMapHumpCase } from './utils/index';
 import settingSvg from '../assets/setting.svg';
-import { PrdTools } from './component';
+import { ProTools } from './component';
 import locale from '../locale';
 var defaultCacheTime = 1; // 配置保存时间为一天
 var defaultThemeConfig = {
@@ -183,7 +183,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
         className: "setting-icon",
         src: settingSvg
       })
-    }), _jsx(PrdTools, {
+    }), _jsx(ProTools, {
       prefixCls: prefixCls,
       onReset: onReset,
       onClose: toggle,

package/es/ProThemeTools/style/index.less

@@ -1,7 +1,7 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
 
-@import '../component/PrdTools/style/index.less';
+@import '../component/ProTools/style/index.less';
 
 .pro-theme-tools {
   display: flex;

package/es/ProTreeModal/components/List.js

@@ -122,11 +122,32 @@ function List(props, ref) {
     document.body.removeChild(temp);
     return len * 20;
   }
+  var handleCommonTitle = function handleCommonTitle(item) {
+    if (isCASCADER) {
+      return item === null || item === void 0 ? void 0 : item.title;
+    }
+    return item[fieldNameLabel];
+  };
+  var handleGetTitle = function handleGetTitle(item) {
+    if (showCodeName) {
+      if (isCASCADER) {
+        if (item[fieldNameValue] && (item === null || item === void 0 ? void 0 : item.title)) {
+          return "".concat(item[fieldNameValue], "-").concat(item.title);
+        }
+        return handleCommonTitle(item);
+      }
+      if (item[fieldNameValue] && item[fieldNameValue]) {
+        return "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]);
+      }
+      return handleCommonTitle(item);
+    }
+    return handleCommonTitle(item);
+  };
   var _useVirtualList = useVirtualList(originalList, {
       containerTarget: containerRef,
       wrapperTarget: wrapperRef,
       itemHeight: function itemHeight(index, item) {
-        var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]) : "".concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]);
+        var title = handleGetTitle(item);
         return Math.floor(getLineHeight(title, 406)) + 12;
       }
     }),
@@ -182,7 +203,7 @@ function List(props, ref) {
             children: _jsx(_Row, {
               children: list.map(function (_item) {
                 var item = _item.data;
-                var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]) : "".concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]);
+                var title = handleGetTitle(item);
                 var content = optionRender ? optionRender(item, searchStr) : _jsx(SearchTitle, {
                   label: title,
                   searchStr: searchStr
@@ -220,7 +241,7 @@ function List(props, ref) {
         value: checkedValues,
         children: _jsx(_Row, {
           children: treeData.map(function (item) {
-            var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]) : "".concat(isCASCADER ? item === null || item === void 0 ? void 0 : item.title : item[fieldNameLabel]);
+            var title = handleGetTitle(item);
             var content = optionRender ? optionRender(item, searchStr) : _jsx(SearchTitle, {
               label: title,
               searchStr: searchStr
@@ -257,7 +278,12 @@ function List(props, ref) {
         ref: wrapperRef,
         children: list.map(function (_item) {
           var item = _item.data;
-          var title = showCodeName ? "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]) : item[fieldNameLabel];
+          var title = item[fieldNameLabel];
+          if (showCodeName) {
+            if (item[fieldNameValue] && item[fieldNameLabel]) {
+              title = "".concat(item[fieldNameValue], "-").concat(item[fieldNameLabel]);
+            }
+          }
           return _jsxs("div", {
             className: "pro-tree-modal-checkbox-content",
             children: [_jsx("div", {

package/lib/ProEditTable/components/RenderField/ListChanged.d.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+import { FormInstance } from 'antd';
+import { NamePath } from 'antd/lib/form/interface';
+interface Props {
+    name?: NamePath;
+    names?: NamePath[];
+    originalName?: NamePath;
+    originalNames?: NamePath[];
+    namesStr?: NamePath;
+    originalValues?: any;
+    form: FormInstance;
+    equalWith?: (preValue: any, curValue: any) => boolean | undefined;
+    [name: string]: any;
+}
+declare const ListChanged: React.FC<Props>;
+export default ListChanged;