aldehyde 0.2.228 → 0.2.231

package/package.json

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

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

@@ -132,26 +132,24 @@ export default class PopoverEntitySelect extends React.PureComponent<
     return (
       <>
         <Popover
-          overlayClassName={"-popover"}
+            //classNames={{ root: "-popover" }}
           placement="bottom"
-          color={"#f0f0f0"}
-          overlayStyle={{
-            maxWidth: "calc(100vw - 60px)",
+           color={"#f0f0f0"}
+          styles={{root:{
+            maxWidth: "calc(100vw - 20vw)",
             maxHeight: "calc(100vh - 50px)",
-          }}
-          overlayInnerStyle={{ padding: "0px" }}
-          // getPopupContainer={(triggerNode) => {
-          //        return triggerNode.parentNode;}}
+          },body:{ padding: "1px"}}}
+
           content={
             <div
               style={{
-                height: 300,
+                height: 350,
                 backgroundColor: "#fafafa",
                 overflow: "auto",
                 borderStyle: "solid",
                 borderRadius: "6px",
-                borderWidth: "0px",
-                borderColor: "#8c8c8c",
+                borderWidth: "2px",
+                 borderColor: "#d9d9d9",
               }}
             >
                 <SelectTable
@@ -174,7 +172,6 @@ export default class PopoverEntitySelect extends React.PureComponent<
             placeholder={translate("${请选择}${" + fieldConfig.title + "}")}
             notFoundContent={translate("${请选择}")}
             allowClear={true}
-            showArrow={true}
             suffixIcon={<SearchOutlined />}
             dropdownStyle={{ display: "none" }}
             onChange={(value) => {

package/src/aldehyde/controls/entry-control.tsx

@@ -18,6 +18,7 @@ import { LockOutlined } from "@ant-design/icons";
 import DatePicker from "./date-picker";
 import Select from "./select";
 import FieldHistory from "./field-history";
+import TreeEntitySelect from "./tree-select/tree-entity-select";
 
 // const CheckboxGroup = Checkbox.Group;
 const RadioGroup = Radio.Group;
@@ -304,6 +305,7 @@ function renderControl(
       );
       break;
     case "relselectvalue":
+    case "entity-select-value":
       entryControl = (
           <EntitySelect valueOnly={true}
               baseCriteria={fieldConfig.baseCriteria}
@@ -328,6 +330,24 @@ function renderControl(
         />
       );
       break;
+    case "tree-entity-select":
+      entryControl = (
+          <TreeEntitySelect
+              baseCriteria={fieldConfig.baseCriteria}
+              maxSelected={max ? parseInt(max) : undefined}
+              {...controlProps}
+          />
+      );
+      break;
+    case "tree-entity-select-value":
+      entryControl = (
+          <TreeEntitySelect valueOnly={true}
+              baseCriteria={fieldConfig.baseCriteria}
+              maxSelected={max ? parseInt(max) : undefined}
+              {...controlProps}
+          />
+      );
+      break;
     case "progress":
       entryControl = <Progress {...controlProps}></Progress>;
       break;

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

@@ -0,0 +1,113 @@
+import React, {useEffect, useState} from "react";
+import {Card, Layout, TreeSelect, Typography} from "antd";
+import TmplTree from "../../tree/tmpl-tree";
+import TreeUtils, { TtmplNodeConfig } from "../../tree/tree-utils";
+import {EControlProps, TtmplConfig} from "../../tmpl/interface";
+import {DtmplEditCard, DtmplViewCard, HydrocarbonService} from "../../index";
+import HcserviceV3 from "../../tmpl/hcservice-v3";
+import { LocaleContext } from "../../locale/LocaleProvider";
+import HCDataSource from "../../tmpl/hc-data-source";
+import ActTree from "../../tree/act-tree";
+
+
+interface TreeEntitySelectProps extends EControlProps {
+  maxSelected?: number;
+  onEntityClick?: (code: string) => void;
+  baseCriteria: object;
+  valueOnly?:boolean;
+  treeOpen?:boolean
+}
+
+// interface SelectTreeState {
+//   ttmplNodeConfig?: TtmplNodeConfig;
+//   showEdit?: boolean;
+//   showView?: boolean;
+//   recordCode?: string;
+//   mainCode?: string;
+//   sourceId?: string;
+//   cardtitle?: string;
+//   addTmplId?: string;
+// }
+
+const TreeEntitySelect=(props:TreeEntitySelectProps)=> {
+
+  const {fieldConfig,serverKey,value,treeOpen,valueOnly}=props
+  //const [ttmplNodeConfig, setTtmplNodeConfig] = useState<TtmplConfig>(undefined);
+  const [ttmplNodeConfig, setTtmplNodeConfig] = useState<TtmplNodeConfig>(undefined);
+  const [expandedKeys,setExpandedKeys]=useState(undefined);
+  const [treeData,setTreeData] =useState([]);
+  const [treeLoadedKeys,setTreeLoadedKeys] =useState([]);
+
+  useEffect( () => {
+    const getttmplConfig= async () =>{
+      let ttmplConfig=  await HCDataSource.requestTtmplConfig(
+          serverKey,
+          fieldConfig.id);
+      let ttmplNodeConfig = await TreeUtils.initTtmplNodeConfig(ttmplConfig);
+      setTtmplNodeConfig(ttmplNodeConfig);
+      loadRootNodeData(ttmplNodeConfig);
+    }
+    getttmplConfig();
+  const loadRootNodeData = async (ttmplNodeConfig) => {
+      const data=await TreeUtils.loadRootNodeData(ttmplNodeConfig);
+    setTreeData(data);
+    }
+
+  }, [fieldConfig]);
+
+  const loadData=async (node)=>{
+    let v = await TreeUtils.reloadData(node.code,ttmplNodeConfig,treeData,expandedKeys);
+    setTreeData(v.data);
+    setExpandedKeys(v.expandedKeys);
+  }
+
+  const onTreeExpand=async (expandedKeys)=>{
+
+    setExpandedKeys(expandedKeys);
+  }
+
+  const onChange=async (value, label, extra)=>{
+
+  // let nodes= TreeUtils.getNodesOfArrayNode(treeData,[value]);
+    let nodes= TreeUtils.getNodesOfKey({children:treeData},[value]);
+    let values:string[]=[];
+    if(nodes){
+      debugger
+      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[]=[];
+      value.forEach(c=>{
+          codes.push(c.split("@R@")[0]) ;
+        })
+       return TreeUtils.getNodeKeys(treeData,codes);
+      }
+    return undefined;
+  }
+
+  return <TreeSelect open ={treeOpen} allowClear value={getValue()}
+                     onChange={onChange}
+                     style={{width:'180px'}}
+                     treeExpandedKeys={expandedKeys}
+                     treeData={treeData}
+                     loadData={loadData}
+                     onTreeExpand={onTreeExpand}/>
+
+}
+
+export default TreeEntitySelect;

package/src/aldehyde/layout/MainPage.tsx

@@ -312,7 +312,7 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
               <Header toggle={this.toggle} {...this.state} />
               <Content
                 style={{
-                  margin: "24px 16px 0",
+                  margin: "12px 16px 0",
                   overflow: "initial",
                   minHeight: "calc(100vh)",
                   minWidth: 760,

package/src/aldehyde/module/dtmpl-edit-page.tsx

@@ -32,6 +32,7 @@ interface ModalEditorProps extends DtmplBaseProps {
   pageType: PageType;
   placement?: "top" | "right" | "bottom" | "left";
   title?: ReactNode;
+  extendButtons?:ReactNode[];
 }
 
 interface ModalEditorState {

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

@@ -11,11 +11,11 @@ import {
   Drawer,
   Modal,
   Tooltip,
-  message,
+  message, Statistic, Layout,
 } from "antd";
 import Table from "./control-table-x-axis-wrapper";
 import {
-  DownloadOutlined,
+  DownloadOutlined,SettingOutlined,
   FundOutlined,
   LineChartOutlined,
   PlusCircleOutlined,
@@ -59,7 +59,9 @@ import BlockMenuTreeDrawer from "../module/block-menu-tree-drawer";
 import ModelSelectTable from "./../table/modal-select-table";
 import ColumnBuilder from "./column/column-builder";
 import ReportTable from "./report-table";
+import EntryControl from "../controls/entry-control";
 
+const { Content, Sider } = Layout;
 type Level = "l1" | "l2";
 
 const defaultDisabledColIds: string[] = ["20000", "10000"];
@@ -940,6 +942,17 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           ) : (
             ""
           )}
+          <Tooltip title={translate("${常用配置}")}>
+            <Button
+                className="hoverbig"
+                onClick={() => {
+                  //doSearch(null);
+                }}
+            >
+              <SettingOutlined  />
+            </Button>
+          </Tooltip>
+
         </Space>
       </>
     );
@@ -1102,75 +1115,110 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           ""
         )}
         <div className="actTable">
-          {funcMode == "complete" || funcMode == "common" ? (
-            collapsible ? null : (
-              <span>
+        <Row>
+          <Col span={24}>
+            {funcMode == "complete" || funcMode == "common" ? (
+                collapsible ? null : (
+                    <span>
                 {ltmplConfig.header ? (
-                  <div
-                    style={{ padding: "6px" }}
-                    dangerouslySetInnerHTML={{ __html: ltmplConfig.header }}
-                  ></div>
+                    <div
+                        style={{ padding: "6px" }}
+                        dangerouslySetInnerHTML={{ __html: ltmplConfig.header }}
+                    ></div>
                 ) : null}
-                <h3>
+                      <h3 >
                   {" "}
-                  {!title
-                    ? translate("${" + ltmplConfig.title + "}")
-                    : typeof title == "string"
-                    ? translate("${" + title + "}")
-                    : title}
-                  {/*{translate("${" + (title ? title : ltmplConfig.title) + "}")}*/}
-                  <p className="fr">{this.renderHeaderButtons()}</p>
+                        <p style={{position:"relative",float: "left",marginBottom:"4px"}}> {!title
+                            ? translate("${" + ltmplConfig.title + "}")
+                            : typeof title == "string"
+                                ? translate("${" + title + "}")
+                                : title}</p>
+                        {/*{translate("${" + (title ? title : ltmplConfig.title) + "}")}*/}
+                        {/*<div style={{maxWidth:"600px",position:"relative",overflow:"auto",float: "left",marginTop:"-18px",marginLeft:"20px"}}>*/}
+                        {/*<Space size={"large"} style={{}}>*/}
+                        {/*  <Statistic title="Active Users" value={112893} />*/}
+                        {/*<Statistic title="Active Users" value={112893} /><Statistic title="Active Users" value={112893} />*/}
+                        {/*<Statistic title="Active Users" value={112893} />*/}
+                        {/*<Statistic title="Active Users" value={112893} />*/}
+                        {/*<Statistic title="Active Users" value={112893} />*/}
+                        {/*<Statistic title="Active Users" value={112893} />*/}
+                        {/*<Statistic title="Active Users" value={112893} /><Statistic title="Active Users" value={112893} />*/}
+                        {/*  <Statistic title="Active Users" value={112893} />*/}
+                        {/*  <Statistic title="Active Users" value={112893} />*/}
+                        {/*  <Statistic title="Active Users" value={112893} />*/}
+                        {/*  <Statistic title="Active Users" value={112893} />*/}
+                        {/*  <Statistic title="Active Users" value={112893} />*/}
+                        {/*  <Statistic title="Active Users" value={112893} />*/}
+                        {/*</Space></div>*/}
+                        <p className="fr" style={{marginBottom:"4px"}}>{this.renderHeaderButtons()}</p>
                 </h3>
               </span>
-            )
-          ) : null}
-          {displayCriteriaCard ? this.renderCriteriaForm() : null}
-          {loading ? (
-            <Table loading={loading}></Table>
-          ) : (tableType =="report"?<ReportTable
-                      tableProps={{scrollY:ltmplConfig.scrollY,clickDisplayTotal:!ltmplConfig.directShowTotal}}
-                      serverKey={serverKey} hiddenColIds={hiddenColIds}
-                      maxSelectedRows={this.checkBoxUseful() ? 1000 : -1}
-                      columns={tableColumns}
-                      selectedRows={selectedRows}  queryKey={queryKey}
-                      onChangeRowSelection={this.changeRowSelection}
-                      leftFixedCols={ltmplConfig.leftFixedCols}
-                  />:
-            <QueryTable
-                tableProps={{scrollY:ltmplConfig.scrollY,clickDisplayTotal:!ltmplConfig.directShowTotal}}
-              serverKey={serverKey}
-              onChangePage={onChangePage}
-              viewModels={viewModels}
-              primaryColumn={ltmplConfig.primaryColumn}
-              columnConfigs={columnConfigs}
-              summaryConfigs={ltmplConfig.totalColumnConfigs}
-              maxSelectedRows={this.checkBoxUseful() ? 10000 : -1}
-              selectedRows={selectedRows}
-              columns={tableColumns}
-              hiddenRowCodes={hiddenRowCodes}
-              pageInfo={{
-                pageNo: pageNo ? pageNo : 1,
-                pageSize: pageSize ? pageSize : ltmplConfig.defaultPageSize,
-              }}
-              queryKey={queryKey}
-              onChangeRowSelection={this.changeRowSelection}
-              subtotalXColumn={
-                ltmplConfig.subtotalXColumn == null ||
-                ltmplConfig.subtotalXColumn.length <= 0
-                  ? null
-                  : ltmplConfig.subtotalXColumn
-              }
-              subtotalYColumn={
-                ltmplConfig.subtotalYColumn == null ||
-                ltmplConfig.subtotalYColumn.length <= 0
-                  ? null
-                  : ltmplConfig.subtotalYColumn
-              }
-              groupIColumns={ltmplConfig.groupIColumns}
-              doSearch={doSearch}
-              sortColumnData={sortColumnData}
-            />
-          )}
+                )
+            ) : null}
+          </Col>
+        </Row>
+          {(<Row><Col span={24}><Layout hasSider style={{ backgroundColor: "#fff" }}>
+            <Sider
+                width={0}
+                theme={"light"}
+                style={{
+                  paddingRight:'0px'
+                  // height: "90vh",
+                  // position: "fixed",
+                  // left: 0,
+                  // top: 126,
+                  // bottom: 0,
+                  // marginLeft: 210,
+                }}
+            >
+              {/*<EntryControl fieldConfig={{id:"366429642427244544",controlType:"tree-entity-select"}}></EntryControl>*/}
+            </Sider>
+            <Layout style={{ backgroundColor: "#fff" }}>
+              <Content style={{ overflow: "initial" }}>
+                {displayCriteriaCard ? this.renderCriteriaForm() : null}
+                { loading ? (
+                    <Table loading={loading}></Table>
+                ) : (tableType =="report"?<ReportTable
+                  tableProps={{scrollY:ltmplConfig.scrollY,clickDisplayTotal:!ltmplConfig.directShowTotal}}
+                  serverKey={serverKey} hiddenColIds={hiddenColIds}
+                  maxSelectedRows={this.checkBoxUseful() ? 1000 : -1}
+                  columns={tableColumns}
+                  selectedRows={selectedRows}  queryKey={queryKey}
+                  onChangeRowSelection={this.changeRowSelection}
+                  leftFixedCols={ltmplConfig.leftFixedCols}
+              />:
+                <QueryTable
+                    tableProps={{scrollY:ltmplConfig.scrollY,clickDisplayTotal:!ltmplConfig.directShowTotal}}
+                    serverKey={serverKey}
+                    onChangePage={onChangePage}
+                    viewModels={viewModels}
+                    primaryColumn={ltmplConfig.primaryColumn}
+                    columnConfigs={columnConfigs}
+                    summaryConfigs={ltmplConfig.totalColumnConfigs}
+                    maxSelectedRows={this.checkBoxUseful() ? 10000 : -1}
+                    selectedRows={selectedRows}
+                    columns={tableColumns}
+                    hiddenRowCodes={hiddenRowCodes}
+                    pageInfo={{
+                      pageNo: pageNo ? pageNo : 1,
+                      pageSize: pageSize ? pageSize : ltmplConfig.defaultPageSize,
+                    }}
+                    queryKey={queryKey}
+                    onChangeRowSelection={this.changeRowSelection}
+                    subtotalXColumn={
+                      ltmplConfig.subtotalXColumn == null ||
+                      ltmplConfig.subtotalXColumn.length <= 0
+                          ? null
+                          : ltmplConfig.subtotalXColumn
+                    }
+                    groupIColumns={ltmplConfig.groupIColumns}
+                    doSearch={doSearch}
+                    sortColumnData={sortColumnData}
+                />) }
+              </Content>
+            </Layout>
+          </Layout></Col></Row>
+                )}
           {/*此处放页脚*/}
           {ltmplConfig.footer ? (
             <div
@@ -1207,9 +1255,6 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   };
 
 
-
-
-
   render() {
     let {
       queryKey,

package/src/aldehyde/table/column/column-builder.tsx

@@ -133,7 +133,7 @@ export default {
         }
         column["render"] = (text, record) => {
           return (
-              <div className={record['dataType']?record['dataType']=="小计"?"xiaoji":'zongji':""}>
+              <div className={record['dataType']?record['dataType']=="小计"?"xiaoji":'heji':""}>
               <ViewControl
                   serverKey={serverKey}
                   fieldConfig={item}
@@ -244,7 +244,8 @@ export default {
         column["width"] = item.colWidth ? item.colWidth : 50;
         column["title"] = translate("${序号}");
         column["align"] = item.valueAlign ? item.valueAlign : "center";
-        column["render"] = (text, record, index) => <label className={record['dataType']?record['dataType']=="小计"?"xiaoji":'zongji':""}>{record[item.id]}</label>;
+        column["render"] = (text, record, index) =>
+            <label className={record['dataType']?record['dataType']=="小计"?"xiaoji":'heji':""}>{record[item.id]}</label>;
         item["sorter"] = undefined;
       } else if (item.id == "10000") {
           this.setSortProps(column,item,translate);
@@ -271,7 +272,7 @@ export default {
         }
         column["render"] = (text, record) => {
           return (
-              <div className={record['dataType']?record['dataType']=="小计"?"xiaoji":'zongji':""}>
+              <div className={record['dataType']?record['dataType']=="小计"?"xiaoji":'heji':""}>
                 <ViewControl
                     // serverKey={serverKey}
                     fieldConfig={item}