@arim-aisdc/public-components 2.2.1 → 2.2.3

package/dist/components/BaseInfo/BaseInfo.d.ts

@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
     value: any;
     field: string;
     label?: string;
-    text: string | JSX.Element | Element;
+    text: string | Element | JSX.Element;
     units?: string;
     width?: string;
     labelWidth?: string;

package/dist/components/CustomForm/CustomForm.js

@@ -399,6 +399,7 @@ var CustomForm = function CustomForm(_ref, ref) {
       case CustomFormItemType.DateTime:
         element = /*#__PURE__*/_jsx(DatePicker, {
           showTime: true,
+          picker: (item === null || item === void 0 ? void 0 : item.picker) || 'date',
           style: {
             width: item !== null && item !== void 0 && item.wapperWidth ? item === null || item === void 0 ? void 0 : item.wapperWidth : '100%'
           }
@@ -416,7 +417,8 @@ var CustomForm = function CustomForm(_ref, ref) {
           suffixIcon: /*#__PURE__*/_jsx("i", {
             className: "iconfont-other icon-other-calendar"
           }),
-          placeholder: item.inputTips
+          placeholder: item.inputTips,
+          presets: item === null || item === void 0 ? void 0 : item.presets
         });
         break;
       case CustomFormItemType.DateRang:
@@ -441,7 +443,8 @@ var CustomForm = function CustomForm(_ref, ref) {
           placeholder: [item.inputTips, item.inputTips],
           picker: item === null || item === void 0 ? void 0 : item.picker,
           disabledDate: item === null || item === void 0 ? void 0 : item.disabledDate,
-          allowClear: item.allowClear === false ? false : true
+          allowClear: item.allowClear === false ? false : true,
+          presets: item === null || item === void 0 ? void 0 : item.presets
         });
         break;
       case CustomFormItemType.Interval:

package/dist/components/CustomForm/UploadImg/index.js

@@ -130,7 +130,7 @@ var UploadImg = function UploadImg(_ref) {
     })]
   });
   return /*#__PURE__*/_jsx(Upload, {
-    accept: ".jpg, .jpeg, .png, .gif, .bmp, .webp, .svg",
+    accept: ".jpg, .jpeg, .png, .gif",
     listType: "picture-card",
     name: "file",
     showUploadList: false,

package/dist/components/CustomForm/type.d.ts

@@ -1,6 +1,7 @@
 import { FormProps } from 'antd';
 import { FormLabelAlign } from 'antd/es/form/interface';
 import { MouseEventHandler, ReactNode } from 'react';
+import type { TimeRangePickerProps, TimePickerProps } from 'antd';
 export interface fieldType {
     field: string;
     label?: string;
@@ -58,6 +59,8 @@ export declare enum PickerType {
     Week = "week",
     Quarter = "quarter "
 }
+type PanelMode = 'time' | 'date' | 'week' | 'month' | 'quarter' | 'year' | 'decade';
+export type PickerMode = Exclude<PanelMode, 'datetime' | 'decade'>;
 export type CustomSearchFieldType = {
     field: string;
     label?: ReactNode | string;
@@ -70,7 +73,7 @@ export type CustomSearchFieldType = {
     maxLength?: number;
     rows?: number;
     wapperWidth?: number;
-    picker?: PickerType;
+    picker?: PickerType | PickerMode;
     defaultFormat?: any;
     showTimeFormat?: any;
     allowClear?: boolean;
@@ -121,7 +124,9 @@ export type CustomSearchFieldType = {
     labelInValue?: boolean;
     baseUrl?: string;
     token?: any;
-    method?: "POST" | "PUT" | "PATCH";
+    method?: 'POST' | 'PUT' | 'PATCH';
+    /**预设常用的日期范围  { label: React.ReactNode, value: Dayjs | (() => Dayjs) | Dayjs[] }[]*/
+    presets?: TimeRangePickerProps['presets'] | TimePickerProps['presets'];
 };
 export interface CustomFormProps {
     data: CustomSearchFieldType[];
@@ -159,3 +164,4 @@ export interface CustomFormProps {
     labelAlign?: FormLabelAlign;
     btnSpan?: number;
 }
+export {};

package/dist/components/QueryFilter/QueryFilter.js

@@ -344,7 +344,8 @@ var QueryFilter = function QueryFilter(_ref, ref) {
             className: "iconfont-other icon-other-calendar"
           }),
           placeholder: item.inputTips,
-          allowClear: item === null || item === void 0 ? void 0 : item.allowClear
+          allowClear: item === null || item === void 0 ? void 0 : item.allowClear,
+          presets: item === null || item === void 0 ? void 0 : item.presets
         });
         break;
       case FormItemType.DateRang:
@@ -372,7 +373,8 @@ var QueryFilter = function QueryFilter(_ref, ref) {
           picker: item === null || item === void 0 ? void 0 : item.picker,
           disabledDate: item === null || item === void 0 ? void 0 : item.disabledDate,
           disabledTime: item === null || item === void 0 ? void 0 : item.disabledTime,
-          allowClear: item === null || item === void 0 ? void 0 : item.allowClear
+          allowClear: item === null || item === void 0 ? void 0 : item.allowClear,
+          presets: item === null || item === void 0 ? void 0 : item.presets
         });
         break;
       case FormItemType.Interval:

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

@@ -1,5 +1,5 @@
 import QueryFilter, { typeList, useDynamicSearchFiled } from './QueryFilter';
-export { FormItemType, TimeFormatType } from './type';
+export { FormItemType, TimeFormatType, PickerType } from './type';
 export type { QueryFilterProps, fieldType, inputValueType, searchFieldType } from './type';
 export { typeList, useDynamicSearchFiled };
 export default QueryFilter;

package/dist/components/QueryFilter/index.js

@@ -1,4 +1,4 @@
 import QueryFilter, { typeList, useDynamicSearchFiled } from "./QueryFilter";
-export { FormItemType, TimeFormatType } from "./type";
+export { FormItemType, TimeFormatType, PickerType } from "./type";
 export { typeList, useDynamicSearchFiled };
 export default QueryFilter;

package/dist/components/QueryFilter/type.d.ts

@@ -1,5 +1,6 @@
 import { FormProps } from 'antd';
 import { MouseEventHandler } from 'react';
+import type { TimeRangePickerProps, TimePickerProps } from 'antd';
 export declare enum FormItemType {
     Text = "text",
     TextArea = "textArea",
@@ -137,6 +138,8 @@ export type searchFieldType = {
     displayRender?: (labels: string[]) => string;
     /**级联选择器是否多选 */
     multiple?: boolean;
+    /**预设常用的日期范围  { label: React.ReactNode, value: Dayjs | (() => Dayjs) | Dayjs[] }[]*/
+    presets?: TimeRangePickerProps['presets'] | TimePickerProps['presets'];
 };
 export interface QueryFilterProps {
     data: searchFieldType[];

package/dist/components/TableMax/components/ColumnSort/customSortFns.d.ts

@@ -1,13 +1,13 @@
 import { TableMaxColumnType } from "../../type";
-export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
 declare const customSortFns: {
-    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/dist/components/TableMax/tableMax.less

@@ -133,6 +133,9 @@
           box-sizing: border-box;
           height: fit-content;
           flex: 1;
+          .cell-wapper {
+            line-height: @global-table-max-header-cell-wapper-line-height;
+          }
         }
 
         .table-header-scroll {
@@ -146,6 +149,9 @@
         overflow: auto scroll;
         font-weight: @global-table-max-body-font-weight;
         // background: @tableColor2;
+        .tbody-tr-td {
+          line-height: @global-table-body-tbody-tr-td-line-height;
+        }
 
         &::-webkit-scrollbar {
           width: 10px;

package/dist/themes/variables.less

@@ -66,4 +66,5 @@
 @global-table-max-scrollbar-track: var(--global-table-max-scrollbar-track, #E8E8E8);
 @global-table-max-header-font-weight: var(--global-table-max-header-font-weight);
 @global-table-max-body-font-weight: var(--global-table-max-body-font-weight);
-
+@global-table-max-header-cell-wapper-line-height: var(--global-table-max-header-cell-wapper-line-height, 16px);
+@global-table-body-tbody-tr-td-line-height: var(--global-table-body-tbody-tr-td-line-height, 32px);

package/dist/themes/variablesConfig.js

@@ -14,19 +14,22 @@ var tableMaxCommonStyle = {
   '--global-table-max-center-border-radius': 'unset',
   '--global-table-max-center-border-bottom': 'none',
   '--global-table-max-header-font-weight': '400',
-  '--global-table-max-body-font-weight': '400'
+  '--global-table-max-body-font-weight': '400',
+  '--global-table-max-header-cell-wapper-line-height': '16px',
+  '--global-table-body-tbody-tr-td-line-height': '32px'
 };
 var tableMaxCommonStyleTwo = {
   '--global-table-max-padding-top': '8px',
   '--global-table-max-padding-left': '8px',
   '--global-table-max-padding-right': '16px',
   '--global-table-max-padding-bottom': '7px',
-  '--global-table-max-border': '1px solid #D9D9D9',
   '--global-table-max-footer-border-radius': '0px 0px 8px 8px',
   '--global-table-max-center-border-radius': '8px 8px 0px 0px',
   '--global-table-max-center-border-bottom': 'none',
   '--global-table-max-header-font-weight': '500',
-  '--global-table-max-body-font-weight': '400'
+  '--global-table-max-body-font-weight': '400',
+  '--global-table-max-header-cell-wapper-line-height': '32px',
+  '--global-table-body-tbody-tr-td-line-height': '42px'
 };
 export var PublicThemeVariablesConfig = {
   light: _objectSpread({
@@ -268,7 +271,8 @@ export var PublicThemeVariablesConfigTwo = {
     // 卡片、表格body背景色 -1
     '--global-card-effect-background-color': '#E8E8E8',
     '--global-default-text-color': '#242A30',
-    '--global-table-max-scrollbar-track': '#E8E8E8'
+    '--global-table-max-scrollbar-track': '#E8E8E8',
+    '--global-table-max-border': '1px solid #D9D9D9'
   }, tableMaxCommonStyleTwo),
   dark: _objectSpread({
     '--global-curd-input-background-color': '#494c5dff',
@@ -349,7 +353,8 @@ export var PublicThemeVariablesConfigTwo = {
     // 卡片、表格body背景色 -1
     '--global-card-effect-background-color': '#1E345B',
     '--global-default-text-color': '#fff',
-    '--global-table-max-scrollbar-track': '#334155'
+    '--global-table-max-scrollbar-track': '#334155',
+    '--global-table-max-border': '1px solid #475569'
   }, tableMaxCommonStyleTwo)
 };
 export var publicThemeMap = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",