aldehyde 0.2.98 → 0.2.100

package/src/aldehyde/detail/edit/fields-edit-card.tsx

@@ -1,103 +1,140 @@
-import React from 'react';
-import {Button, Card, FormInstance, Popconfirm, Space} from 'antd'
-import {CloseOutlined} from '@ant-design/icons'
-import { FieldConfig} from "../../tmpl/interface";
-import {ButtonType} from "antd/es/button";
+import React from "react";
+import { Button, Card, FormInstance, Popconfirm, Space } from "antd";
+import { CloseOutlined } from "@ant-design/icons";
+import { FieldConfig } from "../../tmpl/interface";
+import { ButtonType } from "antd/es/button";
 import FieldsForm from "../../form/fields-form";
+import { LocaleContext } from "../../locale/LocaleProvider";
 
 interface FieldsEditCardProps {
-    serverKey?:string,
-    title?:any,
-    height?: any,
-    onCancel?: () => void,
-    onOk: (value: object) => void,
-    fields: FieldConfig[],
-    value?: object,
-    okButtonType?: ButtonType,
-    okDanger?: boolean,
-    needConfirm?: boolean,
-    onValuesChange:(value:object)=>void,
+  serverKey?: string;
+  title?: any;
+  height?: any;
+  onCancel?: () => void;
+  onOk: (value: object) => void;
+  fields: FieldConfig[];
+  value?: object;
+  okButtonType?: ButtonType;
+  okDanger?: boolean;
+  needConfirm?: boolean;
+  onValuesChange: (value: object) => void;
 }
 
-interface FieldsEditCardState {
-}
+interface FieldsEditCardState {}
 
-export default class FieldsEditCard extends React.PureComponent<FieldsEditCardProps, FieldsEditCardState> {
-    formRef = React.createRef<FormInstance>();
-    static defaultProps = {
-        forceRender: true,
-        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
-        needConfirm: false,
-        okButtonType: 'primary',
-        okDanger: false,
+export default class FieldsEditCard extends React.PureComponent<
+  FieldsEditCardProps,
+  FieldsEditCardState
+> {
+  formRef = React.createRef<FormInstance>();
+  static defaultProps = {
+    forceRender: true,
+    style: { maxWidth: "calc(100vw - 60px)", maxHeight: "calc(100vh - 50px)" },
+    needConfirm: false,
+    okButtonType: "primary",
+    okDanger: false,
+  };
+  state = {};
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
 
-    }
-    state = {}
+  async componentDidMount() {}
 
-    async componentDidMount() {
+  async componentDidUpdate() {
+    this.reset();
+  }
 
+  reset = () => {
+    if (this.formRef.current) {
+      this.formRef.current.resetFields();
     }
+  };
 
-    async componentDidUpdate() {
-        this.reset();
-    }
+  onOk = () => {
+    this.formRef.current.submit();
+  };
 
-    reset = () => {
-        if (this.formRef.current) {
-            this.formRef.current.resetFields();
-        }
-    }
+  render() {
+    const {
+      title,
+      height,
+      onOk,
+      fields,
+      value,
+      onCancel,
+      okButtonType,
+      needConfirm,
+      okDanger,
+      onValuesChange,
+      serverKey,
+    } = this.props;
+    const {} = this.state;
+    const { translate } = this.context;
 
-    onOk = () => {
-        this.formRef.current.submit();
+    function okButton(onOk) {
+      return needConfirm ? (
+        okDanger ? (
+          <Popconfirm
+            placement="rightBottom"
+            title={translate("${确定要执行提交吗}?")}
+            onConfirm={onOk}
+            okText={translate("${确定}")}
+            cancelText={translate("${取消}")}
+            okType={"danger"}
+          >
+            <Button type={okButtonType} danger={true}>
+              {translate("${确定}")}
+            </Button>
+          </Popconfirm>
+        ) : (
+          <Popconfirm
+            placement="rightBottom"
+            title={translate("${确定要执行提交吗}?")}
+            onConfirm={onOk}
+            okText={translate("${确定}")}
+            cancelText={translate("${取消}")}
+          >
+            <Button type={okButtonType}>{translate("${确定}")}</Button>
+          </Popconfirm>
+        )
+      ) : (
+        <Button type={okButtonType} onClick={onOk}>
+          {translate("${确定}")}
+        </Button>
+      );
     }
 
-
-
-    render() {
-        const {title,height, onOk, fields, value, onCancel, okButtonType, needConfirm, okDanger,onValuesChange,serverKey} = this.props
-        const {} = this.state;
-
-        function okButton(onOk) {
-            return needConfirm ? okDanger ?
-                <Popconfirm
-                    placement="rightBottom"
-                    title={`确定要执行提交吗？`}
-                    onConfirm={onOk}
-                    okText="确定"
-                    cancelText="取消"
-                    okType={'danger'}
-                >
-                    <Button type={okButtonType} danger={true}
-                    >确定</Button>
-                </Popconfirm> :
-                <Popconfirm
-                    placement="rightBottom"
-                    title={`确定要执行提交吗？`}
-                    onConfirm={onOk}
-                    okText="确定"
-                    cancelText="取消"
-                >
-                    <Button  type={okButtonType}
-                    >确定</Button>
-                </Popconfirm> :
-                <Button type={okButtonType}  onClick={onOk}
-                >确定</Button>
+    return (
+      <Card
+        size={"small"}
+        style={{ width: 1000 }}
+        title={title}
+        bodyStyle={{ overflow: "auto" }}
+        extra={
+          <>
+            <Space size={[8, 0]}>
+              <Button onClick={this.reset}>{translate("${重置}")}</Button>
+              {okButton(this.onOk)}
+              {onCancel ? (
+                <Button onClick={onCancel}>
+                  <CloseOutlined />
+                </Button>
+              ) : (
+                ""
+              )}
+            </Space>
+          </>
         }
-
-        return <Card size={'small'}
-            style={{width: 1000}}
-            title={title}
-            bodyStyle={{overflow: 'auto'}}
-            extra={<><Space size={[8, 0]}><Button onClick={this.reset}>重置</Button>
-                {okButton(this.onOk)}
-                {onCancel ? <Button onClick={onCancel}><CloseOutlined/></Button> : ""}
-            </Space></>}
-        >
-            <FieldsForm serverKey={serverKey} onValuesChange={onValuesChange} fields={fields} formRef={this.formRef}
-                        value={value}
-                        onFinish={onOk} ></FieldsForm>
-        </Card>
-    }
-
-}
+      >
+        <FieldsForm
+          serverKey={serverKey}
+          onValuesChange={onValuesChange}
+          fields={fields}
+          formRef={this.formRef}
+          value={value}
+          onFinish={onOk}
+        ></FieldsForm>
+      </Card>
+    );
+  }
+}

package/src/aldehyde/detail/edit/modal-row-edit.tsx

@@ -1,73 +1,94 @@
-import React from 'react';
-import {FormInstance, Modal} from 'antd'
-import {DtmplData, FieldGroupConfig} from "../../tmpl/interface";
-import FieldGroupForm from '../../form/field-group-form';
+import React from "react";
+import { FormInstance, Modal } from "antd";
+import { DtmplData, FieldGroupConfig } from "../../tmpl/interface";
+import FieldGroupForm from "../../form/field-group-form";
+import { LocaleContext } from "../../locale/LocaleProvider";
 
 interface ModalRowEditorProps {
-    serverKey?:string,
-    height?: any,
-    open: boolean,
-    onOk: (value: DtmplData) => void,
-    onCancel: () => void,
-    fieldGroupConfig: FieldGroupConfig,
-    dtmplData?: DtmplData,
+  serverKey?: string;
+  height?: any;
+  open: boolean;
+  onOk: (value: DtmplData) => void;
+  onCancel: () => void;
+  fieldGroupConfig: FieldGroupConfig;
+  dtmplData?: DtmplData;
 }
 
-interface ModalRowEditorState {
-}
+interface ModalRowEditorState {}
 
-export default class ModalRowEdit extends React.PureComponent<ModalRowEditorProps, ModalRowEditorState> {
-    formRef = React.createRef<FormInstance>();
-    static defaultProps = {
-        forceRender: true,
-        style: {maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)'},
-    }
-    state = {}
+export default class ModalRowEdit extends React.PureComponent<
+  ModalRowEditorProps,
+  ModalRowEditorState
+> {
+  formRef = React.createRef<FormInstance>();
+  static defaultProps = {
+    forceRender: true,
+    style: { maxWidth: "calc(100vw - 60px)", maxHeight: "calc(100vh - 50px)" },
+  };
+  state = {};
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
 
-    async componentDidMount() {
-    }
+  async componentDidMount() {}
 
-    async componentDidUpdate() {
-        if (this.formRef.current) {
-            this.formRef.current.resetFields();
-        }
+  async componentDidUpdate() {
+    if (this.formRef.current) {
+      this.formRef.current.resetFields();
     }
+  }
 
-    onOk = () => {
-        this.formRef.current.submit();
-    }
+  onOk = () => {
+    this.formRef.current.submit();
+  };
 
-    getTitle = () => {
-        const {fieldGroupConfig, dtmplData} = this.props
-        let title = "";
-        title = fieldGroupConfig.title;
-        if (dtmplData) {
-            title = title + "【行编辑】";
-        } else {
-            title = title + "【新建一行】";
-        }
-        return title;
-    }
+  getTitle = () => {
+    const { fieldGroupConfig, dtmplData } = this.props;
+    const { translate } = this.context;
 
-    render() {
-        const {height, onOk, onCancel, fieldGroupConfig, open, dtmplData,serverKey} = this.props
-        const {} = this.state;
-        return <Modal
-            open={open}
-            width={1150}
-            title={this.getTitle()}
-            bodyStyle={{overflow: 'auto'}}
-            destroyOnClose={true}
-            centered
-            okText={'确定'}
-            cancelText={'取消'}
-            onOk={this.onOk}
-            onCancel={onCancel}
-        >
-            <FieldGroupForm serverKey={serverKey} fieldGroupConfig={fieldGroupConfig} formRef={this.formRef}
-                            onFinish={onOk}
-                            dtmplData={dtmplData} />
-        </Modal>
+    let title = "";
+    title = fieldGroupConfig.title;
+    if (dtmplData) {
+      title = title + translate("[${行编辑}]");
+    } else {
+      title = title + translate("[${新建一行}]");
     }
+    return title;
+  };
+
+  render() {
+    const {
+      height,
+      onOk,
+      onCancel,
+      fieldGroupConfig,
+      open,
+      dtmplData,
+      serverKey,
+    } = this.props;
+    const {} = this.state;
+    const { translate } = this.context;
 
-}
+    return (
+      <Modal
+        open={open}
+        width={1150}
+        title={this.getTitle()}
+        bodyStyle={{ overflow: "auto" }}
+        destroyOnClose={true}
+        centered
+        okText={translate("${确定}")}
+        cancelText={translate("${取消}")}
+        onOk={this.onOk}
+        onCancel={onCancel}
+      >
+        <FieldGroupForm
+          serverKey={serverKey}
+          fieldGroupConfig={fieldGroupConfig}
+          formRef={this.formRef}
+          onFinish={onOk}
+          dtmplData={dtmplData}
+        />
+      </Modal>
+    );
+  }
+}

package/src/aldehyde/detail/edit/post-result/index.tsx

@@ -1,52 +1,85 @@
-import React, {ReactNode} from 'react'
-import {Button, Modal, Result} from 'antd'
-import {AddOrUpdate, SaveJumpType} from "../../../tmpl/interface";
-import {ResultStatusType} from "antd/lib/result";
+import React, { ReactNode } from "react";
+import { Button, Modal, Result } from "antd";
+import { AddOrUpdate, SaveJumpType } from "../../../tmpl/interface";
+import { ResultStatusType } from "antd/lib/result";
+import { useLocale } from "../../../locale/useLocale";
 
 interface PostResultProps {
-    title?: ReactNode,
-    subtitle?: ReactNode,
-    open: boolean,
-    jumpTypes: SaveJumpType[],
-    addOrUpdate: AddOrUpdate,
-    resultStatus?: ResultStatusType,
-    goAdd: () => void,
-    goEdit: () => void,
-    goList: () => void,
-};
-
-const PostResult: React.FC<PostResultProps> = ({resultStatus='success',...props}) => {
-
-    const {title, open, subtitle, goAdd, goEdit, goList, jumpTypes, addOrUpdate} = props;
-    return (
-        <Modal
-            title={title ? title : "保存提示"}
-            open={open}
-            closable={false}
-            destroyOnClose
-            footer={[]}
-            bodyStyle={{height: 430, overflow: 'auto'}}
-            width={560}
-            maskClosable={true}
-        >
-            <Result status={resultStatus} title={resultStatus === "success" ? "保存成功" : "保存失败"}
-                    subTitle={subtitle}
-                    extra={[goAdd && jumpTypes && jumpTypes.includes('add') ?
-                        <Button key="goOnAdd" onClick={() => goAdd()}>
-                            {addOrUpdate === "update" ? "转添加" : "继续添加"}
-                        </Button> : undefined,
-                        goEdit && jumpTypes && jumpTypes.includes('edit') ?
-                            <Button type="primary" key="goOnEdit" onClick={() => goEdit()}>
-                                {addOrUpdate === "update" ? "继续编辑" : "编辑实体"}
-                            </Button> : "",
-                        goList && jumpTypes && jumpTypes.includes('list') ?
-                            <Button type="primary" key="onBackList" onClick={() => goList()}>
-                                返回列表
-                            </Button> : ""
-                    ]}
-            ></Result>
-        </Modal>
-    )
+  title?: ReactNode;
+  subtitle?: ReactNode;
+  open: boolean;
+  jumpTypes: SaveJumpType[];
+  addOrUpdate: AddOrUpdate;
+  resultStatus?: ResultStatusType;
+  goAdd: () => void;
+  goEdit: () => void;
+  goList: () => void;
 }
 
+const PostResult: React.FC<PostResultProps> = ({
+  resultStatus = "success",
+  ...props
+}) => {
+  const {
+    title,
+    open,
+    subtitle,
+    goAdd,
+    goEdit,
+    goList,
+    jumpTypes,
+    addOrUpdate,
+  } = props;
+  const { translate } = useLocale();
+  return (
+    <Modal
+      title={title ? title : translate("${保存提示}")}
+      open={open}
+      closable={false}
+      destroyOnClose
+      footer={[]}
+      bodyStyle={{ height: 430, overflow: "auto" }}
+      width={560}
+      maskClosable={true}
+    >
+      <Result
+        status={resultStatus}
+        title={
+          resultStatus === "success"
+            ? translate("${保存成功}")
+            : translate("${保存失败}")
+        }
+        subTitle={subtitle}
+        extra={[
+          goAdd && jumpTypes && jumpTypes.includes("add") ? (
+            <Button key="goOnAdd" onClick={() => goAdd()}>
+              {addOrUpdate === "update"
+                ? translate("${转添加}")
+                : translate("${继续添加}")}
+            </Button>
+          ) : (
+            undefined
+          ),
+          goEdit && jumpTypes && jumpTypes.includes("edit") ? (
+            <Button type="primary" key="goOnEdit" onClick={() => goEdit()}>
+              {addOrUpdate === "update"
+                ? translate("${继续编辑}")
+                : translate("${编辑实体}")}
+            </Button>
+          ) : (
+            ""
+          ),
+          goList && jumpTypes && jumpTypes.includes("list") ? (
+            <Button type="primary" key="onBackList" onClick={() => goList()}>
+              {translate("${返回列表}")}
+            </Button>
+          ) : (
+            ""
+          ),
+        ]}
+      ></Result>
+    </Modal>
+  );
+};
+
 export default PostResult;