@pointcloud/pcloud-components 0.1.17 → 0.1.18

package/dist/esm/DForm/DItem/itemType.d.ts

@@ -1,5 +1,5 @@
 import { HTMLAttributes, ReactNode } from 'react';
-import { InputProps, InputNumberProps, AutoCompleteProps, CascaderProps, SelectProps, TreeSelectProps, DatePickerProps, TimePickerProps, MentionProps, CheckboxProps, RadioProps, RateProps, SliderSingleProps, SwitchProps, TransferProps, UploadProps, ButtonProps, DividerProps, FormItemProps, RadioGroupProps } from 'antd';
+import { InputProps, InputNumberProps, AutoCompleteProps, CascaderProps, SelectProps, TreeSelectProps, DatePickerProps, TimePickerProps, MentionProps, CheckboxProps, RadioProps, RateProps, SliderSingleProps, SwitchProps, TransferProps, UploadProps, ButtonProps, DividerProps, FormItemProps, RadioGroupProps, ColProps } from 'antd';
 import { PasswordProps, TextAreaProps } from 'antd/lib/input';
 import { RangePickerProps } from 'antd/lib/date-picker';
 import { CheckboxGroupProps } from 'antd/lib/checkbox';
@@ -14,7 +14,9 @@ export declare type DItemBaseProps = {
     /** name标签文本,同antd Form.Item的name */
     name?: string;
     /** Form.Item 的其他属性 */
-    formItemProps?: FormItemProps;
+    formItemProps?: FormItemProps & {
+        grid?: Omit<ColProps, 'prefixCls'>;
+    };
 };
 /** 自定义渲染的DItem */
 declare type CustomItemProps = DItemBaseProps & HTMLAttributes<HTMLElement> & {

package/dist/esm/DForm/DItem/itemsRender.d.ts

@@ -33,7 +33,7 @@ declare const renderMap: {
     rate: (props: RateProps, formItemProps: FormItemProps) => JSX.Element;
     slider: (props: SliderSingleProps, formItemProps: FormItemProps) => JSX.Element;
     switch: (props: SwitchProps, formItemProps: FormItemProps) => JSX.Element;
-    transfer: (props: TransferProps<any>, formItemProps: FormItemProps, render: TransferProps<any>['render']) => JSX.Element;
+    transfer: (props: TransferProps<any>, formItemProps: FormItemProps, label: DItemBaseProps['label'], render: TransferProps<any>['render']) => JSX.Element;
     upload: (props: UploadProps, formItemProps: FormItemProps, label: DItemBaseProps['label'], render: () => void, children: UploadProps['children']) => JSX.Element;
     dUpload: (props: DUploadProps, formItemProps: FormItemProps, render: (props: any) => ReactNode, children: DUploadProps['children']) => JSX.Element;
     button: (props: ButtonProps, formItemProps: FormItemProps, label: DItemBaseProps['label']) => JSX.Element;

package/dist/esm/DForm/DItem/itemsRender.js

@@ -165,7 +165,7 @@ var renderMap = {
       children: /*#__PURE__*/_jsx(Switch, _objectSpread({}, props))
     }));
   },
-  transfer: function transfer(props, formItemProps, render) {
+  transfer: function transfer(props, formItemProps, label, render) {
     return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, formItemProps), {}, {
       children: /*#__PURE__*/_jsx(Transfer, _objectSpread({
         render: render

package/dist/esm/DForm/index.d.ts

@@ -9,8 +9,8 @@ declare type InternalFormProps = {
     defaultItemProps?: DItemProps;
     /** children 方式添加表单项,如果同时设置了 items，则 children 在 items 下面 */
     children?: ReactNode;
-    /** 布局方式 新增了行内垂直布局方式inlineVertical */
-    layout?: 'inline' | 'horizontal' | 'vertical' | 'inlineVertical';
+    /** 布局方式 新增了行内垂直布局方式inlineVertical 和 grid栅格布局 */
+    layout?: 'inline' | 'horizontal' | 'vertical' | 'inlineVertical' | 'grid';
 };
 declare type DFormProps = Omit<FormProps, 'children' | 'layout'> & InternalFormProps;
 declare type DFormRefProps = {

package/dist/esm/DForm/index.js

@@ -11,7 +11,7 @@ var _excluded = ["className", "defaultItemProps", "items", "children", "layout",
  */
 
 import React, { forwardRef, useContext, useState, useEffect, useImperativeHandle } from 'react';
-import { Form } from 'antd';
+import { Form, Row, Col } from 'antd';
 import { ConfigContext } from "../ConfigProvider";
 import helper from "./helper";
 import DItem from "./DItem";
@@ -19,13 +19,26 @@ import "./index.less";
 
 // eslint-disable-next-line no-unused-vars
 import { jsx as _jsx } from "react/jsx-runtime";
-function getChildren(items, children, _defaultItemProps) {
+function getChildren(items, children, _defaultItemProps, layout) {
   var list = [];
   if (items instanceof Array && items.length > 0) {
-    list = items.map(function (item, index) {
-      var _item = helper.merge(_defaultItemProps, item);
-      return /*#__PURE__*/_jsx(DItem, _objectSpread({}, _item), (item === null || item === void 0 ? void 0 : item.name) || index);
-    });
+    if (layout === 'grid') {
+      list.push( /*#__PURE__*/_jsx(Row, {
+        children: items.map(function (item, index) {
+          var _item$formItemProps;
+          var _item = helper.merge(_defaultItemProps, item);
+          var _gridProps = (_item === null || _item === void 0 ? void 0 : (_item$formItemProps = _item.formItemProps) === null || _item$formItemProps === void 0 ? void 0 : _item$formItemProps.grid) || {};
+          return /*#__PURE__*/_jsx(Col, _objectSpread(_objectSpread({}, _gridProps), {}, {
+            children: /*#__PURE__*/_jsx(DItem, _objectSpread({}, _item))
+          }), (item === null || item === void 0 ? void 0 : item.name) || index);
+        })
+      }));
+    } else {
+      list = items.map(function (item, index) {
+        var _item = helper.merge(_defaultItemProps, item);
+        return /*#__PURE__*/_jsx(DItem, _objectSpread({}, _item), (item === null || item === void 0 ? void 0 : item.name) || index);
+      });
+    }
   }
   if (children) {
     var childrenList = children instanceof Array ? children : [children];
@@ -44,34 +57,35 @@ function InternalForm(props, ref) {
     defaultItemProps = props.defaultItemProps,
     items = props.items,
     children = props.children,
-    layout = props.layout,
+    _props$layout = props.layout,
+    layout = _props$layout === void 0 ? 'vertical' : _props$layout,
     _props$autoComplete = props.autoComplete,
     autoComplete = _props$autoComplete === void 0 ? 'off' : _props$autoComplete,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useContext = useContext(ConfigContext),
     getPrefixCls = _useContext.getPrefixCls;
-  var _className = "".concat(getPrefixCls('form'), " ").concat(className, " ").concat(layout === 'inlineVertical' ? 'inlineVertical' : '');
-  var _layout = layout === 'inlineVertical' ? 'inline' : layout;
-  var _useState = useState(getChildren(items, children, defaultItemProps)),
+  var _className = "".concat(getPrefixCls('form'), " ").concat(className, " ").concat(['inlineVertical', 'grid'].includes(layout) ? 'inlineVertical' : '');
+  var _layout = ['inlineVertical', 'grid'].includes(layout) ? 'inline' : layout;
+  var _useState = useState(getChildren(items, children, defaultItemProps, layout)),
     _useState2 = _slicedToArray(_useState, 2),
     itemChildren = _useState2[0],
     setItemChildren = _useState2[1];
   useEffect(function () {
-    setItemChildren(getChildren(items, children, defaultItemProps));
-  }, [items, children, defaultItemProps]);
+    setItemChildren(getChildren(items, children, defaultItemProps, layout));
+  }, [items, children, defaultItemProps, layout]);
   useImperativeHandle(ref, function () {
     return {
       setItems: function setItems(value) {
         if (value instanceof Array) {
-          setItemChildren(getChildren(value, null, defaultItemProps));
+          setItemChildren(getChildren(value, null, defaultItemProps, layout));
         } else if (typeof value === 'function') {
           var result = value(items || []);
           if ('then' in result) {
             result.then(function (list) {
-              setItemChildren(getChildren(list, null, defaultItemProps));
+              setItemChildren(getChildren(list, null, defaultItemProps, layout));
             });
           } else {
-            setItemChildren(getChildren(result, null, defaultItemProps));
+            setItemChildren(getChildren(result, null, defaultItemProps, layout));
           }
         }
       }

package/dist/esm/LabelValue/index.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
-import { LabelValueProps } from './interface';
+import { LabelValueProps as ILabelValueProps } from './interface';
 import './styles/index.less';
-declare function LabelValue({ label, value, emptyValue, className, noWrap, noColon }: LabelValueProps): JSX.Element;
+export declare type LabelValueProps = ILabelValueProps;
+declare function LabelValue({ label, value, emptyValue, className, noWrap, noColon }: ILabelValueProps): JSX.Element;
 declare namespace LabelValue {
     var defaultProps: {
         className: string;

package/dist/esm/LabelValue/interface.d.ts

@@ -6,7 +6,7 @@ export interface LabelValueProps {
     /**
      * @description 文字标签值
      */
-    value?: string | undefined | null;
+    value?: string | undefined;
     /**
      * @description 文字标签值为空时的值
      * @default -

package/dist/esm/index.d.ts

@@ -1,4 +1,5 @@
 export { default as LabelValue } from './LabelValue';
+export type { LabelValueProps } from './LabelValue';
 export { default as AdvancedFilter } from './AdvancedFilter';
 export { default as AuthComponent } from './AuthComponent';
 export type { FProps } from './AdvancedFilter/interface';