aldehyde 0.2.127 → 0.2.128

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

@@ -30,6 +30,7 @@ interface InnerEntitySelectProps extends EControlProps {
   maxSelected?: number;
   onEntityClick?: (code: string) => void;
   baseCriteria: object;
+  valueOnly?:boolean;
 }
 
 interface InnerEntitySelectState {
@@ -67,6 +68,7 @@ export default class EntitySelect extends React.PureComponent<
 > {
   static defaultProps = {
     maxSelected: 100,
+    valueOnly:false,
   };
 
   state = {
@@ -276,10 +278,15 @@ export default class EntitySelect extends React.PureComponent<
     let valueArray = this.toArray(value);
     for (let v of valueArray) {
       if (v) {
-        let vs = v.split("@R@");
-        if (vs[1] != "null") {
-          result.push(vs[0]);
+        if(this.props.valueOnly){
+            result.push(v);
+        }else{
+          let vs = v.split("@R@");
+          if (vs[1] != "null") {
+            result.push(vs[0]);
+          }
         }
+
       }
     }
     return result;
@@ -301,17 +308,22 @@ export default class EntitySelect extends React.PureComponent<
   };
 
   toOptions = (value, onEntityClick) => {
-    const { fieldConfig } = this.props;
+    const { fieldConfig ,valueOnly} = this.props;
     let options: object[] = [];
     //console.log('options value', value);
 
     let valueArray: string[] = this.toArray(value);
     for (let v of valueArray) {
       if (v) {
-        let vs = v.split("@R@");
-        if (vs[1] != "null") {
-          options.push(this.toOption(vs[0], vs[1], onEntityClick));
+        if(valueOnly){
+            options.push(this.toOption(v, v, onEntityClick));
+        }else{
+          let vs = v.split("@R@");
+          if (vs[1] != "null") {
+            options.push(this.toOption(vs[0], vs[1], onEntityClick));
+          }
         }
+
       }
     }
 
@@ -382,7 +394,7 @@ export default class EntitySelect extends React.PureComponent<
         ltmplConfig_ = await this.loadLtmplConfig();
       }
       if (!ltmplConfig_) {
-        message.error("请配置正确查询页面");
+        message.error("请配置正确查询页面",5);
         return;
       }
       let pageInfo = {
@@ -463,17 +475,28 @@ export default class EntitySelect extends React.PureComponent<
 
   onChange = (values: any[]) => {
     const { codeLabel } = this.state;
+    const { maxSelected,valueOnly } = this.props;
     let newValues: Array<string> = [...values];
-    if (values && values.length > this.props.maxSelected) {
+    if (values && values.length > maxSelected) {
       newValues.shift();
     }
     let formValues: Array<string> = [];
+
     newValues.forEach((c) => {
-      if (c.indexOf("@R@") > 0) {
-        formValues.push(c);
-      } else {
-        formValues.push(c + "@R@" + codeLabel[c]);
+      if(valueOnly){
+        if (c.indexOf("@R@") > 0) {
+          formValues.push(c.split("@R@")[1]);
+        } else {
+          formValues.push(codeLabel[c]);
+        }
+      }else{
+        if (c.indexOf("@R@") > 0) {
+          formValues.push(c);
+        } else {
+          formValues.push(c + "@R@" + codeLabel[c]);
+        }
       }
+
     });
     this.props.onChange(formValues);
   };

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

@@ -372,6 +372,15 @@ function renderControl(
         />
       );
       break;
+    case "relselectvalue":
+      entryControl = (
+          <EntitySelect valueOnly={true}
+              baseCriteria={fieldConfig.baseCriteria}
+              maxSelected={1}
+              {...controlProps}
+          />
+      );
+      break;
     case "table-entity-select":
       entryControl = (
         <PopoverEntitySelect

package/src/aldehyde/controls/password-setter/index.js

@@ -18,7 +18,7 @@ export default class SetPasswords extends React.Component {
         if (oldPass === values.oldpass) {
           this.props.setNewPass(values.newpass);
         } else {
-          message.error("原登录密码不正确！");
+          message.error("原登录密码不正确！",6);
         }
       }
     });

package/src/aldehyde/controls/upload/index.tsx

@@ -64,7 +64,7 @@ export default class Upload extends React.PureComponent<
 
     const isLt5M = file.size / 1024 / 1024 < 40;
     if (!isLt5M) {
-      message.error(translate("${超过40M限制 不允许上传~}"));
+      message.error(translate("${超过40M限制 不允许上传~}"),5);
       return false;
     } else {
       return true;

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

@@ -339,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/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

@@ -303,7 +303,7 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
                   overflow: "initial",
                   minHeight: "calc(100vh)",
                   minWidth: 760,
-                  maxWidth: 1960,
+                  // maxWidth: 3060,
                   paddingBottom: "8px",
                 }}
               >

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>

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

@@ -262,7 +262,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     let s = 0;
     let colConfigs = sortedColConfigs ? sortedColConfigs : ltmplConfig.columns;
 
-    let currentDataColIndex=0;
+    let currentDataColIndex = 0;
 
     colConfigs.forEach((item) => {
       let column = {};
@@ -274,6 +274,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       if (item["colWidth"]) column["width"] = item["colWidth"];
       if (item["statColType"]) column["statColType"] = item["statColType"];
       if (item["aggFunc"]) column["cal"] = item["aggFunc"];
+      if (item["order"]) column["order"] = Number(item["order"]);
       // column['ellipsis']= true;
       s++;
       let itemType = SupportInputTypes.getSupportControlType(item);
@@ -285,7 +286,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       //特殊列处理
       //序号
       if (item.title === "序号") {
-        column["width"] = item.colWidth?item.colWidth:40;
+        column["width"] = item.colWidth ? item.colWidth : 50;
+        column["title"] = translate("${序号}");
         //item.fixed='left';
         column["render"] = (text, record, index) => <label>{index + 1}</label>;
         item["sorter"] = undefined;
@@ -336,7 +338,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       } else if (item.title === "操作") {
         column["fixed"] = "right";
         column["align"] = "center";
-        column["width"] = item.colWidth?item.colWidth:160;
+        column["width"] = item.colWidth ? item.colWidth : 160;
         column["className"] = "opsColumn";
         column["title"] = <>{translate("${操作}")}</>;
         column["render"] = (text, record) => (
@@ -524,12 +526,20 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
         currentDataColIndex++;
         column["className"] = "opsColumn";
         column["title"] = translate("${" + item.title + "}");
-        column["width"]=item.colWidth?item.colWidth:160;
-        column["ellipsis"]={showTitle:true}
-        if(ltmplConfig.leftFixedCols && ltmplConfig.leftFixedCols>=currentDataColIndex){
-          column["fixed"]="left";
-        }else{
-          column["fixed"]= item.fixed ? item.fixed =='right'?"right":"left":false;
+        column["width"] = item.colWidth ? item.colWidth : 160;
+        column["ellipsis"] = { showTitle: true };
+        column["align"]=item.valueAlign?item.valueAlign:"left";
+        if (
+          ltmplConfig.leftFixedCols &&
+          ltmplConfig.leftFixedCols >= currentDataColIndex
+        ) {
+          column["fixed"] = "left";
+        } else {
+          column["fixed"] = item.colFixed
+            ? item.colFixed == "right"
+              ? "right"
+              : "left"
+            : false;
         }
         column["render"] = (text, record) => {
           return (
@@ -1093,9 +1103,10 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
   criteriaFormUseful = () => {
     const { ltmplConfig } = this.props;
-    let { buttons, criterias,updrillButtonConfigs } = ltmplConfig;
+    let { buttons, criterias, updrillButtonConfigs } = ltmplConfig;
     if (
-      ((buttons.includes("query") || updrillButtonConfigs && updrillButtonConfigs.length>0) &&
+      ((buttons.includes("query") ||
+        (updrillButtonConfigs && updrillButtonConfigs.length > 0)) &&
         ((criterias && criterias.length > 0) ||
           buttons.includes("drilling"))) ||
       this.checkBoxUseful()