@zat-design/sisyphus-react 3.2.1 → 3.2.2

package/lib/ProForm/style/index.less

@@ -17,11 +17,11 @@
     }
 
     .pro-form-custom-footer {
-      display      : flex;
-      align-items  : center;
+      display: flex;
+      align-items: center;
+      height: auto;
       margin-bottom: 0;
-      height       : auto;
-      padding-top  : 6px;
+      padding-top: 6px;
 
       .ant-space-align-center {
         align-items: normal;
@@ -45,17 +45,17 @@
   }
 
   span.ant-input-clear-icon {
-    display   : unset;
+    display: unset;
     visibility: hidden;
   }
 
   .ant-input-affix-wrapper:hover span.ant-input-clear-icon {
-    display   : unset;
+    display: unset;
     visibility: unset;
   }
 
   .ant-input-affix-wrapper:hover span.ant-input-clear-icon[class~='ant-input-clear-icon-hidden'] {
-    display   : unset;
+    display: unset;
     visibility: hidden;
   }
 
@@ -90,7 +90,7 @@
   // 展开折叠按钮
   .expand-button {
     line-height: 32px;
-    cursor     : pointer;
+    cursor: pointer;
 
     .rotate-to-top {
       transform: rotate(90deg);
@@ -116,24 +116,32 @@
 
     .ant-form-item-tooltip {
       svg {
-        width         : 14px;
-        height        : 14px;
+        width: 14px;
+        height: 14px;
         vertical-align: bottom;
-        fill          : @zaui-aide-text;
+        fill: @zaui-aide-text;
       }
     }
 
     // 比较原始值场景下  不同时候的样式
     &.pro-form-item-changed {
-
       span.ant-input-affix-wrapper,
       .ant-select-selector,
       .ant-picker {
-        background: @zaui-contract-bg;
+        background: @zaui-contract-bg !important;
 
         input {
           background: @zaui-contract-bg;
         }
+        .ant-select-selection-placeholder {
+          z-index: 9;
+        }
+      }
+
+      .ant-form-item-control-input-content > span {
+        background: @zaui-contract-bg;
+        padding: 4px 8px;
+        border-radius: 4px;
       }
     }
 
@@ -168,9 +176,9 @@
         }
 
         .range-right {
-          width                    : 100%;
-          border                   : 1px solid @zaui-form-control-line;
-          border-top-left-radius   : 0;
+          width: 100%;
+          border: 1px solid @zaui-form-control-line;
+          border-top-left-radius: 0;
           border-bottom-left-radius: 0;
         }
       }
@@ -182,7 +190,7 @@
   }
 
   .ant-form-item-label {
-    >label {
+    > label {
       white-space: pre-wrap;
     }
   }
@@ -193,7 +201,7 @@
 
   .ant-form-item-has-error {
     .group-separator {
-      color       : var(--ant-error-color);
+      color: var(--ant-error-color);
       border-color: var(--ant-error-color);
     }
 
@@ -203,10 +211,9 @@
   }
 
   .site-input-group-wrapper {
-
     // 范围值表单样式
     & .site-input-split {
-      text-align      : center;
+      text-align: center;
       background-color: @zaui-table-strip-bg;
 
       &.site-input-split-disabled {
@@ -252,33 +259,33 @@
       }
     }
 
-    &.ant-input-group.ant-input-group-compact>*:not(:last-child) {
+    &.ant-input-group.ant-input-group-compact > *:not(:last-child) {
       margin-right: 0;
     }
 
-    >*:first-child {
-      border-top-right-radius   : 0 !important;
+    > *:first-child {
+      border-top-right-radius: 0 !important;
       border-bottom-right-radius: 0 !important;
 
-      >.ant-select-selector {
-        border-top-right-radius   : 0 !important;
+      > .ant-select-selector {
+        border-top-right-radius: 0 !important;
         border-bottom-right-radius: 0 !important;
       }
     }
 
-    >*:last-child {
-      border-top-left-radius   : 0 !important;
+    > *:last-child {
+      border-top-left-radius: 0 !important;
       border-bottom-left-radius: 0 !important;
 
-      >.ant-select-selector {
-        border-top-left-radius   : 0 !important;
+      > .ant-select-selector {
+        border-top-left-radius: 0 !important;
         border-bottom-left-radius: 0 !important;
       }
     }
   }
 
-  .ant-input-group.ant-input-group-compact>* {
-    float         : none;
+  .ant-input-group.ant-input-group-compact > * {
+    float: none;
     vertical-align: top;
   }
 
@@ -287,17 +294,17 @@
   }
 
   .noDisabled {
-    color           : @zaui-disabled-text;
-    font-size       : var(--zaui-font-size, 14px);
+    color: @zaui-disabled-text;
+    font-size: var(--zaui-font-size, 14px);
     background-color: transparent;
-    border          : none;
-    cursor          : default;
-    opacity         : 1;
+    border: none;
+    cursor: default;
+    opacity: 1;
   }
 
   div.pro-form-custom-footer {
-    width        : unset !important;
-    height       : 32px;
+    width: unset !important;
+    height:32px;
     margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
 
     &.pro-form-custom-footer-hidden {
@@ -306,14 +313,14 @@
   }
 
   .pro-form-view-container {
-    display   : inline-block;
-    color     : var(--zaui-text, #343434);
+    display: inline-block;
+    color: var(--zaui-text, #343434);
     word-break: break-all;
   }
 
   .pro-form-view-container_nowrap {
-    overflow     : hidden;
-    white-space  : nowrap;
+    overflow: hidden;
+    white-space: nowrap;
     text-overflow: ellipsis;
   }
 

package/lib/ProForm/utils/contrastOriginal.d.ts

@@ -1 +1,10 @@
-export declare const contrastOriginal: (name: any, names: any, originValues: any, currentValue: any, fun: any) => any;
+import { FormInstance } from 'antd';
+interface Params {
+    originalValues: any;
+    originalValue: any;
+    value: any;
+    form: FormInstance;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const contrastOriginal: (params: Params) => boolean;
+export {};

package/lib/ProForm/utils/contrastOriginal.js

@@ -6,29 +6,26 @@ Object.defineProperty(exports, "__esModule", {
 exports.contrastOriginal = void 0;
 var _lodash = require("lodash");
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-var contrastOriginal = exports.contrastOriginal = function contrastOriginal(name, names, originValues, currentValue, fun) {
+var contrastOriginal = exports.contrastOriginal = function contrastOriginal(params) {
+  var originalValue = params.originalValue,
+    originalValues = params.originalValues,
+    value = params.value,
+    equalWith = params.equalWith;
   // 支持传入自定义比较事件
-  if ((0, _lodash.isFunction)(fun)) {
-    if (names === null || names === void 0 ? void 0 : names.length) {
-      var originVal = names.map(function (key) {
-        return (0, _lodash.get)(originValues, key);
-      });
-      return !fun(originVal, currentValue);
-    }
-    return !fun((0, _lodash.get)(originValues, name), currentValue);
+  if ((0, _lodash.isFunction)(equalWith)) {
+    return !equalWith(originalValue, value);
   }
-  if (names === null || names === void 0 ? void 0 : names.length) {
-    return names.some(function (nameItem, index) {
-      var originalValue = (0, _lodash.get)(originValues, nameItem);
-      if (!nullValue.includes(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index]) || !nullValue.includes(originalValue)) {
-        return !(0, _lodash.isEqual)(currentValue === null || currentValue === void 0 ? void 0 : currentValue[index], (0, _lodash.get)(originValues, nameItem));
+  if (Array.isArray(originalValue)) {
+    return originalValue.some(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
+        return !(0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
       }
       return false;
     });
   }
-  var originalValue = (0, _lodash.get)(originValues, name);
-  if (!nullValue.includes(currentValue) || !nullValue.includes(originalValue)) {
-    return !(0, _lodash.isEqual)(currentValue, (0, _lodash.get)(originValues, name));
+  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
+    return !(0, _lodash.isEqual)(value, originalValue);
   }
   return false;
 };

package/lib/ProForm/utils/useChanged.d.ts

@@ -1 +1,15 @@
-export declare const useChanged: (name: any, names: any, nameStr: any, originalValues: any, form: any, fun: any) => any;
+import { FormInstance } from 'antd';
+import { NamePath } from 'antd/lib/form/interface';
+interface Params {
+    name?: NamePath;
+    names?: NamePath[];
+    namesStr?: NamePath;
+    originalName?: NamePath;
+    originalNames?: NamePath[];
+    originalNameStr?: NamePath;
+    originalValues: any;
+    form: FormInstance;
+    equalWith?: (originalValue: any, currentValue: any) => boolean;
+}
+export declare const useChanged: (params: Params) => any[];
+export {};

package/lib/ProForm/utils/useChanged.js

@@ -7,13 +7,32 @@ exports.useChanged = void 0;
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _contrastOriginal = require("./contrastOriginal");
-var useChanged = exports.useChanged = function useChanged(name, names, nameStr, originalValues, form, fun) {
+var useChanged = exports.useChanged = function useChanged(params) {
+  var name = params.name,
+    names = params.names,
+    namesStr = params.namesStr,
+    _params$originalName = params.originalName,
+    originalName = _params$originalName === void 0 ? name : _params$originalName,
+    _params$originalNames = params.originalNames,
+    originalNames = _params$originalNames === void 0 ? names : _params$originalNames,
+    originalValues = params.originalValues,
+    form = params.form,
+    equalWith = params.equalWith;
   var _form = form;
-  if (!originalValues || (0, _lodash.get)(originalValues, nameStr || name) === undefined) {
-    _form = [];
-    return false;
-  }
-  var value = _antd.Form.useWatch(nameStr || name, _form);
-  var changed = (0, _contrastOriginal.contrastOriginal)(name, names, originalValues, value, fun);
-  return changed;
+  var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
+    return (0, _lodash.get)(originalValues, originalName);
+  }) : (0, _lodash.get)(originalValues, originalName);
+  var notWatch = !originalValues || originalValue === undefined;
+  // @ts-ignore
+  if (notWatch) _form = [];
+  var value = _antd.Form.useWatch(namesStr || name, _form);
+  if (notWatch) return [false];
+  var changed = (0, _contrastOriginal.contrastOriginal)({
+    value: value,
+    originalValue: originalValue,
+    originalValues: originalValues,
+    form: form,
+    equalWith: equalWith
+  });
+  return [changed, originalValue];
 };

package/lib/ProLayout/components/ProHeader/index.js

@@ -371,6 +371,7 @@ var ProHeader = function ProHeader(props) {
     'pro-header-fixed': fixedTop,
     'pro-header-shadow': showShadow,
     'pro-header-no-back': !backState,
+    'pro-header-has-describe': !(0, _lodash.isEmpty)(_subDescribeColumns) || !(0, _lodash.isEmpty)(describeColumns) || !(0, _lodash.isEmpty)(describeColumns),
     'pro-header-no-describe': (0, _lodash.isEmpty)(_subDescribeColumns) && (0, _lodash.isEmpty)(describeColumns) || (0, _lodash.isEmpty)(describeColumns)
   }, "".concat(className), className));
   if (title && !(0, _lodash.isEmpty)(_breadcrumbColumns)) {

package/lib/ProLayout/components/ProHeader/style/index.less

@@ -4,6 +4,12 @@
   background-color: var(--zaui-base-bg, #ffffff);
   padding         : 24px 0 0 0;
 
+  &.pro-header-no-back.pro-header-has-describe {
+    .pro-header-top {
+      padding-left: var(--zaui-space-size-md, 16px);
+    }
+  }
+
   &.pro-header-no-back {
     .pro-header-top {
       padding-left: 0;
@@ -106,6 +112,7 @@
 
     .ant-breadcrumb-link {
       font-size: var(--zaui-font-size-xl, 18px);
+      display  : inline-flex;
     }
 
     .ant-breadcrumb-separator {

package/lib/ProSelect/index.js

@@ -17,9 +17,10 @@ var _lodash = require("lodash");
 var _ProConfigProvider = require("../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../ProForm/components/Container"));
 var _AdaptiveTooltip = _interopRequireDefault(require("./components/AdaptiveTooltip"));
+var _ = require("..");
 var _locale = _interopRequireDefault(require("../locale"));
 require("./index.less");
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   var _locale$ProSelect;
@@ -49,11 +50,13 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     onChange = props.onChange,
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
+    isViewPro = props.isView,
     selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var value = props.value;
-  var _ref2 = otherProps || {},
-    isView = _ref2.isView,
+  var _ref2 = _.ProForm.useFieldProps() || {},
+    isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   if (fieldNames && Object.keys(fieldNames).length) {
     code = fieldNames.value;
     label = fieldNames.label;

package/lib/ProStep/components/Item/index.js

@@ -33,9 +33,6 @@ var _default = exports.default = function _default(_ref) {
       title: title
     }, restProps), {}, {
       children: children
-    })) : (0, _jsxRuntime.jsx)("div", {
-      id: id,
-      children: children
-    })
+    })) : children
   });
 };

package/lib/ProTable/components/RenderColumn/index.js

@@ -90,6 +90,6 @@ var RenderColumn = function RenderColumn(props) {
       children: node
     }) : '-';
   }
-  return value ? node : '-';
+  return value || value === 0 ? node : '-';
 };
 var _default = exports.default = RenderColumn;

package/lib/ProTable/style/index.less

@@ -54,6 +54,12 @@
     }
   }
 
+  .ant-table-tbody {
+    .ant-table-cell-fix-left, .ant-table-cell-fix-right {
+      background: unset !important;
+    }
+  }
+
   .ant-table-body {
     .ant-table-cell .varied-cell {
       margin-left: -8px;

package/lib/ProTabs/style/index.less

@@ -1,6 +1,6 @@
 .pro-tabs {
   .ant-tabs .ant-tabs-nav-list .ant-tabs-tab {
-    padding: 0;
+    padding: 0 !important;
   }
 
   .ant-tabs-top>.ant-tabs-nav::before,

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

@@ -12,6 +12,7 @@ var _icons = require("@ant-design/icons");
 var _antd = require("antd");
 var _react = require("react");
 var _index = require("../../utils/index");
+var _locale = _interopRequireDefault(require("../../../locale"));
 var connect = function connect(Component) {
   var ComponentWrapper = function ComponentWrapper(props) {
     return (0, _jsxRuntime.jsx)(Component, (0, _objectSpread2.default)({}, props));
@@ -62,8 +63,8 @@ var PrdTools = function PrdTools(_ref) {
   }, []);
   return (0, _jsxRuntime.jsxs)(NewDrawer, {
     className: "pro-theme-prd-tools-drawer",
-    width: 320,
-    title: "\u5168\u5C40\u6837\u5F0F\u81EA\u5B9A\u4E49",
+    width: 400,
+    title: "".concat(_locale.default.ProThemeTools.title),
     placement: "right",
     onClose: onClose,
     open: visible,
@@ -77,7 +78,7 @@ var PrdTools = function PrdTools(_ref) {
     }), (0, _jsxRuntime.jsxs)("div", {
       className: "pro-theme-tools-space",
       children: [(0, _jsxRuntime.jsx)("p", {
-        children: "\u4E3B\u9898\u8272"
+        children: "".concat(_locale.default.ProThemeTools.themeColor)
       }), (0, _jsxRuntime.jsx)("ul", {
         className: "pro-theme-color",
         children: active.map(function (item, index) {
@@ -108,7 +109,7 @@ var PrdTools = function PrdTools(_ref) {
       children: [(0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
         children: (0, _jsxRuntime.jsx)("p", {
-          children: "\u5E03\u5C40"
+          children: "".concat(_locale.default.ProThemeTools.layout)
         })
       }), (0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
@@ -124,13 +125,13 @@ var PrdTools = function PrdTools(_ref) {
           },
           children: [(0, _jsxRuntime.jsx)(_antd.Radio.Button, {
             value: 0.5,
-            children: "\u7D27\u51D1"
+            children: "".concat(_locale.default.ProThemeTools.layoutMode[0])
           }), (0, _jsxRuntime.jsx)(_antd.Radio.Button, {
             value: 1,
-            children: "\u5E38\u89C4"
+            children: "".concat(_locale.default.ProThemeTools.layoutMode[1])
           }), (0, _jsxRuntime.jsx)(_antd.Radio.Button, {
             value: 1.5,
-            children: "\u5BBD\u677E"
+            children: "".concat(_locale.default.ProThemeTools.layoutMode[2])
           })]
         })
       })]
@@ -139,7 +140,7 @@ var PrdTools = function PrdTools(_ref) {
       children: [(0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
         children: (0, _jsxRuntime.jsx)("p", {
-          children: "\u8868\u5355\u6807\u9898"
+          children: "".concat(_locale.default.ProThemeTools.formLabel)
         })
       }), (0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
@@ -176,10 +177,10 @@ var PrdTools = function PrdTools(_ref) {
           },
           children: [(0, _jsxRuntime.jsx)(_antd.Radio.Button, {
             value: "left",
-            children: "\u5DE6\u5BF9\u9F50"
+            children: "".concat(_locale.default.ProThemeTools.flex[0])
           }), (0, _jsxRuntime.jsx)(_antd.Radio.Button, {
             value: "right",
-            children: "\u53F3\u5BF9\u9F50"
+            children: "".concat(_locale.default.ProThemeTools.flex[1])
           })]
         })
       })]
@@ -188,13 +189,13 @@ var PrdTools = function PrdTools(_ref) {
       children: [(0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
         children: (0, _jsxRuntime.jsx)("p", {
-          children: "\u5927\u5B57\u53F7\u6A21\u5F0F"
+          children: "".concat(_locale.default.ProThemeTools.bigText)
         })
       }), (0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
         children: (0, _jsxRuntime.jsx)(_antd.Switch, {
-          checkedChildren: "\u5F00",
-          unCheckedChildren: "\u5173",
+          checkedChildren: "".concat(_locale.default.ProThemeTools.switchText[0]),
+          unCheckedChildren: "".concat(_locale.default.ProThemeTools.switchText[1]),
           checked: state.zauiBigText,
           onClick: function onClick(value) {
             setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
@@ -212,13 +213,13 @@ var PrdTools = function PrdTools(_ref) {
       children: [(0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
         children: (0, _jsxRuntime.jsx)("p", {
-          children: "\u8868\u683C\u8FB9\u6846"
+          children: "".concat(_locale.default.ProThemeTools.tableBorder)
         })
       }), (0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
         children: (0, _jsxRuntime.jsx)(_antd.Switch, {
-          checkedChildren: "\u5F00",
-          unCheckedChildren: "\u5173",
+          checkedChildren: "".concat(_locale.default.ProThemeTools.switchText[0]),
+          unCheckedChildren: "".concat(_locale.default.ProThemeTools.switchText[1]),
           checked: state.zauiTableBorder,
           onClick: function onClick(value) {
             setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
@@ -235,13 +236,13 @@ var PrdTools = function PrdTools(_ref) {
       children: [(0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
         children: (0, _jsxRuntime.jsx)("p", {
-          children: "\u8868\u683C\u6591\u9A6C\u7EB9"
+          children: "".concat(_locale.default.ProThemeTools.tableStripe)
         })
       }), (0, _jsxRuntime.jsx)("div", {
         className: "pro-theme-tools-item",
         children: (0, _jsxRuntime.jsx)(_antd.Switch, {
-          checkedChildren: "\u5F00",
-          unCheckedChildren: "\u5173",
+          checkedChildren: "".concat(_locale.default.ProThemeTools.switchText[0]),
+          unCheckedChildren: "".concat(_locale.default.ProThemeTools.switchText[1]),
           checked: state.zauiStripe,
           onClick: function onClick(value) {
             setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
@@ -272,7 +273,7 @@ var PrdTools = function PrdTools(_ref) {
         }]);
         onReset();
       },
-      children: "\u91CD\u7F6E"
+      children: "".concat(_locale.default.ProThemeTools.reset)
     })]
   });
 };

package/lib/ProThemeTools/index.js

@@ -16,6 +16,7 @@ var _react = require("react");
 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"];
 /* eslint-disable prefer-const */
 var defaultCacheTime = 1; // 配置保存时间为一天
@@ -93,7 +94,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
     input.select();
     if (document.execCommand('copy')) {
       document.execCommand('copy');
-      _antd.message.success('复制成功！');
+      _antd.message.success("".concat(_locale.default.ProThemeTools.copySuccess));
     }
     document.body.removeChild(input);
   };