aldehyde 0.2.97 → 0.2.99

package/src/aldehyde/detail/button/bottom-submit-button-bar.tsx

@@ -1,54 +1,90 @@
-import React from 'react'
-import './index.css'
-import {TmplBase} from "../../../aldehyde/tmpl/interface";
-import {Button, Card, Col, Row, Space} from "antd";
-import {SaveOutlined} from '@ant-design/icons';
+import React from "react";
+import "./index.css";
+import { TmplBase } from "../../../aldehyde/tmpl/interface";
+import { Button, Card, Col, Row, Space } from "antd";
+import { SaveOutlined } from "@ant-design/icons";
 import Action from "../../controls/action";
-import {SubmitButtonProps} from "./submit-button-bar";
-
-interface BottomSubmitButtonBarProps extends SubmitButtonProps {
-
-}
+import { SubmitButtonProps } from "./submit-button-bar";
+import { LocaleContext } from "../../locale/LocaleProvider";
 
+interface BottomSubmitButtonBarProps extends SubmitButtonProps {}
 
 interface BottomSubmitButtonState {
-    // stateSerial:number
+  // stateSerial:number
 }
 
-class BottomSubmitButtonBar extends React.PureComponent<BottomSubmitButtonBarProps, BottomSubmitButtonState> {
+class BottomSubmitButtonBar extends React.PureComponent<
+  BottomSubmitButtonBarProps,
+  BottomSubmitButtonState
+> {
+  state = {
+    // stateSerial:0,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
 
-    state = {
-        // stateSerial:0,
-    }
+  render() {
+    const {} = this.state;
+    const {
+      dtmplConfig,
+      position,
+      doSubmit,
+      formRef,
+      serial,
+      serverKey,
+      dtmplData,
+    } = this.props;
+    const { buttons, actions } = dtmplConfig;
+    const { translate } = this.context;
 
-    render() {
-        const {} = this.state;
-        const {dtmplConfig,position, doSubmit, formRef, serial, serverKey,dtmplData} = this.props
-        const {buttons, actions} = dtmplConfig;
-
-        return (<Card bordered={false}>
-                <Row align={'middle'} justify={position=='bottomLeft'?'start':position=='bottomRight'?'end':'center'}>
-
-                        <Space>
-                            {buttons.includes('dtmplSave') ?
-                                <Col >
-                                <Button
-                                    onClick={() => doSubmit()}
-                                    type='primary'
-                                    icon={<SaveOutlined/>}
-                                    key="btn" block
-                                >保 存</Button></Col> : null}
-                            {actions ? actions.map((item, index) => {
-                                    return <Col ><Action serverKey={serverKey}  serial={serial} key={item.id} data={[dtmplData]}
-                                                         formRef={formRef} actionConfig={item} doAction={doSubmit}></Action></Col>
-                                }
-                            ) : ""}
-                        </Space>
-                </Row>
-            </Card>
-        )
-    }
+    return (
+      <Card bordered={false}>
+        <Row
+          align={"middle"}
+          justify={
+            position == "bottomLeft"
+              ? "start"
+              : position == "bottomRight"
+              ? "end"
+              : "center"
+          }
+        >
+          <Space>
+            {buttons.includes("dtmplSave") ? (
+              <Col>
+                <Button
+                  onClick={() => doSubmit()}
+                  type="primary"
+                  icon={<SaveOutlined />}
+                  key="btn"
+                  block
+                >
+                  {translate("${保存}")}
+                </Button>
+              </Col>
+            ) : null}
+            {actions
+              ? actions.map((item, index) => {
+                  return (
+                    <Col>
+                      <Action
+                        serverKey={serverKey}
+                        serial={serial}
+                        key={item.id}
+                        data={[dtmplData]}
+                        formRef={formRef}
+                        actionConfig={item}
+                        doAction={doSubmit}
+                      ></Action>
+                    </Col>
+                  );
+                })
+              : ""}
+          </Space>
+        </Row>
+      </Card>
+    );
+  }
 }
 
 export default BottomSubmitButtonBar;
-

package/src/aldehyde/detail/button/cquery-button-bar.tsx

@@ -1,113 +1,144 @@
-import React, {RefObject} from 'react'
-import './index.css'
-import {ActionConfig, ButtonName, CQueryConfig, DtmplConfig, DtmplData, TmplBase} from "../../tmpl/interface";
-import {Affix, Button, Popconfirm, Popover,Space} from "antd";
-import {LeftOutlined, SaveOutlined} from '@ant-design/icons';
+import React, { RefObject } from "react";
+import "./index.css";
+import {
+  ActionConfig,
+  ButtonName,
+  CQueryConfig,
+  DtmplConfig,
+  DtmplData,
+  TmplBase,
+} from "../../tmpl/interface";
+import { Affix, Button, Popconfirm, Popover, Space } from "antd";
+import { LeftOutlined, SaveOutlined } from "@ant-design/icons";
 import CquickButton from "../../controls/cquery/cquick-button";
+import { LocaleContext } from "../../locale/LocaleProvider";
 
 interface CqueryButtonBarProps {
-    serverKey?:string,
-    dtmplConfig: DtmplConfig,
-    mainCode:string,
+  serverKey?: string;
+  dtmplConfig: DtmplConfig;
+  mainCode: string;
 }
 
-
 interface CqueryButtonBarState {
-   // stateSerial:number
+  // stateSerial:number
 }
 
-class CqueryButtonBar extends React.PureComponent<CqueryButtonBarProps, CqueryButtonBarState> {
-
-    state={
-      // stateSerial:0,
+class CqueryButtonBar extends React.PureComponent<
+  CqueryButtonBarProps,
+  CqueryButtonBarState
+> {
+  state = {
+    // stateSerial:0,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  calcOffsetBottom = (cQuerys: CQueryConfig[]) => {
+    if (cQuerys.length >= 3) {
+      return 120;
+    } else if (cQuerys.length == 2) {
+      return 86;
+    } else {
+      return 80;
     }
-
-    calcOffsetBottom = (cQuerys: CQueryConfig[]) => {
-
-        if (cQuerys.length>=3) {
-            return 120;
-        } else if (cQuerys.length==2){
-            return 86;
-        }else{
-            return 80;
-        }
+  };
+
+  //  async componentDidMount() {
+  //      console.log("SubmitButtonBar this.loadData()");
+  //
+  //      console.log("SubmitButtonBar this.loadData()1");
+  //          //  if(code!=preCode || (!code && preCode)){
+  //          //     await this.loadData();
+  //          // }else{
+  //          //      formRef.current.resetFields();
+  //          //  }
+  // }
+
+  // loadData = async () => {
+  //     console.log("SubmitButtonBar this.loadData()2");
+  //     this.setState({
+  //         stateSerial: this.state.stateSerial + 1,
+  //     })
+  // }
+
+  render() {
+    const {} = this.state;
+    const { dtmplConfig, mainCode, serverKey } = this.props;
+    const { translate } = this.context;
+
+    if (!dtmplConfig) {
+      return null;
     }
 
-   //  async componentDidMount() {
-   //      console.log("SubmitButtonBar this.loadData()");
-   //
-   //      console.log("SubmitButtonBar this.loadData()1");
-   //          //  if(code!=preCode || (!code && preCode)){
-   //          //     await this.loadData();
-   //          // }else{
-   //          //      formRef.current.resetFields();
-   //          //  }
-   // }
-
-    // loadData = async () => {
-    //     console.log("SubmitButtonBar this.loadData()2");
-    //     this.setState({
-    //         stateSerial: this.state.stateSerial + 1,
-    //     })
-    // }
-
-    render() {
-       const {}=this.state;
-        const {dtmplConfig,mainCode,serverKey} = this.props
-
-        if(!dtmplConfig){
-            return null;
-        }
-
-        const {buttons, cQuerys} = dtmplConfig;
-        const cardList: TmplBase[] = [];
-
-        let content
-        if (cQuerys && cQuerys.length > 3) {
-            content = (
-                <div style={{width:'100px'}} className="btns">
-                    <Space direction="vertical">
-                        {cQuerys.map((item, index) => {
-                            if (index > 2) {
-                                return <CquickButton serverKey={serverKey}  block={true} key={item.id}  mainCode={mainCode} cQueryConfig={item}  ></CquickButton>
-                            }
-                        })
-                        }
-                    </Space>
-
-                </div>
-            );
-        }
-        //offsetBottom={this.calcOffsetBottom(cQuerys)}
-        return (
-            (cQuerys && cQuerys.length>0 &&  mainCode)?<Affix style={{position: 'absolute',top:180, right: 10, maxHeight: 90}}
-                   offsetTop={300} >
-                <div className={'submitButtonBar'} >
-                    <ul>
-                        {
-                            cQuerys ? cQuerys.map((item, index) => {
-                                    if (index < 3) {
-                                        return <li key={index}>
-                                            <CquickButton serverKey={serverKey} type={'text'}  block={true} key={item.id}  mainCode={mainCode} cQueryConfig={item}  ></CquickButton>
-                                        </li>
-                                    }
-                                }
-                            ) : ""
-                        }
-                        {//处理后面的
-                            cQuerys && cQuerys.length > 2 ?
-                                <Popover placement="leftTop" content={content} trigger="hover">
-                                    <Button block >
-                                        <LeftOutlined/>{'更多'}
-                                    </Button>
-                                </Popover> : ""
-                        }
-                    </ul>
-                </div>
-            </Affix>:""
-        )
+    const { buttons, cQuerys } = dtmplConfig;
+    const cardList: TmplBase[] = [];
+
+    let content;
+    if (cQuerys && cQuerys.length > 3) {
+      content = (
+        <div style={{ width: "100px" }} className="btns">
+          <Space direction="vertical">
+            {cQuerys.map((item, index) => {
+              if (index > 2) {
+                return (
+                  <CquickButton
+                    serverKey={serverKey}
+                    block={true}
+                    key={item.id}
+                    mainCode={mainCode}
+                    cQueryConfig={item}
+                  ></CquickButton>
+                );
+              }
+            })}
+          </Space>
+        </div>
+      );
     }
+    //offsetBottom={this.calcOffsetBottom(cQuerys)}
+    return cQuerys && cQuerys.length > 0 && mainCode ? (
+      <Affix
+        style={{ position: "absolute", top: 180, right: 10, maxHeight: 90 }}
+        offsetTop={300}
+      >
+        <div className={"submitButtonBar"}>
+          <ul>
+            {cQuerys
+              ? cQuerys.map((item, index) => {
+                  if (index < 3) {
+                    return (
+                      <li key={index}>
+                        <CquickButton
+                          serverKey={serverKey}
+                          type={"text"}
+                          block={true}
+                          key={item.id}
+                          mainCode={mainCode}
+                          cQueryConfig={item}
+                        ></CquickButton>
+                      </li>
+                    );
+                  }
+                })
+              : ""}
+            {//处理后面的
+            cQuerys && cQuerys.length > 2 ? (
+              <Popover placement="leftTop" content={content} trigger="hover">
+                <Button block>
+                  <LeftOutlined />
+                  {translate("${更多}")}
+                </Button>
+              </Popover>
+            ) : (
+              ""
+            )}
+          </ul>
+        </div>
+      </Affix>
+    ) : (
+      ""
+    );
+  }
 }
 
 export default CqueryButtonBar;
-

package/src/aldehyde/detail/button/fix-right-submit-button-bar.tsx

@@ -1,130 +1,178 @@
-import React, {RefObject} from 'react'
-import './index.css'
-import {ActionConfig, ButtonName, DtmplConfig, TmplBase} from "../../../aldehyde/tmpl/interface";
-import {Affix, Button, Popconfirm, Popover} from "antd";
-import {LeftOutlined, SaveOutlined} from '@ant-design/icons';
+import React, { RefObject } from "react";
+import "./index.css";
+import {
+  ActionConfig,
+  ButtonName,
+  DtmplConfig,
+  TmplBase,
+} from "../../../aldehyde/tmpl/interface";
+import { Affix, Button, Popconfirm, Popover } from "antd";
+import { LeftOutlined, SaveOutlined } from "@ant-design/icons";
 import Action from "../../controls/action";
-import {SubmitButtonProps} from "./submit-button-bar";
-
-interface FixRightSubmitButtonProps extends SubmitButtonProps{
-
-}
+import { SubmitButtonProps } from "./submit-button-bar";
+import { LocaleContext } from "../../locale/LocaleProvider";
 
+interface FixRightSubmitButtonProps extends SubmitButtonProps {}
 
 interface FixRightSubmitButtonState {
-   // stateSerial:number
+  // stateSerial:number
 }
 
-class FixRightSubmitButtonBar extends React.PureComponent<FixRightSubmitButtonProps, FixRightSubmitButtonState> {
+class FixRightSubmitButtonBar extends React.PureComponent<
+  FixRightSubmitButtonProps,
+  FixRightSubmitButtonState
+> {
+  state = {
+    // stateSerial:0,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
 
-    state={
-      // stateSerial:0,
+  calcOffsetBottom = (buttons: ButtonName[], actions: ActionConfig[]) => {
+    let buttonSize: number = 0;
+    if (actions) {
+      buttonSize = buttonSize + actions.length;
     }
-
-    calcOffsetBottom = (buttons: ButtonName[], actions: ActionConfig[]) => {
-        let buttonSize:number=0;
-        if(actions ){
-            buttonSize=buttonSize+actions.length;
-        }
-        if((buttons && buttons.includes('dtmplSave')) ){
-            buttonSize=buttonSize+1;
-        }
-        if (buttonSize>=3) {
-            return 120;
-        } else if (buttonSize==2){
-            return 86;
-        }else{
-            return 80;
-        }
+    if (buttons && buttons.includes("dtmplSave")) {
+      buttonSize = buttonSize + 1;
     }
+    if (buttonSize >= 3) {
+      return 120;
+    } else if (buttonSize == 2) {
+      return 86;
+    } else {
+      return 80;
+    }
+  };
 
-    render() {
-       const {}=this.state;
-        const {dtmplConfig, doSubmit,formRef,serial,serverKey,dtmplData} = this.props
-        const {buttons, actions} = dtmplConfig;
-        const cardList: TmplBase[] = [];
-
-        //console.log(" submit-button-bar serial:",serial);
-       // console.log(" submit-button-bar stateSerial:",stateSerial);
-
-        if (dtmplConfig.premises && dtmplConfig.premises.length > 0) {
-            cardList.push({
-                id: '1', title: '默认字段',
-            });
-        }
-        dtmplConfig.groups.forEach(g => {
-            cardList.push({
-                title: g.title,
-                id: g.id,
-            });
-        })
+  render() {
+    const {} = this.state;
+    const {
+      dtmplConfig,
+      doSubmit,
+      formRef,
+      serial,
+      serverKey,
+      dtmplData,
+    } = this.props;
+    const { buttons, actions } = dtmplConfig;
+    const cardList: TmplBase[] = [];
+    const { translate } = this.context;
 
-        let content
-        if (actions && actions.length > 1) {
-            content = (
-                <div className="btns">
-                    {actions.map((item, index) => {
-                        if (index > 1) {
-                            // return <Popconfirm key={item.id} placement="top" title={"确定要保存修改并执行此操作吗?"}
-                            //                    onConfirm={() => doSubmit(item.id)} okText="确定" cancelText="取消">
-                            // <Button
-                            //     type="primary"
-                            // >{item.title}</Button>
-                            // </Popconfirm>
-                           return <Action serverKey={serverKey} data={[dtmplData]} iconType={'icon-title'} hiddenType={'disabled'} buttonType={'primary'} serial={serial} key={item.id}   formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
-                        }
-                    })
-                    }
-                </div>
-            );
-        }
+    //console.log(" submit-button-bar serial:",serial);
+    // console.log(" submit-button-bar stateSerial:",stateSerial);
 
+    if (dtmplConfig.premises && dtmplConfig.premises.length > 0) {
+      cardList.push({
+        id: "1",
+        title: translate("${默认字段}"),
+      });
+    }
+    dtmplConfig.groups.forEach((g) => {
+      cardList.push({
+        title: g.title,
+        id: g.id,
+      });
+    });
 
-        return (
-            <Affix
-                //style={{position: 'absolute', right: 10, maxHeight: 100}}
-                   // offsetBottom={this.calcOffsetBottom(buttons, actions)}>
-                   style={{position: 'absolute',bottom:60,right: 15,}}  offsetBottom={this.calcOffsetBottom(buttons, actions)}
-            >
-                <div className={'submitButtonBar'} >
-                    <ul>
-                        {buttons.includes('dtmplSave') ? <li key={100}>
-                            <Button
-                                onClick={() => doSubmit()}
-                                type='primary'
-                                icon={<SaveOutlined/>}
-                                key="btn" block
-                            >保 存</Button>
-                        </li> : ""
-                        }
-                        {//处理前两个
-                            actions ? actions.map((item, index) => {
-                                    if (index < 2) {
-                                        return <li key={index}>
-                                            {/*<Popconfirm placement="left" title={"确定要保存修改并执行此操作吗?"} onConfirm={() => doSubmit(item.id)} okText="确定" cancelText="取消">*/}
-                                            {/*<Button  block*/}
-                                            {/*        type={'primary'}>{item.title}</Button>*/}
-                                            {/*</Popconfirm>*/}
-                                            <Action data={[dtmplData]} serverKey={serverKey} hiddenType={'disabled'} buttonType={'primary-block'} serial={serial}  key={item.id}  formRef={formRef} actionConfig={item}  doAction={doSubmit}></Action>
-                                        </li>
-                                    }
-                                }
-                            ) : ""
-                        }
-                        {//处理后面的
-                        actions && actions.length > 2 ?
-                                <Popover placement="leftTop" content={content} trigger="hover">
-                                    <Button block>
-                                        <LeftOutlined/>{'更多'}
-                                    </Button>
-                                </Popover> : ""
-                        }
-                    </ul>
-                </div>
-            </Affix>
-        )
+    let content;
+    if (actions && actions.length > 1) {
+      content = (
+        <div className="btns">
+          {actions.map((item, index) => {
+            if (index > 1) {
+              // return <Popconfirm key={item.id} placement="top" title={"确定要保存修改并执行此操作吗?"}
+              //                    onConfirm={() => doSubmit(item.id)} okText="确定" cancelText="取消">
+              // <Button
+              //     type="primary"
+              // >{item.title}</Button>
+              // </Popconfirm>
+              return (
+                <Action
+                  serverKey={serverKey}
+                  data={[dtmplData]}
+                  iconType={"icon-title"}
+                  hiddenType={"disabled"}
+                  buttonType={"primary"}
+                  serial={serial}
+                  key={item.id}
+                  formRef={formRef}
+                  actionConfig={item}
+                  doAction={doSubmit}
+                ></Action>
+              );
+            }
+          })}
+        </div>
+      );
     }
+
+    return (
+      <Affix
+        //style={{position: 'absolute', right: 10, maxHeight: 100}}
+        // offsetBottom={this.calcOffsetBottom(buttons, actions)}>
+        style={{ position: "absolute", bottom: 60, right: 15 }}
+        offsetBottom={this.calcOffsetBottom(buttons, actions)}
+      >
+        <div className={"submitButtonBar"}>
+          <ul>
+            {buttons.includes("dtmplSave") ? (
+              <li key={100}>
+                <Button
+                  onClick={() => doSubmit()}
+                  type="primary"
+                  icon={<SaveOutlined />}
+                  key="btn"
+                  block
+                >
+                  保 存
+                </Button>
+              </li>
+            ) : (
+              ""
+            )}
+            {//处理前两个
+            actions
+              ? actions.map((item, index) => {
+                  if (index < 2) {
+                    return (
+                      <li key={index}>
+                        {/*<Popconfirm placement="left" title={"确定要保存修改并执行此操作吗?"} onConfirm={() => doSubmit(item.id)} okText="确定" cancelText="取消">*/}
+                        {/*<Button  block*/}
+                        {/*        type={'primary'}>{item.title}</Button>*/}
+                        {/*</Popconfirm>*/}
+                        <Action
+                          data={[dtmplData]}
+                          serverKey={serverKey}
+                          hiddenType={"disabled"}
+                          buttonType={"primary-block"}
+                          serial={serial}
+                          key={item.id}
+                          formRef={formRef}
+                          actionConfig={item}
+                          doAction={doSubmit}
+                        ></Action>
+                      </li>
+                    );
+                  }
+                })
+              : ""}
+            {//处理后面的
+            actions && actions.length > 2 ? (
+              <Popover placement="leftTop" content={content} trigger="hover">
+                <Button block>
+                  <LeftOutlined />
+                  {translate("${更多}")}
+                </Button>
+              </Popover>
+            ) : (
+              ""
+            )}
+          </ul>
+        </div>
+      </Affix>
+    );
+  }
 }
 
 export default FixRightSubmitButtonBar;
-