aldehyde 0.2.97 → 0.2.99

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

@@ -1,253 +1,360 @@
-import * as React from 'react'
-import {RefObject} from 'react'
-import {Button, Checkbox as AntdCheckbox, Popconfirm, Popover,Tooltip} from 'antd'
-import './index.css'
-import {ActionConfig, DtmplData} from "../../tmpl/interface";
-import {FormInstance} from "antd/lib/form/hooks/useForm";
-import FieldsEditCard from "../../detail/edit/fields-edit-card"
-import {SizeType} from "antd/lib/config-provider/SizeContext";
-import ActionUtils from './utils';
-import Icon from '../../icon';
-import {ButtonType} from "antd/lib/button";
-
-export  type ActionButtonIconType = 'icon' | 'icon-title' | 'title'
-export  type ActionButtonType = 'primary-block' | 'dashed' | 'primary'
-export  type ActionButtonHiddenType = 'hidden' | 'disabled'
+import * as React from "react";
+import { RefObject } from "react";
+import {
+  Button,
+  Checkbox as AntdCheckbox,
+  Popconfirm,
+  Popover,
+  Tooltip,
+} from "antd";
+import "./index.css";
+import { ActionConfig, DtmplData } from "../../tmpl/interface";
+import { FormInstance } from "antd/lib/form/hooks/useForm";
+import FieldsEditCard from "../../detail/edit/fields-edit-card";
+import { SizeType } from "antd/lib/config-provider/SizeContext";
+import ActionUtils from "./utils";
+import Icon from "../../icon";
+import { ButtonType } from "antd/lib/button";
+import { LocaleContext } from "../../locale/LocaleProvider";
+
+export type ActionButtonIconType = "icon" | "icon-title" | "title";
+export type ActionButtonType = "primary-block" | "dashed" | "primary";
+export type ActionButtonHiddenType = "hidden" | "disabled";
 
 interface ActionProps {
-    serverKey?:string,
-    disabled?: boolean,
-    actionConfig: ActionConfig,
-    data?: DtmplData[] |object[],
-    formRef?: RefObject<FormInstance>,
-    doAction: (string, Array, object) => void,
-    serial?: number,
-    buttonType?: ActionButtonType,
-    hiddenType?: ActionButtonHiddenType,
-    buttonSize?: SizeType,
-    iconType:ActionButtonIconType,
-};
+  serverKey?: string;
+  disabled?: boolean;
+  actionConfig: ActionConfig;
+  data?: DtmplData[] | object[];
+  formRef?: RefObject<FormInstance>;
+  doAction: (string, Array, object) => void;
+  serial?: number;
+  buttonType?: ActionButtonType;
+  hiddenType?: ActionButtonHiddenType;
+  buttonSize?: SizeType;
+  iconType: ActionButtonIconType;
+}
 
 interface ActionState {
-    popoverOpen?: boolean,
+  popoverOpen?: boolean;
+}
 
-};
+export default class Action extends React.PureComponent<
+  ActionProps,
+  ActionState
+> {
+  static defaultProps = {
+    hiddenType: "hidden",
+    buttonSize: undefined,
+    iconType: "icon-title",
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
 
-export default class Action extends React.PureComponent<ActionProps, ActionState> {
+  state = {
+    popoverOpen: false,
+  };
 
-    static defaultProps = {
-        hiddenType: 'hidden',
-        buttonSize: undefined,
-        iconType:'icon-title',
-    }
+  componentDidMount() {
+    const {} = this.props;
+    this.setState({});
+  }
 
-    state = {
-        popoverOpen: false,
-    }
-
-    componentDidMount() {
-        const {} = this.props;
-        this.setState({})
-    }
-
-    componentDidUpdate(prevProps) {
-        const {} = this.props;
-        if (this.props != prevProps) {
-            // this.setState({collapse:!this.state.collapse})
-        }
+  componentDidUpdate(prevProps) {
+    const {} = this.props;
+    if (this.props != prevProps) {
+      // this.setState({collapse:!this.state.collapse})
     }
+  }
 
+  isShow = () => {
+    const { actionConfig, data, formRef } = this.props;
+    return ActionUtils.isShow(actionConfig, data, formRef);
+  };
 
-    isShow = () => {
-        const {actionConfig, data, formRef} = this.props;
-        return ActionUtils.isShow(actionConfig, data, formRef);
-    }
-
-
-    getValue = () => {
-        const {data, formRef, actionConfig} = this.props;
-        let value = {};
-        //从 dtmplData 与 ref
-        //dtmplData取第一个
-        let dtmplValue = data ? data[0] : undefined;
-        let upperFormValue = formRef ? formRef.current : undefined;
-        for (let fieldConfig of actionConfig.writes) {
-            if(!fieldConfig){
-                continue;
-            }
-            if (upperFormValue) {
-                if (upperFormValue.getFieldValue(fieldConfig.id)) {
-                    value[fieldConfig.id] = ActionUtils.getFormRefValue(formRef.current, fieldConfig.id);
-                }else{
-                    if(dtmplValue){
-                        if(dtmplValue['fieldMap']){
-                            value[fieldConfig.id] = dtmplValue ?dtmplValue['fieldMap'][fieldConfig.id] : undefined;
-                        }else{
-                            value[fieldConfig.id] = dtmplValue ?dtmplValue[fieldConfig.id] : undefined;
-                        }
-                    }
-                }
-            }else{
-                if(dtmplValue) {
-                    if (dtmplValue['fieldMap']) {
-                        value[fieldConfig.id] = dtmplValue ? dtmplValue['fieldMap'][fieldConfig.id] : undefined;
-                    } else {
-                        value[fieldConfig.id] = dtmplValue ? dtmplValue[fieldConfig.id] : undefined;
-                    }
-                }
+  getValue = () => {
+    const { data, formRef, actionConfig } = this.props;
+    let value = {};
+    //从 dtmplData 与 ref
+    //dtmplData取第一个
+    let dtmplValue = data ? data[0] : undefined;
+    let upperFormValue = formRef ? formRef.current : undefined;
+    for (let fieldConfig of actionConfig.writes) {
+      if (!fieldConfig) {
+        continue;
+      }
+      if (upperFormValue) {
+        if (upperFormValue.getFieldValue(fieldConfig.id)) {
+          value[fieldConfig.id] = ActionUtils.getFormRefValue(
+            formRef.current,
+            fieldConfig.id
+          );
+        } else {
+          if (dtmplValue) {
+            if (dtmplValue["fieldMap"]) {
+              value[fieldConfig.id] = dtmplValue
+                ? dtmplValue["fieldMap"][fieldConfig.id]
+                : undefined;
+            } else {
+              value[fieldConfig.id] = dtmplValue
+                ? dtmplValue[fieldConfig.id]
+                : undefined;
             }
+          }
         }
-        console.log("actionValue:",value);
-        return value;
-    }
-    onOk = (value: object) => {
-        console.log('action form value:', value);
-        const {actionConfig, doAction} = this.props;
-        this.setState({
-            popoverOpen: false,
-        })
-        doAction(actionConfig.id, this.getCodes(), value);
-    }
-    onCancel = () => {
-        this.setState({
-            popoverOpen: false,
-        })
-    }
-    onValuesChange = (value: object) => {
-        const {formRef} = this.props;
-        if (formRef && formRef.current) {
-            formRef.current.setFieldsValue(value);
+      } else {
+        if (dtmplValue) {
+          if (dtmplValue["fieldMap"]) {
+            value[fieldConfig.id] = dtmplValue
+              ? dtmplValue["fieldMap"][fieldConfig.id]
+              : undefined;
+          } else {
+            value[fieldConfig.id] = dtmplValue
+              ? dtmplValue[fieldConfig.id]
+              : undefined;
+          }
         }
+      }
     }
-
-
-    getButtonType = () => {
-        const {buttonType,actionConfig} = this.props;
-        let bType: ButtonType = !buttonType ? "dashed" : buttonType.split("-")[0] == "dashed" ? "dashed" : "primary";
-        return  buttonType?bType:actionConfig.buttonType?actionConfig.buttonType:"dashed";
+    console.log("actionValue:", value);
+    return value;
+  };
+  onOk = (value: object) => {
+    console.log("action form value:", value);
+    const { actionConfig, doAction } = this.props;
+    this.setState({
+      popoverOpen: false,
+    });
+    doAction(actionConfig.id, this.getCodes(), value);
+  };
+  onCancel = () => {
+    this.setState({
+      popoverOpen: false,
+    });
+  };
+  onValuesChange = (value: object) => {
+    const { formRef } = this.props;
+    if (formRef && formRef.current) {
+      formRef.current.setFieldsValue(value);
     }
+  };
 
-    blockButton = (): boolean => {
-        const {buttonType} = this.props;
-        let block = buttonType && buttonType.includes('block');
-        return block;
-    }
+  getButtonType = () => {
+    const { buttonType, actionConfig } = this.props;
+    let bType: ButtonType = !buttonType
+      ? "dashed"
+      : buttonType.split("-")[0] == "dashed"
+      ? "dashed"
+      : "primary";
+    return buttonType
+      ? bType
+      : actionConfig.buttonType
+      ? actionConfig.buttonType
+      : "dashed";
+  };
 
+  blockButton = (): boolean => {
+    const { buttonType } = this.props;
+    let block = buttonType && buttonType.includes("block");
+    return block;
+  };
 
-    formButton = () => {
-        const {popoverOpen} = this.state;
-        const {actionConfig, disabled,hiddenType, buttonSize,serverKey} = this.props;
-        let disabled_ = disabled;
-        if (!this.isShow()) {
-            if (!hiddenType || hiddenType == 'hidden') {
-                return null;
-            } else {
-                disabled_ = true;
-            }
-        }
-        return <Popover placement="top" open={popoverOpen} trigger="click" content={
-            <FieldsEditCard serverKey={serverKey} okDanger={actionConfig.beforeExeConfirm == 'danger'} needConfirm={true} title={actionConfig.title} onCancel={() => this.onCancel()} fields={actionConfig.writes}
-                            value={this.getValue()} onOk={this.onOk}
-                            onValuesChange={this.onValuesChange}/>}>
-                <Button danger={actionConfig.danger } type={this.getButtonType()} shape={actionConfig.buttonShape} block={this.blockButton()} size={buttonSize}
-                        onClick={() => this.setState({popoverOpen: !popoverOpen})}
-                        disabled={disabled_} >{this.getTitle()}</Button>
-        </Popover>
+  formButton = () => {
+    const { popoverOpen } = this.state;
+    const {
+      actionConfig,
+      disabled,
+      hiddenType,
+      buttonSize,
+      serverKey,
+    } = this.props;
+    let disabled_ = disabled;
+    if (!this.isShow()) {
+      if (!hiddenType || hiddenType == "hidden") {
+        return null;
+      } else {
+        disabled_ = true;
+      }
     }
-
-    getTitle=()=>{
-        const {actionConfig,iconType} = this.props;
-        let title=null;
-        if(actionConfig.icon){
-            if(iconType=='icon-title'){
-                title=  <><Icon type={actionConfig.icon}></Icon>{actionConfig.title}</>
-            }else if(iconType=='icon'){
-                title= <Tooltip placement="top" title={actionConfig.title}><Icon type={actionConfig.icon}></Icon>{''}</Tooltip>
-            }else{
-                title= actionConfig.title;
-            }
-        }else{
-            title= actionConfig.title;
+    return (
+      <Popover
+        placement="top"
+        open={popoverOpen}
+        trigger="click"
+        content={
+          <FieldsEditCard
+            serverKey={serverKey}
+            okDanger={actionConfig.beforeExeConfirm == "danger"}
+            needConfirm={true}
+            title={actionConfig.title}
+            onCancel={() => this.onCancel()}
+            fields={actionConfig.writes}
+            value={this.getValue()}
+            onOk={this.onOk}
+            onValuesChange={this.onValuesChange}
+          />
         }
+      >
+        <Button
+          danger={actionConfig.danger}
+          type={this.getButtonType()}
+          shape={actionConfig.buttonShape}
+          block={this.blockButton()}
+          size={buttonSize}
+          onClick={() => this.setState({ popoverOpen: !popoverOpen })}
+          disabled={disabled_}
+        >
+          {this.getTitle()}
+        </Button>
+      </Popover>
+    );
+  };
 
-        if(actionConfig.tip && iconType!='icon'){
-            title=<><Tooltip title={actionConfig.tip}>{title}</Tooltip></>
-        }
-
-        return title;
+  getTitle = () => {
+    const { actionConfig, iconType } = this.props;
+    let title = null;
+    if (actionConfig.icon) {
+      if (iconType == "icon-title") {
+        title = (
+          <>
+            <Icon type={actionConfig.icon}></Icon>
+            {actionConfig.title}
+          </>
+        );
+      } else if (iconType == "icon") {
+        title = (
+          <Tooltip placement="top" title={actionConfig.title}>
+            <Icon type={actionConfig.icon}></Icon>
+            {""}
+          </Tooltip>
+        );
+      } else {
+        title = actionConfig.title;
+      }
+    } else {
+      title = actionConfig.title;
     }
 
-
-    getCodes = () => {
-        const {data,} = this.props;
-        let codes = [];
-        if (data) {
-            if (data instanceof Array) {
-                for (let d of data) {
-                    if (d) {
-                        codes.push(d['code']);
-                    }
-                }
-            }
-        }
-        return codes;
+    if (actionConfig.tip && iconType != "icon") {
+      title = (
+        <>
+          <Tooltip title={actionConfig.tip}>{title}</Tooltip>
+        </>
+      );
     }
 
-    withoutFormButton = () => {
-        const {actionConfig, doAction, data, disabled, buttonType, hiddenType, buttonSize} = this.props;
-        let disabled_ = disabled;
-        if (!this.isShow()) {
-            if (!hiddenType || hiddenType == 'hidden') {
-                return null;
-            } else {
-                disabled_ = true;
-            }
+    return title;
+  };
+
+  getCodes = () => {
+    const { data } = this.props;
+    let codes = [];
+    if (data) {
+      if (data instanceof Array) {
+        for (let d of data) {
+          if (d) {
+            codes.push(d["code"]);
+          }
         }
-        let codes = this.getCodes();
-        let block = this.blockButton();
-        let bType = this.getButtonType();
-        return !actionConfig.beforeExeConfirm || actionConfig.beforeExeConfirm == 'default' ?
-            <Popconfirm key={actionConfig.id}
-                        placement="rightBottom"
-                        title={`确定要执行【${actionConfig.title}】吗？`}
-                        onConfirm={() => {
-                            doAction(actionConfig.id, codes, {})
-                        }}
-                        disabled={disabled_}
-                        okText="确定"
-                        cancelText="取消"
-            >
-                <Button size={buttonSize}  danger={actionConfig.danger } type={bType} shape={actionConfig.buttonShape} block={block} disabled={disabled_}
-                >{this.getTitle()}</Button>
-            </Popconfirm> :
-            actionConfig.beforeExeConfirm == 'danger' ?
-                <Popconfirm key={actionConfig.id}
-                            placement="rightBottom"
-                            title={`确定要执行【${actionConfig.title}】吗？`}
-                            onConfirm={() => {
-                                doAction(actionConfig.id, codes, {})
-                            }}
-                            disabled={disabled_}
-                            okText="确定"
-                            cancelText="取消"
-                            okType={'danger'}
-                >
-                    <Button type={bType} block={block} danger={true} shape={actionConfig.buttonShape} size={buttonSize} disabled={disabled_}
-                    >{this.getTitle()}</Button>
-                </Popconfirm> :
-                <Button type={bType} block={block} size={buttonSize} shape={actionConfig.buttonShape}  danger={actionConfig.danger}
-                        onClick={() => doAction(actionConfig.id, codes, {})}
-                        disabled={disabled_}
-                >{this.getTitle()}</Button>
+      }
     }
+    return codes;
+  };
 
-    render() {
-
-        const {} = this.state;
-        const {actionConfig} = this.props;
-        return <>
-            {actionConfig.writes && actionConfig.writes.length > 0 ? this.formButton() : this.withoutFormButton()}
-        </>;
+  withoutFormButton = () => {
+    const {
+      actionConfig,
+      doAction,
+      data,
+      disabled,
+      buttonType,
+      hiddenType,
+      buttonSize,
+    } = this.props;
+    const { translate } = this.context;
+    let disabled_ = disabled;
+    if (!this.isShow()) {
+      if (!hiddenType || hiddenType == "hidden") {
+        return null;
+      } else {
+        disabled_ = true;
+      }
     }
+    let codes = this.getCodes();
+    let block = this.blockButton();
+    let bType = this.getButtonType();
+    return !actionConfig.beforeExeConfirm ||
+      actionConfig.beforeExeConfirm == "default" ? (
+      <Popconfirm
+        key={actionConfig.id}
+        placement="rightBottom"
+        title={translate("${确定要执行}【${" + actionConfig.title + "}】?")}
+        onConfirm={() => {
+          doAction(actionConfig.id, codes, {});
+        }}
+        disabled={disabled_}
+        okText={translate("${确定}")}
+        cancelText={translate("${取消}")}
+      >
+        <Button
+          size={buttonSize}
+          danger={actionConfig.danger}
+          type={bType}
+          shape={actionConfig.buttonShape}
+          block={block}
+          disabled={disabled_}
+        >
+          {this.getTitle()}
+        </Button>
+      </Popconfirm>
+    ) : actionConfig.beforeExeConfirm == "danger" ? (
+      <Popconfirm
+        key={actionConfig.id}
+        placement="rightBottom"
+        title={translate("${确定要执行}【${" + actionConfig.title + "}】?")}
+        onConfirm={() => {
+          doAction(actionConfig.id, codes, {});
+        }}
+        disabled={disabled_}
+        okText={translate("${确定}")}
+        cancelText={translate("${取消}")}
+        okType={"danger"}
+      >
+        <Button
+          type={bType}
+          block={block}
+          danger={true}
+          shape={actionConfig.buttonShape}
+          size={buttonSize}
+          disabled={disabled_}
+        >
+          {this.getTitle()}
+        </Button>
+      </Popconfirm>
+    ) : (
+      <Button
+        type={bType}
+        block={block}
+        size={buttonSize}
+        shape={actionConfig.buttonShape}
+        danger={actionConfig.danger}
+        onClick={() => doAction(actionConfig.id, codes, {})}
+        disabled={disabled_}
+      >
+        {this.getTitle()}
+      </Button>
+    );
+  };
 
+  render() {
+    const {} = this.state;
+    const { actionConfig } = this.props;
+    return (
+      <>
+        {actionConfig.writes && actionConfig.writes.length > 0
+          ? this.formButton()
+          : this.withoutFormButton()}
+      </>
+    );
+  }
 }

package/src/aldehyde/controls/action/utils.tsx

@@ -16,6 +16,7 @@ export default class ActionUtils {
 
     static isMatch(fieldConfigs: FieldConfig[], data: DtmplData[] | object[], formInstance: FormInstance, dtmplConfig: DtmplConfig) {
 
+        debugger
         //所有data都必须满足条件才能显示
         //let comparator=actionConfig.comparator;
         //debugger
@@ -39,17 +40,17 @@ export default class ActionUtils {
                 }
             }
             if(isMatch && tempConfigs.length>0){//若果之前判断成功，则继续判断
-                isMatch = this.matchDtmplData(tempConfigs, data);
+                isMatch = this.matchDtmplData(tempConfigs, data,dtmplConfig);
             }
         } else if (data) {
-            isMatch = this.matchDtmplData(fieldConfigs, data);
+            isMatch = this.matchDtmplData(fieldConfigs, data,dtmplConfig);
         } else {
             isMatch = false;
         }
         return isMatch;
     }
 
-    static matchDtmplData(fieldConfigs: FieldConfig[], data: DtmplData[] | object[]) {
+    static matchDtmplData(fieldConfigs: FieldConfig[], data: DtmplData[] | object[],dtmplConfig: DtmplConfig) {
         let isMatch = true;
         if(!data){
             return false;
@@ -65,7 +66,8 @@ export default class ActionUtils {
 
             for (let fieldConfig of fieldConfigs) {
                 if (d['fieldMap']) {
-                    if (!this.comparator(fieldConfig.comparator, d['fieldMap'][fieldConfig.id], fieldConfig.defaultValue)) {
+                    let fieldId=dtmplConfig ? TmplConfigAnalysis.getFieldId(dtmplConfig, fieldConfig.mstrucId) : fieldConfig.id;
+                    if (!this.comparator(fieldConfig.comparator, d['fieldMap'][fieldId], fieldConfig.defaultValue)) {
                         isMatch = false;
                         break;
                     }