@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

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

@@ -1,114 +1,129 @@
-"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
+// src/ProForm/components/combination/Group/index.tsx
+var Group_exports = {};
+__export(Group_exports, {
+  default: () => Group_default
 });
-exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _react = _interopRequireDefault(require("react"));
-var _classnames2 = _interopRequireDefault(require("classnames"));
-var _utils = require("./utils");
-var _hooks = require("./hooks");
-var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
-var _ComRender = _interopRequireDefault(require("./component/ComRender"));
-/**
- * 1. 外层过滤FormItem相关属性, 但是子元素上的 required [disabled] [show] rules [fieldProps] [component] 需要取到并
- * 2.
- *
- * render内部能力 show, component, value, onChange, disabled, clearNotShow, fieldProps
- */
-var Group = function Group(props) {
-  var children = props.children,
-    className = props.className,
-    _props$space = props.space,
-    space = _props$space === void 0 ? {
+module.exports = __toCommonJS(Group_exports);
+var import_antd = require("antd");
+var import_react = __toESM(require("react"));
+var import_lodash = require("lodash");
+var import_classnames = __toESM(require("classnames"));
+var import_utils = require("./utils");
+var import_hooks = require("./hooks");
+var import_ProForm = __toESM(require("../../../../ProForm"));
+var import_ComRender = __toESM(require("./component/ComRender"));
+var Group = (props) => {
+  const {
+    children,
+    className,
+    space = {
       size: 12
-    } : _props$space,
-    value = props.value,
-    onChange = props.onChange,
-    otherProps = props.otherProps,
-    id = props.id,
-    isParentView = props.isView,
-    formDisabled = props.disabled;
-  var _ref = otherProps || {},
-    desensitizationKey = _ref.desensitizationKey;
-  var contextProps = _ProForm.default.useFieldProps() || {};
-  var names = contextProps.names,
-    name = contextProps.name,
-    form = contextProps.form,
-    namePath = contextProps.namePath,
-    index = contextProps.index,
-    isView = contextProps.isView;
-  var _option = _react.default.useRef([]);
-  // 组合onChange
-  var handleChange = function handleChange(value, option, index) {
-    var _value = props.value ? (0, _toConsumableArray2.default)(props.value) : [];
-    _value[index] = value;
-    _option.current[index] = option;
+    },
+    value,
+    onChange,
+    otherProps,
+    id,
+    isView: isParentView,
+    disabled: formDisabled
+  } = props;
+  const { desensitizationKey } = otherProps || {};
+  const contextProps = import_ProForm.default.useFieldProps() || {};
+  const { names, name, form, namePath, index, isView } = contextProps;
+  const _option = import_react.default.useRef([]);
+  const handleChange = (value2, option, index2) => {
+    const _value = props.value ? [...props.value] : [];
+    _value[index2] = value2;
+    _option.current[index2] = option;
     onChange(_value, _option.current);
   };
-  var columnsProps = (0, _hooks.useTransformColumns)({
+  const columnsProps = (0, import_hooks.useTransformColumns)({
     columns: children,
-    name: name,
-    names: names,
+    name,
+    names,
     onChange: handleChange,
-    namePath: namePath,
-    form: form,
-    index: index,
-    value: value,
+    namePath,
+    form,
+    index,
+    value,
     groupProps: props,
-    formDisabled: formDisabled,
-    desensitizationKey: desensitizationKey
+    formDisabled,
+    desensitizationKey
   });
-  var columns = (0, _utils.insertSeparator)(columnsProps, space);
-  var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
-    'pro-group': true,
-    'pro-group-diy-width': columns.some(function (item) {
-      var _item$fieldProps, _item$fieldProps$styl;
-      return item === null || item === void 0 ? void 0 : (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : (_item$fieldProps$styl = _item$fieldProps.style) === null || _item$fieldProps$styl === void 0 ? void 0 : _item$fieldProps$styl.width;
+  const columns = (0, import_utils.insertSeparator)(columnsProps, space);
+  const _className = (0, import_classnames.default)({
+    "pro-group": true,
+    "pro-group-diy-width": columns.some((item) => {
+      var _a, _b;
+      return (_b = (_a = item == null ? void 0 : item.fieldProps) == null ? void 0 : _a.style) == null ? void 0 : _b.width;
     }),
-    'pro-group-width-auto': columns.some(function (item) {
-      return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
-    })
-  }, "".concat(className), className));
-  return (0, _jsxRuntime.jsx)("div", {
-    className: _className,
-    id: id,
-    children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? (0, _jsxRuntime.jsx)(_space.default.Compact, {
-      children: columns.map(function (column, index) {
-        column.otherProps = otherProps;
-        // 自定义间隔移除对应参数
-        if (column === null || column === void 0 ? void 0 : column.separator) {
-          delete column.separator;
-          delete column.otherProps;
-        }
-        return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)({
-          contextProps: contextProps,
-          isView: isParentView || isView
-        }, column), column.name || index);
-      })
-    }) : (0, _jsxRuntime.jsx)(_space.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      align: "start"
-    }, (0, _omit2.default)(space, ['separator', 'compact'])), {}, {
-      children: columns.map(function (column, index) {
-        column.otherProps = otherProps;
-        if (column === null || column === void 0 ? void 0 : column.separator) {
-          delete column.separator;
-          delete column.otherProps;
-        }
-        return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)({
-          contextProps: contextProps,
-          isView: isParentView || isView
-        }, column), column.name || index);
-      })
-    }))
+    "pro-group-width-auto": columns.some((item) => {
+      return ["Radio", "Checkbox", "Switch"].includes(item.type);
+    }),
+    [`${className}`]: className
   });
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: _className, id }, space.compact || (space == null ? void 0 : space.separator) ? /* @__PURE__ */ import_react.default.createElement(import_antd.Space.Compact, null, columns.map((column, index2) => {
+    column.otherProps = otherProps;
+    if (column == null ? void 0 : column.separator) {
+      delete column.separator;
+      delete column.otherProps;
+    }
+    return /* @__PURE__ */ import_react.default.createElement(
+      import_ComRender.default,
+      {
+        key: column.name || index2,
+        contextProps,
+        isView: isParentView || isView,
+        ...column
+      }
+    );
+  })) : /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { align: "start", ...(0, import_lodash.omit)(space, ["separator", "compact"]) }, columns.map((column, index2) => {
+    column.otherProps = otherProps;
+    if (column == null ? void 0 : column.separator) {
+      delete column.separator;
+      delete column.otherProps;
+    }
+    return /* @__PURE__ */ import_react.default.createElement(
+      import_ComRender.default,
+      {
+        key: column.name || index2,
+        contextProps,
+        isView: isParentView || isView,
+        ...column
+      }
+    );
+  })));
 };
-var _default = exports.default = Group;
+var Group_default = (0, import_react.memo)(Group, (prevProps, nextProps) => {
+  if (!(0, import_lodash.isEqual)(prevProps == null ? void 0 : prevProps.value, nextProps == null ? void 0 : nextProps.value) || (prevProps == null ? void 0 : prevProps.disabled) !== (nextProps == null ? void 0 : nextProps.disabled) || !(0, import_lodash.isEqual)(prevProps == null ? void 0 : prevProps.children, nextProps == null ? void 0 : nextProps.children)) {
+    return false;
+  }
+  return true;
+});

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

@@ -1,5 +1,17 @@
-"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+// src/ProForm/components/combination/Group/propsType.ts
+var propsType_exports = {};
+module.exports = __toCommonJS(propsType_exports);

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

@@ -1,28 +1,9 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
-
-.border-radius(@start-end: 0, @end-end: 0, @start-start: 0, @end-start: 0) {
-  border-start-end-radius: @start-end;
-  border-end-end-radius: @end-end;
-  border-start-start-radius: @start-start;
-  border-end-start-radius: @end-start;
-}
-
-.start-radius() {
-  border-start-start-radius: 4px;
-  border-end-start-radius: 4px;
-}
-
-.end-radius() {
-  border-start-end-radius: 4px;
-  border-end-end-radius: 4px;
-}
-
 .pro-group {
-  width: unset !important;
   display: flex;
+  width: unset !important;
 
-  &.pro-group-diy-width, &.pro-group-width-auto {
+  &.pro-group-diy-width,
+  &.pro-group-width-auto {
     .@{ant-prefix}-space .@{ant-prefix}-space-item {
       width: auto;
 
@@ -53,94 +34,33 @@
     align-items: center;
     width: 100%;
 
-    &>.@{ant-prefix}-input-number{
-      &:first-child{
-        border-end-end-radius: 0;
-        border-start-end-radius: 0;
-      }
-      &:last-child{
-        border-start-start-radius: 0;
-        border-end-start-radius: 0;
-        margin-left: -1px;
-      }
-    }
-
     .@{ant-prefix}-form-item {
       margin-bottom: 0 !important;
     }
 
     .group-separator {
-      margin-inline-end: -2px;
-      margin-inline-start: -1px;
-      border-start-start-radius: 0;
-      border-end-start-radius: 0;
       padding: 0 12px;
       background-color: #fff;
       cursor: default;
+      margin-inline-end: -2px;
+      margin-inline-start: -1px;
     }
     .pro-modal-select {
       margin-left: -1px;
-      .@{ant-prefix}-input{
-        border-start-start-radius: 0;
-        border-end-start-radius: 0;
-      }
     }
 
     // 定制内敛合并样式
     .@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select {
-      .border-radius(0, 0, 0, 0);
-
       &:nth-child(n + 2) {
         margin-inline-start: -1px;
       }
-
-      &:first-child {
-        .start-radius();
-      }
-
-      &:last-child {
-        .end-radius();
-      }
-    }
-
-    .pro-select {
-      .@{ant-prefix}-select .@{ant-prefix}-select-selector{
-        border-radius: 0 !important;
-      }
-      &:first-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
-        border-start-start-radius: 4px !important;
-        border-end-start-radius: 4px !important;
-      }
-
-      &:last-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
-        border-start-end-radius: 4px  !important;
-        border-end-end-radius: 4px!important;
-      }
-    }
-
-    .@{ant-prefix}-select {
-      .@{ant-prefix}-select-selector {
-        .border-radius(0, 0, 0, 0);
-      }
-
-      &:first-child {
-        .@{ant-prefix}-select-selector {
-          .start-radius();
-        }
-      }
-
-      &:last-child {
-        .@{ant-prefix}-select-selector {
-          .end-radius();
-        }
-      }
     }
 
     // 报错样式定制
     .@{ant-prefix}-input-affix-wrapper-status-error ~ .group-separator {
-      color: var(--ant-error-color);
-      border-color: var(--ant-error-color);
+      color: #ff4d4f;
+      border-color: #ff4d4f;
     }
   }
 }

package/lib/ProForm/components/combination/Group/utils.d.ts

@@ -37,7 +37,7 @@ interface Params {
 export declare const getReactiveProps: (params: Params) => {
     disabled: boolean;
     show: boolean;
-    component: any;
+    component: import("react").ReactNode;
     fieldProps: boolean;
     desensitization: [number, number];
 };