@zat-design/sisyphus-react 3.2.2 → 3.3.0

package/lib/ProTable/utils.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ProTableColumn } from './propsType';
-export declare const formatColumn: (column: ProTableColumn, originalDataSource: any[]) => void;
+export declare const formatColumn: (column: ProTableColumn, originalObj: any, dataSourceObj: any, rowKey: any) => void;
 export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 查找最近的父级className

package/lib/ProTable/utils.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isListResult = exports.getParentElement = exports.getColumnDataIndex = exports.formatColumn = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _moment15 = _interopRequireDefault(require("moment"));
@@ -29,7 +28,27 @@ var getDecimalDigits = function getDecimalDigits() {
   var match = Number(num).toString().match(/\.(\d+)/);
   return match ? match[1].length : 0;
 };
-var formatColumn = exports.formatColumn = function formatColumn(column, originalDataSource) {
+/**
+ * @description: 获取初始值
+ * @author: xiangchengli
+ * @param {any} rowKey
+ * @param any value
+ * @param any originalObj
+ * @param {any} dataIndex
+ * @return {any}
+ */
+var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
+  if (!originalObj) {
+    return undefined;
+  }
+  var originalRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
+  var originalValue = (0, _lodash.get)(originalRecord, dataIndex);
+  if (!(0, _lodash.isEqual)(originalValue, value)) {
+    return originalValue;
+  }
+  return undefined;
+};
+var formatColumn = exports.formatColumn = function formatColumn(column, originalObj, dataSourceObj, rowKey) {
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -93,7 +112,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
       var multiple = valueType === 'percentage' ? 100 : 1000;
       var realValue = _utils.tools.calc(Number(value), '*', multiple);
       var renderValue = getDecimalDigits(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
-      var originalValue = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = _utils.tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = getDecimalDigits(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
       if (!originalValue && originalValue !== 0) {
@@ -104,7 +123,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
-        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: renderValue,
@@ -118,7 +137,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     column.render = function (value, record, index) {
       var valueStr = valueTypePrecision ? "".concat(Number(value).toFixed(valueTypePrecision)) : "".concat(value);
       var renderValue = valueStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
-      var originalValue = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
       var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
       if (!originalValue && originalValue !== 0) {
@@ -133,7 +152,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
-        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
@@ -146,7 +165,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     column.render = function (value, record, index) {
       var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
       var renderValue = (_moment = (0, _moment15.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
-      var originalValue = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = (_moment2 = (0, _moment15.default)(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
         case 'date':
@@ -185,7 +204,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
-        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
@@ -198,7 +217,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     column.render = function (value, record, index) {
       var realCode = typeof code === 'function' ? code() : code;
       var renderValue = (0, _getEnumLabel.default)(realCode, value, valueType === 'enumCodeName');
-      var originalValue = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = (0, _getEnumLabel.default)(realCode, originalValue, valueType === 'enumCodeName');
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
@@ -206,7 +225,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
       });
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
-        originalValue: !originalDataSource || value === originalValue ? undefined : originalRenderValue,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
@@ -218,7 +237,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
   } else if (precision || prefix || suffix) {
     column.render = function (value, record, index) {
       var renderValue = value === 'number' ? value.toFixed(precision) : value;
-      var originalValue = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
@@ -232,7 +251,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
-        originalValue: !originalDataSource || renderValue === originalRenderValue ? undefined : originalRenderValue,
+        originalValue: originalValue === undefined ? undefined : originalRenderValue,
         ellipsis: ellipsis,
         width: width,
         node: node,
@@ -245,7 +264,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     column.render = function (value, record, index) {
       var _realValue$filter;
       var realValue = transform ? transform(value, record) : value;
-      var originalValue = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = transform ? transform(originalValue, record) : originalValue;
       var isEmpty = !realValue || Array.isArray(realValue) && (realValue === null || realValue === void 0 ? void 0 : (_realValue$filter = realValue.filter(function (item) {
         return !!item;
@@ -254,7 +273,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         return '-';
       }
       var className = (0, _classnames.default)({
-        'varied-cell': originalDataSource && !(0, _lodash.isEqual)(value, originalValue),
+        'varied-cell': originalValue !== undefined,
         'empty-cell': isEmpty
       });
       var renderValue = (0, _jsxRuntime.jsx)(_ProForm.default.ProAddressBar, {
@@ -272,7 +291,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         isView: true,
         code: code,
         value: realValue,
-        tooltip: originalDataSource && !(0, _lodash.isEqual)(value, originalValue) ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        tooltip: originalValue !== undefined ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
           children: ["\u521D\u59CB\u503C\uFF1A", originalRenderValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
             children: ["\u5F53\u524D\u503C\uFF1A", renderValue]
           }) : undefined]
@@ -296,7 +315,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     };
   } else if (ellipsis) {
     column.render = function (value, record, index) {
-      var originalValue = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       if (!value && value !== 0 && value === originalValue) {
         return '-';
       }
@@ -304,7 +323,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         size: 8,
         children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
           valueType: valueType,
-          originalValue: !originalDataSource || value === originalValue ? undefined : originalValue || '-',
+          originalValue: originalValue === undefined ? undefined : originalValue || '-',
           ellipsis: ellipsis,
           width: width,
           node: value,
@@ -316,7 +335,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     };
   } else {
     column.render = function (value, record, index) {
-      var originalValue = (0, _lodash.get)(originalDataSource, Array.isArray(dataIndex) ? [index].concat((0, _toConsumableArray2.default)(dataIndex)) : [index, dataIndex]);
+      var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), value, suffixNode(value, record, index)]
@@ -326,7 +345,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
       }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
         valueType: valueType,
-        originalValue: !originalDataSource || value === originalValue ? undefined : originalValue || '-',
+        originalValue: originalValue === undefined ? undefined : originalValue || '-',
         ellipsis: ellipsis,
         width: width,
         node: node,

package/lib/ProTabs/style/index.less

@@ -1,18 +1,20 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-tabs {
-  .ant-tabs .ant-tabs-nav-list .ant-tabs-tab {
+  .@{ant-prefix}-tabs .@{ant-prefix}-tabs-nav-list .@{ant-prefix}-tabs-tab {
     padding: 0 !important;
   }
 
-  .ant-tabs-top>.ant-tabs-nav::before,
-  .ant-tabs-bottom>.ant-tabs-nav::before,
-  .ant-tabs-top>div>.ant-tabs-nav::before,
-  .ant-tabs-bottom>div>.ant-tabs-nav::before {
+  .@{ant-prefix}-tabs-top > .@{ant-prefix}-tabs-nav::before,
+  .@{ant-prefix}-tabs-bottom > .@{ant-prefix}-tabs-nav::before,
+  .@{ant-prefix}-tabs-top > div > .@{ant-prefix}-tabs-nav::before,
+  .@{ant-prefix}-tabs-bottom > div > .@{ant-prefix}-tabs-nav::before {
     border: none;
   }
 
-
-  .ant-tabs-nav-list {
-    .ant-tabs-tab {
+  .@{ant-prefix}-tabs-nav-list {
+    .@{ant-prefix}-tabs-tab {
       &:first-child {
         .pro-tabs-card {
           border-left: 1px solid var(--zaui-line, #dddddd);
@@ -21,37 +23,37 @@
     }
   }
 
-  .ant-tabs-tab-active {
+  .@{ant-prefix}-tabs-tab-active {
     .pro-tabs-card {
       background: var(--ant-primary-color-active-deprecated-f-30, rgba(230, 247, 255, 0.3));
     }
   }
 
-  .ant-tabs-ink-bar {
-    top   : 0;
+  .@{ant-prefix}-tabs-ink-bar {
+    top: 0;
     height: 3px !important;
   }
 
   .pro-tabs-card {
-    width      : 200px;
-    padding    : 14px 16px 14px 24px;
-    border     : 1px solid var(--zaui-line, #dddddd);
+    width: 200px;
+    padding: calc(9px * var(--zaui-size; 1)) 16px calc(9px * var(--zaui-size; 1)) 24px;
+    border: 1px solid var(--zaui-line, #dddddd);
     border-left: none;
 
     .pro-tabs-card-left {
-      width      : 104px;
+      width: 104px;
       text-shadow: none;
 
       .pro-tabs-card-left-total {
-        font-size  : var(--zaui-font-size-lg-title, 24px);
+        color: var(--zaui-text, #343434);
         font-weight: 600;
-        color      : var(--zaui-text, #343434);
+        font-size: var(--zaui-font-size-lg-title, 24px);
       }
 
       .pro-tabs-card-left-label {
-        font-size  : var(--zaui-font-size, 14px);
+        color: var(--aui-text, #343434);
         font-weight: 400;
-        color      : var(--aui-text, #343434);
+        font-size: var(--zaui-font-size, 14px);
       }
     }
 
@@ -67,13 +69,13 @@
 
 .pro-tabs-tab {
   .pro-tabs-card {
-    .ant-tag {
+    .@{ant-prefix}-tag {
+      margin-right: 0;
+      padding: 0 var(--zaui-space-size-xs, 4px);
       border-radius: 10px;
-      padding      : 0 var(--zaui-space-size-xs, 4px);
-      margin-right : 0;
     }
 
-    .ant-space-item {
+    .@{ant-prefix}-space-item {
       display: flex;
     }
   }

package/lib/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, }: DevToolsPropsType) => JSX.Element;
+declare const PrdTools: ({ onReset, onClose, setState, visible, state, tableBorder, tableStripe, prefixCls, }: DevToolsPropsType) => JSX.Element;
 export default PrdTools;

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

@@ -27,7 +27,8 @@ var PrdTools = function PrdTools(_ref) {
     visible = _ref.visible,
     state = _ref.state,
     tableBorder = _ref.tableBorder,
-    tableStripe = _ref.tableStripe;
+    tableStripe = _ref.tableStripe,
+    prefixCls = _ref.prefixCls;
   var _useState = (0, _react.useState)([{
       color: '#006AFF',
       active: true
@@ -150,18 +151,18 @@ var PrdTools = function PrdTools(_ref) {
             var after = e.target.value === 'left' ? 'inline' : 'none';
             var before = e.target.value === 'right' ? 'inline' : 'none';
             // 遍历添加className
-            var formItemLabels = document.querySelectorAll('.ant-form-item-label');
+            var formItemLabels = document.querySelectorAll(".".concat(prefixCls, "-form-item-label"));
             // 遍历元素列表，为每个元素添加新的 class
             formItemLabels.forEach(function (label) {
               var _label$classList, _label$classList$valu, _label$classList2, _label$classList2$val;
               if (!label) {
                 return false;
               }
-              if (e.target.value === 'left' && !((_label$classList = label.classList) === null || _label$classList === void 0 ? void 0 : (_label$classList$valu = _label$classList.value) === null || _label$classList$valu === void 0 ? void 0 : _label$classList$valu.includes('ant-form-item-label-left'))) {
-                label.classList.add('ant-form-item-label-left');
+              if (e.target.value === 'left' && !((_label$classList = label.classList) === null || _label$classList === void 0 ? void 0 : (_label$classList$valu = _label$classList.value) === null || _label$classList$valu === void 0 ? void 0 : _label$classList$valu.includes("".concat(prefixCls, "-form-item-label-left")))) {
+                label.classList.add("".concat(prefixCls, "-form-item-label-left"));
               }
-              if (e.target.value === 'right' && ((_label$classList2 = label.classList) === null || _label$classList2 === void 0 ? void 0 : (_label$classList2$val = _label$classList2.value) === null || _label$classList2$val === void 0 ? void 0 : _label$classList2$val.includes('ant-form-item-label-left'))) {
-                label.classList.remove('ant-form-item-label-left');
+              if (e.target.value === 'right' && ((_label$classList2 = label.classList) === null || _label$classList2 === void 0 ? void 0 : (_label$classList2$val = _label$classList2.value) === null || _label$classList2$val === void 0 ? void 0 : _label$classList2$val.includes("".concat(prefixCls, "-form-item-label-left")))) {
+                label.classList.remove("".concat(prefixCls, "-form-item-label-left"));
               }
             });
             setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {

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

@@ -1,17 +1,17 @@
 .pro-theme-prd-tools-drawer {
-  .ant-drawer-header {
+  .@{ant-prefix}-drawer-header {
     border-bottom: none;
   }
 
-  .ant-drawer-title {
+  .@{ant-prefix}-drawer-title {
     font-size: var(--zaui-font-size-xl, 18px);
   }
 
-  .ant-drawer-body {
+  .@{ant-prefix}-drawer-body {
     padding: 0 32px 32px;
   }
 
-  .ant-space-vertical {
+  .@{ant-prefix}-space-vertical {
     gap: var(--zaui-space-size-sm, 8px) !important;
   }
 
@@ -118,12 +118,12 @@
     }
   }
 
-  .ant-radio-button-wrapper {
+  .@{ant-prefix}-radio-button-wrapper {
     padding: 0 28px;
   }
 
   .pro-theme-tools-form {
-    .ant-radio-button-wrapper {
+    .@{ant-prefix}-radio-button-wrapper {
       padding: 0 42px;
     }
   }

package/lib/ProThemeTools/index.d.ts

@@ -1,6 +1,6 @@
 import type { ProThemeToolsProps } from './propsType';
 declare const ProThemeTools: {
-    ({ size, className, cacheTime, color, mode, iconFollowTheme, tableBorder, tableStripe, theme, ...props }: ProThemeToolsProps): JSX.Element;
+    ({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, ...props }: ProThemeToolsProps): JSX.Element;
     defaultProps: {
         size: number;
         mode: string;

package/lib/ProThemeTools/index.js

@@ -17,7 +17,7 @@ var _classnames2 = _interopRequireDefault(require("classnames"));
 var _index = require("./utils/index");
 var _component = require("./component");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "tableBorder", "tableStripe", "theme"];
+var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme"];
 /* eslint-disable prefer-const */
 var defaultCacheTime = 1; // 配置保存时间为一天
 var defaultThemeConfig = {
@@ -42,6 +42,8 @@ var ProThemeTools = function ProThemeTools(_ref) {
     color = _ref.color,
     mode = _ref.mode,
     iconFollowTheme = _ref.iconFollowTheme,
+    _ref$prefixCls = _ref.prefixCls,
+    prefixCls = _ref$prefixCls === void 0 ? 'ant' : _ref$prefixCls,
     _ref$tableBorder = _ref.tableBorder,
     tableBorder = _ref$tableBorder === void 0 ? false : _ref$tableBorder,
     _ref$tableStripe = _ref.tableStripe,
@@ -121,6 +123,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
       setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), localThemeConfig));
       (0, _index.setThemes)(cssVariables);
       _antd.ConfigProvider.config({
+        prefixCls: prefixCls,
         theme: {
           primaryColor: (_localThemeConfig = localThemeConfig) === null || _localThemeConfig === void 0 ? void 0 : _localThemeConfig.zauiBrand
         }
@@ -128,6 +131,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
     } else {
       (0, _index.setThemes)((0, _index.getMapKebabCase)(state));
       _antd.ConfigProvider.config({
+        prefixCls: prefixCls,
         theme: {
           primaryColor: state === null || state === void 0 ? void 0 : state.zauiBrand
         }
@@ -150,7 +154,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
   }, [zauiBrand]);
   // 斑马纹设置
   (0, _react.useEffect)(function () {
-    (0, _index.setTableNoStripe)(zauiStripe);
+    (0, _index.setTableNoStripe)(zauiStripe, prefixCls);
   }, [zauiStripe]);
   // 表格边框设置
   (0, _react.useEffect)(function () {
@@ -182,6 +186,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
         showDrawer();
       }
     }), (0, _jsxRuntime.jsx)(_component.PrdTools, {
+      prefixCls: prefixCls,
       onReset: onReset,
       onClose: onClose,
       onCopy: onCopy,

package/lib/ProThemeTools/propsType.d.ts

@@ -9,6 +9,8 @@ export interface DevToolsPropsType {
     tableBorder?: boolean;
     /** 是否有斑马纹 */
     tableStripe?: boolean;
+    /** 统一样式前缀, 默认ant */
+    prefixCls?: string;
 }
 export interface ProThemeToolsProps {
     size?: number;
@@ -23,6 +25,8 @@ export interface ProThemeToolsProps {
     tableBorder?: boolean;
     /** 是否有斑马纹 */
     tableStripe?: boolean;
+    /** 统一样式前缀, 默认ant */
+    prefixCls?: string;
     [key: string]: any;
 }
 export interface LocalThemeConfigPropsType {

package/lib/ProThemeTools/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 @import '../component/PrdTools/style/index.less';
 
 .pro-theme-tools {
@@ -19,11 +22,11 @@
 }
 
 .pro-theme-tools-drawer {
-  .ant-drawer-body {
+  .@{ant-prefix}-drawer-body {
     padding: 32px;
   }
 
-  .ant-space-vertical {
+  .@{ant-prefix}-space-vertical {
     gap: var(--zaui-space-size-sm, 8px) !important;
   }
 
@@ -49,7 +52,7 @@
     margin-bottom: var(--zaui-space-size-md, 16px);
   }
 
-  .ant-radio-button-wrapper {
+  .@{ant-prefix}-radio-button-wrapper {
     padding: 0 12px;
   }
 }

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

@@ -23,7 +23,7 @@ export declare const getMapHumpCase: (obj?: {}) => {};
  * 设置表格斑马纹
  * @param stripe boolean
  */
-export declare const setTableNoStripe: (stripe: boolean) => void;
+export declare const setTableNoStripe: (stripe: boolean, prefixCls?: string) => void;
 /**
  * 设置表格边框
  * @param border boolean

package/lib/ProThemeTools/utils/index.js

@@ -81,8 +81,9 @@ var getMapHumpCase = exports.getMapHumpCase = function getMapHumpCase() {
  * @param stripe boolean
  */
 var setTableNoStripe = exports.setTableNoStripe = function setTableNoStripe(stripe) {
+  var prefixCls = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'ant';
   var proTables = document.querySelectorAll('.pro-table');
-  var antTables = document.querySelectorAll('.ant-table');
+  var antTables = document.querySelectorAll(".".concat(prefixCls, "-table"));
   if (!proTables.length) {
     return;
   }

package/lib/ProTooltip/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-tooltip {
   cursor: pointer;
 

package/lib/ProTree/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/ProTree/components/ProTree.js

@@ -25,7 +25,7 @@ var _locale = _interopRequireDefault(require("../../locale"));
 var _utils = require("../utils");
 var _inputSearch = _interopRequireDefault(require("../../assets/input-search.svg"));
 require("../style/index.less");
-var _excluded = ["value", "onChange", "dataSource", "mode", "code", "useRequest", "allValue", "showCodeName", "checkStrictly", "tags", "placeholder", "labelInValue", "fieldNames", "disabled", "isView", "transformResponse", "optionRender", "onSelect", "loading", "style", "className", "showSearch", "title", "footer", "expandedKeys", "showExpand", "selectKey"];
+var _excluded = ["value", "onChange", "dataSource", "mode", "code", "useRequest", "allValue", "showCodeName", "checkStrictly", "tags", "placeholder", "labelInValue", "fieldNames", "disabled", "isView", "transformResponse", "optionRender", "onSelect", "loading", "style", "className", "showSearch", "title", "footer", "expandedKeys", "showExpand", "defaultExpandAll"];
 var ProTree = function ProTree(props) {
   var _props$otherProps, _props$otherProps2, _locale$ProTree, _state$innerExpandKey2, _state$innerExpandKey3, _locale$ProTree2, _locale$ProTree3, _locale$ProTree4;
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
@@ -71,7 +71,7 @@ var ProTree = function ProTree(props) {
     expandedKeys = props.expandedKeys,
     _props$showExpand = props.showExpand,
     showExpand = _props$showExpand === void 0 ? false : _props$showExpand,
-    selectKey = props.selectKey,
+    defaultExpandAll = props.defaultExpandAll,
     other = (0, _objectWithoutProperties2.default)(props, _excluded);
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
@@ -86,7 +86,7 @@ var ProTree = function ProTree(props) {
       checkAll: false,
       allKeys: [],
       clickShowLoading: false,
-      innerExpandKeys: props === null || props === void 0 ? void 0 : props.expandedKeys
+      innerExpandKeys: []
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     state = _useSetState2[0],
@@ -96,11 +96,14 @@ var ProTree = function ProTree(props) {
     onSuccess: function onSuccess(res) {
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(res);
+        var flatTrees = (0, _utils.getFlatTreeData)(responseData, fieldNames);
+        var allKey = (0, _utils.getAllKeys)(responseData, fieldNames);
         setState({
           treeData: responseData,
           originalTreeData: responseData,
-          flatTreeData: (0, _utils.getFlatTreeData)(responseData, fieldNames),
-          allKeys: (0, _utils.getAllKeys)(responseData, fieldNames)
+          flatTreeData: flatTrees,
+          allKeys: allKey,
+          innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, allKey)
         });
       } else {
         var _res$status = res.status,
@@ -111,11 +114,14 @@ var ProTree = function ProTree(props) {
           _antd.message.error(msg);
           return;
         }
+        var _flatTrees = (0, _utils.getFlatTreeData)(data, fieldNames);
+        var _allKey = (0, _utils.getAllKeys)(data, fieldNames);
         setState({
           treeData: data,
           originalTreeData: data,
-          flatTreeData: (0, _utils.getFlatTreeData)(data, fieldNames),
-          allKeys: (0, _utils.getAllKeys)(data, fieldNames)
+          flatTreeData: _flatTrees,
+          allKeys: _allKey,
+          innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, _allKey)
         });
       }
     },
@@ -123,11 +129,13 @@ var ProTree = function ProTree(props) {
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
   (0, _ahooks.useDeepCompareEffect)(function () {
     if (dataSource && dataSource.length) {
+      var allKey = (0, _utils.getAllKeys)(dataSource, fieldNames);
       setState({
         treeData: dataSource,
         originalTreeData: (0, _lodash.cloneDeep)(dataSource),
         flatTreeData: (0, _utils.getFlatTreeData)(dataSource, fieldNames),
-        allKeys: (0, _utils.getAllKeys)(dataSource, fieldNames)
+        allKeys: allKey,
+        innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, allKey)
       });
     } else if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -140,11 +148,13 @@ var ProTree = function ProTree(props) {
         console.error('请返回有效的数组');
         dictEnum = [];
       }
+      var _allKey2 = (0, _utils.getAllKeys)(dictEnum, fieldNames);
       setState({
         treeData: dictEnum,
         originalTreeData: (0, _lodash.cloneDeep)(dictEnum),
         flatTreeData: (0, _utils.getFlatTreeData)(dictEnum, fieldNames),
-        allKeys: (0, _utils.getAllKeys)(dictEnum, fieldNames)
+        allKeys: (0, _utils.getAllKeys)(dictEnum, fieldNames),
+        innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, _allKey2)
       });
     }
   }, [dataSource, enumCode]);
@@ -204,7 +214,7 @@ var ProTree = function ProTree(props) {
               return item[fieldNameValue];
             });
           } else {
-            // 单选值场景为string走到这里
+            // 复选，单纯value数组场景
             checkedValues = _innerVal;
           }
         }
@@ -215,6 +225,11 @@ var ProTree = function ProTree(props) {
           // treeViewData,
         });
       }
+    } else if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
+      // 单选--场景-->如果表单的value没有值，那么配置的selectedKey就起作用了，选中树节点
+      setState({
+        checkedValues: props === null || props === void 0 ? void 0 : props.selectedKey
+      });
     }
   }, [value, state.allKeys]);
   /**
@@ -240,6 +255,7 @@ var ProTree = function ProTree(props) {
       onChange && onChange(values);
     }
   };
+  // 该方法只有复选框，在勾中checkbox后才会走到这个方法
   var onCheck = function onCheck(checkedKeys, info) {
     if (disabled || isView) {
       return null;

package/lib/ProTree/components/Tree.js

@@ -100,8 +100,8 @@ function List(props) {
     }
   }, [checkedValues]);
   (0, _react.useEffect)(function () {
+    // 复选树，配置的selectedKey在这里处理选中，单选树，在ProTree组件里跟value比优先级处理，到这个组件里面是checkedValues了
     if (checkable) {
-      // 复选树，selectedKey，选中那个树节点
       setState({
         currentClickTreeNode: selectedKey
       });