aldehyde 0.2.480 → 0.2.481

package/src/aldehyde/controls/file-view/index.less

@@ -1,10 +1,10 @@
-.drawer-file-view {
-    .pdf-canvas {
-        display: flex;
-        justify-content: center;
-    }
-
-    .pdf-canvas canvas {
-        width: 80%;
-    }
+.drawer-file-view {
+    .pdf-canvas {
+        display: flex;
+        justify-content: center;
+    }
+
+    .pdf-canvas canvas {
+        width: 80%;
+    }
 }

package/src/aldehyde/controls/file-view/index.tsx

@@ -1,148 +1,148 @@
-import * as React from 'react'
-import { Button, Col, Image, Row, Space } from 'antd'
-import DrawerFileView from './drawer-file-view'
-import { FieldConfig, CommonFilePath } from "../../tmpl/interface";
-import { DownloadOutlined, PlayCircleOutlined } from '@ant-design/icons';
-import HCService from "../../tmpl/hcservice-v3";
-import Player from "griffith";
-// 不得已而为之
-const Player1: any = Player;
-
-// Image容错图片
-const fallback = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMIAAADDCAYAAADQvc6UAAABRWlDQ1BJQ0MgUHJvZmlsZQAAKJFjYGASSSwoyGFhYGDIzSspCnJ3UoiIjFJgf8LAwSDCIMogwMCcmFxc4BgQ4ANUwgCjUcG3awyMIPqyLsis7PPOq3QdDFcvjV3jOD1boQVTPQrgSkktTgbSf4A4LbmgqISBgTEFyFYuLykAsTuAbJEioKOA7DkgdjqEvQHEToKwj4DVhAQ5A9k3gGyB5IxEoBmML4BsnSQk8XQkNtReEOBxcfXxUQg1Mjc0dyHgXNJBSWpFCYh2zi+oLMpMzyhRcASGUqqCZ16yno6CkYGRAQMDKMwhqj/fAIcloxgHQqxAjIHBEugw5sUIsSQpBobtQPdLciLEVJYzMPBHMDBsayhILEqEO4DxG0txmrERhM29nYGBddr//5/DGRjYNRkY/l7////39v///y4Dmn+LgeHANwDrkl1AuO+pmgAAADhlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAAqACAAQAAAABAAAAwqADAAQAAAABAAAAwwAAAAD9b/HnAAAHlklEQVR4Ae3dP3PTWBSGcbGzM6GCKqlIBRV0dHRJFarQ0eUT8LH4BnRU0NHR0UEFVdIlFRV7TzRksomPY8uykTk/zewQfKw/9znv4yvJynLv4uLiV2dBoDiBf4qP3/ARuCRABEFAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghggQAQZQKAnYEaQBAQaASKIAQJEkAEEegJmBElAoBEgghgg0Aj8i0JO4OzsrPv69Wv+hi2qPHr0qNvf39+iI97soRIh4f3z58/u7du3SXX7Xt7Z2enevHmzfQe+oSN2apSAPj09TSrb+XKI/f379+08+A0cNRE2ANkupk+ACNPvkSPcAAEibACyXUyfABGm3yNHuAECRNgAZLuYPgEirKlHu7u7XdyytGwHAd8jjNyng4OD7vnz51dbPT8/7z58+NB9+/bt6jU/TI+AGWHEnrx48eJ/EsSmHzx40L18+fLyzxF3ZVMjEyDCiEDjMYZZS5wiPXnyZFbJaxMhQIQRGzHvWR7XCyOCXsOmiDAi1HmPMMQjDpbpEiDCiL358eNHurW/5SnWdIBbXiDCiA38/Pnzrce2YyZ4//59F3ePLNMl4PbpiL2J0L979+7yDtHDhw8vtzzvdGnEXdvUigSIsCLAWavHp/+qM0BcXMd/q25n1vF57TYBp0a3mUzilePj4+7k5KSLb6gt6ydAhPUzXnoPR0dHl79WGTNCfBnn1uvSCJdegQhLI1vvCk+fPu2ePXt2tZOYEV6/fn31dz+shwAR1sP1cqvLntbEN9MxA9xcYjsxS1jWR4AIa2Ibzx0tc44fYX/16lV6NDFLXH+YL32jwiACRBiEbf5KcXoTIsQSpzXx4N28Ja4BQoK7rgXiydbHjx/P25TaQAJEGAguWy0+2Q8PD6/Ki4R8EVl+bzBOnZY95fq9rj9zAkTI2SxdidBHqG9+skdw43borCXO/ZcJdraPWdv22uIEiLA4q7nvvCug8WTqzQveOH26fodo7g6uFe/a17W3+nFBAkRYENRdb1vkkz1CH9cPsVy/jrhr27PqMYvENYNlHAIesRiBYwRy0V+8iXP8+/fvX11Mr7L7ECueb/r48eMqm7FuI2BGWDEG8cm+7G3NEOfmdcTQw4h9/55lhm7DekRYKQPZF2ArbXTAyu4kDYB2YxUzwg0gi/41ztHnfQG26HbGel/crVrm7tNY+/1btkOEAZ2M05r4FB7r9GbAIdxaZYrHdOsgJ/wCEQY0J74TmOKnbxxT9n3FgGGWWsVdowHtjt9Nnvf7yQM2aZU/TIAIAxrw6dOnAWtZZcoEnBpNuTuObWMEiLAx1HY0ZQJEmHJ3HNvGCBBhY6jtaMoEiJB0Z29vL6ls58vxPcO8/zfrdo5qvKO+d3Fx8Wu8zf1dW4p/cPzLly/dtv9Ts/EbcvGAHhHyfBIhZ6NSiIBTo0LNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiECRCjUbEPNCRAhZ6NSiAARCjXbUHMCRMjZqBQiQIRCzTbUnAARcjYqhQgQoVCzDTUnQIScjUohAkQo1GxDzQkQIWejUogAEQo121BzAkTI2agUIkCEQs021JwAEXI2KoUIEKFQsw01J0CEnI1KIQJEKNRsQ80JECFno1KIABEKNdtQcwJEyNmoFCJAhELNNtScABFyNiqFCBChULMNNSdAhJyNSiEC/wGgKKC4YMA4TAAAAABJRU5ErkJggg==";
-
-export interface FileViewProps {
-    fieldConfig: FieldConfig,
-    serverKey?: string,
-    downloadable?: boolean,
-    value: any,
-    width?: number,
-    height?: number,
-};
-
-interface FileViewState {
-    urlData?: string,
-    filePath?: CommonFilePath,
-    playing?: boolean,
-
-};
-export default class FileView extends React.PureComponent<FileViewProps, FileViewState> {
-
-    static defaultProps = {
-        downloadable: true,
-    }
-
-    state = {
-        urlData: undefined,
-        filePath: undefined,
-        playing: false,
-    }
-
-    loadData = async () => {
-        const { value, serverKey } = this.props;
-        let filePath: CommonFilePath = undefined;
-        let urlData: undefined;
-        filePath = HCService.toFilePath(value, serverKey);
-        if (filePath?.baseType && /^image\/\w+;base64/.test(filePath?.baseType)) {
-            urlData = await HCService.loadFileTxt(serverKey, filePath?.basePath)
-        }
-        if (value) {
-            this.setState({
-                filePath, urlData
-            })
-        }
-    }
-
-    componentDidMount() {
-        this.loadData();
-    }
-
-    componentDidUpdate(prevProps, prevState, snapshot) {
-        const { value } = this.props;
-        const { value: preValue } = prevProps;
-        if (value != preValue) {
-            this.loadData();
-        }
-    }
-
-
-    packFile2Show = () => {
-        const { urlData, filePath, playing } = this.state;
-        const { downloadable, serverKey, fieldConfig } = this.props;
-        const { preview, isFallback, defShowIcon = true } = fieldConfig;
-
-        let path = undefined;
-        let fileName = undefined;
-        let isNew = false;
-
-        if (filePath) {
-            if ("new" == filePath.valid) {
-                return filePath.fileName
-            } else if ("delete" == filePath.valid) {
-                return undefined;
-            } else if (['png', 'jpg', 'jpeg', 'gif', 'PNG', 'JPG', 'JPEG', 'GIF', 'svg', 'SVG'].includes(filePath.contentType)) {
-                return <Image
-                    width={90}
-                    src={defShowIcon && filePath.iconPath ? filePath.iconPath : filePath.path}
-                    preview={preview || preview === false ? preview : { src: filePath.path }}
-                    fallback={isFallback ? fallback : undefined}
-                />
-            } else if (urlData) {
-                // let urlValue = await HCService.loadFileTxt(jsonFile.base.path)
-                return <Image
-                    width={90}
-                    src={urlData}
-                    preview={preview || preview === false ? preview : { src: urlData }}
-                    fallback={isFallback ? fallback : undefined}
-                />
-            } else if (['mp4', 'MP4', 'mov', 'MOV', 'avi', 'AVI', 'WMV', 'wmv', "wav", "WAV"].includes(filePath.contentType)) {
-                let sources = {
-                    ld: {
-                        play_url: filePath.path,
-                    }
-                }
-                return (<Row>
-                    {playing ?
-                        <Col style={{ height: '60px', width: '300px' }}>
-                            <Player1 locale={'zh-Hans'} autoplay={true} sources={sources} id={filePath.fileName} />
-                        </Col> : <Col >
-                            <Button type={"link"} onClick={() => { this.setState({ playing: true }) }}
-                                icon={<PlayCircleOutlined />}>{'播放'}</Button>
-                        </Col>}
-                </Row>)
-            } else if (['xlsx', 'docx', 'csv', 'webm', 'bmp'].includes(filePath.contentType)) {
-                return <DrawerFileView serverKey={serverKey} filePath={filePath}
-                    downloadable={downloadable} contentType={filePath.contentType} />
-            } else if (['pdf', 'txt'].includes(filePath.contentType)) {
-                return <span className='labelcss'>
-                    {/*<a href={this.getFileUrl(file.base.path)}>{file.base.fileName}</a>*/}
-                    <Button type={'link'} onClick={async () => {
-                        await HCService.openfileDir(filePath.path, filePath.fileName, downloadable ? "" : '#toolbar=0');
-                    }} size="small" style={{ margin: 0 }}>{filePath.fileName}</Button>
-                    {downloadable ? <Button type={'text'} onClick={async () => {
-                        await HCService.downloadDir(filePath.path, filePath.fileName);
-                    }} size="small"><DownloadOutlined /></Button> : null}
-                </span>
-            } else {
-                return <Space className='labelcss' size={1}>
-                    {/*<a href={this.getFileUrl(file.base.path)}>{file.base.fileName}</a>*/}
-                    {downloadable ? <><Button type={'link'} onClick={async () => {
-                        await HCService.download(serverKey, filePath.path);
-                    }} size="small" style={{ margin: 0 }}>{filePath.fileName}</Button>
-                        <Button type={'text'} onClick={async () => {
-                            await HCService.downloadDir(filePath.path, filePath.fileName);
-                        }} size="small" icon={<DownloadOutlined />}></Button></> :
-                        <Button type={'text'} size="small">{filePath.fileName}</Button>}
-                </Space>
-            }
-        } else {
-            return undefined;
-        }
-
-    }
-
-    render() {
-        return <>{this.packFile2Show()}</>;
-    }
-
-}
+import * as React from 'react'
+import { Button, Col, Image, Row, Space } from 'antd'
+import DrawerFileView from './drawer-file-view'
+import { FieldConfig, CommonFilePath } from "../../tmpl/interface";
+import { DownloadOutlined, PlayCircleOutlined } from '@ant-design/icons';
+import HCService from "../../tmpl/hcservice-v3";
+import Player from "griffith";
+// 不得已而为之
+const Player1: any = Player;
+
+// Image容错图片
+const fallback = "data:image/png;base64,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";
+
+export interface FileViewProps {
+    fieldConfig: FieldConfig,
+    serverKey?: string,
+    downloadable?: boolean,
+    value: any,
+    width?: number,
+    height?: number,
+};
+
+interface FileViewState {
+    urlData?: string,
+    filePath?: CommonFilePath,
+    playing?: boolean,
+
+};
+export default class FileView extends React.PureComponent<FileViewProps, FileViewState> {
+
+    static defaultProps = {
+        downloadable: true,
+    }
+
+    state = {
+        urlData: undefined,
+        filePath: undefined,
+        playing: false,
+    }
+
+    loadData = async () => {
+        const { value, serverKey } = this.props;
+        let filePath: CommonFilePath = undefined;
+        let urlData: undefined;
+        filePath = HCService.toFilePath(value, serverKey);
+        if (filePath?.baseType && /^image\/\w+;base64/.test(filePath?.baseType)) {
+            urlData = await HCService.loadFileTxt(serverKey, filePath?.basePath)
+        }
+        if (value) {
+            this.setState({
+                filePath, urlData
+            })
+        }
+    }
+
+    componentDidMount() {
+        this.loadData();
+    }
+
+    componentDidUpdate(prevProps, prevState, snapshot) {
+        const { value } = this.props;
+        const { value: preValue } = prevProps;
+        if (value != preValue) {
+            this.loadData();
+        }
+    }
+
+
+    packFile2Show = () => {
+        const { urlData, filePath, playing } = this.state;
+        const { downloadable, serverKey, fieldConfig } = this.props;
+        const { preview, isFallback, defShowIcon = true } = fieldConfig;
+
+        let path = undefined;
+        let fileName = undefined;
+        let isNew = false;
+
+        if (filePath) {
+            if ("new" == filePath.valid) {
+                return filePath.fileName
+            } else if ("delete" == filePath.valid) {
+                return undefined;
+            } else if (['png', 'jpg', 'jpeg', 'gif', 'PNG', 'JPG', 'JPEG', 'GIF', 'svg', 'SVG'].includes(filePath.contentType)) {
+                return <Image
+                    width={90}
+                    src={defShowIcon && filePath.iconPath ? filePath.iconPath : filePath.path}
+                    preview={preview || preview === false ? preview : { src: filePath.path }}
+                    fallback={isFallback ? fallback : undefined}
+                />
+            } else if (urlData) {
+                // let urlValue = await HCService.loadFileTxt(jsonFile.base.path)
+                return <Image
+                    width={90}
+                    src={urlData}
+                    preview={preview || preview === false ? preview : { src: urlData }}
+                    fallback={isFallback ? fallback : undefined}
+                />
+            } else if (['mp4', 'MP4', 'mov', 'MOV', 'avi', 'AVI', 'WMV', 'wmv', "wav", "WAV"].includes(filePath.contentType)) {
+                let sources = {
+                    ld: {
+                        play_url: filePath.path,
+                    }
+                }
+                return (<Row>
+                    {playing ?
+                        <Col style={{ height: '60px', width: '300px' }}>
+                            <Player1 locale={'zh-Hans'} autoplay={true} sources={sources} id={filePath.fileName} />
+                        </Col> : <Col >
+                            <Button type={"link"} onClick={() => { this.setState({ playing: true }) }}
+                                icon={<PlayCircleOutlined />}>{'播放'}</Button>
+                        </Col>}
+                </Row>)
+            } else if (['xlsx', 'docx', 'csv', 'webm', 'bmp'].includes(filePath.contentType)) {
+                return <DrawerFileView serverKey={serverKey} filePath={filePath}
+                    downloadable={downloadable} contentType={filePath.contentType} />
+            } else if (['pdf', 'txt'].includes(filePath.contentType)) {
+                return <span className='labelcss'>
+                    {/*<a href={this.getFileUrl(file.base.path)}>{file.base.fileName}</a>*/}
+                    <Button type={'link'} onClick={async () => {
+                        await HCService.openfileDir(filePath.path, filePath.fileName, downloadable ? "" : '#toolbar=0');
+                    }} size="small" style={{ margin: 0 }}>{filePath.fileName}</Button>
+                    {downloadable ? <Button type={'text'} onClick={async () => {
+                        await HCService.downloadDir(filePath.path, filePath.fileName);
+                    }} size="small"><DownloadOutlined /></Button> : null}
+                </span>
+            } else {
+                return <Space className='labelcss' size={1}>
+                    {/*<a href={this.getFileUrl(file.base.path)}>{file.base.fileName}</a>*/}
+                    {downloadable ? <><Button type={'link'} onClick={async () => {
+                        await HCService.download(serverKey, filePath.path);
+                    }} size="small" style={{ margin: 0 }}>{filePath.fileName}</Button>
+                        <Button type={'text'} onClick={async () => {
+                            await HCService.downloadDir(filePath.path, filePath.fileName);
+                        }} size="small" icon={<DownloadOutlined />}></Button></> :
+                        <Button type={'text'} size="small">{filePath.fileName}</Button>}
+                </Space>
+            }
+        } else {
+            return undefined;
+        }
+
+    }
+
+    render() {
+        return <>{this.packFile2Show()}</>;
+    }
+
+}

package/src/aldehyde/controls/file-view/multi-file-view.tsx

@@ -1,39 +1,39 @@
-import * as React from 'react'
-import { Space } from 'antd'
-import FileView, { FileViewProps } from "./index";
-
-interface MultiFileViewProps extends FileViewProps {
-
-};
-
-interface MultiFileViewState {
-
-};
-
-export default class MultiFileView extends React.PureComponent<MultiFileViewProps, MultiFileViewState> {
-    static defaultProps = {
-
-    }
-
-    render() {
-        const { value } = this.props;
-        let value_1;
-        let fileList = [];
-        if (value && typeof value == "string" && value !== "") {
-            value_1 = JSON.parse(value);
-            if (value_1 instanceof Array) {
-                fileList = value_1.map(r => typeof r == "string" && r.includes("@R@") ? r.split("@R@")[1] : r);
-            } else {
-                fileList.push(typeof value_1 == "string" && value_1.includes("@R@") ? value_1.split("@R@")[1] : value_1);
-            }
-        } else if (value && value instanceof Array) {
-            fileList = value.map(r => typeof r == "string" && r.includes("@R@") ? r.split("@R@")[1] : r);
-        }
-
-        return <Space wrap={true}>
-            {fileList.map(f => <FileView {...this.props} value={f} />)}
-        </Space>
-
-    }
-
-}
+import * as React from 'react'
+import { Space } from 'antd'
+import FileView, { FileViewProps } from "./index";
+
+interface MultiFileViewProps extends FileViewProps {
+
+};
+
+interface MultiFileViewState {
+
+};
+
+export default class MultiFileView extends React.PureComponent<MultiFileViewProps, MultiFileViewState> {
+    static defaultProps = {
+
+    }
+
+    render() {
+        const { value } = this.props;
+        let value_1;
+        let fileList = [];
+        if (value && typeof value == "string" && value !== "") {
+            value_1 = JSON.parse(value);
+            if (value_1 instanceof Array) {
+                fileList = value_1.map(r => typeof r == "string" && r.includes("@R@") ? r.split("@R@")[1] : r);
+            } else {
+                fileList.push(typeof value_1 == "string" && value_1.includes("@R@") ? value_1.split("@R@")[1] : value_1);
+            }
+        } else if (value && value instanceof Array) {
+            fileList = value.map(r => typeof r == "string" && r.includes("@R@") ? r.split("@R@")[1] : r);
+        }
+
+        return <Space wrap={true}>
+            {fileList.map(f => <FileView {...this.props} value={f} />)}
+        </Space>
+
+    }
+
+}

package/src/aldehyde/controls/file-view/newin-file-view.tsx

@@ -1,40 +1,40 @@
-import * as React from 'react'
-import {Button, Drawer, Space, Spin} from 'antd'
-import {ReadOutlined, DownloadOutlined, CloseOutlined} from '@ant-design/icons'
-
-import {CommonFilePath} from "../../tmpl/interface";
-import HCService from "../../tmpl/hcservice-v3";
-import loadable from '@loadable/component';
-
-const Loading = <Spin tip="Loading...">
-</Spin>
-const FileViewer = loadable(() =>
-    import('react-file-viewer'), {fallback: Loading});
-
-interface NewinFileViewProps {
-    filePath: CommonFilePath,
-    title?: string,
-    serverKey?: string,
-    downloadable?: boolean,
-};
-
-interface NewinFileViewState {
-};
-export default class DrawerFileView extends React.PureComponent<NewinFileViewProps, NewinFileViewState> {
-    static defaultProps = {
-        downloadable: false,
-    }
-    render() {
-        const {filePath, downloadable, serverKey, title} = this.props;
-        // @ts-ignore
-        return <span className='labelcss'>
-                        <Button  onClick={() => {
-                            window.open(filePath.path,"_blank")
-                        }} size="small">{title ? title : filePath.fileName}</Button>
-            {downloadable ? <Button type={'text'} onClick={() => {
-                HCService.downloadDir(filePath.path, filePath.fileName);
-            }} size="small"><DownloadOutlined/></Button> : null}
-                      </span>;
-    }
-
-}
+import * as React from 'react'
+import {Button, Drawer, Space, Spin} from 'antd'
+import {ReadOutlined, DownloadOutlined, CloseOutlined} from '@ant-design/icons'
+
+import {CommonFilePath} from "../../tmpl/interface";
+import HCService from "../../tmpl/hcservice-v3";
+import loadable from '@loadable/component';
+
+const Loading = <Spin tip="Loading...">
+</Spin>
+const FileViewer = loadable(() =>
+    import('react-file-viewer'), {fallback: Loading});
+
+interface NewinFileViewProps {
+    filePath: CommonFilePath,
+    title?: string,
+    serverKey?: string,
+    downloadable?: boolean,
+};
+
+interface NewinFileViewState {
+};
+export default class DrawerFileView extends React.PureComponent<NewinFileViewProps, NewinFileViewState> {
+    static defaultProps = {
+        downloadable: false,
+    }
+    render() {
+        const {filePath, downloadable, serverKey, title} = this.props;
+        // @ts-ignore
+        return <span className='labelcss'>
+                        <Button  onClick={() => {
+                            window.open(filePath.path,"_blank")
+                        }} size="small">{title ? title : filePath.fileName}</Button>
+            {downloadable ? <Button type={'text'} onClick={() => {
+                HCService.downloadDir(filePath.path, filePath.fileName);
+            }} size="small"><DownloadOutlined/></Button> : null}
+                      </span>;
+    }
+
+}