@ecoding/components.antd 0.5.12 → 0.5.14

package/lib/core/form.list/index.d.ts

@@ -8,6 +8,7 @@ interface IC {
     name?: string;
     rules?: any;
     width?: number;
+    valuePropName?: string;
     noStyleHidden?: boolean;
     hideRemove?: boolean | ((field: FormListFieldData, index: number) => boolean);
     render?: (field: FormListFieldData, index: number, { add, remove }: {

package/lib/core/form.list/index.js

@@ -5,7 +5,7 @@ import { DndContext, closestCenter, PointerSensor, useSensor, useSensors } from
 import { SortableContext, verticalListSortingStrategy, useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 const SortableItem = (props) => {
-    const { columns, i18n, field, index, add, remove, afterRemove, enableSort, disabled } = props;
+    const { columns, i18n, field, index, add, remove, afterRemove, enableSort, disabled, operation } = props;
     const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
         id: props.id
     });
@@ -46,6 +46,9 @@ const SortableItem = (props) => {
                 index + 1)),
         columns.map((column, i) => {
             if (column.type == "operation") {
+                if (operation === null || operation === void 0 ? void 0 : operation.hide) {
+                    return null;
+                }
                 return (React.createElement("td", { style: Object.assign({}, tdStyle, { right: 0, zIndex: 10, position: "sticky", backgroundColor: "#fff" }) },
                     React.createElement(Space, null,
                         column.render && column.render(field, index, { add, remove }),
@@ -60,13 +63,13 @@ const SortableItem = (props) => {
             else {
                 if (column.noStyleHidden) {
                     return (React.createElement("td", { style: { display: "none" } },
-                        React.createElement(Form.Item, { noStyle: true, hidden: true, name: [field.name, column.name] }, column.render(field, index, { add, remove }))));
+                        React.createElement(Form.Item, { noStyle: true, hidden: true, name: [field.name, column.name], valuePropName: column.valuePropName ? column.valuePropName : undefined }, column.render(field, index, { add, remove }))));
                 }
                 return (React.createElement("td", { style: tdStyle },
-                    React.createElement(Form.Item, { style: { marginBottom: 0 }, name: [field.name, column.name], rules: column.rules || [] }, column.render(field, index, { add, remove }))));
+                    React.createElement(Form.Item, { style: { marginBottom: 0 }, name: [field.name, column.name], rules: column.rules || [], valuePropName: column.valuePropName ? column.valuePropName : undefined }, column.render(field, index, { add, remove }))));
             }
         }),
-        needDefaultOperation ? (React.createElement("td", { style: Object.assign({}, tdStyle, { right: 0, zIndex: 10, position: "sticky", backgroundColor: "#fff" }) },
+        needDefaultOperation && (operation === null || operation === void 0 ? void 0 : operation.hide) != true ? (React.createElement("td", { style: Object.assign({}, tdStyle, { right: 0, zIndex: 10, position: "sticky", backgroundColor: "#fff" }) },
             React.createElement(Typography.Text, { style: disabled ? { cursor: 'no-drop', 'color': '#ccc' } : { cursor: 'pointer' }, type: disabled ? undefined : "danger", onClick: () => {
                     if (disabled) {
                         return;
@@ -94,12 +97,9 @@ const C = ({ columns, rules, tStyle, name, hideHeader, hideBottom, operation, i1
             }
             w += column.width || 200;
         });
-        if (operation) {
+        if (operation && operation.hide != true) {
             w += operation.width || 150;
         }
-        else {
-            w += 150;
-        }
         return w;
     }, []);
     return (React.createElement(Form.List, { name: name, rules: rules || [] }, (fields, { add, remove, move }, { errors }) => {
@@ -143,7 +143,7 @@ const C = ({ columns, rules, tStyle, name, hideHeader, hideBottom, operation, i1
                                 }
                             } },
                             React.createElement(SortableContext, { items: fields.map(field => field.key), strategy: verticalListSortingStrategy }, fields.map((field, index) => {
-                                return (React.createElement(SortableItem, { columns: columns, index: index, key: field.key, disabled: disabled, id: field.key, i18n: i18n, field: field, add: add, remove: remove, afterRemove: afterRemove, enableSort: enableSort }));
+                                return (React.createElement(SortableItem, { columns: columns, index: index, key: field.key, operation: operation, disabled: disabled, id: field.key, i18n: i18n, field: field, add: add, remove: remove, afterRemove: afterRemove, enableSort: enableSort }));
                             })))))),
             hideBottom || disabled ? null : (React.createElement("div", null,
                 React.createElement(Button, { icon: React.createElement(PlusCircleOutlined, null), type: "dashed", onClick: () => {

package/lib/core/table-pro/index.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { FilterValue, SorterResult, TableCurrentDataSource, TablePaginationConfig, TableLocale } from 'antd/lib/table/interface';
 import type { ColProps } from 'antd/lib/col';
+import type { TableProps } from 'antd';
 interface TableProRef {
     clear: () => void;
     setSelectedRowKeys: (key: React.Key[]) => void;
@@ -11,7 +12,7 @@ interface IProps {
     header?: React.ReactNode;
     buttonArea?: React.ReactNode;
     scrollY?: string | number;
-    scrollX?: string | number | 'max-content';
+    scrollX?: 'max-content' | string | number;
     filters?: {
         overMax?: number;
         colOpts?: ColProps;
@@ -28,6 +29,7 @@ interface IProps {
     bordered?: boolean;
     dataSource: any;
     columns: any[];
+    rowSelection?: TableProps<any>['rowSelection'];
     selectKeys?: React.Key[];
     operationColumn?: any[];
     pagination?: any;

package/lib/core/table-pro/index.js

@@ -5,7 +5,7 @@ import { isEqual } from "@ecoding/helper.is";
 import TableProColumns from "./columns";
 import { getDelateTargetByClassName } from "../../helpers/dom";
 import FilterHorizontal from "./filters.horizontal";
-const TablePro = ({ className, header, buttonArea, filterArea, filters, searchInputArea, loading, rowKey, dataSource, pagination, offsetY, columns, operationColumn, bordered = false, selectChangeHandler, selectType, selectKeys, onChange, expandable, columnsTitle, filterTitle, locale, scrollY = '100%', scrollX, i18n, }, ref) => {
+const TablePro = ({ className, header, buttonArea, filterArea, filters, searchInputArea, loading, rowKey, dataSource, pagination, offsetY, columns, operationColumn, bordered = false, selectChangeHandler, selectType, selectKeys, rowSelection, onChange, expandable, columnsTitle, filterTitle, locale, scrollY = '100%', scrollX, i18n, }, ref) => {
     const tableRef = useRef(null);
     const disColumnRef = useRef([]);
     const [y, setY] = useState(scrollY);
@@ -71,7 +71,7 @@ const TablePro = ({ className, header, buttonArea, filterArea, filters, searchIn
         setSelectedRowKeys(tempKeys);
         selectChangeHandler && selectChangeHandler(tempKeys, selectedRows);
     };
-    const rowSelection = Object.assign({}, {
+    const rowSelections = Object.assign({}, {
         type: selectType,
         selectedRowKeys,
     }, selectType === 'checkbox' ? {
@@ -82,7 +82,7 @@ const TablePro = ({ className, header, buttonArea, filterArea, filters, searchIn
             setSelectedRowKeys(selectedRowKeys);
             selectChangeHandler && selectChangeHandler(selectedRowKeys, selectedRows);
         }
-    } : {});
+    } : {}, rowSelection ? Object.assign({}, rowSelection) : {});
     useEffect(() => {
         if (disColumnRef.current && disColumnRef.current.length > 0 && columns.length > 0) {
             setColumns(columns.map((c) => {
@@ -154,7 +154,7 @@ const TablePro = ({ className, header, buttonArea, filterArea, filters, searchIn
                     } },
                     React.createElement(Button, { type: "text", icon: React.createElement(MenuOutlined, null) }, columnsTitleStr))) : null)),
         dataSource ? (React.createElement("div", { style: { height: '100%', overflow: 'hidden' }, ref: tableRef },
-            React.createElement(Table, { rowSelection: selectType ? rowSelection : undefined, locale: locale ? locale : undefined, onRow: (record, index) => {
+            React.createElement(Table, { rowSelection: selectType ? rowSelections : undefined, locale: locale ? locale : undefined, onRow: (record, index) => {
                     return {
                         onClick: (e) => {
                             const parent = getDelateTargetByClassName(e.target, "ant-table-tbody");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.5.12",
+    "version": "0.5.14",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -47,5 +47,5 @@
         "antd": "^6.0.0",
         "axios": "^1.1.2"
     },
-    "gitHead": "cb63979a8fe80d8595a2ad966dca360f08df2fca"
+    "gitHead": "63dbd74fd806139370f6f812cc712756866283ff"
 }