@yuntijs/ui 1.0.0-beta.109 → 1.0.0-beta.110

package/es/Form/collapse-list/FieldsWatcher.d.ts

@@ -0,0 +1,7 @@
+import { type FormItemProps } from 'antd';
+import React from 'react';
+import { FormCollapseListOperation } from './hooks';
+export interface FormCollapseListFieldsWatcherProps extends Pick<FormCollapseListOperation, 'update'> {
+    name: FormItemProps['name'];
+}
+export declare const FormCollapseListFieldsWatcher: React.FC<FormCollapseListFieldsWatcherProps>;

package/es/Form/collapse-list/FieldsWatcher.js

@@ -0,0 +1,19 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { Form } from 'antd';
+import { memo, useEffect, useState } from 'react';
+export var FormCollapseListFieldsWatcher = /*#__PURE__*/memo(function (_ref) {
+  var name = _ref.name,
+    update = _ref.update;
+  var rows = Form.useWatch(name);
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    preRowsCount = _useState2[0],
+    setPreRowsCount = _useState2[1];
+  useEffect(function () {
+    if ((rows === null || rows === void 0 ? void 0 : rows.length) !== preRowsCount) {
+      update();
+      setPreRowsCount(rows === null || rows === void 0 ? void 0 : rows.length);
+    }
+  }, [preRowsCount, rows, update]);
+  return null;
+});

package/es/Form/collapse-list/hooks.d.ts

@@ -1,11 +1,11 @@
-import { type FormListOperation } from 'antd';
+import { type FormItemProps, type FormListOperation } from 'antd';
 import React from 'react';
 import type { FormCollapseListColumn } from '.';
 import { ListFieldValue } from './utils';
 export interface FormCollapseListOperation extends FormListOperation {
     update: () => void;
 }
-export declare const useFormCollapseListHooks: (name: string, childrenColumnName: string, columns: FormCollapseListColumn[]) => {
+export declare const useFormCollapseListHooks: (name: FormItemProps['name'], childrenColumnName: string, columns: FormCollapseListColumn[]) => {
     values: ListFieldValue[];
     updateValues: () => void;
     expandedRowKeys: readonly React.Key[];

package/es/Form/collapse-list/index.d.ts

@@ -7,7 +7,7 @@ import { FieldPath } from './utils';
 interface FormCollapseListColumnItem extends Omit<FormItemProps, 'dependencies' | 'rules' | 'tooltip' | 'labelAlign' | 'labelCol' | 'colon' | 'children'> {
     render?: (fieldName: number, index: number, operation: FormCollapseListOperation, 
     /** 当前 item 的 path */
-    fieldPath: FieldPath) => React.ReactElement;
+    fieldPath: FieldPath) => React.ReactNode;
     rules?: FormItemProps['rules'] | ((parentFieldPath: FieldPath, index: number) => FormItemProps['rules']);
     dependencies?: FormItemProps['dependencies'] | ((parentFieldPath: FieldPath, index: number) => FormItemProps['dependencies']);
 }

package/es/Form/collapse-list/index.js

@@ -2,6 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 var _excluded = ["collapsible", "extra", "expandIcon", "icon", "title", "variant", "defaultActive", "empty", "columns", "disabled", "readOnly", "addOneFieldDefault", "disableRemoveWhenOneField", "maxFileds", "name", "addParams", "className", "onRemove", "fieldRemoveButton", "style", "defaultExpandAllRows", "indentSize", "childrenColumnName", "rowHoverable"],
   _excluded2 = ["label", "name", "render", "dependencies", "rules", "align", "ellipsis", "fixed", "responsive", "shouldCellUpdate", "width", "className"],
   _excluded3 = ["key"];
@@ -15,11 +16,24 @@ import { Trash2 } from 'lucide-react';
 import React, { memo, useCallback, useEffect, useMemo, useRef } from 'react';
 import Typography from "../../Typography";
 import { CollapseGroup } from "../../CollapseGroup";
+import { FormCollapseListFieldsWatcher } from "./FieldsWatcher";
 import { useFormCollapseListHooks } from "./hooks";
 import { useStyles } from "./style";
 import { FIELD_KEY_PATH, toRowKey } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var Text = Typography.Text;
+var FieldText = function FieldText(props) {
+  var id = props.id,
+    value = props.value;
+  if (_typeof(value) === 'object') {
+    console.warn("".concat(id, " => ").concat(value));
+    return '-';
+  }
+  return /*#__PURE__*/_jsx("span", {
+    children: value
+  });
+};
 export var FormCollapseList = /*#__PURE__*/memo(function (_ref) {
   var collapsible = _ref.collapsible,
     extra = _ref.extra,
@@ -70,6 +84,11 @@ export var FormCollapseList = /*#__PURE__*/memo(function (_ref) {
       return fieldValuesToDataSource(values);
     }, [fieldValuesToDataSource, values]),
     dataSource = _useMemo.dataSource;
+  var isTreeMode = useMemo(function () {
+    return dataSource === null || dataSource === void 0 ? void 0 : dataSource.some(function (d) {
+      return d[childrenColumnName];
+    });
+  }, [childrenColumnName, dataSource]);
   // 设置初始值以及在 readOnly 变化时更新 values
   useEffect(function () {
     updateValues();
@@ -108,7 +127,7 @@ export var FormCollapseList = /*#__PURE__*/memo(function (_ref) {
       }, 200);
     }
   }, [addOneFieldDefault, getAddParams, form, name, firstColumnFormItemName, updateValues]);
-  return /*#__PURE__*/_jsx(CollapseGroup, {
+  return /*#__PURE__*/_jsxs(CollapseGroup, {
     extra: extra === undefined ? name && !readOnly && /*#__PURE__*/_jsx(Tooltip, {
       title: maxFileds && "\u6700\u591A\u6DFB\u52A0 ".concat(maxFileds, " \u9879"),
       children: /*#__PURE__*/_jsx(Button, {
@@ -135,7 +154,10 @@ export var FormCollapseList = /*#__PURE__*/memo(function (_ref) {
     variant: variant,
     defaultActive: defaultActive,
     style: style,
-    children: name ? /*#__PURE__*/_jsx(Form.List, _objectSpread(_objectSpread({
+    children: [!isTreeMode && /*#__PURE__*/_jsx(FormCollapseListFieldsWatcher, {
+      name: name,
+      update: updateValues
+    }), name ? /*#__PURE__*/_jsx(Form.List, _objectSpread(_objectSpread({
       name: name
     }, formListProps), {}, {
       children: function children(fields, operation) {
@@ -181,18 +203,18 @@ export var FormCollapseList = /*#__PURE__*/memo(function (_ref) {
                 var key = field.key,
                   restField = _objectWithoutProperties(field, _excluded3);
                 var children = fieldRender === null || fieldRender === void 0 ? void 0 : fieldRender(fieldName !== null && fieldName !== void 0 ? fieldName : fieldKeyPath.at(-1), index, getFormListOperation(operation, record), fieldPath);
-                if (!children && !itemProps.noStyle) {
+                if (!itemName) {
                   return /*#__PURE__*/_jsx(Flex, {
                     align: "center",
                     className: cx(styles.noFormItem, className),
-                    children: "\u65E0\u9700\u8BBE\u7F6E"
+                    children: children
                   });
                 }
-                if (!itemName) {
+                if (children !== undefined && _typeof(children) !== 'object') {
                   return /*#__PURE__*/_jsx(Flex, {
                     align: "center",
                     className: cx(styles.noFormItem, className),
-                    children: children
+                    children: children.toString()
                   });
                 }
                 var chidrenProps = {};
@@ -218,7 +240,7 @@ export var FormCollapseList = /*#__PURE__*/memo(function (_ref) {
                   ,
                   rules: typeof rules === 'function' ? rules(parentFieldPath, index) : rules
                 }, itemProps), {}, {
-                  children: children && /*#__PURE__*/React.cloneElement(children, chidrenProps)
+                  children: children ? ( /*#__PURE__*/React.cloneElement(children, chidrenProps)) : /*#__PURE__*/_jsx(FieldText, {})
                 }), key);
               }
             };
@@ -286,6 +308,6 @@ export var FormCollapseList = /*#__PURE__*/memo(function (_ref) {
     })) : /*#__PURE__*/_jsx("div", {
       className: styles.empty,
       children: empty
-    })
+    })]
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuntijs/ui",
-  "version": "1.0.0-beta.109",
+  "version": "1.0.0-beta.110",
   "description": "☁️ Yunti UI - an open-source UI component library for building Cloud Native web apps",
   "keywords": [
     "yuntijs",