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

package/es/ProAction/index.less

@@ -1,6 +1,7 @@
 .pro-action-view-tile {
-  margin-bottom: 12px;
-  color: #666;
+  margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
+  color        : #666;
+
   span {
     color: #000;
   }

package/es/ProConfigProvider/index.d.ts

@@ -4,6 +4,7 @@ import { ProModalSelectPropsType } from '../ProForm/components/combination/ProMo
 import { AddressProps } from '../ProForm/components/combination/ProAddressBar/propsType';
 import { ProEnumConfig } from '../ProEnum/propsType';
 export interface ProConfigState {
+    locale?: string;
     ProEnum?: Partial<ProEnumConfig>;
     ProSelect?: Partial<PropSelectProps> & Record<string, any>;
     ProModalSelect?: Partial<ProModalSelectPropsType> & Record<string, any>;
@@ -19,5 +20,6 @@ export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
 export declare const ProConfigProvider: FC<{
     value: ProConfigState;
+    locale?: string;
 }>;
 export default ProConfigProvider;

package/es/ProConfigProvider/index.js

@@ -1,9 +1,14 @@
+import "antd/es/config-provider/style";
+import _ConfigProvider from "antd/es/config-provider";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import React, { useContext, useReducer } from 'react';
+import zhCN from 'antd/es/locale/zh_CN';
+import enUS from 'antd/es/locale/en_US';
 import merge from 'lodash/merge';
 import useEnumRequest from '../ProEnum/hooks/useEnumRequest';
+import { setLanguage } from '../locale';
 export var ProConfigContext = /*#__PURE__*/React.createContext({
   state: {
     ProEnum: {
@@ -43,13 +48,24 @@ export var ProConfigProvider = function ProConfigProvider(props) {
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
   useEnumRequest(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 ? void 0 : (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
+  var cacheLang = localStorage.getItem('locale');
+  // 如果是用户切换了语言那么优先使用用户切换的，否则从缓存中取用户语言，在取默认值
+  var lang = (state === null || state === void 0 ? void 0 : state.locale) || cacheLang || (props === null || props === void 0 ? void 0 : props.locale);
+  // 如果缓存里没有语言，那么将配置的语言设置为当前系统语言
+  if (!(state === null || state === void 0 ? void 0 : state.locale) && !cacheLang && (props === null || props === void 0 ? void 0 : props.locale)) {
+    // 设置默认语言
+    setLanguage(props === null || props === void 0 ? void 0 : props.locale);
+  }
   return _jsx(ProConfigContext.Provider, {
     value: {
       state: merge(state, props.value),
       dispatch: dispatch
     },
-    children: _jsxs("div", {
-      children: [" ", props.children]
+    children: _jsx(_ConfigProvider, {
+      locale: lang === 'en-US' ? enUS : zhCN,
+      children: _jsxs("div", {
+        children: [" ", props.children]
+      })
     })
   });
 };

package/es/ProDrawerForm/index.js

@@ -1,12 +1,14 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+var _locale$common2;
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
 import { ProDrawer, ProModal } from './components';
 import ProForm from '../ProForm';
 import { transformBySize } from './utils';
+import locale from '../locale';
 var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
-  var _okText;
+  var _okText, _locale$common;
   var visible = props.visible,
     showType = props.showType,
     okText = props.okText,
@@ -21,7 +23,7 @@ var ProDrawerForm = /*#__PURE__*/forwardRef(function (props, ref) {
     children = props.children;
   showType = mode || showType;
   isView = isView || disabled;
-  okText = (_okText = okText) !== null && _okText !== void 0 ? _okText : showType === 'Drawer' ? '保存' : '确定';
+  okText = (_okText = okText) !== null && _okText !== void 0 ? _okText : showType === 'Drawer' ? locale === null || locale === void 0 ? void 0 : (_locale$common = locale.common) === null || _locale$common === void 0 ? void 0 : _locale$common.save : locale === null || locale === void 0 ? void 0 : locale.dialog.confirm;
   visible = open !== null && open !== void 0 ? open : visible;
   var width = props.width;
   if (!width && size) {
@@ -83,7 +85,7 @@ ProDrawerForm.defaultProps = {
   size: 'middle',
   isConfirmClose: true,
   maskClosable: false,
-  cancelText: '取消',
+  cancelText: locale === null || locale === void 0 ? void 0 : (_locale$common2 = locale.common) === null || _locale$common2 === void 0 ? void 0 : _locale$common2.cancel,
   proFormProps: {}
 };
 export default ProDrawerForm;

package/es/ProDrawerForm/style/index.less

@@ -8,7 +8,7 @@
     justify-content: center;
     width          : 32px;
     height         : 38px;
-    color: var(--zaui-global-bg, #fff);
+    color          : var(--zaui-global-bg, #fff);
     cursor         : pointer;
 
     .close-icon {
@@ -17,12 +17,13 @@
       z-index  : 1;
       font-size: var(--zaui-font-size-lg, 16px);
       transform: translateZ(100px);
-      fill: var(--zaui-aide-text, #909090);
+      fill     : var(--zaui-aide-text, #909090);
 
       &:hover {
         fill: var(--zaui-brand-active, #005AD9);
       }
-      > div {
+
+      >div {
         height: 20px;
       }
     }
@@ -55,7 +56,7 @@
 
   .pro-drawer-scrolling {
     z-index   : 1;
-    box-shadow: -12px 14px 14px -18px var(--zaui-shadow, rgba(56,56,56,0.15));
+    box-shadow: -12px 14px 14px -18px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
   }
 
   .pro-drawer-content {
@@ -75,7 +76,7 @@
     width           : 100%;
     padding         : var(--zaui-space-size-md, 16px) var(--zaui-space-size-lg, 32px);
     background-color: var(--zaui-global-bg, #fff);
-    box-shadow      : 8px 2px 8px 0 var(--zaui-shadow, rgba(56,56,56,0.15));
+    box-shadow      : 8px 2px 8px 0 var(--zaui-shadow, rgba(56, 56, 56, 0.15));
 
     button {
       margin-right: var(--zaui-space-size-sm, 8px);
@@ -91,6 +92,7 @@
     padding   : 0;
     overflow-y: hidden;
   }
+
   .ant-drawer-content {
     position: static;
   }
@@ -105,15 +107,18 @@
     .ant-modal-close-x {
       .close-icon {
         fill: var(--zaui-aide-text, #909090);
+
         &:hover {
           fill: var(--zaui-brand, #006aff);
         }
       }
     }
   }
+
   .ant-modal-header {
     padding      : var(--zaui-space-size-md, 16px);
     border-bottom: none;
+
     .ant-modal-title {
       font-weight: 600;
     }
@@ -124,7 +129,7 @@
     border-top: none;
 
     .pro-modal-footer {
-      display: flex;
+      display        : flex;
       justify-content: space-between;
     }
   }
@@ -143,8 +148,7 @@
 .pro-modal-no-footer {
   .ant-modal-content {
     .ant-modal-body {
-      
-      padding-bottom   : var(--zaui-space-size-md, 16px);
+      padding-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1))
     }
   }
 }
@@ -153,7 +157,7 @@
   z-index: 1;
 
   .ant-modal-header {
-    box-shadow: -12px 14px 14px -18px var(--zaui-shadow, rgba(56,56,56,0.15));
+    box-shadow: -12px 14px 14px -18px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
     position  : relative;
     z-index   : 1;
   }
@@ -163,6 +167,6 @@
   .ant-modal-footer {
     position  : relative;
     z-index   : 1;
-    box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56,56,56,0.15));
+    box-shadow: 3px 2px 12px 0px var(--zaui-shadow, rgba(56, 56, 56, 0.15));
   }
-}
+}

package/es/ProEditLabel/style/index.less

@@ -87,11 +87,11 @@
     font-size    : var(--zaui-font-size-lg, 16px);
     font-weight  : 500;
     color        : var(--zaui-text, #343434);
-    margin-bottom: var(--zaui-space-size-sm, 8px);
+    margin-bottom: calc(var(--zaui-space-size-sm, 8px) * var(--zaui-size; 1));
   }
 
   .pro-edit-label-tip {
-    margin-bottom: var(--zaui-space-size-md, 16px);
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
     color        : #666;
 
     .anticon-info-circle {

package/es/ProEditTable/style/index.less

@@ -56,7 +56,7 @@
       text-indent  : 5px;
     }
   }
-  
+
   .drag-wrapper {
     display: flex;
     .drag-icon {
@@ -110,12 +110,12 @@
         line-height: 1;
         content    : "*";
       }
-    
+
       &.is-required-left {
         &::after {
           display: none;
         }
-    
+
         &::before {
           position   : static;
           top        : 0;
@@ -140,6 +140,13 @@
         .ant-table-cell-fix-left,
         .ant-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);
         }
       }
 
@@ -175,12 +182,12 @@
             line-height: 1;
             content    : "*";
           }
-        
+
           &.is-required-left {
             &::after {
               display: none;
             }
-        
+
             &::before {
               position   : static;
               top        : 0;
@@ -282,7 +289,7 @@
 }
 
 .pro-edit-table-header {
-  margin-bottom: var(--zaui-space-size-md, 16px);
+  margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 }
 
 .pro-edit-table-toolbar-fixed {
@@ -300,11 +307,11 @@
         display: flex;
         align-items: center;
         padding: 0 var(--zaui-space-size-xs, 4px);
-  
+
         &:first-child {
           padding-left: 0;
         }
-  
+
         span:nth-child(2) {
           margin-left: var(--zaui-space-size-xs, 4px);
         }

package/es/ProEditTable/utils/config.js

@@ -7,6 +7,7 @@ import "antd/es/message/style";
 import _message from "antd/es/message";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { PlusOutlined } from '@ant-design/icons';
+import { set } from 'lodash';
 import { onDelete, getRandom } from './tools';
 export var defaultBtnNameMap = {
   add: '添加',
@@ -62,7 +63,7 @@ export var actions = {
   },
   save: function () {
     var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
-      var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys;
+      var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -80,11 +81,14 @@ export var actions = {
             } else {
               delete record.isEditing;
             }
-            form.setFieldValue(rowName, record);
+            // 防止value引用不变, 值不更新 - (自定义组件)
+            values = form.getFieldsValue();
+            set(values, rowName, record);
+            form.setFieldsValue(values);
             setState({
               editingKeys: nextEditingKeys
             });
-          case 8:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -124,7 +128,10 @@ export var actions = {
         selectedRowKeys: [record.rowKey]
       });
     } else {
-      form.setFieldValue(virtualRowName, record);
+      // 防止value引用不变, 值不更新 - (自定义组件)
+      var values = form.getFieldsValue();
+      set(values, virtualRowName, record);
+      form.setFieldsValue(values);
     }
   },
   delete: function _delete(_ref4) {

package/es/ProEnum/style/index.less

@@ -9,7 +9,7 @@
     align-items: center;
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
-    margin-bottom: var(--zaui-space-size-sm);
+     margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
     padding: var(--zaui-space-size-xs) 10px;
     background-color: #f5f5f5;
     border-radius: var(--zaui-space-size-xs);

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

@@ -50,9 +50,6 @@ var RangePicker = function RangePicker(props) {
   var _res = _objectSpread(_objectSpread({}, rest), {}, {
     showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
   });
-  if (_res === null || _res === void 0 ? void 0 : _res.placeholder) {
-    _res === null || _res === void 0 ? true : delete _res.placeholder;
-  }
   // 字符串时间格式兼容
   if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
     _res.value = [moment(_res.value[0]), moment(_res.value[1])];

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

@@ -6,6 +6,6 @@ div.pro-textarea-view {
   }
   &::after {
     display: none;
-    padding-bottom: 11px;
+    padding-bottom: 12px;
   }
 }

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

@@ -23,7 +23,6 @@
     min-width       : 0;
     margin-left     : -12px;
     margin-right    : -12px;
-    // margin-bottom: -22px;
 
     &>.ant-col {
       padding-left : 12px;

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

@@ -1,17 +1,18 @@
 .pro-form-list-block-title {
-  height: 14px;
-  margin: 3px 0;
-  padding-left: 7px;
-  font-weight: 600;
-  line-height: 14px;
-  border-left: 4px solid #006aff;
+  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;
 }
 
 .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;
@@ -19,12 +20,12 @@
   }
 
   .single-delete {
-    width: 14px !important;
+    width : 14px !important;
     height: 14px !important;
-    color: #939599;
+    color : @zaui-placeholder;
 
     &:hover {
-      color: #8f8c8c;
+      color: @zaui-aide-text;
     }
   }
 
@@ -35,19 +36,19 @@
   .pro-form-list-action {
     padding-bottom: var(--zaui-height-size-md, 16px);
 
-    & > .ant-space-item:first-child > .ant-btn-link {
-      margin-left: 8px;
+    &>.ant-space-item:first-child>.ant-btn-link {
+      margin-left: @zaui-space-size-sm;
     }
   }
 
   .pro-form-list-drag-handle {
-    display: flex;
-    align-items: center;
-    height: @zaui-height-size-lg;
-    margin-bottom: 22px;
-    padding: 0;
+    display      : flex;
+    align-items  : center;
+    height       : @zaui-height-size-lg;
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
+    padding      : 0;
     padding-right: @zaui-space-size-sm;
-    border: none;
+    border       : none;
   }
 }
 
@@ -62,7 +63,7 @@
 .pro-form-list-toolbar,
 .pro-form-list-action {
   .ant-btn-link {
-    padding: 4px 0;
+    padding: @zaui-space-size-xs 0;
   }
 
   .ant-btn-text:hover {

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

@@ -29,7 +29,7 @@ var Group = function Group(props) {
     var fieldList = [];
     var result = columns.map(function (item) {
       return _objectSpread(_objectSpread({
-        disabled: props === null || props === void 0 ? void 0 : props.disabled
+        disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
         parentNames: _parentNames
@@ -43,7 +43,7 @@ var Group = function Group(props) {
       columns: insertSeparator(result, space, node, otherProps),
       fieldList: fieldList
     };
-  }, [name, columns, space]);
+  }, [name, columns, space, props]);
   var _className = classnames(_defineProperty({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {