@zat-design/sisyphus-react 3.1.5-beta.7 → 3.1.5-beta.9

package/.dumi/theme/layouts/layout.less

@@ -1,54 +1,70 @@
 .__amiya {
   &-theme {
-    right: 100px;
-    bottom: 100px;
-    z-index: 10;
+    right   : 100px;
+    bottom  : 100px;
+    z-index : 10;
     position: fixed !important;
   }
 
   &-nav {
-    flex: 1;
-    border-bottom: none !important;
-    display: flex;
+    flex           : 1;
+    border-bottom  : none !important;
+    display        : flex;
     justify-content: flex-end;
   }
 
   &-theme-color {
-    width: 1em;
-    height: 1em;
-    margin-right: 4px;
+    width        : 1em;
+    height       : 1em;
+    margin-right : 4px;
     border-radius: 2px;
-    display: flex;
+    display      : flex;
   }
 
   &-menu {
-    position: fixed;
-    z-index: 100;
-    top: 60px;
-    left: 0;
-    bottom: 0;
-    width: 260px;
+    position        : fixed;
+    z-index         : 100;
+    top             : 60px;
+    left            : 0;
+    bottom          : 0;
+    width           : 260px;
     background-color: #f2f5fa;
-    box-sizing: border-box;
-    transition: left 0.3s;
+    box-sizing      : border-box;
+    transition      : left 0.3s;
+    margin-left     : 40px;
 
     .ant-menu {
-      height: 100%;
-      padding-top: 24px;
-      overflow: auto;
+      height    : 100%;
+      padding   : 24px 0;
+      overflow  : hidden;
+      overflow-y: auto;
+
+      &.ant-menu-inline .ant-menu-item:not(:last-child) {
+        margin-bottom: 0;
+        margin-top   : 0;
+      }
+
+      &.ant-menu-inline .ant-menu-item::after {
+        display: none;
+      }
+
+      &.ant-menu-inline .ant-menu-item {
+        width: calc(98%);
+      }
+    }
+
+    .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
+      border-radius: 8px;
     }
   }
 }
 
-.__dumi-default-previewer {
-  background-color: #f9fafb;
-}
 
 .__dumi-default-previewer-actions {
   background-color: #fff;
-  justify-content: center;
+  justify-content : center;
 
-  > span {
+  >span {
     display: none;
   }
 }
@@ -68,4 +84,4 @@ img {
 .deleted-sign.deleted.prefix,
 .inserted-sign.inserted.prefix {
   user-select: none;
-}
+}

package/dist/index.esm.css

@@ -799,6 +799,23 @@
           box-shadow: 3px 2px 12px 0 hsla(0, 0%, 59.2%, 0.32);
   z-index: 101;
 }
+.back-button-container.ant-btn {
+  color: var(--zaui-text);
+  font-weight: 400;
+  background: var(--zaui-disabled-bg);
+  border: none;
+}
+.back-button-container.ant-btn:hover {
+  color: var(--zaui-aide-text);
+  background: var(--zaui-disabled-bg);
+  border: none;
+}
+.back-button-container.ant-btn:active,
+.back-button-container.ant-btn:focus {
+  color: var(--zaui-text);
+  font-weight: 400;
+  background: var(--zaui-disabled-bg);
+}
 .pro-header {
   background-color: var(--zaui-base-bg, #ffffff);
   padding: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1) + var(--zaui-space-size-sm, 8px) * var(--zaui-size, 1)) 0 0 0;
@@ -806,6 +823,9 @@
 .pro-header.pro-header-no-back .pro-header-top {
   padding-left: 0;
 }
+.pro-header.pro-header-no-back .pro-header-left.pro-header-left-space {
+  margin-left: 0 !important;
+}
 .pro-header.pro-header-no-describe {
   -webkit-box-shadow: none;
           box-shadow: none;
@@ -1599,6 +1619,15 @@
 .pro-table .custom-column-btn .anticon {
   height: 16px;
 }
+.pro-table .ant-table-body .ant-table-cell .varied-cell {
+  margin-left: -8px;
+  background: var(--zaui-contract-bg, #fffaa1);
+  padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+  border-radius: var(--zaui-border-radius, 4px);
+}
+.pro-table .ant-table-body .varied-cell.empty-cell {
+  width: 24.5px;
+}
 .pro-table .copyable-table-cell .ant-typography {
   margin-bottom: 0;
   display: -webkit-box;
@@ -2417,12 +2446,12 @@ div.pro-textarea-view::after {
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker {
-  background: #fffaa1;
+  background: var(--zaui-contract-bg, #fffaa1);
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker input {
-  background: #fffaa1;
+  background: var(--zaui-contract-bg, #fffaa1);
 }
 .pro-form .ant-form-item .ant-row {
   width: 100%;
@@ -4406,23 +4435,6 @@ div.pro-textarea-view::after {
 .pro-download.ant-btn-text {
   padding: 0;
 }
-.back-button-container {
-  color: var(--zaui-aide-text);
-  font-weight: 400;
-  background: var(--zaui-disabled-bg);
-  border: none;
-}
-.back-button-container:hover {
-  color: var(--zaui-aide-text);
-  background: var(--zaui-disabled-bg);
-  border: none;
-}
-.back-button-container:active,
-.back-button-container:focus {
-  color: var(--zaui-aide-text);
-  font-weight: 400;
-  background: var(--zaui-disabled-bg);
-}
 .pro-editable .ant-table-cell .table-title-required::before {
   display: inline-block;
   margin-right: 4px;
@@ -4774,6 +4786,7 @@ input[type='button'] {
   --zaui-table-selected-bg: var(--zaui-table-hover-bg);
   --zaui-table-selected-hover-bg: var(--zaui-table-hover-bg);
   --zaui-table-nested-bg: #fafcfe;
+  --zaui-contract-bg: #fffaa1;
   --zaui-form-label-width: 130px;
   --zaui-border-radius: 4px;
   --zaui-border-radius-card: 2px;

package/es/ProDownload/utils.js

@@ -4,6 +4,8 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+/* eslint-disable no-empty */
+/* eslint-disable prefer-promise-reject-errors */
 import { isFunction, get } from 'lodash';
 var stringify = function stringify(data) {
   var result = '';

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/combination/ProAddressBar/index.js

@@ -1,9 +1,9 @@
 import "antd/es/input/style";
 import _Input from "antd/es/input";
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import "antd/es/cascader/style";
 import _Cascader from "antd/es/cascader";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
@@ -11,14 +11,17 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/typography/style";
+import _Typography from "antd/es/typography";
 var _excluded = ["className", "getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
 import { useSetState } from 'ahooks';
 import { tools } from '@zat-design/utils';
 import { useProConfig } from '../../../../ProConfigProvider';
 import useEnum from '../../../../ProEnum/hooks/useEnum';
 var transformDataName = tools.transformDataName;
+var Text = _Typography.Text;
 var filterDataSource = function filterDataSource(dataSource, level) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
@@ -172,7 +175,7 @@ var ProAddressBar = function ProAddressBar(props) {
               transFormData = transformDataName(newData, {
                 label: fieldNames.label,
                 value: fieldNames.value,
-                children: 'children'
+                children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
               });
               setServiceData(realLevel === 2 ? filterDataSource(transFormData, level) : transFormData);
             }
@@ -266,19 +269,19 @@ var ProAddressBar = function ProAddressBar(props) {
   }, [service]);
   useEffect(function () {
     // 传入useRequest时初始化province展示
-    if (service && !fetched && province) {
+    if (service && loadData && !fetched && province) {
       initAddressLabel('province', province, provinceOptions);
     }
   }, [province, fetched, provinceOptions]);
   useEffect(function () {
     // 传入useRequest时初始化city展示
-    if (service && !fetched && province && city) {
+    if (service && loadData && !fetched && province && city) {
       initAddressLabel('city', city, _defineProperty({}, parentKey, province));
     }
   }, [province, city, fetched]);
   useEffect(function () {
     // 传入useRequest时初始化county展示
-    if (service && !fetched && city && county) {
+    if (service && loadData && !fetched && city && county) {
       initAddressLabel('county', county, _defineProperty({}, parentKey, city));
     }
   }, [city, county, fetched]);
@@ -288,6 +291,12 @@ var ProAddressBar = function ProAddressBar(props) {
       setDefaultLabel(getAddressLabel(realDataSource, value));
     }
   }, [realIsView, value, realDataSource]);
+  useEffect(function () {
+    // 传入useRequest但loadData为fasle查看时初始化展示
+    if (realIsView && value && (serviceData === null || serviceData === void 0 ? void 0 : serviceData.length) > 0) {
+      setDefaultLabel(getAddressLabel(serviceData, value));
+    }
+  }, [realIsView, value, serviceData]);
   var handleLoadData = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(selectedOptions) {
       var targetOption, data;
@@ -363,56 +372,66 @@ var ProAddressBar = function ProAddressBar(props) {
   var viewValue = ((_ref11 = [provinceLabel, cityLabel, countyLabel, value === null || value === void 0 ? void 0 : value[realLevel]]) === null || _ref11 === void 0 ? void 0 : (_ref11$filter = _ref11.filter(function (item) {
     return !!item;
   })) === null || _ref11$filter === void 0 ? void 0 : _ref11$filter.join(separator)) || '-';
-  return _jsx("div", {
+  return realIsView ? tooltip ? _jsx(_Tooltip, {
+    className: className,
+    title: tooltip === true ? viewValue : tooltip,
+    children: _jsx(Text, {
+      ellipsis: {
+        tooltip: false
+      },
+      children: viewValue
+    })
+  }) : _jsx("span", {
+    className: className,
+    children: viewValue
+  }) : _jsxs("div", {
     className: "pro-address ".concat(className),
-    children: realIsView ? viewValue : _jsxs(_Fragment, {
-      children: [dataSource || addressCode || !loadData ? _jsx(_Cascader, {
-        className: hasDetail ? '' : 'no-detail',
-        placeholder: "\u8BF7\u9009\u62E9",
-        value: addressValue,
-        options: !loadData ? serviceData : realDataSource,
-        disabled: disabled,
-        displayRender: function displayRender(label) {
-          return label === null || label === void 0 ? void 0 : label.filter(function (item) {
-            return !!item;
-          }).join('/');
-        },
-        showSearch: {
-          filter: handlefilter
-        },
-        onChange: handleChange
-      }) : _jsx(_Cascader, {
-        className: hasDetail ? '' : 'no-detail',
-        placeholder: "\u8BF7\u9009\u62E9",
-        value: addressValue,
-        loadData: handleLoadData,
-        // @ts-ignore
-        options: provinces,
-        disabled: disabled,
-        displayRender: displayRender,
-        changeOnSelect: true,
-        // @ts-ignore
-        onChange: handleChange
-      }), hasDetail && (tooltip && disabled && address ? _jsx(_Tooltip, {
-        title: address,
-        children: _jsx("span", {
-          className: "pro-address-detail",
-          children: _jsx(_Input, {
-            disabled: disabled,
-            value: address
-          })
+    children: [dataSource || addressCode || !loadData ? _jsx(_Cascader, {
+      className: hasDetail ? '' : 'no-detail',
+      placeholder: "\u8BF7\u9009\u62E9",
+      value: addressValue,
+      options: !loadData ? serviceData : realDataSource,
+      disabled: disabled,
+      displayRender: function displayRender(label) {
+        return label === null || label === void 0 ? void 0 : label.filter(function (item) {
+          return !!item;
+        }).join('/');
+      },
+      showSearch: {
+        filter: handlefilter
+      },
+      onChange: handleChange
+    }) : _jsx(_Cascader, {
+      className: hasDetail ? '' : 'no-detail',
+      placeholder: "\u8BF7\u9009\u62E9",
+      value: addressValue,
+      loadData: handleLoadData,
+      // @ts-ignore
+      options: provinces,
+      disabled: disabled,
+      displayRender: displayRender,
+      changeOnSelect: true,
+      // @ts-ignore
+      onChange: handleChange
+    }), hasDetail && (tooltip && disabled && address ? _jsx(_Tooltip, {
+      title: address,
+      children: _jsx("span", {
+        className: "pro-address-detail",
+        children: _jsx(_Input, {
+          disabled: disabled,
+          value: address
         })
-      }) : _jsx(_Input, {
-        allowClear: true,
-        autoComplete: "off",
-        disabled: disabled,
-        value: address,
-        maxLength: detailMaxLength,
-        placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740",
-        // @ts-ignore
-        onChange: handleAddressChange
-      }))]
-    })
+      })
+    }) : _jsx(_Input, {
+      allowClear: true,
+      autoComplete: "off",
+      disabled: disabled,
+      value: address,
+      maxLength: detailMaxLength,
+      placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740",
+      // @ts-ignore
+      onChange: handleAddressChange
+    }))]
   });
 };
 // @ts-ignore

package/es/ProForm/components/combination/ProAddressBar/propsType.d.ts

@@ -8,7 +8,7 @@ export interface AddressProps {
     value?: string[];
     disabled?: boolean;
     hasDetail?: boolean;
-    tooltip?: boolean;
+    tooltip?: boolean | ReactNode;
     detailMaxLength?: number;
     fieldNames?: {
         label: string;

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

@@ -134,9 +134,7 @@ var RenderFields = function RenderFields(props) {
     }, formItemChildProps), fieldProps);
     if (formDisabled) {
       _fieldProps.disabled = formDisabled;
-      // _disabled = formDisabled;
     }
-
     var componentProps = _objectSpread({
       disabled: _disabled,
       placeholder: _placeholder,
@@ -146,6 +144,10 @@ var RenderFields = function RenderFields(props) {
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';
     }
+    // 时间范围placeholder处理
+    if (['RangePicker'].includes(_type) && !(fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.placeholder)) {
+      delete componentProps.placeholder;
+    }
     // 没有找到对应组件  不渲染
     if (!TargetComponent) {
       return [];

package/es/ProForm/style/index.less

@@ -15,7 +15,6 @@
     margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
   }
 
-
   .pro-collapse-level2 {
     .ant-collapse-item {
       margin-bottom: 0 !important;
@@ -28,17 +27,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;
   }
 
@@ -73,7 +72,7 @@
   // 展开折叠按钮
   .expand-button {
     line-height: @zaui-space-card;
-    cursor     : pointer;
+    cursor: pointer;
 
     .rotate-to-top {
       transform: rotate(90deg);
@@ -89,23 +88,22 @@
 
     .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: #fffaa1;
+        background: @zaui-contract-bg;
 
         input {
-          background: #fffaa1;
+          background: @zaui-contract-bg;
         }
       }
     }
@@ -141,9 +139,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;
         }
       }
@@ -155,7 +153,7 @@
   }
 
   .ant-form-item-label {
-    >label {
+    > label {
       white-space: pre-wrap;
     }
   }
@@ -166,7 +164,7 @@
 
   .ant-form-item-has-error {
     .group-separator {
-      color       : var(--ant-error-color);
+      color: var(--ant-error-color);
       border-color: var(--ant-error-color);
     }
 
@@ -176,10 +174,9 @@
   }
 
   .site-input-group-wrapper {
-
     // 范围值表单样式
     & .site-input-split {
-      text-align      : center;
+      text-align: center;
       background-color: @zaui-table-strip-bg;
 
       &.site-input-split-disabled {
@@ -225,33 +222,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;
   }
 
@@ -260,17 +257,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       : @zaui-space-card;
+    width: unset !important;
+    height: @zaui-space-card;
     margin-bottom: calc(var(--zaui-height-size-md, 16px) * var(--zaui-size, 1));
 
     &.pro-form-custom-footer-hidden {
@@ -279,14 +276,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;
   }