@zat-design/sisyphus-react 3.7.0 → 3.7.1-beta.1

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

@@ -1,9 +1,11 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { useSetState } from 'ahooks';
 import { CheckOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
 import copySvg from '../../../assets/copy.svg';
@@ -22,6 +24,12 @@ var RenderColumn = function RenderColumn(props) {
     originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps;
+  var _useSetState = useSetState({
+      tooltip: false
+    }),
+    _useSetState2 = _slicedToArray(_useSetState, 2),
+    tooltip = _useSetState2[0].tooltip,
+    setState = _useSetState2[1];
   if (originalValue !== undefined) {
     var renderNode = value ? node : '-';
     if (ellipsis || originalDiffTip) {
@@ -82,19 +90,70 @@ var RenderColumn = function RenderColumn(props) {
     });
   }
   if (ellipsis) {
-    return value ? _jsx(Text, {
-      style: {
-        width: width
-      },
-      ellipsis: {
-        tooltip: _objectSpread({
-          getPopupContainer: function getPopupContainer(triggerNode) {
-            return triggerNode.parentNode;
-          }
-        }, toolTipProps)
+    var getPadding = function getPadding(el) {
+      var style = window.getComputedStyle(el, null);
+      var paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0;
+      var paddingRight = Number.parseInt(style.paddingRight, 10) || 0;
+      var paddingTop = Number.parseInt(style.paddingTop, 10) || 0;
+      var paddingBottom = Number.parseInt(style.paddingBottom, 10) || 0;
+      return {
+        pLeft: paddingLeft,
+        pRight: paddingRight,
+        pTop: paddingTop,
+        pBottom: paddingBottom
+      };
+    };
+    var checkEllipsis = function checkEllipsis(box) {
+      var range = document.createRange();
+      range.setStart(box, 0);
+      range.setEnd(box, box.childNodes.length);
+      var rangeWidth = range.getBoundingClientRect().width;
+      var rangeHeight = range.getBoundingClientRect().height;
+      var contentWidth = rangeWidth - Math.floor(rangeWidth);
+      var _getPadding = getPadding(box),
+        pLeft = _getPadding.pLeft,
+        pRight = _getPadding.pRight,
+        pTop = _getPadding.pTop,
+        pBottom = _getPadding.pBottom;
+      var horizontalPadding = pLeft + pRight;
+      var verticalPadding = pTop + pBottom;
+      if (rangeWidth + horizontalPadding > box.clientWidth) {
+        return true;
+      }
+      return false;
+    };
+    var handleMouseOver = function handleMouseOver(e) {
+      setState({
+        tooltip: checkEllipsis(e.target)
+      });
+    };
+    var tooltipProps = _objectSpread({
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      }
+    }, toolTipProps);
+    if (!value) {
+      return '-';
+    }
+    return _jsx(_Tooltip, _objectSpread(_objectSpread({
+      title: value,
+      onOpenChange: function onOpenChange(open) {
+        setState({
+          tooltip: false
+        });
       },
-      children: node
-    }) : '-';
+      open: tooltip
+    }, tooltipProps), {}, {
+      children: _jsx(Text, {
+        style: {
+          width: width
+        },
+        ellipsis: true,
+        onMouseOver: handleMouseOver,
+        onFocus: handleMouseOver,
+        children: node
+      })
+    }));
   }
   return value || value === 0 ? node : '-';
 };

package/es/ProTable/components/RenderFooter/index.js

@@ -1,9 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 var RenderFooter = function RenderFooter(props) {
   var _ref = props || {},
-    footerRender = _ref.footerRender,
-    pagination = _ref.pagination,
-    _dataSource = _ref._dataSource;
+    dataSource = _ref.dataSource;
+  var _ref2 = dataSource || {},
+    footerRender = _ref2.footerRender,
+    pagination = _ref2.pagination,
+    _dataSource = _ref2._dataSource;
   return footerRender ? _jsx("div", {
     className: "pro-table-footer ".concat(pagination && !!(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.length) ? 'has-page' : 'no-page'),
     children: typeof footerRender === 'function' ? footerRender() : footerRender

package/es/ProTable/index.js

@@ -9,7 +9,7 @@ var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stri
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
-import { get, keyBy, assign, isObject } from 'lodash';
+import { get, keyBy, assign, isObject, isFunction, isBoolean } from 'lodash';
 import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { useProConfig } from '../index';
@@ -192,6 +192,18 @@ function ProTable(props) {
     });
     return newColumns;
   }, [curColumns, handleResize]);
+  var _columns = useMemo(function () {
+    return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
+      var show = item.show;
+      if (isBoolean(show)) {
+        return show;
+      }
+      if (isFunction(show)) {
+        return show(item, index);
+      }
+      return true;
+    });
+  }, [columns]);
   var handleColumnConfig = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
@@ -361,7 +373,7 @@ function ProTable(props) {
           tableProps: {
             value: _dataSource,
             headerRender: headerRender,
-            columns: columns,
+            columns: _columns,
             renderRowSelection: renderRowSelection,
             rowClassName: _rowClassName,
             disabled: disabled,

package/es/ProTable/style/index.less

@@ -403,7 +403,6 @@
   }
 
   .@{ant-prefix}-table .@{ant-prefix}-table-thead > tr > th {
-    white-space: nowrap;
     background: var(--zaui-table-header-bg, #f2f3f5);
     border-bottom: 0;
 
@@ -558,4 +557,4 @@
       }
     }
   }
-}
+}

package/lib/ProEditTable/style/index.less

@@ -206,7 +206,6 @@
 
   .@{ant-prefix}-table-thead>tr>th {
     border          : 0;
-    white-space     : nowrap;
     background-color: var(--zaui-table-header-bg, #f2f3f5);
   }
 

package/lib/ProEditTable/utils/index.js

@@ -288,7 +288,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         if (!(_cacheMap === null || _cacheMap === void 0 ? void 0 : (_cacheMap$item$dataIn = _cacheMap[item.dataIndex]) === null || _cacheMap$item$dataIn === void 0 ? void 0 : (_cacheMap$item$dataIn2 = _cacheMap$item$dataIn.dataSource) === null || _cacheMap$item$dataIn2 === void 0 ? void 0 : _cacheMap$item$dataIn2.length)) {
           var _item$fieldProps, _item$fieldProps2;
           _cacheMap[item.dataIndex] = {
-            useRequest: (0, _lodash.cloneDeep)((_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest),
+            useRequest: (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.useRequest,
             dataSource: [],
             transformResponse: (_item$fieldProps2 = item.fieldProps) === null || _item$fieldProps2 === void 0 ? void 0 : _item$fieldProps2.transformResponse
           };

package/lib/ProEnum/hooks/useEnumRequest.js

@@ -98,6 +98,9 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                 // 忽略清洗的 codes
                 ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
                 Object.keys(response).forEach(function (key) {
+                  if (!response[key] || !Array.isArray(response[key])) {
+                    return;
+                  }
                   var options = (0, _toConsumableArray2.default)(response[key]) || [];
                   if (ignoreCodes.includes(key)) {
                     response[key] = options;

package/lib/ProEnum/utils/index.js

@@ -87,7 +87,7 @@ function cacheFieldNames(fieldNames, dataSource) {
   });
   // 递归去对数据进行清洗
   if (children && Array.isArray(dataSource[children])) {
-    result[children] = dataSource[children].map(function (item) {
+    result.children = dataSource[children].map(function (item) {
       return cacheFieldNames(fieldNames, item);
     });
   }

package/lib/ProForm/components/base/Select/index.js

@@ -64,6 +64,7 @@ var Select = function Select(props) {
   }, initialConfig), {}, {
     options: dataSource
   }, rest), {}, {
+    value: rest.value === '' ? null : rest.value,
     fieldNames: _fieldNames
   }));
 };

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -404,8 +405,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
     if (record === null || record === void 0 ? void 0 : record.disabled) return;
     var selectedValue = getRowKey(record);
-    var tempSelectedRows = (0, _lodash.cloneDeep)(selectedRows);
-    var tempSelectedRowKeys = (0, _lodash.cloneDeep)(selectedRowKeys);
+    var tempSelectedRows = (0, _toConsumableArray2.default)(selectedRows);
+    var tempSelectedRowKeys = (0, _toConsumableArray2.default)(selectedRowKeys);
     if (isMultiple) {
       var rowIndex = tempSelectedRows.findIndex(function (item) {
         return getRowKey(item) === selectedValue;

package/lib/ProForm/components/combination/ProModalSelect/style/index.less

@@ -57,7 +57,7 @@
   .@{ant-prefix}-input-affix-wrapper {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
-    &.ant-input-affix-wrapper-status-error{
+    &.@{ant-prefix}-input-affix-wrapper-status-error{
        & + .@{ant-prefix}-btn{
         border: 1px solid var(--ant-error-color);
         >.viewSvg{
@@ -74,6 +74,36 @@
     }
   }
 
+  .@{ant-prefix}-input-compact-item:not(.@{ant-prefix}-input-compact-last-item):not(.@{ant-prefix}-input-compact-item-rtl){
+    margin-right: 0;
+  }
+
+  .@{ant-prefix}-btn-compact-item.@{ant-prefix}-btn.@{ant-prefix}-btn-compact-last-item:not(.@{ant-prefix}-btn-compact-first-item):not(.@{ant-prefix}-btn-compact-item-rtl){
+    &:hover{
+      position: relative;
+      transition: none;
+      &::before{
+        opacity: 1;
+      }
+    }
+    &::before{
+      content: '';
+      position: absolute;
+      top: -1px;
+      left: -1px;
+      width: 1px;
+      height: calc(100% + 2px);
+      background:var(--ant-primary-color-hover);
+      opacity: 0;
+      display: block;
+    }
+  }
+
+  .@{ant-prefix}-input-affix-wrapper-status-error{
+    
+  }
+
+
   .@{ant-prefix}-input-group-wrapper-status-error {
     &:hover {
       .@{ant-prefix}-input,
@@ -109,7 +139,7 @@
 
   .@{ant-prefix}-space-compact {
     .@{ant-prefix}-select-compact-item-div:has(.@{ant-prefix}-select-status-error) {
-      & + .ant-btn-compact-last-item {
+      & + .@{ant-prefix}-btn-compact-last-item {
         border-top: 1px solid var(--ant-error-color);
         border-right: 1px solid var(--ant-error-color);
         border-bottom: 1px solid var(--ant-error-color);
@@ -119,7 +149,7 @@
       }
     }
     .@{ant-prefix}-btn-compact-last-item{
-      border-left: none;
+      border-left: none !important;
     }
   }
 
@@ -138,9 +168,12 @@
 // 报错信息
 .@{ant-prefix}-form-item-has-error{
   .pro-modal-select{
-    .ant-btn-compact-last-item{
+    .@{ant-prefix}-btn-compact-last-item{
       color: @zaui-danger;
       border-color: @zaui-danger;
+      &::before{
+      background:  @zaui-danger !important;
+      }
     }
   }
 }

package/lib/ProForm/components/render/ConfirmWrapper.js

@@ -52,7 +52,8 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
               form: form,
               namePath: otherProps.namePath,
               name: otherProps.name,
-              index: otherProps.index
+              index: otherProps.index,
+              preValue: form.getFieldValue(otherProps.listName || otherProps.name)
             });
           case 5:
             _context.t0 = _context.sent;

package/lib/ProForm/components/render/propsType.d.ts

@@ -220,7 +220,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
-    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void | Promise<boolean | ModalFuncProps | void>>;
     /** 防抖模式 */
     debounceWait?: number;
 }

package/lib/ProLayout/style/index.less

@@ -242,7 +242,6 @@
     }
 
     .pro-layout-open-menu .@{ant-prefix}-menu-item-selected {
-      padding-right: 16px;
       &::after {
         display: none;
       }

package/lib/ProSelect/index.js

@@ -269,6 +269,10 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
         return option === null || option === void 0 ? void 0 : option[code];
       }
     }
+    // 修复空字符placeholder不显示
+    if (value === '') {
+      return null;
+    }
     return value;
   };
   var newSelectList = selectList;

package/lib/ProTable/components/RcTable/components/BaseTable/index.js

@@ -31,7 +31,6 @@ var BaseTable = function BaseTable(_ref) {
     return null;
   };
   return (0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    className: "pro-edit-table-drag",
     components: renderComponents(),
     columns: columns,
     locale: {

package/lib/ProTable/components/RcTable/components/DraggableTable/index.js

@@ -19,7 +19,7 @@ var _excluded = ["dataSource", "tableProps", "draggableProps", "summaryProps", "
  * @Author: za-xuwenli xuwenli@zhongan.io
  * @Date: 2024-08-09 13:48:59
  * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2024-08-20 19:31:24
+ * @LastEditTime: 2024-08-27 15:27:44
  * @FilePath: /za-material-warehouse/src/ProTable/components/RcTable/components/DraggableTable/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */

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

@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
+var _ahooks = require("ahooks");
 var _icons = require("@ant-design/icons");
 var _reactSvg = require("react-svg");
 var _copy = _interopRequireDefault(require("../../../assets/copy.svg"));
@@ -26,6 +28,12 @@ var RenderColumn = function RenderColumn(props) {
     originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps;
+  var _useSetState = (0, _ahooks.useSetState)({
+      tooltip: false
+    }),
+    _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
+    tooltip = _useSetState2[0].tooltip,
+    setState = _useSetState2[1];
   if (originalValue !== undefined) {
     var renderNode = value ? node : '-';
     if (ellipsis || originalDiffTip) {
@@ -86,19 +94,70 @@ var RenderColumn = function RenderColumn(props) {
     });
   }
   if (ellipsis) {
-    return value ? (0, _jsxRuntime.jsx)(Text, {
-      style: {
-        width: width
-      },
-      ellipsis: {
-        tooltip: (0, _objectSpread2.default)({
-          getPopupContainer: function getPopupContainer(triggerNode) {
-            return triggerNode.parentNode;
-          }
-        }, toolTipProps)
+    var getPadding = function getPadding(el) {
+      var style = window.getComputedStyle(el, null);
+      var paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0;
+      var paddingRight = Number.parseInt(style.paddingRight, 10) || 0;
+      var paddingTop = Number.parseInt(style.paddingTop, 10) || 0;
+      var paddingBottom = Number.parseInt(style.paddingBottom, 10) || 0;
+      return {
+        pLeft: paddingLeft,
+        pRight: paddingRight,
+        pTop: paddingTop,
+        pBottom: paddingBottom
+      };
+    };
+    var checkEllipsis = function checkEllipsis(box) {
+      var range = document.createRange();
+      range.setStart(box, 0);
+      range.setEnd(box, box.childNodes.length);
+      var rangeWidth = range.getBoundingClientRect().width;
+      var rangeHeight = range.getBoundingClientRect().height;
+      var contentWidth = rangeWidth - Math.floor(rangeWidth);
+      var _getPadding = getPadding(box),
+        pLeft = _getPadding.pLeft,
+        pRight = _getPadding.pRight,
+        pTop = _getPadding.pTop,
+        pBottom = _getPadding.pBottom;
+      var horizontalPadding = pLeft + pRight;
+      var verticalPadding = pTop + pBottom;
+      if (rangeWidth + horizontalPadding > box.clientWidth) {
+        return true;
+      }
+      return false;
+    };
+    var handleMouseOver = function handleMouseOver(e) {
+      setState({
+        tooltip: checkEllipsis(e.target)
+      });
+    };
+    var tooltipProps = (0, _objectSpread2.default)({
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      }
+    }, toolTipProps);
+    if (!value) {
+      return '-';
+    }
+    return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      title: value,
+      onOpenChange: function onOpenChange(open) {
+        setState({
+          tooltip: false
+        });
       },
-      children: node
-    }) : '-';
+      open: tooltip
+    }, tooltipProps), {}, {
+      children: (0, _jsxRuntime.jsx)(Text, {
+        style: {
+          width: width
+        },
+        ellipsis: true,
+        onMouseOver: handleMouseOver,
+        onFocus: handleMouseOver,
+        children: node
+      })
+    }));
   }
   return value || value === 0 ? node : '-';
 };

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

@@ -7,9 +7,11 @@ exports.default = void 0;
 var _jsxRuntime = require("react/jsx-runtime");
 var RenderFooter = function RenderFooter(props) {
   var _ref = props || {},
-    footerRender = _ref.footerRender,
-    pagination = _ref.pagination,
-    _dataSource = _ref._dataSource;
+    dataSource = _ref.dataSource;
+  var _ref2 = dataSource || {},
+    footerRender = _ref2.footerRender,
+    pagination = _ref2.pagination,
+    _dataSource = _ref2._dataSource;
   return footerRender ? (0, _jsxRuntime.jsx)("div", {
     className: "pro-table-footer ".concat(pagination && !!(_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.length) ? 'has-page' : 'no-page'),
     children: typeof footerRender === 'function' ? footerRender() : footerRender

package/lib/ProTable/index.js

@@ -199,6 +199,18 @@ function ProTable(props) {
     });
     return newColumns;
   }, [curColumns, handleResize]);
+  var _columns = (0, _react.useMemo)(function () {
+    return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
+      var show = item.show;
+      if ((0, _lodash.isBoolean)(show)) {
+        return show;
+      }
+      if ((0, _lodash.isFunction)(show)) {
+        return show(item, index);
+      }
+      return true;
+    });
+  }, [columns]);
   var handleColumnConfig = /*#__PURE__*/function () {
     var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
@@ -368,7 +380,7 @@ function ProTable(props) {
           tableProps: {
             value: _dataSource,
             headerRender: headerRender,
-            columns: columns,
+            columns: _columns,
             renderRowSelection: renderRowSelection,
             rowClassName: _rowClassName,
             disabled: disabled,

package/lib/ProTable/style/index.less

@@ -403,7 +403,6 @@
   }
 
   .@{ant-prefix}-table .@{ant-prefix}-table-thead > tr > th {
-    white-space: nowrap;
     background: var(--zaui-table-header-bg, #f2f3f5);
     border-bottom: 0;
 
@@ -558,4 +557,4 @@
       }
     }
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.7.0",
+  "version": "3.7.1-beta.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",