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

package/lib/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/lib/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/lib/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/lib/ProEditTable/utils/config.js

@@ -13,6 +13,7 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
 var _antd = require("antd");
+var _lodash = require("lodash");
 var _tools = require("./tools");
 var defaultBtnNameMap = exports.defaultBtnNameMap = {
   add: '添加',
@@ -68,7 +69,7 @@ var actions = exports.actions = {
   },
   save: function () {
     var _save = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().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 (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -86,11 +87,14 @@ var actions = exports.actions = {
             } else {
               delete record.isEditing;
             }
-            form.setFieldValue(rowName, record);
+            // 防止value引用不变, 值不更新 - (自定义组件)
+            values = form.getFieldsValue();
+            (0, _lodash.set)(values, rowName, record);
+            form.setFieldsValue(values);
             setState({
               editingKeys: nextEditingKeys
             });
-          case 8:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -130,7 +134,10 @@ var actions = exports.actions = {
         selectedRowKeys: [record.rowKey]
       });
     } else {
-      form.setFieldValue(virtualRowName, record);
+      // 防止value引用不变, 值不更新 - (自定义组件)
+      var values = form.getFieldsValue();
+      (0, _lodash.set)(values, virtualRowName, record);
+      form.setFieldsValue(values);
     }
   },
   delete: function _delete(_ref4) {

package/lib/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/lib/ProForm/components/base/RangePicker/index.js

@@ -54,9 +54,6 @@ var RangePicker = function RangePicker(props) {
   var _res = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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) && (0, _lodash.isString)(_res.value[0]) && (0, _lodash.isString)(_res.value[1])) {
     _res.value = [(0, _moment.default)(_res.value[0]), (0, _moment.default)(_res.value[1])];

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

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

package/lib/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/lib/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/lib/ProForm/components/combination/Group/index.js

@@ -33,7 +33,7 @@ var Group = function Group(props) {
     var fieldList = [];
     var result = columns.map(function (item) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        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
@@ -47,7 +47,7 @@ var Group = function Group(props) {
       columns: (0, _utils.insertSeparator)(result, space, node, otherProps),
       fieldList: fieldList
     };
-  }, [name, columns, space]);
+  }, [name, columns, space, props]);
   var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
     'pro-group': true,
     'pro-group-diy-width': columns.some(function (item) {

package/lib/ProForm/components/combination/ProAddressBar/index.js

@@ -19,8 +19,9 @@ var _antd = require("antd");
 var _utils = require("@zat-design/utils");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
-var _excluded = ["getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
+var _excluded = ["className", "getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
 var transformDataName = _utils.tools.transformDataName;
+var Text = _antd.Typography.Text;
 var filterDataSource = function filterDataSource(dataSource, level) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
@@ -56,7 +57,8 @@ var ProAddressBar = function ProAddressBar(props) {
     configEnumCode = _ref.enumCode,
     configCode = _ref.code;
   // console.count('地址组件渲染次数');
-  var getPopupContainer = props.getPopupContainer,
+  var className = props.className,
+    getPopupContainer = props.getPopupContainer,
     _props$hasDetail = props.hasDetail,
     hasDetail = _props$hasDetail === void 0 ? true : _props$hasDetail,
     _props$detailMaxLengt = props.detailMaxLength,
@@ -173,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);
             }
@@ -267,19 +269,19 @@ var ProAddressBar = function ProAddressBar(props) {
   }, [service]);
   (0, _react.useEffect)(function () {
     // 传入useRequest时初始化province展示
-    if (service && !fetched && province) {
+    if (service && loadData && !fetched && province) {
       initAddressLabel('province', province, provinceOptions);
     }
   }, [province, fetched, provinceOptions]);
   (0, _react.useEffect)(function () {
     // 传入useRequest时初始化city展示
-    if (service && !fetched && province && city) {
+    if (service && loadData && !fetched && province && city) {
       initAddressLabel('city', city, (0, _defineProperty2.default)({}, parentKey, province));
     }
   }, [province, city, fetched]);
   (0, _react.useEffect)(function () {
     // 传入useRequest时初始化county展示
-    if (service && !fetched && city && county) {
+    if (service && loadData && !fetched && city && county) {
       initAddressLabel('county', county, (0, _defineProperty2.default)({}, parentKey, city));
     }
   }, [city, county, fetched]);
@@ -289,6 +291,12 @@ var ProAddressBar = function ProAddressBar(props) {
       setDefaultLabel(getAddressLabel(realDataSource, value));
     }
   }, [realIsView, value, realDataSource]);
+  (0, _react.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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(selectedOptions) {
       var targetOption, data;
@@ -322,14 +330,14 @@ var ProAddressBar = function ProAddressBar(props) {
       return _ref10.apply(this, arguments);
     };
   }();
-  var handleChange = function handleChange(changeValue) {
+  var handleChange = function handleChange(changeValue, selectedOptions) {
     if (onChange) {
       if (hasDetail && address) {
         var realValue = changeValue || [];
         realValue[realLevel] = address;
-        onChange(realValue);
+        onChange(realValue, selectedOptions);
       } else {
-        onChange(changeValue);
+        onChange(changeValue, selectedOptions);
       }
     }
   };
@@ -364,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 (0, _jsxRuntime.jsx)("div", {
-    className: "pro-address",
-    children: realIsView ? viewValue : (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [dataSource || addressCode || !loadData ? (0, _jsxRuntime.jsx)(_antd.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
-      }) : (0, _jsxRuntime.jsx)(_antd.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 ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-        title: address,
-        children: (0, _jsxRuntime.jsx)("span", {
-          className: "pro-address-detail",
-          children: (0, _jsxRuntime.jsx)(_antd.Input, {
-            disabled: disabled,
-            value: address
-          })
-        })
-      }) : (0, _jsxRuntime.jsx)(_antd.Input, {
-        allowClear: true,
-        autoComplete: "off",
-        disabled: disabled,
-        value: address,
-        maxLength: detailMaxLength,
-        placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740",
-        // @ts-ignore
-        onChange: handleAddressChange
-      }))]
+  return realIsView ? tooltip ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    className: className,
+    title: tooltip === true ? viewValue : tooltip,
+    children: (0, _jsxRuntime.jsx)(Text, {
+      ellipsis: {
+        tooltip: false
+      },
+      children: viewValue
     })
+  }) : (0, _jsxRuntime.jsx)("span", {
+    className: className,
+    children: viewValue
+  }) : (0, _jsxRuntime.jsxs)("div", {
+    className: "pro-address ".concat(className),
+    children: [dataSource || addressCode || !loadData ? (0, _jsxRuntime.jsx)(_antd.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
+    }) : (0, _jsxRuntime.jsx)(_antd.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 ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: address,
+      children: (0, _jsxRuntime.jsx)("span", {
+        className: "pro-address-detail",
+        children: (0, _jsxRuntime.jsx)(_antd.Input, {
+          disabled: disabled,
+          value: address
+        })
+      })
+    }) : (0, _jsxRuntime.jsx)(_antd.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/lib/ProForm/components/combination/ProAddressBar/propsType.d.ts

@@ -3,11 +3,12 @@ import { DefaultOptionType } from 'rc-select/lib/Select';
 import { Service } from 'ahooks/lib/useRequest/src/types';
 export interface AddressProps {
     getPopupContainer?: () => ReactNode;
+    className?: string;
     isView?: boolean;
     value?: string[];
     disabled?: boolean;
     hasDetail?: boolean;
-    tooltip?: boolean;
+    tooltip?: boolean | ReactNode;
     detailMaxLength?: number;
     fieldNames?: {
         label: string;
@@ -20,7 +21,7 @@ export interface AddressProps {
         defaultParams?: any;
         parentKey?: string;
     };
-    onChange?: (value: string[]) => void;
+    onChange?: (value: string[], selectedOptions?: any[]) => void;
     transformResponse?: (data: any[]) => any[];
     level?: number;
     enumCode?: string;