@zat-design/sisyphus-react 3.2.2 → 3.3.0

package/lib/ProTree/propsType.d.ts

@@ -118,8 +118,8 @@ export interface ProTreeProps extends PropTreeSelectProps {
     prefixCls?: string;
     children?: any;
     blockNode?: boolean;
-    /** 复选模式下，点中的树节点key */
-    selectKey?: string | number | undefined;
+    /** 点中的树节点key,表单模式下value有值该配置优先级降低 */
+    selectedKey?: string | number | undefined;
 }
 export interface DataProps {
     label?: string;

package/lib/ProTree/style/index.less

@@ -1,10 +1,13 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-tree {
   height: 100%; // tree auto css
 
-  .ant-spin-nested-loading {
+  .@{ant-prefix}-spin-nested-loading {
     height: 100%; // tree auto css
 
-    .ant-spin-container {
+    .@{ant-prefix}-spin-container {
       height: 100%; // tree auto css
     }
   }
@@ -68,19 +71,19 @@
       }
     }
 
-    .ant-tree-checkbox {
+    .@{ant-prefix}-tree-checkbox {
       margin-top: 11px;
     }
 
-    .ant-tree-switcher {
+    .@{ant-prefix}-tree-switcher {
       line-height: 44px;
     }
 
-    .ant-tree-switcher-leaf-line {
+    .@{ant-prefix}-tree-switcher-leaf-line {
       display: none;
     }
 
-    .ant-tree-treenode {
+    .@{ant-prefix}-tree-treenode {
       align-items: flex-start;
       width      : 100%;
       padding    : 0;
@@ -88,15 +91,15 @@
       font-size  : var(--zaui-font-size);
     }
 
-    .ant-tree-node-content-wrapper {
+    .@{ant-prefix}-tree-node-content-wrapper {
       min-height : 20px;
       line-height: 20px;
     }
 
-    .ant-tree-node-content-wrapper {
+    .@{ant-prefix}-tree-node-content-wrapper {
       width: 100%;
 
-      .ant-tree-title {
+      .@{ant-prefix}-tree-title {
         display: block;
         width  : 100%;
       }
@@ -104,13 +107,13 @@
 
     // 只读状态下，是否隐藏未勾选行
     .hide-disable-node {
-      .ant-tree-treenode.ant-tree-treenode-disabled {
+      .@{ant-prefix}-tree-treenode.@{ant-prefix}-tree-treenode-disabled {
         display: none;
       }
 
-      .ant-tree-treenode-checkbox-indeterminate,
-      .ant-tree-treenode-checkbox-checked {
-        &.ant-tree-treenode-disabled {
+      .@{ant-prefix}-tree-treenode-checkbox-indeterminate,
+      .@{ant-prefix}-tree-treenode-checkbox-checked {
+        &.@{ant-prefix}-tree-treenode-disabled {
           display: flex;
         }
       }
@@ -221,17 +224,17 @@
   }
 
   // 连接线、箭头宽度
-  .ant-tree-show-line .ant-tree-indent-unit {
+  .@{ant-prefix}-tree-show-line .@{ant-prefix}-tree-indent-unit {
     width: 20px;
   }
 
-  .ant-tree-switcher {
+  .@{ant-prefix}-tree-switcher {
     width     : 20px;
     align-self: flex-start;
     margin-top: -4px;
   }
 
-  .ant-tree-show-line .ant-tree-indent-unit::before {
+  .@{ant-prefix}-tree-show-line .@{ant-prefix}-tree-indent-unit::before {
     right: 9px;
   }
 
@@ -244,8 +247,8 @@
   }
 
   // 去除antd白色背景
-  .ant-tree-show-line .ant-tree-switcher,
-  .ant-tree {
+  .@{ant-prefix}-tree-show-line .@{ant-prefix}-tree-switcher,
+  .@{ant-prefix}-tree {
     background-color: transparent;
   }
 
@@ -264,12 +267,12 @@
   padding-top: 0px;
   min-width  : 120px;
 
-  .ant-popover-inner-content {
+  .@{ant-prefix}-popover-inner-content {
     padding: 0px;
     width  : 100%;
   }
 
-  .ant-popover-arrow {
+  .@{ant-prefix}-popover-arrow {
     display: none;
   }
 
@@ -301,8 +304,8 @@
   }
 }
 
-.ant-tree .ant-tree-treenode-disabled {
-  .ant-tree-node-content-wrapper {
+.@{ant-prefix}-tree .@{ant-prefix}-tree-treenode-disabled {
+  .@{ant-prefix}-tree-node-content-wrapper {
     color: var(--zaui-text);
   }
 
@@ -316,20 +319,20 @@
 }
 
 // 重置ant-form view模式样式ant-tree样式
-.pro-form.pro-form-view .ant-form-item .pro-tree * {
+.pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree * {
   line-height: 1 !important;
   height     : auto !important;
   min-height : auto !important;
 }
 
-.pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox {
+.pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree .@{ant-prefix}-tree-checkbox {
   margin-top: var(--zaui-space-size-sm);
 }
 
-.pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-switcher {
+.pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree .@{ant-prefix}-tree-switcher {
   padding-top: var(--zaui-font-size-sm);
 }
 
-.pro-form.pro-form-view .ant-form-item .pro-tree .ant-tree-checkbox * {
+.pro-form.pro-form-view .@{ant-prefix}-form-item .pro-tree .@{ant-prefix}-tree-checkbox * {
   height: 16px !important;
 }

package/lib/ProTree/utils.d.ts

@@ -35,3 +35,9 @@ export declare function filterCheckedNodes(data: any, checkedKeys: any, searchSt
  * @returns
  */
 export declare function getChildrenKeys(node: TreeDataProps, childrenKeys: string[], fieldNames: FieldNamesType, type: 'treeClose' | 'treeCheck'): void;
+/**
+ * 如果默认全开展那么返回所有key，否则返回空[]
+ * @param isExpand 是否全展开
+ * @param allkeys 所有key
+ */
+export declare function getDefaultExpandKeys(isExpand: any, allKeys: any): any;

package/lib/ProTree/utils.js

@@ -8,6 +8,7 @@ exports.filterCheckedNodes = filterCheckedNodes;
 exports.findTreeNodeByKey = findTreeNodeByKey;
 exports.getAllKeys = getAllKeys;
 exports.getChildrenKeys = getChildrenKeys;
+exports.getDefaultExpandKeys = getDefaultExpandKeys;
 exports.getFlatTreeData = getFlatTreeData;
 exports.getParentKey = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -192,4 +193,15 @@ function getChildrenKeys(node, childrenKeys, fieldNames, type) {
       }
     });
   }
+}
+/**
+ * 如果默认全开展那么返回所有key，否则返回空[]
+ * @param isExpand 是否全展开
+ * @param allkeys 所有key
+ */
+function getDefaultExpandKeys(isExpand, allKeys) {
+  if (isExpand) {
+    return allKeys;
+  }
+  return [];
 }

package/lib/ProTreeModal/components/CloseIcon.js

@@ -8,11 +8,9 @@ exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 function CloseIcon(props) {
-  return (0, _jsxRuntime.jsx)("span", (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    className: "ant-input-suffix"
-  }, props), {}, {
+  return (0, _jsxRuntime.jsx)("span", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
     children: (0, _jsxRuntime.jsx)("span", {
-      className: "ant-input-clear-icon pro-tree-modal-checkbox-close",
+      className: "pro-tree-modal-checkbox-close",
       role: "button",
       children: (0, _jsxRuntime.jsx)("span", {
         role: "img",

package/lib/ProTreeModal/components/Trigger.d.ts

@@ -5,9 +5,12 @@ interface TriggerProps {
     disabled?: boolean;
     isView?: boolean;
     checkAll?: boolean;
+    appoint: boolean;
+    allValue?: string | number;
     triggerStyle?: CSSProperties;
     handleClick: () => void;
     handleClearAll: () => void;
+    appointChange: (appoint?: boolean) => void;
 }
 declare function Trigger(props: TriggerProps): JSX.Element;
 export default Trigger;

package/lib/ProTreeModal/components/Trigger.js

@@ -7,25 +7,51 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _reactSvg = require("react-svg");
+var _ahooks = require("ahooks");
 var _locale = _interopRequireWildcard(require("../../locale"));
 var _view = _interopRequireDefault(require("../../assets/view.svg"));
 function Trigger(props) {
-  var _locale$ProTreeModal, _locale$ProTreeModal2, _locale$ProTreeModal3;
-  var checkedValues = props.checkedValues,
-    handleClick = props.handleClick,
-    handleClearAll = props.handleClearAll,
-    value = props.value,
-    checkAll = props.checkAll,
+  var _locale$ProTreeModal2, _locale$ProTreeModal3;
+  var value = props.value,
     disabled = props.disabled,
     isView = props.isView,
-    triggerStyle = props.triggerStyle;
-  return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [isView ? (0, _jsxRuntime.jsxs)("div", {
+    triggerStyle = props.triggerStyle,
+    appoint = props.appoint,
+    allValue = props.allValue,
+    checkAll = props.checkAll,
+    checkedValues = props.checkedValues,
+    handleClick = props.handleClick,
+    handleClearAll = props.handleClearAll,
+    appointChange = props.appointChange;
+  var _useSetState = (0, _ahooks.useSetState)({
+      mode: 'appoint'
+    }),
+    _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
+    state = _useSetState2[0],
+    setState = _useSetState2[1];
+  (0, _react.useEffect)(function () {
+    if (checkAll && appoint) {
+      setState({
+        mode: 'all'
+      });
+    }
+  }, [checkAll]);
+  var onIconClick = function onIconClick() {
+    if (appoint && state.mode === 'all') {
+      return;
+    }
+    handleClick();
+  };
+  if (isView) {
+    var _locale$ProTreeModal;
+    return (0, _jsxRuntime.jsxs)("div", {
       className: "pro-tree-modal-isView",
       children: [(0, _jsxRuntime.jsx)("div", {
         children: checkedValues.length === 0 ? '-' : checkAll ? _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.checkAll : (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTreeModal = _locale.default.ProTreeModal) === null || _locale$ProTreeModal === void 0 ? void 0 : _locale$ProTreeModal.checkNumber, {
@@ -36,11 +62,44 @@ function Trigger(props) {
         children: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
           className: "viewSvg",
           src: _view.default,
-          onClick: handleClick
+          onClick: onIconClick
         })
       })]
-    }) : (0, _jsxRuntime.jsx)(_antd.Input, {
-      className: (0, _classnames.default)(disabled ? 'trigger-no-hover' : ''),
+    });
+  }
+  var onAppointChange = function onAppointChange(value) {
+    setState({
+      mode: value
+    });
+    if (value === 'all') {
+      appointChange === null || appointChange === void 0 ? void 0 : appointChange(true);
+    } else {
+      appointChange === null || appointChange === void 0 ? void 0 : appointChange(false);
+    }
+  };
+  var TriggerComponent = function TriggerComponent(props) {
+    if (appoint) {
+      return (0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
+        block: true,
+        children: [(0, _jsxRuntime.jsxs)(_antd.Select, {
+          defaultValue: "appoint",
+          value: state.mode,
+          onChange: onAppointChange,
+          children: [(0, _jsxRuntime.jsx)(_antd.Select.Option, {
+            value: "all",
+            children: "\u5168\u90E8"
+          }), (0, _jsxRuntime.jsx)(_antd.Select.Option, {
+            value: "appoint",
+            children: "\u6307\u5B9A"
+          })]
+        }), props.children]
+      });
+    }
+    return props.children;
+  };
+  return (0, _jsxRuntime.jsx)(TriggerComponent, {
+    children: (0, _jsxRuntime.jsx)(_antd.Input, {
+      className: (0, _classnames.default)(disabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
       onClick: handleClick,
       value: checkedValues.length === 0 ? null : checkAll ? _locale.default === null || _locale.default === void 0 ? void 0 : _locale.default.ProTreeModal.checkAll : (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTreeModal2 = _locale.default.ProTreeModal) === null || _locale$ProTreeModal2 === void 0 ? void 0 : _locale$ProTreeModal2.checkNumber, {
         num: checkedValues.length
@@ -55,16 +114,13 @@ function Trigger(props) {
         }), (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
           className: "viewSvg",
           src: _view.default,
-          onClick: handleClick
+          onClick: onIconClick
         })]
       }),
       placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProTreeModal3 = _locale.default.ProTreeModal) === null || _locale$ProTreeModal3 === void 0 ? void 0 : _locale$ProTreeModal3.select,
-      disabled: disabled,
+      disabled: disabled || appoint && value === allValue,
       style: (0, _objectSpread2.default)({}, triggerStyle)
-    }), (0, _jsxRuntime.jsx)(_antd.Input, {
-      type: "hidden",
-      value: value
-    })]
+    })
   });
 }
 var _default = exports.default = Trigger;

package/lib/ProTreeModal/index.js

@@ -58,6 +58,7 @@ var ProTreeModal = function ProTreeModal(props) {
     max = props.max,
     draggable = props.draggable,
     span = props.span,
+    appoint = props.appoint,
     _props$fieldNames = props.fieldNames,
     fieldNames = _props$fieldNames === void 0 ? {
       label: 'label',
@@ -78,6 +79,7 @@ var ProTreeModal = function ProTreeModal(props) {
   var _useSetState = (0, _ahooks.useSetState)({
       open: false,
       checkedValues: [],
+      beforeClearAllValues: [],
       treeData: [],
       treeViewData: [],
       originalTreeData: [],
@@ -264,6 +266,7 @@ var ProTreeModal = function ProTreeModal(props) {
     }) : [];
     setState({
       checkedValues: _checkedValues,
+      beforeClearAllValues: state.checkedValues,
       treeViewData: [],
       checkAll: false
     });
@@ -272,9 +275,18 @@ var ProTreeModal = function ProTreeModal(props) {
    * Drawer close
    */
   var handleClose = function handleClose() {
-    setState({
-      open: false
-    });
+    var _state$beforeClearAll;
+    if ((_state$beforeClearAll = state.beforeClearAllValues) === null || _state$beforeClearAll === void 0 ? void 0 : _state$beforeClearAll.length) {
+      setState({
+        open: false,
+        checkedValues: state.beforeClearAllValues,
+        beforeClearAllValues: []
+      });
+    } else {
+      setState({
+        open: false
+      });
+    }
     openChange === null || openChange === void 0 ? void 0 : openChange(false);
   };
   /**
@@ -459,6 +471,23 @@ var ProTreeModal = function ProTreeModal(props) {
       });
     }
   };
+  /**
+   * 指定模式下的操作
+   * @param appoint
+   */
+  var appointChange = function appointChange(appoint) {
+    if (appoint) {
+      onChange === null || onChange === void 0 ? void 0 : onChange(allValue);
+      setState({
+        checkAll: true
+      });
+    } else {
+      onChange === null || onChange === void 0 ? void 0 : onChange([]);
+      setState({
+        checkAll: false
+      });
+    }
+  };
   /**
    * Trigger the container opened by Drawer
    * default example and you can customize trigger={<Button>打开</Button>}
@@ -474,12 +503,15 @@ var ProTreeModal = function ProTreeModal(props) {
     return (0, _jsxRuntime.jsx)(_components.Trigger, {
       checkedValues: state.checkedValues,
       value: value,
-      handleClick: handleClick,
-      handleClearAll: handleClearAll,
       checkAll: state.checkAll,
       triggerStyle: style,
       disabled: disabled,
-      isView: isView
+      isView: isView,
+      appoint: appoint,
+      allValue: allValue,
+      handleClick: handleClick,
+      handleClearAll: handleClearAll,
+      appointChange: appointChange
     });
   }, [state.checkedValues, state.checkAll, style, disabled, isView]);
   /**

package/lib/ProTreeModal/propsType.d.ts

@@ -21,6 +21,7 @@ export interface FieldNamesType {
     value: string;
     children?: string;
 }
+export type TreeModalMode = 'tree' | 'list' | 'Cascader' | 'Tree' | 'List';
 export interface ProTreeModalProps {
     /** value */
     value?: AllValueType | string[];
@@ -30,8 +31,10 @@ export interface ProTreeModalProps {
     open?: boolean;
     /** 列表时候一行放几个 */
     span?: number;
-    /** 展示类型、默认list 列表展示形式 */
-    mode?: 'tree' | 'list' | 'Cascader' | 'Tree' | 'List';
+    /** 展示类型、默认list 列表展示形式、appoint 指定模式展示形式会不一样 */
+    mode?: TreeModalMode;
+    /** 是否开启指定模式 */
+    appoint?: boolean;
     /** 开启后、提交给后端 [{ label:xx, value: ""}] 形式  */
     labelInValue?: boolean;
     /** 查看模式、同 disabled 一样 */

package/lib/ProTreeModal/style/index.less

@@ -1,4 +1,7 @@
-.pro-tree-modal-container .ant-modal-content .ant-modal-body {
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
+.pro-tree-modal-container .@{ant-prefix}-modal-content .@{ant-prefix}-modal-body {
   max-height: 498px;
 }
 
@@ -13,16 +16,16 @@
     height        : 482px;
     margin-bottom : calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 
-    .ant-tree-checkbox {
+    .@{ant-prefix}-tree-checkbox {
       margin-top: 2px;
     }
 
-    .ant-tree-switcher {
+    .@{ant-prefix}-tree-switcher {
       width      : 20px;
       line-height: 20px;
     }
 
-    .ant-tree-treenode {
+    .@{ant-prefix}-tree-treenode {
       width         : 100%;
       padding       : 0;
       padding-bottom: var(--zaui-font-size-sm, 12px);
@@ -31,12 +34,12 @@
       line-height   : 20px;
     }
 
-    .ant-tree-node-content-wrapper {
+    .@{ant-prefix}-tree-node-content-wrapper {
       min-height : 20px;
       line-height: 20px;
     }
 
-    .ant-tree-node-content-wrapper {
+    .@{ant-prefix}-tree-node-content-wrapper {
       width: 100%;
     }
   }
@@ -113,7 +116,7 @@
       color: #616161;
     }
 
-    .ant-btn-link {
+    .@{ant-prefix}-btn-link {
       padding: 0;
     }
   }
@@ -223,7 +226,7 @@
       margin-top: 0;
     }
 
-    .ant-tag {
+    .@{ant-prefix}-tag {
       display        : flex;
       align-items    : center;
       justify-content: space-between;

package/lib/ProTreeSelect/index.js

@@ -17,7 +17,7 @@ var _react = require("react");
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../ProForm/components/Container"));
-var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "treeDefaultExpandAll", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
+var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
   _excluded2 = ["children"];
 var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;
 var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
@@ -51,8 +51,9 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     filterTreeNode = props.filterTreeNode,
     _props$treeNodeFilter = props.treeNodeFilterProp,
     treeNodeFilterProp = _props$treeNodeFilter === void 0 ? 'label' : _props$treeNodeFilter,
-    _props$treeDefaultExp = props.treeDefaultExpandAll,
-    treeDefaultExpandAll = _props$treeDefaultExp === void 0 ? true : _props$treeDefaultExp,
+    _props$defaultExpandA = props.defaultExpandAll,
+    defaultExpandAll = _props$defaultExpandA === void 0 ? true : _props$defaultExpandA,
+    expandedKeys = props.expandedKeys,
     _props$treeCheckable = props.treeCheckable,
     treeCheckable = _props$treeCheckable === void 0 ? true : _props$treeCheckable,
     _onSearch = props.onSearch,
@@ -477,7 +478,8 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     disabled: disabled,
     showSearch: showSearch,
     // filterTreeNode: filterTreeNodeEvent,
-    treeDefaultExpandAll: treeDefaultExpandAll,
+    treeDefaultExpandAll: defaultExpandAll,
+    treeExpandedKeys: expandedKeys,
     treeCheckable: treeCheckable,
     showCheckedStrategy: SHOW_PARENT,
     value: value,

package/lib/ProTreeSelect/propsType.d.ts

@@ -69,6 +69,8 @@ export interface PropTreeSelectProps extends Omit<TreeSelectProps, 'onSearch'> {
         service: Service<any, any>;
         options?: Options<any, any>;
     };
+    defaultExpandAll?: boolean;
+    expandedKeys?: any[];
 }
 export interface ProSelectAction {
     /** 获取发生请求的 useRequest 的 ref */