aldehyde 0.2.97 → 0.2.99

package/src/aldehyde/login/router-login.tsx

@@ -1,32 +1,65 @@
-import React from 'react'
+import React from "react";
 import Units from "../units";
-import './index.css'
+import "./index.css";
 import withRouter from "../routable/withroute";
 import Login from "./login";
 import HCDataSource from "../tmpl/hc-data-source";
-import {Col, Row} from "antd";
+import { Col, Row } from "antd";
+import { useLocale } from "../locale/useLocale";
+import LocaleButton from "../locale/LocaleButton";
 
- interface RLoginitProps  {
-     params:object,
-};
+interface RLoginitProps {
+  params: object;
+  autoSaveUser?: boolean;
+}
 
-interface RLoginitState  {
+interface RLoginitState {}
 
-};
+const RouterLogin = (props: RLoginitProps) => {
+  const { params, autoSaveUser } = props;
 
-class RouterLogin extends React.PureComponent<RLoginitProps, RLoginitState> {
-
-    render() {
-        const {params}=this.props;
-        Units.setProgramCode4RoutePath(params);
-        return (<Row  justify="center" align="middle" className="login-blue">
-            <Col><Login onFinish={(token)=>{
+  const { translate } = useLocale();
+  Units.setProgramCode4RoutePath(params);
+  return (
+    <Row justify="center" align="middle" className="login-blue">
+      <Col>
+        <Login
+          onFinish={(token) => {
             HCDataSource.clear();
             window.location.hash = "#/context-setter";
-            Units.setHydrocarbonToken(token);}
-        } title={<h3>欢迎登录</h3>} /> </Col>
-        </Row>)
-    }
-}
+            Units.setHydrocarbonToken(token);
+          }}
+          title={<h3>{translate("${欢迎登录}")}</h3>}
+          autoSaveUser={autoSaveUser}
+        />{" "}
+      </Col>
+    </Row>
+  );
+};
+
+const I18nLogin = (props: RLoginitProps) => {
+  return (
+    <div
+      style={{
+        position: "relative",
+        width: "100%",
+        height: "100%",
+      }}
+    >
+      <div
+        style={{
+          position: "absolute",
+          top: "10px",
+          right: "10px",
+          zIndex: "10000",
+        }}
+      >
+        <LocaleButton></LocaleButton>
+      </div>
+
+      <RouterLogin {...props} />
+    </div>
+  );
+};
 
-export default withRouter(RouterLogin);
+export default withRouter(I18nLogin);

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

@@ -1,192 +1,257 @@
-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 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
+  onOk?: (code: string) => void;
+  style?: {};
+  title?: ReactNode;
 }
 
 interface DtmplEditCardState {
-    id?:string,
-    dtmplConfig?: DtmplConfig,
-    loading?: boolean;
-    serial?:number,
-    dtmplData?:DtmplData,
+  id?: 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;
-    onClickBody = (e) => {
-        //console.log("点击了我" + this.autoSaveTimer);
-        this.autoSaveTimer = 0;
-    }
-    static defaultProps = {
-        showConfirm: false,
-        okText: "确定",
-    }
-    state = {
-        id:'dtmplEditCard'+Units.getRandomNum(6),
-        dtmplConfig: undefined,
-        loading: true,
-        serial:1,
-        dtmplData:undefined,
-    }
+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),
+    dtmplConfig: undefined,
+    loading: true,
+    serial: 1,
+    dtmplData: undefined,
+  };
+
+  async componentDidMount() {
+    await this.loadConfigData();
+  }
 
-    async componentDidMount() {
+  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);
+      }
     }
+  }
 
-    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 {
+    if (this.autoSaveInterval) {
+      clearInterval(this.autoSaveInterval);
     }
+  }
 
-    componentWillUnmount(): void {
-        if(this.autoSaveInterval){
-            clearInterval( this.autoSaveInterval);
-        }
+  loadConfigData = async () => {
+    const { sourceId, code, serverKey, 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
+      );
     }
+    await this.loadData(dtmplConfig);
+    this.setState({
+      dtmplConfig,
+      loading: false,
+    });
+  };
 
-    loadConfigData = async () => {
-        const { sourceId,code,serverKey,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);
-        }
-        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);
     }
 
-    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(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 (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;
         }
-
-        if (code) {
-            this.setState({
-                loading: true,
-            })
-            const dtmplData_:DtmplData=await HcserviceV3.getDtmplData(dtmplConfig,serverKey,sourceId, code);
-            this.setState({
-                dtmplData:dtmplData_,
-                id:code,
-                //  changedGroupData:new Map<number,DtmplData[]>(),
-                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);
+      }, 1000);
     }
 
-    onValuesChange=()=>{
-        this.setState({
-            serial:this.state.serial+1
-        })
+    if (code) {
+      this.setState({
+        loading: true,
+      });
+      const dtmplData_: DtmplData = await HcserviceV3.getDtmplData(
+        dtmplConfig,
+        serverKey,
+        sourceId,
+        code
+      );
+      this.setState({
+        dtmplData: dtmplData_,
+        id: code,
+        //  changedGroupData:new Map<number,DtmplData[]>(),
+        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);
+  };
 
-    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();
+  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 footerButtons = [];
+  getFooter = () => {
+    const { serverKey } = this.props;
+    const { dtmplData, serial } = this.state;
+    const { translate } = this.context;
+    const footerButtons = [];
+    footerButtons.unshift(
+      <Button onClick={() => this.doSubmit()} type={"primary"}>
+        {translate("${保存}")}
+      </Button>
+    );
+    const { dtmplConfig } = this.state;
+    //处理action
+    if (dtmplConfig) {
+      dtmplConfig.actions.forEach((ac, index) => {
         footerButtons.unshift(
-            <Button  onClick={() =>this.doSubmit()} type={'primary'} >
-            保 存
-        </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;
+          <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>
-       </>
-    )
+  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>
+      </>
+    );
+  }
+}