aldehyde 0.2.196 → 0.2.198

package/src/aldehyde/module/dtmpl-view-modal.tsx

@@ -1,54 +1,54 @@
-import React, {ReactNode} from 'react'
-import { Modal} from 'antd'
-import DtmplViewCard from "./dtmpl-view-card";
-import {DtmplBaseProps} from "../tmpl/interface";
-import Scrollbars from 'react-custom-scrollbars';
-interface DtmplViewModalProps extends DtmplBaseProps{
-    title?:ReactNode,
-    open: boolean,
-    onClose: () => void,
-    width?:string|number,
-    height?:string|number,
-}
-
-interface DtmplViewModalState {
-
-}
-
-
-class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewModalState> {
-    state={
-
-    }
-
-    static defaultProps = {
-        height: "82vh",
-        width:"82vw",
-        forceRender: true,
-        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
-        open:false,
-    }
-
-    async componentDidMount() {
-
-    }
-
-    render() {
-        const {title,sourceId,code,open,onClose,width,height,serverKey,codeSource}=this.props;
-        return <Modal
-                    open={open}
-                    width={width}
-                    title={title}
-                    bodyStyle={{height: height, overflow: 'auto'}}
-                    destroyOnClose={true}
-                    centered
-                    onCancel={onClose}
-                >
-            <Scrollbars  autoHide autoHideTimeout={1000}>
-            <DtmplViewCard  codeSource={codeSource} serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
-        </Scrollbars>
-                </Modal>
-    }
-}
-
+import React, {ReactNode} from 'react'
+import { Modal} from 'antd'
+import DtmplViewCard from "./dtmpl-view-card";
+import {DtmplBaseProps} from "../tmpl/interface";
+import Scrollbars from 'react-custom-scrollbars';
+interface DtmplViewModalProps extends DtmplBaseProps{
+    title?:ReactNode,
+    open: boolean,
+    onClose: () => void,
+    width?:string|number,
+    height?:string|number,
+}
+
+interface DtmplViewModalState {
+
+}
+
+
+class DtmplViewModal extends React.PureComponent<DtmplViewModalProps, DtmplViewModalState> {
+    state={
+
+    }
+
+    static defaultProps = {
+        height: "82vh",
+        width:"82vw",
+        forceRender: true,
+        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
+        open:false,
+    }
+
+    async componentDidMount() {
+
+    }
+
+    render() {
+        const {title,sourceId,code,open,onClose,width,height,serverKey,codeSource}=this.props;
+        return <Modal
+                    open={open}
+                    width={width}
+                    title={title}
+                    bodyStyle={{height: height, overflow: 'auto'}}
+                    destroyOnClose={true}
+                    centered
+                    onCancel={onClose}
+                >
+            <Scrollbars  autoHide autoHideTimeout={1000}>
+            <DtmplViewCard  codeSource={codeSource} serverKey={serverKey} sourceId={sourceId} code={code}></DtmplViewCard>
+        </Scrollbars>
+                </Modal>
+    }
+}
+
 export default DtmplViewModal;

package/src/aldehyde/module/embed-dtmpl-edit-page.tsx

@@ -1,138 +1,138 @@
-import React, {ReactNode} from 'react';
-import {Button, Drawer, FormInstance, Modal, Popconfirm, Space,Card} from 'antd'
-import {CodeSource, DtmplBaseProps, DtmplConfig, DtmplData, FieldGroupConfig, PageType} from "../tmpl/interface";
-import DtmplForm from '../form/dtmpl-form';
-import HCDataSource from "../tmpl/hc-data-source";
-import Units from "../units";
-import HcserviceV3 from "../tmpl/hcservice-v3";
-
-interface EmbedDtmplEditPageProps  {
-    group?:FieldGroupConfig,
-    code?:string,
-    sourceId:string,
-    serverKey?:string,
-    mainCode?:string,
-    codeSource?:CodeSource,
-    onFinish: (code:string) => void,
-    defaultDtmplData?:DtmplData,
-    addTmplId?:string,
-}
-
-interface EmbedDtmplEditPageState {
-    id?:string,
-    dtmplConfig?: DtmplConfig,
-    loading?: boolean;
-    dtmplData?:DtmplData,
-}
-
-export default class EmbedDtmplEditPage extends React.PureComponent<EmbedDtmplEditPageProps, EmbedDtmplEditPageState> {
-    formRef = React.createRef<FormInstance>();
-    static defaultProps = {
-
-    }
-    state = {
-        id:'EmbedDtmplEditPage'+Units.getRandomNum(6),
-        dtmplConfig: undefined,
-        loading: true,
-        dtmplData:undefined,
-    }
-
-    async componentDidMount() {
-         await this.loadConfigData();
-    }
-
-    // async componentDidUpdate(prevProps) {
-    //     const { dtmplConfig} = this.state;
-    //     if(prevProps && prevProps!=this.props){
-    //         if(prevProps.sourceId!=this.props.sourceId || dtmplConfig==null){
-    //             await this.loadConfigData();
-    //         }else{
-    //             await this.loadData(dtmplConfig);
-    //         }
-    //     }
-    // }
-
-    componentWillUnmount(): void {
-    }
-
-    doSubmit = (actionId?: string) => {
-        const {mainCode}=this.props;
-        //if (actionId) {
-        //actionid 直接放在表单中
-        this.formRef.current.setFieldsValue({'actionId': actionId});
-        // };
-        if(mainCode){
-            this.formRef.current.setFieldsValue({'mainCode': mainCode});
-        }
-        this.formRef.current.submit();
-    }
-
-    loadConfigData = async () => {
-        const {code,sourceId,serverKey,group,addTmplId} = this.props;
-        this.setState({
-            loading: true,
-        })
-        let dtmplConfig=undefined;
-        if(code){
-            dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId,code);
-        }else{
-            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId,addTmplId);
-        }
-
-        if(dtmplConfig?.entity && dtmplConfig?.entity?.code==code){
-            let dtmplData=dtmplConfig.entity;
-            dtmplConfig.entity=undefined;
-            this.setState({
-                dtmplData,
-                id: code,
-                loading: false,
-            });
-        }else{
-            await this.loadData(dtmplConfig);
-        }
-
-        this.setState({
-            dtmplConfig,
-            loading: false,
-        })
-    }
-
-    loadData = async (dtmplConfig:DtmplConfig ) => {
-        const { sourceId, code:propsCode,defaultDtmplData,serverKey,codeSource} = this.props;
-        let code=propsCode;
-        if(!code && codeSource){
-            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
-        }
-        if (code) {
-            this.setState({
-                loading: true,
-                dtmplData:undefined,
-            })
-            const dtmplData_:DtmplData=await HcserviceV3.getDtmplData(dtmplConfig,serverKey,sourceId, code);
-            this.setState({
-                dtmplData:dtmplData_,
-                id:code,
-                loading: false,
-            })
-        }else if(defaultDtmplData){
-            this.setState({
-                dtmplData:defaultDtmplData,
-                loading: false,
-            })
-        }else{
-            this.setState({
-                dtmplData:{code:undefined,title:undefined,fieldMap:{},arrayMap:{}},
-                loading: false,
-            })
-        }
-    }
-
-
-
-    render() {
-        const {sourceId,serverKey,mainCode,onFinish} = this.props
-        const {dtmplConfig,id,dtmplData} = this.state;
-        return (<DtmplForm  serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} onFinish={onFinish} sourceId={sourceId} dtmplData={dtmplData} />)
-    }
-
+import React, {ReactNode} from 'react';
+import {Button, Drawer, FormInstance, Modal, Popconfirm, Space,Card} from 'antd'
+import {CodeSource, DtmplBaseProps, DtmplConfig, DtmplData, FieldGroupConfig, PageType} from "../tmpl/interface";
+import DtmplForm from '../form/dtmpl-form';
+import HCDataSource from "../tmpl/hc-data-source";
+import Units from "../units";
+import HcserviceV3 from "../tmpl/hcservice-v3";
+
+interface EmbedDtmplEditPageProps  {
+    group?:FieldGroupConfig,
+    code?:string,
+    sourceId:string,
+    serverKey?:string,
+    mainCode?:string,
+    codeSource?:CodeSource,
+    onFinish: (code:string) => void,
+    defaultDtmplData?:DtmplData,
+    addTmplId?:string,
+}
+
+interface EmbedDtmplEditPageState {
+    id?:string,
+    dtmplConfig?: DtmplConfig,
+    loading?: boolean;
+    dtmplData?:DtmplData,
+}
+
+export default class EmbedDtmplEditPage extends React.PureComponent<EmbedDtmplEditPageProps, EmbedDtmplEditPageState> {
+    formRef = React.createRef<FormInstance>();
+    static defaultProps = {
+
+    }
+    state = {
+        id:'EmbedDtmplEditPage'+Units.getRandomNum(6),
+        dtmplConfig: undefined,
+        loading: true,
+        dtmplData:undefined,
+    }
+
+    async componentDidMount() {
+         await this.loadConfigData();
+    }
+
+    // async componentDidUpdate(prevProps) {
+    //     const { dtmplConfig} = this.state;
+    //     if(prevProps && prevProps!=this.props){
+    //         if(prevProps.sourceId!=this.props.sourceId || dtmplConfig==null){
+    //             await this.loadConfigData();
+    //         }else{
+    //             await this.loadData(dtmplConfig);
+    //         }
+    //     }
+    // }
+
+    componentWillUnmount(): void {
+    }
+
+    doSubmit = (actionId?: string) => {
+        const {mainCode}=this.props;
+        //if (actionId) {
+        //actionid 直接放在表单中
+        this.formRef.current.setFieldsValue({'actionId': actionId});
+        // };
+        if(mainCode){
+            this.formRef.current.setFieldsValue({'mainCode': mainCode});
+        }
+        this.formRef.current.submit();
+    }
+
+    loadConfigData = async () => {
+        const {code,sourceId,serverKey,group,addTmplId} = this.props;
+        this.setState({
+            loading: true,
+        })
+        let dtmplConfig=undefined;
+        if(code){
+            dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId,code);
+        }else{
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId,addTmplId);
+        }
+
+        if(dtmplConfig?.entity && dtmplConfig?.entity?.code==code){
+            let dtmplData=dtmplConfig.entity;
+            dtmplConfig.entity=undefined;
+            this.setState({
+                dtmplData,
+                id: code,
+                loading: false,
+            });
+        }else{
+            await this.loadData(dtmplConfig);
+        }
+
+        this.setState({
+            dtmplConfig,
+            loading: false,
+        })
+    }
+
+    loadData = async (dtmplConfig:DtmplConfig ) => {
+        const { sourceId, code:propsCode,defaultDtmplData,serverKey,codeSource} = this.props;
+        let code=propsCode;
+        if(!code && codeSource){
+            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
+        }
+        if (code) {
+            this.setState({
+                loading: true,
+                dtmplData:undefined,
+            })
+            const dtmplData_:DtmplData=await HcserviceV3.getDtmplData(dtmplConfig,serverKey,sourceId, code);
+            this.setState({
+                dtmplData:dtmplData_,
+                id:code,
+                loading: false,
+            })
+        }else if(defaultDtmplData){
+            this.setState({
+                dtmplData:defaultDtmplData,
+                loading: false,
+            })
+        }else{
+            this.setState({
+                dtmplData:{code:undefined,title:undefined,fieldMap:{},arrayMap:{}},
+                loading: false,
+            })
+        }
+    }
+
+
+
+    render() {
+        const {sourceId,serverKey,mainCode,onFinish} = this.props
+        const {dtmplConfig,id,dtmplData} = this.state;
+        return (<DtmplForm  serverKey={serverKey} mainCode={mainCode} parentId={id} dtmplConfig={dtmplConfig} formRef={this.formRef} onFinish={onFinish} sourceId={sourceId} dtmplData={dtmplData} />)
+    }
+
 }

package/src/aldehyde/module/ltmpl-drawer.tsx

@@ -1,58 +1,58 @@
-import React, {ReactNode} from 'react';
-import {Drawer} from 'antd'
-import LtmplTable, {LtmplTableProps} from "./ltmpl-table";
-
-
-interface LtmplDrawPageProps extends LtmplTableProps {
-    onCancel: () => void,
-    placement?:'top' | 'right' | 'bottom' | 'left',
-    title?:ReactNode,
-    width?:number,
-    open:boolean,
-}
-
-interface LtmplDrawPageState {
-
-}
-
-export default class LtmplDrawer extends React.PureComponent<LtmplDrawPageProps, LtmplDrawPageState> {
-
-    static defaultProps = {
-        showConfirm: true,
-        width:'76vw',
-        forceRender: true,
-        style: {maxWidth: '92vw', maxHeight: '92vh'},
-        okText: "确定",
-        cancelText: "取消",
-        placement:'left',
-    }
-    state = {
-
-    }
-
-
-    render() {
-        const {title,placement,width,onCancel,open,...other} = this.props
-
-        return (<Drawer
-                title={title}
-                placement={placement}
-                closable={true}
-                mask={false}
-                onClose={onCancel}
-                open={open}
-                width={width}
-                style={{
-                    maxWidth: '92vw',
-                }}
-                // extra={
-                //     <Space>{this.getFooter()}</Space>
-                // }
-            >
-                <LtmplTable {...other}></LtmplTable>
-        </Drawer>
-    )
-
-    }
-
+import React, {ReactNode} from 'react';
+import {Drawer} from 'antd'
+import LtmplTable, {LtmplTableProps} from "./ltmpl-table";
+
+
+interface LtmplDrawPageProps extends LtmplTableProps {
+    onCancel: () => void,
+    placement?:'top' | 'right' | 'bottom' | 'left',
+    title?:ReactNode,
+    width?:number,
+    open:boolean,
+}
+
+interface LtmplDrawPageState {
+
+}
+
+export default class LtmplDrawer extends React.PureComponent<LtmplDrawPageProps, LtmplDrawPageState> {
+
+    static defaultProps = {
+        showConfirm: true,
+        width:'76vw',
+        forceRender: true,
+        style: {maxWidth: '92vw', maxHeight: '92vh'},
+        okText: "确定",
+        cancelText: "取消",
+        placement:'left',
+    }
+    state = {
+
+    }
+
+
+    render() {
+        const {title,placement,width,onCancel,open,...other} = this.props
+
+        return (<Drawer
+                title={title}
+                placement={placement}
+                closable={true}
+                mask={false}
+                onClose={onCancel}
+                open={open}
+                width={width}
+                style={{
+                    maxWidth: '92vw',
+                }}
+                // extra={
+                //     <Space>{this.getFooter()}</Space>
+                // }
+            >
+                <LtmplTable {...other}></LtmplTable>
+        </Drawer>
+    )
+
+    }
+
 }

package/src/aldehyde/module/ltmpl-modal.tsx

@@ -1,62 +1,62 @@
-import React, { ReactNode } from "react";
-import { Modal, Button, Card } from "antd";
-import LtmplTable, { LtmplTableProps } from "./ltmpl-table";
-import Scrollbars from "react-custom-scrollbars";
-import { LocaleContext } from "../locale/LocaleProvider";
-
-interface LtmplDrawPageProps extends LtmplTableProps {
-  onCancel: () => void;
-  title?: ReactNode;
-  width?: number | string;
-  height?: number | string;
-  open: boolean;
-}
-
-interface LtmplDrawPageState {}
-
-export default class LtmplDrawer extends React.PureComponent<
-  LtmplDrawPageProps,
-  LtmplDrawPageState
-> {
-  static defaultProps = {
-    showConfirm: true,
-    height: "82vh",
-    width: "82vw",
-    forceRender: true,
-    style: {
-      maxWidth: "calc(100vw - 60px)",
-      maxHeight: "calc(100vh - 50px)",
-      padding: 10,
-    },
-    okText: "确定",
-    cancelText: "取消",
-  };
-  state = {};
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  render() {
-    const { title, height, width, onCancel, open, ...other } = this.props;
-    const { translate } = this.context;
-    return (
-      <Modal
-        open={open}
-        width={width}
-        title={title}
-        closable={false}
-        bodyStyle={{ height: height, overflow: "auto", padding: "6 0 6 6" }}
-        destroyOnClose={true}
-        centered
-        onOk={onCancel}
-        onCancel={onCancel}
-        footer={[<Button onClick={onCancel}>{translate("${关闭}")}</Button>]}
-      >
-        <Scrollbars autoHide autoHideTimeout={1000}>
-          <Card bordered={false} bodyStyle={{ padding: "4px 10px 0  0" }}>
-            <LtmplTable {...other}></LtmplTable>
-          </Card>
-        </Scrollbars>
-      </Modal>
-    );
-  }
-}
+import React, { ReactNode } from "react";
+import { Modal, Button, Card } from "antd";
+import LtmplTable, { LtmplTableProps } from "./ltmpl-table";
+import Scrollbars from "react-custom-scrollbars";
+import { LocaleContext } from "../locale/LocaleProvider";
+
+interface LtmplDrawPageProps extends LtmplTableProps {
+  onCancel: () => void;
+  title?: ReactNode;
+  width?: number | string;
+  height?: number | string;
+  open: boolean;
+}
+
+interface LtmplDrawPageState {}
+
+export default class LtmplDrawer extends React.PureComponent<
+  LtmplDrawPageProps,
+  LtmplDrawPageState
+> {
+  static defaultProps = {
+    showConfirm: true,
+    height: "82vh",
+    width: "82vw",
+    forceRender: true,
+    style: {
+      maxWidth: "calc(100vw - 60px)",
+      maxHeight: "calc(100vh - 50px)",
+      padding: 10,
+    },
+    okText: "确定",
+    cancelText: "取消",
+  };
+  state = {};
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  render() {
+    const { title, height, width, onCancel, open, ...other } = this.props;
+    const { translate } = this.context;
+    return (
+      <Modal
+        open={open}
+        width={width}
+        title={title}
+        closable={false}
+        bodyStyle={{ height: height, overflow: "auto", padding: "6 0 6 6" }}
+        destroyOnClose={true}
+        centered
+        onOk={onCancel}
+        onCancel={onCancel}
+        footer={[<Button onClick={onCancel}>{translate("${关闭}")}</Button>]}
+      >
+        <Scrollbars autoHide autoHideTimeout={1000}>
+          <Card bordered={false} bodyStyle={{ padding: "4px 10px 0  0" }}>
+            <LtmplTable {...other}></LtmplTable>
+          </Card>
+        </Scrollbars>
+      </Modal>
+    );
+  }
+}