@zat-design/sisyphus-react 3.9.0-beta.1 → 3.9.0-beta.11

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

@@ -8,8 +8,11 @@ import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useSetState } from 'ahooks';
+import { isBoolean } from 'lodash';
+import classNames from 'classnames';
 import { CheckOutlined } from '@ant-design/icons';
 import { ReactSVG } from 'react-svg';
+import { isEmpty } from '../../../utils';
 import copySvg from '../../../assets/copy.svg';
 var Paragraph = _Typography.Paragraph,
   Text = _Typography.Text;
@@ -23,7 +26,6 @@ var RenderColumn = function RenderColumn(props) {
     ellipsis = props.ellipsis,
     width = props.width,
     originalValue = props.originalValue,
-    originalDiffTip = props.originalDiffTip,
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
     minWidth = props.minWidth,
@@ -34,9 +36,13 @@ var RenderColumn = function RenderColumn(props) {
     _useSetState2 = _slicedToArray(_useSetState, 2),
     tooltip = _useSetState2[0].tooltip,
     setState = _useSetState2[1];
-  if ((originalValue || originalValue === 0) && !isInNewRowFlag) {
+  var cellDiffCls = classNames({
+    'varied-cell': props === null || props === void 0 ? void 0 : props.isChanged
+  });
+  // 比对场景走的逻辑
+  if (!isInNewRowFlag && isBoolean(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
-    if (ellipsis || originalDiffTip) {
+    if (ellipsis || (props === null || props === void 0 ? void 0 : props.isChanged)) {
       renderNode = _jsx(Text, {
         style: {
           width: currentValue === '-' ? 32.5 : width,
@@ -47,8 +53,20 @@ var RenderColumn = function RenderColumn(props) {
         },
         children: ellipsis ? currentValue : renderNode
       });
+      if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
+        return renderNode;
+      }
+      if (Array.isArray(originalValue)) {
+        console.error('Error: When enabled, dataIndex corresponds to an array, which needs to be converted using viewRender');
+      }
+      var originalValueCalc = function originalValueCalc() {
+        if (Array.isArray(originalValue)) {
+          return null;
+        }
+        return !isEmpty(originalValue) ? originalValue : '-';
+      };
       return _jsx(_Tooltip, _objectSpread(_objectSpread({
-        className: "varied-cell",
+        className: cellDiffCls,
         style: {
           width: width,
           minWidth: minWidth
@@ -59,11 +77,11 @@ var RenderColumn = function RenderColumn(props) {
         title: _jsx(_Space, {
           direction: "vertical",
           className: "changed-tooltip",
-          children: originalDiffTip ? _jsxs(_Fragment, {
+          children: (props === null || props === void 0 ? void 0 : props.isChanged) ? _jsxs(_Fragment, {
             children: [_jsxs(_Space, {
               align: "start",
               className: "original-value-container",
-              children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
+              children: ["\u521D\u59CB\u503C\uFF1A", originalValueCalc()]
             }), _jsx(_Space, {
               className: "current-value-container",
               children: ellipsis ? _jsxs(_Space, {
@@ -79,8 +97,11 @@ var RenderColumn = function RenderColumn(props) {
         children: renderNode
       }));
     }
+    if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
+      return renderNode;
+    }
     return _jsx("span", {
-      className: "varied-cell",
+      className: cellDiffCls,
       style: {
         width: width,
         minWidth: minWidth

package/es/ProTable/index.d.ts

@@ -1,19 +1,20 @@
 /// <reference types="react" />
 import { ProTableProps } from './propsType';
+import useAntdTable from './hooks/useAntdTable';
 export declare const TableContext: import("react").Context<{}>;
 export declare const defaultPage: {
     pageNum: number;
     pageSize: number;
 };
-declare function ProTable(props: ProTableProps): import("react/jsx-runtime").JSX.Element;
-declare namespace ProTable {
-    var defaultProps: {
+declare const ProTable: {
+    (props: ProTableProps): import("react/jsx-runtime").JSX.Element;
+    defaultProps: {
         quickConfig: boolean;
         stripe: boolean;
         draggable: boolean;
         disabled: boolean;
         isView: boolean;
     };
-    var useAntdTable: typeof import("./hooks/useAntdTable").default;
-}
+    useAntdTable: typeof useAntdTable;
+};
 export default ProTable;

package/es/ProTable/index.js

@@ -29,7 +29,7 @@ export var defaultPage = {
   pageNum: 1,
   pageSize: 10
 };
-function ProTable(props) {
+var ProTable = function ProTable(props) {
   var _locale$ProTable, _props$scroll, _curTableConfig$pathK;
   var _ref = useProConfig('globalConfig') || {},
     configStorage = _ref.storage; // 获取全局缓存位置配置
@@ -114,7 +114,6 @@ function ProTable(props) {
     });
   });
   var originalObj = _originalDataSource ? keyBy(_originalDataSource, 'rowKey') : undefined;
-  var dataSourceObj = _dataSource ? keyBy(_dataSource, 'rowKey') : {};
   var propsColumnObj = useMemo(function () {
     return propsColumns.reduce(function (acc, cur) {
       // @ts-ignore
@@ -213,9 +212,8 @@ function ProTable(props) {
       formatColumn({
         column: item,
         originalObj: originalObj,
-        dataSourceObj: dataSourceObj,
-        rowKey: 'rowKey',
-        diffToolTip: toolTip,
+        rowKey: props.rowKey,
+        diffConfig: diffConfig,
         wrapToolTipProps: wrapToolTipProps,
         scroll: _scroll,
         onUpdateMinWidth: function onUpdateMinWidth(w) {
@@ -447,7 +445,7 @@ function ProTable(props) {
       })]
     })
   });
-}
+};
 ProTable.defaultProps = {
   quickConfig: false,
   stripe: true,

package/es/ProTable/propsType.d.ts

@@ -31,7 +31,6 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         value: string | number;
     }[];
     copyable?: boolean;
-    originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     tooltip?: ReactNode | {
@@ -45,6 +44,8 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
         value: any;
         originValue: any;
     }) => boolean;
+    viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => any;
+    isChanged?: boolean | null;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/es/ProTable/style/index.less

@@ -261,11 +261,20 @@
     tr.@{ant-prefix}-table-row.new-cell {
       background: var(--zaui-contract-bg-add; #d2fff4) !important;
       background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
-
       td.@{ant-prefix}-table-cell {
         background: var(--zaui-contract-bg-add; #d2fff4) !important;
         background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
         border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+        &.@{ant-prefix}-table-cell-fix-right {
+          background: var(--zaui-contract-bg-add; #d2fff4) !important;
+          background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
+          border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+        }
+        &.@{ant-prefix}-table-cell-fix-left {
+          background: var(--zaui-contract-bg-add; #d2fff4) !important;
+          background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
+          border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+        }
       }
     }
 

package/es/ProTable/utils/index.d.ts

@@ -11,9 +11,12 @@ export declare const getDecimalDigits: (num?: number) => number;
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
-export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => any;
+export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => {
+    originalValue: any;
+    isChanged: boolean;
+};
 export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 判断数据是否为Response<List<any>>结构

package/es/ProTable/utils/index.js

@@ -16,18 +16,27 @@ export var getDecimalDigits = function getDecimalDigits() {
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
 export var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
   if (!originalObj) {
-    return undefined;
+    return {
+      originalValue: null,
+      isChanged: null
+    };
   }
   var originalRecord = get(originalObj, get(record, rowKey));
   var originalValue = get(originalRecord, dataIndex);
   if (!isEqual(originalValue, value)) {
-    return originalValue;
+    return {
+      originalValue: originalValue,
+      isChanged: true
+    };
   }
-  return undefined;
+  return {
+    originalValue: null,
+    isChanged: false
+  };
 };
 export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {
   return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');

package/es/ProTree/components/ProTreeSelect/index.js

@@ -1,6 +1,8 @@
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 import "antd/es/message/style";
@@ -18,7 +20,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { useImperativeHandle, forwardRef } from 'react';
-import { cloneDeep } from 'lodash';
+import { cloneDeep, debounce } from 'lodash';
 import { useProConfig } from '../../../ProConfigProvider';
 import Container from '../../../ProForm/components/Container';
 import AdaptiveTooltip from '../AdaptiveTooltip';
@@ -398,18 +400,35 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     sourceList = _filterData(sourceList);
     return sourceList;
   }
-  var searchTreeEvent = function searchTreeEvent(searchVal) {
-    if (!searchVal) {
-      setState({
-        selectList: cloneDeep(origDataSource || [])
-      });
-      return null;
-    }
-    var result = filterTree(cloneDeep(origDataSource || []), searchVal);
-    setState({
-      selectList: result || []
-    });
-  };
+  var searchTreeEvent = debounce(/*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchVal) {
+      var result;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (searchVal) {
+              _context.next = 3;
+              break;
+            }
+            setState({
+              selectList: cloneDeep(origDataSource || [])
+            });
+            return _context.abrupt("return", null);
+          case 3:
+            result = filterTree(cloneDeep(origDataSource || []), searchVal);
+            setState({
+              selectList: result || []
+            });
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref5.apply(this, arguments);
+    };
+  }(), 500);
   function findTreeNode(treeList, nodeValue) {
     var result = {};
     var _filterData2 = function filterData(data) {

package/es/utils/index.d.ts

@@ -1,3 +1,3 @@
 /** 判断一个值是否是空值 */
-export declare const isEmpty: (value: any) => boolean;
+export declare const isEmpty: (value: any, emptyValue?: string) => boolean;
 export declare const useFocus: (element: Element) => boolean;

package/es/utils/index.js

@@ -2,7 +2,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useEffect, useState } from 'react';
 var EMPTY_VALUE = [undefined, null, ''];
 /** 判断一个值是否是空值 */
-export var isEmpty = function isEmpty(value) {
+export var isEmpty = function isEmpty(value, emptyValue) {
+  if (emptyValue) {
+    EMPTY_VALUE.push(emptyValue);
+  }
   if (EMPTY_VALUE.includes(value)) {
     return true;
   }

package/lib/ProDrawerForm/components/ProDrawer/index.js

@@ -39,6 +39,7 @@ var ProDrawer = function ProDrawer(_ref) {
     onCancel = _ref.onCancel,
     children = _ref.children,
     className = _ref.className,
+    zIndex = _ref.zIndex,
     drawerProps = _ref.drawerProps;
   var ref = (0, _react.useRef)(null);
   var modalRef = (0, _react.useRef)(null);
@@ -195,7 +196,8 @@ var ProDrawer = function ProDrawer(_ref) {
     placement: "right",
     className: "pro-drawer ".concat(className !== null && className !== void 0 ? className : ''),
     closable: false,
-    onClose: onCancel
+    onClose: onCancel,
+    zIndex: zIndex
   }, drawerProps), {}, {
     children: [(0, _jsxRuntime.jsx)("div", {
       className: "pro-drawer-close",

package/lib/ProDrawerForm/components/ProModal/index.js

@@ -38,8 +38,9 @@ var ProModal = function ProModal(_ref) {
     onCancel = _ref.onCancel,
     children = _ref.children,
     className = _ref.className,
-    modalProps = _ref.modalProps,
-    extraLeft = _ref.extraLeft;
+    extraLeft = _ref.extraLeft,
+    zIndex = _ref.zIndex,
+    modalProps = _ref.modalProps;
   var ref = (0, _react.useRef)(null);
   var _ref2 = (0, _ahooks.useScroll)((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.parentNode) || {},
     top = _ref2.top;
@@ -181,7 +182,8 @@ var ProModal = function ProModal(_ref) {
     closeIcon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
       className: "close-icon",
       src: _close.default
-    })
+    }),
+    zIndex: zIndex
   }, modalProps), {}, {
     children: (0, _jsxRuntime.jsx)("div", {
       ref: ref,

package/lib/ProDrawerForm/propsType.d.ts

@@ -98,4 +98,5 @@ export interface ProDrawerFormPropsType {
      */
     onCloseClean?: boolean;
     children?: React.ReactNode;
+    zIndex?: number;
 }

package/lib/ProEnum/index.js

@@ -44,7 +44,8 @@ var ProEnum = function ProEnum(props) {
     enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     viewEmpty = _ref.viewEmpty;
-  var _isView = isView || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
+  var _isView = isView !== undefined && isView !== null ? isView : otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
+  var _defalutValue = props === null || props === void 0 ? void 0 : props.defaultValue;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -274,16 +275,17 @@ var ProEnum = function ProEnum(props) {
     return (0, _lodash.isFunction)(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
   if (_isView) {
-    if (Array.isArray(value)) {
+    var __value = value || _defalutValue;
+    if (Array.isArray(__value)) {
       return (0, _jsxRuntime.jsx)(_Container.default, {
         tooltip: true,
         viewEmpty: viewEmpty,
-        children: transToLabel(value)
+        children: transToLabel(__value)
       });
     }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
-      children: value || (0, _lodash.isNumber)(value) ? transToLabel([value]) : null
+      children: __value || (0, _lodash.isNumber)(__value) ? transToLabel([__value]) : null
     });
   }
   return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {

package/lib/ProEnum/propsType.d.ts

@@ -77,6 +77,7 @@ export interface ProEnum {
     otherProps?: ProFormOtherProps;
     allowClear?: boolean;
     id?: string;
+    defaultValue?: any;
 }
 export type PropProSelectsMap = {
     type?: 'ProSelect';

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

@@ -32,7 +32,8 @@ var Group = function Group(props) {
     value = props.value,
     onChange = props.onChange,
     otherProps = props.otherProps,
-    id = props.id;
+    id = props.id,
+    isParentView = props.isView;
   var contextProps = _ProForm.default.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -77,7 +78,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);
@@ -88,7 +89,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);

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

@@ -840,7 +840,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onOk: handleFinish,
       // @ts-ignore
       onCancel: handleClose,
-      visible: visible
+      visible: visible,
+      zIndex: 1071
     }, restModalProps), {}, {
       children: [(0, _jsxRuntime.jsx)(_index.ProForm, {
         submitOnEnter: true,

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

@@ -34,7 +34,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
     getValueProps = props.getValueProps,
     viewRender = props.viewRender,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  // const contentRef = useRef(null);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
   var originalValues = diffConfig.originalValues,

package/lib/ProForm/style/index.less

@@ -488,7 +488,6 @@
 .original-value-tootip{
   max-width: 100%;
   width: max-content;
-  z-index: 99;
   position: fixed;
   .changed-tooltip {
     .original-value-container {

package/lib/ProTable/components/FormatColumn/index.d.ts

@@ -1,15 +1,17 @@
+/**
+ * 调整点：
+ */
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, }: {
+export declare const formatColumn: ({ column, originalObj, rowKey, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, diffConfig, }: {
     column: ProTableColumn;
     originalObj: any;
-    dataSourceObj: any;
     rowKey: any;
-    diffToolTip?: boolean;
     wrapToolTipProps?: any;
     scroll?: any;
     onUpdateMinWidth?: any;
     isInNewRow?: any;
+    diffConfig: any;
 }) => void;
 /**
  * 查找最近的父级className