@zat-design/sisyphus-react 3.1.4 → 3.1.5-beta.10

package/lib/ProThemeTools/index.js

@@ -16,21 +16,21 @@ var _react = require("react");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _index = require("./utils/index");
 var _component = require("./component");
-var _excluded = ["size", "className", "cacheTime", "color", "mode", "theme", "tableBorder", "tableStripe"];
+var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "tableBorder", "tableStripe", "theme"];
 /* eslint-disable prefer-const */
 var defaultCacheTime = 1; // 配置保存时间为一天
 var defaultThemeConfig = {
   zauiBrand: '#006AFF',
   zauiText: '#343434',
-  zauiFontSize: 14,
+  zauiFontSize: '14px',
   zauiFormAlign: 'left',
   zauiFormRequiredBefore: 'none',
   zauiFormRequiredAfter: 'inline',
   zauiSize: 1,
-  zauiSpaceSizeLg: 32,
-  zauiSpaceSizeMd: 16,
+  zauiSpaceSizeLg: '32px',
+  zauiSpaceSizeMd: '16px',
   zauiBigText: false,
-  zauiBaseFontSize: 0,
+  zauiBaseFontSize: '0px',
   zauiTableBorder: false,
   zauiStripe: true
 };
@@ -40,17 +40,19 @@ var ProThemeTools = function ProThemeTools(_ref) {
     cacheTime = _ref.cacheTime,
     color = _ref.color,
     mode = _ref.mode,
-    theme = _ref.theme,
+    iconFollowTheme = _ref.iconFollowTheme,
     _ref$tableBorder = _ref.tableBorder,
     tableBorder = _ref$tableBorder === void 0 ? false : _ref$tableBorder,
     _ref$tableStripe = _ref.tableStripe,
     tableStripe = _ref$tableStripe === void 0 ? false : _ref$tableStripe,
+    _ref$theme = _ref.theme,
+    theme = _ref$theme === void 0 ? {} : _ref$theme,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var _useState3 = (0, _react.useState)((0, _objectSpread2.default)({}, defaultThemeConfig)),
+  var _useState3 = (0, _react.useState)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultThemeConfig), (0, _index.getMapHumpCase)(theme))),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     state = _useState4[0],
     setState = _useState4[1];
@@ -84,9 +86,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
   };
   // 复制
   var onCopy = function onCopy() {
-    var data = JSON.stringify(Object.fromEntries(Object.entries(state).map(function (item) {
-      return ["@".concat((0, _index.getKebabCase)(item === null || item === void 0 ? void 0 : item[0])), item === null || item === void 0 ? void 0 : item[1]];
-    })));
+    var data = JSON.stringify((0, _index.getMapKebabCase)(state, '@'));
     var input = document.createElement('input');
     document.body.appendChild(input);
     input.setAttribute('value', data);
@@ -104,6 +104,10 @@ var ProThemeTools = function ProThemeTools(_ref) {
     var startTime = curThemeConfig === null || curThemeConfig === void 0 ? void 0 : curThemeConfig.startTime;
     // 默认时间间隔
     var duration = (typeof cacheTime === 'number' ? cacheTime : defaultCacheTime) * 86400000;
+    // antd4以下版本不支持主题色的动态配置
+    if (!_antd.ConfigProvider.config) {
+      return;
+    }
     if (cacheTime && startTime && new Date().getTime() - startTime < duration) {
       var _localThemeConfig;
       var localThemeConfig;
@@ -115,15 +119,18 @@ var ProThemeTools = function ProThemeTools(_ref) {
 
       setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), localThemeConfig));
       (0, _index.setThemes)(cssVariables);
-      // antd4以下版本不支持主题色的动态配置
-      if (!_antd.ConfigProvider.config) {
-        return;
-      }
       _antd.ConfigProvider.config({
         theme: {
           primaryColor: (_localThemeConfig = localThemeConfig) === null || _localThemeConfig === void 0 ? void 0 : _localThemeConfig.zauiBrand
         }
       });
+    } else {
+      (0, _index.setThemes)((0, _index.getMapKebabCase)(state));
+      _antd.ConfigProvider.config({
+        theme: {
+          primaryColor: state === null || state === void 0 ? void 0 : state.zauiBrand
+        }
+      });
     }
   }, []);
   // 主题色动态切换
@@ -160,7 +167,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
   }, [state, cacheTime]);
   var cls = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-theme-tools': true,
-    'pro-theme-tools-follow': theme
+    'pro-theme-tools-follow': iconFollowTheme
   }, className, className));
   return (0, _jsxRuntime.jsxs)("div", (0, _objectSpread2.default)((0, _objectSpread2.default)({
     className: cls
@@ -189,7 +196,7 @@ ProThemeTools.defaultProps = {
   size: 24,
   mode: 'prd',
   color: '#343434',
-  theme: false,
+  iconFollowTheme: false,
   cacheTime: false
 };
 ProThemeTools.setThemes = _index.setThemes;

package/lib/ProThemeTools/propsType.d.ts

@@ -15,8 +15,10 @@ export interface ProThemeToolsProps {
     color?: string;
     mode?: 'dev' | 'prd';
     cacheTime?: number | boolean;
-    /** 是否跟随主题色 */
-    theme?: boolean;
+    /** 主题配置信息 */
+    theme?: any;
+    /** icon是否跟随主题色 */
+    iconFollowTheme?: boolean;
     /** 是否有表格边框 */
     tableBorder?: boolean;
     /** 是否有斑马纹 */
@@ -26,18 +28,18 @@ export interface ProThemeToolsProps {
 export interface LocalThemeConfigPropsType {
     zauiBrand?: string;
     zauiText?: string;
-    zauiFontSize?: number;
+    zauiFontSize?: string;
     zauiFormAlign?: string;
     zauiFormRequiredAfter?: string;
     zauiFormRequiredBefore?: string;
     zauiSize?: number;
-    zauiSpaceSizeLg?: number;
-    zauiSpaceSizeMd?: number;
+    zauiSpaceSizeLg?: string;
+    zauiSpaceSizeMd?: string;
     /** 大字号模式 */
     zauiBigText?: boolean;
     /** 是否有表格边框 */
     zauiTableBorder?: boolean;
     /** 是否有斑马纹 */
     zauiStripe?: boolean;
-    zauiBaseFontSize?: number;
+    zauiBaseFontSize?: string;
 }

package/lib/ProThemeTools/style/index.less

@@ -13,7 +13,7 @@
     color: var(--zaui-brand, #006aff);
 
     svg {
-      font-size: 24px;
+      font-size: var(--zaui-font-size-lg-title, 24px)
     }
   }
 }
@@ -52,4 +52,4 @@
   .ant-radio-button-wrapper {
     padding: 0 12px;
   }
-}
+}

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

@@ -11,7 +11,14 @@ export declare const replaceObject: (themes: ThemesProps, themeMapping: ThemesPr
  * 设置主题变量
  */
 export declare const setThemes: (themes: ThemesProps, themeMapping?: ThemesProps) => boolean;
+/** JS实现驼峰命名与横线命名的转换  */
 export declare const getKebabCase: (str: string) => string;
+/** JS实现对象驼峰命名与横线命名的转换  */
+export declare const getMapKebabCase: (obj: any, prefix?: string) => {
+    [k: string]: unknown;
+};
+/** JS实现对象横线命名与驼峰命名的转换  */
+export declare const getMapHumpCase: (obj?: {}) => {};
 /**
  * 设置表格斑马纹
  * @param stripe boolean

package/lib/ProThemeTools/utils/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setThemes = exports.setTableNoStripe = exports.setTableBorder = exports.replaceObject = exports.getKebabCase = void 0;
+exports.setThemes = exports.setTableNoStripe = exports.setTableBorder = exports.replaceObject = exports.getMapKebabCase = exports.getMapHumpCase = exports.getKebabCase = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _antd = require("antd");
 /** 主题配置mapping */
@@ -47,7 +47,7 @@ var setThemes = exports.setThemes = function setThemes(themes, themeMapping) {
     document.documentElement.style.setProperty("--".concat(item[0]), item[1]);
   });
 };
-// JS实现驼峰命名与横线命名的转换
+/** JS实现驼峰命名与横线命名的转换  */
 var getKebabCase = exports.getKebabCase = function getKebabCase(str) {
   var temp = str.replace(/[A-Z]/g, function (i) {
     return "-".concat(i.toLowerCase());
@@ -58,6 +58,24 @@ var getKebabCase = exports.getKebabCase = function getKebabCase(str) {
 
   return temp;
 };
+/** JS实现对象驼峰命名与横线命名的转换  */
+var getMapKebabCase = exports.getMapKebabCase = function getMapKebabCase(obj) {
+  var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  return Object.fromEntries(Object.entries(obj).map(function (item) {
+    return ["".concat(prefix).concat(getKebabCase(item === null || item === void 0 ? void 0 : item[0])), item === null || item === void 0 ? void 0 : item[1]];
+  }));
+};
+/** JS实现对象横线命名与驼峰命名的转换  */
+var getMapHumpCase = exports.getMapHumpCase = function getMapHumpCase() {
+  var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return Object.keys(obj).reduce(function (acc, key) {
+    var transformedKey = key.replace(/-(\w)/g, function (_, letter) {
+      return letter.toUpperCase();
+    });
+    acc[transformedKey] = obj[key];
+    return acc;
+  }, {});
+};
 /**
  * 设置表格斑马纹
  * @param stripe boolean

package/lib/ProTree/components/ProTree.js

@@ -85,7 +85,7 @@ var ProTree = function ProTree(props) {
       checkAll: false,
       allKeys: [],
       clickShowLoading: false,
-      innerExpandKeys: []
+      innerExpandKeys: props === null || props === void 0 ? void 0 : props.expandedKeys
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     state = _useSetState2[0],

package/lib/ProTree/components/SearchTitle.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 declare function SearchTitle(props: {
-    searchStr: string;
-    label: string;
+    searchStr?: string;
+    label?: string;
     showEllipse?: boolean;
     ellipseWidth?: string;
 }): JSX.Element;

package/lib/ProTree/components/SearchTitle.js

@@ -35,9 +35,19 @@ function SearchTitle(props) {
     style: style,
     children: strTitle
   });
+  var titleTips = index > -1 ? (0, _jsxRuntime.jsxs)("span", {
+    style: style,
+    children: [beforeStr, searchStr ? (0, _jsxRuntime.jsx)("span", {
+      className: "pro-tree-modal-search-value",
+      children: searchStr
+    }) : null, afterStr]
+  }) : (0, _jsxRuntime.jsx)("span", {
+    style: style,
+    children: strTitle
+  });
   if (classEllipse) {
     return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-      title: title,
+      title: titleTips,
       placement: "rightTop",
       children: title
     });

package/lib/ProTree/components/Tree.js

@@ -105,8 +105,13 @@ function List(props) {
       });
     }
   }, [selectedKey]);
-  var onSelect = function onSelect(val, item) {
+  var onSelect = function onSelect(value, item) {
     var _props$onSelect;
+    var val = value;
+    if (value === currentClickTreeNode) {
+      // 如果当前点击了已经选中节点，那么取消选择
+      val = '';
+    }
     setState({
       currentClickTreeNode: val
     });