aldehyde 0.2.480 → 0.2.481

package/src/aldehyde/controls/text/ellipsis-text.tsx

@@ -1,98 +1,98 @@
-import * as React from "react";
-import Units from "../../units";
-import { Popover, Tooltip } from "antd";
-import { LocaleContext } from "../../locale/LocaleProvider";
-import "./index.less";
-
-interface EllipsisTextProps {
-  isHtml?: boolean;
-  value: string;
-  showMax?: number;
-}
-
-interface EllipsisTextState { }
-
-export default class EllipsisText extends React.PureComponent<
-  EllipsisTextProps,
-  EllipsisTextState
-> {
-  state = {};
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  static defaultProps = {
-    isHtml: false,
-    showMax: 30,
-  };
-
-  toString = (value) => {
-    if (value) {
-      return value.toString();
-    } else {
-      return value;
-    }
-  };
-
-  viewButton = (val: string) => {
-    const { value, isHtml } = this.props;
-    //const { translate } = this.context;
-    //debugger
-    return (
-      <>
-        <Popover
-          overlayStyle={{ maxWidth: 360 }}
-          placement="top"
-          // trigger="click"
-          content={
-            // <Card bodyStyle={{padding:'0px'}}>
-            <>
-              {isHtml ? (
-                <div
-                  style={{ padding: "6px" }}
-                  dangerouslySetInnerHTML={{ __html: value }}
-                ></div>
-              ) : (
-                <div style={{ padding: "6px" }}>{value}</div>
-              )}
-            </>
-            // </Card>
-          }
-        >
-          {/*<Button type={"link"} size={"small"}>*/}
-          {/*  {translate("${查看}")}*/}
-          {/*</Button>{" "}*/}
-          {val}
-        </Popover>
-      </>
-    );
-  };
-
-  render() {
-    const { value, isHtml, showMax } = this.props;
-
-    var text = this.toString(value);
-
-    if (isHtml) {
-      var re = new RegExp("<[^<>]+>", "g");
-      text = value?.replace(re, "");
-    }
-
-    let style = Units.getLongTextStyle(text && text.substring ? text.substring(0, showMax) : null);
-    return (
-      <>
-        {!text ? <></> :
-          text.length <= showMax || showMax <= 0 ? (
-            <Tooltip placement="top" title={text} >
-              <span className="infoStyle" style={style}>
-                {text}
-              </span>
-            </Tooltip>
-          ) : (
-            <span className="infoStyle" style={style}>
-              {this.viewButton(text.substring(0, showMax) + "...")}
-            </span>
-          )}
-      </>
-    );
-  }
-}
+import * as React from "react";
+import Units from "../../units";
+import { Popover, Tooltip } from "antd";
+import { LocaleContext } from "../../locale/LocaleProvider";
+import "./index.less";
+
+interface EllipsisTextProps {
+  isHtml?: boolean;
+  value: string;
+  showMax?: number;
+}
+
+interface EllipsisTextState { }
+
+export default class EllipsisText extends React.PureComponent<
+  EllipsisTextProps,
+  EllipsisTextState
+> {
+  state = {};
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  static defaultProps = {
+    isHtml: false,
+    showMax: 30,
+  };
+
+  toString = (value) => {
+    if (value) {
+      return value.toString();
+    } else {
+      return value;
+    }
+  };
+
+  viewButton = (val: string) => {
+    const { value, isHtml } = this.props;
+    //const { translate } = this.context;
+    //debugger
+    return (
+      <>
+        <Popover
+          overlayStyle={{ maxWidth: 360 }}
+          placement="top"
+          // trigger="click"
+          content={
+            // <Card bodyStyle={{padding:'0px'}}>
+            <>
+              {isHtml ? (
+                <div
+                  style={{ padding: "6px" }}
+                  dangerouslySetInnerHTML={{ __html: value }}
+                ></div>
+              ) : (
+                <div style={{ padding: "6px" }}>{value}</div>
+              )}
+            </>
+            // </Card>
+          }
+        >
+          {/*<Button type={"link"} size={"small"}>*/}
+          {/*  {translate("${查看}")}*/}
+          {/*</Button>{" "}*/}
+          {val}
+        </Popover>
+      </>
+    );
+  };
+
+  render() {
+    const { value, isHtml, showMax } = this.props;
+
+    var text = this.toString(value);
+
+    if (isHtml) {
+      var re = new RegExp("<[^<>]+>", "g");
+      text = value?.replace(re, "");
+    }
+
+    let style = Units.getLongTextStyle(text && text.substring ? text.substring(0, showMax) : null);
+    return (
+      <>
+        {!text ? <></> :
+          text.length <= showMax || showMax <= 0 ? (
+            <Tooltip placement="top" title={text} >
+              <span className="infoStyle" style={style}>
+                {text}
+              </span>
+            </Tooltip>
+          ) : (
+            <span className="infoStyle" style={style}>
+              {this.viewButton(text.substring(0, showMax) + "...")}
+            </span>
+          )}
+      </>
+    );
+  }
+}

package/src/aldehyde/controls/text/index.less

@@ -1,8 +1,8 @@
-.infoStyle {
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    width: fit-content;
-    max-width: 100%;
-    min-width: 100%;
+.infoStyle {
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    width: fit-content;
+    max-width: 100%;
+    min-width: 100%;
 }

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

@@ -1,123 +1,123 @@
-import React, {useEffect, useState} from "react";
-import { Empty,  Spin, TreeSelect} from "antd";
-import TreeUtils, { TtmplNodeConfig } from "../../tree/tree-utils";
-import {EControlProps, TtmplConfig} from "../../tmpl/interface";
-import HCDataSource from "../../tmpl/hc-data-source";
-import TmplTree from "../../tree/tmpl-tree";
-
-
-interface NavigationTreeProps extends EControlProps {
-  //onLeafClick:(code:string,title:string) => void;
-}
-
-const NavigationTree=(props:NavigationTreeProps)=> {
-
-  const {fieldConfig,serverKey,value}=props
-  const [ttmplConfig, setTtmplConfig] = useState<TtmplConfig>(undefined);
-  const [ttmplNodeConfig, setTtmplNodeConfig] = useState<TtmplNodeConfig>(undefined);
-  const [expandedKeys,setExpandedKeys]=useState(undefined);
-  const [treeData,setTreeData] =useState([]);
-  const [loading,setLoading] =useState(true);
-  // const [treeLoadedKeys,setTreeLoadedKeys] =useState([]);
-   const refTmplTree: any = React.createRef();
-  useEffect( () => {
-    const getttmplConfig= async () =>{
-      let ttmplConfig=  await HCDataSource.requestTtmplConfig(
-          serverKey,
-          fieldConfig.id);
-      let ttmplNodeConfig = await TreeUtils.initTtmplNodeConfig(ttmplConfig);
-      setTtmplConfig(ttmplConfig);
-      setTtmplNodeConfig(ttmplNodeConfig);
-      loadRootNodeData(ttmplNodeConfig);
-    }
-    getttmplConfig();
-  const loadRootNodeData = async (ttmplNodeConfig) => {
-      const data=await TreeUtils.loadRootNodeData(ttmplNodeConfig);
-      setTreeData(data);
-    setLoading(false);
-   }
-  }, [fieldConfig]);
-
-  const loadData=async (node)=>{
-    let v = await TreeUtils.reloadData(node.code,ttmplNodeConfig,treeData,expandedKeys);
-    setTreeData(v.data);
-    setLoading(false);
-    setExpandedKeys(v.expandedKeys);
-  }
-
-  // const onTreeExpand=async (expandedKeys)=>{
-  //   setExpandedKeys(expandedKeys);
-  // }
-
-  const onChange=async (value, label, extra)=>{
-
-   // let vals =[];
-   //  if(Array.isArray(value)){
-   //    vals=value;
-   //  }else{
-   //    vals=[value]
-   //  }
-   //  let nodes= TreeUtils.getNodesOfKey({children:treeData},value);
-   //  let values:string[]=[];
-   //  if(nodes){
-   //    nodes.forEach(n=>{
-   //      if(valueOnly){
-   //        values.push(n.name)
-   //      }else{
-   //        values.push(n.code+"@R@"+n.name)
-   //      }
-   //
-   //    })
-   //  }
-   //  if(props.onChange){
-   //    props.onChange(values);
-   //  }
-   //  console.log(nodes)
-  }
-
-  function getValue() {
-    if(value){
-      //获取checkkey
-        let codes:string[]=[];
-        let names:string[]=[];
-      value.forEach(c=>{
-          codes.push(c.split("@R@")[0]) ;
-          names.push(c.split("@R@")[1]);
-        })
-       let val= TreeUtils.getNodeKeys(treeData,codes);
-        if(!val || val.length==0){
-          return names;
-        }else{
-          return val;
-        }
-      }
-    return value;
-  }
-
-  return <TmplTree
-      // doEditRoot={this.onEditRoot}
-      // doEditSub={this.onEditSub}
-      // doDelete={this.onDelete}
-      // doViewRoot={this.onViewRoot}
-      // doViewSub={this.onViewSub}
-      // doAddSub={this.onAddSub}
-      onClickNode={(node)=>{
-          if(!ttmplConfig.allSameModel && !node.isLeaf){
-              return;
-          }
-          let value=node.code;
-         if( fieldConfig.extControlType=="ltree-entity-select" ){
-             value=node.code+"@R@"+node.name;
-         } else if(fieldConfig.extControlType=="ltree-entity-select-value"){
-             value=node.name;
-         }
-
-          props.onChange(value);
-      }}
-      ttmplNodeConfig={ttmplNodeConfig}
-      ref={refTmplTree}
-  ></TmplTree>
-
-}
-
+import React, {useEffect, useState} from "react";
+import { Empty,  Spin, TreeSelect} from "antd";
+import TreeUtils, { TtmplNodeConfig } from "../../tree/tree-utils";
+import {EControlProps, TtmplConfig} from "../../tmpl/interface";
+import HCDataSource from "../../tmpl/hc-data-source";
+import TmplTree from "../../tree/tmpl-tree";
+
+
+interface NavigationTreeProps extends EControlProps {
+  //onLeafClick:(code:string,title:string) => void;
+}
+
+const NavigationTree=(props:NavigationTreeProps)=> {
+
+  const {fieldConfig,serverKey,value}=props
+  const [ttmplConfig, setTtmplConfig] = useState<TtmplConfig>(undefined);
+  const [ttmplNodeConfig, setTtmplNodeConfig] = useState<TtmplNodeConfig>(undefined);
+  const [expandedKeys,setExpandedKeys]=useState(undefined);
+  const [treeData,setTreeData] =useState([]);
+  const [loading,setLoading] =useState(true);
+  // const [treeLoadedKeys,setTreeLoadedKeys] =useState([]);
+   const refTmplTree: any = React.createRef();
+  useEffect( () => {
+    const getttmplConfig= async () =>{
+      let ttmplConfig=  await HCDataSource.requestTtmplConfig(
+          serverKey,
+          fieldConfig.id);
+      let ttmplNodeConfig = await TreeUtils.initTtmplNodeConfig(ttmplConfig);
+      setTtmplConfig(ttmplConfig);
+      setTtmplNodeConfig(ttmplNodeConfig);
+      loadRootNodeData(ttmplNodeConfig);
+    }
+    getttmplConfig();
+  const loadRootNodeData = async (ttmplNodeConfig) => {
+      const data=await TreeUtils.loadRootNodeData(ttmplNodeConfig);
+      setTreeData(data);
+    setLoading(false);
+   }
+  }, [fieldConfig]);
+
+  const loadData=async (node)=>{
+    let v = await TreeUtils.reloadData(node.code,ttmplNodeConfig,treeData,expandedKeys);
+    setTreeData(v.data);
+    setLoading(false);
+    setExpandedKeys(v.expandedKeys);
+  }
+
+  // const onTreeExpand=async (expandedKeys)=>{
+  //   setExpandedKeys(expandedKeys);
+  // }
+
+  const onChange=async (value, label, extra)=>{
+
+   // let vals =[];
+   //  if(Array.isArray(value)){
+   //    vals=value;
+   //  }else{
+   //    vals=[value]
+   //  }
+   //  let nodes= TreeUtils.getNodesOfKey({children:treeData},value);
+   //  let values:string[]=[];
+   //  if(nodes){
+   //    nodes.forEach(n=>{
+   //      if(valueOnly){
+   //        values.push(n.name)
+   //      }else{
+   //        values.push(n.code+"@R@"+n.name)
+   //      }
+   //
+   //    })
+   //  }
+   //  if(props.onChange){
+   //    props.onChange(values);
+   //  }
+   //  console.log(nodes)
+  }
+
+  function getValue() {
+    if(value){
+      //获取checkkey
+        let codes:string[]=[];
+        let names:string[]=[];
+      value.forEach(c=>{
+          codes.push(c.split("@R@")[0]) ;
+          names.push(c.split("@R@")[1]);
+        })
+       let val= TreeUtils.getNodeKeys(treeData,codes);
+        if(!val || val.length==0){
+          return names;
+        }else{
+          return val;
+        }
+      }
+    return value;
+  }
+
+  return <TmplTree
+      // doEditRoot={this.onEditRoot}
+      // doEditSub={this.onEditSub}
+      // doDelete={this.onDelete}
+      // doViewRoot={this.onViewRoot}
+      // doViewSub={this.onViewSub}
+      // doAddSub={this.onAddSub}
+      onClickNode={(node)=>{
+          if(!ttmplConfig.allSameModel && !node.isLeaf){
+              return;
+          }
+          let value=node.code;
+         if( fieldConfig.extControlType=="ltree-entity-select" ){
+             value=node.code+"@R@"+node.name;
+         } else if(fieldConfig.extControlType=="ltree-entity-select-value"){
+             value=node.name;
+         }
+
+          props.onChange(value);
+      }}
+      ttmplNodeConfig={ttmplNodeConfig}
+      ref={refTmplTree}
+  ></TmplTree>
+
+}
+
 export default NavigationTree;