aldehyde 0.2.197 → 0.2.199

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

@@ -1,179 +1,179 @@
-import React from "react";
-import {
-  Button,
-  Card,
-  FormInstance,
-  Popconfirm,
-  Popover,
-  Space,
-  Tooltip,
-} from "antd";
-import { CloseOutlined } from "@ant-design/icons";
-import { DtmplData, FieldGroupConfig } from "../../tmpl/interface";
-import FieldGroupForm from "../../form/field-group-form";
-import { ButtonType } from "antd/es/button";
-import { LocaleContext } from "../../locale/LocaleProvider";
-
-interface RowEditCardProps {
-  serverKey?: string;
-  height?: any;
-  onCancel?: () => void;
-  onOk: (value: DtmplData, hidden: boolean) => void;
-  fieldGroupConfig: FieldGroupConfig;
-  dtmplData?: DtmplData;
-  okButtonType?: ButtonType;
-  okDanger?: boolean;
-  needConfirm?: boolean;
-}
-
-interface RowEditCardState {
-  isAdded?: boolean;
-}
-
-export default class RowEditCard extends React.PureComponent<
-  RowEditCardProps,
-  RowEditCardState
-> {
-  formRef = React.createRef<FormInstance>();
-  static defaultProps = {
-    forceRender: true,
-    style: { maxWidth: "calc(100vw - 60px)", maxHeight: "calc(100vh - 50px)" },
-    needConfirm: false,
-    okButtonType: "primary",
-    okDanger: false,
-  };
-  state = {
-    isAdded: false,
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  async componentDidMount() {}
-
-  async componentDidUpdate() {
-    //this.reset();
-  }
-
-  reset = () => {
-    // if (this.formRef.current) {
-    //     this.formRef.current.resetFields();
-    // }
-  };
-
-  onOk = () => {
-    this.setState({ isAdded: false });
-    this.formRef.current.submit();
-  };
-  add = () => {
-    this.setState({ isAdded: true });
-    this.formRef.current.submit();
-  };
-
-  getTitle = () => {
-    const { fieldGroupConfig, dtmplData } = this.props;
-    const { translate } = this.context;
-
-    let title = "";
-    title = fieldGroupConfig.title;
-    if (dtmplData) {
-      title = title + translate("[${行编辑}]");
-    } else {
-      title = title + translate("[${新建一行}]");
-    }
-    return title;
-  };
-
-  render() {
-    const {
-      height,
-      onOk,
-      fieldGroupConfig,
-      dtmplData,
-      onCancel,
-      okButtonType,
-      needConfirm,
-      okDanger,
-      serverKey,
-    } = this.props;
-    const { isAdded } = this.state;
-    const { translate } = this.context;
-
-    function okButton(onOk) {
-      return needConfirm ? (
-        okDanger ? (
-          <Popconfirm
-            placement="rightBottom"
-            title={translate("${确定要执行提交吗}?")}
-            onConfirm={onOk}
-            okText={translate("${确定}")}
-            cancelText={translate("${取消}")}
-            okType={"danger"}
-          >
-            <Button type={okButtonType} danger={true} size="small">
-              确定
-            </Button>
-          </Popconfirm>
-        ) : (
-          <Popconfirm
-            placement="rightBottom"
-            title={translate("${确定要执行提交吗}?")}
-            onConfirm={onOk}
-            okText={translate("${确定}")}
-            cancelText={translate("${取消}")}
-          >
-            <Button size="small" type={okButtonType}>
-              {translate("${确定}")}
-            </Button>
-          </Popconfirm>
-        )
-      ) : (
-        <Button type={okButtonType} size="small" onClick={onOk}>
-          {translate("${确定}")}
-        </Button>
-      );
-    }
-
-    return (
-      <Card
-        style={{ width: 1000 }}
-        title={this.getTitle()}
-        bodyStyle={{ overflow: "auto" }}
-        extra={
-          <>
-            <Space size={[8, 0]}>
-              {/*<Button onClick={this.reset}>重置</Button>*/}
-              {okButton(this.onOk)}
-              {/*{dtmplData ? (*/}
-              {/*  ""*/}
-              {/*) : */}
-              {/*    (*/}
-              {/*  <Tooltip placement="top" title={translate("${可连续添加}")}>*/}
-              {/*    <Button type={"primary"} size={"small"} onClick={this.add}>*/}
-              {/*      {translate("${添加}")}*/}
-              {/*    </Button>*/}
-              {/*  </Tooltip>*/}
-              {/*)*/}
-              {/*}*/}
-
-              {onCancel ? (
-                <Button onClick={onCancel}>
-                  <CloseOutlined />
-                </Button>
-              ) : (
-                ""
-              )}
-            </Space>
-          </>
-        }
-      >
-        <FieldGroupForm
-          serverKey={serverKey}
-          fieldGroupConfig={fieldGroupConfig}
-          formRef={this.formRef}
-          onFinish={(value) => onOk(value, !isAdded)}
-          dtmplData={dtmplData}
-        />
-      </Card>
-    );
-  }
-}
+import React from "react";
+import {
+  Button,
+  Card,
+  FormInstance,
+  Popconfirm,
+  Popover,
+  Space,
+  Tooltip,
+} from "antd";
+import { CloseOutlined } from "@ant-design/icons";
+import { DtmplData, FieldGroupConfig } from "../../tmpl/interface";
+import FieldGroupForm from "../../form/field-group-form";
+import { ButtonType } from "antd/es/button";
+import { LocaleContext } from "../../locale/LocaleProvider";
+
+interface RowEditCardProps {
+  serverKey?: string;
+  height?: any;
+  onCancel?: () => void;
+  onOk: (value: DtmplData, hidden: boolean) => void;
+  fieldGroupConfig: FieldGroupConfig;
+  dtmplData?: DtmplData;
+  okButtonType?: ButtonType;
+  okDanger?: boolean;
+  needConfirm?: boolean;
+}
+
+interface RowEditCardState {
+  isAdded?: boolean;
+}
+
+export default class RowEditCard extends React.PureComponent<
+  RowEditCardProps,
+  RowEditCardState
+> {
+  formRef = React.createRef<FormInstance>();
+  static defaultProps = {
+    forceRender: true,
+    style: { maxWidth: "calc(100vw - 60px)", maxHeight: "calc(100vh - 50px)" },
+    needConfirm: false,
+    okButtonType: "primary",
+    okDanger: false,
+  };
+  state = {
+    isAdded: false,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  async componentDidMount() {}
+
+  async componentDidUpdate() {
+    //this.reset();
+  }
+
+  reset = () => {
+    // if (this.formRef.current) {
+    //     this.formRef.current.resetFields();
+    // }
+  };
+
+  onOk = () => {
+    this.setState({ isAdded: false });
+    this.formRef.current.submit();
+  };
+  add = () => {
+    this.setState({ isAdded: true });
+    this.formRef.current.submit();
+  };
+
+  getTitle = () => {
+    const { fieldGroupConfig, dtmplData } = this.props;
+    const { translate } = this.context;
+
+    let title = "";
+    title = fieldGroupConfig.title;
+    if (dtmplData) {
+      title = title + translate("[${行编辑}]");
+    } else {
+      title = title + translate("[${新建一行}]");
+    }
+    return title;
+  };
+
+  render() {
+    const {
+      height,
+      onOk,
+      fieldGroupConfig,
+      dtmplData,
+      onCancel,
+      okButtonType,
+      needConfirm,
+      okDanger,
+      serverKey,
+    } = this.props;
+    const { isAdded } = this.state;
+    const { translate } = this.context;
+
+    function okButton(onOk) {
+      return needConfirm ? (
+        okDanger ? (
+          <Popconfirm
+            placement="rightBottom"
+            title={translate("${确定要执行提交吗}?")}
+            onConfirm={onOk}
+            okText={translate("${确定}")}
+            cancelText={translate("${取消}")}
+            okType={"danger"}
+          >
+            <Button type={okButtonType} danger={true} size="small">
+              确定
+            </Button>
+          </Popconfirm>
+        ) : (
+          <Popconfirm
+            placement="rightBottom"
+            title={translate("${确定要执行提交吗}?")}
+            onConfirm={onOk}
+            okText={translate("${确定}")}
+            cancelText={translate("${取消}")}
+          >
+            <Button size="small" type={okButtonType}>
+              {translate("${确定}")}
+            </Button>
+          </Popconfirm>
+        )
+      ) : (
+        <Button type={okButtonType} size="small" onClick={onOk}>
+          {translate("${确定}")}
+        </Button>
+      );
+    }
+
+    return (
+      <Card
+        style={{ width: 1000 }}
+        title={this.getTitle()}
+        bodyStyle={{ overflow: "auto" }}
+        extra={
+          <>
+            <Space size={[8, 0]}>
+              {/*<Button onClick={this.reset}>重置</Button>*/}
+              {okButton(this.onOk)}
+              {/*{dtmplData ? (*/}
+              {/*  ""*/}
+              {/*) : */}
+              {/*    (*/}
+              {/*  <Tooltip placement="top" title={translate("${可连续添加}")}>*/}
+              {/*    <Button type={"primary"} size={"small"} onClick={this.add}>*/}
+              {/*      {translate("${添加}")}*/}
+              {/*    </Button>*/}
+              {/*  </Tooltip>*/}
+              {/*)*/}
+              {/*}*/}
+
+              {onCancel ? (
+                <Button onClick={onCancel}>
+                  <CloseOutlined />
+                </Button>
+              ) : (
+                ""
+              )}
+            </Space>
+          </>
+        }
+      >
+        <FieldGroupForm
+          serverKey={serverKey}
+          fieldGroupConfig={fieldGroupConfig}
+          formRef={this.formRef}
+          onFinish={(value) => onOk(value, !isAdded)}
+          dtmplData={dtmplData}
+        />
+      </Card>
+    );
+  }
+}

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

@@ -1,73 +1,73 @@
-import React from 'react';
-import {Button, FormInstance, Popover, Tooltip} from 'antd'
-import {DtmplData, FieldGroupConfig} from "../../tmpl/interface";
-import RowEditCard from './row-edit-card'
-interface RowEditorProps {
-    serverKey?:string,
-    buttonTitle?: string,
-    buttonIcon: React.ReactNode,
-    tooltipTitle?: React.ReactNode ;
-    fieldGroupConfig: FieldGroupConfig;
-    dtmplData?: DtmplData;
-    onOk:(value: DtmplData) => void,
-    buttonStyle?:object,
-    disabled?:boolean
-}
-
-interface RowEditorState {
-    popoverOpen?: boolean,
-}
-
-export default class RowEditor extends React.PureComponent<RowEditorProps, RowEditorState> {
-    formRef = React.createRef<FormInstance>();
-    static defaultProps = {
-        buttonIcon:undefined,
-        disabled:false,
-    }
-    state = {
-        popoverOpen: false,
-    }
-
-    async componentDidMount() {
-
-    }
-
-    async componentDidUpdate() {
-    }
-
-    // reset = () => {
-    //     if (this.formRef.current) {
-    //         this.formRef.current.resetFields();
-    //     }
-    // }
-
-    onOk = (value,hidden:boolean=true) => {
-        if(hidden){
-            this.setState({popoverOpen:false});
-        }
-
-       this.props.onOk(value);
-    }
-
-
-    render() {
-        const {popoverOpen}=this.state;
-        const { disabled, buttonIcon, buttonTitle, tooltipTitle, fieldGroupConfig, dtmplData,buttonStyle,serverKey} = this.props;
-        return <Popover  destroyTooltipOnHide={true} placement="leftBottom" open={popoverOpen}
-                        content={<RowEditCard serverKey={serverKey} fieldGroupConfig={fieldGroupConfig} dtmplData={dtmplData}
-                                              onCancel={()=>{
-                                                  this.setState({popoverOpen:false});}
-                                              }   onOk={this.onOk}></RowEditCard>} trigger="click">
-            <Tooltip placement="left" title={tooltipTitle}>
-                <Button
-                    disabled={disabled}
-                    style={buttonStyle}
-                    icon={buttonIcon}
-                    size="small"
-                    onClick={() => {
-                        this.setState({popoverOpen:!popoverOpen});
-                    }}
-                >{buttonTitle?buttonTitle:""}</Button></Tooltip></Popover>
-    }
-
+import React from 'react';
+import {Button, FormInstance, Popover, Tooltip} from 'antd'
+import {DtmplData, FieldGroupConfig} from "../../tmpl/interface";
+import RowEditCard from './row-edit-card'
+interface RowEditorProps {
+    serverKey?:string,
+    buttonTitle?: string,
+    buttonIcon: React.ReactNode,
+    tooltipTitle?: React.ReactNode ;
+    fieldGroupConfig: FieldGroupConfig;
+    dtmplData?: DtmplData;
+    onOk:(value: DtmplData) => void,
+    buttonStyle?:object,
+    disabled?:boolean
+}
+
+interface RowEditorState {
+    popoverOpen?: boolean,
+}
+
+export default class RowEditor extends React.PureComponent<RowEditorProps, RowEditorState> {
+    formRef = React.createRef<FormInstance>();
+    static defaultProps = {
+        buttonIcon:undefined,
+        disabled:false,
+    }
+    state = {
+        popoverOpen: false,
+    }
+
+    async componentDidMount() {
+
+    }
+
+    async componentDidUpdate() {
+    }
+
+    // reset = () => {
+    //     if (this.formRef.current) {
+    //         this.formRef.current.resetFields();
+    //     }
+    // }
+
+    onOk = (value,hidden:boolean=true) => {
+        if(hidden){
+            this.setState({popoverOpen:false});
+        }
+
+       this.props.onOk(value);
+    }
+
+
+    render() {
+        const {popoverOpen}=this.state;
+        const { disabled, buttonIcon, buttonTitle, tooltipTitle, fieldGroupConfig, dtmplData,buttonStyle,serverKey} = this.props;
+        return <Popover  destroyTooltipOnHide={true} placement="leftBottom" open={popoverOpen}
+                        content={<RowEditCard serverKey={serverKey} fieldGroupConfig={fieldGroupConfig} dtmplData={dtmplData}
+                                              onCancel={()=>{
+                                                  this.setState({popoverOpen:false});}
+                                              }   onOk={this.onOk}></RowEditCard>} trigger="click">
+            <Tooltip placement="left" title={tooltipTitle}>
+                <Button
+                    disabled={disabled}
+                    style={buttonStyle}
+                    icon={buttonIcon}
+                    size="small"
+                    onClick={() => {
+                        this.setState({popoverOpen:!popoverOpen});
+                    }}
+                >{buttonTitle?buttonTitle:""}</Button></Tooltip></Popover>
+    }
+
 }

package/src/aldehyde/detail/rightbar/index.css

@@ -1,35 +1,35 @@
-.rightBar{
-    background: #fff;
-    /*position: absolute;*/
-    /*right:10px;*/
-    /*top:80px;*/
-    border:1px solid #e8e8e8;
-    border-radius: 4px;
-    box-shadow: 2px 2px 10px rgba(0,0,0,.2);
-    height:200px;
-    /*max-height:181px;*/
-    /*min-height:80px;*/
-    min-width: 96px;
-    overflow:auto;
-}
-.rightBar::-webkit-scrollbar {
-    display: none;
-}
-.rightBar ul{
-    padding:0;
-    margin:0;
-}
-.rightBar li{
-    list-style-type: none;
-    cursor: pointer;
-    padding:3px 7px;
-    width:95px;
-    text-align: center;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    text-align: left;
-    overflow: hidden;
-}
-.rightBar li:hover{
-    background: #cfe3f5;
+.rightBar{
+    background: #fff;
+    /*position: absolute;*/
+    /*right:10px;*/
+    /*top:80px;*/
+    border:1px solid #e8e8e8;
+    border-radius: 4px;
+    box-shadow: 2px 2px 10px rgba(0,0,0,.2);
+    height:200px;
+    /*max-height:181px;*/
+    /*min-height:80px;*/
+    min-width: 96px;
+    overflow:auto;
+}
+.rightBar::-webkit-scrollbar {
+    display: none;
+}
+.rightBar ul{
+    padding:0;
+    margin:0;
+}
+.rightBar li{
+    list-style-type: none;
+    cursor: pointer;
+    padding:3px 7px;
+    width:95px;
+    text-align: center;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    text-align: left;
+    overflow: hidden;
+}
+.rightBar li:hover{
+    background: #cfe3f5;
 }