aldehyde 0.2.479 → 0.2.481

package/src/aldehyde/controls/collapse-card/index.tsx

@@ -1,109 +1,109 @@
-import * as React from "react";
-import { Button, Card } from "antd";
-import "./index.css";
-import { DownOutlined, RightOutlined } from "@ant-design/icons";
-import { CardProps } from "antd/lib/card";
-import ToolTipBar from "../../detail/tooltipbar";
-import { LocaleContext } from "../../locale/LocaleProvider";
-
-interface CollapseCardProps extends CardProps {
-  initCollapse?: boolean;
-  tip?: any;
-  showRightNav?: boolean;
-}
-
-interface CollapseCardState {
-  collapse?: boolean;
-}
-export default class CollapseCard extends React.PureComponent<
-  CollapseCardProps,
-  CollapseCardState
-> {
-  state = {
-    collapse: false,
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  componentDidMount() {
-    const { initCollapse } = this.props;
-    this.setState({
-      collapse: initCollapse,
-    });
-  }
-
-  componentDidUpdate(prevProps) {
-    const { initCollapse } = this.props;
-    if (this.props != prevProps) {
-      this.setState({
-        collapse: initCollapse,
-      });
-    }
-  }
-
-  cardTitle = () => {
-    const { title, tip } = this.props;
-    const { collapse } = this.state;
-    const { translate } = this.context;
-    if (!title || "null" == title) {
-      //没title不显示card 头 ，同时不支持伸缩。
-      return null;
-    }
-    let titleBegin = null;
-    if (collapse) {
-      titleBegin = (
-        <Button
-          type="text"
-          onClick={() => {
-            this.setState({ collapse: false });
-          }}
-        >
-          <RightOutlined />
-          {translate("${" + title + "}")}
-        </Button>
-      );
-    } else {
-      titleBegin = (
-        <Button
-          type="text"
-          onClick={() => {
-            this.setState({ collapse: true });
-          }}
-        >
-          <DownOutlined />
-          {typeof title == "string" ? translate("${" + title + "}"):title}
-        </Button>
-      );
-    }
-    return (
-      <>
-        {titleBegin}
-        <ToolTipBar content={tip}></ToolTipBar>
-      </>
-    );
-  };
-
-  render() {
-    const { collapse } = this.state;
-    const {
-      extra,
-      title,
-      className,
-      initCollapse,
-      showRightNav,
-      ...other
-    } = this.props;
-    return (
-      <Card
-        {...other}
-        size={"small"}
-        extra={collapse ? "" : extra}
-        style={{ width: showRightNav ? "90%" : "100%" }}
-        className={`${className} ${collapse ? "collapse" : ""}`}
-        title={this.cardTitle()}
-      >
-        {collapse ? null : this.props.children}
-      </Card>
-    );
-  }
-}
+import * as React from "react";
+import { Button, Card } from "antd";
+import "./index.css";
+import { DownOutlined, RightOutlined } from "@ant-design/icons";
+import { CardProps } from "antd/lib/card";
+import ToolTipBar from "../../detail/tooltipbar";
+import { LocaleContext } from "../../locale/LocaleProvider";
+
+interface CollapseCardProps extends CardProps {
+  initCollapse?: boolean;
+  tip?: any;
+  showRightNav?: boolean;
+}
+
+interface CollapseCardState {
+  collapse?: boolean;
+}
+export default class CollapseCard extends React.PureComponent<
+  CollapseCardProps,
+  CollapseCardState
+> {
+  state = {
+    collapse: false,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  componentDidMount() {
+    const { initCollapse } = this.props;
+    this.setState({
+      collapse: initCollapse,
+    });
+  }
+
+  componentDidUpdate(prevProps) {
+    const { initCollapse } = this.props;
+    if (this.props != prevProps) {
+      this.setState({
+        collapse: initCollapse,
+      });
+    }
+  }
+
+  cardTitle = () => {
+    const { title, tip } = this.props;
+    const { collapse } = this.state;
+    const { translate } = this.context;
+    if (!title || "null" == title) {
+      //没title不显示card 头 ，同时不支持伸缩。
+      return null;
+    }
+    let titleBegin = null;
+    if (collapse) {
+      titleBegin = (
+        <Button
+          type="text"
+          onClick={() => {
+            this.setState({ collapse: false });
+          }}
+        >
+          <RightOutlined />
+          {translate("${" + title + "}")}
+        </Button>
+      );
+    } else {
+      titleBegin = (
+        <Button
+          type="text"
+          onClick={() => {
+            this.setState({ collapse: true });
+          }}
+        >
+          <DownOutlined />
+          {typeof title == "string" ? translate("${" + title + "}"):title}
+        </Button>
+      );
+    }
+    return (
+      <>
+        {titleBegin}
+        <ToolTipBar content={tip}></ToolTipBar>
+      </>
+    );
+  };
+
+  render() {
+    const { collapse } = this.state;
+    const {
+      extra,
+      title,
+      className,
+      initCollapse,
+      showRightNav,
+      ...other
+    } = this.props;
+    return (
+      <Card
+        {...other}
+        size={"small"}
+        extra={collapse ? "" : extra}
+        style={{ width: showRightNav ? "90%" : "100%" }}
+        className={`${className} ${collapse ? "collapse" : ""}`}
+        title={this.cardTitle()}
+      >
+        {collapse ? null : this.props.children}
+      </Card>
+    );
+  }
+}

package/src/aldehyde/controls/color-picker/index.tsx

@@ -1,22 +1,22 @@
-import React from "react";
-import { ColorPicker } from "antd";
-
-const presets = [{ label: "预设颜色", colors: ["#52c41a", "#faad14", "#ff4d4f", "#1677ff", "#21d5ed", "#af57db"] }];
-
-export interface Props {
-  disabled?: boolean;
-  value?: string;
-  onChange?: (data?: string) => void;
-  id?: string;
-  viewOrEdit?: "edit" | "view";
-}
-
-const Index: React.FC<Props> = (props) => {
-  const { onChange, disabled, value, id, viewOrEdit } = props;
-
-  return (
-    <ColorPicker presets={presets} allowClear showText key={id} disabled={viewOrEdit === "view" || disabled} value={value} onClear={() => onChange(undefined)} onChange={(val) => onChange(val.toHexString())} />
-  )
-};
-
+import React from "react";
+import { ColorPicker } from "antd";
+
+const presets = [{ label: "预设颜色", colors: ["#52c41a", "#faad14", "#ff4d4f", "#1677ff", "#21d5ed", "#af57db"] }];
+
+export interface Props {
+  disabled?: boolean;
+  value?: string;
+  onChange?: (data?: string) => void;
+  id?: string;
+  viewOrEdit?: "edit" | "view";
+}
+
+const Index: React.FC<Props> = (props) => {
+  const { onChange, disabled, value, id, viewOrEdit } = props;
+
+  return (
+    <ColorPicker presets={presets} allowClear showText key={id} disabled={viewOrEdit === "view" || disabled} value={value} onClear={() => onChange(undefined)} onChange={(val) => onChange(val.toHexString())} />
+  )
+};
+
 export default Index;

package/src/aldehyde/controls/counting-tag/index.tsx

@@ -1,53 +1,53 @@
-import React from 'react'
-import { Tag,Input} from "antd";
-import {VEControlProps} from "../../tmpl/interface";
-import HCDataSource from "../../tmpl/hc-data-source";
-import Units from "../../units";
-
-interface CountingTagProps extends VEControlProps {
-    count:number,
-    value?:any
-}
-interface CountingTagState {
-}
-
-export default class  CountingTag extends React.PureComponent<CountingTagProps, CountingTagState>{
-
-     componentDidMount() {
-         const {}=this.props;
-         this.onChange(true);
-    }
-
-     componentDidUpdate(preProps) {
-         const {count}=this.props;
-        if((count || count==0) && preProps.count!=count){
-            this.onChange(false)
-        }
-    }
-
-     refreshTime=new Date().getTime();
-
-    onChange=(refresh:boolean)=>{
-
-        let newRefreshTime=new Date().getTime();
-        if(refresh || newRefreshTime-this.refreshTime>10){
-            const {count,onChange,min}=this.props;
-            this.refreshTime=newRefreshTime;
-            onChange((count || count==0 ) && count>=Number(min) ? 1:null);
-        }
-    }
-
-    static defaultProps={
-        min:0
-    }
-
-    render(){
-
-        const {count,min,value}=this.props;
-        //console.log('关系 this.props value', value);
-        //console.log('关系 this.props min', min);
-        return <></>
-        //return <Tag style={{marginBottom: 10}} color="blue">{count?count:0}{value}</Tag>;
-    }
-
-}
+import React from 'react'
+import { Tag,Input} from "antd";
+import {VEControlProps} from "../../tmpl/interface";
+import HCDataSource from "../../tmpl/hc-data-source";
+import Units from "../../units";
+
+interface CountingTagProps extends VEControlProps {
+    count:number,
+    value?:any
+}
+interface CountingTagState {
+}
+
+export default class  CountingTag extends React.PureComponent<CountingTagProps, CountingTagState>{
+
+     componentDidMount() {
+         const {}=this.props;
+         this.onChange(true);
+    }
+
+     componentDidUpdate(preProps) {
+         const {count}=this.props;
+        if((count || count==0) && preProps.count!=count){
+            this.onChange(false)
+        }
+    }
+
+     refreshTime=new Date().getTime();
+
+    onChange=(refresh:boolean)=>{
+
+        let newRefreshTime=new Date().getTime();
+        if(refresh || newRefreshTime-this.refreshTime>10){
+            const {count,onChange,min}=this.props;
+            this.refreshTime=newRefreshTime;
+            onChange((count || count==0 ) && count>=Number(min) ? 1:null);
+        }
+    }
+
+    static defaultProps={
+        min:0
+    }
+
+    render(){
+
+        const {count,min,value}=this.props;
+        //console.log('关系 this.props value', value);
+        //console.log('关系 this.props min', min);
+        return <></>
+        //return <Tag style={{marginBottom: 10}} color="blue">{count?count:0}{value}</Tag>;
+    }
+
+}

package/src/aldehyde/controls/cquery/cquick-button.tsx

@@ -1,145 +1,145 @@
-import React from "react";
-import { Drawer, Space, Button, ButtonProps } from "antd";
-import { CQueryConfig, PageType } from "../../tmpl/interface";
-import LtmplTable from "./../../module/ltmpl-table";
-import { EditOutlined } from "@ant-design/icons";
-import Units from "../../units";
-import DtmplEditPage from "../../module/dtmpl-edit-page";
-import { LocaleContext } from "../../locale/LocaleProvider";
-interface CquickButtonProps extends ButtonProps {
-  mainCode: string;
-  cQueryConfig: CQueryConfig;
-  pageType: PageType;
-  serverKey?: string;
-}
-
-interface CquickButtonState {
-  showDraw?: boolean;
-  drawerSize?: number | string; // 抽屉组件尺寸
-}
-
-const outlinedMap = {
-  EditOutlined: <EditOutlined />,
-};
-
-class CquickButton extends React.PureComponent<
-  CquickButtonProps,
-  CquickButtonState
-> {
-  state = {
-    showDraw: false,
-    drawerSize: "92vw",
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  static defaultProps = {
-    pageType: "modal",
-  };
-
-  showDraw = (currentId: string) => {
-    // console.log("点击了L2MenuQuickBar",currentId);
-    this.setState({
-      showDraw: true,
-    });
-  };
-
-  closeDrawer = () => {
-    this.setState({
-      showDraw: false,
-    });
-  };
-
-  render() {
-    const {
-      cQueryConfig,
-      mainCode,
-      type,
-      pageType,
-      serverKey,
-      ...button
-    } = this.props;
-    const { showDraw, drawerSize } = this.state;
-    const { translate } = this.context;
-    //console.log("cQuery mainCode",mainCode);
-    let mcode =
-      mainCode && mainCode.indexOf("@R@") > 0
-        ? mainCode.split("@R@")[0]
-        : mainCode;
-    return (
-      <>
-        {type == "text" ? (
-          <span
-            className={"cquickTextButton"}
-            onClick={() => {
-              this.setState({
-                showDraw: !showDraw,
-              });
-            }}
-          >
-            {cQueryConfig.title}
-          </span>
-        ) : (
-          <Button
-            {...button}
-            onClick={() => {
-              this.setState({
-                showDraw: !showDraw,
-              });
-            }}
-          >
-            {outlinedMap[cQueryConfig.title]
-              ? outlinedMap[cQueryConfig.title]
-              : cQueryConfig.title}
-          </Button>
-        )}
-        {!showDraw ? null : cQueryConfig.type == "edit" ? (
-          <DtmplEditPage
-            serverKey={serverKey}
-            pageType={pageType}
-            open={showDraw}
-            onCancel={() => {
-              this.setState({
-                showDraw: false,
-              });
-            }}
-            sourceId={cQueryConfig.id}
-            code={mcode}
-            onOk={this.closeDrawer}
-          />
-        ) : (
-          <Drawer
-            placement={"left"}
-            title={translate("${关联查询}")}
-            size={drawerSize}
-            resizable={{ onResize: (newSize => this.setState({ drawerSize: newSize })) }}
-            closable={true}
-            mask={false}
-            onClose={this.closeDrawer}
-            open={showDraw}
-            extra={
-              <Space>
-                <Button onClick={this.closeDrawer}>
-                  {translate("${关闭}")}
-                </Button>
-              </Space>
-            }
-            styles={{ body: { minWidth: "720px" } }}
-          >
-            {cQueryConfig.path ? (
-              React.createElement(Units.getCustomPage(cQueryConfig.path))
-            ) : (
-              <LtmplTable
-                serverKey={serverKey}
-                sourceId={cQueryConfig.id}
-                mainCode={mcode}
-              />
-            )}
-          </Drawer>
-        )}
-      </>
-    );
-  }
-}
-
-export default CquickButton;
+import React from "react";
+import { Drawer, Space, Button, ButtonProps } from "antd";
+import { CQueryConfig, PageType } from "../../tmpl/interface";
+import LtmplTable from "./../../module/ltmpl-table";
+import { EditOutlined } from "@ant-design/icons";
+import Units from "../../units";
+import DtmplEditPage from "../../module/dtmpl-edit-page";
+import { LocaleContext } from "../../locale/LocaleProvider";
+interface CquickButtonProps extends ButtonProps {
+  mainCode: string;
+  cQueryConfig: CQueryConfig;
+  pageType: PageType;
+  serverKey?: string;
+}
+
+interface CquickButtonState {
+  showDraw?: boolean;
+  drawerSize?: number | string; // 抽屉组件尺寸
+}
+
+const outlinedMap = {
+  EditOutlined: <EditOutlined />,
+};
+
+class CquickButton extends React.PureComponent<
+  CquickButtonProps,
+  CquickButtonState
+> {
+  state = {
+    showDraw: false,
+    drawerSize: "92vw",
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  static defaultProps = {
+    pageType: "modal",
+  };
+
+  showDraw = (currentId: string) => {
+    // console.log("点击了L2MenuQuickBar",currentId);
+    this.setState({
+      showDraw: true,
+    });
+  };
+
+  closeDrawer = () => {
+    this.setState({
+      showDraw: false,
+    });
+  };
+
+  render() {
+    const {
+      cQueryConfig,
+      mainCode,
+      type,
+      pageType,
+      serverKey,
+      ...button
+    } = this.props;
+    const { showDraw, drawerSize } = this.state;
+    const { translate } = this.context;
+    //console.log("cQuery mainCode",mainCode);
+    let mcode =
+      mainCode && mainCode.indexOf("@R@") > 0
+        ? mainCode.split("@R@")[0]
+        : mainCode;
+    return (
+      <>
+        {type == "text" ? (
+          <span
+            className={"cquickTextButton"}
+            onClick={() => {
+              this.setState({
+                showDraw: !showDraw,
+              });
+            }}
+          >
+            {cQueryConfig.title}
+          </span>
+        ) : (
+          <Button
+            {...button}
+            onClick={() => {
+              this.setState({
+                showDraw: !showDraw,
+              });
+            }}
+          >
+            {outlinedMap[cQueryConfig.title]
+              ? outlinedMap[cQueryConfig.title]
+              : cQueryConfig.title}
+          </Button>
+        )}
+        {!showDraw ? null : cQueryConfig.type == "edit" ? (
+          <DtmplEditPage
+            serverKey={serverKey}
+            pageType={pageType}
+            open={showDraw}
+            onCancel={() => {
+              this.setState({
+                showDraw: false,
+              });
+            }}
+            sourceId={cQueryConfig.id}
+            code={mcode}
+            onOk={this.closeDrawer}
+          />
+        ) : (
+          <Drawer
+            placement={"left"}
+            title={translate("${关联查询}")}
+            size={drawerSize}
+            resizable={{ onResize: (newSize => this.setState({ drawerSize: newSize })) }}
+            closable={true}
+            mask={false}
+            onClose={this.closeDrawer}
+            open={showDraw}
+            extra={
+              <Space>
+                <Button onClick={this.closeDrawer}>
+                  {translate("${关闭}")}
+                </Button>
+              </Space>
+            }
+            styles={{ body: { minWidth: "720px" } }}
+          >
+            {cQueryConfig.path ? (
+              React.createElement(Units.getCustomPage(cQueryConfig.path))
+            ) : (
+              <LtmplTable
+                serverKey={serverKey}
+                sourceId={cQueryConfig.id}
+                mainCode={mcode}
+              />
+            )}
+          </Drawer>
+        )}
+      </>
+    );
+  }
+}
+
+export default CquickButton;