wargerm 0.7.95 → 0.7.96

package/dist/components/TabelCard/index.d.ts

@@ -1,7 +1,7 @@
 import React, { MutableRefObject } from 'react';
 import { ReactNode } from 'react';
 import { ProTableProps } from '@ant-design/pro-table';
-import { ColumnProps, Isearch } from '../WForm';
+import { ColumnProps, IColumnProps, Isearch } from '../WForm';
 type CustomType = {
     type: 'custom';
     title: ReactNode;
@@ -30,7 +30,7 @@ interface ItableBarCustom {
     key: string;
     actionMethod?: (values: Record<string, any>, done: () => void) => Promise<any>;
 }
-interface IoptionColumnConfig extends ColumnProps {
+interface IoptionColumnConfig extends IColumnProps {
     showMoreNum?: number;
 }
 interface ITableCard extends Omit<ProTableProps<Record<string, any>[], Record<string, any>>, 'columns'> {

package/dist/components/WForm/index.d.ts

@@ -1,19 +1,19 @@
 import React, { MutableRefObject } from 'react';
 import { ReactNode } from 'react';
 import { FormInstance, FormProps } from 'antd';
-export interface ColumnProps {
+import { ColumnType } from 'antd/es/table';
+export interface IColumnProps extends ColumnType<Record<string, any>> {
     title: string;
     dataIndex: string;
     key?: string | number;
     width?: number;
-    ellipsis?: Boolean;
     showTitle?: Boolean;
     hideInSearch?: boolean;
     search?: {
         transform?: (value: any) => Record<string, any>;
         transformSetForm?: (value: any) => Record<string, any>;
     };
-    valueType?: 'text' | 'textarea' | 'inputNumber' | 'select' | 'treeSelect' | 'date' | 'dateTime' | 'dateMonth' | 'dateYear' | 'dateRange' | 'dateTimeRange' | 'checkbox' | 'radio' | 'radioButton' | 'switch' | 'digit' | 'cascader' | 'upload';
+    valueType?: 'text' | 'textarea' | 'inputNumber' | 'select' | 'tree' | 'treeSelect' | 'date' | 'dateTime' | 'dateMonth' | 'dateYear' | 'dateRange' | 'dateTimeRange' | 'checkbox' | 'radio' | 'radioButton' | 'switch' | 'digit' | 'cascader' | 'upload';
     valueEnum?: Record<string, any>;
     options?: Record<string, any>[];
     useFirstIteminitialValue?: boolean;
@@ -26,6 +26,17 @@ export interface ColumnProps {
     render?: (text: string, record: Record<string, any>, index: number) => ReactNode;
     renderFormItem?: (item: any, { formItemProps, fieldProps, ...rest }: any, form: any) => ReactNode;
 }
+type GroupType = {
+    title?: string;
+    type: 'group';
+    groupNode?: ReactNode;
+    children: IColumnProps[];
+};
+type Without<T, U> = {
+    [P in Exclude<keyof T, keyof U>]?: never;
+};
+type XOR<T, U> = T | U extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
+export type ColumnProps = XOR<GroupType, IColumnProps>;
 type defaultColConfig = {
     xs: 24;
     sm: 24;

package/dist/index.esm.js

@@ -3669,7 +3669,8 @@ var WForm = function WForm(props, ref) {
       var _c$children;
       c.children = (_c$children = c.children) === null || _c$children === void 0 ? void 0 : _c$children.filter(function (itm) {
         if (disabledHideInSearch) return true;
-        if (itm.hideInSearch || itm.disabledHideInSearch) {
+        // if (itm.hideInSearch || itm.disabledHideInSearch) {
+        if (itm.hideInSearch) {
           return false;
         }
         return true;
@@ -3684,7 +3685,7 @@ var WForm = function WForm(props, ref) {
       var _c$children2;
       c.children = (_c$children2 = c.children) === null || _c$children2 === void 0 ? void 0 : _c$children2.filter(function (itm) {
         if (disabledHideInSearch) return true;
-        if (itm.hideInSearch || itm.disabledHideInSearch) {
+        if (itm.hideInSearch) {
           return false;
         }
         return true;

package/dist/index.js

@@ -3712,7 +3712,8 @@ var WForm = function WForm(props, ref) {
       var _c$children;
       c.children = (_c$children = c.children) === null || _c$children === void 0 ? void 0 : _c$children.filter(function (itm) {
         if (disabledHideInSearch) return true;
-        if (itm.hideInSearch || itm.disabledHideInSearch) {
+        // if (itm.hideInSearch || itm.disabledHideInSearch) {
+        if (itm.hideInSearch) {
           return false;
         }
         return true;
@@ -3727,7 +3728,7 @@ var WForm = function WForm(props, ref) {
       var _c$children2;
       c.children = (_c$children2 = c.children) === null || _c$children2 === void 0 ? void 0 : _c$children2.filter(function (itm) {
         if (disabledHideInSearch) return true;
-        if (itm.hideInSearch || itm.disabledHideInSearch) {
+        if (itm.hideInSearch) {
           return false;
         }
         return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.7.95",
+  "version": "0.7.96",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",