@zat-design/sisyphus-react 4.2.0-beta.2 → 4.2.0-beta.4

package/es/ProForm/components/base/TextArea/index.js

@@ -1,13 +1,5 @@
-var _excluded = ["placeholder", "otherProps", "className", "tooltip"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import _omit from "lodash/omit";
 import { Input } from 'antd';
-import { omit } from 'lodash';
 import React from 'react';
 import classnames from 'classnames';
 import { useProConfig } from "../../../../ProConfigProvider";
@@ -16,21 +8,24 @@ import ProForm from "../../../../ProForm";
 import Container from "../../Container";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-var TextArea = Input.TextArea;
-var TextAreaDef = props => {
-  var _props$style;
-  var placeholder = props.placeholder,
-    otherProps = props.otherProps,
-    className = props.className,
-    _props$tooltip = props.tooltip,
-    tooltip = _props$tooltip === void 0 ? true : _props$tooltip,
-    rest = _objectWithoutProperties(props, _excluded);
-  var _ref = ProForm.useFieldProps() || {},
-    label = _ref.label,
-    isViewCon = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
-  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  var initialConfig = useProConfig('TextArea');
+const {
+  TextArea
+} = Input;
+const TextAreaDef = props => {
+  const {
+    placeholder,
+    otherProps,
+    className,
+    tooltip = true,
+    ...rest
+  } = props;
+  const {
+    label,
+    isView: isViewCon,
+    viewEmpty
+  } = ProForm.useFieldProps() || {};
+  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
+  const initialConfig = useProConfig('TextArea');
   if (isView) {
     return /*#__PURE__*/_jsx(Container, {
       nowrap: false,
@@ -39,18 +34,19 @@ var TextAreaDef = props => {
       children: rest.value
     });
   }
-  var _className = classnames({
+  const _className = classnames({
     'pro-textarea': true,
     'pro-textarea-view': isView,
     [className]: className
   });
-  return /*#__PURE__*/_jsx(TextArea, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(TextArea, {
     showCount: true,
     autoComplete: "off",
     placeholder: placeholder || `${locale.ProForm.inputPlaceholder}${label || ''}`,
-    autoSize: !(props !== null && props !== void 0 && (_props$style = props.style) !== null && _props$style !== void 0 && _props$style.height)
-  }, omit(initialConfig, ['trim', 'upperCase'])), rest), {}, {
+    autoSize: !props?.style?.height,
+    ..._omit(initialConfig, ['trim', 'upperCase']),
+    ...rest,
     className: _className
-  }));
+  });
 };
 export default TextAreaDef;

package/es/ProForm/components/base/TimePicker/index.js

@@ -1,11 +1,3 @@
-var _excluded = ["format", "onChange", "value", "otherProps"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React from 'react';
 import { DatePicker } from 'antd';
 import dayjs from 'dayjs';
@@ -13,22 +5,25 @@ import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
 import ProForm from "../../../../ProForm";
 import { jsx as _jsx } from "react/jsx-runtime";
-var AntTimePicker = DatePicker.TimePicker;
-var TimePicker = props => {
-  var _props$format = props.format,
-    format = _props$format === void 0 ? 'HH:mm:ss' : _props$format,
-    onChange = props.onChange,
-    value = props.value,
-    otherProps = props.otherProps,
-    rest = _objectWithoutProperties(props, _excluded);
-  var _ref = ProForm.useFieldProps() || {},
-    isViewCon = _ref.isView,
-    viewEmpty = _ref.viewEmpty,
-    _ref$valueType = _ref.valueType,
-    valueType = _ref$valueType === void 0 ? 'dateTime' : _ref$valueType;
-  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  var initialConfig = useProConfig('AntTimePicker');
-  var handleChange = value => {
+const {
+  TimePicker: AntTimePicker
+} = DatePicker;
+const TimePicker = props => {
+  const {
+    format = 'HH:mm:ss',
+    onChange,
+    value,
+    otherProps,
+    ...rest
+  } = props;
+  const {
+    isView: isViewCon,
+    viewEmpty,
+    valueType = 'dateTime'
+  } = ProForm.useFieldProps() || {};
+  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
+  const initialConfig = useProConfig('AntTimePicker');
+  const handleChange = value => {
     if (valueType === 'dateTime') {
       onChange && onChange(value ? dayjs(value).format(format) : undefined);
     }
@@ -39,11 +34,12 @@ var TimePicker = props => {
       children: value
     });
   }
-  return /*#__PURE__*/_jsx(AntTimePicker, _objectSpread(_objectSpread(_objectSpread({
-    value: value ? dayjs(value, format) : undefined
-  }, initialConfig), rest), {}, {
+  return /*#__PURE__*/_jsx(AntTimePicker, {
+    value: value ? dayjs(value, format) : undefined,
+    ...initialConfig,
+    ...rest,
     format: format,
     onChange: handleChange
-  }));
+  });
 };
 export default TimePicker;

package/es/ProForm/components/base/TimePicker/style/index.less

@@ -1,4 +1,3 @@
-
 /* 适配antd 5.x，不再导入antd样式 */
 
 .ant-picker-time {

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

@@ -1,56 +1,57 @@
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import _omit from "lodash/omit";
 import React, { useMemo } from 'react';
-import { omit } from 'lodash';
 import classnames from 'classnames';
 import RenderFields from "../../render/RenderFields";
 import ProCollapse from "../../../../ProLayout/components/ProCollapse";
 import ProForm from "../../../../ProForm";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-var Container = props => {
-  var children = props.children,
-    className = props.className,
-    container = props.container,
-    show = props.show,
-    clearNotShow = props.clearNotShow,
-    diffConfig = props.diffConfig,
-    otherProps = props.otherProps;
-  var _ref = ProForm.useFieldProps() || {},
-    type = _ref.type,
-    form = _ref.form,
-    required = _ref.required,
-    disabled = _ref.disabled;
-  var _className = classnames({
+const Container = props => {
+  const {
+    children,
+    className,
+    container,
+    show,
+    clearNotShow,
+    diffConfig,
+    otherProps
+  } = props;
+  const {
+    type,
+    form,
+    required,
+    disabled
+  } = ProForm.useFieldProps() || {};
+  const _className = classnames({
     'pro-container': true,
     'pro-container-diy': type === 'Container',
-    'pro-container-empty': !(children !== null && children !== void 0 && children.length),
+    'pro-container-empty': !children?.length,
     [`${className}`]: className
   });
-  var _children = useMemo(() => {
-    var result = children === null || children === void 0 ? void 0 : children.map(item => {
-      return _objectSpread({
+  const _children = useMemo(() => {
+    const result = children?.map(item => {
+      return {
         clearNotShow,
         show,
         required,
-        disabled
-      }, item);
+        disabled,
+        ...item
+      };
     });
     return result;
   }, [children]);
-  var childRender = () => {
-    var child = /*#__PURE__*/_jsx(RenderFields, _objectSpread({
+  const childRender = () => {
+    const child = /*#__PURE__*/_jsx(RenderFields, {
       columns: _children,
       form: form,
-      diffConfig: diffConfig
-    }, otherProps));
+      diffConfig: diffConfig,
+      ...otherProps
+    });
     if (type === 'ProCollapse') {
-      var hasFieldChildren = Array.isArray(children) && children.length > 0;
-      return /*#__PURE__*/_jsx(ProCollapse, _objectSpread(_objectSpread({}, omit(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className'])), {}, {
+      const hasFieldChildren = Array.isArray(children) && children.length > 0;
+      return /*#__PURE__*/_jsx(ProCollapse, {
+        ..._omit(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className']),
         children: hasFieldChildren ? child : null
-      }));
+      });
     }
     if (type === 'Container') {
       return /*#__PURE__*/_jsxs(_Fragment, {

package/es/ProForm/components/combination/Container/style/index.less

@@ -1,42 +1,41 @@
 @import '../../../../../style/variables.less';
 
 .pro-container {
-  &.pro-container-empty{
-    .@{ant-prefix}-collapse-content{
+  &.pro-container-empty {
+    .@{ant-prefix}-collapse-content {
       display: none;
     }
   }
   &.pro-container-diy {
     .pro-container-content {
-      display      : flex;
-      flex-flow    : row wrap;
-      min-width    : 0;
-      margin-left  : -12px;
-      margin-right : -12px;
+      display: flex;
+      flex-flow: row wrap;
+      min-width: 0;
+      margin-left: -12px;
+      margin-right: -12px;
       margin-bottom: -22px;
 
-      &>.@{ant-prefix}-col {
-        padding-left : 12px;
+      & > .@{ant-prefix}-col {
+        padding-left: 12px;
         padding-right: 12px;
       }
     }
-
   }
 
   .pro-collapse-content {
-    display         : flex;
-    flex-flow       : row wrap;
-    min-width       : 0;
-    margin-left     : -12px;
-    margin-right    : -12px;
+    display: flex;
+    flex-flow: row wrap;
+    min-width: 0;
+    margin-left: -12px;
+    margin-right: -12px;
 
-    &>.@{ant-prefix}-col {
-      padding-left : 12px;
+    & > .@{ant-prefix}-col {
+      padding-left: 12px;
       padding-right: 12px;
     }
   }
-  .pro-collapse{
-    .@{ant-prefix}-collapse-panel{
+  .pro-collapse {
+    .@{ant-prefix}-collapse-panel {
       background: #fff;
     }
   }