aldehyde 0.2.480 → 0.2.481

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

@@ -1,186 +1,186 @@
-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";
-import { LocaleContext } from "../../locale/LocaleProvider";
-
-interface FixRightSubmitButtonProps extends SubmitButtonProps {}
-
-interface FixRightSubmitButtonState {
-  // stateSerial:number
-  // loading: boolean;
-}
-
-class FixRightSubmitButtonBar extends React.PureComponent<
-  FixRightSubmitButtonProps,
-  FixRightSubmitButtonState
-> {
-  state = {
-    // loading: false,
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  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;
-    }
-  };
-
-  // doSubmit=async ()=>{
-  //   // this.setState({loading:true})
-  //   await this.props.doSubmit();
-  //   // this.setState({loading:false})
-  // }
-
-  render() {
-    const {} = this.state;
-    const {
-      dtmplConfig,
-      formRef,
-      doSubmit,loading,
-      serial,
-      serverKey,
-      dtmplData,
-    } = this.props;
-    const { buttons, actions } = dtmplConfig;
-    const cardList: TmplBase[] = [];
-    const { translate } = this.context;
-
-    //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,
-      });
-    });
-
-    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
-                    loading={loading}
-                  onClick={() => doSubmit()}
-                  type="primary"
-                  icon={<SaveOutlined />}
-                  key="btn"
-                  block
-                >
-                  {translate("${保存}")}
-                </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 loading={loading}
-                          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;
+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";
+import { LocaleContext } from "../../locale/LocaleProvider";
+
+interface FixRightSubmitButtonProps extends SubmitButtonProps {}
+
+interface FixRightSubmitButtonState {
+  // stateSerial:number
+  // loading: boolean;
+}
+
+class FixRightSubmitButtonBar extends React.PureComponent<
+  FixRightSubmitButtonProps,
+  FixRightSubmitButtonState
+> {
+  state = {
+    // loading: false,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  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;
+    }
+  };
+
+  // doSubmit=async ()=>{
+  //   // this.setState({loading:true})
+  //   await this.props.doSubmit();
+  //   // this.setState({loading:false})
+  // }
+
+  render() {
+    const {} = this.state;
+    const {
+      dtmplConfig,
+      formRef,
+      doSubmit,loading,
+      serial,
+      serverKey,
+      dtmplData,
+    } = this.props;
+    const { buttons, actions } = dtmplConfig;
+    const cardList: TmplBase[] = [];
+    const { translate } = this.context;
+
+    //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,
+      });
+    });
+
+    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
+                    loading={loading}
+                  onClick={() => doSubmit()}
+                  type="primary"
+                  icon={<SaveOutlined />}
+                  key="btn"
+                  block
+                >
+                  {translate("${保存}")}
+                </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 loading={loading}
+                          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;

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

@@ -1,43 +1,43 @@
-.submitButtonBar{
-    /* 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);
-    max-height:158px;
-    /*min-height:80px;*/
-    overflow:auto;
-    width:100px;
-}
-.submitButtonBar::-webkit-scrollbar {
-    display: none;
-}
-.submitButtonBar ul{
-    padding:0;
-    margin:0;
-}
-.submitButtonBar li{
-    list-style-type: none;
-    padding:4px;
-    margin:0;
-    text-align: left;
-    white-space: nowrap;
-    overflow: hidden;
-}
-/*.rightBar li:hover{*/
-/*    background: #cfe3f5;*/
-/*}*/
-
-.btns button{
-    margin-right: 10px
-}
-
-.cquickTextButton {
-    cursor:pointer;
-}
-
-.cquickTextButton:hover{
-    color: #1890ff;
+.submitButtonBar{
+    /* 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);
+    max-height:158px;
+    /*min-height:80px;*/
+    overflow:auto;
+    width:100px;
+}
+.submitButtonBar::-webkit-scrollbar {
+    display: none;
+}
+.submitButtonBar ul{
+    padding:0;
+    margin:0;
+}
+.submitButtonBar li{
+    list-style-type: none;
+    padding:4px;
+    margin:0;
+    text-align: left;
+    white-space: nowrap;
+    overflow: hidden;
+}
+/*.rightBar li:hover{*/
+/*    background: #cfe3f5;*/
+/*}*/
+
+.btns button{
+    margin-right: 10px
+}
+
+.cquickTextButton {
+    cursor:pointer;
+}
+
+.cquickTextButton:hover{
+    color: #1890ff;
 }

package/src/aldehyde/detail/button/inline-edit-button.tsx

@@ -1,40 +1,40 @@
-import React from "react";
-import { Button, Tooltip } from "antd";
-import { DtmplData } from "../../tmpl/interface";
-import { FormOutlined, CheckOutlined, CloseCircleOutlined } from "@ant-design/icons";
-import { useLocale } from "../../locale/useLocale";
-
-interface Props {
-  serverKey?: string;
-  data: DtmplData;
-  editings: string[];
-  editRowEdit: (code: string) => void;
-  cancelRowEdit: (code: string) => void;
-  saveRowData: (data: DtmplData) => void;
-}
-
-const InlineEditButton = (props: Props) => {
-  const { data, editings, editRowEdit, cancelRowEdit, saveRowData } = props;
-  const { translate } = useLocale();
-
-  return (<>
-    {editings.includes(data.code) ?
-      <>
-        <Tooltip placement="topRight" title={translate("${确定修改}")}>
-          <Button onClick={() => saveRowData(data)} icon={<CheckOutlined />} size={'small'} />
-        </Tooltip>
-        <Tooltip placement="topRight" title={translate("${取消修改}")}>
-          <Button onClick={() => cancelRowEdit(data.code)} icon={<CloseCircleOutlined />} size={'small'} />
-        </Tooltip>
-      </> :
-      <Button
-        type="dashed"
-        icon={<FormOutlined />}
-        size='small'
-        onClick={() => editRowEdit(data.code)}
-      />
-    }
-  </>);
-}
-
-export default InlineEditButton;
+import React from "react";
+import { Button, Tooltip } from "antd";
+import { DtmplData } from "../../tmpl/interface";
+import { FormOutlined, CheckOutlined, CloseCircleOutlined } from "@ant-design/icons";
+import { useLocale } from "../../locale/useLocale";
+
+interface Props {
+  serverKey?: string;
+  data: DtmplData;
+  editings: string[];
+  editRowEdit: (code: string) => void;
+  cancelRowEdit: (code: string) => void;
+  saveRowData: (data: DtmplData) => void;
+}
+
+const InlineEditButton = (props: Props) => {
+  const { data, editings, editRowEdit, cancelRowEdit, saveRowData } = props;
+  const { translate } = useLocale();
+
+  return (<>
+    {editings.includes(data.code) ?
+      <>
+        <Tooltip placement="topRight" title={translate("${确定修改}")}>
+          <Button onClick={() => saveRowData(data)} icon={<CheckOutlined />} size={'small'} />
+        </Tooltip>
+        <Tooltip placement="topRight" title={translate("${取消修改}")}>
+          <Button onClick={() => cancelRowEdit(data.code)} icon={<CloseCircleOutlined />} size={'small'} />
+        </Tooltip>
+      </> :
+      <Button
+        type="dashed"
+        icon={<FormOutlined />}
+        size='small'
+        onClick={() => editRowEdit(data.code)}
+      />
+    }
+  </>);
+}
+
+export default InlineEditButton;

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

@@ -1,57 +1,57 @@
-import React, {RefObject} from 'react'
-import './index.css'
-import {
-    ActionConfig,
-    ButtonName,
-    ButtonPosition,
-    DtmplConfig,
-    DtmplData,
-    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 FixRightSubmitButtonBar from './fix-right-submit-button-bar'
-import {FormInstance} from "antd/lib/form/hooks/useForm";
-import BottomSubmitButtonBar from "./bottom-submit-button-bar";
-
-export  interface SubmitButtonProps {
-    serverKey?:string,
-    dtmplConfig: DtmplConfig,
-    dtmplData:DtmplData,
-    position?:ButtonPosition,
-    doSubmit: (actionId?: string,codes?:string[],params?:object) => void;
-    formRef: RefObject<FormInstance>,
-    serial:number,
-    loading: boolean,
-}
-
-
-interface SubmitButtonState {
-   // stateSerial:number
-}
-
-class SubmitButtonBar extends React.PureComponent<SubmitButtonProps, SubmitButtonState> {
-
-    state={
-      // stateSerial:0,
-    }
-
-    static defaultProps={
-
-        loading:false,
-    }
-
-    render() {
-        const {position, doSubmit, serial, dtmplConfig, formRef,dtmplData,loading} = this.props;
-        let posi = position ? position : dtmplConfig.buttonPosition ? dtmplConfig.buttonPosition : undefined
-
-        return <>{!posi || posi == 'fixedBottomRight' ?
-            <FixRightSubmitButtonBar loading={loading} doSubmit={doSubmit} serial={serial} dtmplConfig={dtmplConfig} formRef={formRef} dtmplData={dtmplData}/>
-            : <BottomSubmitButtonBar loading={loading} position={posi} doSubmit={doSubmit} serial={serial} dtmplConfig={dtmplConfig} formRef={formRef} dtmplData={dtmplData}/>
-        }</>
-    }
-}
-
-export default SubmitButtonBar;
-
+import React, {RefObject} from 'react'
+import './index.css'
+import {
+    ActionConfig,
+    ButtonName,
+    ButtonPosition,
+    DtmplConfig,
+    DtmplData,
+    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 FixRightSubmitButtonBar from './fix-right-submit-button-bar'
+import {FormInstance} from "antd/lib/form/hooks/useForm";
+import BottomSubmitButtonBar from "./bottom-submit-button-bar";
+
+export  interface SubmitButtonProps {
+    serverKey?:string,
+    dtmplConfig: DtmplConfig,
+    dtmplData:DtmplData,
+    position?:ButtonPosition,
+    doSubmit: (actionId?: string,codes?:string[],params?:object) => void;
+    formRef: RefObject<FormInstance>,
+    serial:number,
+    loading: boolean,
+}
+
+
+interface SubmitButtonState {
+   // stateSerial:number
+}
+
+class SubmitButtonBar extends React.PureComponent<SubmitButtonProps, SubmitButtonState> {
+
+    state={
+      // stateSerial:0,
+    }
+
+    static defaultProps={
+
+        loading:false,
+    }
+
+    render() {
+        const {position, doSubmit, serial, dtmplConfig, formRef,dtmplData,loading} = this.props;
+        let posi = position ? position : dtmplConfig.buttonPosition ? dtmplConfig.buttonPosition : undefined
+
+        return <>{!posi || posi == 'fixedBottomRight' ?
+            <FixRightSubmitButtonBar loading={loading} doSubmit={doSubmit} serial={serial} dtmplConfig={dtmplConfig} formRef={formRef} dtmplData={dtmplData}/>
+            : <BottomSubmitButtonBar loading={loading} position={posi} doSubmit={doSubmit} serial={serial} dtmplConfig={dtmplConfig} formRef={formRef} dtmplData={dtmplData}/>
+        }</>
+    }
+}
+
+export default SubmitButtonBar;
+