aldehyde 0.2.197 → 0.2.198

package/src/aldehyde/controls/auto-complete/index.tsx

@@ -1,82 +1,82 @@
-import React from "react";
-import { AutoComplete as AntdAutoComplete, Input } from "antd";
-import { EControlProps } from "../../tmpl/interface";
-import HCDataSource from "../../tmpl/hc-data-source";
-import { useLocale } from "../../locale/useLocale";
-
-const { TextArea } = Input;
-
-interface AutoCompleteProps extends EControlProps {}
-
-const AutoComplete: React.FC<AutoCompleteProps> = (props) => {
-  const { id, value, itemType, fieldConfig, onChange } = props;
-  const { translate } = useLocale();
-
-  let entryControl = undefined;
-
-  const changeValue = (value1) => {
-    if (onChange) {
-      let newvalue = undefined;
-      if (value1 === undefined) {
-        return "";
-      }
-      let bb = value1.startsWith("@@");
-      if (bb) {
-        newvalue = (value ? value : "") + value1.substring(2, value1.length);
-      } else {
-        newvalue = value1;
-      }
-      onChange(newvalue);
-    }
-  };
-
-  let placeholder = !fieldConfig.disabled
-    ? translate("${请输入}${" + fieldConfig.title + "}")
-    : translate("${无需输入}");
-  let disabled: boolean = fieldConfig.disabled;
-
-  let antdControlProps = {
-    id,
-    placeholder,
-    disabled,
-  };
-
-  const getSelectArray = () => {
-    let data = HCDataSource.getEnums(fieldConfig.mstrucId);
-    if (!data) {
-      return [];
-    }
-    const options = [];
-    data.map((item) => {
-      const option = {
-        value: "@@" + item.value,
-        label: item.title,
-      };
-      options.push(option);
-      return false;
-    });
-    return options;
-  };
-
-  entryControl = (
-    <AntdAutoComplete
-      allowClear={true}
-      dropdownMatchSelectWidth={true}
-      options={getSelectArray()}
-      onChange={changeValue}
-      value={translate("${" + value + "}")}
-      //style={{width: scalableWidth}}
-    >
-      <TextArea
-        style={{
-          height: 150,
-        }}
-        {...antdControlProps}
-      />
-    </AntdAutoComplete>
-  );
-
-  return entryControl;
-};
-
-export default AutoComplete;
+import React from "react";
+import { AutoComplete as AntdAutoComplete, Input } from "antd";
+import { EControlProps } from "../../tmpl/interface";
+import HCDataSource from "../../tmpl/hc-data-source";
+import { useLocale } from "../../locale/useLocale";
+
+const { TextArea } = Input;
+
+interface AutoCompleteProps extends EControlProps {}
+
+const AutoComplete: React.FC<AutoCompleteProps> = (props) => {
+  const { id, value, itemType, fieldConfig, onChange } = props;
+  const { translate } = useLocale();
+
+  let entryControl = undefined;
+
+  const changeValue = (value1) => {
+    if (onChange) {
+      let newvalue = undefined;
+      if (value1 === undefined) {
+        return "";
+      }
+      let bb = value1.startsWith("@@");
+      if (bb) {
+        newvalue = (value ? value : "") + value1.substring(2, value1.length);
+      } else {
+        newvalue = value1;
+      }
+      onChange(newvalue);
+    }
+  };
+
+  let placeholder = !fieldConfig.disabled
+    ? translate("${请输入}${" + fieldConfig.title + "}")
+    : translate("${无需输入}");
+  let disabled: boolean = fieldConfig.disabled;
+
+  let antdControlProps = {
+    id,
+    placeholder,
+    disabled,
+  };
+
+  const getSelectArray = () => {
+    let data = HCDataSource.getEnums(fieldConfig.mstrucId);
+    if (!data) {
+      return [];
+    }
+    const options = [];
+    data.map((item) => {
+      const option = {
+        value: "@@" + item.value,
+        label: item.title,
+      };
+      options.push(option);
+      return false;
+    });
+    return options;
+  };
+
+  entryControl = (
+    <AntdAutoComplete
+      allowClear={true}
+      dropdownMatchSelectWidth={true}
+      options={getSelectArray()}
+      onChange={changeValue}
+      value={translate("${" + value + "}")}
+      //style={{width: scalableWidth}}
+    >
+      <TextArea
+        style={{
+          height: 150,
+        }}
+        {...antdControlProps}
+      />
+    </AntdAutoComplete>
+  );
+
+  return entryControl;
+};
+
+export default AutoComplete;

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

@@ -1,113 +1,113 @@
-import React from 'react'
-import {ButtonProps, Cascader as AntdCascader} from 'antd'
-import { EControlProps, EnumItem} from "../../tmpl/interface";
-import HCDataSource from "../../tmpl/hc-data-source";
-
-interface CascaderProps extends EControlProps{
-
-    baseValue?:string[],//baseValue 指定后不能修改
-
-}
-
-interface CascaderState {
-    options?:object[]
-}
-
-export default class Cascader extends React.PureComponent<CascaderProps, CascaderState> {
-
-    static defaultProps={
-        baseValue:[],//['level1','level2']
-    }
-
-    state={
-        options:[],
-    }
-
-    async componentDidMount() {
-      let options=  await this.getOptions();
-      this.setState({
-          options
-      })
-    }
-
-
-    handleChange=(value)=>{
-        const { onChange } = this.props
-        let res=undefined
-        //console.log('Cascader',value);
-        if(value){
-            res=value.join("->")
-           // console.log("value.join(\"->\")",res)
-        }
-        if (onChange) {
-            onChange(res);
-        }
-    }
-
-    getOptions=async ()=>{
-        const { fieldConfig,baseValue,serverKey }=this.props
-       let options= await HCDataSource.getOptions(serverKey,fieldConfig.mstrucId);
-		const ops=[]
-        let newOptions=[];
-
-		let nextOptions=options;
-		let currentOptions=newOptions;
-        //先根据 baseValue 过滤一层
-        if(baseValue.length>0){
-            baseValue.map((v,i)=>{
-                if(i>0){currentOptions[0].subOptions=[];
-                    currentOptions= currentOptions[0].subOptions;
-                }
-                if(nextOptions){
-                    for(let option of nextOptions){
-                        if(option.title==v){
-                            currentOptions.push({...option});
-                            nextOptions=option.subOptions;
-                        }
-                    }
-                }
-            })
-
-        }else{
-            newOptions=options;
-        }
-
-
-        this.buildOptions(newOptions,ops);
-
-
-
-		return ops;
-    }
-
-    buildOptions=(options:EnumItem[],ops:object[])=>{
-        options.forEach((item)=>{
-            const op={}
-            op["value"]=item.title
-            op["label"]=item.title
-            op["key"]=item.id
-            ops.push(op);
-            if(item.subOptions){
-                let children=[];
-                op['children']=children;
-                this.buildOptions(item.subOptions,children);
-            }else{
-                op["isLeaf"]= true;
-            }
-        })
-    }
-
-    render(){
-        const {options}=this.state;
-        const { fieldConfig,onChange,value,...other}=this.props
-        return (
-            <AntdCascader
-                displayRender={label=>label.join('->')}
-                options={options}
-                value={value?value.split('->'):undefined}
-                onChange={this.handleChange}
-                {...other}
-            />
-        )
-    }
+import React from 'react'
+import {ButtonProps, Cascader as AntdCascader} from 'antd'
+import { EControlProps, EnumItem} from "../../tmpl/interface";
+import HCDataSource from "../../tmpl/hc-data-source";
+
+interface CascaderProps extends EControlProps{
+
+    baseValue?:string[],//baseValue 指定后不能修改
+
+}
+
+interface CascaderState {
+    options?:object[]
+}
+
+export default class Cascader extends React.PureComponent<CascaderProps, CascaderState> {
+
+    static defaultProps={
+        baseValue:[],//['level1','level2']
+    }
+
+    state={
+        options:[],
+    }
+
+    async componentDidMount() {
+      let options=  await this.getOptions();
+      this.setState({
+          options
+      })
+    }
+
+
+    handleChange=(value)=>{
+        const { onChange } = this.props
+        let res=undefined
+        //console.log('Cascader',value);
+        if(value){
+            res=value.join("->")
+           // console.log("value.join(\"->\")",res)
+        }
+        if (onChange) {
+            onChange(res);
+        }
+    }
+
+    getOptions=async ()=>{
+        const { fieldConfig,baseValue,serverKey }=this.props
+       let options= await HCDataSource.getOptions(serverKey,fieldConfig.mstrucId);
+		const ops=[]
+        let newOptions=[];
+
+		let nextOptions=options;
+		let currentOptions=newOptions;
+        //先根据 baseValue 过滤一层
+        if(baseValue.length>0){
+            baseValue.map((v,i)=>{
+                if(i>0){currentOptions[0].subOptions=[];
+                    currentOptions= currentOptions[0].subOptions;
+                }
+                if(nextOptions){
+                    for(let option of nextOptions){
+                        if(option.title==v){
+                            currentOptions.push({...option});
+                            nextOptions=option.subOptions;
+                        }
+                    }
+                }
+            })
+
+        }else{
+            newOptions=options;
+        }
+
+
+        this.buildOptions(newOptions,ops);
+
+
+
+		return ops;
+    }
+
+    buildOptions=(options:EnumItem[],ops:object[])=>{
+        options.forEach((item)=>{
+            const op={}
+            op["value"]=item.title
+            op["label"]=item.title
+            op["key"]=item.id
+            ops.push(op);
+            if(item.subOptions){
+                let children=[];
+                op['children']=children;
+                this.buildOptions(item.subOptions,children);
+            }else{
+                op["isLeaf"]= true;
+            }
+        })
+    }
+
+    render(){
+        const {options}=this.state;
+        const { fieldConfig,onChange,value,...other}=this.props
+        return (
+            <AntdCascader
+                displayRender={label=>label.join('->')}
+                options={options}
+                value={value?value.split('->'):undefined}
+                onChange={this.handleChange}
+                {...other}
+            />
+        )
+    }
 }