aldehyde 0.2.279 → 0.2.282

package/lib/tree/block-menu-auth-tree.js

@@ -84,7 +84,7 @@ class BlockMenuAuthTree extends React.PureComponent {
         };
         this.renderTitle = (nodeData) => {
             const { translate } = this.context;
-            return React.createElement(Card, { bordered: false, style: { width: '100%', minWidth: '180px', marginBottom: 2 }, styles: { body: { padding: '2px' } } },
+            return React.createElement(Card, { variant: "borderless", style: { width: '100%', minWidth: '180px', marginBottom: 2 }, styles: { body: { padding: '2px' } } },
                 React.createElement(Row, null,
                     React.createElement(Col, { span: 24 },
                         React.createElement(Space, null,
@@ -133,10 +133,10 @@ class BlockMenuAuthTree extends React.PureComponent {
         console.log("treeData", treeData);
         console.log("checkedKeys", checkedKeys);
         return React.createElement(Card, { bodyStyle: { padding: '2px', "overflowY": "scroll", height: 'calc(78vh)', minWidth: '420px' }, loading: loading },
-            React.createElement(Tree, { checkable: true, defaultExpandAll: true, 
-                //defaultCheckedKeys={defaultCheckedKeys}
-                checkedKeys: checkedKeys, showLine: { showLeafIcon: false }, selectable: false, onCheck: (checkedKeys) => this.onCheck(checkedKeys), titleRender: (nodeData) => {
-                    return this.renderTitle(nodeData);
+            React.createElement(Tree, { checkable: true, defaultExpandAll: true, checkedKeys: checkedKeys, showLine: { showLeafIcon: false }, selectable: false, onCheck: (checkedKeys) => this.onCheck(checkedKeys), titleRender: (nodeData) => {
+                    return React.createElement("span", { title: "" },
+                        " ",
+                        this.renderTitle(nodeData));
                 }, treeData: treeData }));
     }
 }

package/lib/tree/block-menu-auth-tree.js.map

@@ -1 +1 @@
-{"version":3,"file":"block-menu-auth-tree.js","sourceRoot":"","sources":["../../../../src/aldehyde/tree/block-menu-auth-tree.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"block-menu-auth-tree.js","sourceRoot":"","sources":["../../../../src/aldehyde/tree/block-menu-auth-tree.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.2.279",
+  "version": "0.2.282",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",

package/src/aldehyde/controls/tree-select/tree-entity-select.tsx

@@ -73,18 +73,26 @@ const TreeEntitySelect=(props:TreeEntitySelectProps)=> {
       })
     }
     if(props.onChange){
-      props.onChange(values);
+      props.onChange(values.join("@,@"));
     }
     console.log(nodes)
   }
 
   function getValue() {
-
-    if(value){
+        let values:string[]=[];
+      if(Array.isArray(value) ){
+          values=[...value];
+      }else if(value &&  typeof value === 'string'){
+          if(value.indexOf("@,@")>0){
+              values = value.split("@,@");
+          }else{
+              values = value.split(",");
+          }
+      }
       //获取checkkey
         let codes:string[]=[];
         let names:string[]=[];
-      value.forEach(c=>{
+      values.forEach(c=>{
           codes.push(c.split("@R@")[0]) ;
           names.push(c.split("@R@")[1]);
         })
@@ -94,8 +102,7 @@ const TreeEntitySelect=(props:TreeEntitySelectProps)=> {
         }else{
           return val;
         }
-      }
-    return value;
+        return value;
   }
 
   return <TreeSelect open = {treeOpen} allowClear value={getValue()}

package/src/aldehyde/form/dtmpl-form.tsx

@@ -378,7 +378,7 @@ export default class DtmplForm extends React.PureComponent<
             loading={loading}
             styles={{body:{ padding: "6px" },header:{ background: "#f2f4f5" }}}
           >
-            <FormItemGroup
+            <FormItemGroup layout={HcserviceV3.isForeignLanguageMode()?"vertical":"horizontal"}
               serverKey={serverKey}
               formRef={formRef}
               mainCode={mainCode}
@@ -433,6 +433,7 @@ export default class DtmplForm extends React.PureComponent<
     if (!dtmplConfig || !dtmplData) {
       return <Card loading={true}>{translate("${加载中}")}... ...</Card>;
     }
+
     //debugger
     const { buttons, premises } = appDtmplConfig
       ? appDtmplConfig
@@ -473,6 +474,7 @@ export default class DtmplForm extends React.PureComponent<
           </Card>
         ) : null}
         <AntdForm
+            layout={HcserviceV3.isForeignLanguageMode()?"vertical":"horizontal"}
           scrollToFirstError={true}
           labelWrap={true}
           ref={formRef}

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

@@ -20,6 +20,7 @@ export interface FieldGroupProps {
   mainCode?: string;
   formRef?: RefObject<FormInstance>;
   dataCode?:string,
+  layout?: "horizontal" | "vertical"
 }
 
 interface FieldGroupState {
@@ -78,10 +79,20 @@ export default class FormItemGroup extends React.PureComponent<
     return fieldConfig;
   };
   initFormItem = (fieldConfig: FieldConfig, fieldValue) => {
-    const { nameAttr, maxColsOnRow, mainCode, serverKey,dataCode } = this.props;
+    const { nameAttr, maxColsOnRow, mainCode, serverKey,dataCode,layout } = this.props;
     const { translate } = this.context;
     let item = this.getFieldConfig(fieldConfig);
 
+    let labelColSpan=24;
+    let wrapperColSpan=24;
+    debugger
+    if(layout==="vertical"){
+      labelColSpan=24;
+      wrapperColSpan=24;
+    }else {
+      labelColSpan= maxColsOnRow == 1 ?  6 : item.colSpan == 1 ?  6 :  3;
+      wrapperColSpan= maxColsOnRow == 1 ?  18 : item.colSpan == 1 ? 15 :  19 ;
+    }
 
     return (
       <FormItem
@@ -89,19 +100,10 @@ export default class FormItemGroup extends React.PureComponent<
         hidden={item.hidden}
         name={fieldConfig.controlType=="field-history" ?undefined:item[nameAttr]}
         key={item.id}
-        labelCol={
-          maxColsOnRow == 1
-            ? { span: 6 }
-            : item.colSpan == 1
-            ? { span: 6 }
-            : { span: 3 }
+        labelCol={{ span: labelColSpan }
         }
         wrapperCol={
-          maxColsOnRow == 1
-            ? { span: 18 }
-            : item.colSpan == 1
-            ? { span: 15 }
-            : { span: 19 }
+         {span:wrapperColSpan}
         }
         tooltip={(!item.tip || item.tip=="")?undefined:item.tip}
         initialValue={fieldValue}