@zat-design/sisyphus-react 3.2.2 → 3.3.0-beta.2

package/lib/ProEditTable/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-edit-table {
   .pro-edit-table-tooltip {
     display    : inline-flex;
@@ -35,7 +38,7 @@
       justify-content: center;
       margin-top: var(--zaui-space-size-md, 16px);
 
-      .ant-btn-link {
+      .@{ant-prefix}-btn-link {
         padding: 0;
       }
     }
@@ -47,7 +50,7 @@
   }
 
 
-  .is-cell .ant-form-item .ant-form-item-row .ant-form-item-control .ant-form-item-control-input {
+  .is-cell .@{ant-prefix}-form-item .@{ant-prefix}-form-item-row .@{ant-prefix}-form-item-control .@{ant-prefix}-form-item-control-input {
     border: 1px solid transparent;
 
     &:hover {
@@ -66,15 +69,15 @@
   }
 
   &.pro-table-no-stripe {
-    .ant-table-tbody tr:nth-child(n)>td {
+    .@{ant-prefix}-table-tbody tr:nth-child(n)>td {
       background-color: var(--zaui-base-bg, #fff);
     }
   }
 
-  .ant-space {
+  .@{ant-prefix}-space {
     gap: var(--zaui-space-size-sm, 8px);
 
-    .ant-btn-link {
+    .@{ant-prefix}-btn-link {
       padding: 0 var(--zaui-space-size-xs, 4px);
 
       &:first-child {
@@ -83,12 +86,12 @@
     }
   }
 
-  .ant-table-header>table .ant-table-thead>tr>th.ant-table-selection-column {
+  .@{ant-prefix}-table-header>table .@{ant-prefix}-table-thead>tr>th.@{ant-prefix}-table-selection-column {
     padding-left: var(--zaui-space-size-md, 16px);
     padding-right: var(--zaui-space-size-md, 16px);
   }
 
-  .ant-table-header>table .ant-table-thead>tr>th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required {
+  .@{ant-prefix}-table-header>table .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
     &::after {
       content: "";
     }
@@ -130,27 +133,29 @@
     }
   }
 
-  .ant-table-content {
+  .@{ant-prefix}-table-scroll-horizontal {
+    .@{ant-prefix}-table-cell-fix-right-first {
+      &::after {
+        box-shadow: inset -10px 0 8px -8px rgba(0, 0, 0, 0.15);
+      }
+    }
+  }
+
+  .@{ant-prefix}-table-content {
     >table {
-      .ant-table-summary {
+      .@{ant-prefix}-table-summary {
         background-color: var(--zaui-table-header-bg, #f2f3f5);
         color           : var(--zaui-text, #343434);
         font-weight     : 600;
 
-        .ant-table-cell-fix-left,
-        .ant-table-cell-fix-right {
+        .@{ant-prefix}-table-cell-fix-left,
+        .@{ant-prefix}-table-cell-fix-right {
           background-color: var(--zaui-table-header-bg, #f2f3f5);
           
         }
       }
 
-      .ant-table-cell-fix-right-first {
-        &::after {
-          box-shadow: inset -10px 0 8px -8px rgba(0, 0, 0, 0.15);
-        }
-      }
-
-      th.ant-table-selection-column {
+      th.@{ant-prefix}-table-selection-column {
         width: 48px;
       }
 
@@ -160,7 +165,7 @@
         }
       }
 
-      .ant-table-thead>tr>th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required {
+      .@{ant-prefix}-table-thead>tr>th:not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan]).is-required {
         &::after {
           content: "";
         }
@@ -204,83 +209,88 @@
     }
   }
 
-  .ant-table-cell {
-    .ant-form-item {
+  .@{ant-prefix}-table-cell {
+    .@{ant-prefix}-form-item {
       margin-bottom: 0px !important;
     }
   }
 
-  .ant-table.ant-table-bordered>.ant-table-container {
+  .@{ant-prefix}-table.@{ant-prefix}-table-bordered>.@{ant-prefix}-table-container {
     border: 0;
   }
 
-  .ant-table-thead>tr>th {
+  .@{ant-prefix}-table-thead>tr>th {
     border          : 0;
     white-space     : nowrap;
     background-color: var(--zaui-table-header-bg, #f2f3f5);
   }
 
-  .ant-table-thead>tr>th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
+  .@{ant-prefix}-table-thead>tr>th:not(:last-child):not(.@{ant-prefix}-table-selection-column):not(.@{ant-prefix}-table-row-expand-icon-cell):not([colspan])::before {
     height: 0;
   }
 
-  .ant-table-tbody>tr:not(.ant-table-placeholder)>td {
+  .@{ant-prefix}-table-tbody>tr:not(.@{ant-prefix}-table-placeholder)>td {
     border-bottom: 0;
     border-right : 0;
     border-top   : 0;
   }
 
-  .ant-table-tbody>.is-editing:not(.ant-table-measure-row)>td {
+  .@{ant-prefix}-table-tbody>.is-editing:not(.@{ant-prefix}-table-measure-row)>td {
     border-bottom : 0;
     vertical-align: top;
   }
 
-  .ant-table-tbody tr:nth-child(n)>td {
+  .@{ant-prefix}-table-tbody tr:nth-child(n)>td {
     background-color: var(--zaui-base-bg, #ffffff);
   }
 
-  .ant-table-tbody tr:nth-child(2n)>td {
+  .@{ant-prefix}-table-tbody tr:nth-child(2n)>td {
     background-color: var(--zaui-table-strip-bg, #FAFAFA);
   }
 
-  .ant-table-tbody>.ant-table-placeholder>td {
+  .@{ant-prefix}-table-tbody>.@{ant-prefix}-table-placeholder>td {
     background-color: var(--zaui-base-bg, #ffffff);
   }
 
-  .ant-table-tbody {
+  .@{ant-prefix}-table-tbody {
 
-    >tr:hover:not(.ant-table-expanded-row, .ant-table-placeholder)>td,
-    .ant-table-row-hover,
-    .ant-table-row-hover>td {
+    >tr:hover:not(.@{ant-prefix}-table-expanded-row)>td,
+    .@{ant-prefix}-table-row-hover,
+    .@{ant-prefix}-table-row-hover>td {
+      background: #FAFAFA;
+    }
+    >tr:hover:not(.@{ant-prefix}-table-placeholder)>td,
+    .@{ant-prefix}-table-row-hover,
+    .@{ant-prefix}-table-row-hover>td {
       background: #FAFAFA;
     }
   }
 
-  .ant-table-fixed {
+  .@{ant-prefix}-table-fixed {
 
-    .ant-table-row-hover,
-    .ant-table-row-hover>td {
+    .@{ant-prefix}-table-row-hover,
+    .@{ant-prefix}-table-row-hover>td {
       background: #FAFAFA;
     }
   }
 
-  .ant-table-fixed-header {
-    .ant-table-tbody tr:nth-child(n)>td {
+  .@{ant-prefix}-table-fixed-header {
+    .@{ant-prefix}-table-tbody tr:nth-child(n)>td {
       background-color: #FAFAFA;
     }
 
-    .ant-table-tbody tr:nth-child(2n)>td {
+    .@{ant-prefix}-table-tbody tr:nth-child(2n)>td {
       background-color: var(--zaui-base-bg, #ffffff);
     }
   }
 
-  .ant-table-summary>tr>td {
+  .@{ant-prefix}-table-summary>tr>td {
     border-bottom: none;
   }
 
-  .ant-table-pagination {
-    .ant-pagination-options {
-      .ant-select.ant-select-in-form-item {
+  .@{ant-prefix}-table-pagination {
+    .@{ant-prefix}-pagination-options {
+      .@{ant-prefix}-select.@{ant-prefix}-select-in-form-item {
         width: auto;
       }
     }
@@ -299,11 +309,11 @@
 
 .pro-edit-table-toolbar {
   margin-top: var(--zaui-space-size-md, 16px);
-  .ant-space {
+  .@{ant-prefix}-space {
     gap: var(--zaui-space-size-sm, 8px);
 
-    .ant-space-item {
-      .ant-btn-link {
+    .@{ant-prefix}-space-item {
+      .@{ant-prefix}-btn-link {
         display: flex;
         align-items: center;
         padding: 0 var(--zaui-space-size-xs, 4px);
@@ -321,7 +331,7 @@
 }
 
 .pro-edit-table-drag {
-  table tr th.ant-table-selection-column.ant-table-cell-fix-left{
+  table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
     text-align: right;
   }
 }

package/lib/ProEditTable/utils/config.d.ts

@@ -20,6 +20,6 @@ export declare const actions: {
     save: ({ record, editingKeys, setState, form, rowName, virtualRowName, result }: any) => Promise<void>;
     cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey }: any) => void;
     delete: ({ name, record, editingKeys, setState, form, virtualKey, onlyOneLineMsg }: any) => boolean;
-    add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, }: any) => Promise<boolean>;
+    add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, prefixCls, }: any) => Promise<boolean>;
     mulDelete: ({ form, name, virtualKey, setState, selectedRowKeys, editingKeys }: any) => void;
 };

package/lib/ProEditTable/utils/config.js

@@ -174,11 +174,11 @@ var actions = exports.actions = {
   add: function () {
     var _add = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
-      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, nextData, rowKey, addData, nextEditingKeys;
+      var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef;
+            result = _ref5.result, insertType = _ref5.insertType, editingKeys = _ref5.editingKeys, setState = _ref5.setState, form = _ref5.form, name = _ref5.name, virtualName = _ref5.virtualName, virtualKey = _ref5.virtualKey, onlyOneLineMsg = _ref5.onlyOneLineMsg, tableRef = _ref5.tableRef, _ref5$prefixCls = _ref5.prefixCls, prefixCls = _ref5$prefixCls === void 0 ? 'ant' : _ref5$prefixCls;
             nextData = (0, _toConsumableArray2.default)(form.getFieldValue(name) || []); // 单行编辑时，需要先保存，才能进行下面的编辑
             if (!(virtualKey && editingKeys.length >= 1)) {
               _context2.next = 5;
@@ -197,7 +197,7 @@ var actions = exports.actions = {
             }
             insertType === 'before' ? nextData.unshift(addData) : nextData.push(addData);
             form.setFieldValue(name, nextData);
-            (_tableRef$current$que = tableRef.current.querySelector('.ant-table-body')) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
+            (_tableRef$current$que = tableRef.current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
               top: 10000,
               behavior: 'smooth'
             });

package/lib/ProEnum/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-enum {
   &-tag-root {
     display: flex;

package/lib/ProForm/components/base/DatePicker/index.d.ts

@@ -1,12 +1,12 @@
 import { DatePickerProps, TimePickerProps } from 'antd';
-import { Moment } from 'moment';
+import { Dayjs } from 'dayjs';
 import React from 'react';
 import { PickerPanelDateProps } from 'antd/lib/calendar/generateCalendar';
 export type Props = DatePickerProps & TimePickerProps & {
     isView?: boolean;
     viewEmpty?: React.ReactNode;
     format?: string;
-    showTime?: PickerPanelDateProps<Moment>['showTime'];
+    showTime?: PickerPanelDateProps<Dayjs>['showTime'];
     showNow?: boolean;
 };
 declare const DatePicker: React.FC<Props>;

package/lib/ProForm/components/base/DatePicker/index.js

@@ -12,7 +12,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -36,12 +36,12 @@ var DatePicker = function DatePicker(props) {
     var viewChildren = null;
     if (!value) {
       viewChildren = null;
-    } else if (typeof format === 'string' && _moment.default.isMoment(value)) {
+    } else if (typeof format === 'string' && _dayjs.default.isDayjs(value)) {
       viewChildren = value.format(format);
     } else if ((0, _lodash.isFunction)(format)) {
       viewChildren = format(value);
     } else if ((0, _lodash.isString)(value)) {
-      viewChildren = (0, _moment.default)(value).format(format);
+      viewChildren = (0, _dayjs.default)(value).format(format);
     }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
@@ -52,16 +52,13 @@ var DatePicker = function DatePicker(props) {
   var _rest = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
     showTime: rest.showTime === undefined && valueType === 'dateTime' || rest.showTime
   });
-  if (_rest === null || _rest === void 0 ? void 0 : _rest.placeholder) {
-    _rest === null || _rest === void 0 ? true : delete _rest.placeholder;
-  }
   // 字符串时间格式兼容
   if ((0, _lodash.isString)(_rest.value)) {
-    _rest.value = (0, _moment.default)(_rest.value);
+    _rest.value = (0, _dayjs.default)(_rest.value);
   }
   if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime === undefined) {
     _rest.showTime = {
-      value: (0, _moment.default)(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
+      value: (0, _dayjs.default)(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
       disabled: true
     };
   }

package/lib/ProForm/components/base/RangePicker/index.d.ts

@@ -1,11 +1,12 @@
-import type { RangePickerProps } from 'antd/es/date-picker';
 import React from 'react';
+import { Dayjs } from 'dayjs';
+import { RangePickerProps } from 'antd/lib/date-picker/generatePicker';
 import { ProFormOtherProps } from '../../../propsType';
 export type Props = {
     otherProps?: ProFormOtherProps;
     separator?: any;
     showTime?: any;
     isView?: boolean;
-} & Omit<RangePickerProps, 'separator'>;
+} & Omit<RangePickerProps<Dayjs>, 'separator'>;
 declare const RangePicker: React.FC<Props>;
 export default RangePicker;

package/lib/ProForm/components/base/RangePicker/index.js

@@ -10,11 +10,11 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["format", "otherProps", "separator"]; // @ts-check
+var _excluded = ["format", "otherProps", "separator"];
 var AntRangePicker = _antd.DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
   var _props$format = props.format,
@@ -56,9 +56,9 @@ var RangePicker = function RangePicker(props) {
   var _res = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
     showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
   });
-  // 字符串时间格式兼容
+  // // 字符串时间格式兼容
   if (Array.isArray(_res.value) && (0, _lodash.isString)(_res.value[0]) && (0, _lodash.isString)(_res.value[1])) {
-    _res.value = [(0, _moment.default)(_res.value[0]), (0, _moment.default)(_res.value[1])];
+    _res.value = [(0, _dayjs.default)(_res.value[0]), (0, _dayjs.default)(_res.value[1])];
   }
   return (0, _jsxRuntime.jsx)(AntRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), (0, _lodash.omit)(_res, ['separator'])));
 };

package/lib/ProForm/components/base/SwitchCheckbox/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .switch-checkbox-view {
   display    : flex;
   align-items: center;

package/lib/ProForm/components/base/TextArea/index.less

@@ -1,7 +1,8 @@
-.pro-textarea {
-}
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 div.pro-textarea-view {
-  .ant-input-disabled {
+  .@{ant-prefix}-input-disabled {
     background: transparent !important;
   }
   &::after {

package/lib/ProForm/components/base/TimePicker/index.js

@@ -9,7 +9,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _moment = _interopRequireDefault(require("moment"));
+var _dayjs = _interopRequireDefault(require("dayjs"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
@@ -31,7 +31,7 @@ var TimePicker = function TimePicker(props) {
   var initialConfig = (0, _ProConfigProvider.useProConfig)('AntTimePicker');
   var handleChange = function handleChange(value) {
     if (valueType === 'dateTime') {
-      onChange && onChange(value ? (0, _moment.default)(value).format(format) : undefined);
+      onChange && onChange(value ? (0, _dayjs.default)(value).format(format) : undefined);
     }
   };
   if (isView) {
@@ -41,7 +41,7 @@ var TimePicker = function TimePicker(props) {
     });
   }
   return (0, _jsxRuntime.jsx)(_antd.TimePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    value: value ? (0, _moment.default)(value, format) : undefined
+    value: value ? (0, _dayjs.default)(value, format) : undefined
   }, initialConfig), rest), {}, {
     format: format,
     onChange: handleChange

package/lib/ProForm/components/base/TimePicker/style/index.less

@@ -1,3 +1,6 @@
-.ant-picker {
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
+.@{ant-prefix}-picker {
   display: flex;
 }

package/lib/ProForm/components/combination/Container/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-container {
 
   &.pro-container-diy {
@@ -9,7 +12,7 @@
       margin-right : -12px;
       margin-bottom: -22px;
 
-      &>.ant-col {
+      &>.@{ant-prefix}-col {
         padding-left : 12px;
         padding-right: 12px;
       }
@@ -24,13 +27,13 @@
     margin-left     : -12px;
     margin-right    : -12px;
 
-    &>.ant-col {
+    &>.@{ant-prefix}-col {
       padding-left : 12px;
       padding-right: 12px;
     }
   }
 
-  .pro-collapse.ant-collapse .pro-collapse-panel {
+  .pro-collapse.@{ant-prefix}-collapse .pro-collapse-panel {
     margin-bottom: 0;
   }
 }

package/lib/ProForm/components/combination/FormList/style/index.less

@@ -1,28 +1,23 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-form-list-block-title {
-  height      : 14px;
-  margin      : @zaui-space-size-xs 0;
+  height: 14px;
+  margin: @zaui-space-size-xs 0;
   padding-left: @zaui-space-size-sm;
-  font-weight : 600;
-  line-height : 14px;
-  border-left : 4px solid @zaui-brand;
+  font-weight: 600;
+  line-height: 14px;
+  border-left: 4px solid @zaui-brand;
 }
 
 .pro-form-list {
-  display       : flex;
+  display: flex;
   padding-bottom: 0;
 
-  &.pro-form-list-last {
-
-    .pro-form-list-drag-handle,
-    .ant-form-item {
-      margin-bottom: 0 !important;
-    }
-  }
-
   .single-delete {
-    width : 14px !important;
+    width: 14px !important;
     height: 14px !important;
-    color : @zaui-placeholder;
+    color: @zaui-placeholder;
 
     &:hover {
       color: @zaui-aide-text;
@@ -36,24 +31,25 @@
   .pro-form-list-action {
     padding-bottom: var(--zaui-height-size-md, 16px);
 
-    &>.ant-space-item:first-child>.ant-btn-link {
+    & > .@{ant-prefix}-space-item:first-child > .@{ant-prefix}-btn-link {
       margin-left: @zaui-space-size-sm;
     }
   }
 
   .pro-form-list-drag-handle {
-    display      : flex;
-    align-items  : center;
-    height       : 32px;
+    display: flex;
+    align-items: center;
+    height: 32px;
     margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-    padding      : 0;
+    padding: 0;
     padding-right: @zaui-space-size-sm;
-    border       : none;
+    border: none;
   }
 }
 
 .pro-form-list-line {
   padding: var(--zaui-height-size-md, 16px);
+  padding-bottom: 0;
 
   &:hover {
     background: rgba(0, 0, 0, 0.018);
@@ -62,11 +58,11 @@
 
 .pro-form-list-toolbar,
 .pro-form-list-action {
-  .ant-btn-link {
+  .@{ant-prefix}-btn-link {
     padding: @zaui-space-size-xs 0;
   }
 
-  .ant-btn-text:hover {
+  .@{ant-prefix}-btn-text:hover {
     background: transparent;
   }
 }

package/lib/ProForm/components/combination/Group/style/index.less

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .border-radius(@start-end: 0, @end-end: 0, @start-start: 0, @end-start: 0) {
   border-start-end-radius  : @start-end;
   border-end-end-radius    : @end-end;
@@ -19,38 +22,38 @@
   width: unset !important;
 
   &.pro-group-diy-width {
-    .ant-space .ant-space-item {
+    .@{ant-prefix}-space .@{ant-prefix}-space-item {
       width: auto;
 
-      .ant-space-item {
+      .@{ant-prefix}-space-item {
         width: auto;
       }
     }
   }
 
-  .ant-space {
+  .@{ant-prefix}-space {
     width: 100%;
 
-    .ant-space-item {
+    .@{ant-prefix}-space-item {
       width: 100%;
     }
 
-    .ant-form-item {
+    .@{ant-prefix}-form-item {
 
       margin-bottom: 0 !important;
     }
   }
 
-  .ant-form-item-label {
+  .@{ant-prefix}-form-item-label {
     display: none;
   }
 
-  .ant-space-compact {
+  .@{ant-prefix}-space-compact {
     align-items: center;
     flex       : auto;
     width      : 100%;
 
-    .ant-form-item {
+    .@{ant-prefix}-form-item {
       margin-bottom: 0 !important;
     }
 
@@ -62,8 +65,8 @@
     }
 
     // 定制内敛合并样式
-    .ant-input-affix-wrapper,
-    .ant-select {
+    .@{ant-prefix}-input-affix-wrapper,
+    .@{ant-prefix}-select {
       .border-radius(0, 0, 0, 0);
 
       &:nth-child(n+2) {
@@ -79,19 +82,19 @@
       }
     }
 
-    .ant-select {
-      .ant-select-selector {
+    .@{ant-prefix}-select {
+      .@{ant-prefix}-select-selector {
         .border-radius(0, 0, 0, 0);
       }
 
       &:first-child {
-        .ant-select-selector {
+        .@{ant-prefix}-select-selector {
           .start-radius()
         }
       }
 
       &:last-child {
-        .ant-select-selector {
+        .@{ant-prefix}-select-selector {
           .end-radius()
         }
       }
@@ -99,7 +102,7 @@
     }
 
     // 报错样式定制
-    .ant-input-affix-wrapper-status-error~.group-separator {
+    .@{ant-prefix}-input-affix-wrapper-status-error~.group-separator {
       border-color: var(--ant-error-color);
       color       : var(--ant-error-color);
     }