aldehyde 0.2.197 → 0.2.199

package/src/aldehyde/form/form-Item-group.tsx

@@ -1,211 +1,211 @@
-import React, { RefObject } from "react";
-import { Col, Form, Row } from "antd";
-import { FieldConfig } from "../tmpl/interface";
-import EntryControl from "../controls/entry-control";
-import Units from "../units";
-import { FormInstance } from "antd/lib/form/hooks/useForm";
-import { LocaleContext } from "../locale/LocaleProvider";
-import ControlTypeSupportor from "../tmpl/control-type-supportor";
-
-const FormItem = Form.Item;
-
-export interface FieldGroupProps {
-  serverKey?: string;
-  fields: FieldConfig[];
-  nameAttr?: string;
-  valueMap: object;
-  width?: number;
-  maxColsOnRow?: number;
-  mainCode?: string;
-  formRef?: RefObject<FormInstance>;
-  dataCode?:string,
-}
-
-interface FieldGroupState {
-  fileList?: any;
-}
-
-export default class FormItemGroup extends React.PureComponent<
-  FieldGroupProps,
-  FieldGroupState
-> {
-  static defaultProps = {
-    nameAttr: "id",
-    maxColsOnRow: 2,
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      fileList: [],
-    };
-  }
-
-  isPromise = (obj) => {
-    return (
-      !!obj && //有实际含义的变量才执行方法，变量null，undefined和''空串都为false
-      (typeof obj === "object" || typeof obj === "function") && // 初始promise 或 promise.then返回的
-      typeof obj.then === "function"
-    );
-  };
-
-  getMainCode = (item: FieldConfig, mainCode) => {
-    const { formRef } = this.props;
-    //  let a=formRef.current;
-    if (!item.mainCode) {
-      return mainCode;
-    }
-    if (typeof item.mainCode == "function") {
-      // let res = item.mainCode(formRef.current);
-      return item.mainCode(formRef.current);
-    } else {
-      return item.mainCode;
-    }
-  };
-
-  getFieldConfig = (item: FieldConfig) => {
-    const { formRef } = this.props;
-    let fieldConfig = item;
-    if (item.updateSelf) {
-      fieldConfig = item.updateSelf(formRef.current);
-    } else {
-      fieldConfig = item;
-    }
-    //debugger
-    return fieldConfig;
-  };
-  initFormItem = (fieldConfig: FieldConfig, fieldValue) => {
-    const { nameAttr, maxColsOnRow, mainCode, serverKey,dataCode } = this.props;
-    const { translate } = this.context;
-    let item = this.getFieldConfig(fieldConfig);
-    const title = item.title;
-
-    return (
-      <FormItem
-        label={translate("${" + item.title + "}")}
-        hidden={item.hidden}
-        name={fieldConfig.controlType=="field-history" ?undefined:item[nameAttr]}
-        key={item.id}
-        labelCol={
-          maxColsOnRow == 1
-            ? { span: 6 }
-            : item.colNum == 1
-            ? { span: 6 }
-            : { span: 3 }
-        }
-        wrapperCol={
-          maxColsOnRow == 1
-            ? { span: 18 }
-            : item.colNum == 1
-            ? { span: 15 }
-            : { span: 19 }
-        }
-        tooltip={item.tip}
-        initialValue={fieldValue}
-        style={{ margin: 4 }}
-        rules={
-          item.required
-            ? [
-                {
-                  required: true,
-                  message: translate("${请输入}${" + title + "}"),
-                },
-              ]
-            : undefined
-        }
-      >
-        <EntryControl dataCode={dataCode}
-          serverKey={serverKey}
-          mainCode={this.getMainCode(item, mainCode)}
-          value={fieldValue}
-          fieldConfig={item}
-        />
-      </FormItem>
-    );
-  };
-
-  initFormList = () => {
-    const {
-      fields,
-      valueMap,
-      nameAttr,
-      maxColsOnRow,
-      mainCode,
-      serverKey,
-    } = this.props;
-    const formItemList = [];
-
-    if (fields && fields.length > 0) {
-      fields.forEach((item, index) => {
-        let fieldValue = valueMap ? valueMap[item.id] : undefined;
-        const fieldKey = item.id + Math.random() * 100;
-        fieldValue =
-          fieldValue || fieldValue == 0
-            ? fieldValue
-            : item.defaultValue
-            ? Units.configParamTrans(item.defaultValue,ControlTypeSupportor.getControlType(item,item.defaultValue))
-            : undefined;
-        let formItem = null;
-        if (item.extControlType == "hidden") {
-          formItem = (
-            <FormItem
-              hidden={true}
-              initialValue={fieldValue}
-              name={item[nameAttr]}
-              key={item.id}
-            >
-              <EntryControl
-                serverKey={serverKey}
-                mainCode={this.getMainCode(item, mainCode)}
-                value={fieldValue}
-                fieldConfig={item}
-              />
-            </FormItem>
-          );
-        } else {
-         // debugger;
-          // console.log("getFieldValue ---", Form.useFormInstance());
-          formItem = item.shouldUpdate ? (
-            <FormItem noStyle shouldUpdate={item.shouldUpdate}>
-              {() => this.initFormItem(item, fieldValue)}
-            </FormItem>
-          ) : (
-            this.initFormItem(item, fieldValue)
-          );
-        }
-        formItemList.push(formItem);
-      });
-    }
-
-    const colList = [];
-
-    for (let i = 0; i < formItemList.length; i = i + 1) {
-      let colNum = fields[i].colNum;
-
-      if (fields[i].extControlType == "hidden") {
-        colNum = 0;
-      } else if (maxColsOnRow && maxColsOnRow == 1) {
-        colNum = 2;
-      }
-      let col = (
-        <Col key={i} span={12 * colNum } >
-          {formItemList[i]}
-        </Col>
-      );
-      colList.push(col);
-    }
-
-    const row = (
-      <Row gutter={[16, 8]} key={1}>
-        {colList}
-      </Row>
-    );
-    return row;
-  };
-
-  render() {
-    return this.initFormList();
-  }
-}
+import React, { RefObject } from "react";
+import { Col, Form, Row } from "antd";
+import { FieldConfig } from "../tmpl/interface";
+import EntryControl from "../controls/entry-control";
+import Units from "../units";
+import { FormInstance } from "antd/lib/form/hooks/useForm";
+import { LocaleContext } from "../locale/LocaleProvider";
+import ControlTypeSupportor from "../tmpl/control-type-supportor";
+
+const FormItem = Form.Item;
+
+export interface FieldGroupProps {
+  serverKey?: string;
+  fields: FieldConfig[];
+  nameAttr?: string;
+  valueMap: object;
+  width?: number;
+  maxColsOnRow?: number;
+  mainCode?: string;
+  formRef?: RefObject<FormInstance>;
+  dataCode?:string,
+}
+
+interface FieldGroupState {
+  fileList?: any;
+}
+
+export default class FormItemGroup extends React.PureComponent<
+  FieldGroupProps,
+  FieldGroupState
+> {
+  static defaultProps = {
+    nameAttr: "id",
+    maxColsOnRow: 2,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  constructor(props) {
+    super(props);
+    this.state = {
+      fileList: [],
+    };
+  }
+
+  isPromise = (obj) => {
+    return (
+      !!obj && //有实际含义的变量才执行方法，变量null，undefined和''空串都为false
+      (typeof obj === "object" || typeof obj === "function") && // 初始promise 或 promise.then返回的
+      typeof obj.then === "function"
+    );
+  };
+
+  getMainCode = (item: FieldConfig, mainCode) => {
+    const { formRef } = this.props;
+    //  let a=formRef.current;
+    if (!item.mainCode) {
+      return mainCode;
+    }
+    if (typeof item.mainCode == "function") {
+      // let res = item.mainCode(formRef.current);
+      return item.mainCode(formRef.current);
+    } else {
+      return item.mainCode;
+    }
+  };
+
+  getFieldConfig = (item: FieldConfig) => {
+    const { formRef } = this.props;
+    let fieldConfig = item;
+    if (item.updateSelf) {
+      fieldConfig = item.updateSelf(formRef.current);
+    } else {
+      fieldConfig = item;
+    }
+    //debugger
+    return fieldConfig;
+  };
+  initFormItem = (fieldConfig: FieldConfig, fieldValue) => {
+    const { nameAttr, maxColsOnRow, mainCode, serverKey,dataCode } = this.props;
+    const { translate } = this.context;
+    let item = this.getFieldConfig(fieldConfig);
+    const title = item.title;
+
+    return (
+      <FormItem
+        label={translate("${" + item.title + "}")}
+        hidden={item.hidden}
+        name={fieldConfig.controlType=="field-history" ?undefined:item[nameAttr]}
+        key={item.id}
+        labelCol={
+          maxColsOnRow == 1
+            ? { span: 6 }
+            : item.colNum == 1
+            ? { span: 6 }
+            : { span: 3 }
+        }
+        wrapperCol={
+          maxColsOnRow == 1
+            ? { span: 18 }
+            : item.colNum == 1
+            ? { span: 15 }
+            : { span: 19 }
+        }
+        tooltip={item.tip}
+        initialValue={fieldValue}
+        style={{ margin: 4 }}
+        rules={
+          item.required
+            ? [
+                {
+                  required: true,
+                  message: translate("${请输入}${" + title + "}"),
+                },
+              ]
+            : undefined
+        }
+      >
+        <EntryControl dataCode={dataCode}
+          serverKey={serverKey}
+          mainCode={this.getMainCode(item, mainCode)}
+          value={fieldValue}
+          fieldConfig={item}
+        />
+      </FormItem>
+    );
+  };
+
+  initFormList = () => {
+    const {
+      fields,
+      valueMap,
+      nameAttr,
+      maxColsOnRow,
+      mainCode,
+      serverKey,
+    } = this.props;
+    const formItemList = [];
+
+    if (fields && fields.length > 0) {
+      fields.forEach((item, index) => {
+        let fieldValue = valueMap ? valueMap[item.id] : undefined;
+        const fieldKey = item.id + Math.random() * 100;
+        fieldValue =
+          fieldValue || fieldValue == 0
+            ? fieldValue
+            : item.defaultValue
+            ? Units.configParamTrans(item.defaultValue,ControlTypeSupportor.getControlType(item,item.defaultValue))
+            : undefined;
+        let formItem = null;
+        if (item.extControlType == "hidden") {
+          formItem = (
+            <FormItem
+              hidden={true}
+              initialValue={fieldValue}
+              name={item[nameAttr]}
+              key={item.id}
+            >
+              <EntryControl
+                serverKey={serverKey}
+                mainCode={this.getMainCode(item, mainCode)}
+                value={fieldValue}
+                fieldConfig={item}
+              />
+            </FormItem>
+          );
+        } else {
+         // debugger;
+          // console.log("getFieldValue ---", Form.useFormInstance());
+          formItem = item.shouldUpdate ? (
+            <FormItem noStyle shouldUpdate={item.shouldUpdate}>
+              {() => this.initFormItem(item, fieldValue)}
+            </FormItem>
+          ) : (
+            this.initFormItem(item, fieldValue)
+          );
+        }
+        formItemList.push(formItem);
+      });
+    }
+
+    const colList = [];
+
+    for (let i = 0; i < formItemList.length; i = i + 1) {
+      let colNum = fields[i].colNum;
+
+      if (fields[i].extControlType == "hidden") {
+        colNum = 0;
+      } else if (maxColsOnRow && maxColsOnRow == 1) {
+        colNum = 2;
+      }
+      let col = (
+        <Col key={i} span={12 * colNum } >
+          {formItemList[i]}
+        </Col>
+      );
+      colList.push(col);
+    }
+
+    const row = (
+      <Row gutter={[16, 8]} key={1}>
+        {colList}
+      </Row>
+    );
+    return row;
+  };
+
+  render() {
+    return this.initFormList();
+  }
+}

package/src/aldehyde/form/index.css

@@ -1,13 +1,13 @@
-
-.downAvatar,.infoStyle{
-    width:220px;
-    display:inline-block;
-}
-.downAvatar a,.deleAvatar{
-    visibility: hidden;
-    color:#1890ff;
-    cursor: pointer;
-}
-.downAvatar:hover a,.downAvatar:hover .deleAvatar{
-    visibility:visible;
+
+.downAvatar,.infoStyle{
+    width:220px;
+    display:inline-block;
+}
+.downAvatar a,.deleAvatar{
+    visibility: hidden;
+    color:#1890ff;
+    cursor: pointer;
+}
+.downAvatar:hover a,.downAvatar:hover .deleAvatar{
+    visibility:visible;
 }

package/src/aldehyde/hooks/useVarCssColor.ts

@@ -1,6 +1,6 @@
-export const useVarCssColor = (colors: string[]) => {
-  for (let i = 0; i < colors.length; i++) {
-    const color = colors[i];
-    document.documentElement.style.setProperty(`--color-${i}`, color);
-  }
-};
+export const useVarCssColor = (colors: string[]) => {
+  for (let i = 0; i < colors.length; i++) {
+    const color = colors[i];
+    document.documentElement.style.setProperty(`--color-${i}`, color);
+  }
+};

package/src/aldehyde/icon/index.tsx

@@ -1,29 +1,29 @@
-import React from 'react';
-import {FileDoneOutlined,CheckOutlined,CloseCircleOutlined,FileAddOutlined,ThunderboltOutlined} from '@ant-design/icons';
-
-interface IconProps{
-    type:string,
-}
-
-export interface IconStat {
-
-};
-
-const iconMap={
-    FileDoneOutlined:FileDoneOutlined,
-    CheckOutlined:CheckOutlined,
-    CloseCircleOutlined:CloseCircleOutlined,
-    FileAddOutlined:FileAddOutlined,
-    ThunderboltOutlined:ThunderboltOutlined,
-}
-
-export default class Icon extends React.PureComponent<IconProps, IconStat>{
-    render(){
-        const {type}=this.props;
-        if(iconMap[type]){
-            return React.createElement(iconMap[type]);
-        }else{
-            return <ThunderboltOutlined />
-        }
-    }
+import React from 'react';
+import {FileDoneOutlined,CheckOutlined,CloseCircleOutlined,FileAddOutlined,ThunderboltOutlined} from '@ant-design/icons';
+
+interface IconProps{
+    type:string,
+}
+
+export interface IconStat {
+
+};
+
+const iconMap={
+    FileDoneOutlined:FileDoneOutlined,
+    CheckOutlined:CheckOutlined,
+    CloseCircleOutlined:CloseCircleOutlined,
+    FileAddOutlined:FileAddOutlined,
+    ThunderboltOutlined:ThunderboltOutlined,
+}
+
+export default class Icon extends React.PureComponent<IconProps, IconStat>{
+    render(){
+        const {type}=this.props;
+        if(iconMap[type]){
+            return React.createElement(iconMap[type]);
+        }else{
+            return <ThunderboltOutlined />
+        }
+    }
 }