@zat-design/sisyphus-react 3.4.4-beta.5 → 3.4.5

package/es/ProIcon/config/index.d.ts

@@ -3,3 +3,15 @@ export declare const iconMap: {
     'text-cn': string;
     'text-en': string;
 }[];
+export declare const themeMap: {
+    '#006AFF': string[];
+    '#00BC70': string[];
+    '#FF8C16': string[];
+    '#A00F20': string[];
+};
+export declare const themeFillMap: {
+    '#006AFF': string[];
+    '#00BC70': string[];
+    '#FF8C16': string[];
+    '#A00F20': string[];
+};

package/es/ProIcon/config/index.js

@@ -254,4 +254,18 @@ export var iconMap = [{
   type: 'tiaozhengxuhao',
   'text-cn': '调整序号',
   'text-en': 'adjust order'
-}];
+}];
+// 渐变色icon预设
+export var themeMap = {
+  '#006AFF': ['#ADDDFF', '#5FB3D8', '#4181FF'],
+  '#00BC70': ['#FFFFFF', '#54DFA7', '#00BC70'],
+  '#FF8C16': ['#FFFFFF', '#FFA74E', '#FF8C17'],
+  '#A00F20': ['#FFFFFF', '#E47B7B', '#A00E20']
+};
+// 双色icon预设
+export var themeFillMap = {
+  '#006AFF': ['none', '#87F1FC', 'black', '#4181FF'],
+  '#00BC70': ['none', '#05FFEC', 'black', '#00BC70'],
+  '#FF8C16': ['none', '#FED736', 'black', '#FF8C17'],
+  '#A00F20': ['none', '#FD8357', 'black', '#A00E20']
+};

package/es/ProIcon/index.js

@@ -1,17 +1,24 @@
 import "antd/es/button/style";
 import _Button from "antd/es/button";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList"];
+var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useExternal } from 'ahooks';
 import classNames from 'classnames';
 import { uniqBy } from 'lodash';
+import { ReactSVG } from 'react-svg';
 import { useProConfig } from '../ProConfigProvider';
-import { iconMap } from './config';
+import { iconMap, themeMap, themeFillMap } from './config';
+import { recurseGetNodes } from './utils';
 import locale from '../locale';
 var ProIcon = function ProIcon(props) {
-  var config = useProConfig('ProIcon') || {};
+  var _useProConfig = useProConfig(),
+    state = _useProConfig.state;
+  var config = state.ProIcon,
+    antdTheme = state.theme;
   var _config = _objectSpread(_objectSpread({}, config), props !== null && props !== void 0 ? props : {});
   var _config$type = _config.type,
     type = _config$type === void 0 ? null : _config$type,
@@ -35,11 +42,17 @@ var ProIcon = function ProIcon(props) {
     children = _config.children,
     _config$mapList = _config.mapList,
     mapList = _config$mapList === void 0 ? [] : _config$mapList,
+    src = _config.src,
+    actionMap = _config.actionMap,
     reset = _objectWithoutProperties(_config, _excluded);
+  // 主题色
+  var _ref = antdTheme !== null && antdTheme !== void 0 ? antdTheme : {},
+    _ref$primaryColor = _ref.primaryColor,
+    primaryColor = _ref$primaryColor === void 0 ? '#006AFF' : _ref$primaryColor;
   // 语言
   var language = locale.ProIcon.language;
   // 加载内部icon
-  var status = useExternal('https://at.alicdn.com/t/c/font_4063056_jmnz9g5uycp.js');
+  useExternal('https://at.alicdn.com/t/c/font_4063056_jmnz9g5uycp.js');
   var rotateStyle = rotate ? {
     msTransform: "rotate(".concat(rotate, "deg)"),
     transform: "rotate(".concat(rotate, "deg)")
@@ -61,6 +74,8 @@ var ProIcon = function ProIcon(props) {
   var mergedMapList = uniqBy(mapList.concat(iconMap), targetTextFill);
   var _type = type;
   var _text = children;
+  // svg图标对应文本
+  var iconText = '';
   var typeIsExistAndIncludeEnglish = _type && /[a-zA-Z]/.test(_type);
   // 模式为icon下，对传入的text进行指定语言-icon 映射
   if (isIconMode && !type) {
@@ -70,6 +85,7 @@ var ProIcon = function ProIcon(props) {
       });
       if (target) {
         _type = target === null || target === void 0 ? void 0 : target.type;
+        iconText = target[targetTextFill];
       }
     }
   }
@@ -84,24 +100,89 @@ var ProIcon = function ProIcon(props) {
       }
     }
   }
+  var svgProps = {
+    className: proIconClassNames,
+    fill: 'currentColor',
+    style: _objectSpread(_objectSpread({
+      width: size,
+      height: size
+    }, rotateStyle), style)
+  };
   var RenderIcon = _jsx("span", _objectSpread(_objectSpread({
     className: "anticon",
     style: {
       color: color
     }
   }, reset), {}, {
-    children: _jsx("svg", {
-      className: proIconClassNames,
-      "aria-hidden": "true",
-      onClick: onClick,
-      fill: "currentColor",
-      style: _objectSpread(_objectSpread({
-        width: size,
-        height: size
-      }, rotateStyle), style),
-      children: _jsx("use", {
-        xlinkHref: "#icon-".concat(_type)
-      })
+    children: _jsx(_Tooltip, {
+      title: iconText,
+      children: !src ? _jsx("svg", _objectSpread(_objectSpread({}, svgProps), {}, {
+        onClick: onClick,
+        "aria-hidden": "true",
+        children: _jsx("use", {
+          xlinkHref: "#icon-".concat(_type)
+        })
+      })) : _jsx(ReactSVG, _objectSpread(_objectSpread({}, svgProps), {}, {
+        // @ts-ignore
+        onClick: onClick,
+        "aria-hidden": "true",
+        src: src,
+        beforeInjection: function beforeInjection(svg) {
+          if (actionMap && svg) {
+            var _actionMap$themeMap, _actionMap$themeFillM, _actionMap$gradation, _actionMap$fill;
+            // 项目内置的四种主题匹配渐变色
+            var mergeThemeMap = _objectSpread(_objectSpread({}, themeMap), (_actionMap$themeMap = actionMap.themeMap) !== null && _actionMap$themeMap !== void 0 ? _actionMap$themeMap : {});
+            // 项目内置的四种双色匹配fill
+            var mergeFillThemeMap = _objectSpread(_objectSpread({}, themeFillMap), (_actionMap$themeFillM = actionMap.themeFillMap) !== null && _actionMap$themeFillM !== void 0 ? _actionMap$themeFillM : {});
+            var _gradList = mergeThemeMap[primaryColor];
+            var _fillList = mergeFillThemeMap[primaryColor];
+            // 渐变操作序列
+            var gradList = (_actionMap$gradation = actionMap === null || actionMap === void 0 ? void 0 : actionMap.gradation) !== null && _actionMap$gradation !== void 0 ? _actionMap$gradation : _gradList;
+            // 填充操作序列
+            var fillList = (_actionMap$fill = actionMap === null || actionMap === void 0 ? void 0 : actionMap.fill) !== null && _actionMap$fill !== void 0 ? _actionMap$fill : _fillList;
+            // 节点收集
+            var nodeMap = {
+              // 渐变色节点收集
+              gradation: [],
+              // 具有fill属性的节点收集
+              fill: []
+            };
+            // 目前只支持处理渐变及fill填充
+            var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
+            types.forEach(function (typeKey) {
+              recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
+            });
+            if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
+              nodeMap.gradation.forEach(function (item, index) {
+                // 下一步准备替换的
+                var nextStr = gradList[index];
+                // 属性原本的值
+                var originStr = item.getAttribute('stop-color');
+                if (nextStr && originStr !== nextStr) {
+                  item.setAttribute('stop-color', nextStr);
+                }
+              });
+            }
+            if ((fillList === null || fillList === void 0 ? void 0 : fillList.length) > 0) {
+              nodeMap.fill.forEach(function (item, index) {
+                // 默认接收的
+                var receiveStr = fillList[index];
+                // 下一步准备替换的
+                var nextFillStr = receiveStr === 'theme' ? primaryColor : receiveStr;
+                // 属性原本的值
+                var originFill = item.getAttribute('fill');
+                // 如果包含url(则是内链，不作替换处理
+                if (!(originFill && originFill.includes('url(')) && nextFillStr) {
+                  // 不同才替换
+                  if (originFill !== nextFillStr) {
+                    item.setAttribute('fill', nextFillStr);
+                  }
+                }
+              });
+            }
+          }
+        }
+      }))
     })
   }));
   return !isExtendButtonMode ? RenderIcon : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({

package/es/ProIcon/propsTypes.d.ts

@@ -6,7 +6,21 @@ interface iconMap {
     'text-cn'?: string;
     'text-en'?: string;
 }
+interface themeMap {
+    [key: string]: string[];
+}
+interface actionMap {
+    themeMap?: themeMap;
+    themeFillMap?: themeMap;
+    gradation?: string[];
+    fill?: string[];
+}
 export interface ProIconProps {
+    /**
+     * @description        本地import引入
+     * @default            ""
+     */
+    src?: string;
     /**
      * @description       图标的名称
      * @default           -
@@ -75,5 +89,10 @@ export interface ProIconProps {
      * @default            项目内认默映射
      */
     mapList?: iconMap[];
+    /**
+     * @description        svg变更操作表 请到 ProThemeTools 主题配置查看示例
+     * @default
+     */
+    actionMap?: actionMap;
 }
 export {};

package/es/ProIcon/utils/index.d.ts

@@ -0,0 +1 @@
+export declare const recurseGetNodes: (type: any, node: any, queue: any) => void;

package/es/ProIcon/utils/index.js

@@ -0,0 +1,23 @@
+export var recurseGetNodes = function recurseGetNodes(type, node, queue) {
+  switch (type) {
+    // 渐变
+    case 'gradation':
+      if (node.nodeName === 'stop' && node.getAttribute('stop-color')) {
+        queue.push(node);
+      }
+      break;
+    // 填充
+    case 'fill':
+      if (node.getAttribute && node.getAttribute('fill')) {
+        queue.push(node);
+      }
+      break;
+    default:
+      break;
+  }
+  if (node.childNodes) {
+    for (var i = 0; i < node.childNodes.length; i++) {
+      recurseGetNodes(type, node.childNodes[i], queue);
+    }
+  }
+};

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

@@ -65,6 +65,14 @@ var PrdTools = function PrdTools(_ref) {
         };
       });
       setActive(newArray);
+      dispatch({
+        type: 'set',
+        payload: {
+          theme: {
+            primaryColor: zauiBrand
+          }
+        }
+      });
     }
   }, []);
   return _jsxs(NewDrawer, {
@@ -105,6 +113,14 @@ var PrdTools = function PrdTools(_ref) {
               setThemes({
                 'zaui-brand': item.color
               });
+              dispatch({
+                type: 'set',
+                payload: {
+                  theme: {
+                    primaryColor: item.color
+                  }
+                }
+              });
             },
             children: item.active ? _jsx(CheckOutlined, {}) : null
           }, item.color);

package/es/ProTreeModal/index.js

@@ -206,10 +206,11 @@ var ProTreeModal = function ProTreeModal(props) {
       setState({
         checkedValues: checkedValues,
         checkAll: checkedValues.length === allKeys.length,
-        treeViewData: treeViewData
+        treeViewData: treeViewData,
+        beforeClearAllValues: checkedValues
       });
     }
-  }, [value, state.allKeys]);
+  }, [value, state.allKeys, state.open]);
   var handleClick = function handleClick() {
     setState({
       open: true
@@ -276,24 +277,19 @@ var ProTreeModal = function ProTreeModal(props) {
       treeViewData: [],
       checkAll: false
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange(_checkedValues);
+    /* ******** fix:3.4.4-beta.4 点击清空全部不应该回调、所有的都是应该走统一的确定 *********  */
+    // onChange?.(_checkedValues);
   };
   /**
    * Drawer close
    */
   var handleClose = function handleClose() {
-    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
-      });
-    }
+    setState({
+      open: false,
+      checkedValues: state.beforeClearAllValues,
+      beforeClearAllValues: []
+    });
+    // onChange?.(state.beforeClearAllValues);
     openChange === null || openChange === void 0 ? void 0 : openChange(false);
   };
   /**

package/es/global.less

@@ -1,5 +1,41 @@
-@import "./style/index.less";
+@import './style/index.less';
 
-pre * {
+pre {
   font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 }
+
+* {
+  // 火狐浏览器
+  scrollbar-width: thin;
+  scrollbar-color: #8b8b8b transparent;
+  // ie浏览器
+  scrollbar-face-color: #8b8b8b;
+  scrollbar-highlight-color: #606060;
+  scrollbar-3dlight-color: #606060;
+}
+
+::-webkit-scrollbar  {
+  width: 16px;
+}
+
+// // 滑块
+::-webkit-scrollbar-thumb {
+  background-color: #8b8b8b;
+  background-clip: padding-box;
+  border-color: transparent;
+  border-style: dashed;
+  border-width: 4px;
+  border-radius: 10px;
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+}
+
+// 轨道
+::-webkit-scrollbar-track {
+  background-color: transparent;
+  border-radius: 10px;
+}
+
+// 悬浮轨道
+::-webkit-scrollbar-thumb:hover {
+  background-color: #606060;
+}

package/lib/ProIcon/config/index.d.ts

@@ -3,3 +3,15 @@ export declare const iconMap: {
     'text-cn': string;
     'text-en': string;
 }[];
+export declare const themeMap: {
+    '#006AFF': string[];
+    '#00BC70': string[];
+    '#FF8C16': string[];
+    '#A00F20': string[];
+};
+export declare const themeFillMap: {
+    '#006AFF': string[];
+    '#00BC70': string[];
+    '#FF8C16': string[];
+    '#A00F20': string[];
+};

package/lib/ProIcon/config/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.iconMap = void 0;
+exports.themeMap = exports.themeFillMap = exports.iconMap = void 0;
 var iconMap = exports.iconMap = [{
   type: 'view',
   'text-cn': '查看',
@@ -260,4 +260,18 @@ var iconMap = exports.iconMap = [{
   type: 'tiaozhengxuhao',
   'text-cn': '调整序号',
   'text-en': 'adjust order'
-}];
+}];
+// 渐变色icon预设
+var themeMap = exports.themeMap = {
+  '#006AFF': ['#ADDDFF', '#5FB3D8', '#4181FF'],
+  '#00BC70': ['#FFFFFF', '#54DFA7', '#00BC70'],
+  '#FF8C16': ['#FFFFFF', '#FFA74E', '#FF8C17'],
+  '#A00F20': ['#FFFFFF', '#E47B7B', '#A00E20']
+};
+// 双色icon预设
+var themeFillMap = exports.themeFillMap = {
+  '#006AFF': ['none', '#87F1FC', 'black', '#4181FF'],
+  '#00BC70': ['none', '#05FFEC', 'black', '#00BC70'],
+  '#FF8C16': ['none', '#FED736', 'black', '#FF8C17'],
+  '#A00F20': ['none', '#FD8357', 'black', '#A00E20']
+};

package/lib/ProIcon/index.js

@@ -12,12 +12,17 @@ var _ahooks = require("ahooks");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
+var _reactSvg = require("react-svg");
 var _ProConfigProvider = require("../ProConfigProvider");
 var _config2 = require("./config");
+var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList"];
+var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap"];
 var ProIcon = function ProIcon(props) {
-  var config = (0, _ProConfigProvider.useProConfig)('ProIcon') || {};
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
+    state = _useProConfig.state;
+  var config = state.ProIcon,
+    antdTheme = state.theme;
   var _config = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), props !== null && props !== void 0 ? props : {});
   var _config$type = _config.type,
     type = _config$type === void 0 ? null : _config$type,
@@ -41,11 +46,17 @@ var ProIcon = function ProIcon(props) {
     children = _config.children,
     _config$mapList = _config.mapList,
     mapList = _config$mapList === void 0 ? [] : _config$mapList,
+    src = _config.src,
+    actionMap = _config.actionMap,
     reset = (0, _objectWithoutProperties2.default)(_config, _excluded);
+  // 主题色
+  var _ref = antdTheme !== null && antdTheme !== void 0 ? antdTheme : {},
+    _ref$primaryColor = _ref.primaryColor,
+    primaryColor = _ref$primaryColor === void 0 ? '#006AFF' : _ref$primaryColor;
   // 语言
   var language = _locale.default.ProIcon.language;
   // 加载内部icon
-  var status = (0, _ahooks.useExternal)('https://at.alicdn.com/t/c/font_4063056_jmnz9g5uycp.js');
+  (0, _ahooks.useExternal)('https://at.alicdn.com/t/c/font_4063056_jmnz9g5uycp.js');
   var rotateStyle = rotate ? {
     msTransform: "rotate(".concat(rotate, "deg)"),
     transform: "rotate(".concat(rotate, "deg)")
@@ -67,6 +78,8 @@ var ProIcon = function ProIcon(props) {
   var mergedMapList = (0, _lodash.uniqBy)(mapList.concat(_config2.iconMap), targetTextFill);
   var _type = type;
   var _text = children;
+  // svg图标对应文本
+  var iconText = '';
   var typeIsExistAndIncludeEnglish = _type && /[a-zA-Z]/.test(_type);
   // 模式为icon下，对传入的text进行指定语言-icon 映射
   if (isIconMode && !type) {
@@ -76,6 +89,7 @@ var ProIcon = function ProIcon(props) {
       });
       if (target) {
         _type = target === null || target === void 0 ? void 0 : target.type;
+        iconText = target[targetTextFill];
       }
     }
   }
@@ -90,24 +104,89 @@ var ProIcon = function ProIcon(props) {
       }
     }
   }
+  var svgProps = {
+    className: proIconClassNames,
+    fill: 'currentColor',
+    style: (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      width: size,
+      height: size
+    }, rotateStyle), style)
+  };
   var RenderIcon = (0, _jsxRuntime.jsx)("span", (0, _objectSpread2.default)((0, _objectSpread2.default)({
     className: "anticon",
     style: {
       color: color
     }
   }, reset), {}, {
-    children: (0, _jsxRuntime.jsx)("svg", {
-      className: proIconClassNames,
-      "aria-hidden": "true",
-      onClick: onClick,
-      fill: "currentColor",
-      style: (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        width: size,
-        height: size
-      }, rotateStyle), style),
-      children: (0, _jsxRuntime.jsx)("use", {
-        xlinkHref: "#icon-".concat(_type)
-      })
+    children: (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: iconText,
+      children: !src ? (0, _jsxRuntime.jsx)("svg", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
+        onClick: onClick,
+        "aria-hidden": "true",
+        children: (0, _jsxRuntime.jsx)("use", {
+          xlinkHref: "#icon-".concat(_type)
+        })
+      })) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
+        // @ts-ignore
+        onClick: onClick,
+        "aria-hidden": "true",
+        src: src,
+        beforeInjection: function beforeInjection(svg) {
+          if (actionMap && svg) {
+            var _actionMap$themeMap, _actionMap$themeFillM, _actionMap$gradation, _actionMap$fill;
+            // 项目内置的四种主题匹配渐变色
+            var mergeThemeMap = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config2.themeMap), (_actionMap$themeMap = actionMap.themeMap) !== null && _actionMap$themeMap !== void 0 ? _actionMap$themeMap : {});
+            // 项目内置的四种双色匹配fill
+            var mergeFillThemeMap = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config2.themeFillMap), (_actionMap$themeFillM = actionMap.themeFillMap) !== null && _actionMap$themeFillM !== void 0 ? _actionMap$themeFillM : {});
+            var _gradList = mergeThemeMap[primaryColor];
+            var _fillList = mergeFillThemeMap[primaryColor];
+            // 渐变操作序列
+            var gradList = (_actionMap$gradation = actionMap === null || actionMap === void 0 ? void 0 : actionMap.gradation) !== null && _actionMap$gradation !== void 0 ? _actionMap$gradation : _gradList;
+            // 填充操作序列
+            var fillList = (_actionMap$fill = actionMap === null || actionMap === void 0 ? void 0 : actionMap.fill) !== null && _actionMap$fill !== void 0 ? _actionMap$fill : _fillList;
+            // 节点收集
+            var nodeMap = {
+              // 渐变色节点收集
+              gradation: [],
+              // 具有fill属性的节点收集
+              fill: []
+            };
+            // 目前只支持处理渐变及fill填充
+            var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
+            types.forEach(function (typeKey) {
+              (0, _utils.recurseGetNodes)(typeKey, svg, nodeMap[typeKey]);
+            });
+            if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
+              nodeMap.gradation.forEach(function (item, index) {
+                // 下一步准备替换的
+                var nextStr = gradList[index];
+                // 属性原本的值
+                var originStr = item.getAttribute('stop-color');
+                if (nextStr && originStr !== nextStr) {
+                  item.setAttribute('stop-color', nextStr);
+                }
+              });
+            }
+            if ((fillList === null || fillList === void 0 ? void 0 : fillList.length) > 0) {
+              nodeMap.fill.forEach(function (item, index) {
+                // 默认接收的
+                var receiveStr = fillList[index];
+                // 下一步准备替换的
+                var nextFillStr = receiveStr === 'theme' ? primaryColor : receiveStr;
+                // 属性原本的值
+                var originFill = item.getAttribute('fill');
+                // 如果包含url(则是内链，不作替换处理
+                if (!(originFill && originFill.includes('url(')) && nextFillStr) {
+                  // 不同才替换
+                  if (originFill !== nextFillStr) {
+                    item.setAttribute('fill', nextFillStr);
+                  }
+                }
+              });
+            }
+          }
+        }
+      }))
     })
   }));
   return !isExtendButtonMode ? RenderIcon : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({

package/lib/ProIcon/propsTypes.d.ts

@@ -6,7 +6,21 @@ interface iconMap {
     'text-cn'?: string;
     'text-en'?: string;
 }
+interface themeMap {
+    [key: string]: string[];
+}
+interface actionMap {
+    themeMap?: themeMap;
+    themeFillMap?: themeMap;
+    gradation?: string[];
+    fill?: string[];
+}
 export interface ProIconProps {
+    /**
+     * @description        本地import引入
+     * @default            ""
+     */
+    src?: string;
     /**
      * @description       图标的名称
      * @default           -
@@ -75,5 +89,10 @@ export interface ProIconProps {
      * @default            项目内认默映射
      */
     mapList?: iconMap[];
+    /**
+     * @description        svg变更操作表 请到 ProThemeTools 主题配置查看示例
+     * @default
+     */
+    actionMap?: actionMap;
 }
 export {};

package/lib/ProIcon/utils/index.d.ts

@@ -0,0 +1 @@
+export declare const recurseGetNodes: (type: any, node: any, queue: any) => void;

package/lib/ProIcon/utils/index.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.recurseGetNodes = void 0;
+var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
+  switch (type) {
+    // 渐变
+    case 'gradation':
+      if (node.nodeName === 'stop' && node.getAttribute('stop-color')) {
+        queue.push(node);
+      }
+      break;
+    // 填充
+    case 'fill':
+      if (node.getAttribute && node.getAttribute('fill')) {
+        queue.push(node);
+      }
+      break;
+    default:
+      break;
+  }
+  if (node.childNodes) {
+    for (var i = 0; i < node.childNodes.length; i++) {
+      recurseGetNodes(type, node.childNodes[i], queue);
+    }
+  }
+};

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

@@ -65,6 +65,14 @@ var PrdTools = function PrdTools(_ref) {
         };
       });
       setActive(newArray);
+      dispatch({
+        type: 'set',
+        payload: {
+          theme: {
+            primaryColor: zauiBrand
+          }
+        }
+      });
     }
   }, []);
   return (0, _jsxRuntime.jsxs)(NewDrawer, {
@@ -105,6 +113,14 @@ var PrdTools = function PrdTools(_ref) {
               (0, _index.setThemes)({
                 'zaui-brand': item.color
               });
+              dispatch({
+                type: 'set',
+                payload: {
+                  theme: {
+                    primaryColor: item.color
+                  }
+                }
+              });
             },
             children: item.active ? (0, _jsxRuntime.jsx)(_icons.CheckOutlined, {}) : null
           }, item.color);

package/lib/ProTreeModal/index.js

@@ -207,10 +207,11 @@ var ProTreeModal = function ProTreeModal(props) {
       setState({
         checkedValues: checkedValues,
         checkAll: checkedValues.length === allKeys.length,
-        treeViewData: treeViewData
+        treeViewData: treeViewData,
+        beforeClearAllValues: checkedValues
       });
     }
-  }, [value, state.allKeys]);
+  }, [value, state.allKeys, state.open]);
   var handleClick = function handleClick() {
     setState({
       open: true
@@ -277,24 +278,19 @@ var ProTreeModal = function ProTreeModal(props) {
       treeViewData: [],
       checkAll: false
     });
-    onChange === null || onChange === void 0 ? void 0 : onChange(_checkedValues);
+    /* ******** fix:3.4.4-beta.4 点击清空全部不应该回调、所有的都是应该走统一的确定 *********  */
+    // onChange?.(_checkedValues);
   };
   /**
    * Drawer close
    */
   var handleClose = function handleClose() {
-    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
-      });
-    }
+    setState({
+      open: false,
+      checkedValues: state.beforeClearAllValues,
+      beforeClearAllValues: []
+    });
+    // onChange?.(state.beforeClearAllValues);
     openChange === null || openChange === void 0 ? void 0 : openChange(false);
   };
   /**

package/lib/global.less

@@ -1,5 +1,41 @@
-@import "./style/index.less";
+@import './style/index.less';
 
-pre * {
+pre {
   font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
 }
+
+* {
+  // 火狐浏览器
+  scrollbar-width: thin;
+  scrollbar-color: #8b8b8b transparent;
+  // ie浏览器
+  scrollbar-face-color: #8b8b8b;
+  scrollbar-highlight-color: #606060;
+  scrollbar-3dlight-color: #606060;
+}
+
+::-webkit-scrollbar  {
+  width: 16px;
+}
+
+// // 滑块
+::-webkit-scrollbar-thumb {
+  background-color: #8b8b8b;
+  background-clip: padding-box;
+  border-color: transparent;
+  border-style: dashed;
+  border-width: 4px;
+  border-radius: 10px;
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+}
+
+// 轨道
+::-webkit-scrollbar-track {
+  background-color: transparent;
+  border-radius: 10px;
+}
+
+// 悬浮轨道
+::-webkit-scrollbar-thumb:hover {
+  background-color: #606060;
+}

package/package.json

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