@zat-design/sisyphus-react 3.7.3-beta.2 → 3.7.3-beta.21

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 _recourse = 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) {
+              _recourse(parentNode);
+            }
+          }
+        }
+      };
+      _recourse(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;
@@ -70,7 +71,7 @@ function getAllKeys(data, fieldNames) {
  * @param fieldNames
  * @returns
  */
-var _getParentKey = exports.getParentKey = function getParentKey(key, tree, fieldNames) {
+var getParentKey = exports.getParentKey = function getParentKey(key, tree, fieldNames) {
   var parentKey;
   for (var i = 0; i < tree.length; i++) {
     var node = tree[i];
@@ -79,8 +80,8 @@ var _getParentKey = exports.getParentKey = function getParentKey(key, tree, fiel
         return item[fieldNames.value] === key;
       })) {
         parentKey = node[fieldNames.value];
-      } else if (_getParentKey(key, node[fieldNames.children], fieldNames)) {
-        parentKey = _getParentKey(key, node[fieldNames.children], fieldNames);
+      } else if (getParentKey(key, node[fieldNames.children], fieldNames)) {
+        parentKey = getParentKey(key, node[fieldNames.children], fieldNames);
       }
     }
   }
@@ -88,7 +89,7 @@ var _getParentKey = exports.getParentKey = function getParentKey(key, tree, fiel
 };
 function findTreeNodeByKey(treeData, key, fieldNames) {
   var result = [];
-  var _traverse = function traverse(node, parents) {
+  var traverse = function traverse(node, parents) {
     if (node[fieldNames.value] === key) {
       result.push.apply(result, [node].concat((0, _toConsumableArray2.default)(parents)));
       return true;
@@ -99,7 +100,7 @@ function findTreeNodeByKey(treeData, key, fieldNames) {
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var child = _step.value;
-        if (_traverse(child, [node].concat((0, _toConsumableArray2.default)(parents)))) {
+        if (traverse(child, [node].concat((0, _toConsumableArray2.default)(parents)))) {
           return true;
         }
       }
@@ -115,7 +116,7 @@ function findTreeNodeByKey(treeData, key, fieldNames) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var node = _step2.value;
-      _traverse(node, []);
+      traverse(node, []);
     }
   } catch (err) {
     _iterator2.e(err);
@@ -134,23 +135,23 @@ function filterCheckedNodes(data, checkedKeys) {
   var searchStr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   var fieldNames = arguments.length > 3 ? arguments[3] : undefined;
   var result = [];
-  var _traverse2 = function traverse(node) {
+  var traverse = function traverse(node) {
     var _node$fieldNames$chil3;
     var title = node[fieldNames.value] + node[fieldNames.label];
     if (!searchStr) {
       if (checkedKeys.includes(node[fieldNames.value])) {
         var _node$fieldNames$chil;
-        var _children = (node === null || node === void 0 ? void 0 : (_node$fieldNames$chil = node[fieldNames.children]) === null || _node$fieldNames$chil === void 0 ? void 0 : _node$fieldNames$chil.map(_traverse2).filter(Boolean)) || [];
+        var _children = (node === null || node === void 0 ? void 0 : (_node$fieldNames$chil = node[fieldNames.children]) === null || _node$fieldNames$chil === void 0 ? void 0 : _node$fieldNames$chil.map(traverse).filter(Boolean)) || [];
         return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, node), {}, (0, _defineProperty2.default)({}, fieldNames.children, _children));
       }
     } else if (title.indexOf(searchStr) > -1) {
       var _node$fieldNames$chil2;
-      var _children2 = ((_node$fieldNames$chil2 = node[fieldNames.children]) === null || _node$fieldNames$chil2 === void 0 ? void 0 : _node$fieldNames$chil2.map(_traverse2).filter(Boolean)) || [];
+      var _children2 = ((_node$fieldNames$chil2 = node[fieldNames.children]) === null || _node$fieldNames$chil2 === void 0 ? void 0 : _node$fieldNames$chil2.map(traverse).filter(Boolean)) || [];
       return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, node), {}, {
         children: _children2
       });
     }
-    var children = (_node$fieldNames$chil3 = node[fieldNames.children]) === null || _node$fieldNames$chil3 === void 0 ? void 0 : _node$fieldNames$chil3.map(_traverse2).filter(Boolean);
+    var children = (_node$fieldNames$chil3 = node[fieldNames.children]) === null || _node$fieldNames$chil3 === void 0 ? void 0 : _node$fieldNames$chil3.map(traverse).filter(Boolean);
     if (children && children.length > 0) {
       return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, node), {}, (0, _defineProperty2.default)({}, fieldNames.children, children));
     }
@@ -162,7 +163,7 @@ function filterCheckedNodes(data, checkedKeys) {
   try {
     for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
       var node = _step3.value;
-      var filtered = _traverse2(node);
+      var filtered = traverse(node);
       if (filtered) {
         result.push(filtered);
       }
@@ -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/lib/ProUpload/components/DraggableUploadListItem.d.ts

@@ -1,2 +1,2 @@
 import { DraggableUploadListItemProps } from '../propsType';
-export declare const DraggableUploadListItem: ({ file, children }: DraggableUploadListItemProps) => import("react/jsx-runtime").JSX.Element;
+export declare const DraggableUploadListItem: ({ file, children }: DraggableUploadListItemProps) => JSX.Element;

package/lib/style/theme/antd.less

@@ -749,3 +749,8 @@
     }
   }
 }
+
+.@{ant-prefix}-picker.@{ant-prefix}-picker-disabled  {
+  background: var(--zaui-disabled-bg);
+}
+

package/lib/style/theme/index.less

@@ -8,7 +8,7 @@
   --zaui-brand                      : #006aff;
   --zaui-brand-hover                : #3387ff;
   --zaui-brand-active               : #005ad9;
-  --zaui-brand-disabled             : #99c3ff;
+  --zaui-brand-disabled             : color-mix(in srgb, var(--zaui-brand) 70%, white);
   --zaui-text                       : #343434;
   --zaui-text-weak                  : #616161;
   --zaui-aide-text                  : #909090;
@@ -55,6 +55,7 @@
   --zaui-table-selected-hover-bg    : var(--zaui-table-hover-bg); // 默认同悬停
   --zaui-table-nested-bg            : #fafcfe;
   --zaui-contract-bg                : #fffaa1; // 对比背景色
+  --zaui-contract-bg-add            : #d2fff4; // 新增对比背景色
   --zaui-form-label-width           : 130px; // 8个全角字符宽度
   --zaui-border-radius              : 8px;
   --zaui-border-radius-card         : 4px;

package/lib/style/theme/tokens.less

@@ -53,6 +53,7 @@
 @zaui-table-selected-hover-bg: var(--zaui-table-hover-bg #fafafa);
 @zaui-table-nested-bg: var(--zaui-table-nested-bg #FAFCFE);
 @zaui-contract-bg: var(--zaui-contract-bg; #fffaa1); // 对比背景色
+@zaui-contract-bg-add: var(--zaui-contract-bg-add; #d2fff4); // 新增对比背景色
 @zaui-form-required-after: var(--zaui-form-required-after; inline);
 @zaui-form-required-before: var(--zaui-form-required-before; none);
 @zaui-form-label-width: var(--zaui-form-label-width; 130px);

package/lib/utils/index.d.ts

@@ -0,0 +1,2 @@
+/** 判断一个值是否是空值 */
+export declare const isEmpty: (value: any) => boolean;

package/lib/utils/index.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isEmpty = void 0;
+var EMPTY_VALUE = [undefined, null, ''];
+/** 判断一个值是否是空值 */
+var isEmpty = exports.isEmpty = function isEmpty(value) {
+  if (EMPTY_VALUE.includes(value)) {
+    return true;
+  }
+  if (Array.isArray(value)) {
+    return !(value === null || value === void 0 ? void 0 : value.length) || value.every(function (item) {
+      return EMPTY_VALUE.includes(item);
+    });
+  }
+  return false;
+};

package/package.json

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

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "kisstkondoros.vscode-codemetrics"
-    ]
-}

package/es/ProForm/components/render/Changed.d.ts

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

package/es/ProForm/components/render/Changed.js

@@ -1,64 +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", "originalValues", "form", "equalWith", "children", "type", "originalDiffTip"];
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { get } from 'lodash';
-import React, { useMemo } from 'react';
-import { diffOriginal } from '../../utils/diffOriginal';
-var Changed = function Changed(props) {
-  var name = props.name,
-    names = props.names,
-    namesStr = props.namesStr,
-    originalValues = props.originalValues,
-    form = props.form,
-    equalWith = props.equalWith,
-    children = props.children,
-    type = props.type,
-    originalDiffTip = props.originalDiffTip,
-    rest = _objectWithoutProperties(props, _excluded);
-  // 不渲染tooltip
-  var notWatch = !originalDiffTip || ['FormList', 'ProEditTable'].includes(type);
-  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
-    return get(originalValues, name);
-  }) : get(originalValues, name);
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = useMemo(function () {
-    if (notWatch || noChange) return false;
-    return diffOriginal({
-      originalValue: originalValue,
-      value: props.value,
-      form: form,
-      equalWith: equalWith
-      // name: namesStr || name,
-    });
-  }, [notWatch, noChange, props.value, originalValue]);
-  var tipContent = useMemo(function () {
-    if (notWatch || noChange) return undefined;
-    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, {
-      isView: true,
-      value: originalValue,
-      checked: type === 'Switch' ? originalValue : undefined
-    })) : undefined;
-  }, [originalValue, children]);
-  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", tipContent]
-    }),
-    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 Changed;

package/lib/ProForm/components/render/Changed.d.ts

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

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

@@ -1,69 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _antd = require("antd");
-var _lodash = require("lodash");
-var _react = _interopRequireWildcard(require("react"));
-var _diffOriginal = require("../../utils/diffOriginal");
-var _excluded = ["name", "names", "namesStr", "originalValues", "form", "equalWith", "children", "type", "originalDiffTip"];
-var Changed = function Changed(props) {
-  var name = props.name,
-    names = props.names,
-    namesStr = props.namesStr,
-    originalValues = props.originalValues,
-    form = props.form,
-    equalWith = props.equalWith,
-    children = props.children,
-    type = props.type,
-    originalDiffTip = props.originalDiffTip,
-    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  // 不渲染tooltip
-  var notWatch = !originalDiffTip || ['FormList', 'ProEditTable'].includes(type);
-  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
-    return (0, _lodash.get)(originalValues, name);
-  }) : (0, _lodash.get)(originalValues, name);
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = (0, _react.useMemo)(function () {
-    if (notWatch || noChange) return false;
-    return (0, _diffOriginal.diffOriginal)({
-      originalValue: originalValue,
-      value: props.value,
-      form: form,
-      equalWith: equalWith
-      // name: namesStr || name,
-    });
-  }, [notWatch, noChange, props.value, originalValue]);
-  var tipContent = (0, _react.useMemo)(function () {
-    if (notWatch || 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;
-  }, [originalValue, children]);
-  if (notWatch || noChange) {
-    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
-  }
-  return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    open: changed ? undefined : false,
-    getPopupContainer: function getPopupContainer(target) {
-      return target.parentElement;
-    },
-    title: (0, _jsxRuntime.jsxs)(_antd.Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-    }),
-    children: (0, _jsxRuntime.jsx)("div", {
-      className: changed ? 'pro-form-item-changed' : '',
-      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest)) : undefined
-    })
-  });
-};
-var _default = exports.default = Changed;