aldehyde 0.2.197 → 0.2.199

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

@@ -1,142 +1,142 @@
-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} from '@ant-design/icons';
-import HCService from "../../tmpl/hcservice-v3";
-import Player from "griffith";
-// 不得已而为之
-const Player1: any = Player;
-
-
-interface FileViewProps {
-    fieldConfig: FieldConfig,
-    serverKey?: string,
-    downloadable?: boolean,
-    value: any,
-    width?: number,
-    height?: number,
-};
-
-interface FileViewState {
-    urlData?: string,
-    filePath?: CommonFilePath
-
-};
-export default class FileView extends React.PureComponent<FileViewProps, FileViewState> {
-
-    static defaultProps = {
-        downloadable: true,
-    }
-
-    state = {
-        urlData: undefined,
-        filePath: undefined,
-    }
-
-    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} = this.props;
-        if (value != preValue) {
-            this.loadData();
-        }
-    }
-
-
-    packFile2Show = () => {
-        const {urlData, filePath} = this.state;
-        const {downloadable, serverKey} = this.props;
-
-        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={filePath.iconPath ? filePath.iconPath : filePath.path}
-                    preview={{
-                        src: filePath.path,
-                    }}
-                />
-            } else if (urlData) {
-                // let urlValue = await HCService.loadFileTxt(jsonFile.base.path)
-                return <Image
-                    width={90}
-                    src={urlData}
-                    preview={{
-                        src: urlData,
-                    }}
-                />
-            } else if (['mp4', 'MP4', 'mov', 'MOV', 'avi', 'AVI', 'WMV', 'wmv', "wav", "WAV"].includes(filePath.contentType)) {
-                let sources = {
-                    ld: {
-                        play_url: filePath.path,
-                    }
-                }
-                return (<Row align={'middle'}>
-                    <Col style={{height: '60px', width: '300px'}}>
-                        <Player1 locale={'zh-Hans'} sources={sources} id={filePath.fileName}/>
-                    </Col>
-                </Row>)
-            } else if (['xlsx', 'docx', 'csv', 'webm', 'bmp'].includes(filePath.contentType)) {
-                return <DrawerFileView serverKey={serverKey} filePath={filePath}
-                                       downloadable={downloadable}></DrawerFileView>
-            } 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">{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'>
-                    {/*<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">{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} from '@ant-design/icons';
+import HCService from "../../tmpl/hcservice-v3";
+import Player from "griffith";
+// 不得已而为之
+const Player1: any = Player;
+
+
+interface FileViewProps {
+    fieldConfig: FieldConfig,
+    serverKey?: string,
+    downloadable?: boolean,
+    value: any,
+    width?: number,
+    height?: number,
+};
+
+interface FileViewState {
+    urlData?: string,
+    filePath?: CommonFilePath
+
+};
+export default class FileView extends React.PureComponent<FileViewProps, FileViewState> {
+
+    static defaultProps = {
+        downloadable: true,
+    }
+
+    state = {
+        urlData: undefined,
+        filePath: undefined,
+    }
+
+    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} = this.props;
+        if (value != preValue) {
+            this.loadData();
+        }
+    }
+
+
+    packFile2Show = () => {
+        const {urlData, filePath} = this.state;
+        const {downloadable, serverKey} = this.props;
+
+        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={filePath.iconPath ? filePath.iconPath : filePath.path}
+                    preview={{
+                        src: filePath.path,
+                    }}
+                />
+            } else if (urlData) {
+                // let urlValue = await HCService.loadFileTxt(jsonFile.base.path)
+                return <Image
+                    width={90}
+                    src={urlData}
+                    preview={{
+                        src: urlData,
+                    }}
+                />
+            } else if (['mp4', 'MP4', 'mov', 'MOV', 'avi', 'AVI', 'WMV', 'wmv', "wav", "WAV"].includes(filePath.contentType)) {
+                let sources = {
+                    ld: {
+                        play_url: filePath.path,
+                    }
+                }
+                return (<Row align={'middle'}>
+                    <Col style={{height: '60px', width: '300px'}}>
+                        <Player1 locale={'zh-Hans'} sources={sources} id={filePath.fileName}/>
+                    </Col>
+                </Row>)
+            } else if (['xlsx', 'docx', 'csv', 'webm', 'bmp'].includes(filePath.contentType)) {
+                return <DrawerFileView serverKey={serverKey} filePath={filePath}
+                                       downloadable={downloadable}></DrawerFileView>
+            } 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">{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'>
+                    {/*<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">{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/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>;
+    }
+
+}