@zat-design/sisyphus-react 3.4.2 → 3.4.3

package/es/ProStep/style/index.less

@@ -6,37 +6,38 @@
 }
 
 .pro-step {
-  position        : fixed;
-  right           : 0;
-  z-index         : 101;
-  min-width       : 48px;
-  min-height      : 48px;
-  text-align      : center;
-  background-color: var(--zaui-global-bg, #fff);
-  cursor          : pointer;
-  box-shadow      : -1px 0px 5px 0px var(--zaui-shadow, rgba(56,56,56,0.15));
-  transition      : width .2s;
+  position: fixed;
+  right: 0;
+  z-index: 101;
+  min-width: 48px;
+  min-height: 48px;
   overflow-x: hidden;
   overflow-y: auto;
-
-  >.step-menu {
-    display      : flex;
-    align-items  : center;
-    width        : 100%;
-    height       : 48px;
-    font-size    : var(--zaui-font-size-lg, 16px);
+  text-align: center;
+  background-color: var(--zaui-global-bg, #fff);
+  border-radius: 0 0 var(--zaui-border-radius) var(--zaui-border-radius);
+  box-shadow: -1px 0px 5px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
+  cursor: pointer;
+  transition: width 0.2s;
+
+  > .step-menu {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    height: 48px;
+    font-size: var(--zaui-font-size-lg, 16px);
     border-bottom: 1px solid var(--zaui-line, #dddddd);
 
-    >.menu-icon {
+    > .menu-icon {
       font-size: var(--zaui-font-size-lg-title, 24px);
-      fill     : var(--zaui-brand, #006AFF);
+      fill: var(--zaui-brand, #006aff);
 
-      >div {
-        width          : 48px;
-        height         : 24px;
-        display        : flex;
-        align-items    : center;
+      > div {
+        display: flex;
+        align-items: center;
         justify-content: center;
+        width: 48px;
+        height: 24px;
       }
     }
   }
@@ -50,12 +51,12 @@
   }
 
   .com-menu-item {
-    display        : flex;
-    align-items    : center;
+    display: flex;
+    align-items: center;
     justify-content: space-between;
-    width          : 100%;
-    height         : 48px;
-    padding-right  : var(--zaui-space-size-md, 24px);
+    width: 100%;
+    height: 48px;
+    padding-right: var(--zaui-space-size-md, 24px);
 
     &:hover {
       background-color: rgba(185, 185, 189, 0.1);
@@ -69,63 +70,63 @@
       }
     }
 
-    >.menu-item {
-      display    : flex;
+    > .menu-item {
+      display: flex;
       align-items: center;
 
-      >.menu-icon {
-        display        : flex;
-        align-items    : center;
+      > .menu-icon {
+        display: flex;
+        align-items: center;
         justify-content: center;
-        width          : 48px;
-        height         : 100%;
+        width: 48px;
+        height: 100%;
 
-        >svg {
-          fill: var(--zaui-brand, #006AFF);
+        > svg {
+          fill: var(--zaui-brand, #006aff);
         }
 
-        >.dot {
-          width        : 6px;
-          height       : 6px;
-          background   : var(--zaui-brand, #006AFF);
+        > .dot {
+          width: 6px;
+          height: 6px;
+          background: var(--zaui-brand, #006aff);
           border-radius: 3px;
 
           &.errored {
             background: #ff5050;
-            fill      : #ff5050;
+            fill: #ff5050;
           }
 
           &.disabled {
             background: #939599;
-            fill      : #939599;
+            fill: #939599;
           }
         }
 
         .dot-icon {
-          display        : flex;
-          align-items    : center;
+          display: flex;
+          align-items: center;
           justify-content: center;
-          font-size      : var(--zaui-font-size-sm, 12px);
-          color          : #ffffff;
-          width          : 18px;
-          height         : 18px;
-          background     : var(--zaui-brand, #006AFF);
-          border-radius  : 9px;
+          width: 18px;
+          height: 18px;
+          color: #ffffff;
+          font-size: var(--zaui-font-size-sm, 12px);
+          background: var(--zaui-brand, #006aff);
+          border-radius: 9px;
 
           &.errored {
             background: #ff5050;
-            fill      : #ff5050;
+            fill: #ff5050;
           }
 
           &.disabled {
             background: #939599;
-            fill      : #939599;
+            fill: #939599;
           }
         }
       }
 
-      >.menu-name {
-        color: #0A0A0A;
+      > .menu-name {
+        color: #0a0a0a;
 
         &.disabled {
           color: #626366;
@@ -133,26 +134,26 @@
       }
     }
 
-    >.checked-status {
+    > .checked-status {
       height: 18px;
 
-      >svg {
-        fill: var(--zaui-brand, #006AFF);
+      > svg {
+        fill: var(--zaui-brand, #006aff);
       }
 
       .errorDot {
-        display        : flex;
-        align-items    : center;
+        display: flex;
+        align-items: center;
         justify-content: center;
-        width          : 16px;
-        height         : 16px;
-        background     : rgba(255, 80, 80, 0.2);
-        border-radius  : 8px;
-
-        >span {
-          color        : #ff5050;
-          font-weight  : 600;
-          font-size    : var(--aui-font-size-sm, 12px);
+        width: 16px;
+        height: 16px;
+        background: rgba(255, 80, 80, 0.2);
+        border-radius: 8px;
+
+        > span {
+          color: #ff5050;
+          font-weight: 600;
+          font-size: var(--aui-font-size-sm, 12px);
           border-radius: 8px;
         }
       }

package/es/ProTable/components/RenderColumn/index.d.ts

@@ -5,7 +5,7 @@ interface Props {
     value?: any;
     currentValue?: any;
     copyable?: boolean;
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     ellipsis?: any;
     width?: number | string;
     originalValue?: any;

package/es/ProTable/components/RenderColumn/index.js

@@ -18,10 +18,10 @@ var RenderColumn = function RenderColumn(props) {
     ellipsis = props.ellipsis,
     width = props.width,
     originalValue = props.originalValue,
-    originalTip = props.originalTip;
+    originalDiffTip = props.originalDiffTip;
   if (originalValue !== undefined) {
     var renderNode = value ? node : '-';
-    if (ellipsis || originalTip) {
+    if (ellipsis || originalDiffTip) {
       if (ellipsis) {
         renderNode = _jsx(Text, {
           style: {
@@ -38,7 +38,7 @@ var RenderColumn = function RenderColumn(props) {
         style: {
           width: width
         },
-        title: originalTip ? _jsxs(_Fragment, {
+        title: originalDiffTip ? _jsxs(_Fragment, {
           children: ["\u521D\u59CB\u503C\uFF1A", originalValue, _jsx("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
         }) : node,
         children: renderNode

package/es/ProTable/propsType.d.ts

@@ -26,7 +26,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     precision?: number;
     code?: string | string[] | ((text: any, record: any) => string);
     copyable?: boolean;
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     tooltip?: ReactNode | {

package/es/ProTable/style/index.less

@@ -177,7 +177,7 @@
       margin-left: -8px;
       padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
       background: var(--zaui-contract-bg, #fffaa1);
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
     }
 
     .varied-cell.empty-cell {
@@ -432,7 +432,7 @@
   .@{ant-prefix}-pagination .@{ant-prefix}-pagination-item-active a {
     color: #ffffff;
     background: var(--zaui-brand, #006aff) !important;
-    border-radius: var(--zaui-border-radius, 4px);
+    border-radius: var(--zaui-border-radius, 8px);
   }
 
   .pro-table-footer {

package/es/ProTable/utils.js

@@ -57,8 +57,8 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
     prefix = column.prefix,
     suffix = column.suffix,
     dataIndex = column.dataIndex,
-    _column$originalTip = column.originalTip,
-    originalTip = _column$originalTip === void 0 ? true : _column$originalTip;
+    _column$originalDiffT = column.originalDiffTip,
+    originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -122,7 +122,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: renderValue,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -151,7 +151,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -203,7 +203,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -224,7 +224,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (precision || prefix || suffix) {
@@ -250,7 +250,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (valueType === 'address') {
@@ -322,7 +322,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
           node: value,
           value: value,
           currentValue: value || '-',
-          originalTip: originalTip
+          originalDiffTip: originalDiffTip
         }), suffixNode(value, record, index)]
       });
     };
@@ -344,7 +344,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: value || '-',
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   }

package/es/ProTabs/style/index.less

@@ -70,9 +70,11 @@
 .pro-tabs-tab {
   .pro-tabs-card {
     .@{ant-prefix}-tag {
+      min-width: 22px;
       margin-right: 0;
       padding: 0 var(--zaui-space-size-xs, 4px);
-      border-radius: 10px;
+      text-align: center;
+      border-radius: 12px;
     }
 
     .@{ant-prefix}-space-item {

package/es/ProThemeTools/component/PrdTools/index.d.ts

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

package/es/ProThemeTools/component/PrdTools/index.js

@@ -24,7 +24,7 @@ var PrdTools = function PrdTools(_ref) {
   var onReset = _ref.onReset,
     onClose = _ref.onClose,
     setState = _ref.setState,
-    visible = _ref.visible,
+    open = _ref.open,
     state = _ref.state,
     tableBorder = _ref.tableBorder,
     tableStripe = _ref.tableStripe,
@@ -68,7 +68,7 @@ var PrdTools = function PrdTools(_ref) {
     title: "".concat(locale.ProThemeTools.title),
     placement: "right",
     onClose: onClose,
-    open: visible,
+    open: open,
     closable: false,
     children: [_jsx("div", {
       className: "pro-drawer-close",

package/es/ProThemeTools/component/PrdTools/style/index.less

@@ -29,7 +29,7 @@
       width        : 4px;
       height       : 14px;
       background   : var(--zaui-brand, #006aff);
-      border-radius: var(zaui-border-radius-card, 2px);
+      border-radius: var(zaui-border-radius-card, 4px);
     }
   }
 

package/es/ProThemeTools/index.js

@@ -9,12 +9,14 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme", "onChange"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable prefer-const */
-import { SettingOutlined } from '@ant-design/icons';
+
 import { useEffect, useState } from 'react';
-import { usePrevious, useUpdateEffect } from 'ahooks';
+import { usePrevious, useUpdateEffect, useToggle } from 'ahooks';
+import { ReactSVG } from 'react-svg';
 import { isEqual } from 'lodash';
 import classnames from 'classnames';
 import { getKebabCase, setThemes, setTableBorder, getMapKebabCase, getMapHumpCase } from './utils/index';
+import settingSvg from '../assets/setting.svg';
 import { PrdTools } from './component';
 import locale from '../locale';
 var defaultCacheTime = 1; // 配置保存时间为一天
@@ -50,24 +52,18 @@ var ProThemeTools = function ProThemeTools(_ref) {
     theme = _ref$theme === void 0 ? {} : _ref$theme,
     onChange = _ref.onChange,
     props = _objectWithoutProperties(_ref, _excluded);
-  var _useState = useState(false),
+  var _useToggle = useToggle(false),
+    _useToggle2 = _slicedToArray(_useToggle, 2),
+    visible = _useToggle2[0],
+    toggle = _useToggle2[1].toggle;
+  var _useState = useState(_objectSpread(_objectSpread({}, defaultThemeConfig), getMapHumpCase(theme))),
     _useState2 = _slicedToArray(_useState, 2),
-    visible = _useState2[0],
-    setVisible = _useState2[1];
-  var _useState3 = useState(_objectSpread(_objectSpread({}, defaultThemeConfig), getMapHumpCase(theme))),
-    _useState4 = _slicedToArray(_useState3, 2),
-    state = _useState4[0],
-    setState = _useState4[1];
+    state = _useState2[0],
+    setState = _useState2[1];
   var previousState = usePrevious(state);
   var zauiBrand = state.zauiBrand,
     zauiStripe = state.zauiStripe,
     zauiTableBorder = state.zauiTableBorder;
-  var showDrawer = function showDrawer() {
-    setVisible(true);
-  };
-  var onClose = function onClose() {
-    setVisible(false);
-  };
   // 重置
   var onReset = function onReset() {
     setState(_objectSpread(_objectSpread({}, state), defaultThemeConfig));
@@ -180,24 +176,21 @@ var ProThemeTools = function ProThemeTools(_ref) {
     'pro-theme-tools': true,
     'pro-theme-tools-follow': iconFollowTheme
   }, className, className));
-  return _jsxs("div", _objectSpread(_objectSpread({
-    className: cls
-  }, props), {}, {
-    children: [_jsx(SettingOutlined, {
-      style: {
-        fontSize: "".concat(size, "px"),
-        color: color
-      },
-      onClick: function onClick() {
-        showDrawer();
-      }
+  return _jsxs("div", _objectSpread(_objectSpread({}, props), {}, {
+    children: [_jsx("div", {
+      className: cls,
+      onClick: toggle,
+      children: _jsx(ReactSVG, {
+        className: "setting-icon",
+        src: settingSvg
+      })
     }), _jsx(PrdTools, {
       prefixCls: prefixCls,
       onReset: onReset,
-      onClose: onClose,
+      onClose: toggle,
       onCopy: onCopy,
       setState: setState,
-      visible: visible,
+      open: visible,
       state: state,
       tableBorder: tableBorder,
       tableStripe: tableStripe

package/es/ProThemeTools/propsType.d.ts

@@ -3,7 +3,7 @@ export interface DevToolsPropsType {
     onClose: () => void;
     onCopy?: () => void;
     setState: any;
-    visible: boolean;
+    open: boolean;
     state: LocalThemeConfigPropsType;
     /** 是否有表格边框 */
     tableBorder?: boolean;

package/es/ProThemeTools/style/index.less

@@ -5,18 +5,35 @@
 
 .pro-theme-tools {
   display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 34px;
+  height: 34px;
+  background: #d8e6ff;
+  border-radius: var(--zaui-border-radius, 8px);
+  cursor: pointer;
+
+  .setting-icon {
+    margin-top: -1px;
+    div {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
 
   &.pro-theme-tools-follow {
+    background: var(--ant-primary-1);
     svg {
       color: var(--zaui-brand, #006aff);
     }
   }
 
   .anticon {
-    color: var(--zaui-brand, #006aff);
+    color: var(--zaui-text, #343434);
 
     svg {
-      font-size: var(--zaui-font-size-lg-title, 24px)
+      font-size: 20px;
     }
   }
 }
@@ -36,16 +53,16 @@
 
   .copy-btn {
     position: absolute;
-    width   : calc(100% - 64px);
-    bottom  : 20px;
-    left    : 32px;
-    z-index : 10;
+    bottom: 20px;
+    left: 32px;
+    z-index: 10;
+    width: calc(100% - 64px);
   }
 
   .pro-theme-tools-box {
-    display        : flex;
+    display: flex;
+    flex-wrap: wrap;
     justify-content: space-between;
-    flex-wrap      : wrap;
   }
 
   .pro-theme-tools-space {

package/es/{ProTreeSelect → ProTree/components/ProTreeSelect}/index.js

@@ -11,12 +11,14 @@ import _TreeSelect from "antd/es/tree-select";
 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"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/* eslint-disable react/no-danger */
+/* eslint-disable react/jsx-closing-tag-location */
 import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { useImperativeHandle, forwardRef } from 'react';
 import { cloneDeep } from 'lodash';
-import { useProConfig } from '../ProConfigProvider';
-import Container from '../ProForm/components/Container';
+import { useProConfig } from '../../../ProConfigProvider';
+import Container from '../../../ProForm/components/Container';
 var SHOW_PARENT = _TreeSelect.SHOW_PARENT;
 export var ProTreeSelect = function ProTreeSelect(props, ref) {
   // 全局属性配置在ConfigProvider
@@ -282,8 +284,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
    */
   var renderTreeNode = function renderTreeNode(node, grade) {
     var children = node.children,
-      icon = node.icon,
-      hideNodeClass = node.hideNodeClass;
+      icon = node.icon;
     var labelText = node[label];
     var value = node[code];
     var titleHtml = _jsx("span", {
@@ -302,10 +303,10 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
       children: [_jsx("span", {
         className: "check-option-text-content",
         children: titleHtml
-      }), _jsx("span", {
+      }), !disabled ? _jsx("span", {
         className: "check-mark-icon",
         children: _jsx(Icon, {})
-      })]
+      }) : null]
     });
     if (!children) {
       return _jsx(_TreeSelect.TreeNode, {
@@ -357,10 +358,6 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
           item[label] = item[label].replace(regExp, "<span class=\"highlight-search-text\">".concat(keyWord, "</span>"));
         }
         currentAllNodeChild.push(item);
-        // if (tag || item?.children?.length) {
-        //   // 如果子节点有匹配项或者自己匹配了那么都加入结果中
-        //   currentAllNodeChild.push(item);
-        // }
       }
       return currentAllNodeChild;
     };
@@ -473,7 +470,6 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
   var treeProps = _objectSpread({
     disabled: disabled,
     showSearch: showSearch,
-    // filterTreeNode: filterTreeNodeEvent,
     treeDefaultExpandAll: defaultExpandAll,
     treeExpandedKeys: expandedKeys,
     treeCheckable: treeCheckable,

package/es/{ProTreeSelect → ProTree/components/ProTreeSelect}/propsType.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { TreeSelectProps } from 'antd';
 import { Service, Options, Result } from 'ahooks/lib/useRequest/src/types';
-import { ProFormOtherProps } from '../ProForm/propsType';
+import { ProFormOtherProps } from '../../../ProForm/propsType';
 export interface DataProps {
     label: string;
     value?: string;

package/es/ProTree/index.js

@@ -8,7 +8,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *@Description: ProTree组件，集成了tree和treeSelect
 */
 import ProTree from './components/ProTree';
-import ProTreeSelect from '../ProTreeSelect';
+import ProTreeSelect from './components/ProTreeSelect';
 var ProTreeHandle = function ProTreeHandle(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'tree' : _props$mode;

package/es/ProTreeModal/style/index.less

@@ -53,7 +53,7 @@
     font-size: var(--zaui-font-size, 14px);
     line-height: 20px;
     border: 1px solid #e6e6e6;
-    border-radius: var(--zaui-border-radius, 4px);
+    border-radius: var(--zaui-border-radius, 8px);
 
     &:first-child {
       margin-right: var(--zaui-space-size-md, 16px);
@@ -246,7 +246,7 @@
       font-size: var(--zaui-font-size, 14px);
       background: #f2f2f2;
       border: none;
-      border-radius: var(--zaui-border-radius, 4px);
+      border-radius: var(--zaui-border-radius, 8px);
 
       .pro-tooltip {
         flex: 1;

package/es/ProUpload/style/fileItem.less

@@ -12,7 +12,7 @@
       line-height: 16px;
       &:hover {
         background: #F8F9FA;
-        border-radius: var(--zaui-border-radius, 4px);
+        border-radius: var(--zaui-border-radius, 8px);
         color: var(--zaui-brand);
         .file-actions-wrap {
           .file-actions{
@@ -93,7 +93,7 @@
       justify-content: center;
       &:hover {
         background: #F8F9FA;
-        border-radius: var(--zaui-border-radius, 4px);
+        border-radius: var(--zaui-border-radius, 8px);
       }
       &:hover,&.file-box-error {
         .file-actions-wrap {