@zat-design/sisyphus-react 3.2.2 → 3.3.0

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.js

@@ -52,9 +52,6 @@ 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);

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/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);
     }

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

@@ -1,8 +1,11 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-address {
   display: flex;
   width: 100%;
 
-  .ant-cascader {
+  .@{ant-prefix}-cascader {
     width: 50% !important;
 
     &.no-detail {
@@ -14,12 +17,12 @@
     width: 50%;
     margin-left: 2px;
 
-    .ant-input-affix-wrapper {
+    .@{ant-prefix}-input-affix-wrapper {
       width: 100%;
     }
   }
 
-  .ant-input-affix-wrapper {
+  .@{ant-prefix}-input-affix-wrapper {
     width: 50%;
     margin-left: 2px;
   }

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

@@ -1,4 +1,7 @@
-.pro-combination.ant-input-group.ant-input-group-compact {
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
+.pro-combination.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact {
   display: flex;
 
   & > * {
@@ -9,7 +12,7 @@
     flex: none;
   }
 
-  & > *:not(.ant-btn) {
+  & > *:not(.@{ant-prefix}-btn) {
     flex: 1;
   }
 }

package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -13,6 +14,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
 var _react = require("react");
+var _locale = _interopRequireWildcard(require("../../../../../locale"));
 var defaultPage = {
   pageNum: 1,
   pageSize: 10
@@ -136,7 +138,11 @@ function useRequestList(service, options, useRequestOptions) {
       onShowSizeChange: onChange,
       hideOnSinglePage: page.pageSize === 10,
       showTotal: function showTotal(total) {
-        return "\u5171".concat(total, "\u6761");
+        var _locale$ProEditTable;
+        if (!total) return;
+        return (0, _locale.formatMessage)(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEditTable = _locale.default.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+          total: total
+        });
       }
     } : false
   });

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

@@ -1,6 +1,9 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-modal-select,
 .pro-tree-modal {
-  .ant-input-group-wrapper {
+  .@{ant-prefix}-input-group-wrapper {
     .close-icon {
       display: none;
     }
@@ -32,31 +35,49 @@
       }
     }
     &:hover {
-      .ant-input,
-      .ant-input-group-addon {
+      .@{ant-prefix}-input,
+      .@{ant-prefix}-input-group-addon {
         border-color: var(--zaui-brand-hover, #3387ff);
       }
+
+      .@{ant-prefix}-input-disabled {
+        border-color: #d9d9d9;
+      }
+
+      .@{ant-prefix}-input-disabled + span {
+        border-color: #d9d9d9;
+        .close-icon {
+          display: none;
+        }
+      }
+    }
+  }
+
+  .pro-tree-modal-input-appoint {
+    .@{ant-prefix}-input {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
     }
   }
 
-  .ant-input-group-wrapper-status-error {
+  .@{ant-prefix}-input-group-wrapper-status-error {
     &:hover {
-      .ant-input,
-      .ant-input-group-addon {
+      .@{ant-prefix}-input,
+      .@{ant-prefix}-input-group-addon {
         border-color: var(--ant-error-color, #ff4d4f);
       }
     }
   }
-  .ant-input-group {
-    .ant-input {
+  .@{ant-prefix}-input-group {
+    .@{ant-prefix}-input {
       padding-right: 26px;
     }
   }
 
   .trigger-no-hover {
     &:hover {
-      .ant-input,
-      .ant-input-group-addon {
+      .@{ant-prefix}-input,
+      .@{ant-prefix}-input-group-addon {
         border-color: @zaui-form-control-line;
       }
     }
@@ -72,7 +93,7 @@
     fill: #c5c7cd;
   }
 
-  .ant-input-group-addon {
+  .@{ant-prefix}-input-group-addon {
     padding: 0px var(--zaui-space-size-sm, 8px);
     background-color: var(--zaui-base-bg, #ffffff);
     cursor: pointer;

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

@@ -1,3 +1,6 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-number-range {
 
   .range-split {
@@ -8,7 +11,7 @@
     text-align    : center !important;
   }
 
-  .ant-input-status-error {
+  .@{ant-prefix}-input-status-error {
     &.range-split {
       border-color: @zaui-danger;
     }
@@ -16,16 +19,16 @@
 
 
 
-  & .ant-input-rtl.range-right {
+  & .@{ant-prefix}-input-rtl.range-right {
     border-right-width: 0;
   }
 
-  & .ant-input-rtl.range-right:hover,
-  & .ant-input-rtl.range-right:focus {
+  & .@{ant-prefix}-input-rtl.range-right:hover,
+  & .@{ant-prefix}-input-rtl.range-right:focus {
     border-right-width: 1px;
   }
 
-  .ant-form-item {
+  .@{ant-prefix}-form-item {
     margin-bottom: 0;
   }
 
@@ -36,13 +39,13 @@
   }
 
   .range-left {
-    .ant-input-number {
+    .@{ant-prefix}-input-number {
       border-right: none;
     }
   }
 
   .range-right {
-    .ant-input-number {
+    .@{ant-prefix}-input-number {
       border-left: none;
     }
 
@@ -53,7 +56,7 @@
     }
   }
 
-  &.ant-input-group.ant-input-group-compact>*:not(:last-child) {
+  &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact>*:not(:last-child) {
     margin-right: 0;
   }
 
@@ -61,7 +64,7 @@
     border-top-right-radius   : 0 !important;
     border-bottom-right-radius: 0 !important;
 
-    >.ant-select-selector {
+    >.@{ant-prefix}-select-selector {
       border-top-right-radius   : 0 !important;
       border-bottom-right-radius: 0 !important;
     }
@@ -71,7 +74,7 @@
     border-top-left-radius   : 0 !important;
     border-bottom-left-radius: 0 !important;
 
-    >.ant-select-selector {
+    >.@{ant-prefix}-select-selector {
       border-top-left-radius   : 0 !important;
       border-bottom-left-radius: 0 !important;
     }

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

@@ -1,10 +1,13 @@
-.ant-form-item-has-error {
-  .ant-picker-status-error
-    ~ .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input {
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
+.@{ant-prefix}-form-item-has-error {
+  .@{ant-prefix}-picker-status-error
+    ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(.@{ant-prefix}-input-borderless).@{ant-prefix}-input {
     background: @zaui-base-bg;
     border-color: var(--ant-error-color);
   }
-  .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus {
+  .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(.@{ant-prefix}-input-borderless).@{ant-prefix}-input:focus {
     border-color: var(--ant-error-color-hover);
     border-right-width: 1px;
     outline: 0;
@@ -12,12 +15,12 @@
   }
 }
 
-span.ant-input-group-compact {
+span.@{ant-prefix}-input-group-compact {
   &.pro-time-limit,
   &.pro-range-limit {
     display: flex;
 
-    .ant-picker {
+    .@{ant-prefix}-picker {
       flex: 1;
     }
 

package/lib/ProForm/components/render/RenderFields.js

@@ -74,8 +74,7 @@ var RenderFields = function RenderFields(props) {
       formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      _column$disabled = column.disabled,
-      disabled = _column$disabled === void 0 ? false : _column$disabled,
+      disabled = column.disabled,
       equalWith = column.equalWith,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
@@ -145,10 +144,10 @@ var RenderFields = function RenderFields(props) {
       _fieldProps.disabled = formDisabled;
     }
     var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      disabledStrictly: true
-    }, _fieldProps), {}, {
-      disabled: _disabled,
+      disabledStrictly: true,
       placeholder: _placeholder
+    }, _fieldProps), {}, {
+      disabled: _disabled
     });
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {