aldehyde 0.2.196 → 0.2.198

package/src/aldehyde/table/selected-rows-card.tsx

@@ -1,75 +1,75 @@
-import React from "react";
-import { PageInfo, SelectedRow } from "../tmpl/interface";
-import { Pagination as AntdPagination, Tag } from "antd";
-import "./pagination.css";
-import { LocaleContext } from "../locale/LocaleProvider";
-
-interface SelectedRowsCardProps {
-  value: SelectedRow[];
-  onChange?: (value: SelectedRow[]) => void;
-}
-
-interface SelectedRowsCardStat {}
-
-class SelectedRowsCard extends React.PureComponent<
-  SelectedRowsCardProps,
-  SelectedRowsCardStat
-> {
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  handleClose = (row: SelectedRow) => {
-    const { onChange, value } = this.props;
-    if (onChange) {
-      const value_1: SelectedRow[] = [];
-      for (let v of value) {
-        if (v.code != row.code) {
-          value_1.push(v);
-        }
-      }
-      onChange(value_1);
-    }
-  };
-
-  renderTag = () => {
-    const { value } = this.props;
-    const tags = [];
-    if (value) {
-      value.forEach((v, index) => {
-        let title = v.title instanceof Array ? v.title[0] : v.title;
-        tags.push(
-          <Tag
-            key={index}
-            style={{ fontSize: 14 }}
-            color="geekblue"
-            closable={true}
-            onClose={(e) => {
-              e.preventDefault();
-              this.handleClose(v);
-            }}
-          >
-            {title && title.includes("@R@") ? title.split("@R@")[1] : v.title}
-          </Tag>
-        );
-      });
-    } else {
-      return "";
-    }
-
-    return tags;
-  };
-
-  render() {
-    const { translate } = this.context;
-    return (
-      <div>
-        <h3>
-          {translate("${查询点选}:")}
-          {this.renderTag()}
-        </h3>
-      </div>
-    );
-  }
-}
-
-export default SelectedRowsCard;
+import React from "react";
+import { PageInfo, SelectedRow } from "../tmpl/interface";
+import { Pagination as AntdPagination, Tag } from "antd";
+import "./pagination.css";
+import { LocaleContext } from "../locale/LocaleProvider";
+
+interface SelectedRowsCardProps {
+  value: SelectedRow[];
+  onChange?: (value: SelectedRow[]) => void;
+}
+
+interface SelectedRowsCardStat {}
+
+class SelectedRowsCard extends React.PureComponent<
+  SelectedRowsCardProps,
+  SelectedRowsCardStat
+> {
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  handleClose = (row: SelectedRow) => {
+    const { onChange, value } = this.props;
+    if (onChange) {
+      const value_1: SelectedRow[] = [];
+      for (let v of value) {
+        if (v.code != row.code) {
+          value_1.push(v);
+        }
+      }
+      onChange(value_1);
+    }
+  };
+
+  renderTag = () => {
+    const { value } = this.props;
+    const tags = [];
+    if (value) {
+      value.forEach((v, index) => {
+        let title = v.title instanceof Array ? v.title[0] : v.title;
+        tags.push(
+          <Tag
+            key={index}
+            style={{ fontSize: 14 }}
+            color="geekblue"
+            closable={true}
+            onClose={(e) => {
+              e.preventDefault();
+              this.handleClose(v);
+            }}
+          >
+            {title && title.includes("@R@") ? title.split("@R@")[1] : v.title}
+          </Tag>
+        );
+      });
+    } else {
+      return "";
+    }
+
+    return tags;
+  };
+
+  render() {
+    const { translate } = this.context;
+    return (
+      <div>
+        <h3>
+          {translate("${查询点选}:")}
+          {this.renderTag()}
+        </h3>
+      </div>
+    );
+  }
+}
+
+export default SelectedRowsCard;

package/src/aldehyde/table/stat/restat.tsx

@@ -1,123 +1,123 @@
-import React from "react";
-import {
-  Button,
-  Card,
-  Form as AntdForm,
-  FormInstance,
-  Popconfirm,
-  Popover,
-  Space,
-  Tooltip,
-} from "antd";
-import { CalculatorOutlined, CloseOutlined } from "@ant-design/icons";
-import { FieldConfig } from "../../tmpl/interface";
-import "../pagination.css";
-import FormItemGroup from "../../form/form-Item-group";
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-import { LocaleContext } from "../../locale/LocaleProvider";
-interface RestatProps {
-  onfinish: () => void;
-  fields: FieldConfig[];
-  value?: object;
-  serverKey?: string;
-  sourceId: string;
-}
-
-interface RestatStat {
-  popoverOpen?: boolean;
-  loading?: boolean;
-}
-
-class Restat extends React.PureComponent<RestatProps, RestatStat> {
-  static defaultProps = {};
-  state = {
-    popoverOpen: false,
-    loading: false,
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-  formRef = React.createRef<FormInstance>();
-  onRestat = async (val) => {
-    const { sourceId, onfinish, serverKey } = this.props;
-    this.setState({
-      loading: true,
-    });
-    await HcserviceV3.increCalc(serverKey, sourceId, val);
-    this.setState({
-      loading: false,
-    });
-    onfinish();
-  };
-
-  render() {
-    const { popoverOpen, loading } = this.state;
-    const { fields, value, serverKey } = this.props;
-    const { translate } = this.context;
-    return (
-      <Popover
-        open={popoverOpen}
-        content={
-          <Card
-            loading={loading}
-            style={{ width: 1000 }}
-            title={translate("${重新统计}")}
-            bodyStyle={{ overflow: "auto" }}
-            extra={
-              <>
-                <Space size={[8, 0]}>
-                  {
-                    <Button
-                      type={"primary"}
-                      onClick={() => {
-                        this.formRef.current.submit();
-                      }}
-                    >
-                      {translate("${确定}")}
-                    </Button>
-                  }
-                  {
-                    <Button
-                      onClick={() => {
-                        this.setState({ popoverOpen: false });
-                      }}
-                    >
-                      <CloseOutlined />
-                    </Button>
-                  }
-                </Space>
-              </>
-            }
-          >
-            <AntdForm
-              labelWrap={true}
-              ref={this.formRef}
-              name="control-hooks"
-              onFinish={this.onRestat}
-            >
-              <FormItemGroup
-                serverKey={serverKey}
-                nameAttr={"id"}
-                fields={fields}
-                valueMap={value}
-              ></FormItemGroup>
-            </AntdForm>
-          </Card>
-        }
-        placement="bottomLeft"
-        trigger="click"
-      >
-        <Tooltip title={translate("${重新统计}")}>
-          <Button
-            onClick={() => {
-              this.setState({ popoverOpen: !popoverOpen });
-            }}
-          >
-            <CalculatorOutlined />
-          </Button>
-        </Tooltip>
-      </Popover>
-    );
-  }
-}
-
-export default Restat;
+import React from "react";
+import {
+  Button,
+  Card,
+  Form as AntdForm,
+  FormInstance,
+  Popconfirm,
+  Popover,
+  Space,
+  Tooltip,
+} from "antd";
+import { CalculatorOutlined, CloseOutlined } from "@ant-design/icons";
+import { FieldConfig } from "../../tmpl/interface";
+import "../pagination.css";
+import FormItemGroup from "../../form/form-Item-group";
+import HcserviceV3 from "../../tmpl/hcservice-v3";
+import { LocaleContext } from "../../locale/LocaleProvider";
+interface RestatProps {
+  onfinish: () => void;
+  fields: FieldConfig[];
+  value?: object;
+  serverKey?: string;
+  sourceId: string;
+}
+
+interface RestatStat {
+  popoverOpen?: boolean;
+  loading?: boolean;
+}
+
+class Restat extends React.PureComponent<RestatProps, RestatStat> {
+  static defaultProps = {};
+  state = {
+    popoverOpen: false,
+    loading: false,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+  formRef = React.createRef<FormInstance>();
+  onRestat = async (val) => {
+    const { sourceId, onfinish, serverKey } = this.props;
+    this.setState({
+      loading: true,
+    });
+    await HcserviceV3.increCalc(serverKey, sourceId, val);
+    this.setState({
+      loading: false,
+    });
+    onfinish();
+  };
+
+  render() {
+    const { popoverOpen, loading } = this.state;
+    const { fields, value, serverKey } = this.props;
+    const { translate } = this.context;
+    return (
+      <Popover
+        open={popoverOpen}
+        content={
+          <Card
+            loading={loading}
+            style={{ width: 1000 }}
+            title={translate("${重新统计}")}
+            bodyStyle={{ overflow: "auto" }}
+            extra={
+              <>
+                <Space size={[8, 0]}>
+                  {
+                    <Button
+                      type={"primary"}
+                      onClick={() => {
+                        this.formRef.current.submit();
+                      }}
+                    >
+                      {translate("${确定}")}
+                    </Button>
+                  }
+                  {
+                    <Button
+                      onClick={() => {
+                        this.setState({ popoverOpen: false });
+                      }}
+                    >
+                      <CloseOutlined />
+                    </Button>
+                  }
+                </Space>
+              </>
+            }
+          >
+            <AntdForm
+              labelWrap={true}
+              ref={this.formRef}
+              name="control-hooks"
+              onFinish={this.onRestat}
+            >
+              <FormItemGroup
+                serverKey={serverKey}
+                nameAttr={"id"}
+                fields={fields}
+                valueMap={value}
+              ></FormItemGroup>
+            </AntdForm>
+          </Card>
+        }
+        placement="bottomLeft"
+        trigger="click"
+      >
+        <Tooltip title={translate("${重新统计}")}>
+          <Button
+            onClick={() => {
+              this.setState({ popoverOpen: !popoverOpen });
+            }}
+          >
+            <CalculatorOutlined />
+          </Button>
+        </Tooltip>
+      </Popover>
+    );
+  }
+}
+
+export default Restat;

package/src/aldehyde/table/table-util.tsx

@@ -1,25 +1,25 @@
-import React from "react";
-
-export default {
-  sort(col, itemType: string, defaultSort?) {
-    let colName = col["dataIndex"];
-    // if (itemType == "decimal" || itemType == "int" || itemType == "float" || itemType == "double") { //排序b
-    //     col["sorter"] = (a, b) => a[colName] - b[colName];
-    // } else if (itemType == "text" || itemType == "textarea" || itemType == "date" || itemType == "datetime") {
-    //     col["sorter"] = (a, b) => a[colName] ? a[colName].localeCompare(b[colName], 'zh-CN') : -1;
-    // } else {
-    //     col["sorter"] = (a, b) => { //排序
-    //         if (a[colName] && b[colName] && a[colName].localeCompare) {
-    //             return a[colName] ? a[colName].localeCompare(b[colName], 'zh-CN') : -1;
-    //         } else {
-    //             return 1;
-    //         }
-    //     }
-    // }
-    col["sorter"] = true;
-    if (defaultSort) {
-      col["defaultSortOrder"] = defaultSort;
-    }
-    col["showSorterTooltip"] = false;
-  },
-};
+import React from "react";
+
+export default {
+  sort(col, itemType: string, defaultSort?) {
+    let colName = col["dataIndex"];
+    // if (itemType == "decimal" || itemType == "int" || itemType == "float" || itemType == "double") { //排序b
+    //     col["sorter"] = (a, b) => a[colName] - b[colName];
+    // } else if (itemType == "text" || itemType == "textarea" || itemType == "date" || itemType == "datetime") {
+    //     col["sorter"] = (a, b) => a[colName] ? a[colName].localeCompare(b[colName], 'zh-CN') : -1;
+    // } else {
+    //     col["sorter"] = (a, b) => { //排序
+    //         if (a[colName] && b[colName] && a[colName].localeCompare) {
+    //             return a[colName] ? a[colName].localeCompare(b[colName], 'zh-CN') : -1;
+    //         } else {
+    //             return 1;
+    //         }
+    //     }
+    // }
+    col["sorter"] = true;
+    if (defaultSort) {
+      col["defaultSortOrder"] = defaultSort;
+    }
+    col["showSorterTooltip"] = false;
+  },
+};

package/src/aldehyde/tmpl/control-type-supportor.tsx

@@ -1,111 +1,111 @@
-import { FieldBase, FieldConfig} from "./interface";
-import {ProgramConfig} from "../index";
-
-const SupportInputTypes:Set<string>=new Set<string>();
-SupportInputTypes.add('date-YY');
-SupportInputTypes.add('daterange-YY');
-SupportInputTypes.add('date-M1');
-SupportInputTypes.add('daterange-M1');
-SupportInputTypes.add('date');
-SupportInputTypes.add('daterange');
-SupportInputTypes.add('datetime-HH');
-SupportInputTypes.add('datetimerange-HH');
-SupportInputTypes.add('datetime-mm');
-SupportInputTypes.add('datetimerange-mm');
-SupportInputTypes.add('datetime');
-SupportInputTypes.add('datetimerange');
-SupportInputTypes.add('timestamp');
-
-SupportInputTypes.add('time-HH');
-SupportInputTypes.add('timerange-HH');
-SupportInputTypes.add('time-mm');
-SupportInputTypes.add('timerange-mm');
-SupportInputTypes.add('time');
-SupportInputTypes.add('timerange');
-
-SupportInputTypes.add('timerange-HH-unorder');
-SupportInputTypes.add('timerange-mm-unorder');
-SupportInputTypes.add('timerange-unorder');
-
-SupportInputTypes.add('text');
-SupportInputTypes.add('textarea');
-SupportInputTypes.add('html');
-SupportInputTypes.add('steps');
-SupportInputTypes.add('progress');
-SupportInputTypes.add('password');
-SupportInputTypes.add('preselect');
-SupportInputTypes.add('select');
-SupportInputTypes.add('multiselect');
-SupportInputTypes.add('checkbox');
-SupportInputTypes.add('radio');
-SupportInputTypes.add('yes-no-select');
-SupportInputTypes.add('yes-no-radio');
-SupportInputTypes.add('yes-no-switch');
-SupportInputTypes.add('caselect');
-SupportInputTypes.add('relation');
-SupportInputTypes.add('file');
-SupportInputTypes.add('picture');
-SupportInputTypes.add('chemstruc');
-SupportInputTypes.add('sql-code-editor');
-SupportInputTypes.add('video');//没支持上
-SupportInputTypes.add('takeVideo');//没支持上
-SupportInputTypes.add('signature');//签名组件
-SupportInputTypes.add('non-download-file');
-
-SupportInputTypes.add('decimal');
-SupportInputTypes.add('float');
-SupportInputTypes.add('double');
-SupportInputTypes.add('int');
-SupportInputTypes.add('relselect');
-SupportInputTypes.add('relselectvalue');
-SupportInputTypes.add('refselect');
-SupportInputTypes.add('field-history');
-
-SupportInputTypes.add('range');
-SupportInputTypes.add('intrange');
-SupportInputTypes.add('decimalrange');
-SupportInputTypes.add('texttags');
-// SupportInputTypes.add('relation_existion');
-SupportInputTypes.add('entity-select');
-SupportInputTypes.add('table-entity-select');
-SupportInputTypes.add('modal-entity-select');
-SupportInputTypes.add('color');
-SupportInputTypes.add('url');
-SupportInputTypes.add('hidden');
-SupportInputTypes.add('lab-tree-select');
-SupportInputTypes.add('field-history');
-function ControlTypeSupportor(){
-
-}
-ControlTypeSupportor.isSupport=function(type:string):boolean {
-    if(type){
-        if(ProgramConfig.getCustomViewControl(type)){
-            return true;
-        }else{
-            return SupportInputTypes.has(type);
-        }
-    }else{
-        return false;
-    }
-};
-ControlTypeSupportor.getSupportControlType=function(fieldConfig:FieldBase):string{
-    if(this.isSupport(fieldConfig.extControlType)){
-        return fieldConfig.extControlType;
-    }else if(this.isSupport(fieldConfig.controlType)){
-        return fieldConfig.controlType;
-    }else{
-        return 'text';
-    }
-};
-
-ControlTypeSupportor.getControlType=function(fieldConfig: FieldConfig, fieldValue: any) {
-    let itemType: string;
-    itemType = this.getSupportControlType(fieldConfig);
-    //对关系属性之文件进行特殊处理
-    if (!!fieldValue && typeof(fieldValue) == 'string' && fieldValue.indexOf('@R@') === -1 && itemType === "relselect" && fieldValue.indexOf('download-files/') != -1) {
-        itemType = "file";
-    }
-    return itemType;
-}
-
-export default  ControlTypeSupportor;
+import { FieldBase, FieldConfig} from "./interface";
+import {ProgramConfig} from "../index";
+
+const SupportInputTypes:Set<string>=new Set<string>();
+SupportInputTypes.add('date-YY');
+SupportInputTypes.add('daterange-YY');
+SupportInputTypes.add('date-M1');
+SupportInputTypes.add('daterange-M1');
+SupportInputTypes.add('date');
+SupportInputTypes.add('daterange');
+SupportInputTypes.add('datetime-HH');
+SupportInputTypes.add('datetimerange-HH');
+SupportInputTypes.add('datetime-mm');
+SupportInputTypes.add('datetimerange-mm');
+SupportInputTypes.add('datetime');
+SupportInputTypes.add('datetimerange');
+SupportInputTypes.add('timestamp');
+
+SupportInputTypes.add('time-HH');
+SupportInputTypes.add('timerange-HH');
+SupportInputTypes.add('time-mm');
+SupportInputTypes.add('timerange-mm');
+SupportInputTypes.add('time');
+SupportInputTypes.add('timerange');
+
+SupportInputTypes.add('timerange-HH-unorder');
+SupportInputTypes.add('timerange-mm-unorder');
+SupportInputTypes.add('timerange-unorder');
+
+SupportInputTypes.add('text');
+SupportInputTypes.add('textarea');
+SupportInputTypes.add('html');
+SupportInputTypes.add('steps');
+SupportInputTypes.add('progress');
+SupportInputTypes.add('password');
+SupportInputTypes.add('preselect');
+SupportInputTypes.add('select');
+SupportInputTypes.add('multiselect');
+SupportInputTypes.add('checkbox');
+SupportInputTypes.add('radio');
+SupportInputTypes.add('yes-no-select');
+SupportInputTypes.add('yes-no-radio');
+SupportInputTypes.add('yes-no-switch');
+SupportInputTypes.add('caselect');
+SupportInputTypes.add('relation');
+SupportInputTypes.add('file');
+SupportInputTypes.add('picture');
+SupportInputTypes.add('chemstruc');
+SupportInputTypes.add('sql-code-editor');
+SupportInputTypes.add('video');//没支持上
+SupportInputTypes.add('takeVideo');//没支持上
+SupportInputTypes.add('signature');//签名组件
+SupportInputTypes.add('non-download-file');
+
+SupportInputTypes.add('decimal');
+SupportInputTypes.add('float');
+SupportInputTypes.add('double');
+SupportInputTypes.add('int');
+SupportInputTypes.add('relselect');
+SupportInputTypes.add('relselectvalue');
+SupportInputTypes.add('refselect');
+SupportInputTypes.add('field-history');
+
+SupportInputTypes.add('range');
+SupportInputTypes.add('intrange');
+SupportInputTypes.add('decimalrange');
+SupportInputTypes.add('texttags');
+// SupportInputTypes.add('relation_existion');
+SupportInputTypes.add('entity-select');
+SupportInputTypes.add('table-entity-select');
+SupportInputTypes.add('modal-entity-select');
+SupportInputTypes.add('color');
+SupportInputTypes.add('url');
+SupportInputTypes.add('hidden');
+SupportInputTypes.add('lab-tree-select');
+SupportInputTypes.add('field-history');
+function ControlTypeSupportor(){
+
+}
+ControlTypeSupportor.isSupport=function(type:string):boolean {
+    if(type){
+        if(ProgramConfig.getCustomViewControl(type)){
+            return true;
+        }else{
+            return SupportInputTypes.has(type);
+        }
+    }else{
+        return false;
+    }
+};
+ControlTypeSupportor.getSupportControlType=function(fieldConfig:FieldBase):string{
+    if(this.isSupport(fieldConfig.extControlType)){
+        return fieldConfig.extControlType;
+    }else if(this.isSupport(fieldConfig.controlType)){
+        return fieldConfig.controlType;
+    }else{
+        return 'text';
+    }
+};
+
+ControlTypeSupportor.getControlType=function(fieldConfig: FieldConfig, fieldValue: any) {
+    let itemType: string;
+    itemType = this.getSupportControlType(fieldConfig);
+    //对关系属性之文件进行特殊处理
+    if (!!fieldValue && typeof(fieldValue) == 'string' && fieldValue.indexOf('@R@') === -1 && itemType === "relselect" && fieldValue.indexOf('download-files/') != -1) {
+        itemType = "file";
+    }
+    return itemType;
+}
+
+export default  ControlTypeSupportor;