@zat-design/sisyphus-react 3.4.4 → 3.4.5

package/es/ProForm/components/combination/GroupCopy/utils.js

@@ -0,0 +1,180 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { isFunction } from 'lodash';
+import valueTypeMap from '../../../utils/valueType';
+/**
+ * 插入间隔符
+ * @param columns 表单配置数组
+ * @returns
+ */
+export var insertSeparator = function insertSeparator(columns, space) {
+  if (!(space === null || space === void 0 ? void 0 : space.separator)) {
+    return columns;
+  }
+  return columns.reduce(function (result, current, index, array) {
+    // 将当前元素添加到结果数组中
+    result.push(current);
+    // 如果当前元素不是最后一个元素，则添加间隔符
+    if (index < array.length - 1) {
+      result.push({
+        component: _jsx(_Button, {
+          className: "group-separator",
+          children: space.separator
+        }),
+        fieldProps: {
+          disabled: true
+        }
+      });
+    }
+    return result;
+  }, []);
+};
+/** 带出event的组件默认取值方法 */
+export function defaultGetValueFromEvent(valuePropName) {
+  var event = arguments.length <= 1 ? undefined : arguments[1];
+  if (event && event.target && _typeof(event.target) === 'object' && valuePropName in event.target) {
+    return event.target[valuePropName];
+  }
+  return event;
+}
+/** 转换names */
+export var transformNamesString = function transformNamesString(arr) {
+  var result = arr.map(function (subArr) {
+    if (Array.isArray(subArr)) {
+      return subArr.join('_');
+    }
+    return subArr;
+  });
+  return result;
+};
+/** 计算响应式参数的值 */
+export var getReactiveProps = function getReactiveProps(params) {
+  var form = params.form,
+    index = params.index,
+    namePath = params.namePath,
+    disabled = params.disabled,
+    show = params.show,
+    component = params.component,
+    fieldProps = params.fieldProps,
+    name = params.name;
+  var values = form.getFieldsValue(namePath || undefined);
+  var _disabled = isFunction(disabled) ? disabled(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : disabled;
+  var _show = isFunction(show) ? show(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : show;
+  var _component = isFunction(component) ? component(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : component;
+  var _fieldProps = isFunction(fieldProps) ? fieldProps(values, {
+    form: form,
+    index: index,
+    namePath: namePath
+  }) : fieldProps;
+  return {
+    disabled: _disabled,
+    show: _show,
+    component: _component,
+    fieldProps: _fieldProps
+  };
+};
+/** 获取当前字段的转换函数 */
+export var getValueTypeTrans = function getValueTypeTrans(params) {
+  var _valueTypeMap$valueTy;
+  var valueType = params.valueType;
+  var transform = (_valueTypeMap$valueTy = valueTypeMap[valueType]) === null || _valueTypeMap$valueTy === void 0 ? void 0 : _valueTypeMap$valueTy.call(valueTypeMap, params);
+  return transform;
+};
+/** 转换columns */
+export var transformColumns = function transformColumns(params) {
+  var form = params.form,
+    columns = params.columns,
+    name = params.name,
+    names = params.names,
+    outerIndex = params.index,
+    namePath = params.namePath,
+    value = params.value,
+    internalChange = params.onChange;
+  return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
+    var type = column.type,
+      valueType = column.valueType,
+      switchValue = column.switchValue,
+      toISOString = column.toISOString,
+      fieldProps = column.fieldProps,
+      getValueFromEvent = column.getValueFromEvent,
+      _column$valuePropName = column.valuePropName,
+      valuePropName = _column$valuePropName === void 0 ? 'value' : _column$valuePropName,
+      normalize = column.normalize,
+      disabled = column.disabled,
+      show = column.show,
+      component = column.component;
+    var _ref = fieldProps || {},
+      mode = _ref.mode,
+      onChange = _ref.onChange,
+      onFieldChange = _ref.onFieldChange,
+      comDisabled = _ref.disabled;
+    var _disabled = disabled !== null && disabled !== void 0 ? disabled : comDisabled;
+    var columnName = names ? names[index] : [].concat(name, index);
+    // 响应式字段
+    var reactiveProps = getReactiveProps({
+      form: form,
+      index: index,
+      type: type,
+      namePath: namePath,
+      disabled: _disabled,
+      show: show,
+      component: component,
+      fieldProps: fieldProps,
+      name: columnName
+    });
+    if (reactiveProps.show === false) return [];
+    var transform = getValueTypeTrans({
+      type: type,
+      valueType: valueType,
+      switchValue: switchValue,
+      toISOString: toISOString,
+      mode: mode
+    });
+    var newValue;
+    var handleChange = function handleChange() {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      if (getValueFromEvent) {
+        newValue = getValueFromEvent.apply(void 0, args);
+      } else {
+        newValue = defaultGetValueFromEvent.apply(void 0, [valuePropName].concat(args));
+      }
+      if ((transform === null || transform === void 0 ? void 0 : transform.normalize) || normalize) {
+        var _transform$normalize;
+        // @ts-ignore
+        newValue = ((_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue)) || (normalize === null || normalize === void 0 ? void 0 : normalize(newValue));
+      }
+      internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
+      onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
+      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, form.getFieldValue(namePath), {
+        index: outerIndex,
+        namePath: namePath,
+        form: form
+      });
+    };
+    return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {
+      name: columnName
+    }, reactiveProps), {}, {
+      fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
+        onChange: handleChange,
+        value: value === null || value === void 0 ? void 0 : value[index]
+      })
+    });
+  });
+};

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -22,7 +22,6 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { SearchOutlined } from '@ant-design/icons';
 import { useMount, useSetState } from 'ahooks';
-import { useRequest as useUmiRequest } from 'umi';
 import { cloneDeep, debounce, isArray, isEqual, isFunction, omit } from 'lodash';
 import { ReactSVG } from 'react-svg';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
@@ -127,17 +126,22 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     form = _Form$useForm2[0];
   var selectedRows = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || _selectedRows;
   var selectedRowKeys = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || _selectedRowKeys;
-  var _useUmiRequest = useUmiRequest(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+  var _useRequestList = useRequestList(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
+      withPagination: withPagination,
+      transformParams: transformParams,
+      transformResponse: transformResponse
+    }, _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
       manual: true,
-      onSuccess: function onSuccess(data) {
-        var list = withPagination ? data === null || data === void 0 ? void 0 : data.list : data;
+      onSuccess: function onSuccess(res) {
+        var _res$data;
+        var list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
         setState({
           options: list
         });
       }
     })),
-    run = _useUmiRequest.run;
-  var _useRequestList = useRequestList(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
+    run = _useRequestList.run;
+  var _useRequestList2 = useRequestList(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
       withPagination: withPagination,
       transformParams: transformParams,
       transformResponse: transformResponse
@@ -145,13 +149,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       manual: true,
       ready: ((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne) && !readOnly || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
-    data = _useRequestList.data,
-    loading = _useRequestList.loading,
-    pagination = _useRequestList.pagination,
-    onSearch = _useRequestList.onSearch,
-    onReset = _useRequestList.onReset,
-    runAsync = _useRequestList.runAsync,
-    mutate = _useRequestList.mutate;
+    data = _useRequestList2.data,
+    loading = _useRequestList2.loading,
+    pagination = _useRequestList2.pagination,
+    onSearch = _useRequestList2.onSearch,
+    onReset = _useRequestList2.onReset,
+    runAsync = _useRequestList2.runAsync,
+    mutate = _useRequestList2.mutate;
   var defaultOptionRender = function defaultOptionRender(rowData) {
     return rowData === null || rowData === void 0 ? void 0 : rowData[labelKey];
   };
@@ -423,7 +427,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data, _data2, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -452,7 +456,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
               } else {
-                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
+                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
               if (_data2) {
@@ -489,7 +493,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data2, _data3, nextSelectRowKeys;
+      var queryBean, page, params, res, _list2, list, _res$data3, _data3, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -511,7 +515,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
               } else {
-                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
+                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
               _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
@@ -670,7 +674,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         // 没有值的时候，初始化点击默认查询前五十条
         if (!value && isInit || !(options === null || options === void 0 ? void 0 : options.length)) {
           var _useRequest$options9;
-          var queryBean = useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams;
+          var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams) || {};
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,

package/es/ProForm/components/index.js

@@ -21,6 +21,7 @@ export { default as ProModalSelect } from './combination/ProModalSelect';
 export { default as ProTimeLimit } from './combination/ProTimeLimit';
 export { default as ProRangeLimit } from './combination/ProRangeLimit';
 export { default as Group } from './combination/Group';
+// export { default as GroupCopy } from './combination/GroupCopy';
 export { default as ProCollapse } from './combination/Container';
 export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';

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

@@ -155,9 +155,9 @@ var Render = function Render(props) {
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
   }, internalRule, {
-    required: typeof labelRequired === 'boolean' ? labelRequired : _required || (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
+    required: typeof labelRequired === 'boolean' ? labelRequired : _required || Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
       return item === null || item === void 0 ? void 0 : item.required;
-    }))
+    })) || false
   }, otherProps.isView && !requiredOnView ? {
     required: false
   } : null, _objectSpread({}, isTrim(type, trim, useProConfig())), // 优先取传进来的，其次取ProConfigProvider配置的

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

@@ -52,7 +52,7 @@ interface ControlProps {
 /**
  * 扩展函数的参数
  */
-type FunctionArgs<Values, R = any> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
+export type FunctionArgs<Values, R = any> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
     form: FormInstance<Values>;
     index?: number;
     namePath?: NamePath;

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,14 +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');
-  if (status !== 'ready') {
-    return null;
-  }
+  useExternal('https://at.alicdn.com/t/c/font_4063056_jmnz9g5uycp.js');
   var rotateStyle = rotate ? {
     msTransform: "rotate(".concat(rotate, "deg)"),
     transform: "rotate(".concat(rotate, "deg)")
@@ -64,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) {
@@ -73,6 +85,7 @@ var ProIcon = function ProIcon(props) {
       });
       if (target) {
         _type = target === null || target === void 0 ? void 0 : target.type;
+        iconText = target[targetTextFill];
       }
     }
   }
@@ -87,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/ProWaterMark/__snapshots__/index.test.tsx.snap

@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`render ProWaterMark with dumi 1`] = `
+<span>
+  123
+</span>
+`;