aldehyde 0.2.130 → 0.2.132

package/src/aldehyde/layout/sidebar/index.tsx

@@ -8,6 +8,8 @@ import { Image, theme } from "antd";
 import logo from "./logo.png";
 import { useLocale } from "../../locale/useLocale";
 interface SideBarProps extends Menu2layersProps {
+  header?:any;
+  collapsedHeader?:any;
   title?: string;
   logo?: any;
 }
@@ -18,7 +20,7 @@ const SideBar: React.FC<SideBarProps> = (props) => {
   const { translate } = useLocale();
   const { token } = useToken();
   let syyy = { "--logo-blue-background": token.colorPrimary } as CSSProperties;
-  let { collapsed } = props;
+  let { collapsed,header,collapsedHeader } = props;
   return (
     <div>
       <Scrollbars
@@ -28,41 +30,49 @@ const SideBar: React.FC<SideBarProps> = (props) => {
       >
         <div className={collapsed ? "logonly" : "logo-blue"} style={syyy}>
           <a href="#/home">
-            {collapsed ? (
-              props.logo ? (
-                <Image src={props.logo} />
-              ) : (
-                <h1
-                  style={{
-                    overflow: "hidden",
-                    height: "56px",
-                    paddingLeft: "-20px",
-                  }}
-                >
-                  M
-                </h1>
-              )
-            ) : (
-              <>
-                <h1
-                  style={{
-                    overflow: "hidden",
-                    height: "56px",
-                    paddingLeft: "-20px",
-                  }}
-                >
-                  <>
-                    {props.logo ? (
-                      <Image width={"30px"} src={props.logo} />
-                    ) : (
-                      <></>
-                    )}
-                    {translate(
-                      props.title ? props.title : Units.programName_NavLeft()
-                    )}
-                  </>
-                </h1>
-              </>
+            {collapsed ?( collapsedHeader ? <div style={{
+                      overflow: "hidden",
+                      height: "56px",
+                      padding:"2px"
+                    }}>{collapsedHeader}</div>:
+                props.logo ?
+                    <Image src={props.logo}/>
+                 : (
+                    <h1
+                        style={{
+                          overflow: "hidden",
+                          height: "56px",
+                          paddingLeft: "-20px",
+                        }}
+                    >
+                      M
+                    </h1>
+                )
+            ) : (header ? <div style={{
+                      overflow: "hidden",
+                      height: "56px",
+                      padding: "2px"
+                    }}>{header}</div> :
+                    <>
+                      <h1
+                          style={{
+                            overflow: "hidden",
+                            height: "56px",
+                            paddingLeft: "-20px",
+                          }}
+                      >
+                        <>
+                          {props.logo ? (
+                              <Image width={"30px"} src={props.logo}/>
+                          ) : (
+                              <></>
+                          )}
+                          {translate(
+                              props.title ? props.title : Units.programName_NavLeft()
+                          )}
+                        </>
+                      </h1>
+                    </>
             )}
           </a>
         </div>

package/src/aldehyde/login/router-login.tsx

@@ -4,62 +4,84 @@ import "./index.css";
 import withRouter from "../routable/withroute";
 import Login from "./login";
 import HCDataSource from "../tmpl/hc-data-source";
-import { Col, Row } from "antd";
-import { useLocale } from "../locale/useLocale";
+import {Col, Row, theme} from "antd";
+import {useLocale} from "../locale/useLocale";
 import LocaleButton from "../locale/LocaleButton";
 
+const {useToken} = theme;
+
 interface RLoginitProps {
-  params: object;
-  autoSaveUser?: boolean;
+    params: object;
+    autoSaveUser?: boolean;
+    theme?: any;
+    themePosition?: "left" | "center" | "right"|undefined
 }
 
-interface RLoginitState {}
+interface RLoginitState {
+}
 
 const RouterLogin = (props: RLoginitProps) => {
-  const { params, autoSaveUser } = props;
+    const {token} = useToken();
+    const {params, autoSaveUser, themePosition, theme} = props;
+
+    const {translate} = useLocale();
+    Units.setProgramCode4RoutePath(params);
+
+    const getLogin = () => {
+        return <Login
+            onFinish={(token) => {
+                HCDataSource.clear();
+                window.location.hash = "#/context-setter";
+                Units.setHydrocarbonToken(token);
+            }}
+            title={<h3>{translate("${欢迎登录}")}</h3>}
+            autoSaveUser={autoSaveUser}
+        />
+    }
+    const getContent = () => {
+        if (themePosition) {
+            if (themePosition == "left") {
+                return <>
+                    <Col span={12}>{theme}</Col>
+                    <Col span={12}>{getLogin()} </Col>
+                </>
+            }
+        } else {
+            return <><Col>{getLogin()}</Col></>
+        }
+    }
 
-  const { translate } = useLocale();
-  Units.setProgramCode4RoutePath(params);
-  return (
-    <Row justify="center" align="middle" className="login-blue">
-      <Col>
-        <Login
-          onFinish={(token) => {
-            HCDataSource.clear();
-            window.location.hash = "#/context-setter";
-            Units.setHydrocarbonToken(token);
-          }}
-          title={<h3>{translate("${欢迎登录}")}</h3>}
-          autoSaveUser={autoSaveUser}
-        />{" "}
-      </Col>
-    </Row>
-  );
+    return (
+        <Row justify="center" align="middle" className="login-blue"
+             style={{background: token.colorPrimary}}>
+            {getContent()}
+        </Row>
+    );
 };
 
 const I18nLogin = (props: RLoginitProps) => {
-  return (
-    <div
-      style={{
-        position: "relative",
-        width: "100%",
-        height: "100%",
-      }}
-    >
-      <div
-        style={{
-          position: "absolute",
-          top: "10px",
-          right: "10px",
-          zIndex: "10000",
-        }}
-      >
-        <LocaleButton size="large"></LocaleButton>
-      </div>
+    return (
+        <div
+            style={{
+                position: "relative",
+                width: "100%",
+                height: "100%",
+            }}
+        >
+            <div
+                style={{
+                    position: "absolute",
+                    top: "10px",
+                    right: "10px",
+                    zIndex: "10000",
+                }}
+            >
+                <LocaleButton size="large"></LocaleButton>
+            </div>
 
-      <RouterLogin {...props} />
-    </div>
-  );
+            <RouterLogin {...props} />
+        </div>
+    );
 };
 
 export default withRouter(I18nLogin);

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

@@ -168,6 +168,7 @@ export default class DtmplEditPage extends React.PureComponent<
     if (code) {
       this.setState({
         loading: true,
+        dtmplData:undefined,
       });
 
       const dtmplData_: DtmplData = await HcserviceV3.getDtmplData(

package/src/aldehyde/module/dtmpl-editor.tsx

@@ -109,6 +109,7 @@ export default class DtmplEditPage extends React.PureComponent<ModalEditorProps,
         if (code) {
             this.setState({
                 loading: true,
+                dtmplData:undefined,
             })
             const dtmplData_:DtmplData=await HcserviceV3.getDtmplData(dtmplConfig,serverKey,sourceId, code);
             this.setState({

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

@@ -94,6 +94,7 @@ export default class EmbedDtmplEditPage extends React.PureComponent<EmbedDtmplEd
         if (code) {
             this.setState({
                 loading: true,
+                dtmplData:undefined,
             })
             const dtmplData_:DtmplData=await HcserviceV3.getDtmplData(dtmplConfig,serverKey,sourceId, code);
             this.setState({

package/src/aldehyde/table/index.css

@@ -50,18 +50,18 @@
 /*    padding:0px;*/
 /*}*/
 
-.ant-table-cell:has(.xiaoji) {
-  background-color: rgb(225, 250, 235);
-}
+/*.ant-table-cell:has(.xiaoji) {*/
+/*  background-color: rgb(225, 250, 235);*/
+/*}*/
 
-.ant-table-cell:has(.zongji) {
-  background-color: #00b96b;
-}
+/*.ant-table-cell:has(.zongji) {*/
+/*  background-color: #00b96b;*/
+/*}*/
 
-.xiaoji {
-  background-color: rgb(225, 250, 235);
-}
+/*.xiaoji {*/
+/*  background-color: rgb(225, 250, 235);*/
+/*}*/
 
-.zongji {
-  background-color: #00b96b;
-}
+/*.zongji {*/
+/*  background-color: #00b96b;*/
+/*}*/

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

@@ -22,6 +22,7 @@ import Scrollbars from "react-custom-scrollbars";
 import { LocaleContext } from "../locale/LocaleProvider";
 import { BigNumber } from "bignumber.js";
 import Column from "antd/es/table/Column";
+import {ColumnsType} from "antd/es/table";
 const { Panel } = Collapse;
 const SortableItem = SortableElement((props) => <tr {...props} />);
 const SortableBody = SortableContainer((props) => <tbody {...props} />);
@@ -919,28 +920,32 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                 : this.props.columns;
 
               const sumConfigs: {
-                sum: { value: string; id: string }[];
-                avg: { value: string; id: string }[];
+                sum: { value: string; id: string;columnConfig?:any }[];
+                avg: { value: string; id: string;columnConfig?:any }[];
               } = { sum: [], avg: [] };
 
               if (this.getRowSelection()) {
                 sumConfigs["avg"].push({
                   value: "",
                   id: "",
+                  columnConfig:{align:'center'}
                 });
                 sumConfigs["sum"].push({
                   value: "",
                   id: "",
+                  columnConfig:{"align":'center'}
                 });
               }
 
               sumConfigs["sum"].push({
                 value: translate("${合计}"),
                 id: "title",
+                columnConfig:{"align":'center'}
               });
               sumConfigs["avg"].push({
                 value: translate("${均值}"),
                 id: "title",
+                columnConfig:{"align":'center'}
               });
 
               let sumLen = 0,
@@ -950,7 +955,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                 const idx = i,
                   dataIndex = columns[i].dataIndex;
                 if (idx === 0) continue;
-                const sum = { value: "", id: "" };
+                const sum = { value: "", id: "",columnConfig:columns[i] };
                 const sumConfigIdx = summaryConfigs.findIndex(
                   ({ id }) => id === dataIndex
                 );
@@ -1006,8 +1011,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                     <></>
                   ) : (
                     <Table.Summary.Row>
-                      {sumConfigs["sum"].map(({ id, value }, idx) => (
-                        <Table.Summary.Cell index={idx} className="zongji">
+                      {sumConfigs["sum"].map(({ id, value ,columnConfig}, idx) => (
+                        <Table.Summary.Cell align={columnConfig?.align} index={idx} className="zongji">
                           {value}
                         </Table.Summary.Cell>
                       ))}
@@ -1017,8 +1022,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                     <></>
                   ) : (
                     <Table.Summary.Row>
-                      {sumConfigs["avg"].map(({ id, value }, idx) => (
-                        <Table.Summary.Cell index={idx} className="zongji">
+                      {sumConfigs["avg"].map(({ id, value,columnConfig }, idx) => (
+                        <Table.Summary.Cell align={columnConfig?.align} index={idx} className="zongji">
                           {value}
                         </Table.Summary.Cell>
                       ))}

package/src/aldehyde/tmpl/control-type-supportor.tsx

@@ -23,6 +23,10 @@ SupportInputTypes.add('timerange-mm');
 SupportInputTypes.add('time');
 SupportInputTypes.add('timerange');
 
+SupportInputTypes.add('timerange-HH-unorder');
+SupportInputTypes.add('timerange-mm-unorder');
+SupportInputTypes.add('timerange-unorder');
+
 SupportInputTypes.add('text');
 SupportInputTypes.add('textarea');
 SupportInputTypes.add('html');
@@ -34,6 +38,7 @@ SupportInputTypes.add('select');
 SupportInputTypes.add('multiselect');
 SupportInputTypes.add('checkbox');
 SupportInputTypes.add('radio');
+SupportInputTypes.add('yes-no-select');
 SupportInputTypes.add('yes-no-radio');
 SupportInputTypes.add('yes-no-switch');
 SupportInputTypes.add('caselect');

package/src/aldehyde/units/index.tsx

@@ -659,14 +659,17 @@ export default {
                 break;
             case 'time-HH':
             case 'timerange-HH':
+            case 'timerange-HH-unorder':
                 format = 'HH';
                 break;
             case 'time-mm':
             case 'timerange-mm':
+            case 'timerange-mm-unorder':
                 format = 'HH:mm';
                 break;
             case 'time':
             case 'timerange':
+            case 'timerange-unorder':
                 format = 'HH:mm:ss';
                 break;
         }