aldehyde 0.2.479 → 0.2.481

package/src/aldehyde/controls/date-picker/index.tsx

@@ -1,200 +1,200 @@
-import React, { useMemo } from 'react'
-import { DatePicker as AntdDatePicker, TimePicker } from "antd";
-import "dayjs/locale/zh-cn";
-import dayjs from "dayjs";
-import weekday from "dayjs/plugin/weekday"
-import localeData from "dayjs/plugin/localeData"
-import { EControlProps } from "../../tmpl/interface";
-import Units from "../../units";
-import type { RangePickerProps } from 'antd/es/date-picker';
-import utc from "dayjs/plugin/utc";
-import timezone from "dayjs/plugin/timezone";
-import { useLocale } from "../../locale/useLocale";
-
-dayjs.locale("zh-cn");
-dayjs.extend(utc);
-dayjs.extend(weekday)
-dayjs.extend(timezone);
-dayjs.extend(localeData);
-
-const { RangePicker } = AntdDatePicker;
-
-// 默认显示预设时间范围
-const defShowPresets = {
-    "last1days": { label: "最近1天", value: [dayjs().subtract(1, 'day'), dayjs()] },
-    "yesterday": { label: "昨天", value: [dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day')] },
-    "currentDay": { label: "今天", value: [dayjs().startOf('day'), dayjs().endOf('day')] },
-};
-
-// 预设时间范围
-const defPresets = {
-    "currentYear": { label: "本年", value: [dayjs().startOf('year'), dayjs().endOf('year')] },
-    "lastYear": { label: "上年", value: [dayjs().subtract(1, 'year').startOf('year'), dayjs().subtract(1, 'year').endOf('year')] },
-    "currentMonth": { label: "本月", value: [dayjs().startOf('month'), dayjs().endOf('month')] },
-    "lastMonth": { label: "上月", value: [dayjs().subtract(1, 'month').startOf('month'), dayjs().subtract(1, 'month').endOf('month')] },
-    "last30days": { label: "最近30天", value: [dayjs().subtract(30, 'day'), dayjs()] },
-    "last15days": { label: "最近15天", value: [dayjs().subtract(15, 'day'), dayjs()] },
-    "last7days": { label: "最近7天", value: [dayjs().subtract(7, 'day'), dayjs()] },
-    ...defShowPresets,
-    "last12hours": { label: "最近12小时", value: [dayjs().subtract(12, 'hour'), dayjs()] },
-    "last6hours": { label: "最近6小时", value: [dayjs().subtract(6, 'hour'), dayjs()] },
-    "last1hour": { label: "最近1小时", value: [dayjs().subtract(1, 'hour'), dayjs()] },
-    "last30minutes": { label: "最近30分钟", value: [dayjs().subtract(30, 'minute'), dayjs()] },
-    "last15minutes": { label: "最近15分钟", value: [dayjs().subtract(15, 'minute'), dayjs()] },
-};
-
-interface DatePickerProps extends EControlProps { }
-
-const DatePicker: React.FC<DatePickerProps> = (props) => {
-    const { id, value: propsValue, itemType, fieldConfig, onChange, style, min, max } = props;
-    const { dateControlShortcutKeys } = fieldConfig || {};
-    const { translate } = useLocale();
-
-    let value = propsValue;
-    // value="2025-03-20 00:00:00"
-    let format = Units.getDayjsFormat(itemType);
-    //value= Units.formateDate(propsValue,format);
-    const changeValue = (value, dateString) => {
-        if (onChange) {
-            onChange(value ? value.format(format) : undefined);
-        }
-    }
-
-    const changeRangeValue = (value, dateString) => {
-        if (onChange) {
-            if (!value) {
-                onChange(value);
-            } else if (value.length === 2 && value[0] && value[1]) {
-                onChange(value[0].format(format) + "~" + value[1].format(format));
-            }
-        }
-    }
-
-    const disabledDate: RangePickerProps['disabledDate'] = current => {
-        // console.log('current',dayjs(min,format).format(format));
-        return current && ((max && dayjs(current.format(format), format) > dayjs(max, format)) || (min && dayjs(current.format(format), format) < dayjs(min, format)));
-    };
-
-    const presets = useMemo(() => {
-        const temArr = dateControlShortcutKeys?.map(item => defPresets[item]) || [];
-        return (temArr?.length ? temArr : Object.values(defShowPresets)).map(item => ({ ...item, label: translate("${" + item.label + "}") }));
-    }, [dateControlShortcutKeys]);
-
-    let entryControl = undefined;
-    let picker: "date" | "time" | "year" | "month" | "week" | "quarter" = "date";
-    let dayjsValue;
-    switch (itemType) {
-        case 'date-YY':
-        case 'date-M1':
-        case 'date':
-            dayjsValue = value ? dayjs(value) : undefined;
-            picker = itemType == 'date-YY' ? 'year' : itemType == 'date-M1' ? "month" : "date"
-            // @ts-ignore
-            entryControl = <AntdDatePicker
-                id={id}
-                style={{ ...style }}
-                picker={picker}
-                format={format}
-                disabledDate={disabledDate}
-                value={dayjsValue}
-                disabled={fieldConfig.disabled}
-                onChange={changeValue}
-            />;
-            break;
-        case 'datetime-HH':
-        case 'datetime-mm':
-        case 'datetime':
-            dayjsValue = value ? dayjs(value) : undefined;
-            entryControl = <AntdDatePicker
-                id={id}
-                style={{ ...style }}
-                disabledDate={disabledDate}
-                showTime={{ format: Units.getDateTimeFormat(itemType) }}
-                picker='date'
-                format={format}
-                value={dayjsValue}
-                disabled={fieldConfig.disabled}
-                onChange={changeValue}
-            />;
-            break;
-        case 'daterange-YY':
-        case 'daterange-M1':
-        case 'daterange':
-            let v1 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
-            let v2 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
-            dayjsValue = [v1 ? dayjs(v1) : undefined, v2 ? dayjs(v2) : undefined];
-            picker = itemType == 'daterange-YY' ? 'year' : itemType == 'daterange-M1' ? "month" : "date"
-            // @ts-ignore
-            entryControl = <RangePicker id={id} picker={picker}
-                style={{ ...style }}
-                format={format}
-                disabledDate={disabledDate}
-                value={dayjsValue}
-                disabled={fieldConfig.disabled}
-                onChange={changeRangeValue}
-                presets={presets}
-            />;
-            break;
-        case 'datetimerange-HH':
-        case 'datetimerange-mm':
-        case 'datetimerange':
-            const v3 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
-            const v4 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
-            dayjsValue = [v3 ? dayjs(v3) : undefined, v4 ? dayjs(v4) : undefined];
-            entryControl = <RangePicker id={id} showTime={{ format: Units.getDateTimeFormat(itemType) }}
-                format={format}
-                style={{ ...style }}
-                value={dayjsValue}
-                disabledDate={disabledDate}
-                disabled={fieldConfig.disabled}
-                onChange={changeRangeValue}
-                presets={presets}
-            />;
-            break;
-        case 'time-HH':
-            dayjsValue = value ? dayjs(value, "HH") : undefined;
-            entryControl =
-                <TimePicker id={id} value={dayjsValue}
-                    style={{ ...style }}
-                    disabled={fieldConfig.disabled} onChange={changeValue}
-                    format={format} />;
-            break;
-        case 'time-mm':
-            dayjsValue = value ? dayjs(value, 'HH:mm') : undefined;
-            entryControl =
-                <TimePicker id={id} value={dayjsValue}
-                    style={{ ...style }}
-                    disabled={fieldConfig.disabled} onChange={changeValue}
-                    format={format} />;
-            break;
-        case 'time':
-            dayjsValue = value ? dayjs(value, 'HH:mm:ss') : undefined;
-            entryControl =
-                <TimePicker id={id} value={dayjsValue}
-                    style={{ ...style }}
-                    disabled={fieldConfig.disabled} onChange={changeValue}
-                    format={format} />;
-            break;
-        case 'timerange-HH':
-        case 'timerange-mm':
-        case 'timerange':
-        case 'timerange-HH-unorder':
-        case 'timerange-mm-unorder':
-        case 'timerange-unorder':
-            const v5 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
-            const v6 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
-            dayjsValue = [v5 ? dayjs(v5) : undefined, v6 ? dayjs(v6) : undefined];
-            entryControl = <TimePicker.RangePicker order={itemType.includes('unorder') ? false : true} id={id} value={dayjsValue}
-                style={{ ...style }}
-                disabled={fieldConfig.disabled}
-                onChange={changeRangeValue} format={format} />;
-            break;
-        default:
-            break;
-    }
-
-    return entryControl;
-
-}
-
+import React, { useMemo } from 'react'
+import { DatePicker as AntdDatePicker, TimePicker } from "antd";
+import "dayjs/locale/zh-cn";
+import dayjs from "dayjs";
+import weekday from "dayjs/plugin/weekday"
+import localeData from "dayjs/plugin/localeData"
+import { EControlProps } from "../../tmpl/interface";
+import Units from "../../units";
+import type { RangePickerProps } from 'antd/es/date-picker';
+import utc from "dayjs/plugin/utc";
+import timezone from "dayjs/plugin/timezone";
+import { useLocale } from "../../locale/useLocale";
+
+dayjs.locale("zh-cn");
+dayjs.extend(utc);
+dayjs.extend(weekday)
+dayjs.extend(timezone);
+dayjs.extend(localeData);
+
+const { RangePicker } = AntdDatePicker;
+
+// 默认显示预设时间范围
+const defShowPresets = {
+    "last1days": { label: "最近1天", value: [dayjs().subtract(1, 'day'), dayjs()] },
+    "yesterday": { label: "昨天", value: [dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day')] },
+    "currentDay": { label: "今天", value: [dayjs().startOf('day'), dayjs().endOf('day')] },
+};
+
+// 预设时间范围
+const defPresets = {
+    "currentYear": { label: "本年", value: [dayjs().startOf('year'), dayjs().endOf('year')] },
+    "lastYear": { label: "上年", value: [dayjs().subtract(1, 'year').startOf('year'), dayjs().subtract(1, 'year').endOf('year')] },
+    "currentMonth": { label: "本月", value: [dayjs().startOf('month'), dayjs().endOf('month')] },
+    "lastMonth": { label: "上月", value: [dayjs().subtract(1, 'month').startOf('month'), dayjs().subtract(1, 'month').endOf('month')] },
+    "last30days": { label: "最近30天", value: [dayjs().subtract(30, 'day'), dayjs()] },
+    "last15days": { label: "最近15天", value: [dayjs().subtract(15, 'day'), dayjs()] },
+    "last7days": { label: "最近7天", value: [dayjs().subtract(7, 'day'), dayjs()] },
+    ...defShowPresets,
+    "last12hours": { label: "最近12小时", value: [dayjs().subtract(12, 'hour'), dayjs()] },
+    "last6hours": { label: "最近6小时", value: [dayjs().subtract(6, 'hour'), dayjs()] },
+    "last1hour": { label: "最近1小时", value: [dayjs().subtract(1, 'hour'), dayjs()] },
+    "last30minutes": { label: "最近30分钟", value: [dayjs().subtract(30, 'minute'), dayjs()] },
+    "last15minutes": { label: "最近15分钟", value: [dayjs().subtract(15, 'minute'), dayjs()] },
+};
+
+interface DatePickerProps extends EControlProps { }
+
+const DatePicker: React.FC<DatePickerProps> = (props) => {
+    const { id, value: propsValue, itemType, fieldConfig, onChange, style, min, max } = props;
+    const { dateControlShortcutKeys } = fieldConfig || {};
+    const { translate } = useLocale();
+
+    let value = propsValue;
+    // value="2025-03-20 00:00:00"
+    let format = Units.getDayjsFormat(itemType);
+    //value= Units.formateDate(propsValue,format);
+    const changeValue = (value, dateString) => {
+        if (onChange) {
+            onChange(value ? value.format(format) : undefined);
+        }
+    }
+
+    const changeRangeValue = (value, dateString) => {
+        if (onChange) {
+            if (!value) {
+                onChange(value);
+            } else if (value.length === 2 && value[0] && value[1]) {
+                onChange(value[0].format(format) + "~" + value[1].format(format));
+            }
+        }
+    }
+
+    const disabledDate: RangePickerProps['disabledDate'] = current => {
+        // console.log('current',dayjs(min,format).format(format));
+        return current && ((max && dayjs(current.format(format), format) > dayjs(max, format)) || (min && dayjs(current.format(format), format) < dayjs(min, format)));
+    };
+
+    const presets = useMemo(() => {
+        const temArr = dateControlShortcutKeys?.map(item => defPresets[item]) || [];
+        return (temArr?.length ? temArr : Object.values(defShowPresets)).map(item => ({ ...item, label: translate("${" + item.label + "}") }));
+    }, [dateControlShortcutKeys]);
+
+    let entryControl = undefined;
+    let picker: "date" | "time" | "year" | "month" | "week" | "quarter" = "date";
+    let dayjsValue;
+    switch (itemType) {
+        case 'date-YY':
+        case 'date-M1':
+        case 'date':
+            dayjsValue = value ? dayjs(value) : undefined;
+            picker = itemType == 'date-YY' ? 'year' : itemType == 'date-M1' ? "month" : "date"
+            // @ts-ignore
+            entryControl = <AntdDatePicker
+                id={id}
+                style={{ ...style }}
+                picker={picker}
+                format={format}
+                disabledDate={disabledDate}
+                value={dayjsValue}
+                disabled={fieldConfig.disabled}
+                onChange={changeValue}
+            />;
+            break;
+        case 'datetime-HH':
+        case 'datetime-mm':
+        case 'datetime':
+            dayjsValue = value ? dayjs(value) : undefined;
+            entryControl = <AntdDatePicker
+                id={id}
+                style={{ ...style }}
+                disabledDate={disabledDate}
+                showTime={{ format: Units.getDateTimeFormat(itemType) }}
+                picker='date'
+                format={format}
+                value={dayjsValue}
+                disabled={fieldConfig.disabled}
+                onChange={changeValue}
+            />;
+            break;
+        case 'daterange-YY':
+        case 'daterange-M1':
+        case 'daterange':
+            let v1 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
+            let v2 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
+            dayjsValue = [v1 ? dayjs(v1) : undefined, v2 ? dayjs(v2) : undefined];
+            picker = itemType == 'daterange-YY' ? 'year' : itemType == 'daterange-M1' ? "month" : "date"
+            // @ts-ignore
+            entryControl = <RangePicker id={id} picker={picker}
+                style={{ ...style }}
+                format={format}
+                disabledDate={disabledDate}
+                value={dayjsValue}
+                disabled={fieldConfig.disabled}
+                onChange={changeRangeValue}
+                presets={presets}
+            />;
+            break;
+        case 'datetimerange-HH':
+        case 'datetimerange-mm':
+        case 'datetimerange':
+            const v3 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
+            const v4 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
+            dayjsValue = [v3 ? dayjs(v3) : undefined, v4 ? dayjs(v4) : undefined];
+            entryControl = <RangePicker id={id} showTime={{ format: Units.getDateTimeFormat(itemType) }}
+                format={format}
+                style={{ ...style }}
+                value={dayjsValue}
+                disabledDate={disabledDate}
+                disabled={fieldConfig.disabled}
+                onChange={changeRangeValue}
+                presets={presets}
+            />;
+            break;
+        case 'time-HH':
+            dayjsValue = value ? dayjs(value, "HH") : undefined;
+            entryControl =
+                <TimePicker id={id} value={dayjsValue}
+                    style={{ ...style }}
+                    disabled={fieldConfig.disabled} onChange={changeValue}
+                    format={format} />;
+            break;
+        case 'time-mm':
+            dayjsValue = value ? dayjs(value, 'HH:mm') : undefined;
+            entryControl =
+                <TimePicker id={id} value={dayjsValue}
+                    style={{ ...style }}
+                    disabled={fieldConfig.disabled} onChange={changeValue}
+                    format={format} />;
+            break;
+        case 'time':
+            dayjsValue = value ? dayjs(value, 'HH:mm:ss') : undefined;
+            entryControl =
+                <TimePicker id={id} value={dayjsValue}
+                    style={{ ...style }}
+                    disabled={fieldConfig.disabled} onChange={changeValue}
+                    format={format} />;
+            break;
+        case 'timerange-HH':
+        case 'timerange-mm':
+        case 'timerange':
+        case 'timerange-HH-unorder':
+        case 'timerange-mm-unorder':
+        case 'timerange-unorder':
+            const v5 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
+            const v6 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
+            dayjsValue = [v5 ? dayjs(v5) : undefined, v6 ? dayjs(v6) : undefined];
+            entryControl = <TimePicker.RangePicker order={itemType.includes('unorder') ? false : true} id={id} value={dayjsValue}
+                style={{ ...style }}
+                disabled={fieldConfig.disabled}
+                onChange={changeRangeValue} format={format} />;
+            break;
+        default:
+            break;
+    }
+
+    return entryControl;
+
+}
+
 export default DatePicker;

package/src/aldehyde/controls/direct-file-view/drawer-file-view.tsx

@@ -1,55 +1,55 @@
-import React, { useState } from 'react';
-import { Button, Drawer, Space, Spin } from 'antd';
-import { DownloadOutlined, CloseOutlined } from '@ant-design/icons';
-import { CommonFilePath } from "../../tmpl/interface";
-import loadable from '@loadable/component';
-import Units from "../../units";
-
-const Loading = <Spin tip="Loading..." />;
-const FileViewer = loadable(() => import('react-file-viewer'), { fallback: Loading });
-
-interface DrawerFileViewProps {
-    filePath: CommonFilePath,
-    serverKey?: string,
-    downloadable?: boolean,
-};
-
-const Index = (props: DrawerFileViewProps) => {
-    const { filePath, downloadable } = props;
-    const [drawerOpen, setDrawerOpen] = useState<boolean>(false);
-    const [drawerSize, setDrawerSize] = useState<number | string>("1200px");
-
-    const download = (filePath: CommonFilePath) => {
-        Units.downloadFile(filePath.path, filePath.fileName);
-    };
-
-    return <span className='labelcss'>
-        <Button type={'link'} onClick={() => setDrawerOpen(true)} size="small" style={{ margin: 0 }}>{filePath.fileName}</Button>
-        {downloadable ? <Button type={'text'} onClick={() => download(filePath)} size="small"><DownloadOutlined /></Button> : null}
-        {drawerOpen ? <Drawer
-            title={filePath.fileName}
-            placement="left"
-            size={drawerSize}
-            resizable={{ onResize: (newSize => setDrawerSize(newSize)) }}
-            closable={false}
-            onClose={() => setDrawerOpen(false)}
-            open={drawerOpen}
-            styles={{ body: { minWidth: "1000px" } }}
-            extra={
-                <Space>
-                    {downloadable ? <Button onClick={() => download(filePath)} ><DownloadOutlined /></Button> : null}
-                    <Button onClick={() => setDrawerOpen(false)}><CloseOutlined /></Button>
-                </Space>
-            }>
-            <FileViewer
-                style={{ width: '100%' }}
-                fileType={filePath.contentType}
-                filePath={filePath.path}
-                errorComponent={undefined}
-                onError={(e) => console.log(e, 'error in file-viewer')} />
-        </Drawer> : null
-        }
-    </span>;
-}
-
+import React, { useState } from 'react';
+import { Button, Drawer, Space, Spin } from 'antd';
+import { DownloadOutlined, CloseOutlined } from '@ant-design/icons';
+import { CommonFilePath } from "../../tmpl/interface";
+import loadable from '@loadable/component';
+import Units from "../../units";
+
+const Loading = <Spin tip="Loading..." />;
+const FileViewer = loadable(() => import('react-file-viewer'), { fallback: Loading });
+
+interface DrawerFileViewProps {
+    filePath: CommonFilePath,
+    serverKey?: string,
+    downloadable?: boolean,
+};
+
+const Index = (props: DrawerFileViewProps) => {
+    const { filePath, downloadable } = props;
+    const [drawerOpen, setDrawerOpen] = useState<boolean>(false);
+    const [drawerSize, setDrawerSize] = useState<number | string>("1200px");
+
+    const download = (filePath: CommonFilePath) => {
+        Units.downloadFile(filePath.path, filePath.fileName);
+    };
+
+    return <span className='labelcss'>
+        <Button type={'link'} onClick={() => setDrawerOpen(true)} size="small" style={{ margin: 0 }}>{filePath.fileName}</Button>
+        {downloadable ? <Button type={'text'} onClick={() => download(filePath)} size="small"><DownloadOutlined /></Button> : null}
+        {drawerOpen ? <Drawer
+            title={filePath.fileName}
+            placement="left"
+            size={drawerSize}
+            resizable={{ onResize: (newSize => setDrawerSize(newSize)) }}
+            closable={false}
+            onClose={() => setDrawerOpen(false)}
+            open={drawerOpen}
+            styles={{ body: { minWidth: "1000px" } }}
+            extra={
+                <Space>
+                    {downloadable ? <Button onClick={() => download(filePath)} ><DownloadOutlined /></Button> : null}
+                    <Button onClick={() => setDrawerOpen(false)}><CloseOutlined /></Button>
+                </Space>
+            }>
+            <FileViewer
+                style={{ width: '100%' }}
+                fileType={filePath.contentType}
+                filePath={filePath.path}
+                errorComponent={undefined}
+                onError={(e) => console.log(e, 'error in file-viewer')} />
+        </Drawer> : null
+        }
+    </span>;
+}
+
 export default Index;