aldehyde 0.2.97 → 0.2.99

package/src/aldehyde/controls/relation-existion/index.tsx

@@ -1,102 +1,140 @@
-import * as React from 'react'
-import {Popover, Select} from 'antd'
-import {EControlProps, SelectedRow} from "../../tmpl/interface";
-import {SearchOutlined} from '@ant-design/icons';
-import SelectTable from '../../table/select-table'
-import './index.css'
+import * as React from "react";
+import { Popover, Select } from "antd";
+import { EControlProps, SelectedRow } from "../../tmpl/interface";
+import { SearchOutlined } from "@ant-design/icons";
+import SelectTable from "../../table/select-table";
+import "./index.css";
+import { LocaleContext } from "../../locale/LocaleProvider";
 
-interface RelationExistionProps extends EControlProps {
-
-};
+interface RelationExistionProps extends EControlProps {}
 
 interface RelationExistionState {
-    showSelectTable?: boolean;
-};
-
-export default class RelationExistion extends React.PureComponent<RelationExistionProps, RelationExistionState> {
+  showSelectTable?: boolean;
+}
 
-    state = {
-        showSelectTable: false,
-    }
+export default class RelationExistion extends React.PureComponent<
+  RelationExistionProps,
+  RelationExistionState
+> {
+  state = {
+    showSelectTable: false,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
 
-    onClick = () => {
-        this.setState({
-            showSelectTable: true,
-        })
-    }
+  onClick = () => {
+    this.setState({
+      showSelectTable: true,
+    });
+  };
 
-    onClear = () => {
-        const { onChange} = this.props;
-        onChange([]);
-    }
+  onClear = () => {
+    const { onChange } = this.props;
+    onChange([]);
+  };
 
-    onDeselect=(val:string)=>{
-        const {value, onChange} = this.props;
-        let newValue = [];
-        if (value) {
-            for (let v of value) {
-                if(val!=v){
-                    newValue.push(v);
-                }
-            }
+  onDeselect = (val: string) => {
+    const { value, onChange } = this.props;
+    let newValue = [];
+    if (value) {
+      for (let v of value) {
+        if (val != v) {
+          newValue.push(v);
         }
-        onChange(newValue);
+      }
     }
+    onChange(newValue);
+  };
 
-    onSelect = (selectedRows: SelectedRow[]) => {
-        const {value, onChange} = this.props;
-        let newValue = [];
-        if (selectedRows) {
-            for (let row of selectedRows) {
-                newValue.push(row.code+ '@R@' +row.title  );
-            }
-        }
-        onChange(newValue);
-        // this.setState({
-        //     showSelectTable: false,
-        // })
+  onSelect = (selectedRows: SelectedRow[]) => {
+    const { value, onChange } = this.props;
+    let newValue = [];
+    if (selectedRows) {
+      for (let row of selectedRows) {
+        newValue.push(row.code + "@R@" + row.title);
+      }
     }
+    onChange(newValue);
+    // this.setState({
+    //     showSelectTable: false,
+    // })
+  };
 
-
-    render() {
-        const {id,value, itemType, fieldConfig, onChange, style,serverKey} = this.props;
-        const {showSelectTable} = this.state;
-        let selectedRows: SelectedRow[] = [];
-        let relationOptions = []
-        if (value) {
-            value.forEach((v) => {
-                if (v.indexOf('@R@') > 0) {
-                    let vs=v.split('@R@');
-                    selectedRows.push({code: vs[0], title:vs[1]});
-                    relationOptions.push({value: v, label: vs[1]});
-                }
-            })
+  render() {
+    const {
+      id,
+      value,
+      itemType,
+      fieldConfig,
+      onChange,
+      style,
+      serverKey,
+    } = this.props;
+    const { showSelectTable } = this.state;
+    const { translate } = this.context;
+    let selectedRows: SelectedRow[] = [];
+    let relationOptions = [];
+    if (value) {
+      value.forEach((v) => {
+        if (v.indexOf("@R@") > 0) {
+          let vs = v.split("@R@");
+          selectedRows.push({ code: vs[0], title: vs[1] });
+          relationOptions.push({ value: v, label: vs[1] });
         }
-        return <>
-            <Popover placement="bottom" color={'#f0f0f0'} overlayStyle={{maxWidth: 'calc(100vw - 60px)', maxHeight: 'calc(100vh - 50px)',} }
-                     overlayInnerStyle={{padding:'0px'}}
-                     // getPopupContainer={(triggerNode) => {
-                     //        return triggerNode.parentNode;}}
-                     content={<div style={{height:300,backgroundColor:'#fafafa',overflow:'auto',borderStyle:'solid',borderRadius:'6px',
-                         borderWidth:'0px',borderColor:'#8c8c8c'}}><SelectTable serverKey={serverKey} selectedRows={selectedRows} sourceId={fieldConfig.sourceId}  onChange={this.onSelect}></SelectTable></div>}
-                     trigger="click">
-            <Select id={id} style={{...style}}
-                    value={value}
-                    mode="multiple"
-                    placeholder={`请选择${fieldConfig.title}`}
-                    notFoundContent="请选择"
-                    allowClear={true}
-                    showArrow={true}
-                    suffixIcon={<SearchOutlined/>}
-                    dropdownStyle={{display: 'none'}}
-                    onChange={(value)=>{
-                        onChange(value)}
-                    }
-                    options={relationOptions}
-            >
-            </Select>
-            </Popover>
-
-        </>;
+      });
     }
+    return (
+      <>
+        <Popover
+          placement="bottom"
+          color={"#f0f0f0"}
+          overlayStyle={{
+            maxWidth: "calc(100vw - 60px)",
+            maxHeight: "calc(100vh - 50px)",
+          }}
+          overlayInnerStyle={{ padding: "0px" }}
+          // getPopupContainer={(triggerNode) => {
+          //        return triggerNode.parentNode;}}
+          content={
+            <div
+              style={{
+                height: 300,
+                backgroundColor: "#fafafa",
+                overflow: "auto",
+                borderStyle: "solid",
+                borderRadius: "6px",
+                borderWidth: "0px",
+                borderColor: "#8c8c8c",
+              }}
+            >
+              <SelectTable
+                serverKey={serverKey}
+                selectedRows={selectedRows}
+                sourceId={fieldConfig.sourceId}
+                onChange={this.onSelect}
+              ></SelectTable>
+            </div>
+          }
+          trigger="click"
+        >
+          <Select
+            id={id}
+            style={{ ...style }}
+            value={value}
+            mode="multiple"
+            placeholder={translate("${请选择}${" + fieldConfig.title + "}")}
+            notFoundContent={translate("${请选择}")}
+            allowClear={true}
+            showArrow={true}
+            suffixIcon={<SearchOutlined />}
+            dropdownStyle={{ display: "none" }}
+            onChange={(value) => {
+              onChange(value);
+            }}
+            options={relationOptions}
+          ></Select>
+        </Popover>
+      </>
+    );
+  }
 }

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

@@ -1,162 +1,189 @@
-import * as React from 'react'
-import {Button, Popover, Space} from 'antd'
-import {VControlProps} from "../../tmpl/interface";
-import ModalDtmplView from '../../detail/view/modal-dtmpl-view'
-import './index.css'
+import * as React from "react";
+import { Button, Popover, Space } from "antd";
+import { VControlProps } from "../../tmpl/interface";
+import ModalDtmplView from "../../detail/view/modal-dtmpl-view";
+import "./index.css";
+import { LocaleContext } from "../../locale/LocaleProvider";
 
-interface RfieldProps extends VControlProps {
-};
+interface RfieldProps extends VControlProps {}
 
 interface RfieldState {
-    showDtmplView?: boolean;
-    showSelectTable?: boolean;
-    selectedCodes?: string[];
-    openCode?: string;
-};
-
-export default class Rfield extends React.PureComponent<RfieldProps, RfieldState> {
-
-    state = {
-        showDtmplView: false,
-        showSelectTable: false,
-        selectedCodes: undefined,
-        openCode: undefined,
-    }
-
-
-    showRfieldDtmplView = (code) => {
-        this.setState({
-            openCode: code,
-            showDtmplView: true,
-        })
-    }
-
-    hiddenDtmplView = () => {
-        this.setState({
-            showDtmplView: false,
-        })
-    }
-
-    handleRFieldSelect = (id: string) => {
+  showDtmplView?: boolean;
+  showSelectTable?: boolean;
+  selectedCodes?: string[];
+  openCode?: string;
+}
 
+export default class Rfield extends React.PureComponent<
+  RfieldProps,
+  RfieldState
+> {
+  state = {
+    showDtmplView: false,
+    showSelectTable: false,
+    selectedCodes: undefined,
+    openCode: undefined,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  showRfieldDtmplView = (code) => {
+    this.setState({
+      openCode: code,
+      showDtmplView: true,
+    });
+  };
+
+  hiddenDtmplView = () => {
+    this.setState({
+      showDtmplView: false,
+    });
+  };
+
+  handleRFieldSelect = (id: string) => {};
+
+  deleteRFieldValue = (id: string) => {};
+
+  showCount = () => {
+    const { value } = this.props;
+    let valueArray: string[];
+    let vStr = "";
+    if (value instanceof Array) {
+      valueArray = value;
+      let i: number = 0;
+      for (let val of valueArray) {
+        i++;
+        let isRValue = val ? val.indexOf("@R@") > 0 : false;
+        let valueShow = isRValue ? val.split("@R@")[1] : val;
+        vStr = vStr + valueShow;
+        if (vStr.length >= 20) {
+          break;
+        }
+      }
+      return i;
+    } else {
+      return 1;
     }
-
-    deleteRFieldValue = (id: string) => {
-
+  };
+
+  needMore = () => {
+    const { value } = this.props;
+    let showCount = this.showCount();
+    let allCount = 0;
+    if (value instanceof Array) {
+      allCount = value.length;
+    } else {
+      allCount = 1;
     }
-
-    showCount = () => {
-        const {value} = this.props;
-        let valueArray: string[];
-        let vStr = "";
-        if (value instanceof Array) {
-            valueArray = value;
-            let i: number = 0;
-            for (let val of valueArray) {
-                i++;
-                let isRValue = val ? val.indexOf('@R@') > 0 : false;
-                let valueShow = isRValue ? val.split('@R@')[1] : val;
-                vStr = vStr + valueShow;
-                if (vStr.length >= 20) {
-                    break;
-                }
-            }
-            return i;
-        } else {
-            return 1;
-        }
+    if (allCount > showCount) {
+      return true;
+    } else {
+      return false;
     }
-
-    needMore = () => {
-        const {value} = this.props;
-        let showCount = this.showCount();
-        let allCount = 0;
-        if (value instanceof Array) {
-            allCount = value.length;
-        } else {
-            allCount = 1;
-        }
-        if (allCount > showCount) {
-            return true;
-        } else {
-            return false;
-        }
+  };
+
+  getValue = (count?: number) => {
+    const { fieldConfig, value } = this.props;
+    const { buttons } = fieldConfig;
+    let valueArray: string[];
+    //debugger
+    if (value instanceof Array) {
+      if (count && count > 0 && value.length > count) {
+        valueArray = value.slice(0, count);
+      } else {
+        valueArray = value;
+      }
+    } else {
+      if (value) {
+        valueArray = value.split(",");
+      } else {
+        valueArray = [];
+      }
     }
-
-    getValue = (count?: number) => {
-        const {fieldConfig, value,} = this.props;
-        const {buttons} = fieldConfig;
-        let valueArray: string[];
-        //debugger
-        if (value instanceof Array) {
-            if (count && count > 0 && value.length > count) {
-                valueArray = value.slice(0, count);
-            } else {
-                valueArray = value;
-            }
-        } else {
-            if (value) {
-                valueArray = value.split(',');
-            } else {
-                valueArray = [];
-            }
-        }
-        let dom;
-        if (buttons && buttons.includes('detail')) {
-            dom = <Space key={count?(count+1):1} size={[8, 8]} wrap>
-                {valueArray.map((val,index) => {
-                    let isRValue = val ? val.indexOf('@R@') > 0 : false;
-                    let valueShow = isRValue ? val.split('@R@')[1] : val;
-                    let code = !val ? undefined : val.split('@R@')[0];
-                    return isRValue ? <Button key={index} style={{padding:'0px 0px',height:'100%'}}  type="link" title=""
-                                              onClick={() => {
-                                                  this.showRfieldDtmplView(code)
-                                              }}>{valueShow}
-                    </Button> : <span key={index}>{valueShow}
-                        </span>;
-                })
-                }
-            </Space>;
-        } else {
-            dom = <Space key={count?(count+2):2} size={[8, 16]} wrap>
-                {valueArray.map((val,index) => {
-                    let isRValue = val ? val.indexOf('@R@') > 0 : false;
-                    let valueShow = isRValue ? val.split('@R@')[1] : val;
-                    let code = !val ? undefined : val.split('@R@')[0];
-                    return <span key={index}>{valueShow}
-                        </span>;
-                })
-                }
-            </Space>
-        }
-
-        return dom;
+    let dom;
+    if (buttons && buttons.includes("detail")) {
+      dom = (
+        <Space key={count ? count + 1 : 1} size={[8, 8]} wrap>
+          {valueArray.map((val, index) => {
+            let isRValue = val ? val.indexOf("@R@") > 0 : false;
+            let valueShow = isRValue ? val.split("@R@")[1] : val;
+            let code = !val ? undefined : val.split("@R@")[0];
+            return isRValue ? (
+              <Button
+                key={index}
+                style={{ padding: "0px 0px", height: "100%" }}
+                type="link"
+                title=""
+                onClick={() => {
+                  this.showRfieldDtmplView(code);
+                }}
+              >
+                {valueShow}
+              </Button>
+            ) : (
+              <span key={index}>{valueShow}</span>
+            );
+          })}
+        </Space>
+      );
+    } else {
+      dom = (
+        <Space key={count ? count + 2 : 2} size={[8, 16]} wrap>
+          {valueArray.map((val, index) => {
+            let isRValue = val ? val.indexOf("@R@") > 0 : false;
+            let valueShow = isRValue ? val.split("@R@")[1] : val;
+            let code = !val ? undefined : val.split("@R@")[0];
+            return <span key={index}>{valueShow}</span>;
+          })}
+        </Space>
+      );
     }
 
-    render() {
-        const {fieldConfig, value, itemType,serverKey} = this.props;
-        const {showDtmplView, openCode} = this.state;
-        const {buttons} = fieldConfig;
-
-        // let isRValue = value ? value.indexOf('@R@') > 0 : false;
-        // let valueShow = isRValue ? value.split('@R@')[1] : "";
-        // let code = !value ? undefined : value.split('@R@')[0];
-        let showDom = this.getValue(this.showCount());
-        return <>
-            <Space key={3} size={[8, 16]} wrap style={{minWidth:'80px'}}>
-            {showDom}
-            {this.needMore() ?
-                <Popover overlayStyle={{maxWidth: '400px'}} placement="leftBottom" trigger="click"
-                         content={this.getValue()}>
-                    <Button key={'more'}  type={"link"} size={'small'}
-                    >更多...</Button>
-                </Popover> : null
-            }
-            {buttons && buttons.includes('detail') ?
-                <ModalDtmplView serverKey={serverKey} key={'mdv'} open={showDtmplView} onCancel={this.hiddenDtmplView}
-                                sourceId={fieldConfig.sourceId}
-                                code={openCode}> </ModalDtmplView> : ""}
-            </Space>
-        </>;
-    }
+    return dom;
+  };
+
+  render() {
+    const { fieldConfig, value, itemType, serverKey } = this.props;
+    const { showDtmplView, openCode } = this.state;
+    const { buttons } = fieldConfig;
+    const { translate } = this.context;
+
+    // let isRValue = value ? value.indexOf('@R@') > 0 : false;
+    // let valueShow = isRValue ? value.split('@R@')[1] : "";
+    // let code = !value ? undefined : value.split('@R@')[0];
+    let showDom = this.getValue(this.showCount());
+    return (
+      <>
+        <Space key={3} size={[8, 16]} wrap style={{ minWidth: "80px" }}>
+          {showDom}
+          {this.needMore() ? (
+            <Popover
+              overlayStyle={{ maxWidth: "400px" }}
+              placement="leftBottom"
+              trigger="click"
+              content={this.getValue()}
+            >
+              <Button key={"more"} type={"link"} size={"small"}>
+                {translate("${更多}...")}
+              </Button>
+            </Popover>
+          ) : null}
+          {buttons && buttons.includes("detail") ? (
+            <ModalDtmplView
+              serverKey={serverKey}
+              key={"mdv"}
+              open={showDtmplView}
+              onCancel={this.hiddenDtmplView}
+              sourceId={fieldConfig.sourceId}
+              code={openCode}
+            >
+              {" "}
+            </ModalDtmplView>
+          ) : (
+            ""
+          )}
+        </Space>
+      </>
+    );
+  }
 }