aldehyde 0.2.214 → 0.2.216

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

@@ -69,10 +69,10 @@ function renderControl(
     holderType = "descriptions";
   }
 
-  const colNum = fieldConfig.colNum;
+  const colSpan = fieldConfig.colSpan;
   let scalableWidth = width;
-  if (colNum == 2) {
-    scalableWidth = width * colNum * 1.52;
+  if (colSpan == 2) {
+    scalableWidth = width * colSpan * 1.52;
   }
   let viewControl = undefined;
 
@@ -80,7 +80,8 @@ function renderControl(
     ? translate("${请输入}${" + fieldConfig.title + "}")
     : translate("${无需输入}");
   let disabled: boolean = fieldConfig.disabled;
-  let value = fieldValue
+
+  let value = fieldValue || fieldValue==0
     ? fieldValue
     : fieldConfig.defaultValue &&
       !Units.isConfigDefaultValue(fieldConfig.defaultValue)
@@ -108,7 +109,8 @@ function renderControl(
       {translate("${暂未完成}-${" + itemType + "}")}
     </span>
   );
-  if (!value || value == "null" || value.toString().includes("@R@null")) {
+
+  if (value !=0 && (!value  || value == "null" || value.toString().includes("@R@null"))) {
     viewControl = <></>;
   } else {
     switch (itemType) {

package/src/aldehyde/detail/edit/dtmpl-edit.tsx

@@ -105,7 +105,6 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
             code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
         }
 
-        debugger
         if(dtmplConfig.autoSaveInterval && dtmplConfig.autoSaveInterval>0){
             if(this.autoSaveInterval){
                 clearInterval(this.autoSaveInterval);
@@ -225,7 +224,7 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
 
     render() {
         const {dtmplConfig, showPostResult,loading,id,serial,dtmplData} = this.state;
-        debugger
+
         //console.log(" dtmpl edit serial:",serial);
         const { sourceId, showRightNav, code,addOrUpdate,maxColsOnRow,mainCode,serverKey} = this.props;
         //const {title} = dtmplConfig;

package/src/aldehyde/detail/view/field-view-group.tsx

@@ -50,7 +50,7 @@ export default class FieldViewGroup extends React.PureComponent<
           const formItem = (
             <Descriptions.Item
               label={translate("${" + item.title + "}")}
-              span={item.colNum}
+              span={item.colSpan}
               key={index}
               className="labelcss"
             >

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

@@ -176,7 +176,7 @@ export default class DtmplForm extends React.PureComponent<
     } = this.state;
     dtmplData.fieldMap={...values}
     let resultCode = undefined;
-    debugger
+    //debugger
     const result = values;
     for (let group of dtmplConfig.groups) {
       if (group.type == "embed" && group.embedType != "列表") {

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

@@ -91,14 +91,14 @@ export default class FormItemGroup extends React.PureComponent<
         labelCol={
           maxColsOnRow == 1
             ? { span: 6 }
-            : item.colNum == 1
+            : item.colSpan == 1
             ? { span: 6 }
             : { span: 3 }
         }
         wrapperCol={
           maxColsOnRow == 1
             ? { span: 18 }
-            : item.colNum == 1
+            : item.colSpan == 1
             ? { span: 15 }
             : { span: 19 }
         }
@@ -182,15 +182,15 @@ export default class FormItemGroup extends React.PureComponent<
     const colList = [];
 
     for (let i = 0; i < formItemList.length; i = i + 1) {
-      let colNum = fields[i].colNum;
+      let colSpan = fields[i].colSpan;
 
       if (fields[i].extControlType == "hidden") {
-        colNum = 0;
+        colSpan = 0;
       } else if (maxColsOnRow && maxColsOnRow == 1) {
-        colNum = 2;
+        colSpan = 2;
       }
       let col = (
-        <Col key={i} span={12 * colNum } >
+        <Col key={i} span={12 * colSpan } >
           {formItemList[i]}
         </Col>
       );

package/src/aldehyde/index.tsx

@@ -45,6 +45,8 @@ import DtmplRoute from "./routable/dtmpl-route";
 // const DtmplRoute = loadable(() =>
 //     import("./routable/dtmpl-route"), {fallback: Loading});
 import ImportRoute from "./routable/import-route";
+
+
 // const ImportRoute = loadable(() =>
 //     import("./routable/import-route"), {fallback: Loading});
 import LtmplRoute from "./routable/ltmpl-route";

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

@@ -7,6 +7,8 @@ import L2MenuMessageBar from "../menu/l2menu-message-bar";
 import L2MenuQuickBar from "../menu/l2menu-quick-bar";
 import UserBar from "../menu/user-bar";
 import LocaleButton from "../../locale/LocaleButton";
+import {generate} from "@ant-design/colors";
+import ReactDOMServer from "react-dom/server";
 
 const { Header: AntdHeader } = Layout;
 
@@ -18,12 +20,15 @@ interface HeaderProps extends BlockProps {
 interface HeaderState {}
 
 const { useToken } = theme;
+
 const Header: React.FC<HeaderProps> = (props) => {
   const { token } = useToken();
   let { collapsed } = props;
+
   const syyy: CSSProperties = {
     "--antd-color-primary": token.colorPrimary,
   } as CSSProperties;
+
   return (
     <AntdHeader  style={{position: 'sticky',
         top: 0,
@@ -142,4 +147,6 @@ const Header: React.FC<HeaderProps> = (props) => {
   );
 };
 
+
+
 export default Header;

package/src/aldehyde/layout/menu/menu-render.tsx

@@ -103,7 +103,10 @@ export default {
                     codeSource = '&codeSource=listop';
                     break;
                 case "导入":
-                    routePath = 'importer';
+                    routePath = "importer";
+                    break;
+                case "报表":
+                    routePath = "report-table";
                     break;
             }
             return `${basePath}/${menu.id}/${routePath}?menuId=${menu.id}${codeSource}${defaultCriteriaData}`;

package/src/aldehyde/layout2/css/header.css

@@ -15,7 +15,7 @@
 }
 
 .ant-menu-submenu-selected > .ant-menu-submenu-title {
-  /* color: #fff !important; */
+  /*color: #fff !important;*/
 }
 
 /* .ant-menu-item-group-list > .ant-menu-item-selected,

package/src/aldehyde/layout2/header.tsx

@@ -12,7 +12,6 @@ import "./css/header.css";
 import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
 import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
 import LocaleButton from "../locale/LocaleButton";
-import UserBar from "../layout/menu/user-bar";
 import UserButton from "./components/userButton";
 import homePng from "./imgs/home.png";
 import { MenuType } from "./type/layout.type";
@@ -24,7 +23,7 @@ import {
 import { useLocale } from "../locale/useLocale";
 import { generate } from "@ant-design/colors";
 import { useLayoutContext } from "./LayoutContext";
-import { set } from "lodash";
+import ThemeColorGetter from "../table/column/theme-color-getter";
 
 type HeaderPropsType = {
   systemName: string;
@@ -277,7 +276,8 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style }) => {
                 subMenuItemBg: colors[4],
                 itemHoverColor: "#fff",
                 itemColor: "#fff",
-                itemSelectedBg: colors[3],
+                itemSelectedBg: colors[2],
+                  subMenuItemSelectedColor: colors[0],
                 itemSelectedColor: "#fff !important",
                 groupTitleColor: "#fff",
                 horizontalItemHoverColor: "#fff",

package/src/aldehyde/layout2/page.tsx

@@ -60,6 +60,9 @@ const handleMenuItemUrl = (
     case "导入":
       routePath = "importer";
       break;
+    case "报表":
+      routePath = "report-table";
+      break;
     default:
       routePath = "";
   }

package/src/aldehyde/locale/LocaleProvider.tsx

@@ -1,4 +1,4 @@
-import { ConfigProvider } from "antd";
+
 import React, { ReactNode, createContext, useEffect, useState } from "react";
 import { useNavigatorLanguage } from "./useLocale";
 import { antdLangMp, getLangWithLangApiMp, getLangWithLangMp } from "./langMp";

package/src/aldehyde/locale/useLocale.ts

@@ -40,6 +40,7 @@ export const useLocale = () => {
     t,
     translate,
     availableLang,
+    getServiceLangStr
   } = useContext(LocaleContext);
 
   return {
@@ -51,6 +52,6 @@ export const useLocale = () => {
     },
     t,
     translate,
-    availableLang,
+    availableLang,getServiceLangStr
   };
 };

package/src/aldehyde/login2/login-page.tsx

@@ -3,11 +3,16 @@ import Login from "./login";
 import LoginBgPng from "./img/login-bg.png";
 import { useLocale } from "../locale/useLocale";
 import HCDataSource from "../tmpl/hc-data-source";
-import Units from "../units";
-import {Button, Col, Row} from "antd";
+import ProgramConfig from "../units";
+import { Col, Row} from "antd";
 import ResetPassword from "../layout/menu/reset-password";
+import {SafetyCertificateTwoTone} from '@ant-design/icons'
+type LoginPageProps = {
+    programName?: string;
+    copyright?: string;
+};
+const LoginPage = (props:LoginPageProps) => {
 
-const LoginPage = () => {
   const { translate } = useLocale();
 
   return (
@@ -36,26 +41,51 @@ const LoginPage = () => {
           aspectRatio: "1/1",
         }}
       >
-        <div
-          style={{
-            fontWeight: 600,
-            fontSize: "30px",
-            color: "#222222",
-            marginBottom: 60,
-          }}
-        >
-          {translate("欢迎, 登录")}
-        </div>
+
+          <div
+              style={{
+                  fontWeight: 600,
+                  fontSize: "30px",
+                  color: "#222222",
+                  marginBottom: 10,
+              }}
+          >
+              {translate("${欢迎,登录}")}
+          </div>
+          <div
+              style={{
+                  fontWeight: 600,
+                  fontSize: "24px",
+                  color: "#222222",
+                  marginBottom: 40,
+              }}
+          >{props.programName=="Aldehyde"?"":
+              <><SafetyCertificateTwoTone />
+              {props.programName?translate("${" + props.programName + "}"): translate("${" + ProgramConfig.programName() + "}")}
+          </>}
+          </div>
         <Login
           onFinish={(token) => {
             HCDataSource.clear();
             window.location.hash = "/v2";
-            Units.setHydrocarbonToken(token);
+              ProgramConfig.setHydrocarbonToken(token);
           }}
         ></Login>
           <Row>
               <Col span={6} offset={18}><ResetPassword showUserName={true}></ResetPassword></Col>
           </Row>
+          <div
+              style={{
+                  fontWeight: 600,
+                  fontSize: "14px",
+                  color: "#999",
+                  marginTop: 40,
+              }}
+          ><Row>
+              <Col>{"版权所有:" + (props.copyright?props.copyright:"浙江恩赫控股集团有限公司")}</Col>
+          </Row>
+
+          </div>
       </div>
     </div>
   );

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

@@ -184,7 +184,6 @@ export default class DtmplEditCard extends React.PureComponent<
           sourceId,
           code
       );
-      debugger
       if( (!this.state.queryingCode  || code == dtmplData_.code) &&
           (!dtmplData_.sourceId  || (this.props.sourceId==dtmplData_.sourceId))){
         this.setState({

package/src/aldehyde/routable/ltmpl-route.tsx

@@ -21,6 +21,7 @@ import DtmplViewModal from "../module/dtmpl-view-modal";
 
 export interface LtmplRouteProps extends RouterCompProps {
     layoutRootPath?: string;
+    tableType?:"common"|"report";
 }
 
 export interface LtmplRouteState {
@@ -42,6 +43,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
 
     static defaultProps = {
         basePath: "",
+        tableType:"common",
     };
     state = {
         ltmplConfigRes: undefined,
@@ -93,7 +95,6 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
     loadData = async () => {
         const {params} = this.props;
         const {sourceId} = params;
-
         let ltmplConfigRes: LtmplConfigRes = await HCDataSource.requestLtmplConfig(
             null,
             sourceId
@@ -237,7 +238,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             const {basePath} = this.props;
             let path = `${basePath}${
                 this.computedLayoutPath
-            }/${ractionId}/act-table?mainCode=${mainCode}&menuId=${this.getMenuId()}`;
+            }/${ractionId}/${this.pathMark()}?mainCode=${mainCode}&menuId=${this.getMenuId()}`;
             this.onRoute(path);
         } else {
             this.setState({
@@ -248,9 +249,13 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         }
     };
 
+    pathMark=()=>{
+        const {tableType} = this.props;
+       return tableType && tableType=="report"?"report-table":"act-table";
+    }
 
     doSearch = (params_) => {
-        const {basePath} = this.props;
+        const {basePath,tableType} = this.props;
         const {sourceId} = this.props.params;
         let params = {
             ...Units.transQueryStrToParams(
@@ -262,7 +267,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
         //params['sourceId'] = sourceId;
         const newfliter = Units.transQueryParamsToStr({...params});
         this.props.navigate(
-            `${basePath}${this.computedLayoutPath}/${sourceId}/act-table?${newfliter}`,
+            `${basePath}${this.computedLayoutPath}/${sourceId}/${this.pathMark()}?${newfliter}`,
             {
                 replace: true,
             }
@@ -307,7 +312,8 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             ltmplConfigRes, showDraw, showWindowType, ractionId, selectedCode,
             showViewDrawer, showViewModal, showEdit
         } = this.state;
-        const {location, params,} = this.props;
+        const {location, params,tableType} = this.props;
+
         const {sourceId} = params;
         const {translate} = this.context;
         //let menuId = undefined;
@@ -333,6 +339,7 @@ class LtmplRoute extends React.PureComponent<LtmplRouteProps, LtmplRouteState> {
             return (
                 <>
                     <ActTable
+                        tableType={tableType}
                         serverKey={null}
                         pageSize={pageSize}
                         pageNo={pageNo}