aldehyde 0.2.197 → 0.2.199

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

@@ -1,313 +1,313 @@
-import React, { ReactNode } from "react";
-import { Button, FormInstance, Space, Card } from "antd";
-import {
-  DtmplBaseProps,
-  DtmplConfig,
-  DtmplData,
-  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";
-import Action from "../controls/action";
-import { LocaleContext } from "../locale/LocaleProvider";
-
-interface DtmplEditCardProps extends DtmplBaseProps {
-  onOk?: (code: string) => void;
-  style?: {};
-  title?: ReactNode;
-}
-
-interface DtmplEditCardState {
-  id?: string;
-  queryingCode?:string;
-  dtmplConfig?: DtmplConfig;
-  loading?: boolean;
-  serial?: number;
-  dtmplData?: DtmplData;
-}
-
-export default class DtmplEditCard extends React.PureComponent<
-  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();
-  }
-
-  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) {
-        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);
-    }
-  }
-
-  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,
-      });
-    }
-  };
-
-  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,
-      codeSource,
-    } = 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);
-        } 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  || this.state.queryingCode==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.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 });
-    // }
-    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) => {
-        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;
-  };
-
-  render() {
-    const {
-      onOk,
-      sourceId,
-      mainCode,
-      style,
-      maxColsOnRow,
-      title,
-      serverKey,
-    } = this.props;
-    const { dtmplConfig, id, dtmplData } = this.state;
-
-    return (
-      <>
-        <Card
-          onClick={this.onClickBody}
-          headStyle={{ alignItems: "center" }}
-          title={title}
-          style={{ minWidth: maxColsOnRow == 1 ? "360px" : "720px", ...style }}
-          bodyStyle={{ padding: "6px" }}
-          extra={<Space>{this.getFooter()}</Space>}
-        >
-          <DtmplForm
-            serverKey={serverKey}
-            showHeader={false}
-            mainCode={mainCode}
-            parentId={id}
-            dtmplConfig={dtmplConfig}
-            formRef={this.formRef}
-            sourceId={sourceId}
-            onFinish={onOk}
-            maxColsOnRow={maxColsOnRow}
-            showConfirm={false}
-            dtmplData={dtmplData}
-            onValuesChange={this.onValuesChange}
-          />
-        </Card>
-      </>
-    );
-  }
-}
+import React, { ReactNode } from "react";
+import { Button, FormInstance, Space, Card } from "antd";
+import {
+  DtmplBaseProps,
+  DtmplConfig,
+  DtmplData,
+  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";
+import Action from "../controls/action";
+import { LocaleContext } from "../locale/LocaleProvider";
+
+interface DtmplEditCardProps extends DtmplBaseProps {
+  onOk?: (code: string) => void;
+  style?: {};
+  title?: ReactNode;
+}
+
+interface DtmplEditCardState {
+  id?: string;
+  queryingCode?:string;
+  dtmplConfig?: DtmplConfig;
+  loading?: boolean;
+  serial?: number;
+  dtmplData?: DtmplData;
+}
+
+export default class DtmplEditCard extends React.PureComponent<
+  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();
+  }
+
+  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) {
+        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);
+    }
+  }
+
+  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,
+      });
+    }
+  };
+
+  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,
+      codeSource,
+    } = 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);
+        } 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  || this.state.queryingCode==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.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 });
+    // }
+    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) => {
+        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;
+  };
+
+  render() {
+    const {
+      onOk,
+      sourceId,
+      mainCode,
+      style,
+      maxColsOnRow,
+      title,
+      serverKey,
+    } = this.props;
+    const { dtmplConfig, id, dtmplData } = this.state;
+
+    return (
+      <>
+        <Card
+          onClick={this.onClickBody}
+          headStyle={{ alignItems: "center" }}
+          title={title}
+          style={{ minWidth: maxColsOnRow == 1 ? "360px" : "720px", ...style }}
+          bodyStyle={{ padding: "6px" }}
+          extra={<Space>{this.getFooter()}</Space>}
+        >
+          <DtmplForm
+            serverKey={serverKey}
+            showHeader={false}
+            mainCode={mainCode}
+            parentId={id}
+            dtmplConfig={dtmplConfig}
+            formRef={this.formRef}
+            sourceId={sourceId}
+            onFinish={onOk}
+            maxColsOnRow={maxColsOnRow}
+            showConfirm={false}
+            dtmplData={dtmplData}
+            onValuesChange={this.onValuesChange}
+          />
+        </Card>
+      </>
+    );
+  }
+}

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

@@ -1,24 +1,24 @@
-import React, {ReactNode} from 'react';
-import {DtmplBaseProps} from "../tmpl/interface";
-import DtmplEditPage from "./dtmpl-edit-page";
-
-interface DtmplEditDrawerProps extends DtmplBaseProps {
-    width?: number,
-    open: boolean,
-    onOk: (code: string) => void,
-    onCancel: () => void,
-    title?: ReactNode,
-    placement?:'top' | 'right' | 'bottom' | 'left',
-}
-
-interface DtmplEditDrawerState {
-
-}
-
-export default class DtmplEditDrawer extends React.PureComponent<DtmplEditDrawerProps, DtmplEditDrawerState> {
-
-    render() {
-        return <DtmplEditPage  pageType={'drawer'} {...this.props}></DtmplEditPage>
-    }
-
+import React, {ReactNode} from 'react';
+import {DtmplBaseProps} from "../tmpl/interface";
+import DtmplEditPage from "./dtmpl-edit-page";
+
+interface DtmplEditDrawerProps extends DtmplBaseProps {
+    width?: number,
+    open: boolean,
+    onOk: (code: string) => void,
+    onCancel: () => void,
+    title?: ReactNode,
+    placement?:'top' | 'right' | 'bottom' | 'left',
+}
+
+interface DtmplEditDrawerState {
+
+}
+
+export default class DtmplEditDrawer extends React.PureComponent<DtmplEditDrawerProps, DtmplEditDrawerState> {
+
+    render() {
+        return <DtmplEditPage  pageType={'drawer'} {...this.props}></DtmplEditPage>
+    }
+
 }