aldehyde 0.2.287 → 0.2.290

package/src/aldehyde/module/dtmpl-edit-card.tsx

@@ -1,314 +1,324 @@
-import React, { ReactNode } from "react";
-import { Button, FormInstance, Space, Card } from "antd";
+import React, {ReactNode} from "react";
+import {Button, FormInstance, Space, Card} from "antd";
 import {
-  DtmplBaseProps,
-  DtmplConfig,
-  DtmplData,
+    DtmplBaseProps,
+    DtmplConfig,
+    DtmplData,
 } 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";
 import Action from "../controls/action";
-import { LocaleContext } from "../locale/LocaleProvider";
+import {LocaleContext} from "../locale/LocaleProvider";
 
 interface DtmplEditCardProps extends DtmplBaseProps {
-  onOk?: (code: string) => void;
-  style?: {};
-  title?: ReactNode;
+    onOk?: (code: string) => void;
+    style?: {};
+    title?: ReactNode;
 }
 
 interface DtmplEditCardState {
-  id?: string;
-  queryingCode?:string;
-  dtmplConfig?: DtmplConfig;
-  loading?: boolean;
-  serial?: number;
-  dtmplData?: DtmplData;
+    id?: string;
+    queryingCode?: string;
+    dtmplConfig?: DtmplConfig;
+    loading?: boolean;
+    serial?: number;
+    dtmplData?: DtmplData;
 }
 
 export default class DtmplEditCard extends React.PureComponent<
-  DtmplEditCardProps,
-  DtmplEditCardState
+    DtmplEditCardProps,
+    DtmplEditCardState
 > {
-  formRef = React.createRef<FormInstance>();
-  autoSaveTimer = -1000000000000000;
-  autoSaveInterval = undefined;
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-  onClickBody = (e) => {
-    //console.log("点击了我" + this.autoSaveTimer);
-    this.autoSaveTimer = 0;
-  };
-  static defaultProps = {
-    showConfirm: false,
-    okText: "确定",
-  };
-  state = {
-    id: "dtmplEditCard" + Units.getRandomNum(6),
-    queryingCode:undefined,
-    dtmplConfig: undefined,
-    loading: true,
-    serial: 1,
-    dtmplData: undefined,
-  };
-
-  async componentDidMount() {
-    await this.loadConfigData();
-  }
+    formRef = React.createRef<FormInstance>();
+    autoSaveTimer = -1000000000000000;
+    autoSaveInterval = undefined;
+    static contextType = LocaleContext;
+    context: React.ContextType<typeof LocaleContext>;
+    onClickBody = (e) => {
+        //console.log("点击了我" + this.autoSaveTimer);
+        this.autoSaveTimer = 0;
+    };
+    static defaultProps = {
+        showConfirm: false,
+        okText: "确定",
+    };
+    state = {
+        id: "dtmplEditCard" + Units.getRandomNum(6),
+        queryingCode: undefined,
+        dtmplConfig: undefined,
+        loading: true,
+        serial: 1,
+        dtmplData: undefined,
+    };
 
-  async componentDidUpdate(prevProps) {
-    const { dtmplConfig,dtmplData,queryingCode } = this.state;
-    if (prevProps && prevProps != this.props) {
-      let code=this.props.code?this.props.code:queryingCode;
-      if (prevProps.sourceId != this.props.sourceId || dtmplConfig == null  || (!this.props.code && prevProps.code)) {
+    async componentDidMount() {
         await this.loadConfigData();
-      } else if(prevProps.sourceId != this.props.sourceId || queryingCode!=code || !dtmplData ){
-        //防止反复请求 code
-        if(code){
-          await this.loadCodeData(dtmplConfig,code);
-        }else{
-          await this.loadData(dtmplConfig);
-        }
-      }
     }
-  }
 
-  componentWillUnmount(): void {
-    if (this.autoSaveInterval) {
-      clearInterval(this.autoSaveInterval);
+    async componentDidUpdate(prevProps) {
+        const {dtmplConfig, dtmplData, queryingCode} = this.state;
+        if (prevProps && prevProps != this.props) {
+            let code = this.props.code ? this.props.code : queryingCode;
+            if (prevProps.sourceId != this.props.sourceId || dtmplConfig == null || (!this.props.code && prevProps.code)) {
+                await this.loadConfigData();
+            } else if (prevProps.sourceId != this.props.sourceId || queryingCode != code || !dtmplData) {
+                //防止反复请求 code
+                if (code) {
+                    await this.loadCodeData(dtmplConfig, code);
+                } else {
+                    await this.loadData(dtmplConfig);
+                }
+            }
+        }
     }
-  }
 
-  loadConfigData = async () => {
-    const { sourceId, code, serverKey, addTmplId } = this.props;
-    this.setState({
-      loading: true,
-    });
-    let dtmplConfig:DtmplConfig = undefined;
-    if (code) {
-      dtmplConfig = await HCDataSource.requestDtmplConfig(
-        serverKey,
-        sourceId,
-        code
-      );
-    } else {
-      dtmplConfig = await HCDataSource.requestAddDtmplConfig(
-        serverKey,
-        sourceId,
-        addTmplId
-      );
-    }
-    if(dtmplConfig.entity){
-      let dtmplData=dtmplConfig.entity;
-      dtmplConfig.entity=undefined;
-      this.setState({
-        queryingCode:code,
-        dtmplData,
-        dtmplConfig,
-        loading: false,
-      });
-    }else{
-      await this.loadData(dtmplConfig);
-      this.setState({
-        dtmplConfig,
-        loading: false,
-      });
+    componentWillUnmount(): void {
+        if (this.autoSaveInterval) {
+            clearInterval(this.autoSaveInterval);
+        }
     }
-  };
 
-  loadData = async (dtmplConfig: DtmplConfig) => {
-    const {
-      sourceId,
-      serverKey,
-      code: propsCode,
-      codeSource
-    } = this.props;
-    let code = propsCode;
-    if (!code && codeSource) {
-      code = await HcserviceV3.queryCode(sourceId, codeSource, serverKey);
-    }
-    await this.loadCodeData(dtmplConfig,code)
+    loadConfigData = async () => {
+        const {sourceId, code, serverKey, addTmplId} = this.props;
+        this.setState({
+            loading: true,
+        });
+        let dtmplConfig: DtmplConfig = undefined;
+        if (code) {
+            dtmplConfig = await HCDataSource.requestDtmplConfig(
+                serverKey,
+                sourceId,
+                code
+            );
+        } else {
+            dtmplConfig = await HCDataSource.requestAddDtmplConfig(
+                serverKey,
+                sourceId,
+                addTmplId
+            );
+        }
+        if (dtmplConfig.entity) {
+            let dtmplData = dtmplConfig.entity;
+            dtmplConfig.entity = undefined;
+            this.setState({
+                queryingCode: code,
+                dtmplData,
+                dtmplConfig,
+                loading: false,
+            });
+        } else {
+            await this.loadData(dtmplConfig);
+            this.setState({
+                dtmplConfig,
+                loading: false,
+            });
+        }
+    };
 
-  };
-  reloadData = async () => {
-    const {queryingCode,dtmplConfig}=this.state;
-    const {
-      sourceId,
-      serverKey,
-      code: propsCode,
-      codeSource
-    } = this.props;
-    let code = propsCode?propsCode:queryingCode;
-    if (!code && codeSource) {
-      code = await HcserviceV3.queryCode(sourceId, codeSource, serverKey);
-    }
-    await this.loadCodeData(dtmplConfig,code);
-  };
+    loadData = async (dtmplConfig: DtmplConfig) => {
+        const {
+            sourceId,
+            serverKey,
+            code: propsCode,
+            codeSource
+        } = this.props;
+        let code = propsCode;
+        if (!code && codeSource) {
+            code = await HcserviceV3.queryCode(sourceId, codeSource, serverKey);
+        }
+        await this.loadCodeData(dtmplConfig, code)
+
+    };
+    reloadData = async () => {
+        const {queryingCode, dtmplConfig} = this.state;
+        const {
+            sourceId,
+            serverKey,
+            code: propsCode,
+            codeSource
+        } = this.props;
+        let code = propsCode ? propsCode : queryingCode;
+        if (!code && codeSource) {
+            code = await HcserviceV3.queryCode(sourceId, codeSource, serverKey);
+        }
+        await this.loadCodeData(dtmplConfig, code);
+    };
 
 
-  loadCodeData = async (dtmplConfig: DtmplConfig,code:string) => {
-    const {
-      sourceId,
-      defaultDtmplData,
-      serverKey,
-    } = this.props;
+    loadCodeData = async (dtmplConfig: DtmplConfig, code: string) => {
+        const {
+            sourceId,
+            defaultDtmplData,
+            serverKey,
+        } = this.props;
 
-    //重设定时器
-    if (dtmplConfig.autoSaveInterval && dtmplConfig.autoSaveInterval > 0) {
-      if (this.autoSaveInterval) {
-        clearInterval(this.autoSaveInterval);
-      }
-      this.autoSaveInterval = setInterval(() => {
-        if (this.autoSaveTimer >= dtmplConfig.autoSaveInterval) {
-          // console.log('执行自动保存');
-          this.autoSaveTimer = -1000000000000000;
-          this.doSubmit(undefined);
+        //重设定时器
+        if (dtmplConfig.autoSaveInterval && dtmplConfig.autoSaveInterval > 0) {
+            if (this.autoSaveInterval) {
+                clearInterval(this.autoSaveInterval);
+            }
+            this.autoSaveInterval = setInterval(() => {
+                if (this.autoSaveTimer >= dtmplConfig.autoSaveInterval) {
+                    // console.log('执行自动保存');
+                    this.autoSaveTimer = -1000000000000000;
+                    this.doSubmit(undefined);
+                } else {
+                    this.autoSaveTimer = this.autoSaveTimer + 1;
+                }
+            }, 1000);
+        }
+
+        if (code) {
+            this.setState({
+                loading: true,
+                queryingCode: code,
+                dtmplData: undefined,
+            });
+            const dtmplData_: DtmplData = await HcserviceV3.getDtmplData(
+                dtmplConfig,
+                serverKey,
+                sourceId,
+                code
+            );
+            if ((!this.state.queryingCode || code == dtmplData_.code) &&
+                (!dtmplData_.sourceId || (this.props.sourceId == dtmplData_.sourceId))) {
+                this.setState({
+                    dtmplData: dtmplData_,
+                    id: code,
+                });
+            }
+            this.setState({
+                loading: false,
+            });
+        } else if (defaultDtmplData) {
+            this.setState({
+                dtmplData: {...defaultDtmplData},
+                loading: false,
+            });
         } else {
-          this.autoSaveTimer = this.autoSaveTimer + 1;
+            this.setState({
+                dtmplData: {
+                    code: undefined,
+                    title: undefined,
+                    fieldMap: {},
+                    arrayMap: {},
+                },
+                loading: false,
+            });
         }
-      }, 1000);
-    }
+        setTimeout(() => this.onValuesChange(), 300);
+    };
 
-    if (code) {
-      this.setState({
-        loading: true,
-        queryingCode:code,
-        dtmplData:undefined,
-      });
-      const dtmplData_: DtmplData = await HcserviceV3.getDtmplData(
-          dtmplConfig,
-          serverKey,
-          sourceId,
-          code
-      );
-      if( (!this.state.queryingCode  || code == dtmplData_.code) &&
-          (!dtmplData_.sourceId  || (this.props.sourceId==dtmplData_.sourceId))){
+    onValuesChange = () => {
         this.setState({
-          dtmplData: dtmplData_,
-          id: code,
+            serial: this.state.serial + 1,
         });
-      }
-      this.setState({
-        loading: false,
-      });
-    } else if (defaultDtmplData) {
-      this.setState({
-        dtmplData: {...defaultDtmplData},
-        loading: false,
-      });
-    } else {
-      this.setState({
-        dtmplData: {
-          code: undefined,
-          title: undefined,
-          fieldMap: {},
-          arrayMap: {},
-        },
-        loading: false,
-      });
-    }
-    setTimeout(() => this.onValuesChange(), 300);
-  };
-
-  onValuesChange = () => {
-    this.setState({
-      serial: this.state.serial + 1,
-    });
-  };
+    };
 
-  doSubmit = (actionId?: number, codes?: string[], params?: object) => {
-    const { mainCode } = this.props;
-    //if (actionId) {
-    this.formRef.current.setFieldsValue({ actionId: actionId });
+    // doSubmit = async (actionId?: number, codes?: string[], params?: object) => {
+    //     await this.doSubmit1(actionId, codes, params);
+    //     //await this.reloadData();
     // }
-    if (mainCode) {
-      this.formRef.current.setFieldsValue({ mainCode: mainCode });
-    }
-    if (params) {
-      this.formRef.current.setFieldsValue(params);
-    }
-    this.formRef.current.submit();
-  };
 
-  getFooter = () => {
-    const { serverKey } = this.props;
-    const { dtmplData, serial } = this.state;
-    const { translate } = this.context;
-    const footerButtons = [];
-    footerButtons.unshift(
-    <Button onClick={() => this.reloadData()} >
-      {translate("${刷新}")}
-    </Button>
-  );
-    footerButtons.unshift(
-      <Button onClick={() => this.doSubmit()} type={"primary"}>
-        {translate("${保存}")}
-      </Button>
-    );
-    const { dtmplConfig } = this.state;
-    //处理action
-    if (dtmplConfig) {
-      dtmplConfig.actions.forEach((ac, index) => {
+    doSubmit = async (actionId?: number, codes?: string[], params?: object) => {
+        const {mainCode} = this.props;
+        //if (actionId) {
+        this.formRef.current.setFieldsValue({actionId: actionId});
+        // }
+        if (mainCode) {
+            this.formRef.current.setFieldsValue({mainCode: mainCode});
+        }
+        if (params) {
+            this.formRef.current.setFieldsValue(params);
+        }
+        this.formRef.current.submit();
+        //this.reloadData();
+    };
+
+    getFooter = () => {
+        const {serverKey} = this.props;
+        const {dtmplData, serial} = this.state;
+        const {translate} = this.context;
+        const footerButtons = [];
+        footerButtons.unshift(
+            <Button onClick={() => this.reloadData()}>
+                {translate("${刷新}")}
+            </Button>
+        );
         footerButtons.unshift(
-          <Action
-            serverKey={serverKey}
-            iconType={"icon-title"}
-            hiddenType={"disabled"}
-            serial={serial}
-            key={ac.id}
-            formRef={this.formRef}
-            actionConfig={ac}
-            doAction={this.doSubmit}
-          ></Action>
+            <Button onClick={() => {
+                this.doSubmit();
+            }} type={"primary"}>
+                {translate("${保存}")}
+            </Button>
         );
-      });
+        const {dtmplConfig} = this.state;
+        //处理action
+        if (dtmplConfig) {
+            dtmplConfig.actions.forEach((ac, index) => {
+                footerButtons.unshift(
+                    <Action
+                        serverKey={serverKey}
+                        iconType={"icon-title"}
+                        hiddenType={"disabled"}
+                        serial={serial}
+                        key={ac.id}
+                        formRef={this.formRef}
+                        actionConfig={ac}
+                        doAction={this.doSubmit}
+                    ></Action>
+                );
+            });
+        }
+        return footerButtons;
+    };
+    onFinish = async (code: any) => {
+        this.setState({loading: false})
+        if (code) {
+            this.props.onOk(code);
+            await this.reloadData();
+        }
+
     }
-    return footerButtons;
-  };
-  onFinish = (code:any) => {
-      this.setState({loading:false})
-      if(code){
-        this.props.onOk(code);
-      }
-  }
 
-  render() {
-    const {
-      sourceId,
-      mainCode,
-      style,
-      maxColsOnRow,
-      title,
-      serverKey,
-    } = this.props;
-    const { dtmplConfig, id, dtmplData } = this.state;
+    render() {
+        const {
+            sourceId,
+            mainCode,
+            style,
+            maxColsOnRow,
+            title,
+            serverKey,
+        } = this.props;
+        const {dtmplConfig, id, dtmplData} = this.state;
 
-    return (
-      <>
-        <Card
-          onClick={this.onClickBody}
-          styles={{body:{ padding: "6px" },header:{alignItems: "center" }}}
-          title={title}
-          style={{ minWidth: maxColsOnRow == 1 ? "360px" : "720px", ...style }}
-          extra={<Space>{this.getFooter()}</Space>}
-        >
-          <DtmplForm
-            serverKey={serverKey}
-            showHeader={false}
-            mainCode={mainCode}
-            parentId={id}
-            dtmplConfig={dtmplConfig}
-            formRef={this.formRef}
-            sourceId={sourceId}
-            onFinish={this.onFinish}
-            maxColsOnRow={maxColsOnRow}
-            showConfirm={false}
-            dtmplData={dtmplData}
-            onValuesChange={this.onValuesChange}
-          />
-        </Card>
-      </>
-    );
-  }
+        return (
+            <>
+                <Card
+                    onClick={this.onClickBody}
+                    styles={{body: {padding: "6px"}, header: {alignItems: "center"}}}
+                    title={title}
+                    style={{minWidth: maxColsOnRow == 1 ? "360px" : "720px", ...style}}
+                    extra={<Space>{this.getFooter()}</Space>}
+                >
+                    <DtmplForm
+                        serverKey={serverKey}
+                        showHeader={false}
+                        mainCode={mainCode}
+                        parentId={id}
+                        dtmplConfig={dtmplConfig}
+                        formRef={this.formRef}
+                        sourceId={sourceId}
+                        onFinish={this.onFinish}
+                        maxColsOnRow={maxColsOnRow}
+                        showConfirm={false}
+                        dtmplData={dtmplData}
+                        onValuesChange={this.onValuesChange}
+                    />
+                </Card>
+            </>
+        );
+    }
 }