@zat-design/sisyphus-react 3.7.3-beta.15 → 3.7.3-beta.17

package/lib/ProForm/components/render/ChangedWrapper.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
@@ -18,7 +19,7 @@ var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
 var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
 var ChangedWrapper = function ChangedWrapper(props) {
-  var _diffConfig$toolTip;
+  var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -56,14 +57,12 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var isChanged = diffType === 'changed';
   var tipContent = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return undefined;
-    return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), {}, {
-      isView: true,
-      value: originalValue,
-      checked: type === 'Switch' ? originalValue : undefined
-    })) : undefined;
+    return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), {}, (0, _defineProperty2.default)({
+      isView: true
+    }, valuePropName, originalValue))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
-    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
+    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest));
   }
   var tipOpenCalc = function tipOpenCalc() {
     if (!toolTip) return false;
@@ -78,19 +77,33 @@ var ChangedWrapper = function ChangedWrapper(props) {
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
+  // @ts-ignore
+  var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     open: tipOpenCalc(),
+    mouseEnterDelay: 1,
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      direction: "vertical",
+      children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
+        children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      }), _showEllipse && (0, _jsxRuntime.jsxs)(_antd.Space, {
+        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
+          isView: true
+        })) : undefined]
+      })]
     }),
     placement: "topLeft",
     children: (0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
       style: style,
-      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest)) : undefined
+      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
+        otherProps: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
+          isDiffChange: isChanged
+        })
+      })) : undefined
     })
   });
 };

package/lib/ProForm/propsType.d.ts

@@ -44,6 +44,7 @@ export interface ProFormOtherProps {
     listName?: any[] | string | number;
     globalControl?: boolean;
     formDisabled?: boolean;
+    isDiffChange?: boolean;
 }
 export interface DiffConfigProps<Values = any> {
     /** 比对原始数据源 */

package/lib/ProSelect/index.js

@@ -25,6 +25,7 @@ var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames"
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   var _selectProps$showCode, _locale$ProSelect;
+  console.log('props11: ', props);
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
@@ -297,7 +298,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       showArrow: true,
       loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       onChange: handleChange,
-      optionLabelProp: "children" // 解决warning报错，添加默认值
+      // optionLabelProp={otherProps?.isDiffChange ? "label" : 'children'} // 解决warning报错，添加默认值
+      optionLabelProp: "label" // 解决warning报错，添加默认值
       ,
       showSearch: true,
       filterOption: (0, _lodash.isFunction)(_onSearch) ? false : function (input, option) {
@@ -315,16 +317,15 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       value: transformValue(),
       children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
         return (0, _jsxRuntime.jsx)(Option, {
+          label: item[label],
           value: item[code],
           record: item,
           disabled: !!item.disabled,
           children: (0, _jsxRuntime.jsx)(TooltipOption, {
             title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
             children: OptionRender ? (0, _jsxRuntime.jsx)("span", {
-              title: OptionRender(item),
               children: OptionRender(item)
             }) : (0, _jsxRuntime.jsx)("span", {
-              title: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
               children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
             })
           }, item[code])

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

@@ -76,13 +76,13 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   var _props$value = props.value,
     value = _props$value === void 0 ? undefined : _props$value;
   var _props$showEllipse = props.showEllipse,
-    showEllipse = _props$showEllipse === void 0 ? true : _props$showEllipse,
-    _props$isDiffChange = props.isDiffChange,
-    isDiffChange = _props$isDiffChange === void 0 ? false : _props$isDiffChange;
+    showEllipse = _props$showEllipse === void 0 ? true : _props$showEllipse;
+  var _ref2 = otherProps !== null && otherProps !== void 0 ? otherProps : {},
+    isDiffChange = _ref2.isDiffChange;
   var _showEllipse = showEllipse && !isDiffChange;
-  var _ref2 = otherProps || {},
-    isView = _ref2.isView,
-    viewEmpty = _ref2.viewEmpty;
+  var _ref3 = otherProps || {},
+    isView = _ref3.isView,
+    viewEmpty = _ref3.viewEmpty;
   if (fieldNames && Object.keys(fieldNames).length) {
     code = fieldNames.value || 'value';
     label = fieldNames.label || 'label';
@@ -215,8 +215,8 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       return undefined;
     }
     // 如果配置手动加载，不执行请求
-    var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
-      defaultParams = _ref3.defaultParams;
+    var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+      defaultParams = _ref4.defaultParams;
     // 执行用户配置的枚举服务，拉取枚举数据进行更新
     fetchFunction.run(defaultParams);
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, defaultDisableValue]);

package/lib/ProTree/components/SearchTitle.d.ts

@@ -1,10 +1,11 @@
 /// <reference types="react" />
+import { ProFormOtherProps } from '../../ProForm/propsType';
 declare function SearchTitle(props: {
     searchStr?: string;
     label?: string;
     showEllipse?: boolean;
     ellipseWidth?: string;
-    isDiffChange?: boolean;
+    otherProps?: ProFormOtherProps;
 }): import("react/jsx-runtime").JSX.Element;
 declare const _default: import("react").MemoExoticComponent<typeof SearchTitle>;
 export default _default;

package/lib/ProTree/components/SearchTitle.js

@@ -8,14 +8,25 @@ exports.default = void 0;
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _AdaptiveTooltip = _interopRequireDefault(require("./AdaptiveTooltip"));
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-09-26 14:37:00
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-09-26 17:50:59
+ * @FilePath: /za-material-warehouse/src/ProTree/components/SearchTitle.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+
 function SearchTitle(props) {
   var label = props.label,
     _props$searchStr = props.searchStr,
     searchStr = _props$searchStr === void 0 ? '' : _props$searchStr,
     showEllipse = props.showEllipse,
     ellipseWidth = props.ellipseWidth,
-    _props$isDiffChange = props.isDiffChange,
-    isDiffChange = _props$isDiffChange === void 0 ? false : _props$isDiffChange;
+    otherProps = props.otherProps;
+  var _ref = otherProps !== null && otherProps !== void 0 ? otherProps : {},
+    _ref$isDiffChange = _ref.isDiffChange,
+    isDiffChange = _ref$isDiffChange === void 0 ? false : _ref$isDiffChange;
   var strTitle = label;
   var index = strTitle === null || strTitle === void 0 ? void 0 : strTitle.indexOf(searchStr);
   var beforeStr = strTitle === null || strTitle === void 0 ? void 0 : strTitle.substring(0, index);

package/lib/ProTreeModal/components/Tree.js

@@ -183,23 +183,21 @@ function List(props, ref) {
     setAutoExpandParent(false);
   };
   if (mode === 'render') {
-    return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: (0, _jsxRuntime.jsx)(_antd.Tree, {
-        disabled: disabled,
-        style: {
-          width: '100%'
-        },
-        checkable: true,
-        treeData: _treeData,
-        onExpand: onExpand,
-        expandedKeys: expandedKeys,
-        autoExpandParent: autoExpandParent,
-        selectable: false,
-        onCheck: onCheck,
-        checkedKeys: checkedValues,
-        checkStrictly: checkStrictly,
-        height: 432
-      })
+    return (0, _jsxRuntime.jsx)(_antd.Tree, {
+      disabled: disabled,
+      style: {
+        width: '100%'
+      },
+      checkable: true,
+      treeData: _treeData,
+      onExpand: onExpand,
+      expandedKeys: expandedKeys,
+      autoExpandParent: autoExpandParent,
+      selectable: false,
+      onCheck: onCheck,
+      checkedKeys: checkedValues,
+      checkStrictly: searchStr ? true : checkStrictly,
+      height: 432
     });
   }
   return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {

package/lib/ProTreeModal/index.js

@@ -20,6 +20,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _index = require("../index");
 var _components = require("./components");
 var _utils = require("./utils");
+var _index2 = require("../ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/utils/index");
 var _inputSearch = _interopRequireDefault(require("../assets/input-search.svg"));
 var _locale = _interopRequireWildcard(require("../locale"));
 require("./style/index.less");
@@ -27,7 +28,7 @@ require("./style/index.less");
  * @Author: za-xuwenli xuwenli@zhongan.io
  * @Date: 2024-06-04 10:01:18
  * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2024-06-25 17:56:33
+ * @LastEditTime: 2024-09-27 11:49:28
  * @FilePath: /za-material-warehouse/src/ProTreeModal/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -100,7 +101,8 @@ var ProTreeModal = function ProTreeModal(props) {
       flatTreeData: [],
       searchStr: '',
       checkAll: false,
-      allKeys: []
+      allKeys: [],
+      transformedTree: []
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     state = _useSetState2[0],
@@ -222,6 +224,12 @@ var ProTreeModal = function ProTreeModal(props) {
       });
     }
   }, [value, state.allKeys, state.open]);
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    var transformedTree = (0, _utils.addLevelAndParentId)(state.treeData, fieldNames);
+    setState({
+      transformedTree: transformedTree
+    });
+  }, [state.treeData]);
   var handleClick = function handleClick() {
     setState({
       open: true
@@ -362,8 +370,55 @@ var ProTreeModal = function ProTreeModal(props) {
   var onCheck = function onCheck(checkedKeys, info) {
     var checkedValues = (0, _toConsumableArray2.default)(state.checkedValues);
     var originalTreeData = state.originalTreeData;
+    // 如果有检索则自管理
+    if (state.searchStr) {
+      var _transformTreeToArray;
+      var node = info.node;
+      // 从完整树中找到当前节点
+      var activeNode = (0, _index2.treeNodeFind)(state.transformedTree, function (t) {
+        return t[fieldNameValue] === node[fieldNameValue];
+      }, {
+        childrenKey: fieldNames.children
+      });
+      var allChildren = (_transformTreeToArray = (0, _index2.transformTreeToArray)([activeNode], {
+        childrenKey: fieldNames.children
+      })) === null || _transformTreeToArray === void 0 ? void 0 : _transformTreeToArray.map(function (item) {
+        return item[fieldNameValue];
+      });
+      // 子项合并勾选
+      checkedValues = checkedValues.concat(allChildren);
+      // 从完整树中拿到父节点 只要存在父节点，那么就判断当前children是否全被勾选 若全被勾选就合并当前key到勾选队列
+      var _recourse2 = function _recourse(findNode) {
+        if (findNode.parentId) {
+          var _transformTreeToArray2;
+          var parentNode = (0, _index2.treeNodeFind)(state.transformedTree, function (t) {
+            return t[fieldNameValue] === findNode.parentId;
+          }, {
+            childrenKey: fieldNames.children
+          });
+          var parentChildrenKeys = (_transformTreeToArray2 = (0, _index2.transformTreeToArray)([parentNode], {
+            childrenKey: fieldNames.children
+          })) === null || _transformTreeToArray2 === void 0 ? void 0 : _transformTreeToArray2.map(function (item) {
+            return item[fieldNameValue];
+          });
+          var parentChildrenAllChecked = parentChildrenKeys.every(function (key) {
+            return checkedValues.includes(key);
+          });
+          if (parentChildrenAllChecked) {
+            // 把当前父节点追加进来
+            checkedValues = checkedValues.concat([parentNode[fieldNameValue]]);
+            // 继续向上查找
+            if (parentNode.parentId) {
+              _recourse2(parentNode);
+            }
+          }
+        }
+      };
+      _recourse2(activeNode);
+    }
+    var _checkStrictly = state.searchStr ? true : checkStrictly;
     // 此时应该取消掉自身并包含它所有的子集
-    if (!info.checked && !checkStrictly) {
+    if (!info.checked && !_checkStrictly) {
       // 1. 取消自身
       // 2. 把所有的子节点也要取消
       var childrenkeys = [];
@@ -380,8 +435,8 @@ var ProTreeModal = function ProTreeModal(props) {
         return !parentKeys.includes(key);
       });
     } else {
-      // checkStrictly 模式下取 checkedKeys.checked 或者自身的 key
-      if (checkStrictly) {
+      // _checkStrictly 模式下取 checkedKeys.checked 或者自身的 key
+      if (_checkStrictly) {
         if (!info.checked) {
           checkedValues = checkedValues.filter(function (key) {
             return key !== info.node.key;
@@ -620,7 +675,7 @@ var ProTreeModal = function ProTreeModal(props) {
         });
       case TREE:
         return (0, _jsxRuntime.jsx)(_components.TreeView, {
-          treeData: state.treeData,
+          treeData: state.transformedTree,
           originalTreeData: state.originalTreeData,
           flatTreeData: state.flatTreeData,
           checkedValues: state.checkedValues,

package/lib/ProTreeModal/utils.d.ts

@@ -36,3 +36,4 @@ export declare function filterCheckedNodes(data: any, checkedKeys: any, searchSt
  */
 export declare function getChildrenKeys(node: TreeDataProps, childrenKeys: string[], fieldNames: FieldNamesType, type: 'treeClose' | 'treeCheck'): void;
 export declare const transformMessage: (obj: any, message: string) => string;
+export declare const addLevelAndParentId: (tree: any[], fieldNames: any, currentLevel?: number, currentParentId?: any) => any[];

package/lib/ProTreeModal/utils.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.addLevelAndParentId = void 0;
 exports.filterCheckedNodes = filterCheckedNodes;
 exports.findTreeNodeByKey = findTreeNodeByKey;
 exports.getAllKeys = getAllKeys;
@@ -209,4 +210,23 @@ var transformMessage = exports.transformMessage = function transformMessage(obj,
     _message = message.replaceAll("{".concat(key, "}"), obj[key]);
   });
   return _message;
+};
+var _addLevelAndParentId = exports.addLevelAndParentId = function addLevelAndParentId() {
+  var tree = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var fieldNames = arguments.length > 1 ? arguments[1] : undefined;
+  var currentLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  var currentParentId = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+  var _fieldNames$children = fieldNames.children,
+    children = _fieldNames$children === void 0 ? 'children' : _fieldNames$children,
+    _fieldNames$value = fieldNames.value,
+    value = _fieldNames$value === void 0 ? 'value' : _fieldNames$value;
+  return tree.map(function (node) {
+    var newNode = (0, _objectSpread4.default)({}, node);
+    newNode.level = currentLevel;
+    newNode.parentId = currentParentId;
+    if (node[children]) {
+      newNode[children] = _addLevelAndParentId(node[children], fieldNames, currentLevel + 1, newNode[value]);
+    }
+    return newNode;
+  });
 };

package/package.json

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