@zat-design/sisyphus-react 3.8.0-beat.2 → 3.8.0-beat.4

package/es/ProTree/components/ProTreeSelect/index.js

@@ -294,9 +294,19 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
   var _renderTreeNode = function renderTreeNode(node, grade) {
     var children = node.children,
       icon = node.icon;
-    var labelText = node === null || node === void 0 ? void 0 : node.label;
-    var value = node === null || node === void 0 ? void 0 : node.value;
-    var key = uuidKey === proSelectFieldNames.value ? node === null || node === void 0 ? void 0 : node.value : node[uuidKey];
+    var labelText = node[label];
+    var value = node[code];
+    var key = node[uuidKey];
+    // 三无走默认
+    if (['undefined-undefined', 'undefined'].includes(labelText) && !value && !key) {
+      if (showCodeName) {
+        labelText = "".concat(node === null || node === void 0 ? void 0 : node.value, "-").concat(node === null || node === void 0 ? void 0 : node.label);
+      } else {
+        labelText = node === null || node === void 0 ? void 0 : node.label;
+      }
+      value = node === null || node === void 0 ? void 0 : node.value;
+      key = node === null || node === void 0 ? void 0 : node.value;
+    }
     var titleHtml = _jsx("span", {
       dangerouslySetInnerHTML: {
         __html: labelText

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -294,9 +294,19 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   var _renderTreeNode = function renderTreeNode(node, grade) {
     var children = node.children,
       icon = node.icon;
-    var labelText = node === null || node === void 0 ? void 0 : node.label;
-    var value = node === null || node === void 0 ? void 0 : node.value;
-    var key = uuidKey === proSelectFieldNames.value ? node === null || node === void 0 ? void 0 : node.value : node[uuidKey];
+    var labelText = node[label];
+    var value = node[code];
+    var key = node[uuidKey];
+    // 三无走默认
+    if (['undefined-undefined', 'undefined'].includes(labelText) && !value && !key) {
+      if (showCodeName) {
+        labelText = "".concat(node === null || node === void 0 ? void 0 : node.value, "-").concat(node === null || node === void 0 ? void 0 : node.label);
+      } else {
+        labelText = node === null || node === void 0 ? void 0 : node.label;
+      }
+      value = node === null || node === void 0 ? void 0 : node.value;
+      key = node === null || node === void 0 ? void 0 : node.value;
+    }
     var titleHtml = (0, _jsxRuntime.jsx)("span", {
       dangerouslySetInnerHTML: {
         __html: labelText

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.8.0-beat.2",
+  "version": "3.8.0-beat.4",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -96,7 +96,7 @@
     "@zat-design/login-react": "1.0.25",
     "babel-eslint": "10.0.3",
     "babel-plugin-import": "^1.13.3",
-    "commander": "<=9.2.0",
+    "commander": "9.2.0",
     "cross-env": "^7.0.3",
     "dumi": "^1.0.9",
     "eslint": "7.10.0",
@@ -114,7 +114,6 @@
     "jest-canvas-mock": "^2.5.2",
     "lint-staged": "^10.0.0",
     "mockjs": "^1.1.0",
-    "patch-package": "^8.0.0",
     "prettier": "^2.5.0",
     "pretty-quick": "^3.1.3",
     "react-json-view": "^1.21.3",

package/patches/rc-table+7.26.0.patch

@@ -1,49 +0,0 @@
-diff --git a/node_modules/rc-table/es/Cell/index.js b/node_modules/rc-table/es/Cell/index.js
-index 4f49ea7..00de314 100644
---- a/node_modules/rc-table/es/Cell/index.js
-+++ b/node_modules/rc-table/es/Cell/index.js
-@@ -8,6 +8,7 @@ var _excluded = ["colSpan", "rowSpan", "style", "className"];
- import * as React from 'react';
- import classNames from 'classnames';
- import shallowEqual from 'shallowequal';
-+import isEqual from 'rc-util/es/isEqual';
- import { supportRef } from "rc-util/es/ref";
- import { getPathValue, validateValue } from '../utils/valueUtil';
- import StickyContext from '../context/StickyContext';
-@@ -226,16 +227,29 @@ var RefCell = /*#__PURE__*/React.forwardRef(Cell);
- RefCell.displayName = 'Cell';
- var comparePropList = ['expanded', 'className', 'hovering'];
- var MemoCell = /*#__PURE__*/React.memo(RefCell, function (prev, next) {
-+  // if (next.shouldCellUpdate) {
-+  //   return (// Additional handle of expanded logic
-+  //     comparePropList.every(function (propName) {
-+  //       return prev[propName] === next[propName];
-+  //     }) && // User control update logic
-+  //     !next.shouldCellUpdate(next.record, prev.record)
-+  //   );
-+  // }
-+
-+  // return shallowEqual(prev, next);
-+
-   if (next.shouldCellUpdate) {
--    return (// Additional handle of expanded logic
--      comparePropList.every(function (propName) {
--        return prev[propName] === next[propName];
--      }) && // User control update logic
--      !next.shouldCellUpdate(next.record, prev.record)
--    );
-+    const [, prevRecord] = prev;
-+    const [, nextRecord] = next;
-+    return next.shouldCellUpdate(nextRecord, prevRecord);
-   }
- 
--  return shallowEqual(prev, next);
-+  // Legacy mode should always update
-+  // if (perfRecord.renderWithProps) {
-+  //   return true;
-+  // }
-+
-+  return !isEqual(prev, next, true);
- });
- /** Inject hover data here, we still wish MemoCell keep simple `shouldCellUpdate` logic */
-