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

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Row = void 0;
+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 _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -12,6 +14,7 @@ var _react = _interopRequireDefault(require("react"));
 var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
 var _utilities = require("@dnd-kit/utilities");
+var _lodash = require("lodash");
 var _index = require("./utils/index");
 var _ProIcon = _interopRequireDefault(require("../../../../../../../ProIcon"));
 var _excluded = ["disabled", "children"];
@@ -74,48 +77,177 @@ 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 = (0, _index.addLevelAndParentId)(value, rowKey);
-    // 同一level层级的且parentId相同的，可以互相之间拖拽替换
-    if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
-      var activeObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
-        return t.rowKey === active.id;
-      });
-      var overObject = (0, _index.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 = (0, _index.transformTreeToArray)(transformedValue).map(function (item) {
-            return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-              children: undefined
+    rowKey = _ref2.rowKey,
+    onDragStartGuard = _ref2.onDragStartGuard,
+    onDragMoveGuard = _ref2.onDragMoveGuard,
+    onDragOverGuard = _ref2.onDragOverGuard,
+    onDragEndGuard = _ref2.onDragEndGuard,
+    onDragCancelGuard = _ref2.onDragCancelGuard;
+  var onDragStart = /*#__PURE__*/function () {
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(event) {
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(onDragStartGuard && (0, _lodash.isFunction)(onDragStartGuard))) {
+              _context.next = 3;
+              break;
+            }
+            _context.next = 3;
+            return onDragStartGuard({
+              event: event
             });
-          });
-          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 = (0, _sortable.arrayMove)(_flatTree, activeIndex, overIndex);
-          onChange((0, _index.createTreeFromArray)(nextValue, {
-            itemKey: 'rowKey',
-            parentKey: 'parentId',
-            childrenKey: 'children'
-          }));
+          case 3:
+          case "end":
+            return _context.stop();
         }
-      }
-    }
-  };
+      }, _callee);
+    }));
+    return function onDragStart(_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var onDragMove = /*#__PURE__*/function () {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(event) {
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(onDragMoveGuard && (0, _lodash.isFunction)(onDragMoveGuard))) {
+              _context2.next = 3;
+              break;
+            }
+            _context2.next = 3;
+            return onDragMoveGuard({
+              event: event
+            });
+          case 3:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onDragMove(_x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var onDragOver = /*#__PURE__*/function () {
+    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(event) {
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (!(onDragOverGuard && (0, _lodash.isFunction)(onDragOverGuard))) {
+              _context3.next = 3;
+              break;
+            }
+            _context3.next = 3;
+            return onDragOverGuard({
+              event: event
+            });
+          case 3:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function onDragOver(_x3) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+  var onDragEnd = /*#__PURE__*/function () {
+    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(_ref6) {
+      var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            active = _ref6.active, over = _ref6.over;
+            // 为数据源划分层级及parentId
+            transformedValue = (0, _index.addLevelAndParentId)(value, rowKey); // 同一level层级的且parentId相同的，可以互相之间拖拽替换
+            if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
+              _context4.next = 15;
+              break;
+            }
+            activeObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
+              return t.rowKey === active.id;
+            });
+            overObject = (0, _index.treeNodeFind)(transformedValue, function (t) {
+              return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+            });
+            if (!(activeObject && overObject)) {
+              _context4.next = 15;
+              break;
+            }
+            activeLevel = activeObject.level, activeParentId = activeObject.parentId;
+            overLevel = overObject.level, overParentId = overObject.parentId; // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
+            if (!(onDragEndGuard && (0, _lodash.isFunction)(onDragEndGuard))) {
+              _context4.next = 14;
+              break;
+            }
+            _context4.next = 11;
+            return onDragEndGuard({
+              activeObject: activeObject,
+              overObject: overObject,
+              currentDataSource: value,
+              transformTreeToArray: _index.transformTreeToArray,
+              arrayMove: _sortable.arrayMove,
+              createTreeFromArray: _index.createTreeFromArray
+            });
+          case 11:
+            nextDataSource = _context4.sent;
+            onChange(nextDataSource !== null && nextDataSource !== void 0 ? nextDataSource : []);
+            return _context4.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 "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function onDragEnd(_x4) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
+  var onDragCancel = /*#__PURE__*/function () {
+    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5(event) {
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            if (!(onDragCancelGuard && (0, _lodash.isFunction)(onDragCancelGuard))) {
+              _context5.next = 3;
+              break;
+            }
+            _context5.next = 3;
+            return onDragCancelGuard({
+              event: event
+            });
+          case 3:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return function onDragCancel(_x5) {
+      return _ref8.apply(this, arguments);
+    };
+  }();
   // 将树平铺
   var flatTree = (0, _index.transformTreeToArray)(value).map(function (item) {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
@@ -124,6 +256,10 @@ var DndWrapper = function DndWrapper(_ref2) {
   });
   return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
     onDragEnd: onDragEnd,
+    onDragStart: onDragStart,
+    onDragMove: onDragMove,
+    onDragOver: onDragOver,
+    onDragCancel: onDragCancel,
     collisionDetection: _core.closestCorners,
     children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {
       items: (flatTree === null || flatTree === void 0 ? void 0 : (_flatTree$ = flatTree[0]) === null || _flatTree$ === void 0 ? void 0 : _flatTree$.rowKey) ? flatTree.map(function (i) {

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

@@ -15,6 +15,14 @@ var _DndWrapper = _interopRequireWildcard(require("./components/DndWrapper"));
 var _index = require("../../../index");
 require("../../../../style/index.less");
 var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "emptyTextProps"];
+/*
+ * @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
+ */
 var DraggableTable = function DraggableTable(_ref) {
   var dataSource = _ref.dataSource,
     tableProps = _ref.tableProps,
@@ -28,13 +36,23 @@ var DraggableTable = function DraggableTable(_ref) {
     disabled = tableProps.disabled;
   var onChange = draggableProps.onChange,
     draggable = draggableProps.draggable,
-    rowKey = draggableProps.rowKey;
+    rowKey = draggableProps.rowKey,
+    onDragStartGuard = draggableProps.onDragStartGuard,
+    onDragMoveGuard = draggableProps.onDragMoveGuard,
+    onDragOverGuard = draggableProps.onDragOverGuard,
+    onDragEndGuard = draggableProps.onDragEndGuard,
+    onDragCancelGuard = draggableProps.onDragCancelGuard;
   return (0, _jsxRuntime.jsx)(_DndWrapper.default, {
     value: dataSource !== null && dataSource !== void 0 ? dataSource : [],
     onChange: onChange,
     disabled: disabled,
     draggable: draggable,
     rowKey: rowKey,
+    onDragStartGuard: onDragStartGuard,
+    onDragMoveGuard: onDragMoveGuard,
+    onDragOverGuard: onDragOverGuard,
+    onDragEndGuard: onDragEndGuard,
+    onDragCancelGuard: onDragCancelGuard,
     children: (0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       className: "pro-edit-table-drag",
       components: {

package/lib/ProTable/index.js

@@ -27,7 +27,7 @@ var _reset = _interopRequireDefault(require("../assets/reset.svg"));
 var _customColumn = _interopRequireDefault(require("../assets/customColumn.svg"));
 var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
-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", "onDragMove", "onDragOver", "onDragEnd", "onDragCancel"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 var defaultCacheTime = 1; // columns 配置保存时间为一天
 // 全局上下文
@@ -60,6 +60,11 @@ function ProTable(props) {
     _props$emptyText = props.emptyText,
     emptyText = _props$emptyText === void 0 ? _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTable = _locale.default.ProTable) === null || _locale$ProTable === void 0 ? void 0 : _locale$ProTable.noData : _props$emptyText,
     originalDataSource = props.originalDataSource,
+    onDragStartGuard = props.onDragStart,
+    onDragMoveGuard = props.onDragMove,
+    onDragOverGuard = props.onDragOver,
+    onDragEndGuard = props.onDragEnd,
+    onDragCancelGuard = props.onDragCancel,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var quickTableConfig = quickConfig ? (0, _objectSpread4.default)({
     columnConfig: true,
@@ -359,7 +364,12 @@ function ProTable(props) {
           draggableProps: {
             onChange: onDataSourceChange,
             draggable: draggable,
-            rowKey: rowKey
+            rowKey: rowKey,
+            onDragStartGuard: onDragStartGuard,
+            onDragMoveGuard: onDragMoveGuard,
+            onDragOverGuard: onDragOverGuard,
+            onDragEndGuard: onDragEndGuard,
+            onDragCancelGuard: onDragCancelGuard
           },
           tableProps: {
             value: _dataSource,

package/lib/ProTable/propsType.d.ts

@@ -3,6 +3,7 @@ import { TableProps } from 'antd/es/table/Table';
 import { ColumnType, GetRowKey, RowSelectionType } from 'antd/es/table/interface';
 import { FormInstance } from 'antd';
 import type { TooltipProps } from 'antd';
+import type { DragStartEvent, DragMoveEvent, DragOverEvent, DragCancelEvent } from '@dnd-kit/core';
 interface SummaryColumnProps {
     key: string | string[];
     index: number;
@@ -26,6 +27,10 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     format?: string;
     precision?: number;
     code?: string | string[] | ((text: any, record: any) => string);
+    codeValues?: {
+        label: string;
+        value: string | number;
+    }[];
     copyable?: boolean;
     originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
@@ -37,6 +42,22 @@ 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[];
+    transformTreeToArray: (tree: any[]) => any[];
+    arrayMove: (array: any[], from: number, to: number) => any[];
+    createTreeFromArray: (array: any[], options: CreateTreeFromArrayOptions) => any[];
+}
 export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary' | 'columns'> {
     tableId?: string;
     rowKey?: string | GetRowKey<any>;
@@ -63,6 +84,14 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
     stripe?: boolean;
     columns: ProTableColumn[];
     originalDataSource?: any[];
+    /**
+     * 拖拽额外配置
+     */
+    onDragStart?: DragCommonGuardProps<DragStartEvent>;
+    onDragMove?: DragCommonGuardProps<DragMoveEvent>;
+    onDragOver?: DragCommonGuardProps<DragOverEvent>;
+    onDragCancel?: DragCommonGuardProps<DragCancelEvent>;
+    onDragEnd?: DragEndGuardProps;
 }
 export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
 export interface Response<T = any> {

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

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

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

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

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

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

package/lib/ProThemeTools/component/index.js

@@ -4,10 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "ProTools", {
+Object.defineProperty(exports, "PrdTools", {
   enumerable: true,
   get: function get() {
-    return _ProTools.default;
+    return _PrdTools.default;
   }
 });
-var _ProTools = _interopRequireDefault(require("./ProTools"));
+var _PrdTools = _interopRequireDefault(require("./PrdTools"));

package/lib/ProThemeTools/index.js

@@ -186,7 +186,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
         className: "setting-icon",
         src: _setting.default
       })
-    }), (0, _jsxRuntime.jsx)(_component.ProTools, {
+    }), (0, _jsxRuntime.jsx)(_component.PrdTools, {
       prefixCls: prefixCls,
       onReset: onReset,
       onClose: toggle,

package/lib/ProThemeTools/style/index.less

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

package/lib/ProTreeModal/components/List.js

@@ -125,11 +125,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 = (0, _ahooks.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;
       }
     }),
@@ -185,7 +206,7 @@ function List(props, ref) {
             children: (0, _jsxRuntime.jsx)(_antd.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) : (0, _jsxRuntime.jsx)(_SearchTitle.default, {
                   label: title,
                   searchStr: searchStr
@@ -223,7 +244,7 @@ function List(props, ref) {
         value: checkedValues,
         children: (0, _jsxRuntime.jsx)(_antd.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) : (0, _jsxRuntime.jsx)(_SearchTitle.default, {
               label: title,
               searchStr: searchStr
@@ -260,7 +281,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 (0, _jsxRuntime.jsxs)("div", {
             className: "pro-tree-modal-checkbox-content",
             children: [(0, _jsxRuntime.jsx)("div", {

package/package.json

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

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

@@ -1,16 +0,0 @@
-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;

package/es/ProEditTable/components/RenderField/ListChanged.js

@@ -1,124 +0,0 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type"];
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import React, { useMemo } from 'react';
-import { get } from 'lodash';
-import { diffOriginal } from '../../../ProForm/utils/diffOriginal';
-var toNamePath = function toNamePath(name) {
-  if (Array.isArray(name)) {
-    return name;
-  }
-  return [name];
-};
-var toNamePaths = function toNamePaths(names) {
-  return names.map(function (name) {
-    return toNamePath(name);
-  });
-};
-var getOriginalValue = function getOriginalValue(_ref) {
-  var namePath = _ref.namePath,
-    originalName = _ref.originalName,
-    originalNames = _ref.originalNames,
-    originalValues = _ref.originalValues,
-    rowKeyPath = _ref.rowKeyPath,
-    form = _ref.form;
-  if (!originalValues) {
-    return undefined;
-  }
-  if (rowKeyPath) {
-    var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
-    var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
-    var rowValue = form.getFieldValue(rowValueNamePath);
-    if (!rowValue) return undefined;
-    var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
-    if (!keyValue) return undefined;
-    var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    var originalValueRow = originalValueList.find(function (item) {
-      return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
-    });
-    var originalValue;
-    if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
-      var originalNamesValue = originalNames.map(function (originalName) {
-        return get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
-      });
-      // 有可能出现数组中全是undefined的情况  视为没有值
-      var fillUndefined = originalNamesValue.every(function (valItem) {
-        return valItem === undefined;
-      });
-      originalValue = fillUndefined ? undefined : originalNamesValue;
-    } else {
-      originalValue = get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
-    }
-    return originalValue;
-  }
-  // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
-  return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-    return get(originalValues, originalName);
-  }) : get(originalValues, originalName);
-};
-var ListChanged = function ListChanged(props) {
-  var name = props.name,
-    names = props.names,
-    namesStr = props.namesStr,
-    _props$originalName = props.originalName,
-    originalName = _props$originalName === void 0 ? name : _props$originalName,
-    _props$originalNames = props.originalNames,
-    originalNames = _props$originalNames === void 0 ? names : _props$originalNames,
-    originalValues = props.originalValues,
-    form = props.form,
-    equalWith = props.equalWith,
-    rowKeyPath = props.rowKeyPath,
-    children = props.children,
-    type = props.type,
-    rest = _objectWithoutProperties(props, _excluded);
-  var namePath = toNamePath(namesStr || name);
-  var originalNamePath = toNamePath(originalName);
-  var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var notWatch = !originalValues || ['FormList', 'ProEditTable'].includes(type);
-  var originalValue = !notWatch ? getOriginalValue({
-    namePath: namePath,
-    originalName: originalNamePath,
-    originalNames: originalNamePaths,
-    originalValues: originalValues,
-    rowKeyPath: rowKeyPath,
-    form: form
-  }) : undefined;
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = useMemo(function () {
-    if (notWatch || noChange) return false;
-    return diffOriginal({
-      value: props.value,
-      originalValue: originalValue,
-      form: form,
-      equalWith: equalWith
-      // name: isString(namesStr) ? namesStr : originalName || name,
-    });
-  }, [props.value, originalValue]);
-  if (notWatch || noChange) {
-    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
-  }
-  return _jsx(_Tooltip, {
-    open: changed ? undefined : false,
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
-    },
-    title: _jsxs(_Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, {
-        // @ts-ignore
-        isView: true,
-        value: originalValue,
-        checked: type === 'Switch' ? originalValue : undefined
-      })) : undefined]
-    }),
-    children: _jsx("div", {
-      className: changed ? 'pro-form-item-changed' : '',
-      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest)) : undefined
-    })
-  });
-};
-export default ListChanged;