@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

package/lib/style/theme/base.less

@@ -0,0 +1,90 @@
+@ant-prefix: ant;
+@import '../core/index.less';
+@import './tokens.less';
+
+/* 兼容IE11  默认会生成2个值，默认值，var值。IE11下读取默认值 */
+:root {
+  --zaui-global-bg                  : #ffffff;
+  --zaui-base-bg                    : #ffffff;
+  --zaui-brand                      : #006aff;
+  --zaui-brand-hover                : #3387ff;
+  --zaui-brand-active               : #005ad9;
+  --zaui-brand-disabled             : color-mix(in srgb, var(--zaui-brand) 70%, white);
+  --zaui-text                       : #343434;
+  --zaui-text-weak                  : #616161;
+  --zaui-aide-text                  : #909090;
+  --zaui-placeholder                : #a0a0a0;
+  --zaui-link                       : var(--zaui-brand);
+  --zaui-link-light-active          : var(--zaui-brand-active);
+  --zaui-line                       : #dcdcdc;
+  --zaui-dividing-line              : #dcdcdc;
+  --zaui-area                       : #fafafa;
+  --zaui-shadow                     : rgba(56, 56, 56, 0.15);
+  --zaui-form-control-line          : var(--zaui-line);
+  --zaui-form-control-line-hover    : var(--zaui-brand-hover);
+  --zaui-form-control-line-active   : var(--zaui-brand-active);
+  --zaui-list-item-active-bg        : var(--zaui-brand);
+  --zaui-list-item-active-hover-bg  : var(--zaui-brand);
+  --zaui-list-item-selected-bg      : var(--zaui-brand);
+  --zaui-list-item-selected-hover-bg: var(--zaui-brand);
+  --zaui-disabled-bg                : #f2f2f2;
+  --zaui-disabled-text              : #333333;
+  --zaui-feedback-overlay-bg        : rgba(0, 0, 0, 0.7);
+  --zaui-feedback-overlay-text      : #343434;
+  --zaui-primary                    : var(--zaui-brand);
+  --zaui-primary-hover              : var(--zaui-brand-hover);
+  --zaui-primary-active             : var(--zaui-brand-active);
+  --zaui-danger-line                : var(--zaui-line);
+  --zaui-danger-bg                  : #fff2f0;
+  --zaui-warning-line               : var(--zaui-line);
+  --zaui-warning-bg                 : #fffbe6;
+  --zaui-info-line                  : var(--zaui-line);
+  --zaui-info-bg                    : #e6f7ff;
+  --zaui-success-line               : var(--zaui-line);
+  --zaui-success-bg                 : #f6ffed;
+  --zaui-danger                     : #ff5050;
+  --zaui-warning                    : #ec9131;
+  --zaui-success                    : #00ae4d;
+  --zaui-menu-top-bg                : #ffffff;
+  --zaui-menu-left-bg               : #1a202d;
+  --zaui-menu-second-bg             : #ffffff;
+  --zaui-form-align                 : left;
+  --zaui-table-header-bg            : #f2f3f5;
+  --zaui-table-strip-bg             : #fafafa;
+  --zaui-table-hover-bg             : #fafafa;
+  --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-contract-bg-add            : #d2fff4; // 新增对比背景色
+  --zaui-form-label-width           : 130px; // 8个全角字符宽度
+  --zaui-border-radius              : 8px;
+  --zaui-border-radius-card         : 4px;
+  --zaui-font-size-title            : 16px;
+  --zaui-font-size-card-title       : var(--zaui-font-size-title);
+  --zaui-font-size                  : 14px;
+  --zaui-font-size-sm               : 12px;
+  --zaui-font-size-md               : var(--zaui-font-size);
+  --zaui-font-size-lg               : 16px;
+  --zaui-font-size-xl               : 18px;
+  --zaui-font-size-xxl              : 20px;
+  --zaui-font-size-lg-title         : 24px;
+  --zaui-height-border              : var(--zaui-height-size-md);
+  --zaui-height-card                : var(--zaui-height-size-lg);
+  --zaui-height-size-xs             : 4px;
+  --zaui-height-size-sm             : 8px;
+  --zaui-height-size-md             : 16px;
+  --zaui-height-size-lg             : 32px;
+  --zaui-height-size-xl             : 64px;
+  --zaui-space-border               : var(--zaui-space-size-md); // 兼容1.1.35一下版本 变量
+  --zaui-space-card                 : var(--zaui-space-size-lg);
+  --zaui-space-size-xs              : 4px;
+  --zaui-space-size-sm              : 8px;
+  --zaui-space-size-md              : 16px;
+  --zaui-space-size-lg              : 32px;
+  --zaui-space-size-xl              : 64px;
+
+  --zaui-line-height-base: 1.5;
+  --zaui-size            : 1;
+  --zaui-base-font-size  : 0px;
+} 

package/lib/style/theme/index.less

@@ -1,89 +1,2 @@
-@import '../core/index.less';
-@import './tokens.less';
-
-/* 兼容IE11  默认会生成2个值，默认值，var值。IE11下读取默认值 */
-:root {
-  --zaui-global-bg                  : #ffffff;
-  --zaui-base-bg                    : #ffffff;
-  --zaui-brand                      : #006aff;
-  --zaui-brand-hover                : #3387ff;
-  --zaui-brand-active               : #005ad9;
-  --zaui-brand-disabled             : color-mix(in srgb, var(--zaui-brand) 70%, white);
-  --zaui-text                       : #343434;
-  --zaui-text-weak                  : #616161;
-  --zaui-aide-text                  : #909090;
-  --zaui-placeholder                : #a0a0a0;
-  --zaui-link                       : var(--zaui-brand);
-  --zaui-link-light-active          : var(--zaui-brand-active);
-  --zaui-line                       : #dcdcdc;
-  --zaui-dividing-line              : #dcdcdc;
-  --zaui-area                       : #fafafa;
-  --zaui-shadow                     : rgba(56, 56, 56, 0.15);
-  --zaui-form-control-line          : var(--zaui-line);
-  --zaui-form-control-line-hover    : var(--zaui-brand-hover);
-  --zaui-form-control-line-active   : var(--zaui-brand-active);
-  --zaui-list-item-active-bg        : var(--zaui-brand);
-  --zaui-list-item-active-hover-bg  : var(--zaui-brand);
-  --zaui-list-item-selected-bg      : var(--zaui-brand);
-  --zaui-list-item-selected-hover-bg: var(--zaui-brand);
-  --zaui-disabled-bg                : #f2f2f2;
-  --zaui-disabled-text              : #333333;
-  --zaui-feedback-overlay-bg        : rgba(0, 0, 0, 0.7);
-  --zaui-feedback-overlay-text      : #343434;
-  --zaui-primary                    : var(--zaui-brand);
-  --zaui-primary-hover              : var(--zaui-brand-hover);
-  --zaui-primary-active             : var(--zaui-brand-active);
-  --zaui-danger-line                : var(--zaui-line);
-  --zaui-danger-bg                  : #fff2f0;
-  --zaui-warning-line               : var(--zaui-line);
-  --zaui-warning-bg                 : #fffbe6;
-  --zaui-info-line                  : var(--zaui-line);
-  --zaui-info-bg                    : #e6f7ff;
-  --zaui-success-line               : var(--zaui-line);
-  --zaui-success-bg                 : #f6ffed;
-  --zaui-danger                     : #ff5050;
-  --zaui-warning                    : #ec9131;
-  --zaui-success                    : #00ae4d;
-  --zaui-menu-top-bg                : #ffffff;
-  --zaui-menu-left-bg               : #1a202d;
-  --zaui-menu-second-bg             : #ffffff;
-  --zaui-form-align                 : left;
-  --zaui-table-header-bg            : #f2f3f5;
-  --zaui-table-strip-bg             : #fafafa;
-  --zaui-table-hover-bg             : #fafafa;
-  --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-contract-bg-add            : #d2fff4; // 新增对比背景色
-  --zaui-form-label-width           : 130px; // 8个全角字符宽度
-  --zaui-border-radius              : 8px;
-  --zaui-border-radius-card         : 4px;
-  --zaui-font-size-title            : 16px;
-  --zaui-font-size-card-title       : var(--zaui-font-size-title);
-  --zaui-font-size                  : 14px;
-  --zaui-font-size-sm               : 12px;
-  --zaui-font-size-md               : var(--zaui-font-size);
-  --zaui-font-size-lg               : 16px;
-  --zaui-font-size-xl               : 18px;
-  --zaui-font-size-xxl              : 20px;
-  --zaui-font-size-lg-title         : 24px;
-  --zaui-height-border              : var(--zaui-height-size-md);
-  --zaui-height-card                : var(--zaui-height-size-lg);
-  --zaui-height-size-xs             : 4px;
-  --zaui-height-size-sm             : 8px;
-  --zaui-height-size-md             : 16px;
-  --zaui-height-size-lg             : 32px;
-  --zaui-height-size-xl             : 64px;
-  --zaui-space-border               : var(--zaui-space-size-md); // 兼容1.1.35一下版本 变量
-  --zaui-space-card                 : var(--zaui-space-size-lg);
-  --zaui-space-size-xs              : 4px;
-  --zaui-space-size-sm              : 8px;
-  --zaui-space-size-md              : 16px;
-  --zaui-space-size-lg              : 32px;
-  --zaui-space-size-xl              : 64px;
-
-  --zaui-line-height-base: 1.5;
-  --zaui-size            : 1;
-  --zaui-base-font-size  : 0px;
-}
+// 引用基础主题文件，避免重复
+@import './base.less';

package/lib/utils/index.d.ts

@@ -1,3 +1,10 @@
+export declare const customEqualForFunction: (value: any, other: any) => boolean;
+/**
+ * 兼容 React17/18 的 startTransition。
+ *  - React18+: 使用原生 startTransition
+ *  - React17 : 直接执行回调
+ */
+export declare function compatStartTransition(cb: () => void): void;
 /**
  * 判断一个值是否是空值
  * 空值 或者 仅包含空值的数组视为空

package/lib/utils/index.js

@@ -1,14 +1,53 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useFocus = exports.isEmpty = exports.isEllipsisActive = void 0;
+exports.compatStartTransition = compatStartTransition;
+exports.useFocus = exports.isEmpty = exports.isEllipsisActive = exports.customEqualForFunction = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
+var _lodash = require("lodash");
 var EMPTY_VALUE = [undefined, null, ''];
 
+// 自定义深比对 如果两边都是函数类型则认为相等
+// 对于 React 元素，不直接认为相等，而是让 lodash 继续进行深度比较
+var customEqualForFunction = (value, other) => {
+  // 只有当两边都是函数时才认为相等
+  if ((0, _lodash.isFunction)(value) && (0, _lodash.isFunction)(other)) {
+    return true;
+  }
+  // 对于 React 元素，返回 undefined 让 isEqualWith 继续使用默认比较逻辑
+  // 这样会比较 React 元素的 type、props 等属性
+  if ( /*#__PURE__*/_react.default.isValidElement(value) && /*#__PURE__*/_react.default.isValidElement(other)) {
+    // 比较 React 元素的类型和关键 props
+    if (value.type !== other.type) {
+      return false;
+    }
+    // 对于相同类型的 React 元素，返回 undefined 让 isEqualWith 继续深度比较 props
+    return undefined;
+  }
+};
+
+/**
+ * 兼容 React17/18 的 startTransition。
+ *  - React18+: 使用原生 startTransition
+ *  - React17 : 直接执行回调
+ */
+exports.customEqualForFunction = customEqualForFunction;
+function compatStartTransition(cb) {
+  var maybeStartTransition = _react.default.startTransition;
+  if (typeof maybeStartTransition === 'function') {
+    // React 18+
+    maybeStartTransition(cb);
+  } else {
+    // React 17 及以下
+    cb();
+  }
+}
+
 /**
  * 判断一个值是否是空值
  * 空值 或者 仅包含空值的数组视为空

package/package.json

@@ -1,21 +1,31 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.14.0-beta.2",
+  "version": "4.0.0-beta.10",
   "license": "MIT",
-  "engines": {
-    "node": ">=18.19.0"
-  },
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
   "homepage": "https://procomponents.zhongan.tech",
+  "keywords": [
+    "components",
+    "design",
+    "framework",
+    "frontend",
+    "react",
+    "react-component",
+    "ui",
+    "zat-design",
+    "sisyphus",
+    "react-sisyphus",
+    "pro-components"
+  ],
   "scripts": {
     "analyze": "ANALYZE=1 dumi build",
     "build": "father build && mv dist/index.min.css dist/index.esm.css && mv dist/less.min.css dist/less.esm.css",
     "build-es": "father build --format esm",
     "build-lib": "father build --format cjs",
     "build-dist": "father build --format umd",
-    "docs": "export NODE_OPTIONS=--openssl-legacy-provider && dumi build",
+    "docs": "cross-env NODE_OPTIONS=\"--openssl-legacy-provider\" dumi build",
     "docs:deploy": "gh-pages -d docs-dist",
     "lint": "npm run lint:js && npm run lint:style && npm run lint:prettier",
     "lint-staged": "lint-staged",
@@ -30,7 +40,7 @@
     "postpublish": "git clean -fd",
     "release": "yarn build && npm publish",
     "release:beta": "yarn build && npm publish --tag=beta",
-    "start": "export NODE_OPTIONS=--openssl-legacy-provider && dumi dev",
+    "start": "cross-env NODE_OPTIONS=\"--openssl-legacy-provider\" dumi dev",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
     "tsc": "tsc --noEmit"
@@ -54,50 +64,49 @@
   ],
   "overrides": {
     "react-resizable": {
-      "react-draggable": "4.4.3"
+      "react-draggable": "<4.5.0"
     }
   },
   "resolutions": {
-    "@types/react": "^17.0.53",
     "mockjs/commander": "9.2.0",
-    "react-draggable": "4.4.3"
+    "react-draggable": "<4.5.0"
   },
   "dependencies": {
-    "@ant-design/icons": "^4.2.2",
+    "@ant-design/icons": "^5.6.1",
     "@babel/runtime": "^7.18.0",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
-    "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "1.1.43",
-    "ahooks": "3.8.4",
-    "antd": "^4.24.8",
+    "@zat-design/utils": "4.0.0-beta.5",
+    "ahooks": "3.9.5",
+    "antd": "^5.28.1",
     "big.js": "^6.2.1",
     "classnames": "^2.3.1",
+    "dayjs": "^1.11.13",
     "lodash": "^4.17.21",
-    "moment": "^2.29.1",
     "rc-resize-observer": "^1.4.0",
     "react-lazyload": "^3.2.1",
     "react-resizable": "^3.0.5",
     "react-svg": "^15.1.7"
   },
   "peerDependencies": {
-    "antd": "^4.24.8",
-    "react": "^17.0.0 || ^18.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0"
+    "antd": "^5.26.4",
+    "react": "^18",
+    "react-dom": "^18",
+    "react-router-dom": "^6.0.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^12.1.1",
     "@commitlint/config-conventional": "^12.1.1",
-    "@testing-library/jest-dom": "6.2.0",
-    "@testing-library/react": "12.1.5",
+    "@testing-library/jest-dom": "^6.0.0",
+    "@testing-library/react": "^14.0.0",
     "@types/classnames": "^2.3.1",
     "@types/jest": "^29.5.11",
     "@types/lodash": "^4.14.171",
-    "@types/react": "^17.0.53",
-    "@types/react-dom": "^17.0.0",
+    "@types/react": "^18.2.0",
+    "@types/react-dom": "^18.2.0",
     "@types/react-lazyload": "^3.2.3",
-    "@types/react-resizable": "^1.7.4",
+    "@types/react-resizable": "^3.0.8",
     "@typescript-eslint/eslint-plugin": "4.0.1",
     "@typescript-eslint/parser": "4.0.1",
     "@umijs/fabric": "^2.8.1",
@@ -105,7 +114,7 @@
     "@umijs/test": "^3.0.5",
     "@zat-design/login-react": "1.0.25",
     "babel-eslint": "10.0.3",
-    "babel-plugin-import": "^1.13.3",
+    "babel-plugin-import": "^1.13.8",
     "babel-plugin-lodash": "^3.3.4",
     "commander": "9.2.0",
     "cross-env": "^7.0.3",
@@ -119,15 +128,18 @@
     "eslint-plugin-react": "7.16.0",
     "eslint-plugin-react-hooks": "2.2.0",
     "eslint-plugin-unused-imports": "^3.0.0",
-    "father": "^4.6.3",
+    "father": "^4.6.1",
     "gh-pages": "^3.0.0",
     "husky": "^4.0.7",
     "jest-canvas-mock": "^2.5.2",
     "lint-staged": "^10.0.0",
     "mini-css-extract-plugin": "^2.9.4",
+    "minimatch": "^10.1.1",
     "mockjs": "^1.0.0",
     "prettier": "^2.5.0",
     "pretty-quick": "^3.1.3",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "react-json-view": "^1.21.3",
     "slash2": "^2.0.0",
     "stylelint": "13.0.0",

package/es/ProEditTable/components/RcTable/VirtualTable.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="react" />
-declare const _default: import("react").MemoExoticComponent<() => import("react/jsx-runtime").JSX.Element>;
-export default _default;

package/es/ProEditTable/components/RcTable/VirtualTable.js

@@ -1,9 +0,0 @@
-import { memo } from 'react';
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
-var VirtualTable = () => {
-  return /*#__PURE__*/_jsx(_Fragment, {
-    children: "\u6682\u65F6\u4E0D\u4F7F\u7528\uFF0C\u53EF\u4EE5\u7B49\u5347\u7EA7antd5\u4F7F\u7528\u5BF9\u5E94\u7684\u80FD\u529B"
-  });
-};
-export default /*#__PURE__*/memo(VirtualTable);

package/es/ProForm/components/combination/ProCombination/index.d.ts

@@ -1,6 +0,0 @@
-import { FC } from 'react';
-import type { ProCombinationType, ChildPropsItemType } from './propsType';
-import './style/index.less';
-export declare const ProCombination: FC<ProCombinationType>;
-export declare const childPropsItemProps: FC<ChildPropsItemType>;
-export default ProCombination;

package/es/ProForm/components/combination/ProCombination/index.js

@@ -1,208 +0,0 @@
-import "antd/es/input/style";
-import _Input from "antd/es/input";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-// @ts-nocheck
-import { useMemo, useState } from 'react';
-import classNames from 'classnames';
-import Container from "../../Container";
-import * as componentMap from "../../index";
-import { isNullValue, weedOutProps } from "../../../utils";
-import { otherKeys } from "../../../propsType";
-import ProForm from "../../../../ProForm";
-import "./style/index.less";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-var useControlled = props => {
-  var value = props.value,
-    onChange = props.onChange;
-  var _useState = useState(value || []),
-    _useState2 = _slicedToArray(_useState, 2),
-    _values = _useState2[0],
-    setValues = _useState2[1];
-  var handleChange = function handleChange() {
-    for (var _len = arguments.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
-      rest[_key] = arguments[_key];
-    }
-    setValues(rest[0]);
-    onChange === null || onChange === void 0 || onChange(...rest);
-  };
-  if ('value' in props) {
-    return [value, function () {
-      for (var _len2 = arguments.length, rest = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        rest[_key2] = arguments[_key2];
-      }
-      return onChange === null || onChange === void 0 ? void 0 : onChange(...rest);
-    }];
-  }
-  return [_values, handleChange];
-};
-export var ProCombination = props => {
-  var _childProps$, _childProps$2;
-  var disabled = props.disabled,
-    _props$childProps = props.childProps,
-    childProps = _props$childProps === void 0 ? [{
-      renderType: 'Input'
-    }, {
-      renderType: 'Input'
-    }] : _props$childProps,
-    separator = props.separator,
-    id = props.id;
-  var _ref = ProForm.useFieldProps() || {},
-    _ref$isView = _ref.isView,
-    isView = _ref$isView === void 0 ? false : _ref$isView,
-    viewEmpty = _ref.viewEmpty,
-    form = _ref.form;
-
-  // 取到对应组件
-  var _ref2 = [componentMap[((_childProps$ = childProps[0]) === null || _childProps$ === void 0 ? void 0 : _childProps$.renderType) || 'Input'], componentMap[((_childProps$2 = childProps[1]) === null || _childProps$2 === void 0 ? void 0 : _childProps$2.renderType) || 'Input']],
-    BeforeCom = _ref2[0],
-    AfterCom = _ref2[1];
-  var _useControlled = useControlled(props),
-    _useControlled2 = _slicedToArray(_useControlled, 2),
-    values = _useControlled2[0],
-    _handleChange = _useControlled2[1];
-  var handleChange = (value, rest, index) => {
-    var _value, _values2, _values3, _childProps$index, _childProps$index$onC;
-    if (((_value = value) === null || _value === void 0 || (_value = _value.target) === null || _value === void 0 ? void 0 : _value.value) !== undefined) {
-      value = value.target.value;
-    }
-    var _values;
-    if (index === 0) {
-      _values = [value, values === null || values === void 0 ? void 0 : values[1]];
-    }
-    if (index === 1) {
-      _values = [values === null || values === void 0 ? void 0 : values[0], value];
-    }
-    // 如果两个值都不存在 则values置为[] 防止必填校验无效
-    if (isNullValue((_values2 = _values) === null || _values2 === void 0 ? void 0 : _values2[0]) && isNullValue((_values3 = _values) === null || _values3 === void 0 ? void 0 : _values3[1])) {
-      _values = [];
-    }
-    _handleChange(_values, rest === null || rest === void 0 ? void 0 : rest[0], form);
-    (_childProps$index = childProps[index]) === null || _childProps$index === void 0 || (_childProps$index$onC = _childProps$index.onChange) === null || _childProps$index$onC === void 0 || _childProps$index$onC.call(_childProps$index, value, rest === null || rest === void 0 ? void 0 : rest[0], form); // 支持子组件分别传入onChange
-  };
-  var className = classNames({
-    'pro-combination': true,
-    'pro-combination-view': isView
-  });
-  var addedOtherKeys = useMemo(() => {
-    return [...otherKeys, 'renderType'];
-  }, [otherKeys]);
-  // 剔除其他参数
-  var _useMemo = useMemo(() => {
-      return weedOutProps(childProps[0] || {}, addedOtherKeys);
-    }, [childProps[0]]),
-    _useMemo2 = _slicedToArray(_useMemo, 2),
-    beforeProps = _useMemo2[0],
-    beforeOtherProps = _useMemo2[1];
-  var _useMemo3 = useMemo(() => {
-      return weedOutProps(childProps[1] || {}, addedOtherKeys);
-    }, [childProps[1]]),
-    _useMemo4 = _slicedToArray(_useMemo3, 2),
-    afterProps = _useMemo4[0],
-    afterOtherProps = _useMemo4[1];
-
-  // 查看模式
-  if (isView) {
-    if (!values || !Array.isArray(values)) {
-      return viewEmpty;
-    }
-    var childData = childProps;
-    if (!childData || Array.isArray(childData) && !childData.length) {
-      childData.push({
-        renderType: 'Input'
-      });
-      childData.push({
-        renderType: 'Input'
-      });
-    }
-    if (childData.length === 1) {
-      childData.push({
-        renderType: 'Input'
-      });
-    }
-
-    // 第一个值
-    var oneValue = '';
-    // 第二个值
-    var twoValue = '';
-    childData.forEach((item, index) => {
-      if (index === 0 && values !== null && values !== void 0 && values[0]) {
-        if (['ProEnum', 'ProSelect', 'Select'].includes(item.renderType)) {
-          oneValue = /*#__PURE__*/_jsx(BeforeCom, _objectSpread(_objectSpread({}, beforeProps), {}, {
-            value: values === null || values === void 0 ? void 0 : values[0],
-            otherProps: _objectSpread(_objectSpread({}, beforeOtherProps), {}, {
-              isView
-            })
-          }));
-        } else {
-          oneValue = values === null || values === void 0 ? void 0 : values[0];
-        }
-      }
-      if (index === 1 && values !== null && values !== void 0 && values[1]) {
-        if (['ProEnum', 'ProSelect', 'Select'].includes(item.renderType)) {
-          twoValue = /*#__PURE__*/_jsx(AfterCom, _objectSpread(_objectSpread({}, afterProps), {}, {
-            value: values === null || values === void 0 ? void 0 : values[1],
-            otherProps: _objectSpread(_objectSpread({}, afterOtherProps), {}, {
-              isView
-            })
-          }));
-        } else {
-          twoValue = values === null || values === void 0 ? void 0 : values[1];
-        }
-      }
-    });
-    return /*#__PURE__*/_jsx(Container, {
-      viewEmpty: viewEmpty,
-      children: /*#__PURE__*/_jsx(_Space, {
-        size: 8,
-        children: !oneValue && !twoValue ? viewEmpty : /*#__PURE__*/_jsxs(_Fragment, {
-          children: [oneValue, separator, twoValue]
-        })
-      })
-    });
-  }
-  return /*#__PURE__*/_jsxs(_Input.Group, {
-    compact: true,
-    className: className,
-    id: id,
-    children: [/*#__PURE__*/_jsx(BeforeCom, _objectSpread(_objectSpread({
-      disabled: disabled
-    }, beforeProps), {}, {
-      value: values === null || values === void 0 ? void 0 : values[0],
-      onChange: function onChange(value) {
-        for (var _len3 = arguments.length, rest = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
-          rest[_key3 - 1] = arguments[_key3];
-        }
-        return handleChange(value, rest, 0);
-      },
-      otherProps: beforeOtherProps
-    })), isView ? separator : separator && /*#__PURE__*/_jsx(_Button, {
-      disabled: true,
-      children: separator
-    }), /*#__PURE__*/_jsx(AfterCom, _objectSpread(_objectSpread({
-      disabled: disabled
-    }, afterProps), {}, {
-      value: values === null || values === void 0 ? void 0 : values[1],
-      onChange: function onChange(value) {
-        for (var _len4 = arguments.length, rest = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-          rest[_key4 - 1] = arguments[_key4];
-        }
-        return handleChange(value, rest, 1);
-      },
-      otherProps: afterOtherProps
-    }))]
-  });
-};
-ProCombination.defaultProps = {
-  disabled: false
-};
-export var childPropsItemProps = props => {
-  return null;
-};
-export default ProCombination;