aldehyde 0.2.126 → 0.2.128

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

@@ -60,8 +60,8 @@ function renderControl(
   width: any,
   other: any
 ) {
-  const { translate } = useLocale();
 
+  const { translate } = useLocale();
   let itemType = ControlTypeSupportor.getControlType(fieldConfig, fieldValue);
   let holderType: ControlHolderType = pHolderType;
   if (!holderType) {
@@ -106,157 +106,159 @@ function renderControl(
       {translate("${暂未完成}-${" + itemType + "}")}
     </span>
   );
-
-  switch (itemType) {
-    case "int":
-    case "decimal":
-    case "float":
-    case "double":
-    case "intrange":
-    case "decimalrange":
-    case "range":
-      viewControl = <span className="infoStyle">{value}</span>;
-      break;
-    case "date-YY":
-    case "date-M1":
-    case "date":
-    case "datetime-HH":
-    case "datetime-mm":
-    case "datetime":
-    case "time-HH":
-    case "time-mm":
-    case "time":
-      viewControl = (
-        <span className="infoStyle">
+  if(!value || value == "null" || value.toString().includes("@R@null") ){
+    viewControl =<></>
+  }else{
+    switch (itemType) {
+      case "int":
+      case "decimal":
+      case "float":
+      case "double":
+      case "intrange":
+      case "decimalrange":
+      case "range":
+        viewControl = <span className="infoStyle">{value}</span>;
+        break;
+      case "date-YY":
+      case "date-M1":
+      case "date":
+      case "datetime-HH":
+      case "datetime-mm":
+      case "datetime":
+      case "time-HH":
+      case "time-mm":
+      case "time":
+        viewControl = (
+            <span className="infoStyle">
           {value
-            ? dayjs(value).format(Units.getDayjsFormat(itemType))=="Invalid Date"?value:
+              ? dayjs(value).format(Units.getDayjsFormat(itemType))=="Invalid Date"?value:
                   dayjs(value).format(Units.getDayjsFormat(itemType))
-            : undefined}
+              : undefined}
         </span>
-      );
-      break;
-    case "daterange-YY":
-    case "daterange-M1":
-    case "daterange":
-    case "datetimerange-HH":
-    case "datetimerange-mm":
-    case "datetimerange":
-    case "timerange-HH":
-    case "timerange-mm":
-    case "timerange":
-      viewControl = <span className="infoStyle">{value}</span>;
-      break;
-    case "text":
-    case "textarea":
-    case "preselect":
-      if (holderType == "table") {
-        viewControl = (
-          <EllipsisText
-            maxWidth={"400px"}
-            isHtml={false}
-            value={value}
-            showMax={fieldConfig.ellipsisLength}
-          ></EllipsisText>
         );
-      } else {
+        break;
+      case "daterange-YY":
+      case "daterange-M1":
+      case "daterange":
+      case "datetimerange-HH":
+      case "datetimerange-mm":
+      case "datetimerange":
+      case "timerange-HH":
+      case "timerange-mm":
+      case "timerange":
         viewControl = <span className="infoStyle">{value}</span>;
-      }
-      break;
-    case "select":
-    case "radio":
-    case "yes-no-switch":
-      viewControl = <EnumBadge {...controlProps} />;
-      break;
-    case "yes-no-radio":
-      viewControl = (
-        <span className="infoStyle">
+        break;
+      case "text":
+      case "textarea":
+      case "preselect":
+        if (holderType == "table") {
+          viewControl = (
+              <EllipsisText
+                  isHtml={false}
+                  value={value}
+                  showMax={fieldConfig.ellipsisLength?fieldConfig.ellipsisLength:28}
+              ></EllipsisText>
+          );
+        } else {
+          viewControl = <span className="infoStyle">{value}</span>;
+        }
+        break;
+      case "select":
+      case "radio":
+      case "yes-no-switch":
+        viewControl = <EnumBadge {...controlProps} />;
+        break;
+      case "yes-no-radio":
+        viewControl = (
+            <span className="infoStyle">
           {value ? (
-            <Badge
-              color={value == translate("${是}") ? "green" : "red"}
-              text={value}
-            />
+              <Badge
+                  color={value == translate("${是}") ? "green" : "red"}
+                  text={value}
+              />
           ) : null}
         </span>
-      );
-      break;
-    case "multiselect":
-    case "checkbox":
-      viewControl = <EnumTags {...controlProps} />;
-      break;
-    case "html":
-      if (holderType == "table") {
-        viewControl = <EllipsisText isHtml={true} value={value}></EllipsisText>;
-      } else {
-        viewControl = <div dangerouslySetInnerHTML={{ __html: value }}></div>;
-      }
-      break;
-    case "steps":
-      viewControl = <Steps {...controlProps} />;
-      break;
-    case "password":
-      if (value) {
+        );
+        break;
+      case "multiselect":
+      case "checkbox":
+        viewControl = <EnumTags {...controlProps} />;
+        break;
+      case "html":
+        if (holderType == "table") {
+          viewControl = <EllipsisText isHtml={true} value={value}></EllipsisText>;
+        } else {
+          viewControl = <div dangerouslySetInnerHTML={{ __html: value }}></div>;
+        }
+        break;
+      case "steps":
+        viewControl = <Steps {...controlProps} />;
+        break;
+      case "password":
+        if (value) {
+          viewControl = (
+              <Tooltip title={value} color={"#fff1b8"} {...controlProps}>
+                <span className="infoStyle">********</span>
+              </Tooltip>
+          );
+        } else {
+          viewControl = null;
+        }
+        break;
+      case "caselect":
+        viewControl = <span className="infoStyle">{value}</span>;
+        break;
+      case "relation":
+        viewControl = unSupportControl;
+        break;
+      case "file":
+      case "picture":
+      case "video":
+        viewControl = <FileView {...controlProps}></FileView>;
+        break;
+      case "non-download-file":
+        viewControl = (
+            <FileView {...controlProps} downloadable={false}></FileView>
+        );
+        break;
+      case "chemstruc":
+        viewControl = <ChemStruc {...controlProps}></ChemStruc>;
+        //viewControl = unSupportControl
+        break;
+      case "sql-code-editor":
         viewControl = (
-          <Tooltip title={value} color={"#fff1b8"} {...controlProps}>
-            <span className="infoStyle">********</span>
-          </Tooltip>
+            <SqlCodeEditor viewOrEdit={"view"} {...controlProps}></SqlCodeEditor>
         );
-      } else {
-        viewControl = null;
-      }
-      break;
-    case "caselect":
-      viewControl = <span className="infoStyle">{value}</span>;
-      break;
-    case "relation":
-      viewControl = unSupportControl;
-      break;
-    case "file":
-    case "picture":
-    case "video":
-      viewControl = <FileView {...controlProps}></FileView>;
-      break;
-    case "non-download-file":
-      viewControl = (
-        <FileView {...controlProps} downloadable={false}></FileView>
-      );
-      break;
-    case "chemstruc":
-      viewControl = <ChemStruc {...controlProps}></ChemStruc>;
-      //viewControl = unSupportControl
-      break;
-    case "sql-code-editor":
-      viewControl = (
-        <SqlCodeEditor viewOrEdit={"view"} {...controlProps}></SqlCodeEditor>
-      );
-      break;
-    case "relselect":
-    case "refselect":
-    case "entity-select":
-    case "table-entity-select":
-      viewControl = <Rfield {...controlProps} />;
-      break;
-    case "progress":
-      viewControl = <Progress {...controlProps}></Progress>;
-      break;
-    case "signature":
-      viewControl = <Signature {...controlProps}></Signature>;
-      break;
-    case "color":
-      viewControl = <ColorPicker {...controlProps}></ColorPicker>;
-      break;
-    case "url":
-      viewControl = (
-        <a target={"_blank"} href={value}>
-          {translate("${网址}")}
-        </a>
-      );
-      break;
-    case "hidden": //
-      viewControl = <Input type="hidden" value={fieldValue} disabled={true} />;
-      break;
-    default:
-      viewControl = unSupportControl;
-      break;
+        break;
+      case "relselect":
+      case "refselect":
+      case "entity-select":
+      case "table-entity-select":
+        viewControl = <Rfield {...controlProps} />;
+        break;
+      case "progress":
+        viewControl = <Progress {...controlProps}></Progress>;
+        break;
+      case "signature":
+        viewControl = <Signature {...controlProps}></Signature>;
+        break;
+      case "color":
+        viewControl = <ColorPicker {...controlProps}></ColorPicker>;
+        break;
+      case "url":
+        viewControl = (
+            <a target={"_blank"} href={value}>
+              {translate("${网址}")}
+            </a>
+        );
+        break;
+      case "hidden": //
+        viewControl = <Input type="hidden" value={fieldValue} disabled={true} />;
+        break;
+      default:
+        viewControl = unSupportControl;
+        break;
+  }
   }
   return viewControl;
 }

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

@@ -79,10 +79,11 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
   const searchSubmit = (data) => {
     let new_serial_number = new Date().getTime();
 
-    // if (doSearch && new_serial_number - serial_number > 3000) {
-    //   serial_number = new_serial_number;
-    //   doSearch({ ...data, serial_number });
-    // }
+    if (doSearch && new_serial_number - serial_number > 3000) {
+      serial_number = new_serial_number;
+      doSearch({ ...data, serial_number });
+    }
+
     doSearch && doSearch({ ...data, serial_number });
   };
   // let currentDrillButton=null;
@@ -338,74 +339,65 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
       onFinish={searchSubmit}
       style={{ width: "100%" }}
     >
-      {buttons.includes("drilling") &&
-      open &&
-      (drillingParams.length > 0 || hasDimension() || ltmplConfig.showDim) ? (
-        // <Collapse style={{ width: "100%" }} defaultActiveKey={["1"]}>
-        // <Panel header={""} key="1">
-        <Card>
+
+        {/*// <Collapse style={{ width: "100%" }} defaultActiveKey={["1"]}>*/}
+        {/*// <Panel header={""} key="1">*/}
+        <Card size={'small'} style={{ display: open ? "block" : "none", width: "100%" }}>
           <Row>
             <Col>
               <Space size={"small"} wrap>
-                {renderCriteria(drillingParams)}
-                {renderDrillDimension()}
+                {buttons.includes("drilling") &&
+                open &&
+                (drillingParams.length > 0 || hasDimension() || ltmplConfig.showDim) ?
+                    <>{renderCriteria(drillingParams)}
+                      {renderDrillDimension()}</>
+                    : null}
+                {showQueryButton ||
+                (updrillButtonConfigs && updrillButtonConfigs.length > 0)
+                    ? renderCriteria(criterias)
+                    : null}
+                <Space className="btns">
+                  {showQueryButton ? (
+                      <Button type="primary" htmlType="submit">
+                        {translate("${查询}")}
+                      </Button>
+                  ) : (
+                      ""
+                  )}
+                  {showDeleteButton ? (
+                      <Popconfirm
+                          placement="rightBottom"
+                          title={translate("${确定要[删除]选中数据吗}?")}
+                          onConfirm={() => {
+                            doDelete();
+                          }}
+                          okText={translate("${确定}")}
+                          cancelText={translate("${取消}")}
+                          okType={"danger"}
+                      >
+                        <Button danger disabled={deleteButtonDisabled}>
+                          {translate("${删除选中}")}
+                        </Button>
+                      </Popconfirm>
+                  ) : (
+                      ""
+                  )}
+                  {renderAction()}
+                  {renderJump()}
+                  {renderCQuery()}
+                  {renderUpdrill()}
+                </Space>
               </Space>
             </Col>
           </Row>
         </Card>
-      ) : (
-        //         </Panel>
-        // </Collapse>
-        ""
-      )}
-      <Card
-        className="hoverable"
-        style={{ display: open ? "block" : "none", width: "100%" }}
-        headStyle={{ background: "#f2f4f5" }}
-      >
-        <Row>
-          <Col>
-            <Space size={"small"} wrap>
-              {showQueryButton ||
-              (updrillButtonConfigs && updrillButtonConfigs.length > 0)
-                ? renderCriteria(criterias)
-                : null}
-
-              <Space className="btns">
-                {showQueryButton ? (
-                  <Button type="primary" htmlType="submit">
-                    {translate("${查询}")}
-                  </Button>
-                ) : (
-                  ""
-                )}
-                {showDeleteButton ? (
-                  <Popconfirm
-                    placement="rightBottom"
-                    title={translate("${确定要[删除]选中数据吗}?")}
-                    onConfirm={() => {
-                      doDelete();
-                    }}
-                    okText={translate("${确定}")}
-                    cancelText={translate("${取消}")}
-                    okType={"danger"}
-                  >
-                    <Button danger disabled={deleteButtonDisabled}>
-                      {translate("${删除选中}")}
-                    </Button>
-                  </Popconfirm>
-                ) : (
-                  ""
-                )}
-                {renderAction()}
-                {renderJump()}
-                {renderCQuery()}
-                {renderUpdrill()}
-              </Space>
-            </Space>
-          </Col>
-        </Row>
-      </Card>
+      {/*<Card size={'small'}*/}
+      {/*  className="hoverable"*/}
+      {/*  style={{ display: open ? "block" : "none", width: "100%" }}*/}
+      {/*  headStyle={{ background: "#f2f4f5" }}*/}
+      {/*>*/}
+      {/*  */}
+      {/*</Card>*/}
     </AntdForm>
   );
 };

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

@@ -163,7 +163,7 @@ export default class FormItemGroup extends React.PureComponent<
             </FormItem>
           );
         } else {
-          debugger;
+         // debugger;
           // console.log("getFieldValue ---", Form.useFormInstance());
           formItem = item.shouldUpdate ? (
             <FormItem noStyle shouldUpdate={item.shouldUpdate}>

package/src/aldehyde/import/excel-import.tsx

@@ -124,7 +124,7 @@ export default class ExcelImport extends React.PureComponent<
         });
         this.timerId = setInterval(() => this.handleStatus(res.importId), 500);
       } else {
-        message.error(translate("${失败}!"));
+        message.error(translate("${失败}!"),5);
         this.setState({
           importStatus: "fail",
         });

package/src/aldehyde/layout/MainPage.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import { Layout } from "antd";
+import { Layout ,Affix} from "antd";
 import Footer from "./footer/index";
 import { BlockMenu } from "../tmpl/interface";
 import Header from "./header";
@@ -296,14 +296,14 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
                     }
               }
             >
-              <Header toggle={this.toggle} {...this.state} />
+              <Header   toggle={this.toggle} {...this.state} />
               <Content
                 style={{
                   margin: "24px 16px 0",
                   overflow: "initial",
                   minHeight: "calc(100vh)",
                   minWidth: 760,
-                  maxWidth: 1960,
+                  // maxWidth: 3060,
                   paddingBottom: "8px",
                 }}
               >

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

@@ -25,7 +25,11 @@ const Header: React.FC<HeaderProps> = (props) => {
     "--antd-color-primary": token.colorPrimary,
   } as CSSProperties;
   return (
-    <AntdHeader style={{ padding: 0, height: "auto", minWidth: "760px" }}>
+    <AntdHeader  style={{position: 'sticky',
+        top: 0,
+        zIndex: 100,
+        width: '100%',
+         padding: 0, height: "auto", minWidth: "760px" }}>
       {/*<Row  justify="space-around" align="middle" style={{'background':'#0f4da1',height:'100px'}}>*/}
       {/*      <Col span={12}>*/}
       {/*          <img style={{height:'80px'}} src={Logo}></img>*/}

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

@@ -8,14 +8,12 @@ import translate from "../../locale/translate";
 
 
 export default {
-
     getMenu(blockMenu: BlockMenu , target, basePath = ""){
         if(blockMenu.l1Menus){
            return this.toL1Menu(blockMenu.l1Menus, target, basePath = "")
         }else{
             return this.toSubMenu(blockMenu.items, target, basePath = "");
         }
-
     },
 
     toL1Menu(subMenus: (Level1Menu)[], target, basePath = "") {
@@ -49,20 +47,18 @@ export default {
                     menu.children = this.toSubMenu(subItems, target, basePath);
                 } else {
                     let i:Level2Menu=item as Level2Menu;
-
                     if(i.disabled ){
                         if(i.hiddenOnDisabled){
                             menu=null;
                         }else{
                             menu.disabled=i.disabled;
                             if(i.tip){
-                                menu.label= <Tooltip placement="top" title={i.tip} >
+                                menu.label= <Tooltip placement="top" title={translate('${' + i.tip + '}')} >
                                     {translate('${' + i.title + '}')}
                                 </Tooltip>
                             }else{
                                 menu.label=translate('${' + i.title + '}');
                             }
-
                         }
                     }else{
                         menu.label = this.toL2MenuTitle(i , target, basePath);
@@ -107,18 +103,14 @@ export default {
                     codeSource = '&codeSource=listop';
                     break;
             }
-
             return `${basePath}/${menu.id}/${routePath}?menuId=${menu.id}${codeSource}${defaultCriteriaData}`;
-
         }
         return null;
     },
     toL2MenuTitle(item: Level2Menu & {path?: string}, target, basePath = "") {
-
         if(!item){
             return null;
         }
-
         let delimiter = "/";
         let customPath = item.customPath;
         if (customPath) {
@@ -166,8 +158,6 @@ export default {
 
             }
         }
-
-
         return openL2MenuId;
     }
 }

package/src/aldehyde/login/context-setter.tsx

@@ -4,6 +4,7 @@ import {Button, Col, Form, FormInstance, Modal, Row} from "antd";
 import EntryControl from "../controls/entry-control";
 import HCserviceV3 from "../tmpl/hcservice-v3";
 import withRouter from "../routable/withroute";
+import {LocaleContext} from "../locale/LocaleProvider";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
@@ -27,7 +28,8 @@ class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSette
     }
     formRef = React.createRef<FormInstance>();
     static defaultProps = {}
-
+    static contextType = LocaleContext;
+    context: React.ContextType<typeof LocaleContext>;
     async componentDidMount() {
 
         let config = await HCserviceV3.getContextSourceConfig();
@@ -73,9 +75,10 @@ class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSette
 
 
     render() {
+        const { translate} = this.context;
         const {config,loading,context}=this.state;
         const {serverKey}=this.props;
-        return <Modal title="全局配置" closable={false} open={true} footer={[]}>
+        return <Modal title={translate("${全局配置}")} closable={false} open={true} footer={[]}>
             <Row  justify="center" align="middle" >
                 <Col>
                     <Form style={{width: 350}} ref={this.formRef}
@@ -111,7 +114,7 @@ class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSette
                         <Form.Item>
                             <Button type="primary" style={{width: '100%'}} loading={loading} onClick={this.handleSubmit}
                                     className="login-form-button">
-                                确 定
+                                {translate("${确定}")}
                             </Button>
                         </Form.Item>
                     </Form>