aldehyde 0.2.97 → 0.2.99

package/src/aldehyde/controls/input-number/index.tsx

@@ -1,101 +1,146 @@
-import React from 'react'
-import {InputNumber as AntdInputNumber,Space} from "antd";
-import {EControlProps} from "../../tmpl/interface";
+import React from "react";
+import { InputNumber as AntdInputNumber, Space } from "antd";
+import { EControlProps } from "../../tmpl/interface";
 import Units from "../../units";
+import { useLocale } from "../../locale/useLocale";
 
-interface InputNumberProps extends EControlProps {
-
-}
+interface InputNumberProps extends EControlProps {}
 
 const InputNumber: React.FC<InputNumberProps> = (props) => {
+  const { id, value, itemType, fieldConfig, onChange, style, min, max } = props;
+  const { translate } = useLocale();
 
-    const {id,value, itemType, fieldConfig, onChange,style,min,max} = props;
-
-    let entryControl = undefined;
-    //console.log('form value',value);
-    const changeValue = (value) => {
-        //console.log('input value',value);
-        if (onChange) {
-            onChange(value);
-        }
+  let entryControl = undefined;
+  //console.log('form value',value);
+  const changeValue = (value) => {
+    //console.log('input value',value);
+    if (onChange) {
+      onChange(value);
     }
+  };
 
-    let valObj=Units.splitValue(value);
-    let valueBegin=valObj['valueBegin'], valueEnd=valObj['valueEnd'];
-    let valueSingle=value || value==0 ?value:null;
+  let valObj = Units.splitValue(value);
+  let valueBegin = valObj["valueBegin"],
+    valueEnd = valObj["valueEnd"];
+  let valueSingle = value || value == 0 ? value : null;
 
-    const changeBeginValue = (value) => {
-        if (onChange) {
-            onChange(Units.concatValue(value,valueEnd));
-        }
+  const changeBeginValue = (value) => {
+    if (onChange) {
+      onChange(Units.concatValue(value, valueEnd));
     }
+  };
 
-    const changeEndValue = (value) => {
-        if (onChange) {
-            onChange(Units.concatValue(valueBegin,value));
-        }
+  const changeEndValue = (value) => {
+    if (onChange) {
+      onChange(Units.concatValue(valueBegin, value));
     }
+  };
 
-    const changeInt = (e) => { //只允许输入整数
-            if ((e.target.value || e.target.value==0) && !isNaN(e.target.value)) {
-                //e.target.value = e.target.value
-            } else {
-                e.target.value = null
-            }
-        }
-    ;
-    let placeholder = !fieldConfig.disabled ? `请输入${fieldConfig.title}` : "无需输入";
-    let disabled: boolean = fieldConfig.disabled;
-
-    let antdControlProps = {
-       id, placeholder, disabled,value
+  const changeInt = (e) => {
+    //只允许输入整数
+    if ((e.target.value || e.target.value == 0) && !isNaN(e.target.value)) {
+      //e.target.value = e.target.value
+    } else {
+      e.target.value = null;
     }
+  };
+  let placeholder = !fieldConfig.disabled
+    ? translate("${请输入}${" + fieldConfig.title + "}")
+    : translate("${无需输入}");
+  let disabled: boolean = fieldConfig.disabled;
 
-    switch (itemType) {
-        case 'int':
-            entryControl = <AntdInputNumber   style={{...style}} min={min} max={max} stringMode precision={0}
-                                            {...antdControlProps} value={valueSingle}
-                                             onChange={changeValue}
-            />
-            break;
-        case 'decimal':
-        case 'float':
-        case 'double':
-            entryControl = <AntdInputNumber style={{...style}}
-                {...antdControlProps} value={valueSingle} min={min} max={max}
-                // style={{width}}
-                step={0.1} onChange={changeValue}
-            />
-            break;
-        case 'intrange':
-            entryControl =
-                <Space>
-                <AntdInputNumber  min={min} max={max}
-                                            placeholder={`开始`} value={valueBegin} precision={0}
-                                            onKeyUp={changeInt} onChange={changeBeginValue}
-            />~
-            <AntdInputNumber min={min} max={max}
-                             placeholder={`结束`} value={valueEnd} precision={0}
-                             onKeyUp={changeInt} onChange={changeEndValue}
-            />
-                    </Space>;
-            break;
-        case 'decimalrange':
-            entryControl =
-                <Space>
-                    <AntdInputNumber min={min} max={max}
-                                     placeholder={`开始`} value={valueBegin}
-                                      onChange={changeBeginValue} step={0.1}
-                                     disabled={disabled}
-                    />~
-                    <AntdInputNumber min={min} max={max}
-                                     placeholder={`结束`} value={valueEnd} step={0.1}
-                                      onChange={changeEndValue}  disabled={disabled}
-                    />
-                </Space>;
-            break;
-    }
-    return entryControl;
-}
+  let antdControlProps = {
+    id,
+    placeholder,
+    disabled,
+    value,
+  };
+
+  switch (itemType) {
+    case "int":
+      entryControl = (
+        <AntdInputNumber
+          style={{ ...style }}
+          min={min}
+          max={max}
+          stringMode
+          precision={0}
+          {...antdControlProps}
+          value={valueSingle}
+          onChange={changeValue}
+        />
+      );
+      break;
+    case "decimal":
+    case "float":
+    case "double":
+      entryControl = (
+        <AntdInputNumber
+          style={{ ...style }}
+          {...antdControlProps}
+          value={valueSingle}
+          min={min}
+          max={max}
+          // style={{width}}
+          step={0.1}
+          onChange={changeValue}
+        />
+      );
+      break;
+    case "intrange":
+      entryControl = (
+        <Space>
+          <AntdInputNumber
+            min={min}
+            max={max}
+            placeholder={translate("${开始}")}
+            value={valueBegin}
+            precision={0}
+            onKeyUp={changeInt}
+            onChange={changeBeginValue}
+          />
+          ~
+          <AntdInputNumber
+            min={min}
+            max={max}
+            placeholder={translate("${结束}")}
+            value={valueEnd}
+            precision={0}
+            onKeyUp={changeInt}
+            onChange={changeEndValue}
+          />
+        </Space>
+      );
+      break;
+    case "decimalrange":
+      entryControl = (
+        <Space>
+          <AntdInputNumber
+            min={min}
+            max={max}
+            placeholder={translate("${开始}")}
+            value={valueBegin}
+            onChange={changeBeginValue}
+            step={0.1}
+            disabled={disabled}
+          />
+          ~
+          <AntdInputNumber
+            min={min}
+            max={max}
+            placeholder={translate("${结束}")}
+            value={valueEnd}
+            step={0.1}
+            onChange={changeEndValue}
+            disabled={disabled}
+          />
+        </Space>
+      );
+      break;
+    default:
+      break;
+  }
+  return entryControl;
+};
 
-export default InputNumber;
+export default InputNumber;

package/src/aldehyde/controls/input-range/index.tsx

@@ -1,48 +1,59 @@
-import React from 'react'
-import {Input} from "antd";
-import {EControlProps} from "../../tmpl/interface";
-import Units from '../../units/'
+import React from "react";
+import { Input } from "antd";
+import { EControlProps } from "../../tmpl/interface";
+import Units from "../../units/";
+import { useLocale } from "../../locale/useLocale";
 
-interface InputRangeProps extends EControlProps {
-
-}
+interface InputRangeProps extends EControlProps {}
 
 const InputRange: React.FC<InputRangeProps> = (props) => {
+  const { id, value, itemType, fieldConfig, onChange, style } = props;
+  const { translate } = useLocale();
 
-    const {id,value, itemType, fieldConfig, onChange, style} = props;
-
-    let entryControl = undefined;
+  let entryControl = undefined;
 
-
-    let valObj=Units.splitValue(value);
-    let valueBegin=valObj['valueBegin'], valueEnd=valObj['valueEnd'];
-    const changeBeginValue = ({ target: { value } }) => {
-        if (onChange) {
-            onChange(Units.concatValue(value,valueEnd));
-        }
+  let valObj = Units.splitValue(value);
+  let valueBegin = valObj["valueBegin"],
+    valueEnd = valObj["valueEnd"];
+  const changeBeginValue = ({ target: { value } }) => {
+    if (onChange) {
+      onChange(Units.concatValue(value, valueEnd));
     }
+  };
 
-    const changeEndValue = ({ target: { value } }) => {
-        if (onChange) {
-            onChange(Units.concatValue(valueBegin,value));
-        }
+  const changeEndValue = ({ target: { value } }) => {
+    if (onChange) {
+      onChange(Units.concatValue(valueBegin, value));
     }
-
-    let disabled: boolean = fieldConfig.disabled;
-    entryControl =
-        <Input.Group   compact>
-            <Input id={id} style={{ width: '45%' }} disabled={disabled} min={fieldConfig.min} max={fieldConfig.max}
-                   placeholder={`开始`} value={valueBegin}
-                   onChange={changeBeginValue}
-            />
-            ~
-            <Input style={{ width: '45%' }} disabled={disabled} min={fieldConfig.min} max={fieldConfig.max}
-                   placeholder={`结束`} value={valueEnd}
-                   onChange={changeEndValue}
-            />
-        </Input.Group>;
-
-    return entryControl;
-}
-
-export default InputRange;
+  };
+
+  let disabled: boolean = fieldConfig.disabled;
+  entryControl = (
+    <Input.Group compact>
+      <Input
+        id={id}
+        style={{ width: "45%" }}
+        disabled={disabled}
+        min={fieldConfig.min}
+        max={fieldConfig.max}
+        placeholder={translate("${开始}")}
+        value={valueBegin}
+        onChange={changeBeginValue}
+      />
+      ~
+      <Input
+        style={{ width: "45%" }}
+        disabled={disabled}
+        min={fieldConfig.min}
+        max={fieldConfig.max}
+        placeholder={translate("${结束}")}
+        value={valueEnd}
+        onChange={changeEndValue}
+      />
+    </Input.Group>
+  );
+
+  return entryControl;
+};
+
+export default InputRange;

package/src/aldehyde/controls/password-setter/index.js

@@ -1,70 +1,88 @@
-import React from 'react'
-import {Modal, Input, Form, message} from 'antd'
-import {LockOutlined} from '@ant-design/icons';
-import './index.css'
+import React from "react";
+import { Modal, Input, Form, message } from "antd";
+import { LockOutlined } from "@ant-design/icons";
+import "./index.css";
+import { LocaleContext } from "../../locale/LocaleProvider";
 
+// 没有用，暂时不做国际化
 export default class SetPasswords extends React.Component {
-
-    handleOk = () => {
-        const {oldPass} = this.props
-        this.props.form.validateFields({force: true}, (err, values) => { //提交再次验证
-            if (!err) {
-                if (oldPass === values.oldpass) {
-                    this.props.setNewPass(values.newpass)
-                } else {
-                    message.error("原登录密码不正确！")
-                }
-            }
-
-        })
-    }
-    compareToFirstPassword = (rule, value, callback) => {
-        const form = this.props.form;
-        if (value && value !== form.getFieldValue('newpass')) {
-            callback('请输入相同的密码!');
+  constructor() {
+    super();
+    this.contextType = LocaleContext;
+  }
+  handleOk = () => {
+    const { oldPass } = this.props;
+    this.props.form.validateFields({ force: true }, (err, values) => {
+      //提交再次验证
+      if (!err) {
+        if (oldPass === values.oldpass) {
+          this.props.setNewPass(values.newpass);
         } else {
-            callback();
+          message.error("原登录密码不正确！");
         }
+      }
+    });
+  };
+  compareToFirstPassword = (rule, value, callback) => {
+    const form = this.props.form;
+    if (value && value !== form.getFieldValue("newpass")) {
+      callback("请输入相同的密码!");
+    } else {
+      callback();
     }
+  };
 
-    render() {
-        const {showSetPass, handleCancel} = this.props
-        return (
-            <Modal
-                title="修改密码"
-                open={showSetPass}
-                onOk={this.handleOk}
-                destroyOnClose
-                onCancel={handleCancel}
-                className="setPass"
-                maskClosable={false}
-            >
-                <Form style={{width: "100%"}}>
-                    <Form.Item label={"原登录密码"} name='oldpass' rules={[{required: true, message: '请输入原登录密码!'}]}>
-                        <Input
-                            prefix={<LockOutlined/>}
-                            placeholder="请输入原登录密码"
-                            type="password"
-                        />,
-                    </Form.Item>
-                    <Form.Item label={"新登录密码"} name='oldpass'> rules={[{required: true, message: '请输入新登录密码!'}]}
-                        <Input
-                            prefix={<LockOutlined/>}
-                            type="password"
-                            placeholder="请输入新登录密码"
-                        />,
-                    </Form.Item>
-                    <Form.Item label={"确认密码"}> name='apass' rules={[{required: true, message: '确认密码!'},
-                        {validator: this.compareToFirstPassword,}
-                    ]}
-                        <Input
-                            prefix={<LockOutlined/>}
-                            type="password"
-                            placeholder="确认密码"
-                        />
-                    </Form.Item>
-                </Form>
-            </Modal>
-        )
-    }
+  render() {
+    const { showSetPass, handleCancel } = this.props;
+    console.log(this.context);
+    return (
+      <Modal
+        title="修改密码"
+        open={showSetPass}
+        onOk={this.handleOk}
+        destroyOnClose
+        onCancel={handleCancel}
+        className="setPass"
+        maskClosable={false}
+      >
+        <Form style={{ width: "100%" }}>
+          <Form.Item
+            label={"原登录密码"}
+            name="oldpass"
+            rules={[{ required: true, message: "请输入原登录密码!" }]}
+          >
+            <Input
+              prefix={<LockOutlined />}
+              placeholder="请输入原登录密码"
+              type="password"
+            />
+            ,
+          </Form.Item>
+          <Form.Item label={"新登录密码"} name="oldpass">
+            {" "}
+            rules={[{ required: true, message: "请输入新登录密码!" }]}
+            <Input
+              prefix={<LockOutlined />}
+              type="password"
+              placeholder="请输入新登录密码"
+            />
+            ,
+          </Form.Item>
+          <Form.Item label={"确认密码"}>
+            {" "}
+            name='apass' rules=
+            {[
+              { required: true, message: "确认密码!" },
+              { validator: this.compareToFirstPassword },
+            ]}
+            <Input
+              prefix={<LockOutlined />}
+              type="password"
+              placeholder="确认密码"
+            />
+          </Form.Item>
+        </Form>
+      </Modal>
+    );
+  }
 }

package/src/aldehyde/controls/progress/index.tsx

@@ -1,61 +1,74 @@
-import React from 'react'
-import {InputNumber as AntdInputNumber,Progress as AntdProgress,Space} from "antd";
-import {EControlProps,VEControlProps} from "../../tmpl/interface";
+import React from "react";
+import {
+  InputNumber as AntdInputNumber,
+  Progress as AntdProgress,
+  Space,
+} from "antd";
+import { EControlProps, VEControlProps } from "../../tmpl/interface";
 import Units from "../../units";
+import { useLocale } from "../../locale/useLocale";
 
-interface ProgressProps extends VEControlProps {
-
-}
+interface ProgressProps extends VEControlProps {}
 
 const Progress: React.FC<ProgressProps> = (props) => {
+  const { value, itemType, fieldConfig, onChange, style, viewOrEdit } = props;
+  const { translate } = useLocale();
 
-    const {value, itemType, fieldConfig, onChange,style,viewOrEdit} = props;
+  let val = 0;
 
-    let val=0;
+  if (!value) {
+    val = 0;
+  } else {
+    if (isNaN(value)) {
+      val = value;
+    } else {
+      val = value.toString();
+    }
+  }
 
-    if (!value ) {
-        val=0;
-    }else{
-        if(isNaN(value)){
-           val= value;
-        }else {
-            val=value.toString();
-        }
+  const changeValue = (value) => {
+    if (onChange) {
+      onChange(value);
     }
+  };
 
-    const changeValue = (value) => {
-        if (onChange) {
-            onChange(value);
-        }
+  const changeInt = (e) => {
+    //只允许输入整数
+    if (e.target.value && !isNaN(e.target.value)) {
+      e.target.value = parseInt(e.target.value);
+    } else {
+      e.target.value = 0;
     }
+  };
 
-    const changeInt = (e) => { //只允许输入整数
-            if (e.target.value && !isNaN(e.target.value)) {
-                e.target.value = parseInt(e.target.value)
-            } else {
-                e.target.value = 0
-            }
-        }
-    ;
+  let placeholder = !fieldConfig.disabled
+    ? translate("${请输入}${" + fieldConfig.title + "}")
+    : translate("${无需输入}");
+  let disabled: boolean = fieldConfig.disabled;
 
-    let placeholder = !fieldConfig.disabled ? `请输入${fieldConfig.title}` : "无需输入";
-    let disabled: boolean = fieldConfig.disabled;
+  let antdControlProps = {
+    placeholder,
+    disabled,
+    value,
+  };
 
-    let antdControlProps = {
-        placeholder, disabled,value
-    }
+  let entryControl;
 
-    let entryControl;
-
-    if(viewOrEdit=='view' || fieldConfig.disabled){
-        entryControl= <AntdProgress width={90}  percent={val} />
-    }else{
-        entryControl = <AntdInputNumber style={{...style}} min={0} max={100}
-                                        {...antdControlProps}
-                                        onKeyUp={changeInt} onChange={changeValue}
-        />
-    }
-    return entryControl;
-}
+  if (viewOrEdit == "view" || fieldConfig.disabled) {
+    entryControl = <AntdProgress width={90} percent={val} />;
+  } else {
+    entryControl = (
+      <AntdInputNumber
+        style={{ ...style }}
+        min={0}
+        max={100}
+        {...antdControlProps}
+        onKeyUp={changeInt}
+        onChange={changeValue}
+      />
+    );
+  }
+  return entryControl;
+};
 
-export default Progress;
+export default Progress;