@tachybase/client 1.6.19 → 1.6.21

package/es/built-in/attachment-preview/previewers/file-default.mjs

@@ -32,19 +32,20 @@ const fileDef = {
     }
 };
 const ViewComponentImageDefault = (props)=>{
-    const { file, prefixCls } = props;
+    const { file, prefixCls, style } = props;
     return file.imageUrl && /*#__PURE__*/ jsx("img", {
         src: "".concat(file.imageUrl).concat(file.thumbnailRule || ''),
         style: {
             width: '100%',
-            height: '100%'
+            height: '100%',
+            ...style
         },
         alt: file.title,
         className: "".concat(prefixCls, "-list-item-image")
     });
 };
 const CheckedComponentImageDefault = (props)=>{
-    const { file } = props;
+    const { file, style } = props;
     return file.imageUrl && /*#__PURE__*/ jsx("img", {
         ...props,
         src: "".concat(file.imageUrl).concat(file.thumbnailRule || ''),
@@ -54,7 +55,8 @@ const CheckedComponentImageDefault = (props)=>{
             height: 'auto',
             display: 'flex',
             justifyContent: 'center',
-            alignItems: 'center'
+            alignItems: 'center',
+            ...style
         }
     });
 };

package/es/built-in/attachment-preview/previewers/image-jpeg.mjs

@@ -16,7 +16,7 @@ const imagejpeg = {
         });
     },
     checkedComponent: (props)=>{
-        const { file } = props;
+        const { file, style } = props;
         return file.imageUrl && /*#__PURE__*/ jsx("img", {
             ...props,
             src: "".concat(file.imageUrl).concat(file.thumbnailRule || ''),
@@ -26,7 +26,8 @@ const imagejpeg = {
                 height: 'auto',
                 display: 'flex',
                 justifyContent: 'center',
-                alignItems: 'center'
+                alignItems: 'center',
+                ...style
             }
         });
     }

package/es/built-in/attachment-preview/previewers/image-png.mjs

@@ -16,7 +16,7 @@ const imagePng = {
         });
     },
     checkedComponent: (props)=>{
-        const { file } = props;
+        const { file, style } = props;
         return file.imageUrl && /*#__PURE__*/ jsx("img", {
             ...props,
             src: "".concat(file.imageUrl).concat(file.thumbnailRule || ''),
@@ -26,7 +26,8 @@ const imagePng = {
                 height: 'auto',
                 display: 'flex',
                 justifyContent: 'center',
-                alignItems: 'center'
+                alignItems: 'center',
+                ...style
             }
         });
     }

package/es/built-in/attachment-preview/previewers/image-svg.mjs

@@ -10,10 +10,13 @@ const imageSvg = {
         });
     },
     checkedComponent: (props)=>{
-        const { file } = props;
+        const { file, style } = props;
         return file.imageUrl && /*#__PURE__*/ jsx("img", {
             ...props,
-            src: "".concat(file.url)
+            src: "".concat(file.url),
+            style: {
+                ...style
+            }
         });
     }
 };

package/es/filter-provider/utils.mjs

@@ -91,6 +91,10 @@ const resolveFilterOperator = function(schema, path) {
 };
 const getDatePickerComponent = (fieldSchema)=>{
     var _fieldSchema_xcomponentprops;
+    if ((null == fieldSchema ? void 0 : fieldSchema['x-component']) === 'CollectionField') {
+        var _fieldSchema_xcomponentprops1;
+        return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1.component;
+    }
     return (null == fieldSchema ? void 0 : fieldSchema['x-component']) || (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
 };
 const getDatePickerShowTime = (fieldSchema)=>{
@@ -109,7 +113,7 @@ const normalizeDateBetweenBoundary = function(value, boundary) {
     if (!m.isValid()) return value;
     if (isDateOnlyString(value)) return ('start' === boundary ? m.startOf('day') : m.endOf('day')).toISOString();
     if ('date' === options.valueMode) {
-        if ('retained-local-date-boundary' === options.valueSource) return m.toISOString();
+        if ('metadata' === options.valueSource || 'retained-local-date-boundary' === options.valueSource) return m.toISOString();
         const localBoundary = dayjs(normalizeLocalDateBoundaryInput(value));
         return ('start' === boundary ? localBoundary.startOf('day') : localBoundary.endOf('day')).toISOString();
     }
@@ -182,13 +186,15 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
                 };
             } else if ('$dateBetween' === operator) {
                 if (Array.isArray(value)) {
+                    const datePickerComponent = getDatePickerComponent(currentFieldSchema);
+                    const useDefaultDateBoundary = shouldUseDefaultDateBoundary(currentFieldSchema);
                     const valueInfo = resolveDatePickerRangeValueInfo(value, {
-                        component: getDatePickerComponent(currentFieldSchema),
+                        component: datePickerComponent,
                         showTime: getDatePickerShowTime(currentFieldSchema),
-                        preferDateBoundaryFallback: shouldUseDefaultDateBoundary(currentFieldSchema)
+                        preferDateBoundaryFallback: useDefaultDateBoundary
                     });
                     value = normalizeDateBetweenValue(value, {
-                        useDefaultDateBoundary: shouldUseDefaultDateBoundary(currentFieldSchema),
+                        useDefaultDateBoundary,
                         valueMode: valueInfo.mode,
                         valueSource: valueInfo.source,
                         preferDateBoundaryFallback: 'retained-date-boundary' === valueInfo.source

package/es/schema-component/antd/date-picker/util.d.ts

@@ -23,7 +23,13 @@ export declare const resolveDatePickerRangeValueInfo: (value: any, options?: {
     component?: string;
     preferDateBoundaryFallback?: boolean;
 }) => DatePickerRangeValueInfo;
-export declare const normalizeDatePickerParseOptions: (options?: Moment2strOptions) => Moment2strOptions;
+export declare const normalizeDatePickerParseOptions: (options?: Moment2strOptions) => {
+    showTime?: boolean;
+    utc?: boolean;
+    picker?: "year" | "month" | "week" | "quarter";
+    value?: any;
+    component?: string;
+};
 export declare const moment2str: (value?: Dayjs | null, options?: Moment2strOptions) => any;
 export declare const mapDatePicker: () => (props: any) => any;
 export declare const mapRangePicker: () => (props: any) => any;

package/es/schema-component/antd/date-picker/util.mjs

@@ -46,18 +46,24 @@ const isDatePickerRetainedLocalBoundaryPair = (value)=>Array.isArray(value) && v
 const resolveDatePickerRangeValueInfo = function(value) {
     let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
     const metadataMode = getRangeValueMode(value);
-    if (metadataMode) return {
-        mode: metadataMode,
-        source: 'metadata'
+    if (metadataMode) {
+        if ('date' === metadataMode && isDatePickerDefaultRangeBoundaryPair(value)) return {
+            mode: 'date',
+            source: 'retained-date-boundary'
+        };
+        return {
+            mode: metadataMode,
+            source: 'metadata'
+        };
+    }
+    if (options.preferDateBoundaryFallback && isDatePickerRetainedLocalBoundaryPair(value)) return {
+        mode: 'date',
+        source: 'retained-local-date-boundary'
     };
     if ('DatePicker.RangePicker' === options.component && !options.showTime) return {
         mode: 'date',
         source: 'schema'
     };
-    if (options.preferDateBoundaryFallback && options.showTime && isDatePickerRetainedLocalBoundaryPair(value)) return {
-        mode: 'date',
-        source: 'retained-local-date-boundary'
-    };
     if (options.preferDateBoundaryFallback && isDatePickerDefaultRangeBoundaryPair(value)) return {
         mode: 'date',
         source: 'retained-date-boundary'
@@ -68,7 +74,7 @@ const resolveDatePickerRangeValueInfo = function(value) {
 };
 const normalizeDatePickerParseOptions = function() {
     let options = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
-    if (false === options.utc || 'boolean' == typeof options.gmt || options.picker) return options;
+    if (false === options.utc || true === options.gmt || options.picker) return options;
     const rangeValueInfo = resolveDatePickerRangeValueInfo(options.value, {
         component: options.component,
         showTime: options.showTime,
@@ -77,10 +83,12 @@ const normalizeDatePickerParseOptions = function() {
     if (options.showTime) {
         if ('date' !== rangeValueInfo.mode || 'retained-local-date-boundary' === rangeValueInfo.source) return options;
     }
-    return {
-        ...options,
+    const { gmt, ...rest } = options;
+    if ('retained-date-boundary' === rangeValueInfo.source) return {
+        ...rest,
         gmt: true
     };
+    return rest;
 };
 const moment2str = function(value) {
     let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};

package/es/schema-component/antd/filter/useFilterActionProps.mjs

@@ -137,6 +137,10 @@ const findCustomFieldSchema = (schema, key)=>{
 };
 const getDatePickerComponent = (fieldSchema)=>{
     var _fieldSchema_xcomponentprops;
+    if ((null == fieldSchema ? void 0 : fieldSchema['x-component']) === 'CollectionField') {
+        var _fieldSchema_xcomponentprops1;
+        return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1.component;
+    }
     return (null == fieldSchema ? void 0 : fieldSchema['x-component']) || (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
 };
 const getDatePickerShowTime = (fieldSchema)=>{

package/es/schema-component/antd/upload/ReadPretty.mjs

@@ -1,8 +1,8 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useState } from "react";
 import { useField } from "@tachybase/schema";
-import { DownloadOutlined } from "@ant-design/icons";
 import { Lightbox, isString } from "@tego/client";
+import { DownloadOutlined, RotateRightOutlined } from "@ant-design/icons";
 import { Button, Space } from "antd";
 import style from "antd/es/upload/style";
 import classnames from "classnames";
@@ -21,6 +21,7 @@ ReadPretty.File = function(props) {
     const app = useApp();
     const [fileIndex, setFileIndex] = useState(0);
     const [visible, setVisible] = useState(false);
+    const [rotate, setRotate] = useState(0);
     const { wrapSSR, hashId, componentCls: prefixCls } = useStyles();
     const useUploadStyleVal = style["default"] ? style["default"] : style;
     const previewList = app.AttachmentPreviewManager.get();
@@ -66,8 +67,14 @@ ReadPretty.File = function(props) {
                     e.stopPropagation();
                     setVisible(false);
                 },
-                onMovePrevRequest: ()=>setFileIndex((fileIndex + images.length - 1) % images.length),
-                onMoveNextRequest: ()=>setFileIndex((fileIndex + 1) % images.length),
+                onMovePrevRequest: ()=>{
+                    setFileIndex((fileIndex + images.length - 1) % images.length);
+                    setRotate(0);
+                },
+                onMoveNextRequest: ()=>{
+                    setFileIndex((fileIndex + 1) % images.length);
+                    setRotate(0);
+                },
                 imageTitle: null == (_images_fileIndex1 = images[fileIndex]) ? void 0 : _images_fileIndex1.title,
                 toolbarButtons: [
                     /*#__PURE__*/ jsx("button", {
@@ -87,8 +94,29 @@ ReadPretty.File = function(props) {
                             saveAs(file.url, "".concat(file.title).concat(file.extname));
                         },
                         children: /*#__PURE__*/ jsx(DownloadOutlined, {})
-                    }, 'download')
-                ]
+                    }, 'download'),
+                    /*#__PURE__*/ jsx("button", {
+                        style: {
+                            fontSize: 22,
+                            background: 'none',
+                            lineHeight: 1
+                        },
+                        type: "button",
+                        "aria-label": "Zoom in",
+                        title: "Zoom in",
+                        className: "ril-zoom-in ril__toolbarItemChild ril__builtinButton",
+                        onClick: (e)=>{
+                            setRotate(rotate + 90);
+                        },
+                        children: /*#__PURE__*/ jsx(RotateRightOutlined, {})
+                    }, 'rotate')
+                ],
+                otherProps: {
+                    style: {
+                        transform: "rotate(".concat(rotate, "deg)"),
+                        transition: 'transform 0.3s'
+                    }
+                }
             })
         ]
     }));

package/es/schema-component/antd/upload/Upload.mjs

@@ -1,8 +1,8 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { createElement, useEffect, useRef, useState } from "react";
 import { connect, mapProps, mapReadPretty } from "@tachybase/schema";
-import { DeleteOutlined, DownloadOutlined, InboxOutlined, LoadingOutlined, PlusOutlined } from "@ant-design/icons";
 import { Lightbox } from "@tego/client";
+import { DeleteOutlined, DownloadOutlined, InboxOutlined, LoadingOutlined, PlusOutlined, RotateRightOutlined } from "@ant-design/icons";
 import { Button, Progress, Space, Upload } from "antd";
 import classnames from "classnames";
 import { saveAs } from "file-saver";
@@ -28,6 +28,7 @@ Upload_Upload.Attachment = connect((props)=>{
     const images = fileList;
     const [fileIndex, setFileIndex] = useState(0);
     const [visible, setVisible] = useState(false);
+    const [rotate, setRotate] = useState(0);
     const { t } = useTranslation();
     const uploadProps = useUploadProps({
         ...props
@@ -124,8 +125,14 @@ Upload_Upload.Attachment = connect((props)=>{
                 prevFile: images[(fileIndex + images.length - 1) % images.length],
                 previewList: previewList,
                 onCloseRequest: ()=>setVisible(false),
-                onMovePrevRequest: ()=>setFileIndex((fileIndex + images.length - 1) % images.length),
-                onMoveNextRequest: ()=>setFileIndex((fileIndex + 1) % images.length),
+                onMovePrevRequest: ()=>{
+                    setFileIndex((fileIndex + images.length - 1) % images.length);
+                    setRotate(0);
+                },
+                onMoveNextRequest: ()=>{
+                    setFileIndex((fileIndex + 1) % images.length);
+                    setRotate(0);
+                },
                 imageTitle: null == (_images_fileIndex1 = images[fileIndex]) ? void 0 : _images_fileIndex1.title,
                 toolbarButtons: [
                     /*#__PURE__*/ jsx("button", {
@@ -140,12 +147,34 @@ Upload_Upload.Attachment = connect((props)=>{
                         className: "ril-zoom-in ril__toolbarItemChild ril__builtinButton",
                         onClick: (e)=>{
                             e.preventDefault();
+                            e.stopPropagation();
                             const file = images[fileIndex];
                             saveAs(file.url, "".concat(file.title).concat(file.extname));
                         },
                         children: /*#__PURE__*/ jsx(DownloadOutlined, {})
-                    }, 'preview-img')
-                ]
+                    }, 'download'),
+                    /*#__PURE__*/ jsx("button", {
+                        style: {
+                            fontSize: 22,
+                            background: 'none',
+                            lineHeight: 1
+                        },
+                        type: "button",
+                        "aria-label": "Zoom in",
+                        title: "Zoom in",
+                        className: "ril-zoom-in ril__toolbarItemChild ril__builtinButton",
+                        onClick: (e)=>{
+                            setRotate(rotate + 90);
+                        },
+                        children: /*#__PURE__*/ jsx(RotateRightOutlined, {})
+                    }, 'rotate')
+                ],
+                otherProps: {
+                    style: {
+                        transform: "rotate(".concat(rotate, "deg)"),
+                        transition: 'transform 0.3s'
+                    }
+                }
             })
         ]
     }));

package/es/schema-initializer/items/CustomFilterFormItemInitializer.mjs

@@ -334,11 +334,15 @@ const FilterCustomItemInitializer = /*#__PURE__*/ memo((props)=>{
             },
             collectionName: collection
         };
-        if ('DatePicker' === component) {
+        if ('DatePicker' === component || 'DatePicker.RangePicker' === component) {
             schema['x-settings'] = 'fieldSettings:FilterFormItem';
             schema['x-designer-props'] = {
                 interface: 'datetime'
             };
+            schema['x-component-props'] = {
+                ...schema['x-component-props'],
+                gmt: false
+            };
         }
         insert(gridRowColWrap(schema));
     }, [

package/lib/built-in/attachment-preview/previewers/file-default.js

@@ -60,19 +60,20 @@ const fileDef = {
     }
 };
 const ViewComponentImageDefault = (props)=>{
-    const { file, prefixCls } = props;
+    const { file, prefixCls, style } = props;
     return file.imageUrl && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("img", {
         src: "".concat(file.imageUrl).concat(file.thumbnailRule || ''),
         style: {
             width: '100%',
-            height: '100%'
+            height: '100%',
+            ...style
         },
         alt: file.title,
         className: "".concat(prefixCls, "-list-item-image")
     });
 };
 const CheckedComponentImageDefault = (props)=>{
-    const { file } = props;
+    const { file, style } = props;
     return file.imageUrl && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("img", {
         ...props,
         src: "".concat(file.imageUrl).concat(file.thumbnailRule || ''),
@@ -82,7 +83,8 @@ const CheckedComponentImageDefault = (props)=>{
             height: 'auto',
             display: 'flex',
             justifyContent: 'center',
-            alignItems: 'center'
+            alignItems: 'center',
+            ...style
         }
     });
 };

package/lib/built-in/attachment-preview/previewers/image-jpeg.js

@@ -44,7 +44,7 @@ const imagejpeg = {
         });
     },
     checkedComponent: (props)=>{
-        const { file } = props;
+        const { file, style } = props;
         return file.imageUrl && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("img", {
             ...props,
             src: "".concat(file.imageUrl).concat(file.thumbnailRule || ''),
@@ -54,7 +54,8 @@ const imagejpeg = {
                 height: 'auto',
                 display: 'flex',
                 justifyContent: 'center',
-                alignItems: 'center'
+                alignItems: 'center',
+                ...style
             }
         });
     }

package/lib/built-in/attachment-preview/previewers/image-png.js

@@ -44,7 +44,7 @@ const imagePng = {
         });
     },
     checkedComponent: (props)=>{
-        const { file } = props;
+        const { file, style } = props;
         return file.imageUrl && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("img", {
             ...props,
             src: "".concat(file.imageUrl).concat(file.thumbnailRule || ''),
@@ -54,7 +54,8 @@ const imagePng = {
                 height: 'auto',
                 display: 'flex',
                 justifyContent: 'center',
-                alignItems: 'center'
+                alignItems: 'center',
+                ...style
             }
         });
     }

package/lib/built-in/attachment-preview/previewers/image-svg.js

@@ -38,10 +38,13 @@ const imageSvg = {
         });
     },
     checkedComponent: (props)=>{
-        const { file } = props;
+        const { file, style } = props;
         return file.imageUrl && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("img", {
             ...props,
-            src: "".concat(file.url)
+            src: "".concat(file.url),
+            style: {
+                ...style
+            }
         });
     }
 };

package/lib/filter-provider/utils.js

@@ -143,6 +143,10 @@ const resolveFilterOperator = function(schema, path) {
 };
 const getDatePickerComponent = (fieldSchema)=>{
     var _fieldSchema_xcomponentprops;
+    if ((null == fieldSchema ? void 0 : fieldSchema['x-component']) === 'CollectionField') {
+        var _fieldSchema_xcomponentprops1;
+        return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1.component;
+    }
     return (null == fieldSchema ? void 0 : fieldSchema['x-component']) || (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
 };
 const getDatePickerShowTime = (fieldSchema)=>{
@@ -161,7 +165,7 @@ const normalizeDateBetweenBoundary = function(value, boundary) {
     if (!m.isValid()) return value;
     if (isDateOnlyString(value)) return ('start' === boundary ? m.startOf('day') : m.endOf('day')).toISOString();
     if ('date' === options.valueMode) {
-        if ('retained-local-date-boundary' === options.valueSource) return m.toISOString();
+        if ('metadata' === options.valueSource || 'retained-local-date-boundary' === options.valueSource) return m.toISOString();
         const localBoundary = external_dayjs_default()(normalizeLocalDateBoundaryInput(value));
         return ('start' === boundary ? localBoundary.startOf('day') : localBoundary.endOf('day')).toISOString();
     }
@@ -234,13 +238,15 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
                 };
             } else if ('$dateBetween' === operator) {
                 if (Array.isArray(value)) {
+                    const datePickerComponent = getDatePickerComponent(currentFieldSchema);
+                    const useDefaultDateBoundary = shouldUseDefaultDateBoundary(currentFieldSchema);
                     const valueInfo = (0, util_js_namespaceObject.resolveDatePickerRangeValueInfo)(value, {
-                        component: getDatePickerComponent(currentFieldSchema),
+                        component: datePickerComponent,
                         showTime: getDatePickerShowTime(currentFieldSchema),
-                        preferDateBoundaryFallback: shouldUseDefaultDateBoundary(currentFieldSchema)
+                        preferDateBoundaryFallback: useDefaultDateBoundary
                     });
                     value = normalizeDateBetweenValue(value, {
-                        useDefaultDateBoundary: shouldUseDefaultDateBoundary(currentFieldSchema),
+                        useDefaultDateBoundary,
                         valueMode: valueInfo.mode,
                         valueSource: valueInfo.source,
                         preferDateBoundaryFallback: 'retained-date-boundary' === valueInfo.source

package/lib/schema-component/antd/date-picker/util.js

@@ -95,18 +95,24 @@ const isDatePickerRetainedLocalBoundaryPair = (value)=>Array.isArray(value) && v
 const resolveDatePickerRangeValueInfo = function(value) {
     let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
     const metadataMode = getRangeValueMode(value);
-    if (metadataMode) return {
-        mode: metadataMode,
-        source: 'metadata'
+    if (metadataMode) {
+        if ('date' === metadataMode && isDatePickerDefaultRangeBoundaryPair(value)) return {
+            mode: 'date',
+            source: 'retained-date-boundary'
+        };
+        return {
+            mode: metadataMode,
+            source: 'metadata'
+        };
+    }
+    if (options.preferDateBoundaryFallback && isDatePickerRetainedLocalBoundaryPair(value)) return {
+        mode: 'date',
+        source: 'retained-local-date-boundary'
     };
     if ('DatePicker.RangePicker' === options.component && !options.showTime) return {
         mode: 'date',
         source: 'schema'
     };
-    if (options.preferDateBoundaryFallback && options.showTime && isDatePickerRetainedLocalBoundaryPair(value)) return {
-        mode: 'date',
-        source: 'retained-local-date-boundary'
-    };
     if (options.preferDateBoundaryFallback && isDatePickerDefaultRangeBoundaryPair(value)) return {
         mode: 'date',
         source: 'retained-date-boundary'
@@ -117,7 +123,7 @@ const resolveDatePickerRangeValueInfo = function(value) {
 };
 const normalizeDatePickerParseOptions = function() {
     let options = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
-    if (false === options.utc || 'boolean' == typeof options.gmt || options.picker) return options;
+    if (false === options.utc || true === options.gmt || options.picker) return options;
     const rangeValueInfo = resolveDatePickerRangeValueInfo(options.value, {
         component: options.component,
         showTime: options.showTime,
@@ -126,10 +132,12 @@ const normalizeDatePickerParseOptions = function() {
     if (options.showTime) {
         if ('date' !== rangeValueInfo.mode || 'retained-local-date-boundary' === rangeValueInfo.source) return options;
     }
-    return {
-        ...options,
+    const { gmt, ...rest } = options;
+    if ('retained-date-boundary' === rangeValueInfo.source) return {
+        ...rest,
         gmt: true
     };
+    return rest;
 };
 const moment2str = function(value) {
     let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};

package/lib/schema-component/antd/filter/useFilterActionProps.js

@@ -183,6 +183,10 @@ const findCustomFieldSchema = (schema, key)=>{
 };
 const getDatePickerComponent = (fieldSchema)=>{
     var _fieldSchema_xcomponentprops;
+    if ((null == fieldSchema ? void 0 : fieldSchema['x-component']) === 'CollectionField') {
+        var _fieldSchema_xcomponentprops1;
+        return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1.component;
+    }
     return (null == fieldSchema ? void 0 : fieldSchema['x-component']) || (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
 };
 const getDatePickerShowTime = (fieldSchema)=>{

package/lib/schema-component/antd/upload/ReadPretty.js

@@ -39,8 +39,8 @@ __webpack_require__.d(__webpack_exports__, {
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
-const icons_namespaceObject = require("@ant-design/icons");
 const client_namespaceObject = require("@tego/client");
+const icons_namespaceObject = require("@ant-design/icons");
 const external_antd_namespaceObject = require("antd");
 const style_namespaceObject = require("antd/es/upload/style");
 var style_default = /*#__PURE__*/ __webpack_require__.n(style_namespaceObject);
@@ -61,6 +61,7 @@ ReadPretty.File = function(props) {
     const app = (0, index_js_namespaceObject.useApp)();
     const [fileIndex, setFileIndex] = (0, external_react_namespaceObject.useState)(0);
     const [visible, setVisible] = (0, external_react_namespaceObject.useState)(false);
+    const [rotate, setRotate] = (0, external_react_namespaceObject.useState)(0);
     const { wrapSSR, hashId, componentCls: prefixCls } = (0, external_style_js_namespaceObject.useStyles)();
     const useUploadStyleVal = style_default()["default"] ? style_default()["default"] : style_default();
     const previewList = app.AttachmentPreviewManager.get();
@@ -106,8 +107,14 @@ ReadPretty.File = function(props) {
                     e.stopPropagation();
                     setVisible(false);
                 },
-                onMovePrevRequest: ()=>setFileIndex((fileIndex + images.length - 1) % images.length),
-                onMoveNextRequest: ()=>setFileIndex((fileIndex + 1) % images.length),
+                onMovePrevRequest: ()=>{
+                    setFileIndex((fileIndex + images.length - 1) % images.length);
+                    setRotate(0);
+                },
+                onMoveNextRequest: ()=>{
+                    setFileIndex((fileIndex + 1) % images.length);
+                    setRotate(0);
+                },
                 imageTitle: null == (_images_fileIndex1 = images[fileIndex]) ? void 0 : _images_fileIndex1.title,
                 toolbarButtons: [
                     /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("button", {
@@ -127,8 +134,29 @@ ReadPretty.File = function(props) {
                             (0, external_file_saver_namespaceObject.saveAs)(file.url, "".concat(file.title).concat(file.extname));
                         },
                         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(icons_namespaceObject.DownloadOutlined, {})
-                    }, 'download')
-                ]
+                    }, 'download'),
+                    /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("button", {
+                        style: {
+                            fontSize: 22,
+                            background: 'none',
+                            lineHeight: 1
+                        },
+                        type: "button",
+                        "aria-label": "Zoom in",
+                        title: "Zoom in",
+                        className: "ril-zoom-in ril__toolbarItemChild ril__builtinButton",
+                        onClick: (e)=>{
+                            setRotate(rotate + 90);
+                        },
+                        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(icons_namespaceObject.RotateRightOutlined, {})
+                    }, 'rotate')
+                ],
+                otherProps: {
+                    style: {
+                        transform: "rotate(".concat(rotate, "deg)"),
+                        transition: 'transform 0.3s'
+                    }
+                }
             })
         ]
     }));

package/lib/schema-component/antd/upload/Upload.js

@@ -40,8 +40,8 @@ __webpack_require__.d(__webpack_exports__, {
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
-const icons_namespaceObject = require("@ant-design/icons");
 const client_namespaceObject = require("@tego/client");
+const icons_namespaceObject = require("@ant-design/icons");
 const external_antd_namespaceObject = require("antd");
 const external_classnames_namespaceObject = require("classnames");
 var external_classnames_default = /*#__PURE__*/ __webpack_require__.n(external_classnames_namespaceObject);
@@ -68,6 +68,7 @@ Upload_Upload.Attachment = (0, schema_namespaceObject.connect)((props)=>{
     const images = fileList;
     const [fileIndex, setFileIndex] = (0, external_react_namespaceObject.useState)(0);
     const [visible, setVisible] = (0, external_react_namespaceObject.useState)(false);
+    const [rotate, setRotate] = (0, external_react_namespaceObject.useState)(0);
     const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
     const uploadProps = (0, external_shared_js_namespaceObject.useUploadProps)({
         ...props
@@ -164,8 +165,14 @@ Upload_Upload.Attachment = (0, schema_namespaceObject.connect)((props)=>{
                 prevFile: images[(fileIndex + images.length - 1) % images.length],
                 previewList: previewList,
                 onCloseRequest: ()=>setVisible(false),
-                onMovePrevRequest: ()=>setFileIndex((fileIndex + images.length - 1) % images.length),
-                onMoveNextRequest: ()=>setFileIndex((fileIndex + 1) % images.length),
+                onMovePrevRequest: ()=>{
+                    setFileIndex((fileIndex + images.length - 1) % images.length);
+                    setRotate(0);
+                },
+                onMoveNextRequest: ()=>{
+                    setFileIndex((fileIndex + 1) % images.length);
+                    setRotate(0);
+                },
                 imageTitle: null == (_images_fileIndex1 = images[fileIndex]) ? void 0 : _images_fileIndex1.title,
                 toolbarButtons: [
                     /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("button", {
@@ -180,12 +187,34 @@ Upload_Upload.Attachment = (0, schema_namespaceObject.connect)((props)=>{
                         className: "ril-zoom-in ril__toolbarItemChild ril__builtinButton",
                         onClick: (e)=>{
                             e.preventDefault();
+                            e.stopPropagation();
                             const file = images[fileIndex];
                             (0, external_file_saver_namespaceObject.saveAs)(file.url, "".concat(file.title).concat(file.extname));
                         },
                         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(icons_namespaceObject.DownloadOutlined, {})
-                    }, 'preview-img')
-                ]
+                    }, 'download'),
+                    /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("button", {
+                        style: {
+                            fontSize: 22,
+                            background: 'none',
+                            lineHeight: 1
+                        },
+                        type: "button",
+                        "aria-label": "Zoom in",
+                        title: "Zoom in",
+                        className: "ril-zoom-in ril__toolbarItemChild ril__builtinButton",
+                        onClick: (e)=>{
+                            setRotate(rotate + 90);
+                        },
+                        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(icons_namespaceObject.RotateRightOutlined, {})
+                    }, 'rotate')
+                ],
+                otherProps: {
+                    style: {
+                        transform: "rotate(".concat(rotate, "deg)"),
+                        transition: 'transform 0.3s'
+                    }
+                }
             })
         ]
     }));

package/lib/schema-initializer/items/CustomFilterFormItemInitializer.js

@@ -377,11 +377,15 @@ const FilterCustomItemInitializer = /*#__PURE__*/ (0, external_react_namespaceOb
             },
             collectionName: collection
         };
-        if ('DatePicker' === component) {
+        if ('DatePicker' === component || 'DatePicker.RangePicker' === component) {
             schema['x-settings'] = 'fieldSettings:FilterFormItem';
             schema['x-designer-props'] = {
                 interface: 'datetime'
             };
+            schema['x-component-props'] = {
+                ...schema['x-component-props'],
+                gmt: false
+            };
         }
         insert((0, external_utils_js_namespaceObject.gridRowColWrap)(schema));
     }, [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/client",
-  "version": "1.6.19",
+  "version": "1.6.21",
   "homepage": "https://github.com/tegojs/tego-standard#readme",
   "bugs": {
     "url": "https://github.com/tegojs/tego-standard/issues"
@@ -30,8 +30,8 @@
     "@floating-ui/react": "0.26.28",
     "@js-preview/excel": "^1.7.14",
     "@lottiefiles/dotlottie-react": "^0.9.3",
-    "@tachybase/schema": "1.6.10",
-    "@tego/client": "1.6.10",
+    "@tachybase/schema": "1.6.11",
+    "@tego/client": "1.6.11",
     "ahooks": "^3.9.0",
     "antd": "5.22.5",
     "antd-style": "3.7.1",