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

package/es/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/es/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/es/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/es/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/es/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/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -5,6 +5,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useDebounceFn, usePrevious, useRequest } from 'ahooks';
 import { isEqual } from 'lodash';
 import { useCallback, useEffect, useMemo, useState } from 'react';
+import locale, { formatMessage } from '../../../../../locale';
 var defaultPage = {
   pageNum: 1,
   pageSize: 10
@@ -128,7 +129,11 @@ export 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 formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+          total: total
+        });
       }
     } : false
   });

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

@@ -419,19 +419,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               useRequest.initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField = contentForm.getFieldsValue) === null || _contentForm$getField === void 0 ? void 0 : _contentForm$getField.call(contentForm));
             }
             if (!((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne)) {
-              _context4.next = 13;
+              _context4.next = 10;
               break;
             }
-            if (readOnly) {
-              _context4.next = 5;
-              break;
-            }
-            setState({
-              _value: value,
-              isInit: false
-            });
-            return _context4.abrupt("return");
-          case 5:
             queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || {});
             page = _objectSpread({
               pageNum: 1,
@@ -441,9 +431,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
-            _context4.next = 11;
+            _context4.next = 8;
             return runAsync(params);
-          case 11:
+          case 8:
             res = _context4.sent;
             if (res === null || res === void 0 ? void 0 : res.data) {
               list = [];
@@ -453,19 +443,27 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 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;
               }
               _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
-              nextSelectRowKeys = isMultiple ? value : [value];
-              if (labelInValue) {
-                onChange(_data2);
+              if (_data2) {
+                nextSelectRowKeys = isMultiple ? value : [value];
+                if (labelInValue) {
+                  onChange(_data2);
+                }
+                // 更新内部展示值
+                setState({
+                  _value: _data2,
+                  isInit: false,
+                  selectedRows: list,
+                  selectedRowKeys: nextSelectRowKeys
+                });
+              } else if (!readOnly) {
+                // 当传入initParams且文本框非只读时，不调用接口获取初始化数据
+                setState({
+                  _value: value,
+                  isInit: false
+                });
               }
-              // 更新内部展示值
-              setState({
-                _value: _data2,
-                isInit: false,
-                selectedRows: list,
-                selectedRowKeys: nextSelectRowKeys
-              });
             }
-          case 13:
+          case 10:
           case "end":
             return _context4.stop();
         }

package/es/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/es/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/es/ProForm/components/combination/ProRangeLimit/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RangePickerProps } from 'antd/es/date-picker';
-import { Moment } from 'moment';
+import { Dayjs } from 'dayjs';
 export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'separator' | 'mode'> & {
     disabled?: boolean;
     foreverText?: string;
@@ -12,7 +12,7 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
     separator?: any;
     isView?: boolean;
 };
-type Value = [Moment?, Moment?, boolean?];
+type Value = [Dayjs?, Dayjs?, boolean?];
 type ValueStr = [string?, string?, string?];
 type HandleChange = (value: ValueStr | null, valueStr: Value | null) => void;
 declare const ProRangeLimit: React.FC<Props>;

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

@@ -12,12 +12,12 @@ import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useMemo, useState } from 'react';
 import { omit } from 'lodash';
 import classNames from 'classnames';
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import locale from '../../../../locale';
 import ProForm from '../../../../ProForm';
-var defaultPickerValue = [moment(), moment()];
+var defaultPickerValue = [dayjs(), dayjs()];
 var useControlled = function useControlled(props) {
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -25,7 +25,7 @@ var useControlled = function useControlled(props) {
     setValue = _useState2[1];
   if ('value' in props) {
     var _props$value, _props$value2;
-    var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && moment(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && moment(props.value[1], props.format)];
+    var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && dayjs(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && dayjs(props.value[1], props.format)];
     var handleChange = function handleChange(value, other) {
       var _value = _slicedToArray(value, 2),
         start = _value[0],
@@ -74,10 +74,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
     'forever-checkbox': true
   });
   var _isForever = useMemo(function () {
-    return moment(foreverDate, format).isSame(endDate);
+    return dayjs(foreverDate, format).isSame(endDate);
   }, [value]);
   var foreverMoment = useMemo(function () {
-    return moment(foreverDate, format);
+    return dayjs(foreverDate, format);
   }, [foreverDate, format]);
   if (isView) {
     var _props$value3, _props$value4;
@@ -115,7 +115,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
       start = _ref9[0],
       end = _ref9[1];
     if (e.target.checked) {
-      start = start || moment().startOf('day');
+      start = start || dayjs().startOf('day');
       end = foreverMoment;
     } else {
       start = undefined;

package/es/ProForm/components/combination/ProTimeLimit/hooks/useControlled.d.ts

@@ -1,8 +1,8 @@
-import moment, { Moment } from 'moment';
+import dayjs, { Dayjs } from 'dayjs';
 interface Props<T = any> {
     value?: T;
     onChange?: (value: T, ...rest: any[]) => void;
     format?: string;
 }
-declare const useControlled: (props: Props) => [moment.Moment, (value: Moment | undefined) => void];
+declare const useControlled: (props: Props) => [dayjs.Dayjs, (value: Dayjs | undefined) => void];
 export default useControlled;

package/es/ProForm/components/combination/ProTimeLimit/hooks/useControlled.js

@@ -1,5 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { useState } from 'react';
 var useControlled = function useControlled(props) {
   var value = props.value,
@@ -18,7 +18,7 @@ var useControlled = function useControlled(props) {
     onChange(_value, value);
   };
   if ('value' in props) {
-    return [value && moment(value, format).startOf('day'), handleChange];
+    return [value && dayjs(value, format).startOf('day'), handleChange];
   }
   return [valueState, handleChange];
 };

package/es/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -1,12 +1,12 @@
 import { DatePickerProps } from 'antd';
-import { Moment } from 'moment';
+import { Dayjs } from 'dayjs';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
 import { Props as ProRangeLimitProps } from '../ProRangeLimit';
 export type DateType = DatePickerProps['value'];
 export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
     value?: string;
-    onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Moment) => void;
+    onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Dayjs) => void;
     disabled?: boolean;
     foreverTime?: string;
     foreverText?: string;

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

@@ -12,7 +12,7 @@ var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType"
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { omit } from 'lodash';
-import moment, { isMoment } from 'moment';
+import dayjs, { isDayjs } from 'dayjs';
 import { useMemo } from 'react';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
@@ -37,7 +37,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _useMemo = useMemo(function () {
-      var foreverMoment = foreverTime ? moment(foreverTime, format) : moment('9999-01-01', 'YYYY-MM-DD');
+      var foreverMoment = foreverTime ? dayjs(foreverTime, format) : dayjs('9999-01-01', 'YYYY-MM-DD');
       var foreverString = foreverTime || foreverMoment.format(format);
       return [foreverString, foreverMoment];
     }, [format, foreverTime]),
@@ -53,7 +53,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var initialConfig = useProConfig('ProTimeLimit');
   var isForever = useMemo(function () {
-    if (isMoment(value)) {
+    if (isDayjs(value)) {
       return foreverMoment.format(format) === value.format(format);
     }
     return false;
@@ -61,7 +61,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
   var foreverChange = function foreverChange(e) {
     var checkedForever = e.target.checked;
     if (checkedForever) {
-      onChange(moment(foreverString, format));
+      onChange(dayjs(foreverString, format));
     } else {
       onChange(null);
     }