aldehyde 0.2.197 → 0.2.199

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

@@ -1,144 +1,144 @@
-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;
-}
-
-const outlinedMap = {
-  EditOutlined: <EditOutlined />,
-};
-
-class CquickButton extends React.PureComponent<
-  CquickButtonProps,
-  CquickButtonState
-> {
-  state = {
-    showDraw: false,
-  };
-  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 } = 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("${关联查询}")}
-            closable={true}
-            mask={false}
-            onClose={this.closeDrawer}
-            open={showDraw}
-            width={"calc(100% - 280px)"}
-            style={{
-              maxWidth: 1960,
-            }}
-            extra={
-              <Space>
-                <Button onClick={this.closeDrawer}>
-                  {translate("${关闭}")}
-                </Button>
-              </Space>
-            }
-          >
-            {cQueryConfig.path ? (
-              React.createElement(Units.getCustomPage(cQueryConfig.path))
-            ) : (
-              <LtmplTable
-                serverKey={serverKey}
-                sourceId={cQueryConfig.id}
-                mainCode={mcode}
-              ></LtmplTable>
-            )}
-          </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;
+}
+
+const outlinedMap = {
+  EditOutlined: <EditOutlined />,
+};
+
+class CquickButton extends React.PureComponent<
+  CquickButtonProps,
+  CquickButtonState
+> {
+  state = {
+    showDraw: false,
+  };
+  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 } = 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("${关联查询}")}
+            closable={true}
+            mask={false}
+            onClose={this.closeDrawer}
+            open={showDraw}
+            width={"calc(100% - 280px)"}
+            style={{
+              maxWidth: 1960,
+            }}
+            extra={
+              <Space>
+                <Button onClick={this.closeDrawer}>
+                  {translate("${关闭}")}
+                </Button>
+              </Space>
+            }
+          >
+            {cQueryConfig.path ? (
+              React.createElement(Units.getCustomPage(cQueryConfig.path))
+            ) : (
+              <LtmplTable
+                serverKey={serverKey}
+                sourceId={cQueryConfig.id}
+                mainCode={mcode}
+              ></LtmplTable>
+            )}
+          </Drawer>
+        )}
+      </>
+    );
+  }
+}
+
+export default CquickButton;

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

@@ -1,147 +1,147 @@
-import React from 'react'
-import {DatePicker as AntdDatePicker,TimePicker} from "antd";
-import dayjs from "dayjs";
-import weekday from "dayjs/plugin/weekday"
-import localeData from "dayjs/plugin/localeData"
-import type { Dayjs } from "dayjs";
-import {FieldConfig,EControlProps} from "../../tmpl/interface";
-import Units from "../../units";
-import type { RangePickerProps } from 'antd/es/date-picker';
-dayjs.extend(weekday)
-dayjs.extend(localeData);
-
-const {RangePicker} = AntdDatePicker;
-
-
-interface DatePickerProps extends EControlProps{
-
-}
-
-
-const DatePicker: React.FC<DatePickerProps> = (props) => {
-
-    const {id,value:propsValue, itemType, fieldConfig, onChange,style,min,max} = props;
-    let value=propsValue;
-    let format = Units.getDayjsFormat(itemType);
-
-    const changeValue = (value,dateString) => {
-        if (onChange) {
-            onChange(value?value.format(format):undefined);
-        }
-    }
-
-    const changeRangeValue = (value,dateString) => {
-        if (onChange) {
-            if(!value){
-                onChange(value);
-            }else if(value.length===2 && value[0] && value[1]){
-                onChange(value[0].format(format)+"~"+value[1].format(format));
-            }
-        }
-    }
-
-    const disabledDate: RangePickerProps['disabledDate'] = current => {
-       // console.log('current',dayjs(min,format).format(format));
-        return current && ( (max && dayjs(current.format(format),format) > dayjs(max,format)) || (min && dayjs(current.format(format),format) <dayjs(min,format)));
-    };
-
-    let entryControl = undefined;
-    let picker:"date" | "time" | "year" | "month" | "week" | "quarter"="date";
-    let dayjsValue;
-    switch (itemType) {
-        case 'date-YY':
-        case 'date-M1':
-        case 'date':
-            dayjsValue = value ? dayjs(value, format) : undefined;
-            picker = itemType == 'date-YY' ? 'year' : itemType == 'date-M1' ? "month" : "date"
-            // @ts-ignore
-            entryControl = <AntdDatePicker
-                id={id}
-                style={{...style}}
-                picker={picker}
-                format={format}
-                disabledDate={disabledDate}
-                value={dayjsValue}
-                disabled={fieldConfig.disabled}
-                onChange={changeValue}
-            />;
-            break;
-        case 'datetime-HH':
-        case 'datetime-mm':
-        case 'datetime':
-            dayjsValue = value ? dayjs(value, format) : undefined;
-            entryControl = <AntdDatePicker
-                id={id}
-                style={{...style}}
-                disabledDate={disabledDate}
-                showTime={{format: Units.getDateTimeFormat(itemType)}}
-                picker='date'
-                format={format}
-                value={dayjsValue}
-                disabled={fieldConfig.disabled}
-                onChange={changeValue}
-            />;
-            break;
-        case 'daterange-YY':
-        case 'daterange-M1':
-        case 'daterange':
-            let v1 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
-            let v2 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
-            dayjsValue = [v1 ? dayjs(v1, format) : undefined, v2 ? dayjs(v2, format) : undefined];
-            picker = itemType == 'daterange-YY' ? 'year' : itemType == 'daterange-M1' ? "month" : "date"
-            // @ts-ignore
-            entryControl = <RangePicker id={id} picker={picker}
-                                        style={{...style}}
-                                        format={format}
-                                        disabledDate={disabledDate}
-                                        value={dayjsValue}
-                                        disabled={fieldConfig.disabled}
-                                        onChange={changeRangeValue}/>;
-            break;
-        case 'datetimerange-HH':
-        case 'datetimerange-mm':
-        case 'datetimerange':
-            const v3 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
-            const v4 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
-            dayjsValue = [v3 ? dayjs(v3, format) : undefined, v4 ? dayjs(v4, format) : undefined];
-            entryControl = <RangePicker id={id} showTime={{format: Units.getDateTimeFormat(itemType)}}
-                                        format={format}
-                                        style={{...style}}
-                                        value={dayjsValue}
-                                        disabledDate={disabledDate}
-                                        disabled={fieldConfig.disabled}
-                                        onChange={changeRangeValue}/>;
-            break;
-        case 'time-HH':
-        case 'time-mm':
-        case 'time':
-            dayjsValue = value ? dayjs(value, format) : undefined;
-            entryControl =
-                <TimePicker id={id} value={dayjsValue}
-                            style={{...style}}
-                            disabled={fieldConfig.disabled} onChange={changeValue}
-                            format={format}/>;
-            break;
-        case 'timerange-HH':
-        case 'timerange-mm':
-        case 'timerange':
-        case 'timerange-HH-unorder':
-        case 'timerange-mm-unorder':
-        case 'timerange-unorder':
-            const v5 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
-            const v6 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
-            dayjsValue = [v5 ? dayjs(v5, format) : undefined, v6 ? dayjs(v6, format) : undefined];
-            entryControl = <TimePicker.RangePicker  order={itemType.includes('unorder')?false:true} id={id} value={dayjsValue}
-                                                   style={{...style}}
-                                                   disabled={fieldConfig.disabled}
-                                                   onChange={changeRangeValue} format={format}/>;
-            break;
-
-
-    }
-
-    return entryControl;
-
-}
-
+import React from 'react'
+import {DatePicker as AntdDatePicker,TimePicker} from "antd";
+import dayjs from "dayjs";
+import weekday from "dayjs/plugin/weekday"
+import localeData from "dayjs/plugin/localeData"
+import type { Dayjs } from "dayjs";
+import {FieldConfig,EControlProps} from "../../tmpl/interface";
+import Units from "../../units";
+import type { RangePickerProps } from 'antd/es/date-picker';
+dayjs.extend(weekday)
+dayjs.extend(localeData);
+
+const {RangePicker} = AntdDatePicker;
+
+
+interface DatePickerProps extends EControlProps{
+
+}
+
+
+const DatePicker: React.FC<DatePickerProps> = (props) => {
+
+    const {id,value:propsValue, itemType, fieldConfig, onChange,style,min,max} = props;
+    let value=propsValue;
+    let format = Units.getDayjsFormat(itemType);
+
+    const changeValue = (value,dateString) => {
+        if (onChange) {
+            onChange(value?value.format(format):undefined);
+        }
+    }
+
+    const changeRangeValue = (value,dateString) => {
+        if (onChange) {
+            if(!value){
+                onChange(value);
+            }else if(value.length===2 && value[0] && value[1]){
+                onChange(value[0].format(format)+"~"+value[1].format(format));
+            }
+        }
+    }
+
+    const disabledDate: RangePickerProps['disabledDate'] = current => {
+       // console.log('current',dayjs(min,format).format(format));
+        return current && ( (max && dayjs(current.format(format),format) > dayjs(max,format)) || (min && dayjs(current.format(format),format) <dayjs(min,format)));
+    };
+
+    let entryControl = undefined;
+    let picker:"date" | "time" | "year" | "month" | "week" | "quarter"="date";
+    let dayjsValue;
+    switch (itemType) {
+        case 'date-YY':
+        case 'date-M1':
+        case 'date':
+            dayjsValue = value ? dayjs(value, format) : undefined;
+            picker = itemType == 'date-YY' ? 'year' : itemType == 'date-M1' ? "month" : "date"
+            // @ts-ignore
+            entryControl = <AntdDatePicker
+                id={id}
+                style={{...style}}
+                picker={picker}
+                format={format}
+                disabledDate={disabledDate}
+                value={dayjsValue}
+                disabled={fieldConfig.disabled}
+                onChange={changeValue}
+            />;
+            break;
+        case 'datetime-HH':
+        case 'datetime-mm':
+        case 'datetime':
+            dayjsValue = value ? dayjs(value, format) : undefined;
+            entryControl = <AntdDatePicker
+                id={id}
+                style={{...style}}
+                disabledDate={disabledDate}
+                showTime={{format: Units.getDateTimeFormat(itemType)}}
+                picker='date'
+                format={format}
+                value={dayjsValue}
+                disabled={fieldConfig.disabled}
+                onChange={changeValue}
+            />;
+            break;
+        case 'daterange-YY':
+        case 'daterange-M1':
+        case 'daterange':
+            let v1 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
+            let v2 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
+            dayjsValue = [v1 ? dayjs(v1, format) : undefined, v2 ? dayjs(v2, format) : undefined];
+            picker = itemType == 'daterange-YY' ? 'year' : itemType == 'daterange-M1' ? "month" : "date"
+            // @ts-ignore
+            entryControl = <RangePicker id={id} picker={picker}
+                                        style={{...style}}
+                                        format={format}
+                                        disabledDate={disabledDate}
+                                        value={dayjsValue}
+                                        disabled={fieldConfig.disabled}
+                                        onChange={changeRangeValue}/>;
+            break;
+        case 'datetimerange-HH':
+        case 'datetimerange-mm':
+        case 'datetimerange':
+            const v3 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
+            const v4 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
+            dayjsValue = [v3 ? dayjs(v3, format) : undefined, v4 ? dayjs(v4, format) : undefined];
+            entryControl = <RangePicker id={id} showTime={{format: Units.getDateTimeFormat(itemType)}}
+                                        format={format}
+                                        style={{...style}}
+                                        value={dayjsValue}
+                                        disabledDate={disabledDate}
+                                        disabled={fieldConfig.disabled}
+                                        onChange={changeRangeValue}/>;
+            break;
+        case 'time-HH':
+        case 'time-mm':
+        case 'time':
+            dayjsValue = value ? dayjs(value, format) : undefined;
+            entryControl =
+                <TimePicker id={id} value={dayjsValue}
+                            style={{...style}}
+                            disabled={fieldConfig.disabled} onChange={changeValue}
+                            format={format}/>;
+            break;
+        case 'timerange-HH':
+        case 'timerange-mm':
+        case 'timerange':
+        case 'timerange-HH-unorder':
+        case 'timerange-mm-unorder':
+        case 'timerange-unorder':
+            const v5 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
+            const v6 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
+            dayjsValue = [v5 ? dayjs(v5, format) : undefined, v6 ? dayjs(v6, format) : undefined];
+            entryControl = <TimePicker.RangePicker  order={itemType.includes('unorder')?false:true} id={id} value={dayjsValue}
+                                                   style={{...style}}
+                                                   disabled={fieldConfig.disabled}
+                                                   onChange={changeRangeValue} format={format}/>;
+            break;
+
+
+    }
+
+    return entryControl;
+
+}
+
 export default DatePicker;